[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 1093 commits - starmath/inc starmath/prj starmath/qa starmath/sdi starmath/source starmath/uiconfig starmath/util sw/AllLangResTarget_sw.mk sw/inc sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/Makefile sw/Module_sw.mk sw/Package_misc.mk sw/Package_uiconfig.mk sw/Package_xml.mk sw/prj sw/qa sw/sdi sw/source sw/uiconfig sw/util
Michael Meeks
mmeeks at kemper.freedesktop.org
Fri Mar 4 07:19:19 PST 2011
starmath/inc/applicat.hxx | 4
starmath/inc/dialog.hxx | 6
starmath/inc/helpids.h | 326 +
starmath/inc/node.hxx | 8
starmath/inc/smcommands.h | 68
starmath/inc/smmod.hxx | 1
starmath/inc/starmath.hrc | 315 -
starmath/inc/symbol.hxx | 9
starmath/inc/toolbox.hxx | 6
starmath/inc/utility.hxx | 4
starmath/inc/view.hxx | 2
starmath/prj/build.lst | 4
starmath/prj/d.lst | 2
starmath/qa/unoapi/knownissues.xcl | 3
starmath/sdi/smath.sdi | 4
starmath/sdi/smslots.sdi | 2
starmath/source/cfgitem.cxx | 90
starmath/source/cfgitem.hxx | 14
starmath/source/detreg.cxx | 23
starmath/source/dialog.cxx | 139
starmath/source/document.cxx | 21
starmath/source/edit.cxx | 1
starmath/source/makefile.mk | 4
starmath/source/mathmlexport.cxx | 3006 +++++-----
starmath/source/mathmlimport.cxx | 1
starmath/source/menu_tmpl.src | 160
starmath/source/node.cxx | 81
starmath/source/register.cxx | 86
starmath/source/smdetect.cxx | 16
starmath/source/smmod.cxx | 10
starmath/source/smres.src | 1905 ------
starmath/source/symbol.cxx | 3
starmath/source/toolbox.cxx | 95
starmath/source/toolbox.hrc | 14
starmath/source/toolbox.src | 1777 +++++
starmath/source/unomodel.cxx | 55
starmath/source/utility.cxx | 2
starmath/source/view.cxx | 10
starmath/uiconfig/smath/menubar/menubar.xml | 2
starmath/util/hidother.src | 3
starmath/util/makefile.mk | 17
starmath/util/sm.component | 61
starmath/util/smd.component | 34
sw/AllLangResTarget_sw.mk | 184
sw/Library_msword.mk | 142
sw/Library_sw.mk | 773 ++
sw/Library_swd.mk | 92
sw/Library_swui.mk | 195
sw/Library_vbaswobj.mk | 154
sw/Makefile | 38
sw/Module_sw.mk | 42
sw/Package_misc.mk | 30
sw/Package_uiconfig.mk | 261
sw/Package_xml.mk | 29
sw/inc/IDocumentSettingAccess.hxx | 5
sw/inc/PostItMgr.hxx | 2
sw/inc/SidebarWin.hxx | 1
sw/inc/SwNumberTree.hxx | 10
sw/inc/accmap.hxx | 3
sw/inc/authfld.hxx | 10
sw/inc/chpfld.hxx | 13
sw/inc/cmdid.h | 7
sw/inc/crsrsh.hxx | 2
sw/inc/dbfld.hxx | 18
sw/inc/dbmgr.hxx | 1
sw/inc/ddefld.hxx | 13
sw/inc/doc.hxx | 13
sw/inc/docufld.hxx | 27
sw/inc/editsh.hxx | 3
sw/inc/expfld.hxx | 40
sw/inc/fesh.hxx | 13
sw/inc/fldbas.hxx | 20
sw/inc/flddat.hxx | 12
sw/inc/flddropdown.hxx | 41
sw/inc/frmfmt.hxx | 13
sw/inc/helpid.h | 1884 +++---
sw/inc/inetfld.hxx | 13
sw/inc/makefile.mk | 49
sw/inc/modcfg.hxx | 2
sw/inc/ndarr.hxx | 10
sw/inc/ndgrf.hxx | 2
sw/inc/ndole.hxx | 6
sw/inc/ndtxt.hxx | 13
sw/inc/numrule.hxx | 2
sw/inc/pagedesc.hxx | 3
sw/inc/pch/precompiled_sw.hxx | 10
sw/inc/printdata.hxx | 34
sw/inc/reffld.hxx | 14
sw/inc/rolbck.hxx | 2
sw/inc/section.hxx | 67
sw/inc/swabstdlg.hxx | 3
sw/inc/swcli.hxx | 2
sw/inc/swcommands.h | 434 +
sw/inc/swmodule.hxx | 2
sw/inc/swprtopt.hxx | 104
sw/inc/swtable.hxx | 17
sw/inc/tblafmt.hxx | 1
sw/inc/txtfld.hxx | 3
sw/inc/undobj.hxx | 4
sw/inc/unobaseclass.hxx | 79
sw/inc/unocrsrhelper.hxx | 82
sw/inc/unoframe.hxx | 1
sw/inc/unoidx.hxx | 14
sw/inc/unomailmerge.hxx | 2
sw/inc/unoprnms.hxx | 2
sw/inc/unoredline.hxx | 2
sw/inc/unostyle.hxx | 2
sw/inc/unotxdoc.hxx | 7
sw/inc/usrfld.hxx | 13
sw/inc/viewsh.hxx | 17
sw/prj/build.lst | 81
sw/prj/d.lst | 59
sw/prj/makefile.mk | 40
sw/qa/complex/accessibility/AccessibleRelationSet.java | 173
sw/qa/complex/accessibility/makefile.mk | 43
sw/qa/complex/checkColor/CheckChangeColor.java | 121
sw/qa/complex/checkColor/makefile.mk | 61
sw/qa/complex/indeterminateState/CheckIndeterminateState.java | 133
sw/qa/complex/indeterminateState/makefile.mk | 82
sw/qa/complex/writer/CheckBookmarks.java | 127
sw/qa/complex/writer/CheckCrossReferences.java | 334 -
sw/qa/complex/writer/CheckFlies.java | 219
sw/qa/complex/writer/CheckIndexedPropertyValues.java | 184
sw/qa/complex/writer/CheckNamedPropertyValues.java | 200
sw/qa/complex/writer/LoadSaveTest.java | 254
sw/qa/complex/writer/TestDocument.java | 39
sw/qa/complex/writer/TextPortionEnumerationTest.java | 645 --
sw/qa/complex/writer/makefile.mk | 108
sw/qa/core/makefile.mk | 165
sw/qa/unoapi/knownissues.xcl | 14
sw/qa/unoapi/sw.sce | 6
sw/sdi/_annotsh.sdi | 6
sw/sdi/_docsh.sdi | 5
sw/sdi/_textsh.sdi | 8
sw/sdi/makefile.mk | 108
sw/sdi/swriter.sdi | 27
sw/source/core/SwNumberTree/SwNodeNum.cxx | 5
sw/source/core/SwNumberTree/SwNumberTree.cxx | 2
sw/source/core/SwNumberTree/makefile.mk | 50
sw/source/core/access/acccontext.cxx | 18
sw/source/core/access/accfrmobj.cxx | 93
sw/source/core/access/accfrmobj.hxx | 1
sw/source/core/access/accfrmobjmap.cxx | 34
sw/source/core/access/accfrmobjslist.cxx | 6
sw/source/core/access/accmap.cxx | 26
sw/source/core/access/makefile.mk | 100
sw/source/core/attr/makefile.mk | 58
sw/source/core/bastyp/calc.cxx | 5
sw/source/core/bastyp/makefile.mk | 79
sw/source/core/crsr/bookmrk.cxx | 11
sw/source/core/crsr/crstrvl.cxx | 8
sw/source/core/crsr/makefile.mk | 80
sw/source/core/crsr/pam.cxx | 14
sw/source/core/doc/doc.cxx | 182
sw/source/core/doc/docbasic.cxx | 4
sw/source/core/doc/doccorr.cxx | 215
sw/source/core/doc/docedt.cxx | 2
sw/source/core/doc/docfld.cxx | 50
sw/source/core/doc/docfmt.cxx | 6
sw/source/core/doc/docglbl.cxx | 4
sw/source/core/doc/docnew.cxx | 22
sw/source/core/doc/docnum.cxx | 37
sw/source/core/doc/doctxm.cxx | 8
sw/source/core/doc/makefile.mk | 92
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/doc/number.cxx | 1
sw/source/core/doc/tblrwcl.cxx | 10
sw/source/core/doc/visiturl.cxx | 4
sw/source/core/docnode/makefile.mk | 73
sw/source/core/docnode/ndtbl.cxx | 73
sw/source/core/docnode/node.cxx | 4
sw/source/core/docnode/section.cxx | 17
sw/source/core/docnode/swbaslnk.cxx | 1
sw/source/core/draw/dflyobj.cxx | 5
sw/source/core/draw/dview.cxx | 9
sw/source/core/draw/makefile.mk | 58
sw/source/core/edit/edattr.cxx | 2
sw/source/core/edit/edfld.cxx | 8
sw/source/core/edit/edlingu.cxx | 1
sw/source/core/edit/edsect.cxx | 4
sw/source/core/edit/edtox.cxx | 1
sw/source/core/edit/makefile.mk | 71
sw/source/core/except/dbgloop.cxx | 2
sw/source/core/except/errhdl.cxx | 11
sw/source/core/except/makefile.mk | 60
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/dbfld.cxx | 43
sw/source/core/fields/docufld.cxx | 71
sw/source/core/fields/expfld.cxx | 92
sw/source/core/fields/fldbas.cxx | 44
sw/source/core/fields/macrofld.cxx | 17
sw/source/core/fields/makefile.mk | 92
sw/source/core/fields/postithelper.cxx | 35
sw/source/core/fields/reffld.cxx | 5
sw/source/core/fields/tblcalc.cxx | 45
sw/source/core/fields/usrfld.cxx | 18
sw/source/core/frmedt/fecopy.cxx | 11
sw/source/core/frmedt/fefly1.cxx | 117
sw/source/core/frmedt/feshview.cxx | 36
sw/source/core/frmedt/fetab.cxx | 1
sw/source/core/frmedt/makefile.mk | 76
sw/source/core/frmedt/tblsel.cxx | 19
sw/source/core/graphic/makefile.mk | 53
sw/source/core/inc/bookmrk.hxx | 1
sw/source/core/inc/cellfrm.hxx | 7
sw/source/core/inc/flyfrm.hxx | 15
sw/source/core/inc/frame.hxx | 10
sw/source/core/inc/layfrm.hxx | 15
sw/source/core/inc/makefile.mk | 26
sw/source/core/inc/mvsave.hxx | 22
sw/source/core/inc/notxtfrm.hxx | 7
sw/source/core/inc/rootfrm.hxx | 10
sw/source/core/inc/scriptinfo.hxx | 52
sw/source/core/inc/tabfrm.hxx | 9
sw/source/core/inc/txmsrt.hxx | 22
sw/source/core/inc/txtfrm.hxx | 8
sw/source/core/inc/viewimp.hxx | 13
sw/source/core/layout/dbg_lay.cxx | 2
sw/source/core/layout/fly.cxx | 11
sw/source/core/layout/layact.cxx | 14
sw/source/core/layout/laycache.cxx | 16
sw/source/core/layout/layhelp.hxx | 4
sw/source/core/layout/makefile.mk | 101
sw/source/core/layout/paintfrm.cxx | 22
sw/source/core/layout/ssfrm.cxx | 13
sw/source/core/layout/trvlfrm.cxx | 14
sw/source/core/layout/unusedf.cxx | 4
sw/source/core/layout/wsfrm.cxx | 2
sw/source/core/makefile.mk | 110
sw/source/core/objectpositioning/makefile.mk | 62
sw/source/core/ole/makefile.mk | 55
sw/source/core/ole/ndole.cxx | 18
sw/source/core/para/makefile.mk | 57
sw/source/core/sw3io/makefile.mk | 52
sw/source/core/swg/makefile.mk | 57
sw/source/core/table/makefile.mk | 48
sw/source/core/text/frmcrsr.cxx | 2
sw/source/core/text/frmpaint.cxx | 2
sw/source/core/text/itratr.cxx | 4
sw/source/core/text/makefile.mk | 104
sw/source/core/text/porlay.cxx | 119
sw/source/core/text/pormulti.cxx | 102
sw/source/core/text/txtfld.cxx | 91
sw/source/core/text/txtfly.cxx | 6
sw/source/core/text/txtio.cxx | 6
sw/source/core/tox/makefile.mk | 56
sw/source/core/tox/txmsrt.cxx | 23
sw/source/core/txtnode/atrfld.cxx | 4
sw/source/core/txtnode/fntcache.cxx | 4
sw/source/core/txtnode/makefile.mk | 77
sw/source/core/txtnode/ndtxt.cxx | 35
sw/source/core/txtnode/swfont.cxx | 7
sw/source/core/txtnode/thints.cxx | 18
sw/source/core/txtnode/txtatr2.cxx | 10
sw/source/core/txtnode/txtedt.cxx | 184
sw/source/core/undo/makefile.mk | 81
sw/source/core/undo/rolbck.cxx | 8
sw/source/core/undo/undo.src | 2
sw/source/core/undo/unnum.cxx | 15
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/SwXTextDefaults.cxx | 2
sw/source/core/unocore/makefile.mk | 124
sw/source/core/unocore/unobkm.cxx | 33
sw/source/core/unocore/unocoll.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 1
sw/source/core/unocore/unofield.cxx | 15
sw/source/core/unocore/unoflatpara.cxx | 3
sw/source/core/unocore/unoportenum.cxx | 1
sw/source/core/unocore/unosrch.cxx | 62
sw/source/core/unocore/unostyle.cxx | 11
sw/source/core/unocore/unotbl.cxx | 44
sw/source/core/view/makefile.mk | 61
sw/source/core/view/printdata.cxx | 210
sw/source/core/view/vdraw.cxx | 9
sw/source/core/view/viewpg.cxx | 6
sw/source/core/view/viewsh.cxx | 4
sw/source/core/view/vprint.cxx | 150
sw/source/filter/ascii/ascatr.cxx | 6
sw/source/filter/ascii/makefile.mk | 57
sw/source/filter/ascii/parasc.cxx | 20
sw/source/filter/ascii/wrtasc.cxx | 2
sw/source/filter/basflt/fltini.cxx | 1862 +++---
sw/source/filter/basflt/makefile.mk | 57
sw/source/filter/basflt/shellio.cxx | 6
sw/source/filter/html/css1atr.cxx | 1
sw/source/filter/html/htmlatr.cxx | 16
sw/source/filter/html/htmlcss1.cxx | 1
sw/source/filter/html/htmlfldw.cxx | 2
sw/source/filter/html/htmlfly.cxx | 8
sw/source/filter/html/htmlform.cxx | 8
sw/source/filter/html/htmlgrin.cxx | 18
sw/source/filter/html/htmltab.cxx | 1
sw/source/filter/html/htmltabw.cxx | 14
sw/source/filter/html/makefile.mk | 79
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/html/swhtml.hxx | 4
sw/source/filter/inc/makefile.mk | 26
sw/source/filter/inc/wrtswtbl.hxx | 36
sw/source/filter/makefile.mk | 67
sw/source/filter/rtf/makefile.mk | 60
sw/source/filter/rtf/rtfnum.cxx | 55
sw/source/filter/rtf/rtftbl.cxx | 92
sw/source/filter/rtf/swparrtf.cxx | 45
sw/source/filter/rtf/swparrtf.hxx | 6
sw/source/filter/writer/makefile.mk | 58
sw/source/filter/writer/writer.cxx | 6
sw/source/filter/writer/wrtswtbl.cxx | 40
sw/source/filter/ww1/makefile.mk | 93
sw/source/filter/ww1/w1filter.cxx | 3
sw/source/filter/ww8/README-rtf.txt | 31
sw/source/filter/ww8/WW8TableInfo.cxx | 543 +
sw/source/filter/ww8/attributeoutputbase.hxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 7
sw/source/filter/ww8/docxexport.cxx | 5
sw/source/filter/ww8/docxexportfilter.cxx | 52
sw/source/filter/ww8/docxfootnotes.hxx | 1
sw/source/filter/ww8/dump/msvbasic.cxx | 536 +
sw/source/filter/ww8/dump/msvbasic.hxx | 102
sw/source/filter/ww8/makefile.mk | 91
sw/source/filter/ww8/rtfattributeoutput.cxx | 7
sw/source/filter/ww8/rtfattributeoutput.hxx | 1
sw/source/filter/ww8/rtfexportfilter.cxx | 53
sw/source/filter/ww8/rtfexportfilter.hxx | 1
sw/source/filter/ww8/rtfimportfilter.cxx | 1
sw/source/filter/ww8/rtfimportfilter.hxx | 1
sw/source/filter/ww8/rtfsdrexport.cxx | 1
sw/source/filter/ww8/rtfsdrexport.hxx | 1
sw/source/filter/ww8/wrtw8esh.cxx | 3
sw/source/filter/ww8/wrtw8nds.cxx | 14
sw/source/filter/ww8/wrtw8sty.cxx | 33
sw/source/filter/ww8/wrtww8.cxx | 144
sw/source/filter/ww8/wrtww8.hxx | 55
sw/source/filter/ww8/wrtww8gr.cxx | 4
sw/source/filter/ww8/ww8atr.cxx | 6
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 1
sw/source/filter/ww8/ww8par.cxx | 177
sw/source/filter/ww8/ww8par2.cxx | 3
sw/source/filter/ww8/ww8par3.cxx | 2
sw/source/filter/ww8/ww8par5.cxx | 4
sw/source/filter/ww8/ww8par6.cxx | 1
sw/source/filter/xml/makefile.mk | 76
sw/source/filter/xml/xmlexp.cxx | 4
sw/source/filter/xml/xmlfonte.cxx | 6
sw/source/filter/xml/xmliteme.cxx | 2
sw/source/filter/xml/xmlitemi.cxx | 1
sw/source/filter/xml/xmltble.cxx | 36
sw/source/filter/xml/xmltbli.cxx | 6
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/app/apphdl.cxx | 2
sw/source/ui/app/applab.cxx | 2
sw/source/ui/app/appopt.cxx | 63
sw/source/ui/app/docsh.cxx | 61
sw/source/ui/app/docsh2.cxx | 51
sw/source/ui/app/docshini.cxx | 49
sw/source/ui/app/makefile.mk | 95
sw/source/ui/app/mn.src | 504 +
sw/source/ui/cctrl/makefile.mk | 59
sw/source/ui/chrdlg/break.cxx | 2
sw/source/ui/chrdlg/ccoll.src | 5
sw/source/ui/chrdlg/chardlg.src | 8
sw/source/ui/chrdlg/drpcps.cxx | 14
sw/source/ui/chrdlg/drpcps.src | 7
sw/source/ui/chrdlg/makefile.mk | 72
sw/source/ui/chrdlg/numpara.src | 8
sw/source/ui/chrdlg/swbreak.src | 8
sw/source/ui/chrdlg/swuiccoll.cxx | 2
sw/source/ui/config/cfgitems.cxx | 2
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/mailconfigpage.src | 22
sw/source/ui/config/makefile.mk | 87
sw/source/ui/config/modcfg.cxx | 1
sw/source/ui/config/optcomp.cxx | 2
sw/source/ui/config/optcomp.src | 3
sw/source/ui/config/optdlg.hrc | 15
sw/source/ui/config/optdlg.src | 107
sw/source/ui/config/optload.src | 18
sw/source/ui/config/optpage.cxx | 135
sw/source/ui/config/prtopt.cxx | 3
sw/source/ui/config/redlopt.src | 8
sw/source/ui/config/usrpref.cxx | 147
sw/source/ui/dbui/addresslistdialog.cxx | 2
sw/source/ui/dbui/addresslistdialog.src | 5
sw/source/ui/dbui/createaddresslistdialog.src | 13
sw/source/ui/dbui/customizeaddresslistdialog.src | 7
sw/source/ui/dbui/dbinsdlg.src | 21
sw/source/ui/dbui/dbmgr.cxx | 50
sw/source/ui/dbui/dbtree.cxx | 4
sw/source/ui/dbui/dbui.src | 1
sw/source/ui/dbui/mailmergechildwindow.cxx | 2
sw/source/ui/dbui/mailmergechildwindow.src | 1
sw/source/ui/dbui/mailmergewizard.src | 1
sw/source/ui/dbui/makefile.mk | 108
sw/source/ui/dbui/mmaddressblockpage.cxx | 23
sw/source/ui/dbui/mmaddressblockpage.src | 23
sw/source/ui/dbui/mmdocselectpage.src | 8
sw/source/ui/dbui/mmgreetingspage.src | 6
sw/source/ui/dbui/mmlayoutpage.src | 6
sw/source/ui/dbui/mmmergepage.src | 6
sw/source/ui/dbui/mmoutputpage.cxx | 31
sw/source/ui/dbui/mmoutputpage.src | 27
sw/source/ui/dbui/mmoutputtypepage.src | 2
sw/source/ui/dbui/mmpreparemergepage.src | 7
sw/source/ui/dbui/selectdbtabledialog.cxx | 2
sw/source/ui/dbui/selectdbtabledialog.src | 1
sw/source/ui/dialog/abstract.src | 2
sw/source/ui/dialog/ascfldlg.cxx | 22
sw/source/ui/dialog/ascfldlg.src | 6
sw/source/ui/dialog/docstdlg.src | 1
sw/source/ui/dialog/makefile.mk | 99
sw/source/ui/dialog/regionsw.src | 44
sw/source/ui/dialog/swabstdlg.cxx | 5
sw/source/ui/dialog/swdlgfact.cxx | 4
sw/source/ui/dialog/swdlgfact.hxx | 5
sw/source/ui/dialog/uiregionsw.cxx | 2
sw/source/ui/dochdl/makefile.mk | 65
sw/source/ui/dochdl/selglos.src | 3
sw/source/ui/dochdl/swdtflvr.cxx | 38
sw/source/ui/docvw/AnnotationMenuButton.cxx | 11
sw/source/ui/docvw/PostItMgr.cxx | 15
sw/source/ui/docvw/docvw.src | 22
sw/source/ui/docvw/edtwin.cxx | 18
sw/source/ui/docvw/edtwin2.cxx | 5
sw/source/ui/docvw/frmsidebarwincontainer.hxx | 4
sw/source/ui/docvw/makefile.mk | 70
sw/source/ui/docvw/srcedtw.cxx | 33
sw/source/ui/envelp/envfmt.src | 9
sw/source/ui/envelp/envimg.cxx | 2
sw/source/ui/envelp/envlop.src | 7
sw/source/ui/envelp/envlop1.cxx | 6
sw/source/ui/envelp/envprt.src | 17
sw/source/ui/envelp/label.src | 44
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labfmt.src | 11
sw/source/ui/envelp/labprt.src | 6
sw/source/ui/envelp/mailmrge.cxx | 2
sw/source/ui/envelp/mailmrge.src | 29
sw/source/ui/envelp/makefile.mk | 79
sw/source/ui/fldui/DropDownFieldDialog.cxx | 6
sw/source/ui/fldui/DropDownFieldDialog.src | 3
sw/source/ui/fldui/changedb.cxx | 4
sw/source/ui/fldui/changedb.src | 2
sw/source/ui/fldui/flddb.src | 8
sw/source/ui/fldui/flddinf.cxx | 7
sw/source/ui/fldui/flddinf.src | 3
sw/source/ui/fldui/flddok.src | 8
sw/source/ui/fldui/fldedt.cxx | 17
sw/source/ui/fldui/fldfunc.src | 15
sw/source/ui/fldui/fldmgr.cxx | 2
sw/source/ui/fldui/fldref.cxx | 2
sw/source/ui/fldui/fldref.src | 5
sw/source/ui/fldui/fldvar.src | 9
sw/source/ui/fldui/inpdlg.cxx | 8
sw/source/ui/fldui/inpdlg.src | 3
sw/source/ui/fldui/javaedit.src | 9
sw/source/ui/fldui/makefile.mk | 90
sw/source/ui/fmtui/fmtui.src | 88
sw/source/ui/fmtui/makefile.mk | 54
sw/source/ui/fmtui/tmpdlg.cxx | 2
sw/source/ui/frmdlg/column.src | 15
sw/source/ui/frmdlg/cption.src | 13
sw/source/ui/frmdlg/frmdlg.cxx | 3
sw/source/ui/frmdlg/frmpage.cxx | 47
sw/source/ui/frmdlg/frmpage.src | 44
sw/source/ui/frmdlg/makefile.mk | 78
sw/source/ui/frmdlg/wrap.src | 14
sw/source/ui/globdoc/makefile.mk | 54
sw/source/ui/inc/SidebarWindowsConsts.hxx | 2
sw/source/ui/inc/column.hxx | 2
sw/source/ui/inc/envlop.hxx | 2
sw/source/ui/inc/fldedt.hxx | 2
sw/source/ui/inc/frmdlg.hxx | 1
sw/source/ui/inc/frmpage.hxx | 5
sw/source/ui/inc/javaedit.hxx | 2
sw/source/ui/inc/makefile.mk | 42
sw/source/ui/inc/optpage.hxx | 12
sw/source/ui/inc/pview.hxx | 1
sw/source/ui/inc/regionsw.hxx | 1
sw/source/ui/inc/ribbar.hrc | 3
sw/source/ui/inc/split.hxx | 2
sw/source/ui/inc/swdtflvr.hxx | 2
sw/source/ui/inc/swlbox.hxx | 4
sw/source/ui/inc/swmn_tmpl.hrc | 386 -
sw/source/ui/inc/swuicnttab.hxx | 2
sw/source/ui/inc/swuiidxmrk.hxx | 2
sw/source/ui/inc/toolbox.hrc | 563 +
sw/source/ui/inc/toolbox_tmpl.hrc | 563 -
sw/source/ui/inc/uitool.hxx | 2
sw/source/ui/inc/uivwimp.hxx | 7
sw/source/ui/inc/unotxvw.hxx | 2
sw/source/ui/inc/usrpref.hxx | 11
sw/source/ui/inc/view.hxx | 11
sw/source/ui/inc/workctrl.hxx | 2
sw/source/ui/inc/wrap.hxx | 2
sw/source/ui/index/cnttab.cxx | 41
sw/source/ui/index/cnttab.src | 72
sw/source/ui/index/idxmrk.src | 13
sw/source/ui/index/makefile.mk | 67
sw/source/ui/index/multmrk.src | 3
sw/source/ui/index/swuiidxmrk.cxx | 8
sw/source/ui/lingu/makefile.mk | 56
sw/source/ui/lingu/olmenu.cxx | 39
sw/source/ui/makefile.mk | 101
sw/source/ui/misc/bookmark.src | 4
sw/source/ui/misc/docfnote.cxx | 2
sw/source/ui/misc/docfnote.src | 26
sw/source/ui/misc/glosbib.cxx | 2
sw/source/ui/misc/glosbib.src | 5
sw/source/ui/misc/glossary.cxx | 2
sw/source/ui/misc/glossary.src | 15
sw/source/ui/misc/insfnote.src | 9
sw/source/ui/misc/linenum.src | 11
sw/source/ui/misc/makefile.mk | 93
sw/source/ui/misc/num.src | 12
sw/source/ui/misc/outline.src | 10
sw/source/ui/misc/pgfnote.src | 8
sw/source/ui/misc/pggrid.src | 13
sw/source/ui/misc/redlndlg.cxx | 2
sw/source/ui/misc/srtdlg.src | 25
sw/source/ui/ribbar/inputwin.cxx | 21
sw/source/ui/ribbar/inputwin.src | 12
sw/source/ui/ribbar/makefile.mk | 69
sw/source/ui/ribbar/tblctrl.src | 94
sw/source/ui/ribbar/workctrl.cxx | 2
sw/source/ui/ribbar/workctrl.src | 183
sw/source/ui/shells/annotsh.cxx | 15
sw/source/ui/shells/basesh.cxx | 10
sw/source/ui/shells/drwtxtex.cxx | 29
sw/source/ui/shells/frmsh.cxx | 23
sw/source/ui/shells/makefile.mk | 84
sw/source/ui/shells/shells.src | 834 --
sw/source/ui/shells/tabsh.cxx | 7
sw/source/ui/shells/textfld.cxx | 6
sw/source/ui/shells/textidx.cxx | 2
sw/source/ui/shells/textsh.cxx | 69
sw/source/ui/shells/textsh1.cxx | 8
sw/source/ui/shells/txtcrsr.cxx | 4
sw/source/ui/smartmenu/makefile.mk | 53
sw/source/ui/table/chartins.src | 6
sw/source/ui/table/colwd.src | 4
sw/source/ui/table/convert.src | 14
sw/source/ui/table/instable.src | 11
sw/source/ui/table/makefile.mk | 81
sw/source/ui/table/mergetbl.src | 4
sw/source/ui/table/rowht.src | 4
sw/source/ui/table/splittbl.src | 6
sw/source/ui/table/tabledlg.cxx | 2
sw/source/ui/table/tabledlg.src | 40
sw/source/ui/table/tablepg.hxx | 2
sw/source/ui/table/tautofmt.src | 11
sw/source/ui/uiview/makefile.mk | 77
sw/source/ui/uiview/pview.cxx | 31
sw/source/ui/uiview/pview.src | 91
sw/source/ui/uiview/srcview.cxx | 7
sw/source/ui/uiview/swcli.cxx | 17
sw/source/ui/uiview/uivwimp.cxx | 2
sw/source/ui/uiview/view.cxx | 34
sw/source/ui/uiview/view.src | 154
sw/source/ui/uiview/view2.cxx | 7
sw/source/ui/uiview/viewdlg2.cxx | 4
sw/source/ui/uiview/viewfunc.hxx | 2
sw/source/ui/uiview/viewling.cxx | 139
sw/source/ui/uiview/viewprt.cxx | 30
sw/source/ui/uiview/viewstat.cxx | 2
sw/source/ui/uiview/viewtab.cxx | 12
sw/source/ui/uno/SwXDocumentSettings.cxx | 33
sw/source/ui/uno/SwXPrintPreviewSettings.cxx | 370 -
sw/source/ui/uno/SwXPrintPreviewSettings.hxx | 90
sw/source/ui/uno/detreg.cxx | 24
sw/source/ui/uno/makefile.mk | 82
sw/source/ui/uno/swdetect.cxx | 13
sw/source/ui/uno/unoatxt.cxx | 1
sw/source/ui/uno/unofreg.cxx | 93
sw/source/ui/uno/unomailmerge.cxx | 1
sw/source/ui/uno/unomod.cxx | 18
sw/source/ui/uno/unotxdoc.cxx | 45
sw/source/ui/uno/unotxvw.cxx | 9
sw/source/ui/utlui/content.cxx | 11
sw/source/ui/utlui/glbltree.cxx | 2
sw/source/ui/utlui/gloslst.src | 1
sw/source/ui/utlui/makefile.mk | 79
sw/source/ui/utlui/navipi.cxx | 13
sw/source/ui/utlui/unotools.cxx | 1
sw/source/ui/utlui/unotools.src | 1
sw/source/ui/utlui/utlui.src | 4
sw/source/ui/vba/makefile.mk | 140
sw/source/ui/vba/service.cxx | 14
sw/source/ui/vba/vbadocuments.cxx | 27
sw/source/ui/vba/vbadocuments.hxx | 5
sw/source/ui/vba/vbafind.hxx | 2
sw/source/ui/vba/vbaheaderfooterhelper.cxx | 3
sw/source/ui/vba/vbarange.hxx | 2
sw/source/ui/web/makefile.mk | 62
sw/source/ui/web/web.src | 262
sw/source/ui/web/wtextsh.cxx | 2
sw/source/ui/web/wview.cxx | 1
sw/source/ui/wrtsh/makefile.mk | 62
sw/source/ui/wrtsh/wrtsh1.cxx | 69
sw/source/ui/wrtsh/wrtundo.cxx | 8
sw/uiconfig/layout/makefile.mk | 46
sw/util/hidother.src | 18
sw/util/makefile.mk | 391 -
sw/util/msword.component | 37
sw/util/msword.map | 14
sw/util/sw.component | 104
sw/util/sw.flt | 136
sw/util/swd.component | 36
sw/util/swui.map | 6
sw/util/vbaswobj.component | 43
609 files changed, 17309 insertions(+), 19393 deletions(-)
New commits:
commit d7206332626870bf2b4460f6b52af031cc625d22
Merge: 91efc27... 5824c86...
Author: Michael Meeks <michael.meeks at novell.com>
Date: Fri Mar 4 14:57:45 2011 +0000
Merge remote branch 'stage/ooo/dev300_m98_fixed' into integration/dev300_m98
Conflicts:
starmath/inc/dialog.hxx
starmath/inc/format.hxx
starmath/inc/node.hxx
starmath/inc/parse.hxx
starmath/inc/starmath.hrc
starmath/inc/symbol.hxx
starmath/inc/view.hxx
starmath/prj/build.lst
starmath/qa/unoapi/knownissues.xcl
starmath/sdi/smslots.sdi
starmath/source/cfgitem.cxx
starmath/source/cfgitem.hxx
starmath/source/dialog.cxx
starmath/source/document.cxx
starmath/source/edit.cxx
starmath/source/format.cxx
starmath/source/makefile.mk
starmath/source/math_pch.cxx
starmath/source/mathmlexport.cxx
starmath/source/mathmlexport.hxx
starmath/source/mathmlimport.cxx
starmath/source/mathmlimport.hxx
starmath/source/menu_tmpl.src
starmath/source/node.cxx
starmath/source/parse.cxx
starmath/source/smdll.cxx
starmath/source/smmod.cxx
starmath/source/smres.src
starmath/source/symbol.cxx
starmath/source/toolbox.cxx
starmath/source/types.cxx
starmath/source/unomodel.cxx
starmath/source/view.cxx
starmath/uiconfig/smath/menubar/menubar.xml
sw/Module_sw.mk
sw/Package_xml.mk
sw/inc/AnnotationWin.hxx
sw/inc/IDocumentLinksAdministration.hxx
sw/inc/IDocumentSettingAccess.hxx
sw/inc/IMark.hxx
sw/inc/PostItMgr.hxx
sw/inc/SidebarWin.hxx
sw/inc/SidebarWindowsTypes.hxx
sw/inc/SwNumberTree.hxx
sw/inc/accmap.hxx
sw/inc/anchoreddrawobject.hxx
sw/inc/chpfld.hxx
sw/inc/cmdid.h
sw/inc/comcore.hrc
sw/inc/crsrsh.hxx
sw/inc/dbfld.hxx
sw/inc/ddefld.hxx
sw/inc/doc.hxx
sw/inc/docsh.hxx
sw/inc/docufld.hxx
sw/inc/editsh.hxx
sw/inc/expfld.hxx
sw/inc/fesh.hxx
sw/inc/fldbas.hxx
sw/inc/flddat.hxx
sw/inc/fmtcol.hxx
sw/inc/frmfmt.hxx
sw/inc/helpid.h
sw/inc/hintids.hxx
sw/inc/lineinfo.hxx
sw/inc/makefile.mk
sw/inc/ndarr.hxx
sw/inc/ndgrf.hxx
sw/inc/ndole.hxx
sw/inc/ndtxt.hxx
sw/inc/numrule.hxx
sw/inc/pagedesc.hxx
sw/inc/pagepreviewlayout.hxx
sw/inc/pch/precompiled_sw.hxx
sw/inc/postithelper.hxx
sw/inc/printdata.hxx
sw/inc/reffld.hxx
sw/inc/rolbck.hxx
sw/inc/section.hxx
sw/inc/swabstdlg.hxx
sw/inc/swprtopt.hxx
sw/inc/swtable.hxx
sw/inc/tblafmt.hxx
sw/inc/tox.hxx
sw/inc/txtfld.hxx
sw/inc/undobj.hxx
sw/inc/unobaseclass.hxx
sw/inc/unobookmark.hxx
sw/inc/unocrsrhelper.hxx
sw/inc/unofootnote.hxx
sw/inc/unoframe.hxx
sw/inc/unoidx.hxx
sw/inc/unoparaframeenum.hxx
sw/inc/unoparagraph.hxx
sw/inc/unoprnms.hxx
sw/inc/unoredline.hxx
sw/inc/unoredlines.hxx
sw/inc/unorefmark.hxx
sw/inc/unosection.hxx
sw/inc/unostyle.hxx
sw/inc/unotext.hxx
sw/inc/unotextbodyhf.hxx
sw/inc/unotextcursor.hxx
sw/inc/unotextrange.hxx
sw/inc/unotxdoc.hxx
sw/inc/usrfld.hxx
sw/inc/viewsh.hxx
sw/inc/warnpassword.hxx
sw/prj/build.lst
sw/prj/d.lst
sw/qa/complex/indeterminateState/makefile.mk
sw/qa/complex/writer/TextPortionEnumerationTest.java
sw/qa/complex/writer/makefile.mk
sw/qa/core/makefile.mk
sw/qa/unoapi/knownissues.xcl
sw/sdi/makefile.mk
sw/source/core/SwNumberTree/SwNodeNum.cxx
sw/source/core/SwNumberTree/SwNumberTree.cxx
sw/source/core/SwNumberTree/makefile.mk
sw/source/core/access/acccell.cxx
sw/source/core/access/acccontext.cxx
sw/source/core/access/accframe.cxx
sw/source/core/access/accfrmobj.cxx
sw/source/core/access/accfrmobj.hxx
sw/source/core/access/accfrmobjmap.cxx
sw/source/core/access/accfrmobjslist.cxx
sw/source/core/access/accfrmobjslist.hxx
sw/source/core/access/accmap.cxx
sw/source/core/access/accpara.cxx
sw/source/core/access/accselectionhelper.cxx
sw/source/core/access/acctable.cxx
sw/source/core/access/makefile.mk
sw/source/core/access/parachangetrackinginfo.cxx
sw/source/core/access/parachangetrackinginfo.hxx
sw/source/core/access/textmarkuphelper.cxx
sw/source/core/attr/cellatr.cxx
sw/source/core/attr/hints.cxx
sw/source/core/attr/makefile.mk
sw/source/core/bastyp/breakit.cxx
sw/source/core/bastyp/calc.cxx
sw/source/core/bastyp/init.cxx
sw/source/core/bastyp/makefile.mk
sw/source/core/crsr/bookmrk.cxx
sw/source/core/crsr/callnk.cxx
sw/source/core/crsr/findtxt.cxx
sw/source/core/crsr/makefile.mk
sw/source/core/crsr/pam.cxx
sw/source/core/doc/SwStyleNameMapper.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/doccomp.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docedt.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/doc/docglbl.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/docredln.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/makefile.mk
sw/source/core/doc/notxtfrm.cxx
sw/source/core/doc/number.cxx
sw/source/core/doc/tblrwcl.cxx
sw/source/core/docnode/makefile.mk
sw/source/core/docnode/ndsect.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/section.cxx
sw/source/core/docnode/swbaslnk.cxx
sw/source/core/draw/dflyobj.cxx
sw/source/core/draw/dview.cxx
sw/source/core/draw/makefile.mk
sw/source/core/edit/acorrect.cxx
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/edattr.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/edsect.cxx
sw/source/core/edit/edtox.cxx
sw/source/core/edit/makefile.mk
sw/source/core/except/dbgloop.cxx
sw/source/core/except/makefile.mk
sw/source/core/fields/cellfml.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/fields/makefile.mk
sw/source/core/fields/postithelper.cxx
sw/source/core/fields/tblcalc.cxx
sw/source/core/fields/usrfld.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/frmedt/makefile.mk
sw/source/core/frmedt/tblsel.cxx
sw/source/core/graphic/makefile.mk
sw/source/core/inc/bookmrk.hxx
sw/source/core/inc/layfrm.hxx
sw/source/core/inc/scriptinfo.hxx
sw/source/core/inc/swfont.hxx
sw/source/core/inc/tabfrm.hxx
sw/source/core/inc/txmsrt.hxx
sw/source/core/inc/unoclbck.hxx
sw/source/core/inc/viewimp.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/layout/dbg_lay.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/flyincnt.cxx
sw/source/core/layout/layact.cxx
sw/source/core/layout/laycache.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/paintfrm.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/layout/trvlfrm.cxx
sw/source/core/layout/wsfrm.cxx
sw/source/core/makefile.mk
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
sw/source/core/objectpositioning/makefile.mk
sw/source/core/ole/makefile.mk
sw/source/core/ole/ndole.cxx
sw/source/core/para/makefile.mk
sw/source/core/sw3io/makefile.mk
sw/source/core/swg/makefile.mk
sw/source/core/table/makefile.mk
sw/source/core/table/swtable.cxx
sw/source/core/text/frmpaint.cxx
sw/source/core/text/inftxt.cxx
sw/source/core/text/inftxt.hxx
sw/source/core/text/itrform2.cxx
sw/source/core/text/makefile.mk
sw/source/core/text/porfld.cxx
sw/source/core/text/portxt.cxx
sw/source/core/text/txtfld.cxx
sw/source/core/text/txtfly.cxx
sw/source/core/text/txtio.cxx
sw/source/core/text/txttab.cxx
sw/source/core/tox/makefile.mk
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/atrfld.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/fntcap.cxx
sw/source/core/txtnode/makefile.mk
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/swfont.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/txtnode/txtatr2.cxx
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/makefile.mk
sw/source/core/undo/rolbck.cxx
sw/source/core/undo/undel.cxx
sw/source/core/undo/unmove.cxx
sw/source/core/undo/unnum.cxx
sw/source/core/undo/unsect.cxx
sw/source/core/unocore/SwXTextDefaults.cxx
sw/source/core/unocore/makefile.mk
sw/source/core/unocore/unobkm.cxx
sw/source/core/unocore/unocoll.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoflatpara.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoftn.cxx
sw/source/core/unocore/unoidx.cxx
sw/source/core/unocore/unoobj.cxx
sw/source/core/unocore/unoobj2.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/core/unocore/unoportenum.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/core/unocore/unoredline.cxx
sw/source/core/unocore/unoredlines.cxx
sw/source/core/unocore/unorefmk.cxx
sw/source/core/unocore/unosect.cxx
sw/source/core/unocore/unosrch.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/core/unocore/unotbl.cxx
sw/source/core/unocore/unotext.cxx
sw/source/core/view/makefile.mk
sw/source/core/view/printdata.cxx
sw/source/core/view/vdraw.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewpg.cxx
sw/source/core/view/viewsh.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ascii/ascatr.cxx
sw/source/filter/ascii/makefile.mk
sw/source/filter/basflt/fltini.cxx
sw/source/filter/basflt/makefile.mk
sw/source/filter/html/css1atr.cxx
sw/source/filter/html/htmlcss1.cxx
sw/source/filter/html/htmlfldw.cxx
sw/source/filter/html/htmlgrin.cxx
sw/source/filter/html/htmltab.cxx
sw/source/filter/html/htmltabw.cxx
sw/source/filter/html/makefile.mk
sw/source/filter/html/parcss1.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/makefile.mk
sw/source/filter/rtf/makefile.mk
sw/source/filter/rtf/rtfnum.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/filter/rtf/swparrtf.cxx
sw/source/filter/rtf/swparrtf.hxx
sw/source/filter/writer/makefile.mk
sw/source/filter/writer/writer.cxx
sw/source/filter/writer/wrtswtbl.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/makefile.mk
sw/source/filter/ww1/w1filter.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/README-rtf.txt
sw/source/filter/ww8/WW8Sttbf.cxx
sw/source/filter/ww8/WW8TableInfo.cxx
sw/source/filter/ww8/attributeoutputbase.hxx
sw/source/filter/ww8/docxattributeoutput.cxx
sw/source/filter/ww8/docxexport.cxx
sw/source/filter/ww8/docxexport.hxx
sw/source/filter/ww8/docxexportfilter.cxx
sw/source/filter/ww8/dump/dump8.cxx
sw/source/filter/ww8/dump/dump8a.cxx
sw/source/filter/ww8/dump/msvbasic.cxx
sw/source/filter/ww8/dump/msvbasic.hxx
sw/source/filter/ww8/dump/ww8darr.cxx
sw/source/filter/ww8/dump/ww8dout.cxx
sw/source/filter/ww8/dump/ww8dout.hxx
sw/source/filter/ww8/dump/ww8scan.cxx
sw/source/filter/ww8/dump/ww8scan.hxx
sw/source/filter/ww8/dump/ww8struc.hxx
sw/source/filter/ww8/makefile.mk
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.hxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/filter/ww8/rtfexport.hxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/filter/ww8/rtfexportfilter.hxx
sw/source/filter/ww8/rtfimportfilter.cxx
sw/source/filter/ww8/rtfimportfilter.hxx
sw/source/filter/ww8/rtfsdrexport.cxx
sw/source/filter/ww8/rtfsdrexport.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/writerhelper.hxx
sw/source/filter/ww8/writerwordglue.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8sty.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/wrtww8.hxx
sw/source/filter/ww8/wrtww8gr.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8graf.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/ww8/ww8scan.cxx
sw/source/filter/xml/XMLRedlineImportHelper.cxx
sw/source/filter/xml/makefile.mk
sw/source/filter/xml/xmlexp.cxx
sw/source/filter/xml/xmlexp.hxx
sw/source/filter/xml/xmliteme.cxx
sw/source/filter/xml/xmlitemi.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/ui/app/app.src
sw/source/ui/app/appenv.cxx
sw/source/ui/app/applab.cxx
sw/source/ui/app/appopt.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docstyle.cxx
sw/source/ui/app/makefile.mk
sw/source/ui/app/mn.src
sw/source/ui/app/swmodule.cxx
sw/source/ui/cctrl/makefile.mk
sw/source/ui/chrdlg/chardlg.cxx
sw/source/ui/chrdlg/drpcps.cxx
sw/source/ui/chrdlg/makefile.mk
sw/source/ui/chrdlg/swuiccoll.cxx
sw/source/ui/config/cfgitems.cxx
sw/source/ui/config/makefile.mk
sw/source/ui/config/modcfg.cxx
sw/source/ui/config/optdlg.src
sw/source/ui/config/optpage.cxx
sw/source/ui/config/prtopt.cxx
sw/source/ui/config/uinums.cxx
sw/source/ui/config/usrpref.cxx
sw/source/ui/config/viewopt.cxx
sw/source/ui/dbui/dbmgr.cxx
sw/source/ui/dbui/dbtree.cxx
sw/source/ui/dbui/makefile.mk
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dbui/mmdocselectpage.cxx
sw/source/ui/dbui/mmgreetingspage.cxx
sw/source/ui/dbui/mmlayoutpage.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx
sw/source/ui/dialog/makefile.mk
sw/source/ui/dialog/regionsw.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/dochdl/makefile.mk
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/docvw/AnchorOverlayObject.cxx
sw/source/ui/docvw/AnchorOverlayObject.hxx
sw/source/ui/docvw/AnnotationMenuButton.cxx
sw/source/ui/docvw/AnnotationMenuButton.hxx
sw/source/ui/docvw/AnnotationWin.cxx
sw/source/ui/docvw/PostItMgr.cxx
sw/source/ui/docvw/ShadowOverlayObject.cxx
sw/source/ui/docvw/ShadowOverlayObject.hxx
sw/source/ui/docvw/SidebarTxtControl.cxx
sw/source/ui/docvw/SidebarTxtControl.hxx
sw/source/ui/docvw/SidebarTxtControlAcc.cxx
sw/source/ui/docvw/SidebarTxtControlAcc.hxx
sw/source/ui/docvw/SidebarWin.cxx
sw/source/ui/docvw/SidebarWinAcc.cxx
sw/source/ui/docvw/SidebarWinAcc.hxx
sw/source/ui/docvw/annotation.hrc
sw/source/ui/docvw/annotation.src
sw/source/ui/docvw/edtdd.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/docvw/frmsidebarwincontainer.cxx
sw/source/ui/docvw/frmsidebarwincontainer.hxx
sw/source/ui/docvw/makefile.mk
sw/source/ui/docvw/srcedtw.cxx
sw/source/ui/envelp/envfmt.cxx
sw/source/ui/envelp/makefile.mk
sw/source/ui/fldui/changedb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/inpdlg.cxx
sw/source/ui/fldui/makefile.mk
sw/source/ui/fmtui/makefile.mk
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/frmdlg/cption.cxx
sw/source/ui/frmdlg/frmdlg.cxx
sw/source/ui/frmdlg/frmmgr.cxx
sw/source/ui/frmdlg/frmpage.cxx
sw/source/ui/frmdlg/makefile.mk
sw/source/ui/frmdlg/wrap.cxx
sw/source/ui/frmdlg/wrap.hrc
sw/source/ui/globdoc/makefile.mk
sw/source/ui/inc/SidebarWindowsConsts.hxx
sw/source/ui/inc/app.hrc
sw/source/ui/inc/column.hxx
sw/source/ui/inc/dbtree.hxx
sw/source/ui/inc/envlop.hxx
sw/source/ui/inc/frmpage.hxx
sw/source/ui/inc/javaedit.hxx
sw/source/ui/inc/navipi.hxx
sw/source/ui/inc/optpage.hxx
sw/source/ui/inc/regionsw.hxx
sw/source/ui/inc/split.hxx
sw/source/ui/inc/swmn_tmpl.hrc
sw/source/ui/inc/swuicnttab.hxx
sw/source/ui/inc/swuiidxmrk.hxx
sw/source/ui/inc/tbxmgr.hxx
sw/source/ui/inc/utlui.hrc
sw/source/ui/inc/view.hxx
sw/source/ui/inc/workctrl.hxx
sw/source/ui/inc/wrap.hxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/index/cnttab.hrc
sw/source/ui/index/cnttab.src
sw/source/ui/index/makefile.mk
sw/source/ui/index/swuiidxmrk.cxx
sw/source/ui/lingu/hhcwrp.cxx
sw/source/ui/lingu/makefile.mk
sw/source/ui/lingu/olmenu.cxx
sw/source/ui/makefile.mk
sw/source/ui/misc/glossary.cxx
sw/source/ui/misc/insrule.cxx
sw/source/ui/misc/makefile.mk
sw/source/ui/misc/pggrid.cxx
sw/source/ui/ribbar/concustomshape.cxx
sw/source/ui/ribbar/inputwin.cxx
sw/source/ui/ribbar/makefile.mk
sw/source/ui/ribbar/tblctrl.src
sw/source/ui/ribbar/workctrl.cxx
sw/source/ui/ribbar/workctrl.hrc
sw/source/ui/ribbar/workctrl.src
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfshex.cxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/makefile.mk
sw/source/ui/shells/slotadd.cxx
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textfld.cxx
sw/source/ui/shells/textidx.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/smartmenu/makefile.mk
sw/source/ui/table/chartins.cxx
sw/source/ui/table/makefile.mk
sw/source/ui/table/swtablerep.cxx
sw/source/ui/table/tabledlg.cxx
sw/source/ui/table/tablepg.hxx
sw/source/ui/uiview/makefile.mk
sw/source/ui/uiview/pview.cxx
sw/source/ui/uiview/pview.src
sw/source/ui/uiview/srcview.cxx
sw/source/ui/uiview/swcli.cxx
sw/source/ui/uiview/uivwimp.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uiview/view0.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewling.cxx
sw/source/ui/uiview/viewmdi.cxx
sw/source/ui/uiview/viewport.cxx
sw/source/ui/uiview/viewprt.cxx
sw/source/ui/uiview/viewsrch.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.hxx
sw/source/ui/uno/makefile.mk
sw/source/ui/uno/unoatxt.cxx
sw/source/ui/uno/unomod.cxx
sw/source/ui/uno/unotxdoc.cxx
sw/source/ui/uno/unotxvw.cxx
sw/source/ui/utlui/content.cxx
sw/source/ui/utlui/glbltree.cxx
sw/source/ui/utlui/makefile.mk
sw/source/ui/utlui/navipi.cxx
sw/source/ui/utlui/navipi.hrc
sw/source/ui/utlui/uitool.cxx
sw/source/ui/utlui/utlui.src
sw/source/ui/vba/makefile.mk
sw/source/ui/vba/service.cxx
sw/source/ui/vba/vbaapplication.hxx
sw/source/ui/vba/vbaborders.cxx
sw/source/ui/vba/vbaeventshelper.cxx
sw/source/ui/vba/vbaeventshelper.hxx
sw/source/ui/vba/vbafield.cxx
sw/source/ui/vba/vbafield.hxx
sw/source/ui/vba/vbafind.cxx
sw/source/ui/vba/vbafind.hxx
sw/source/ui/vba/vbaglobals.hxx
sw/source/ui/vba/vbaheaderfooter.cxx
sw/source/ui/vba/vbaheaderfooterhelper.cxx
sw/source/ui/vba/vbaheaderfooterhelper.hxx
sw/source/ui/vba/vbarange.cxx
sw/source/ui/vba/vbarange.hxx
sw/source/ui/vba/vbaselection.cxx
sw/source/ui/vba/vbasystem.cxx
sw/source/ui/vba/vbatabstop.hxx
sw/source/ui/vba/vbawindow.cxx
sw/source/ui/vba/wordvbahelper.cxx
sw/source/ui/web/makefile.mk
sw/source/ui/web/wformsh.cxx
sw/source/ui/wrtsh/makefile.mk
sw/source/ui/wrtsh/wrtsh1.cxx
sw/source/ui/wrtsh/wrtundo.cxx
sw/uiconfig/sglobal/menubar/menubar.xml
sw/uiconfig/sweb/menubar/menubar.xml
sw/uiconfig/swform/menubar/menubar.xml
sw/uiconfig/swreport/menubar/menubar.xml
sw/uiconfig/swriter/menubar/menubar.xml
sw/uiconfig/swxform/menubar/menubar.xml
sw/util/hidother.src
sw/util/makefile.mk
sw/util/msword.map
sw/util/swui.map
diff --cc starmath/inc/applicat.hxx
index e232906,fd3936a..bef58cd
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@@ -33,15 -33,24 +33,11 @@@ class SvxErrorHandler
#include <sfx2/app.hxx>
-/**************************************************************************/
-/*
-**
-** MACRO DEFINITION
-**
-**/
-
-#define SMDLL 1
-#define APPLICATIONNAME "smath3"
+#define SMDLL 1
+#define APPLICATIONNAME "smath3"
-/**************************************************************************/
-/*
-**
-** CLASS DEFINITION
-**
-**/
- #ifdef WIN
- #define RELEASE "WIN304"
- #endif
-
#ifdef PM2
#define RELEASE "PM304"
#endif
diff --cc starmath/inc/dialog.hxx
index e1f9acc,d6b294e..4002bd9
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@@ -251,11 -255,13 +251,11 @@@ class SmDistanceDialog : public ModalDi
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
- void SetHelpId(MetricField &rField, ULONG nHelpId);
+ void SetHelpId(MetricField &rField, const rtl::OString& sHelpId);
void SetCategory(USHORT Category);
- void ApplyImages();
-
public:
- SmDistanceDialog(Window *pParent, BOOL bFreeRes = TRUE);
+ SmDistanceDialog(Window *pParent, bool bFreeRes = true);
~SmDistanceDialog();
void ReadFrom(const SmFormat &rFormat);
diff --cc starmath/inc/format.hxx
index 3027c61,7b360f9..3027c61
mode 100644,100755..100755
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
diff --cc starmath/inc/helpids.h
index 0000000,1623137..f27b47e
mode 000000,100644..100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@@ -1,0 -1,326 +1,326 @@@
+ /*************************************************************************
+ *
+ * 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.
+ *
+ ************************************************************************/
+ #ifndef STARMATH_HELPIDS_H
+ #define STARMATH_HELPIDS_H
+
+ #define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG"
+ #define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG"
+ #define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG"
+ #define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG"
+ #define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG"
+ #define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG"
+ #define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE"
+ #define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG"
+ #define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG"
+ #define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE"
+ #define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY"
+ #define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY"
+ #define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY"
+ #define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR"
+ #define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR"
+ #define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR"
+ #define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR"
+ #define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING"
+ #define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME"
+ #define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME"
+ #define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME"
+ #define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME"
+ #define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO"
+ #define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO"
+ #define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO"
+ #define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU"
+ #define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU"
+ #define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU"
+ #define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU"
+ #define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW"
+ #define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW"
+ #define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW"
+ #define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT"
+ #define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR"
+ #define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC"
+ #define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD"
+ #define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION"
+ #define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR"
+ #define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR"
+ #define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR"
+ #define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR"
+ #define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP"
+ #define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP"
+ #define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT"
+ #define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT"
+
+ #define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX"
+ #define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX"
+ #define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX"
+ #define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX"
+ #define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX"
+ #define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY"
+ #define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY"
+ #define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY"
+ #define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY"
+ #define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY"
+ #define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY"
+ #define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY"
+ #define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY"
+ #define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY"
+ #define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY"
+ #define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY"
+ #define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY"
+ #define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY"
+ #define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY"
+ #define HID_SMA_XORY "STARMATH_HID_SMA_XORY"
+ #define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY"
+ #define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY"
+ #define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY"
+ #define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY"
+ #define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY"
+ #define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY"
+ #define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY"
+ #define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY"
+ #define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY"
+ #define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY"
+ #define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY"
+ #define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY"
+ #define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY"
+ #define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY"
+ #define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY"
+ #define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY"
+ #define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY"
+ #define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY"
+ #define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY"
+ #define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY"
+ #define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY"
+ #define HID_SMA_XINY "STARMATH_HID_SMA_XINY"
+ #define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY"
+ #define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY"
+ #define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY"
+ #define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY"
+ #define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY"
+ #define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY"
+ #define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY"
+ #define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY"
+ #define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY"
+ #define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY"
+ #define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY"
+ #define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY"
+ #define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY"
+ #define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY"
+ #define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX"
+ #define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX"
+ #define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX"
+ #define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY"
+ #define HID_SMA_EX "STARMATH_HID_SMA_EX"
+ #define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX"
+ #define HID_SMA_LNX "STARMATH_HID_SMA_LNX"
+ #define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX"
+ #define HID_SMA_SINX "STARMATH_HID_SMA_SINX"
+ #define HID_SMA_COSX "STARMATH_HID_SMA_COSX"
+ #define HID_SMA_TANX "STARMATH_HID_SMA_TANX"
+ #define HID_SMA_COTX "STARMATH_HID_SMA_COTX"
+ #define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX"
+ #define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX"
+ #define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX"
+ #define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX"
+ #define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX"
+ #define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX"
+ #define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX"
+ #define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX"
+ #define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX"
+ #define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX"
+ #define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX"
+ #define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX"
+ #define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX"
+ #define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX"
+ #define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX"
+ #define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX"
+ #define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX"
+ #define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX"
+ #define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS"
+ #define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL"
+ #define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA"
+ #define HID_SMA_INTX "STARMATH_HID_SMA_INTX"
+ #define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX"
+ #define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX"
+ #define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX"
+ #define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX"
+ #define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX"
+ #define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX"
+ #define HID_SMA_TOX "STARMATH_HID_SMA_TOX"
+ #define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY"
+ #define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY"
+ #define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY"
+ #define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY"
+ #define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW"
+ #define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW"
+ #define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW"
+
+ #define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT"
+ #define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT"
+ #define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT"
+ #define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT"
+ #define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT"
+ #define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT"
+ #define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT"
+ #define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT"
+ #define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT"
+
+ #define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN"
+ #define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX"
+ #define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX"
+ #define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX"
+ #define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX"
+ #define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX"
+ #define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX"
+ #define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX"
+ #define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX"
+ #define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX"
+ #define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN"
+ #define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU"
+ #define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU"
+
+ #define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX"
+ #define HID_SMA_BARX "STARMATH_HID_SMA_BARX"
+ #define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX"
+ #define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX"
+ #define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX"
+ #define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX"
+ #define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX"
+ #define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX"
+ #define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX"
+ #define HID_SMA_HATX "STARMATH_HID_SMA_HATX"
+ #define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX"
+ #define HID_SMA_VECX "STARMATH_HID_SMA_VECX"
+ #define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX"
+ #define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX"
+ #define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX"
+ #define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX"
+ #define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX"
+ #define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX"
+ #define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY"
+ #define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY"
+ #define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX"
+ #define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX"
+ #define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX"
+ #define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX"
+ #define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX"
+ #define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX"
+ #define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX"
+ #define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX"
+ #define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX"
+ #define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX"
+ #define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX"
+ #define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX"
+ #define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX"
+ #define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX"
+ #define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX"
+ #define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX"
+ #define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX"
+ #define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX"
+ #define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX"
+ #define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX"
+ #define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX"
+ #define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX"
+ #define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK"
+ #define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK"
+ #define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE"
+ #define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY"
+ #define HID_SMA_STACK "STARMATH_HID_SMA_STACK"
+ #define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX"
+ #define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX"
+ #define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX"
+ #define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX"
+ #define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH"
+ #define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET"
+ #define HID_SMA_RE "STARMATH_HID_SMA_RE"
+ #define HID_SMA_IM "STARMATH_HID_SMA_IM"
+ #define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY"
+ #define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL"
+ #define HID_SMA_WP "STARMATH_HID_SMA_WP"
+ #define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS"
+ #define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP"
+ #define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN"
+ #define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW"
+ #define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT"
+
+ #define HID_SMA_SETN "STARMATH_HID_SMA_SETN"
+ #define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ"
+ #define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ"
+ #define HID_SMA_SETR "STARMATH_HID_SMA_SETR"
+ #define HID_SMA_SETC "STARMATH_HID_SMA_SETC"
+ #define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX"
+ #define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX"
+ #define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX"
+ #define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX"
+ #define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX"
+ #define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR"
+ #define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR"
+ #define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW"
+ #define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW"
+ #define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW"
+ #define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW"
+
+ #define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST"
+ #define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST"
+ #define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST"
+ #define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST"
+ #define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST"
+ #define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST"
+ #define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST"
+ #define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH"
+ #define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH"
+ #define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST"
+ #define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST"
+ #define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT"
+ #define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST"
+ #define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST"
+ #define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST"
+ #define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST"
+ #define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST"
+ #define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT"
+ #define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST"
+ #define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST"
+ #define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST"
+ #define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST"
+ #define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST"
+ #define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS"
+ #define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2"
+ #define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY"
+ #define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY"
+ #define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY"
+ #define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY"
+ #define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY"
+ #define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY"
+ #define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX"
+ #define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX"
+
+ #define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW"
+ #define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW"
+
+ #define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE"
+
+ #endif
+
diff --cc starmath/inc/node.hxx
index 9d35e6b,d97b2b9..c81b30b
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@@ -207,60 -181,11 +207,64 @@@ public
const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
const SmNode * FindRectClosestTo(const Point &rPoint) const;
+ // --> 4.7.2010 #i972#
+ virtual long GetFormulaBaseline() const;
+ // <--
-};
+
+ /** Accept a visitor
+ * Calls the method for this class on the visitor
+ */
+ virtual void Accept(SmVisitor* pVisitor);
+
+ /** True if this node is selected */
+ bool IsSelected() const {return bIsSelected;}
+ void SetSelected(bool Selected = true) {bIsSelected = Selected;}
+
+#ifdef DEBUG_ENABLE_DUMPASDOT
+ /** The tree as dot graph for graphviz, usable for debugging
+ * Convert the output to a image using $ dot graph.gv -Tpng > graph.png
+ */
+ inline void DumpAsDot(std::ostream &out, String* label = NULL) const{
+ int id = 0;
+ DumpAsDot(out, label, -1, id, -1);
+ }
+#endif /* DEBUG_ENABLE_DUMPASDOT */
+
+ /** Get the parent node of this node */
+ SmStructureNode* GetParent(){ return aParentNode; }
+ /** Set the parent node */
+ void SetParent(SmStructureNode* parent){
+ aParentNode = parent;
+ }
+
+ /** Get the index of a child node
+ *
+ * Returns -1, if pSubNode isn't a subnode of this.
+ */
+ int IndexOfSubNode(SmNode* pSubNode){
+ USHORT nSize = GetNumSubNodes();
+ for(USHORT i = 0; i < nSize; i++)
+ if(pSubNode == GetSubNode(i))
+ return i;
+ return -1;
+ }
+ /** Set the token for this node */
+ void SetToken(SmToken& token){
+ aNodeToken = token;
+ }
+protected:
+ /** Sets parent on children of this node */
+ void ClaimPaternity(){
+ SmNode* pNode;
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
+ if (NULL != (pNode = GetSubNode(i)))
+ pNode->SetParent((SmStructureNode*)this); //Cast is valid if we have children
+ }
+private:
+ SmStructureNode* aParentNode;
+ void DumpAsDot(std::ostream &out, String* label, int number, int& id, int parent) const;
+};
////////////////////////////////////////////////////////////////////////////////
@@@ -696,15 -457,12 +700,18 @@@ public
////////////////////////////////////////////////////////////////////////////////
-
+/** Table node
+ *
+ * This is the root node for the formula tree. This node is also used for the
+ * STACK and BINOM commands. When used for root node, its
+ * children are instances of SmLineNode, and in some obscure cases the a child
+ * can be an instance of SmExpressionNode, mainly when errors occur.
+ */
class SmTableNode : public SmStructureNode
{
+ // --> 4.7.2010 #i972#
+ long nFormulaBaseline;
+ // <--
public:
SmTableNode(const SmToken &rNodeToken)
: SmStructureNode(NTABLE, rNodeToken)
@@@ -714,7 -472,7 +721,8 @@@
virtual SmNode * GetLeftMost();
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ virtual long GetFormulaBaseline() const;
+ void Accept(SmVisitor* pVisitor);
};
diff --cc starmath/inc/starmath.hrc
index b1db8da,e388d9f..8d982d3
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@@ -54,13 -55,11 +55,13 @@@
#define SID_AUTO_REDRAW (SID_SMA_START + 55)
#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
#define SID_TEXTMODE (SID_SMA_START + 57)
- #define SID_INSERT_FORMULA (SID_SMA_START + 58)
- #define SID_TEXT (SID_SMA_START + 100)
- #define SID_GAPHIC_SM (SID_SMA_START + 101)
+ #define SID_IMPORT_FORMULA (SID_SMA_START + 58)
+ #define SID_TEXT (SID_SMA_START + 100)
+ #define SID_GAPHIC_SM (SID_SMA_START + 101)
#define SID_FITINWINDOW (SID_SMA_START + 103)
-#define SID_INSERTTEXT (SID_SMA_START + 104)
+/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
+#define SID_INSERTSYMBOL (SID_SMA_START + 104)
+/** Command for inserting a math construction specified in commands.src */
#define SID_INSERTCOMMAND (SID_SMA_START + 105)
#define SID_LOADSYMBOLS (SID_SMA_START + 107)
diff --cc starmath/inc/symbol.hxx
index 4638d4f,c7b55c9..6c0e095
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@@ -84,14 -82,14 +84,14 @@@ private
String m_aName;
String m_aExportName;
String m_aSetName;
- sal_Unicode m_cChar;
+ sal_UCS4 m_cChar;
- BOOL m_bPredefined;
- BOOL m_bDocSymbol;
+ bool m_bPredefined;
+ bool m_bDocSymbol;
public:
SmSym();
- SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+ SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
- const String& rSet, BOOL bIsPredefined = FALSE);
+ const String& rSet, bool bIsPredefined = false);
SmSym(const SmSym& rSymbol);
SmSym& operator = (const SmSym& rSymbol);
@@@ -146,10 -144,9 +146,9 @@@ struct lt_SmSymPtr : public std::binary
}
};
--
class SmSymbolManager : public SfxListener
{
+private:
SymbolMap_t m_aSymbols;
bool m_bModified;
diff --cc starmath/prj/build.lst
index 1eb4c23,a849b81..fba3e2d
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@@ -6,5 -6,4 +6,5 @@@ sm starmath\res get - all sm_re
sm starmath\sdi nmake - all sm_sdi NULL
sm starmath\source nmake - all sm_sorce sm_sdi sm_inc NULL
sm starmath\util nmake - all sm_util sm_sorce NULL
- sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+ sm starmath\qa\unoapi nmake - all sm_qa_unoapi NULL
+sm starmath\qa\cppunit nmake - all sm_qa_cppunit sm_util NULL
diff --cc starmath/source/cfgitem.cxx
index b202bb7,5973e8b..cfe47d5
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@@ -290,11 -292,10 +288,10 @@@ SmFontFormatList::SmFontFormatList(
void SmFontFormatList::Clear()
{
- USHORT nCnt = aEntries.Count();
- if (nCnt)
+ if (!aEntries.empty())
{
- aEntries.Remove( 0, nCnt );
+ aEntries.clear();
- SetModified( TRUE );
+ SetModified( true );
}
}
@@@ -307,8 -308,8 +304,8 @@@ void SmFontFormatList::AddFontFormat( c
if (!pFntFmt)
{
SmFntFmtListEntry aEntry( rFntFmtId, rFntFmt );
- aEntries.Insert( aEntry, aEntries.Count() );
+ aEntries.push_back( aEntry );
- SetModified( TRUE );
+ SetModified( true );
}
}
@@@ -403,16 -402,19 +398,19 @@@ const String SmFontFormatList::GetNewFo
String aRes;
- String aPrefix( RTL_CONSTASCII_STRINGPARAM( "Id" ) );
+ String aPrefix( RTL_CONSTASCII_USTRINGPARAM( "Id" ) );
INT32 nCnt = GetCount();
- for (INT32 i = 1; i <= nCnt + 1 && 0 == aRes.Len(); ++i)
+ for (INT32 i = 1; i <= nCnt + 1; ++i)
{
String aTmpId( aPrefix );
aTmpId += String::CreateFromInt32( i );
if (!GetFontFormat( aTmpId ))
+ {
aRes = aTmpId;
+ break;
+ }
}
- DBG_ASSERT( 0 != aRes.Len(), "failed to create new FontFormatId" );
+ OSL_ENSURE( 0 != aRes.Len(), "failed to create new FontFormatId" );
return aRes;
}
@@@ -486,19 -488,19 +484,19 @@@ void SmMathConfig::ReadSymbol( SmSym &r
{
const Any * pValue = aValues.getConstArray();
Font aFont;
- sal_Unicode cChar = '\0';
+ sal_UCS4 cChar = '\0';
String aSet;
- BOOL bPredefined = FALSE;
+ bool bPredefined = false;
OUString aTmpStr;
INT32 nTmp32 = 0;
- BOOL bTmp = FALSE;
+ bool bTmp = false;
- BOOL bOK = TRUE;
+ bool bOK = true;
if (pValue->hasValue() && (*pValue >>= nTmp32))
- cChar = (sal_Unicode) nTmp32;
+ cChar = static_cast< sal_UCS4 >( nTmp32 );
else
- bOK = FALSE;
+ bOK = false;
++pValue;
if (pValue->hasValue() && (*pValue >>= aTmpStr))
aSet = aTmpStr;
@@@ -812,10 -815,11 +810,11 @@@ void SmMathConfig::SaveFontFormatList(
pVal->Value <<= (INT16) aFntFmt.nItalic;
pVal++;
}
- OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" );
+ DBG_ASSERT( static_cast<size_t>(pVal - pValues) == (nCount * nSymbolProps),
+ "properties missing" );
ReplaceSetProperties( A2OU( FONT_FORMAT_LIST ) , aValues );
- rFntFmtList.SetModified( FALSE );
+ rFntFmtList.SetModified( false );
}
@@@ -827,10 -830,10 +825,10 @@@ void SmMathConfig::StripFontFormatList
// build list of used font-formats only
//!! font-format IDs may be different !!
SmFontFormatList aUsedList;
- for (i = 0; i < nCount; ++i)
+ for (i = 0; i < rSymbols.size(); ++i)
{
- DBG_ASSERT( rSymbols[i].GetName().Len() > 0, "non named symbol" );
- aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , TRUE );
+ OSL_ENSURE( rSymbols[i].GetName().Len() > 0, "non named symbol" );
+ aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , true );
}
const SmFormat & rStdFmt = GetStandardFormat();
for (i = FNT_BEGIN; i <= FNT_END; ++i)
diff --cc starmath/source/cfgitem.hxx
index ba8dcd0,824b65f..367076d
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@@ -83,14 -82,10 +83,10 @@@ struct SmFntFmtListEntr
SmFntFmtListEntry( const String &rId, const SmFontFormat &rFntFmt );
};
-
- SV_DECL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry, 8, 8 )
-
-
class SmFontFormatList
{
- SmFntFmtListEntryArr aEntries;
+ std::deque<SmFntFmtListEntry> aEntries;
- BOOL bModified;
+ bool bModified;
// disallow copy-constructor and assignment-operator for now
SmFontFormatList( const SmFontFormatList & );
@@@ -104,15 -99,15 +100,15 @@@ public
void RemoveFontFormat( const String &rFntFmtId );
const SmFontFormat * GetFontFormat( const String &rFntFmtId ) const;
- const SmFontFormat * GetFontFormat( USHORT nPos ) const;
+ const SmFontFormat * GetFontFormat( size_t nPos ) const;
const String GetFontFormatId( const SmFontFormat &rFntFmt ) const;
- const String GetFontFormatId( const SmFontFormat &rFntFmt, BOOL bAdd );
+ const String GetFontFormatId( const SmFontFormat &rFntFmt, bool bAdd );
- const String GetFontFormatId( USHORT nPos ) const;
+ const String GetFontFormatId( size_t nPos ) const;
const String GetNewFontFormatId() const;
- USHORT GetCount() const { return aEntries.Count(); }
+ size_t GetCount() const { return aEntries.size(); }
- BOOL IsModified() const { return bModified; }
- void SetModified( BOOL bVal ) { bModified = bVal; }
+ bool IsModified() const { return bModified; }
+ void SetModified( bool bVal ) { bModified = bVal; }
};
diff --cc starmath/source/dialog.cxx
index 39d8259,84cfd95..4477465
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@@ -766,10 -773,10 +769,10 @@@ void SmDistanceDialog::SetHelpId(Metric
const XubString aEmptyText;
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT(aEmptyText.Len() == 0, "Sm: Ooops...");
+ OSL_ENSURE(aEmptyText.Len() == 0, "Sm: Ooops...");
#endif
- rField.SetHelpId(nHelpId);
+ rField.SetHelpId(sHelpId);
rField.SetHelpText(aEmptyText);
// since MetricField inherits from SpinField which has a sub Edit field
@@@ -793,9 -801,9 +797,9 @@@ void SmDistanceDialog::SetCategory(USHO
// array to convert category- and metricfield-number in help ids.
// 0 is used in case of unused combinations.
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT(NOCATEGORIES == 10, "Sm : Array passt nicht zu Anzahl der Kategorien");
+ OSL_ENSURE(NOCATEGORIES == 10, "Sm : array doesn't fit into the number of categories");
#endif
- ULONG const aCatMf2Hid[10][4] =
- const char* __READONLY_DATA aCatMf2Hid[10][4] =
++ static const char* aCatMf2Hid[10][4] =
{
{ HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, 0 },
{ HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , 0, 0 },
@@@ -1658,13 -1681,14 +1661,14 @@@ void SmShowChar::SetSymbol( sal_UCS4 cC
Invalidate();
}
+
////////////////////////////////////////////////////////////////////////////////
-void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, BOOL bDeleteText)
+void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
{
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT(&rComboBox == &aOldSymbols || &rComboBox == &aSymbols,
- "Sm : falsche ComboBox");
+ OSL_ENSURE(&rComboBox == &aOldSymbols || &rComboBox == &aSymbols,
+ "Sm : wrong ComboBox");
#endif
rComboBox.Clear();
@@@ -1843,10 -1868,10 +1847,10 @@@ IMPL_LINK( SmSymDefineDialog, StyleChan
IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
{
- sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
+ sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
#if OSL_DEBUG_LEVEL > 1
- DBG_ASSERT( pSubsetMap, "SubsetMap missing" );
+ OSL_ENSURE( pSubsetMap, "SubsetMap missing" );
#endif
if (pSubsetMap)
{
@@@ -1909,12 -1940,11 +1919,10 @@@ IMPL_LINK( SmSymDefineDialog, ChangeCli
// get new Sybol to use
//! get font from symbol-disp lay since charset-display does not keep
//! the bold attribut.
- // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(),
- sal::static_int_cast< sal_Unicode >( aCharsetDisplay.GetSelectCharacter() ),
- aSymbolSets.GetText() );
+ aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() );
// remove old symbol if the name was changed then add new one
-// const bool bSetNameChanged = aOldSymbolSets.GetText() != aSymbolSets.GetText();
const bool bNameChanged = aOldSymbols.GetText() != aSymbols.GetText();
if (bNameChanged)
aSymbolMgrCopy.RemoveSymbol( aOldSymbols.GetText() );
@@@ -1925,17 -1955,16 +1933,16 @@@
SetOrigSymbol(NULL, XubString());
// update display of new symbol
- aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
- aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+ aSymbolDisplay.SetSymbol( &aNewSymbol );
aSymbolName.SetText( aNewSymbol.GetName() );
aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
--
++
// update list box entries
- FillSymbolSets(aOldSymbolSets, FALSE);
- FillSymbolSets(aSymbolSets, FALSE);
- FillSymbols(aOldSymbols ,FALSE);
- FillSymbols(aSymbols ,FALSE);
+ FillSymbolSets(aOldSymbolSets, false);
+ FillSymbolSets(aSymbolSets, false);
+ FillSymbols(aOldSymbols ,false);
+ FillSymbols(aSymbols ,false);
-
+
UpdateButtons();
return 0;
@@@ -1997,9 -2027,15 +2004,12 @@@ void SmSymDefineDialog::UpdateButtons(
// loeschen nur wenn alle Einstellungen gleich sind
bDelete = pOrigSymbol != NULL;
- // aendern wenn bei gleichem Namen mindestens eine Einstellung anders ist
- // oder wenn es noch kein Symbol des neuen Namens gibt (wuerde implizites
- // loeschen des bereits vorhandenen Symbols erfordern)
-// BOOL bEqualName = pOrigSymbol && aTmpSymbolName == pOrigSymbol->GetName();
-// bChange = pOrigSymbol && ( (bEqualName && !bEqual) || (!bEqualName && bAdd) );
+ // aendern nur falls altes Symbol vorhanden und am neuen etwas anders ist
+ bChange = pOrigSymbol && !bEqual;
- }
+
+ // aendern nur falls altes Symbol vorhanden und am neuen etwas anders ist
+ bChange = pOrigSymbol && !bEqual;
+ }
aAddBtn .Enable(bAdd);
aChangeBtn.Enable(bChange);
diff --cc starmath/source/document.cxx
index 8431cc5,1ebf917..9cb2eef
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@@ -134,8 -132,8 +136,8 @@@ void SmDocShell::SFX_NOTIFY(SfxBroadcas
switch (((SfxSimpleHint&)rHint).GetId())
{
case HINT_FORMATCHANGED:
- SetFormulaArranged(FALSE);
+ SetFormulaArranged(false);
-
+
nModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
Repaint();
diff --cc starmath/source/edit.cxx
index 44a1a49,935c213..e6c05cf
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@@ -753,7 -737,8 +753,8 @@@ void SmEditWindow::InsertCommand(USHOR
}
aModifyTimer.Start();
- aCursorMoveTimer.Start();
+ StartCursorMove();
+
GrabFocus();
}
}
diff --cc starmath/source/makefile.mk
index b211903,5900fae..b9293c4
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@@ -45,43 -45,41 +45,44 @@@ ENABLE_EXCEPTIONS=TRU
SMDLL=TRUE
SRS2NAME =smres
-SRC2FILES = smres.src \
- symbol.src \
+SRC2FILES = smres.src \
+ symbol.src \
+ toolbox.src \
commands.src
-SLO1FILES = \
+SLO1FILES = \
$(SLO)$/accessibility.obj \
- $(SLO)$/edit.obj \
+ $(SLO)$/edit.obj \
$(SLO)$/eqnolefilehdr.obj \
- $(SLO)$/mathmlexport.obj \
- $(SLO)$/mathmlimport.obj \
- $(SLO)$/symbol.obj \
- $(SLO)$/types.obj \
- $(SLO)$/unodoc.obj \
- $(SLO)$/action.obj \
- $(SLO)$/cfgitem.obj \
- $(SLO)$/config.obj \
- $(SLO)$/dialog.obj \
- $(SLO)$/document.obj \
- $(SLO)$/format.obj \
- $(SLO)$/mathtype.obj \
- $(SLO)$/node.obj \
- $(SLO)$/parse.obj \
- $(SLO)$/register.obj \
- $(SLO)$/smdll.obj \
- $(SLO)$/toolbox.obj \
- $(SLO)$/typemap.obj \
- $(SLO)$/smmod.obj \
- $(SLO)$/utility.obj \
- $(SLO)$/rect.obj \
- $(SLO)$/unomodel.obj \
+ $(SLO)$/mathmlexport.obj \
+ $(SLO)$/mathmlimport.obj \
+ $(SLO)$/symbol.obj \
+ $(SLO)$/types.obj \
+ $(SLO)$/unodoc.obj \
+ $(SLO)$/action.obj \
+ $(SLO)$/cfgitem.obj \
+ $(SLO)$/config.obj \
+ $(SLO)$/dialog.obj \
+ $(SLO)$/document.obj \
+ $(SLO)$/format.obj \
+ $(SLO)$/mathtype.obj \
+ $(SLO)$/node.obj \
+ $(SLO)$/visitors.obj \
+ $(SLO)$/caret.obj \
+ $(SLO)$/cursor.obj \
+ $(SLO)$/parse.obj \
+ $(SLO)$/register.obj \
+ $(SLO)$/smdll.obj \
+ $(SLO)$/toolbox.obj \
+ $(SLO)$/typemap.obj \
+ $(SLO)$/smmod.obj \
+ $(SLO)$/utility.obj \
+ $(SLO)$/rect.obj \
+ $(SLO)$/unomodel.obj \
$(SLO)$/view.obj
-SLO2FILES = \
- $(SLO)$/register.obj \
+SLO2FILES = \
+ $(SLO)$/register.obj \
$(SLO)$/detreg.obj
SLOFILES = \
diff --cc starmath/source/mathmlexport.cxx
index 0cf220b,cf5c28e..1edaf5a
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@@ -1,1503 -1,1564 +1,1503 @@@
- /* -*- 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_starmath.hxx"
--
--/*
-- Warning: The SvXMLElementExport helper class creates the beginning and
-- closing tags of xml elements in its constructor and destructor, so theres
-- hidden stuff going on, on occasion the ordering of these classes declarations
-- may be significant
--*/
--
--
--#include <com/sun/star/xml/sax/XErrorHandler.hpp>
--#include <com/sun/star/xml/sax/XEntityResolver.hpp>
--#include <com/sun/star/xml/sax/InputSource.hpp>
--#include <com/sun/star/xml/sax/XDTDHandler.hpp>
--#include <com/sun/star/xml/sax/XParser.hpp>
--#include <com/sun/star/io/XActiveDataSource.hpp>
--#include <com/sun/star/io/XActiveDataControl.hpp>
--#include <com/sun/star/document/XDocumentProperties.hpp>
--#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
--#include <com/sun/star/packages/zip/ZipIOException.hpp>
--#include <com/sun/star/task/XStatusIndicatorFactory.hpp>
--#include <com/sun/star/beans/PropertyAttribute.hpp>
--#include <com/sun/star/container/XNameAccess.hpp>
--#include <com/sun/star/embed/ElementModes.hpp>
--#include <com/sun/star/uno/Any.h>
--
--#include <rtl/math.hxx>
--#include <sfx2/frame.hxx>
--#include <sfx2/docfile.hxx>
- #include <osl/diagnose.h>
- #include <tools/urlobj.hxx>
- #include <svtools/sfxecode.hxx>
- #include <unotools/saveopt.hxx>
- #include <svl/stritem.hxx>
- #include <svl/itemprop.hxx>
- #include <unotools/processfactory.hxx>
- #include <unotools/streamwrap.hxx>
- #include <xmloff/xmlnmspe.hxx>
- #include <xmloff/xmltoken.hxx>
- #include <xmloff/nmspmap.hxx>
- #include <xmloff/attrlist.hxx>
- #include <xmloff/xmluconv.hxx>
- #include <xmloff/xmlmetai.hxx>
- #include <osl/mutex.hxx>
- #include <comphelper/genericpropertyset.hxx>
-
- #include <memory>
-
- #include "mathmlexport.hxx"
- #include <starmath.hrc>
- #include <unomodel.hxx>
- #include <document.hxx>
- #include <utility.hxx>
-
- using namespace ::com::sun::star::beans;
- using namespace ::com::sun::star::container;
- using namespace ::com::sun::star::document;
- using namespace ::com::sun::star::lang;
- using namespace ::com::sun::star::uno;
- using namespace ::com::sun::star;
- using namespace ::xmloff::token;
-
- using ::rtl::OUString;
- using ::rtl::OUStringBuffer;
-
- #define EXPORT_SVC_NAME RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.XMLExportFilter")
-
- #undef WANTEXCEPT
-
-
- ////////////////////////////////////////////////////////////
-
- sal_Bool SmXMLExportWrapper::Export(SfxMedium &rMedium)
- {
- sal_Bool bRet=sal_True;
- uno::Reference<lang::XMultiServiceFactory>
- xServiceFactory(utl::getProcessServiceFactory());
- OSL_ENSURE(xServiceFactory.is(),"got no service manager");
-
- //Get model
- uno::Reference< lang::XComponent > xModelComp(xModel, uno::UNO_QUERY );
-
- sal_Bool bEmbedded = sal_False;
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
-
- SmDocShell *pDocShell = pModel ?
- static_cast<SmDocShell*>(pModel->GetObjectShell()) : 0;
- if ( pDocShell &&
- SFX_CREATE_MODE_EMBEDDED == pDocShell->GetCreateMode() )
- bEmbedded = sal_True;
-
- uno::Reference<task::XStatusIndicator> xStatusIndicator;
- if (!bEmbedded)
- {
- if (pDocShell /*&& pDocShell->GetMedium()*/)
- {
- OSL_ENSURE( pDocShell->GetMedium() == &rMedium,
- "different SfxMedium found" );
-
- SfxItemSet* pSet = rMedium.GetItemSet();
- if (pSet)
- {
- const SfxUnoAnyItem* pItem = static_cast<const SfxUnoAnyItem*>(
- pSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL) );
- if (pItem)
- pItem->GetValue() >>= xStatusIndicator;
- }
- }
-
- // set progress range and start status indicator
- if (xStatusIndicator.is())
- {
- sal_Int32 nProgressRange = bFlat ? 1 : 3;
- xStatusIndicator->start(String(SmResId(STR_STATSTR_WRITING)),
- nProgressRange);
- }
- }
-
-
- // create XPropertySet with three properties for status indicator
- comphelper::PropertyMapEntry aInfoMap[] =
- {
- { "UsePrettyPrinting", sizeof("UsePrettyPrinting")-1, 0,
- &::getBooleanCppuType(),
- beans::PropertyAttribute::MAYBEVOID, 0},
- { "BaseURI", sizeof("BaseURI")-1, 0,
- &::getCppuType( (OUString *)0 ),
- beans::PropertyAttribute::MAYBEVOID, 0 },
- { "StreamRelPath", sizeof("StreamRelPath")-1, 0,
- &::getCppuType( (OUString *)0 ),
- beans::PropertyAttribute::MAYBEVOID, 0 },
- { "StreamName", sizeof("StreamName")-1, 0,
- &::getCppuType( (OUString *)0 ),
- beans::PropertyAttribute::MAYBEVOID, 0 },
- { NULL, 0, 0, NULL, 0, 0 }
- };
- uno::Reference< beans::XPropertySet > xInfoSet(
- comphelper::GenericPropertySet_CreateInstance(
- new comphelper::PropertySetInfo( aInfoMap ) ) );
-
- SvtSaveOptions aSaveOpt;
- OUString sUsePrettyPrinting(RTL_CONSTASCII_USTRINGPARAM("UsePrettyPrinting"));
- sal_Bool bUsePrettyPrinting( bFlat || aSaveOpt.IsPrettyPrinting() );
- Any aAny;
- aAny.setValue( &bUsePrettyPrinting, ::getBooleanCppuType() );
- xInfoSet->setPropertyValue( sUsePrettyPrinting, aAny );
-
- // Set base URI
- OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") );
- xInfoSet->setPropertyValue( sPropName, makeAny( rMedium.GetBaseURL( true ) ) );
-
- sal_Int32 nSteps=0;
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
- if (!bFlat) //Storage (Package) of Stream
- {
- uno::Reference < embed::XStorage > xStg = rMedium.GetOutputStorage();
- sal_Bool bOASIS = ( SotStorage::GetVersion( xStg ) > SOFFICE_FILEFORMAT_60 );
-
- // TODO/LATER: handle the case of embedded links gracefully
- if ( bEmbedded ) //&& !pStg->IsRoot() )
- {
- OUString aName;
- if ( rMedium.GetItemSet() )
- {
- const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>(
- rMedium.GetItemSet()->GetItem(SID_DOC_HIERARCHICALNAME) );
- if ( pDocHierarchItem )
- aName = pDocHierarchItem->GetValue();
- }
-
- if ( aName.getLength() )
- {
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("StreamRelPath"));
- xInfoSet->setPropertyValue( sPropName, makeAny( aName ) );
- }
- }
-
- if ( !bEmbedded )
- {
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
-
- bRet = WriteThroughComponent(
- xStg, xModelComp, "meta.xml", xServiceFactory, xInfoSet,
- (bOASIS ? "com.sun.star.comp.Math.XMLOasisMetaExporter"
- : "com.sun.star.comp.Math.XMLMetaExporter"),
- sal_False);
- }
- if ( bRet )
- {
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
-
- bRet = WriteThroughComponent(
- xStg, xModelComp, "content.xml", xServiceFactory, xInfoSet,
- "com.sun.star.comp.Math.XMLContentExporter");
- }
-
- if ( bRet )
- {
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
-
- bRet = WriteThroughComponent(
- xStg, xModelComp, "settings.xml", xServiceFactory, xInfoSet,
- (bOASIS ? "com.sun.star.comp.Math.XMLOasisSettingsExporter"
- : "com.sun.star.comp.Math.XMLSettingsExporter") );
- }
- }
- else
- {
- SvStream *pStream = rMedium.GetOutStream();
- uno::Reference<io::XOutputStream> xOut(
- new utl::OOutputStreamWrapper(*pStream) );
-
- if (xStatusIndicator.is())
- xStatusIndicator->setValue(nSteps++);
-
- bRet = WriteThroughComponent(
- xOut, xModelComp, xServiceFactory, xInfoSet,
- "com.sun.star.comp.Math.XMLContentExporter");
- }
-
- if (xStatusIndicator.is())
- xStatusIndicator->end();
-
- return bRet;
- }
-
-
- /// export through an XML exporter component (output stream version)
- sal_Bool SmXMLExportWrapper::WriteThroughComponent(
- Reference<io::XOutputStream> xOutputStream,
- Reference<XComponent> xComponent,
- Reference<lang::XMultiServiceFactory> & rFactory,
- Reference<beans::XPropertySet> & rPropSet,
- const sal_Char* pComponentName )
- {
- OSL_ENSURE(xOutputStream.is(), "I really need an output stream!");
- OSL_ENSURE(xComponent.is(), "Need component!");
- OSL_ENSURE(NULL != pComponentName, "Need component name!");
-
- // get component
- Reference< io::XActiveDataSource > xSaxWriter(
- rFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer") )),
- UNO_QUERY );
- OSL_ENSURE( xSaxWriter.is(), "can't instantiate XML writer" );
- if (!xSaxWriter.is())
- return sal_False;
-
- // connect XML writer to output stream
- xSaxWriter->setOutputStream( xOutputStream );
-
- // prepare arguments (prepend doc handler to given arguments)
- Reference<xml::sax::XDocumentHandler> xDocHandler( xSaxWriter,UNO_QUERY);
-
- Sequence<Any> aArgs( 2 );
- aArgs[0] <<= xDocHandler;
- aArgs[1] <<= rPropSet;
-
- // get filter component
- Reference< document::XExporter > xExporter(
- rFactory->createInstanceWithArguments(
- OUString::createFromAscii(pComponentName), aArgs), UNO_QUERY);
- OSL_ENSURE( xExporter.is(),
- "can't instantiate export filter component" );
- if ( !xExporter.is() )
- return sal_False;
-
-
- // connect model and filter
- xExporter->setSourceDocument( xComponent );
-
- // filter!
- Reference < XFilter > xFilter( xExporter, UNO_QUERY );
- uno::Sequence< PropertyValue > aProps(0);
- xFilter->filter( aProps );
-
- uno::Reference<lang::XUnoTunnel> xFilterTunnel;
- xFilterTunnel = uno::Reference<lang::XUnoTunnel>
- ( xFilter, uno::UNO_QUERY );
- SmXMLExport *pFilter = reinterpret_cast< SmXMLExport * >(
- sal::static_int_cast< sal_uIntPtr >(
- xFilterTunnel->getSomething( SmXMLExport::getUnoTunnelId() )));
- return pFilter ? pFilter->GetSuccess() : sal_True;
- }
-
-
- /// export through an XML exporter component (storage version)
- sal_Bool SmXMLExportWrapper::WriteThroughComponent(
- const Reference < embed::XStorage >& xStorage,
- Reference<XComponent> xComponent,
- const sal_Char* pStreamName,
- Reference<lang::XMultiServiceFactory> & rFactory,
- Reference<beans::XPropertySet> & rPropSet,
- const sal_Char* pComponentName,
- sal_Bool bCompress
- )
- {
- OSL_ENSURE(xStorage.is(), "Need storage!");
- OSL_ENSURE(NULL != pStreamName, "Need stream name!");
-
- // open stream
- Reference < io::XStream > xStream;
- OUString sStreamName = OUString::createFromAscii(pStreamName);
- try
- {
- xStream = xStorage->openStreamElement( sStreamName,
- embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
- }
- catch ( uno::Exception& )
- {
- DBG_ERROR( "Can't create output stream in package!" );
- return sal_False;
- }
-
- String aPropName( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("MediaType") ) );
- OUString aMime( RTL_CONSTASCII_USTRINGPARAM("text/xml") );
- uno::Any aAny;
- aAny <<= aMime;
-
- uno::Reference < beans::XPropertySet > xSet( xStream, uno::UNO_QUERY );
- xSet->setPropertyValue( aPropName, aAny );
-
- if ( !bCompress )
- {
- aPropName = String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM("Compressed") );
- sal_Bool bFalse = sal_False;
- aAny.setValue( &bFalse, ::getBooleanCppuType() );
- xSet->setPropertyValue( aPropName, aAny );
- }
-
- // even plain stream must be encrypted in encrypted document
- OUString aTmpPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
- sal_Bool bTrue = sal_True;
- aAny.setValue( &bTrue, ::getBooleanCppuType() );
- xSet->setPropertyValue( aTmpPropName, aAny );
-
- // set Base URL
- if ( rPropSet.is() )
- {
- OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") );
- rPropSet->setPropertyValue( sPropName, makeAny( sStreamName ) );
- }
-
- // write the stuff
- sal_Bool bRet = WriteThroughComponent( xStream->getOutputStream(), xComponent, rFactory,
- rPropSet, pComponentName );
-
- return bRet;
- }
-
- ////////////////////////////////////////////////////////////
-
- // #110680#
- SmXMLExport::SmXMLExport(
- const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
- sal_uInt16 nExportFlags)
- : SvXMLExport( xServiceFactory, MAP_INCH, XML_MATH, nExportFlags ) ,
- pTree(0) ,
- bSuccess(sal_False)
- {
- }
-
- sal_Int64 SAL_CALL SmXMLExport::getSomething(
- const uno::Sequence< sal_Int8 >& rId )
- throw(uno::RuntimeException)
- {
- if ( rId.getLength() == 16 &&
- 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
- rId.getConstArray(), 16 ) )
- return sal::static_int_cast< sal_Int64 >(reinterpret_cast< sal_uIntPtr >(this));
-
- return SvXMLExport::getSomething( rId );
- }
-
- const uno::Sequence< sal_Int8 > & SmXMLExport::getUnoTunnelId() throw()
- {
- static uno::Sequence< sal_Int8 > * pSeq = 0;
- if ( !pSeq )
- {
- osl::Guard< osl::Mutex > aGuard( osl::Mutex::getGlobalMutex() );
- if ( !pSeq )
- {
- static uno::Sequence< sal_Int8 > aSeq( 16 );
- rtl_createUuid( (sal_uInt8*)aSeq.getArray(), 0, sal_True );
- pSeq = &aSeq;
- }
- }
- return *pSeq;
- }
-
- OUString SAL_CALL SmXMLExport_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExport_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExport_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- // EXPORT_OASIS is required here allthough there is no differrence between
- // OOo and OASIS, because without the flag, a transformation to OOo would
- // be chained in.
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_ALL );
- }
-
- ////////////////////////////////////////////////////////////
-
- OUString SAL_CALL SmXMLExportMetaOOO_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLMetaExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExportMetaOOO_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMetaOOO_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_META );
- }
-
- ////////////////////////////////////////////////////////////
-
- OUString SAL_CALL SmXMLExportMeta_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLOasisMetaExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExportMeta_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExportMeta_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_META );
- }
-
- ////////////////////////////////////////////////////////////
-
- OUString SAL_CALL SmXMLExportSettingsOOO_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLSettingsExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExportSettingsOOO_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettingsOOO_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_SETTINGS );
- }
-
- ////////////////////////////////////////////////////////////
-
- OUString SAL_CALL SmXMLExportSettings_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLOasisSettingsExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExportSettings_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExportSettings_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_SETTINGS );
- }
-
- ////////////////////////////////////////////////////////////
-
- OUString SAL_CALL SmXMLExportContent_getImplementationName() throw()
- {
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Math.XMLContentExporter" ) );
- }
-
- uno::Sequence< OUString > SAL_CALL SmXMLExportContent_getSupportedServiceNames()
- throw()
- {
- const OUString aServiceName( EXPORT_SVC_NAME );
- const uno::Sequence< OUString > aSeq( &aServiceName, 1 );
- return aSeq;
- }
-
- uno::Reference< uno::XInterface > SAL_CALL SmXMLExportContent_createInstance(
- const uno::Reference< lang::XMultiServiceFactory > & rSMgr)
- throw( uno::Exception )
- {
- // #110680#
- // The EXPORT_OASIS flag is only required to avoid that a transformer is
- // chanied in
- return (cppu::OWeakObject*)new SmXMLExport( rSMgr, EXPORT_OASIS|EXPORT_CONTENT );
- }
-
- ////////////////////////////////////////////////////////////
-
- // XServiceInfo
- // override empty method from parent class
- rtl::OUString SAL_CALL SmXMLExport::getImplementationName()
- throw(uno::RuntimeException)
- {
- OUString aTxt;
- switch( getExportFlags() )
- {
- case EXPORT_META:
- aTxt = SmXMLExportMeta_getImplementationName();
- break;
- case EXPORT_SETTINGS:
- aTxt = SmXMLExportSettings_getImplementationName();
- break;
- case EXPORT_CONTENT:
- aTxt = SmXMLExportContent_getImplementationName();
- break;
- case EXPORT_ALL:
- default:
- aTxt = SmXMLExport_getImplementationName();
- break;
- }
- return aTxt;
- }
-
- sal_uInt32 SmXMLExport::exportDoc(enum XMLTokenEnum eClass)
- {
- if ( (getExportFlags() & EXPORT_CONTENT) == 0 )
- {
- SvXMLExport::exportDoc( eClass );
- }
- else
- {
- uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
-
- if (pModel)
- {
- SmDocShell *pDocShell =
- static_cast<SmDocShell*>(pModel->GetObjectShell());
- pTree = pDocShell->GetFormulaTree();
- aText = pDocShell->GetText();
- }
-
- GetDocHandler()->startDocument();
-
- /*Add xmlns line*/
- SvXMLAttributeList &rList = GetAttrList();
-
- // make use of a default namespace
- ResetNamespaceMap(); // Math doesn't need namespaces from xmloff, since it now uses default namespaces (because that is common with current MathML usage in the web)
- _GetNamespaceMap().Add( OUString(), GetXMLToken(XML_N_MATH), XML_NAMESPACE_MATH );
-
- rList.AddAttribute(GetNamespaceMap().GetAttrNameByKey(XML_NAMESPACE_MATH_IDX),
- GetNamespaceMap().GetNameByKey( XML_NAMESPACE_MATH_IDX));
-
- //I think we need something like ImplExportEntities();
- _ExportContent();
- GetDocHandler()->endDocument();
- }
-
- bSuccess=sal_True;
- return 0;
- }
-
- void SmXMLExport::_ExportContent()
- {
- SvXMLElementExport aEquation(*this, XML_NAMESPACE_MATH, XML_MATH, sal_True, sal_True);
- SvXMLElementExport *pSemantics=0;
-
- if (aText.Len())
- {
- pSemantics = new SvXMLElementExport(*this, XML_NAMESPACE_MATH,
- XML_SEMANTICS, sal_True, sal_True);
- }
-
- ExportNodes(pTree, 0);
-
- if (aText.Len())
- {
- // Convert symbol names
- uno::Reference <frame::XModel> xModel = GetModel();
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
- SmDocShell *pDocShell = pModel ?
- static_cast<SmDocShell*>(pModel->GetObjectShell()) : 0;
- OSL_ENSURE( pDocShell, "doc shell missing" );
- if (pDocShell)
- {
- SmParser &rParser = pDocShell->GetParser();
- bool bVal = rParser.IsExportSymbolNames();
- rParser.SetExportSymbolNames( true );
- SmNode *pTmpTree = rParser.Parse( aText );
- aText = rParser.GetText();
- delete pTmpTree;
- rParser.SetExportSymbolNames( bVal );
- }
-
- AddAttribute(XML_NAMESPACE_MATH, XML_ENCODING,
- OUString(RTL_CONSTASCII_USTRINGPARAM("StarMath 5.0")));
- SvXMLElementExport aAnnotation(*this, XML_NAMESPACE_MATH,
- XML_ANNOTATION, sal_True, sal_False);
- GetDocHandler()->characters(OUString( aText ));
- }
- delete pSemantics;
- }
-
- void SmXMLExport::GetViewSettings( Sequence < PropertyValue >& aProps)
- {
- uno::Reference <frame::XModel> xModel = GetModel();
- if ( !xModel.is() )
- return;
-
- uno::Reference <lang::XUnoTunnel> xTunnel;
- xTunnel = uno::Reference <lang::XUnoTunnel> (xModel,uno::UNO_QUERY);
- SmModel *pModel = reinterpret_cast<SmModel *>
- (xTunnel->getSomething(SmModel::getUnoTunnelId()));
-
- if ( !pModel )
- return;
-
- SmDocShell *pDocShell =
- static_cast<SmDocShell*>(pModel->GetObjectShell());
- if ( !pDocShell )
- return;
-
- aProps.realloc( 4 );
- PropertyValue *pValue = aProps.getArray();
- sal_Int32 nIndex = 0;
-
- Rectangle aRect( pDocShell->GetVisArea() );
-
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaTop") );
- pValue[nIndex++].Value <<= aRect.Top();
-
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaLeft") );
- pValue[nIndex++].Value <<= aRect.Left();
-
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaWidth") );
- pValue[nIndex++].Value <<= aRect.GetWidth();
-
- pValue[nIndex].Name = OUString( RTL_CONSTASCII_USTRINGPARAM ( "ViewAreaHeight") );
- pValue[nIndex++].Value <<= aRect.GetHeight();
- }
-
- void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps)
- {
- Reference < XPropertySet > xProps ( GetModel(), UNO_QUERY );
- if ( xProps.is() )
- {
- Reference< XPropertySetInfo > xPropertySetInfo = xProps->getPropertySetInfo();
- if (xPropertySetInfo.is())
- {
- Sequence< Property > aProps = xPropertySetInfo->getProperties();
- sal_Int32 nCount(aProps.getLength());
- if (nCount > 0)
- {
- rProps.realloc(nCount);
- PropertyValue* pProps = rProps.getArray();
- if (pProps)
- {
- const OUString sFormula ( RTL_CONSTASCII_USTRINGPARAM ( "Formula" ) );
- const OUString sBasicLibraries ( RTL_CONSTASCII_USTRINGPARAM ( "BasicLibraries" ) );
- const OUString sDialogLibraries ( RTL_CONSTASCII_USTRINGPARAM ( "DialogLibraries" ) );
- const OUString sRuntimeUID ( RTL_CONSTASCII_USTRINGPARAM ( "RuntimeUID" ) );
- for (sal_Int32 i = 0; i < nCount; i++, pProps++)
- {
- const OUString &rPropName = aProps[i].Name;
- if (rPropName != sFormula &&
- rPropName != sBasicLibraries &&
- rPropName != sDialogLibraries &&
- rPropName != sRuntimeUID)
- {
- pProps->Name = rPropName;
- pProps->Value = xProps->getPropertyValue(rPropName);
- }
- }
- }
- }
- }
- }
- }
-
- void SmXMLExport::ExportLine(const SmNode *pNode, int nLevel)
- {
- ExportExpression(pNode, nLevel);
- }
-
- void SmXMLExport::ExportBinaryHorizontal(const SmNode *pNode, int nLevel)
- {
- ExportExpression(pNode, nLevel);
- }
-
- void SmXMLExport::ExportUnaryHorizontal(const SmNode *pNode, int nLevel)
- {
- ExportExpression(pNode, nLevel);
- }
-
- void SmXMLExport::ExportExpression(const SmNode *pNode, int nLevel)
- {
- SvXMLElementExport *pRow=0;
- ULONG nSize = pNode->GetNumSubNodes();
-
- if (nSize > 1)
- pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MROW, sal_True, sal_True);
-
- for (USHORT i = 0; i < nSize; i++)
- if (const SmNode *pTemp = pNode->GetSubNode(i))
- ExportNodes(pTemp, nLevel+1);
-
- delete pRow;
- }
-
- void SmXMLExport::ExportBinaryVertical(const SmNode *pNode, int nLevel)
- {
- OSL_ENSURE(pNode->GetNumSubNodes()==3,"Bad Fraction");
- SvXMLElementExport aFraction(*this, XML_NAMESPACE_MATH, XML_MFRAC, sal_True, sal_True);
- ExportNodes(pNode->GetSubNode(0), nLevel);
- ExportNodes(pNode->GetSubNode(2), nLevel);
- }
-
- void SmXMLExport::ExportTable(const SmNode *pNode, int nLevel)
- {
- SvXMLElementExport *pTable=0;
-
- USHORT nSize = pNode->GetNumSubNodes();
-
- //If the list ends in newline then the last entry has
- //no subnodes, the newline is superfulous so we just drop
- //the last node, inclusion would create a bad MathML
- //table
- if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0)
- --nSize;
-
- // try to avoid creating a mtable element when the formula consists only
- // of a single output line
- if (nLevel || (nSize >1))
- pTable = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTABLE, sal_True, sal_True);
-
- for (USHORT i = 0; i < nSize; i++)
- if (const SmNode *pTemp = pNode->GetSubNode(i))
- {
- SvXMLElementExport *pRow=0;
- SvXMLElementExport *pCell=0;
- if (pTable)
- {
- pRow = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTR, sal_True, sal_True);
- pCell = new SvXMLElementExport(*this, XML_NAMESPACE_MATH, XML_MTD, sal_True, sal_True);
- }
- ExportNodes(pTemp, nLevel+1);
- delete pCell;
- delete pRow;
- }
-
- delete pTable;
- }
-
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list