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, 422 insertions, 84 deletions

diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index 68c8bbbb83..928304b15b 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -25,7 +25,349 @@
  *
  ************************************************************************/
 
-#include "swmn.hrc"
+#include <svx/dialogs.hrc>
+#include <svx/globlmn.hrc>
+#include "cmdid.h"
+#include "app.hrc"
+#include "globals.hrc"
+#include "helpid.h"
+#include "popup.hrc"
+
+/* --------------------- F O R M A T --------------------------------- */
+#define SEPARATOR		MenuItem { Separator = TRUE; }
+//define for ITEM_FORMAT_NUMBERING
+#define DEFINE_SLOTID_FOR_NUMBER_BULLETS FN_NUMBER_BULLETS
+#define MN_NUMBERING ITEM_FORMAT_NUMBERING
+
+#define MN_TXT\
+    MenuItem\
+    {\
+        ITEM_FORMAT_CHAR_DLG\
+    };\
+    MenuItem\
+    {\
+        ITEM_FORMAT_PARA_DLG\
+    };\
+    MenuItem\
+    {\
+        Identifier = FN_FORMAT_PAGE_DLG ; \
+        HelpId = CMD_FN_FORMAT_PAGE_DLG ; \
+        Text [ en-US ] = "Pa~ge..." ; \
+    };
+
+
+#define MN_TEXT_ATTR\
+    MenuItem\
+    {\
+        ITEM_FORMAT_ATTR_CHAR_FONT\
+    };\
+    MenuItem\
+    {\
+        ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_STYLE ; \
+        Command = ".uno:StyleMenu" ; \
+        Text [ en-US ] = "St~yle" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_WEIGHT\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_POSTURE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_OVERLINE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_UNDERLINE\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_STRIKEOUT\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_SHADOWED\
+                };\
+                MenuItem\
+                {\
+                    ITEM_FORMAT_ATTR_CHAR_CONTOUR\
+                };\
+                SEPARATOR ; \
+                MenuItem\
+                {\
+                    Identifier = FN_SET_SUPER_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUPER_SCRIPT ; \
+                    Text [ en-US ] = "Superscript" ; \
+                };\
+                MenuItem\
+                {\
+                    Identifier = FN_SET_SUB_SCRIPT ; \
+                    HelpId = CMD_FN_SET_SUB_SCRIPT ; \
+                    Text [ en-US ] = "Subscript" ; \
+                };\
+            };\
+        };\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_ALGN ; \
+        Command = ".uno:AlignTextMenu" ; \
+        Text [ en-US ] = "A~lignment" ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER\
+                };\
+                MenuItem\
+                {\
+                    Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \
+                    RadioCheck = TRUE ; \
+                    Text [ en-US ] = "Justified" ; \
+                };\
+            };\
+        };\
+    };\
+    MenuItem\
+    {\
+        Identifier = MN_FORMAT_LINESPACE ; \
+        Command = ".uno:LineSpacingMenu" ; \
+        Text [ en-US ] = "Line Spacing" ; \
+        _MenuItemFlags = MIB_RADIOCHECK ; \
+        SubMenu = Menu\
+        {\
+            ItemList = \
+            {\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_10\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_15\
+                };\
+                MenuItem\
+                {\
+                    RadioCheck = TRUE ; \
+                    ITEM_FORMAT_PARA_LINESPACE_20\
+                };\
+            };\
+        };\
+    };
+
+/* --------------------- M E N U  --------------------------------- */
+
+/*
+
+
+The application menu bar resource has become obsolete. You can now find the menu bar at the following
+location: <project>/uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml
+
+
+*/
+
+/* --------------------- D O C U M E N T -------------------------- */
+
+
+#define _MN_EDIT_FIELD                                                      \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_FIELD ;                                    \
+            HelpId = CMD_FN_EDIT_FIELD ;                                        \
+            Text [ en-US ] = "Fields..." ;                             \
+    };
+#define _MN_EDIT_FOOTNOTE                                                    \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_FOOTNOTE ;                                 \
+            HelpId = CMD_FN_EDIT_FOOTNOTE ;                                     \
+            Text [ en-US ] = "Footnote/Endnote~..." ;                          \
+        };
+    #define _MN_EDIT_IDX_ENTRY_DLG                                          \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_IDX_ENTRY_DLG ;                            \
+            HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ;                                \
+            Text [ en-US ] = "Inde~x Entry..." ;                       \
+    };
+
+#define _MN_EDIT_REDLINE                                          \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REDLINE_ACCEPT_DIRECT;                            \
+            HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ;                                \
+            Text [ en-US ] = "Accept Change" ;                       \
+        };\
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REDLINE_REJECT_DIRECT ;                            \
+            HelpId = CMD_FN_REDLINE_REJECT_DIRECT ;                                \
+            Text [ en-US ] = "Reject Change" ;                       \
+        };								\
+    SEPARATOR ;
+#define _MN_EDIT_BIB_ENTRY_DLG                                              \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_AUTH_ENTRY_DLG ;                           \
+            HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ;                               \
+            Text [ en-US ] = "~Bibliography Entry...";                  \
+    };                                                                  \
+        SEPARATOR ;
+
+#define _MN_EDIT_OPEN_HYPERLINK                                             \
+    MenuItem                                                                \
+    {                                                                       \
+        ITEM_OPEN_HYPERLINK                                                 \
+    };\
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier = FN_EDIT_HYPERLINK ;                           \
+        HelpId = CMD_FN_EDIT_HYPERLINK ;                               \
+        Text [ en-US ] = "Edit Hyperlink...";                  \
+    };                                                                  \
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier =  FN_COPY_HYPERLINK_LOCATION;                           \
+        HelpId = CMD_FN_COPY_HYPERLINK_LOCATION;                               \
+        Text [ en-US ] = "Copy Hyperlink ~Location";                  \
+    };                                                                  \
+    MenuItem                                                            \
+    {                                                                   \
+        Identifier = FN_REMOVE_HYPERLINK ;                           \
+        HelpId = CMD_FN_REMOVE_HYPERLINK ;                               \
+        Text [ en-US ] = "Remo~ve Hyperlink";                  \
+    };                                                                  
+
+#define _MN_EDIT_OPEN_SMARTTAGMENU                                          \
+    MenuItem                                                                \
+    {                                                                       \
+        ITEM_OPEN_SMARTTAGMENU                                              \
+    };
+    
+#define _MN_EDIT__HYPERLINK \
+    MenuItem\
+    {\
+        Identifier = FN_EDIT_HYPERLINK ; \
+        HelpId = CMD_FN_EDIT_HYPERLINK ; \
+        Text [ en-US ] = "~Edit Hyperlink" ; \
+    };
+    
+#define _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
+    _MN_EDIT_FIELD                                                              \
+    _MN_EDIT_FOOTNOTE                                                           \
+    _MN_EDIT_IDX_ENTRY_DLG                                                      \
+    _MN_EDIT_BIB_ENTRY_DLG                                                      \
+    _MN_EDIT_REDLINE                                                            \
+    MenuItem                                                            \
+    {                                                                   \
+        ITEM_POPUP_TEMPLATE_EDIT                                        \
+    };                                                                  \
+    SEPARATOR ;                                                         \
+    _MN_EDIT_OPEN_HYPERLINK                                             \
+    _MN_EDIT_OPEN_SMARTTAGMENU
+
+
+#define MN_RESET\
+    MenuItem\
+    {\
+        Identifier = FN_FORMAT_RESET ; \
+        HelpId = CMD_FN_FORMAT_RESET ; \
+        Text [ en-US ] = "~Default Formatting" ; \
+    };
+
+#define _NUMBERING_RELATED_MENU \
+        SEPARATOR ;                                                         \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUMBER_NEWSTART;                                \
+            HelpId = CMD_FN_NUMBER_NEWSTART;                                    \
+            Text[ en-US ] = "Restart Numbering";                            \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_CONTINUE;                                   \
+            HelpId = CMD_FN_NUM_CONTINUE;                                       \
+            Text[ en-US ] = "Continue previous numbering";                  \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_BULLET_UP;                              \
+            HelpId = CMD_FN_NUM_BULLET_UP;                                  \
+            Text[ en-US ] = "Up One Level";                              \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_NUM_BULLET_DOWN;                              \
+            HelpId = CMD_FN_NUM_BULLET_DOWN;                                  \
+            Text[ en-US ] = "Down One Level";                              \
+        };                                                                  
+
+#define BASE_TEXT_POPUPMENU_BEGIN \
+{                                                                           \
+    ItemList =                                                              \
+    {                                                                       \
+        MN_RESET                                                            \
+        _NUMBERING_RELATED_MENU                                             \
+        SEPARATOR ;                                                         \
+        MN_TEXT_ATTR                                                        \
+        SEPARATOR ;                                                         \
+        MN_TXT                                                              \
+        MN_NUMBERING                                                        \
+        ITEM_TRANSLITERATE_MENU                                             \
+        SEPARATOR ;                                                         
+
+// not in Writer/Web
+#define BASE_TEXT_POPUPMENU_NOWEB \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_UPDATE_CUR_TOX ;                                \
+            HelpId = CMD_FN_UPDATE_CUR_TOX ;                                    \
+            Text [ en-US ] = "~Update Index/Table";                         \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_EDIT_CURRENT_TOX;                               \
+            HelpId = CMD_FN_EDIT_CURRENT_TOX;                                   \
+            Text [ en-US ] = "~Edit Index/Table";                           \
+        };                                                                  \
+        MenuItem                                                            \
+        {                                                                   \
+            Identifier = FN_REMOVE_CUR_TOX;                                 \
+            HelpId = CMD_FN_REMOVE_CUR_TOX;                                     \
+            Text [ en-US ] = "Delete Index/Table";                          \
+        };                                                                  \
+        SEPARATOR ;                                                         
+
+#define BASE_TEXT_POPUPMENU_END \
+        _DEFAULT_TEXT_EDIT_ELEMENTS                                         \
+    };                                                                      \
+};                                                                          
 
 /*------------------------------------------------------------------------
    Description: Menu Window
@@ -35,7 +377,7 @@
         MenuItem\
         {\
             Identifier = FN_INSERT_CAPTION ;\
-            HelpID = FN_INSERT_CAPTION ;\
+            HelpId = CMD_FN_INSERT_CAPTION ;\
             Text [ en-US ] = "~Caption..." ;\
     };
 
@@ -43,31 +385,30 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_TABLE_DLG ; \
-        HelpID = FN_FORMAT_TABLE_DLG ; \
+        HelpId = CMD_FN_FORMAT_TABLE_DLG ; \
         Text [ en-US ] = "~Table..." ; \
     };\
     MenuItem\
     {\
         Identifier = FN_TABLE_MERGE_TABLE ; \
-        HelpID = FN_TABLE_MERGE_TABLE ; \
+        HelpId = CMD_FN_TABLE_MERGE_TABLE ; \
         Text [ en-US ] = "Merge Tables";\
     };\
     MenuItem\
     {\
         Identifier = FN_TABLE_SPLIT_TABLE ; \
-        HelpID = FN_TABLE_SPLIT_TABLE ; \
+        HelpId = CMD_FN_TABLE_SPLIT_TABLE ; \
         Text [ en-US ] = "~Split Table" ; \
     };\
     MenuItem\
     {\
         Identifier = FN_NUM_FORMAT_TABLE_DLG ; \
-        HelpID = FN_NUM_FORMAT_TABLE_DLG ; \
+        HelpId = CMD_FN_NUM_FORMAT_TABLE_DLG ; \
         Text [ en-US ] = "N~umber Format..." ; \
     };\
     MenuItem\
     {\
         Identifier = MN_CELL ; \
-        HelpID = MN_CELL ; \
         Command = ".uno:CellMenu" ; \
         Text [ en-US ] = "~Cell" ; \
         SubMenu = Menu\
@@ -77,45 +418,45 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_MERGE_CELLS ; \
-                    HelpID = FN_TABLE_MERGE_CELLS ; \
+                    HelpId = CMD_FN_TABLE_MERGE_CELLS ; \
                     Text [ en-US ] = "~Merge" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SPLIT_CELLS ; \
-                    HelpID = FN_TABLE_SPLIT_CELLS ; \
+                    HelpId = CMD_FN_TABLE_SPLIT_CELLS ; \
                     Text [ en-US ] = "~Split..." ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_NONE ; \
-                    HelpID = FN_TABLE_VERT_NONE ; \
+                    HelpId = CMD_FN_TABLE_VERT_NONE ; \
                     Text [ en-US ] = "~Top" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_CENTER ; \
-                    HelpID = FN_TABLE_VERT_CENTER ; \
+                    HelpId = CMD_FN_TABLE_VERT_CENTER ; \
                     Text [ en-US ] = "C~enter" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_VERT_BOTTOM ; \
-                    HelpID = FN_TABLE_VERT_BOTTOM ; \
+                    HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \
                     Text [ en-US ] = "~Bottom" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_READ_ONLY_CELLS ; \
-                    HelpID = FN_TABLE_SET_READ_ONLY_CELLS ; \
+                    HelpId = CMD_FN_TABLE_SET_READ_ONLY_CELLS ; \
                     Text [ en-US ] = "~Protect" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_UNSET_READ_ONLY_CELLS ; \
-                    HelpID = FN_TABLE_UNSET_READ_ONLY_CELLS ; \
+                    HelpId = CMD_FN_TABLE_UNSET_READ_ONLY_CELLS ; \
                     Text [ en-US ] = "~Unprotect" ; \
                 };\
             };\
@@ -136,44 +477,44 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_ROW_HEIGHT ; \
-                    HelpID = FN_TABLE_SET_ROW_HEIGHT ; \
+                    HelpId = CMD_FN_TABLE_SET_ROW_HEIGHT ; \
                     Text [ en-US ] = "~Height..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_ROW_SPLIT;\
-                    HelpID = FN_TABLE_ROW_SPLIT ; \
+                    HelpId = CMD_FN_TABLE_ROW_SPLIT ; \
                     Text [ en-US ] = "Allow Row to Break A~cross Pages and Columns" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_OPTIMAL_HEIGHT ; \
-                    HelpID = FN_TABLE_OPTIMAL_HEIGHT ; \
+                    HelpId = CMD_FN_TABLE_OPTIMAL_HEIGHT ; \
                     Text [ en-US ] = "~Optimal Height" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_BALANCE_ROWS ; \
-                    HelpID = FN_TABLE_BALANCE_ROWS ; \
+                    HelpId = CMD_FN_TABLE_BALANCE_ROWS ; \
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SELECT_ROW ; \
-                    HelpID = FN_TABLE_SELECT_ROW ; \
+                    HelpId = CMD_FN_TABLE_SELECT_ROW ; \
                     Text [ en-US ] = "~Select" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_ROW_DLG ; \
-                    HelpID = FN_TABLE_INSERT_ROW_DLG ; \
+                    HelpId = CMD_FN_TABLE_INSERT_ROW_DLG ; \
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_ROW ; \
-                    HelpID = FN_TABLE_DELETE_ROW ; \
+                    HelpId = CMD_FN_TABLE_DELETE_ROW ; \
                     Text [ en-US ] = "~Delete" ; \
                 };\
             };\
@@ -192,38 +533,38 @@
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SET_COL_WIDTH ; \
-                    HelpID = FN_TABLE_SET_COL_WIDTH ; \
+                    HelpId = CMD_FN_TABLE_SET_COL_WIDTH ; \
                     Text [ en-US ] = "~Width..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_ADJUST_CELLS ; \
-                    HelpID = FN_TABLE_ADJUST_CELLS ; \
+                    HelpId = CMD_FN_TABLE_ADJUST_CELLS ; \
                     Text [ en-US ] = "~Optimal Width " ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_BALANCE_CELLS ; \
-                    HelpID = FN_TABLE_BALANCE_CELLS ; \
+                    HelpId = CMD_FN_TABLE_BALANCE_CELLS ; \
                     Text [ en-US ] = "Space ~Equally" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_SELECT_COL ; \
-                    HelpID = FN_TABLE_SELECT_COL ; \
+                    HelpId = CMD_FN_TABLE_SELECT_COL ; \
                     Text [ en-US ] = "~Select" ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_INSERT_COL_DLG ; \
-                    HelpID = FN_TABLE_INSERT_COL_DLG ; \
+                    HelpId = CMD_FN_TABLE_INSERT_COL_DLG ; \
                     Text [ en-US ] = "~Insert..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_TABLE_DELETE_COL ; \
-                    HelpID = FN_TABLE_DELETE_COL ; \
+                    HelpId = CMD_FN_TABLE_DELETE_COL ; \
                     Text [ en-US ] = "~Delete" ; \
                 };\
             };\
@@ -244,7 +585,7 @@
     MenuItem\
     {\
         Identifier = FN_DRAWTEXT_ATTR_DLG ; \
-        HelpID = FN_DRAWTEXT_ATTR_DLG ; \
+        HelpId = CMD_FN_DRAWTEXT_ATTR_DLG ; \
         Text [ en-US ] = "Te~xt..." ; \
     };
 
@@ -252,7 +593,7 @@
     MenuItem\
     {\
         Identifier = FN_NAME_SHAPE ; \
-        HelpID = FN_NAME_SHAPE ; \
+        HelpId = CMD_FN_NAME_SHAPE ; \
         Text [ en-US ] = "Name..." ; \
     };
 
@@ -260,7 +601,7 @@
     MenuItem\
     {\
         Identifier = FN_TITLE_DESCRIPTION_SHAPE; \
-        HelpID = FN_TITLE_DESCRIPTION_SHAPE; \
+        HelpId = CMD_FN_TITLE_DESCRIPTION_SHAPE; \
         Text [ en-US ] = "Description..." ; \
     };
 
@@ -268,7 +609,7 @@
     MenuItem\
     {\
         Identifier = FN_FORMAT_FRAME_DLG ; \
-        HelpID = FN_FORMAT_FRAME_DLG ; \
+        HelpId = CMD_FN_FORMAT_FRAME_DLG ; \
         Text [ en-US ] = "~Frame..." ; \
     };
 
@@ -323,13 +664,13 @@
     MenuItem\
     {\
         Identifier = FN_FRAME_UP ; \
-        HelpID = FN_FRAME_UP ; \
+        HelpId = CMD_FN_FRAME_UP ; \
         Text [ en-US ] = "Bring ~Forward" ; \
     };\
     MenuItem\
     {\
         Identifier = FN_FRAME_DOWN ; \
-        HelpID = FN_FRAME_DOWN ; \
+        HelpId = CMD_FN_FRAME_DOWN ; \
         Text [ en-US ] = "Send Back~ward" ; \
     };
 
@@ -409,45 +750,45 @@
     MenuItem\
     {\
         Identifier = FN_REPLY ;\
-        HelpID = FN_DELETE_NOTE ;\
+        HelpID = CMD_FN_REPLY ;\
         Text [ en-US ] = "Reply" ;\
     };\
     SEPARATOR ; \
     MenuItem\
     {\
-        Identifier = FN_DELETE_NOTE ;\
-        HelpID = FN_DELETE_NOTE ;\
+        Identifier = FN_DELETE_COMMENT ;\
+        HelpID = CMD_FN_DELETE_COMMENT ;\
         Text [ en-US ] = "Delete ~Comment" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_DELETE_NOTE_AUTHOR ;\
-        HelpID = FN_DELETE_NOTE_AUTHOR ;\
+        HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;\
         Text [ en-US ] = "Delete ~All Comments by $1" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_DELETE_ALL_NOTES ;\
-        HelpID = FN_DELETE_ALL_NOTES ;\
+        HelpId = CMD_FN_DELETE_ALL_NOTES ;\
         Text [ en-US ] = "~Delete All Comments" ;\
     };\
     /*
     MenuItem\
     {\
         Identifier = FN_HIDE_NOTE ;\
-        HelpID = FN_HIDE_NOTE ;\
+        HelpId = CMD_FN_HIDE_NOTE ;\
         Text [ en-US ] = "~Hide comment" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_HIDE_NOTE_AUTHOR	 ;\
-        HelpID = FN_HIDE_NOTE_AUTHOR ;\
+        HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;\
         Text [ en-US ] = "Hide ~author" ;\
     };\
     MenuItem\
     {\
         Identifier = FN_HIDE_ALL_NOTES ;\
-        HelpID = FN_HIDE_ALL_NOTES ;\
+        HelpId = CMD_FN_HIDE_ALL_NOTES ;\
         Text [ en-US ] = "Hide all ~comments" ;\
     };
     */
@@ -490,13 +831,13 @@ Menu MN_TAB_POPUPMENU
         MenuItem
         {
             Identifier = FN_VIEW_TABLEGRID ;
-            HelpID = FN_VIEW_TABLEGRID ;
+            HelpId = CMD_FN_VIEW_TABLEGRID ;
             Text [ en-US ] = "Table Boundaries" ;
         };
         MenuItem
         {
             Identifier = FN_SET_MODOPT_TBLNUMFMT ;
-            HelpID = FN_SET_MODOPT_TBLNUMFMT ;
+            HelpId = CMD_FN_SET_MODOPT_TBLNUMFMT ;
             Text [ en-US ] = "~Number Recognition";
         };
         SEPARATOR ;
@@ -508,7 +849,7 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_FRAME_WRAP_CONTOUR ; \
-        HelpID = FN_FRAME_WRAP_CONTOUR ; \
+        HelpId = CMD_FN_FRAME_WRAP_CONTOUR ; \
         Text [ en-US ] = "~Contour" ; \
     };
 
@@ -516,7 +857,7 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = SID_CONTOUR_DLG ; \
-        HelpID = SID_CONTOUR_DLG ; \
+        HelpId = CMD_SID_CONTOUR_DLG ; \
         Text [ en-US ] = "~Edit Contour..." ; \
     };
 
@@ -527,7 +868,6 @@ Menu MN_TAB_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_WRAP ; \
-        HelpID = MN_WRAP ; \
         Command = ".uno:WrapMenu" ; \
         Text [ en-US ] = "~Wrap" ; \
         SubMenu = Menu\
@@ -538,35 +878,35 @@ Menu MN_TAB_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_NOWRAP ; \
-                    HelpID = FN_FRAME_NOWRAP ; \
+                    HelpId = CMD_FN_FRAME_NOWRAP ; \
                     Text [ en-US ] = "~No Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP ; \
-                    HelpID = FN_FRAME_WRAP ; \
+                    HelpId = CMD_FN_FRAME_WRAP ; \
                     Text [ en-US ] = "~Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpID = FN_FRAME_WRAP_IDEAL ; \
+                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
                     Text [ en-US ] = "~Optimal Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpID = FN_FRAME_WRAPTHRU ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
                     Text [ en-US ] = "~Wrap Through" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
                     Text [ en-US ] = "In ~Background" ; \
                 };\
                 SEPARATOR ; \
@@ -576,7 +916,7 @@ Menu MN_TAB_POPUPMENU
                 {\
                     Checkable = TRUE ; \
                     Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpID = FN_WRAP_ANCHOR_ONLY ; \
+                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
                     Text [ en-US ] = "~First Paragraph" ; \
                     };\
             };\
@@ -594,7 +934,6 @@ String MN_DRAW_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_WRAP ; \
-        HelpID = MN_WRAP ; \
         Command = ".uno:WrapMenu" ; \
         SubMenu = Menu\
         {\
@@ -604,35 +943,35 @@ String MN_DRAW_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_NOWRAP ; \
-                    HelpID = FN_FRAME_NOWRAP ; \
+                    HelpId = CMD_FN_FRAME_NOWRAP ; \
                     Text [ en-US ] = "~No Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP ; \
-                    HelpID = FN_FRAME_WRAP ; \
+                    HelpId = CMD_FN_FRAME_WRAP ; \
                     Text [ en-US ] = "~Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAP_IDEAL ; \
-                    HelpID = FN_FRAME_WRAP_IDEAL ; \
+                    HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \
                     Text [ en-US ] = "~Optimal Page Wrap" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU ; \
-                    HelpID = FN_FRAME_WRAPTHRU ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU ; \
                     Text [ en-US ] = "~Wrap Through" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \
-                    HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \
+                    HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \
                     Text [ en-US ] = "In ~Background" ; \
                 };\
                 SEPARATOR ; \
@@ -641,14 +980,14 @@ String MN_DRAW_POPUPMENU
                 {\
                     Checkable = TRUE ; \
                     Identifier = FN_WRAP_ANCHOR_ONLY ; \
-                    HelpID = FN_WRAP_ANCHOR_ONLY ; \
+                    HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \
                     Text [ en-US ] = "~First Paragraph" ; \
                 };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_DRAW_WRAP_DLG ; \
-                    HelpID = FN_DRAW_WRAP_DLG ; \
+                    HelpId = CMD_FN_DRAW_WRAP_DLG ; \
                     Text [ en-US ] = "~Edit..." ; \
                 };\
             };\
@@ -667,7 +1006,7 @@ String MN_DRAW_POPUPMENU
     {\
         RadioCheck = TRUE ; \
         Identifier = FN_TOOL_ANKER_FRAME ; \
-        HelpID = FN_TOOL_ANKER_FRAME ; \
+        HelpId = CMD_FN_TOOL_ANKER_FRAME ; \
         Text [ en-US ] = "To ~Frame" ; \
     };
 
@@ -675,7 +1014,7 @@ String MN_DRAW_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_TOOL_ANKER ; \
-        HelpID = FN_TOOL_ANKER ; \
+        HelpId = CMD_FN_TOOL_ANKER ; \
         Command = ".uno:AnchorMenu" ; \
         Text [ en-US ] = "An~chor" ; \
         SubMenu = Menu\
@@ -686,28 +1025,28 @@ String MN_DRAW_POPUPMENU
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_PAGE ; \
-                    HelpID = FN_TOOL_ANKER_PAGE ; \
+                    HelpId = CMD_FN_TOOL_ANKER_PAGE ; \
                     Text [ en-US ] = "To P~age" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_PARAGRAPH ; \
-                    HelpID = FN_TOOL_ANKER_PARAGRAPH ; \
+                    HelpId = CMD_FN_TOOL_ANKER_PARAGRAPH ; \
                     Text [ en-US ] = "To ~Paragraph" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_AT_CHAR ; \
-                    HelpID = FN_TOOL_ANKER_AT_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANKER_AT_CHAR ; \
                     Text [ en-US ] = "To ~Character" ; \
                 };\
                 MenuItem\
                 {\
                     RadioCheck = TRUE ; \
                     Identifier = FN_TOOL_ANKER_CHAR ; \
-                    HelpID = FN_TOOL_ANKER_CHAR ; \
+                    HelpId = CMD_FN_TOOL_ANKER_CHAR ; \
                     Text [ en-US ] = "As C~haracter" ; \
                 };\
                 MN_AT_FRAME\
@@ -793,7 +1132,7 @@ Menu MN_DRWTXT_POPUPMENU
     MenuItem\
     {\
         Identifier = FN_DELETE_COMMENT ;\
-        HelpID = FN_DELETE_COMMENT ;\
+        HelpId = CMD_FN_DELETE_COMMENT ;\
         Text [ en-US ] = "Delete ~Changes Note" ;\
     };\
 
@@ -870,7 +1209,6 @@ String MN_GRF_POPUPMENU
     MenuItem\
     {\
         Identifier = MN_FORMAT_FRM_HORZ ; \
-        HelpID = MN_FORMAT_FRM_HORZ ; \
         Command = ".uno:AlignFrameMenu" ; \
         SubMenu = Menu\
         {\
@@ -879,38 +1217,38 @@ String MN_GRF_POPUPMENU
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_LEFT ; \
                     Text [ en-US ] = "~Left" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_CENTER ; \
                     Text [ en-US ] = "~Centered" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \
-                    HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_HORZ_RIGHT ; \
                     Text [ en-US ] = "~Right" ; \
                     };\
                 SEPARATOR ; \
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_TOP ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_TOP ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_TOP ; \
                     Text [ en-US ] = "Base at ~Top" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_CENTER ; \
                     Text [ en-US ] = "Base in ~Middle" ; \
                     };\
                 MenuItem\
                 {\
                     Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \
-                    HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \
+                    HelpId = CMD_FN_FRAME_ALIGN_VERT_BOTTOM ; \
                     Text [ en-US ] = "Base at ~Bottom" ; \
                     };\
             };\
@@ -931,13 +1269,13 @@ Menu MN_GRF_POPUPMENU
         MenuItem
         {
             Identifier = FN_FORMAT_GRAFIC_DLG ;
-            HelpID = FN_FORMAT_GRAFIC_DLG ;
+            HelpId = CMD_FN_FORMAT_GRAFIC_DLG ;
             Text [ en-US ] = "~Picture..." ;
         };
         MenuItem
         {
             Identifier = FN_SAVE_GRAPHIC;
-            HelpID = FN_SAVE_GRAPHIC;
+            HelpId = CMD_FN_SAVE_GRAPHIC;
             Text [ en-US ] = "Save Graphics..." ;
         };
         MN_FRM_CAPTION_ITEM
@@ -945,7 +1283,7 @@ Menu MN_GRF_POPUPMENU
         MenuItem
         {
             Identifier = FN_EXTERNAL_EDIT ;
-            HelpID = FN_EXTERNAL_EDIT ;
+            HelpID = CMD_FN_EXTERNAL_EDIT ;
             Text [ en-US ] = "Edit with External Tool...";
         };
         SEPARATOR;
@@ -972,13 +1310,13 @@ String MN_OLE_POPUPMENU
                 MenuItem\
                 {\
                     Identifier = FN_EXPORT_OLE_AS_PDF ;\
-                    HelpID = FN_EXPORT_OLE_AS_PDF ; \
+                    HelpID = CMD_FN_EXPORT_OLE_AS_PDF ; \
                     Text [ en-US ] = "Export as P~DF..." ; \
                 };\
                 MenuItem\
                 {\
                     Identifier = FN_EXPORT_OLE_AS_GRAPHIC ;\
-                    HelpID = FN_EXPORT_OLE_AS_GRAPHIC ; \
+                    HelpID = CMD_FN_EXPORT_OLE_AS_GRAPHIC ; \
                     Text [ en-US ] = "Export as JPG..." ; \
                 };\
             };\
@@ -997,7 +1335,7 @@ Menu MN_OLE_POPUPMENU
         MenuItem
         {
             Identifier = FN_FORMAT_FRAME_DLG ;
-            HelpID = FN_FORMAT_FRAME_DLG ;
+            HelpId = CMD_FN_FORMAT_FRAME_DLG ;
             Text [ en-US ] = "Object..." ;
         };
         SEPARATOR ;
@@ -1040,13 +1378,13 @@ Menu MN_PPREVIEW_POPUPMENU
         MenuItem
         {
             Identifier = FN_PAGEUP ;
-            HelpID = FN_PAGEUP ;
+            HelpId = CMD_FN_PAGEUP ;
             Text [ en-US ] = "Previous Page" ;
         };
         MenuItem
         {
             Identifier = FN_PAGEDOWN ;
-            HelpID = FN_PAGEDOWN ;
+            HelpId = CMD_FN_PAGEDOWN ;
             Text [ en-US ] = "Next Page" ;
         };
         MenuItem
@@ -1057,14 +1395,14 @@ Menu MN_PPREVIEW_POPUPMENU
         MenuItem
         {
             Identifier = FN_PRINT_PAGEPREVIEW ;
-            HelpID = FN_PRINT_PAGEPREVIEW ;
+            HelpId = CMD_FN_PRINT_PAGEPREVIEW ;
             Text [ en-US ] = "Print" ;
         };
         SEPARATOR ;
         MenuItem
         {
             Identifier = SID_PRINTPREVIEW;
-            HelpID =  SID_PRINTPREVIEW;
+            HelpId = CMD_SID_PRINTPREVIEW;
             Text [ en-US ] = "Close Preview" ;
         };
     };