summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--starmath/inc/applicat.hxx31
-rw-r--r--starmath/inc/config.hxx2
-rw-r--r--starmath/inc/cursor.hxx2
-rwxr-xr-x[-rw-r--r--]starmath/inc/dialog.hxx47
-rwxr-xr-x[-rw-r--r--]starmath/inc/document.hxx51
-rw-r--r--starmath/inc/edit.hxx4
-rw-r--r--starmath/inc/format.hxx32
-rw-r--r--starmath/inc/helpids.h326
-rw-r--r--starmath/inc/node.hxx107
-rwxr-xr-x[-rw-r--r--]starmath/inc/parse.hxx91
-rw-r--r--starmath/inc/rect.hxx12
-rw-r--r--starmath/inc/smcommands.h68
-rw-r--r--starmath/inc/smdll.hxx2
-rw-r--r--starmath/inc/smmod.hxx11
-rwxr-xr-x[-rw-r--r--]starmath/inc/starmath.hrc319
-rw-r--r--starmath/inc/symbol.hxx10
-rw-r--r--starmath/inc/toolbox.hxx18
-rw-r--r--starmath/inc/unomodel.hxx2
-rw-r--r--starmath/inc/utility.hxx36
-rw-r--r--starmath/inc/view.hxx32
-rw-r--r--starmath/prj/build.lst2
-rw-r--r--starmath/prj/d.lst2
-rw-r--r--starmath/qa/unoapi/knownissues.xcl3
-rwxr-xr-x[-rw-r--r--]starmath/sdi/smath.sdi4
-rwxr-xr-x[-rw-r--r--]starmath/sdi/smslots.sdi2
-rw-r--r--starmath/source/accessibility.cxx102
-rw-r--r--starmath/source/accessibility.hxx60
-rw-r--r--starmath/source/cfgitem.cxx221
-rw-r--r--starmath/source/cfgitem.hxx31
-rwxr-xr-x[-rw-r--r--]starmath/source/config.cxx25
-rw-r--r--starmath/source/cursor.cxx36
-rw-r--r--starmath/source/detreg.cxx23
-rwxr-xr-x[-rw-r--r--]starmath/source/dialog.cxx244
-rwxr-xr-x[-rw-r--r--]starmath/source/dialog.hrc9
-rwxr-xr-x[-rw-r--r--]starmath/source/document.cxx104
-rw-r--r--starmath/source/edit.cxx22
-rw-r--r--starmath/source/format.cxx18
-rwxr-xr-x[-rw-r--r--]starmath/source/makefile.mk20
-rwxr-xr-x[-rw-r--r--]starmath/source/mathmlexport.cxx30
-rwxr-xr-x[-rw-r--r--]starmath/source/mathmlimport.cxx128
-rwxr-xr-x[-rw-r--r--]starmath/source/mathmlimport.hxx14
-rw-r--r--starmath/source/mathtype.cxx46
-rw-r--r--starmath/source/mathtype.hxx4
-rw-r--r--starmath/source/menu_tmpl.src160
-rw-r--r--starmath/source/node.cxx255
-rw-r--r--starmath/source/parse.cxx995
-rw-r--r--starmath/source/rect.cxx6
-rw-r--r--starmath/source/register.cxx86
-rw-r--r--starmath/source/smdetect.cxx28
-rwxr-xr-x[-rw-r--r--]starmath/source/smmod.cxx39
-rw-r--r--starmath/source/smres.src1904
-rw-r--r--starmath/source/symbol.cxx15
-rw-r--r--starmath/source/toolbox.cxx123
-rwxr-xr-x[-rw-r--r--]starmath/source/toolbox.hrc14
-rwxr-xr-xstarmath/source/toolbox.src1777
-rw-r--r--starmath/source/unomodel.cxx79
-rw-r--r--starmath/source/utility.cxx20
-rw-r--r--starmath/source/view.cxx127
-rw-r--r--starmath/source/visitors.cxx14
-rwxr-xr-x[-rw-r--r--]starmath/uiconfig/smath/menubar/menubar.xml2
-rw-r--r--starmath/util/hidother.src3
-rw-r--r--starmath/util/makefile.mk17
-rw-r--r--starmath/util/sm.component61
-rw-r--r--starmath/util/smd.component34
-rw-r--r--sw/AllLangResTarget_sw.mk184
-rwxr-xr-xsw/JunitTest_sw_complex.mk57
-rwxr-xr-x[-rw-r--r--]sw/JunitTest_sw_unoapi.mk (renamed from sw/source/core/attr/makefile.mk)49
-rw-r--r--sw/Library_msword.mk123
-rw-r--r--sw/Library_sw.mk740
-rw-r--r--sw/Library_swd.mk (renamed from sw/source/core/SwNumberTree/makefile.mk)58
-rw-r--r--sw/Library_swui.mk169
-rw-r--r--sw/Library_vbaswobj.mk148
-rw-r--r--sw/Makefile (renamed from sw/inc/sw.mk)19
-rw-r--r--sw/Module_sw.mk (renamed from sw/source/ui/inc/makefile.mk)37
-rw-r--r--sw/Package_misc.mk (renamed from sw/source/filter/inc/makefile.mk)6
-rw-r--r--sw/Package_uiconfig.mk261
-rw-r--r--sw/Package_xml.mk (renamed from sw/source/core/inc/makefile.mk)5
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/IDocumentDeviceAccess.hxx2
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx14
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx2
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx14
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx9
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx253
-rw-r--r--sw/inc/IShellCursorSupplier.hxx (renamed from sw/source/ui/fmtui/fmtui.src)70
-rw-r--r--sw/inc/PostItMgr.hxx8
-rw-r--r--sw/inc/SidebarWin.hxx10
-rw-r--r--sw/inc/SwAppletImpl.hxx6
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx2
-rw-r--r--sw/inc/SwRewriter.hxx5
-rw-r--r--sw/inc/SwUndoField.hxx36
-rw-r--r--sw/inc/access.hrc15
-rw-r--r--sw/inc/accessibilityoptions.hxx24
-rw-r--r--sw/inc/acmplwrd.hxx16
-rw-r--r--sw/inc/authfld.hxx54
-rw-r--r--sw/inc/authratr.hxx6
-rw-r--r--sw/inc/bparr.hxx45
-rw-r--r--sw/inc/breakit.hxx4
-rw-r--r--sw/inc/calbck.hxx40
-rw-r--r--sw/inc/calc.hxx22
-rw-r--r--sw/inc/ccoll.hxx14
-rw-r--r--sw/inc/cellatr.hxx22
-rw-r--r--sw/inc/cellfml.hxx14
-rw-r--r--sw/inc/charatr.hxx132
-rw-r--r--sw/inc/charfmt.hxx4
-rw-r--r--sw/inc/chpfld.hxx31
-rw-r--r--sw/inc/cmdid.h8
-rw-r--r--sw/inc/colwd.hxx2
-rw-r--r--sw/inc/crsrsh.hxx424
-rw-r--r--sw/inc/crsskip.hxx6
-rw-r--r--sw/inc/crstate.hxx104
-rw-r--r--sw/inc/cshtyp.hxx8
-rw-r--r--sw/inc/dbfld.hxx106
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx107
-rw-r--r--sw/inc/dcontact.hxx6
-rw-r--r--sw/inc/ddefld.hxx37
-rw-r--r--sw/inc/doc.hxx300
-rw-r--r--sw/inc/docary.hxx33
-rw-r--r--sw/inc/docsh.hxx72
-rw-r--r--sw/inc/docstat.hxx20
-rw-r--r--sw/inc/docstyle.hxx64
-rw-r--r--sw/inc/docufld.hxx201
-rw-r--r--sw/inc/dpage.hxx6
-rw-r--r--sw/inc/edglbldc.hxx6
-rw-r--r--sw/inc/edimp.hxx18
-rw-r--r--sw/inc/editsh.hxx375
-rw-r--r--sw/inc/errhdl.hxx76
-rw-r--r--sw/inc/expfld.hxx184
-rw-r--r--sw/inc/extinput.hxx10
-rw-r--r--sw/inc/fchrfmt.hxx6
-rw-r--r--sw/inc/fesh.hxx343
-rw-r--r--sw/inc/fldbas.hxx92
-rw-r--r--sw/inc/flddat.hxx32
-rw-r--r--sw/inc/flddropdown.hxx51
-rw-r--r--sw/inc/flypos.hxx10
-rw-r--r--sw/inc/fmtanchr.hxx18
-rw-r--r--sw/inc/fmtautofmt.hxx6
-rw-r--r--sw/inc/fmtclbl.hxx6
-rw-r--r--sw/inc/fmtclds.hxx82
-rw-r--r--sw/inc/fmtcnct.hxx6
-rw-r--r--sw/inc/fmtcntnt.hxx4
-rw-r--r--sw/inc/fmtcol.hxx52
-rw-r--r--sw/inc/fmteiro.hxx8
-rw-r--r--sw/inc/fmtfld.hxx6
-rw-r--r--sw/inc/fmtfollowtextflow.hxx6
-rw-r--r--sw/inc/fmtfordr.hxx6
-rw-r--r--sw/inc/fmtfsize.hxx20
-rw-r--r--sw/inc/fmtftn.hxx8
-rw-r--r--sw/inc/fmtftntx.hxx26
-rw-r--r--sw/inc/fmthdft.hxx24
-rw-r--r--sw/inc/fmtinfmt.hxx20
-rw-r--r--sw/inc/fmtline.hxx18
-rw-r--r--sw/inc/fmtlsplt.hxx6
-rw-r--r--sw/inc/fmtmeta.hxx6
-rw-r--r--sw/inc/fmtornt.hxx30
-rw-r--r--sw/inc/fmtpdsc.hxx22
-rw-r--r--sw/inc/fmtrowsplt.hxx6
-rw-r--r--sw/inc/fmtruby.hxx22
-rw-r--r--sw/inc/fmtsrnd.hxx30
-rw-r--r--sw/inc/fmturl.hxx14
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx8
-rw-r--r--sw/inc/format.hxx292
-rw-r--r--sw/inc/frmatr.hxx52
-rw-r--r--sw/inc/frmfmt.hxx29
-rw-r--r--sw/inc/ftnidx.hxx6
-rw-r--r--sw/inc/ftninfo.hxx6
-rw-r--r--sw/inc/grfatr.hxx84
-rw-r--r--sw/inc/helpid.h1885
-rw-r--r--sw/inc/hfspacingitem.hxx8
-rw-r--r--sw/inc/hhcwrp.hxx8
-rw-r--r--sw/inc/hintids.hxx52
-rw-r--r--sw/inc/hints.hxx22
-rw-r--r--sw/inc/htmltbl.hxx326
-rw-r--r--sw/inc/index.hxx34
-rw-r--r--sw/inc/inetfld.hxx19
-rw-r--r--sw/inc/io.hxx2
-rw-r--r--sw/inc/iodetect.hxx16
-rw-r--r--sw/inc/itabenum.hxx16
-rw-r--r--sw/inc/lineinfo.hxx44
-rw-r--r--sw/inc/list.hxx2
-rw-r--r--sw/inc/makefile.mk49
-rw-r--r--sw/inc/mdiexp.hxx16
-rw-r--r--sw/inc/modcfg.hxx108
-rw-r--r--sw/inc/ndarr.hxx85
-rw-r--r--sw/inc/ndgrf.hxx66
-rw-r--r--sw/inc/ndhints.hxx34
-rw-r--r--sw/inc/ndindex.hxx131
-rw-r--r--sw/inc/ndnotxt.hxx30
-rw-r--r--sw/inc/ndole.hxx24
-rw-r--r--sw/inc/ndtxt.hxx126
-rw-r--r--sw/inc/ndtyp.hxx24
-rw-r--r--sw/inc/newhdl.hxx6
-rw-r--r--sw/inc/node.hxx168
-rw-r--r--sw/inc/numrule.hxx88
-rw-r--r--sw/inc/pagedesc.hxx66
-rw-r--r--sw/inc/pageiter.hxx8
-rw-r--r--sw/inc/pam.hxx56
-rw-r--r--sw/inc/paratr.hxx110
-rwxr-xr-x[-rw-r--r--]sw/inc/pch/precompiled_sw.hxx9
-rw-r--r--sw/inc/poolfmt.awk31
-rw-r--r--sw/inc/poolfmt.hrc9
-rw-r--r--sw/inc/poolfmt.hxx42
-rw-r--r--sw/inc/postithelper.hxx2
-rw-r--r--sw/inc/printdata.hxx31
-rw-r--r--sw/inc/prtopt.hxx (renamed from sw/source/ui/inc/prtopt.hxx)0
-rw-r--r--sw/inc/pvprtdat.hxx44
-rw-r--r--sw/inc/redline.hxx78
-rw-r--r--sw/inc/redlnaut.hxx2
-rw-r--r--sw/inc/reffld.hxx35
-rw-r--r--sw/inc/section.hxx14
-rw-r--r--sw/inc/shellio.hxx235
-rw-r--r--sw/inc/shellres.hxx2
-rw-r--r--sw/inc/sortopt.hxx12
-rw-r--r--sw/inc/swabstdlg.hxx106
-rw-r--r--sw/inc/swacorr.hxx4
-rw-r--r--sw/inc/swatrset.hxx244
-rw-r--r--sw/inc/swbaslnk.hxx30
-rw-r--r--sw/inc/swcalwrp.hxx4
-rw-r--r--sw/inc/swcli.hxx10
-rw-r--r--sw/inc/swcommands.h437
-rw-r--r--sw/inc/swcrsr.hxx176
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swdbtoolsclient.hxx2
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swerror.h4
-rw-r--r--sw/inc/swevent.hxx2
-rw-r--r--sw/inc/swgstr.hxx40
-rw-r--r--sw/inc/swmodule.hxx10
-rw-r--r--sw/inc/swpre.mk46
-rw-r--r--sw/inc/swprtopt.hxx98
-rw-r--r--sw/inc/swrect.hxx34
-rw-r--r--sw/inc/swregion.hxx8
-rw-r--r--sw/inc/swserv.hxx8
-rw-r--r--sw/inc/swtable.hxx150
-rw-r--r--sw/inc/swtypes.hxx16
-rw-r--r--sw/inc/swundo.hxx32
-rw-r--r--sw/inc/swunohelper.hxx16
-rw-r--r--sw/inc/swurl.hxx2
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx28
-rw-r--r--sw/inc/tblafmt.hxx66
-rw-r--r--sw/inc/tblenum.hxx2
-rw-r--r--sw/inc/tblsel.hxx30
-rw-r--r--sw/inc/tgrditem.hxx50
-rw-r--r--sw/inc/tox.hxx178
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/txatbase.hxx4
-rw-r--r--sw/inc/txatritr.hxx4
-rw-r--r--sw/inc/txtatr.hxx10
-rw-r--r--sw/inc/txtfld.hxx3
-rw-r--r--sw/inc/txtftn.hxx12
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/undobj.hxx1701
-rw-r--r--sw/inc/unoatxt.hxx10
-rw-r--r--sw/inc/unochart.hxx2
-rw-r--r--sw/inc/unocrsr.hxx24
-rw-r--r--sw/inc/unocrsrhelper.hxx4
-rw-r--r--sw/inc/unoevtlstnr.hxx2
-rw-r--r--sw/inc/unofield.hxx2
-rw-r--r--sw/inc/unoflatpara.hxx6
-rw-r--r--sw/inc/unomailmerge.hxx8
-rw-r--r--sw/inc/unomap.hxx6
-rw-r--r--sw/inc/unoprnms.hxx8
-rw-r--r--sw/inc/unoredline.hxx2
-rw-r--r--sw/inc/unoredlines.hxx4
-rw-r--r--sw/inc/unostyle.hxx2
-rw-r--r--sw/inc/unotbl.hxx2
-rw-r--r--sw/inc/unotextrange.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx3
-rw-r--r--sw/inc/usrfld.hxx57
-rw-r--r--sw/inc/viewopt.hxx432
-rw-r--r--sw/inc/viewsh.hxx25
-rw-r--r--sw/inc/viscrs.hxx28
-rw-r--r--sw/inc/wdocsh.hxx6
-rw-r--r--[-rwxr-xr-x]sw/prj/build.lst78
-rw-r--r--sw/prj/d.lst59
-rw-r--r--sw/prj/makefile.mk (renamed from sw/uiconfig/layout/makefile.mk)24
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java173
-rw-r--r--sw/qa/complex/accessibility/makefile.mk57
-rw-r--r--sw/qa/complex/checkColor/CheckChangeColor.java119
-rw-r--r--sw/qa/complex/checkColor/makefile.mk75
-rw-r--r--sw/qa/complex/indeterminateState/CheckIndeterminateState.java133
-rw-r--r--sw/qa/complex/indeterminateState/makefile.mk82
-rw-r--r--sw/qa/complex/writer/CheckBookmarks.java127
-rw-r--r--sw/qa/complex/writer/CheckCrossReferences.java334
-rw-r--r--sw/qa/complex/writer/CheckFlies.java219
-rw-r--r--sw/qa/complex/writer/CheckIndexedPropertyValues.java184
-rw-r--r--sw/qa/complex/writer/CheckNamedPropertyValues.java200
-rw-r--r--sw/qa/complex/writer/LoadSaveTest.java254
-rw-r--r--sw/qa/complex/writer/TestDocument.java39
-rw-r--r--sw/qa/complex/writer/TextPortionEnumerationTest.java645
-rw-r--r--sw/qa/complex/writer/makefile.mk108
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx86
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx14
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx20
-rw-r--r--sw/qa/core/filters-test.cxx2
-rw-r--r--sw/qa/core/makefile.mk217
-rw-r--r--sw/qa/core/swdoc-test.cxx2
-rw-r--r--sw/qa/unoapi/Test.java5
-rw-r--r--sw/qa/unoapi/knownissues.xcl14
-rw-r--r--sw/qa/unoapi/lastCheck.txt1
-rw-r--r--sw/qa/unoapi/makefile.mk48
-rw-r--r--sw/qa/unoapi/sw.sce6
-rw-r--r--sw/sdi/_annotsh.sdi6
-rw-r--r--sw/sdi/_docsh.sdi5
-rw-r--r--sw/sdi/_textsh.sdi8
-rw-r--r--sw/sdi/makefile.mk107
-rw-r--r--sw/sdi/swriter.sdi27
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accmap.cxx2
-rw-r--r--sw/source/core/access/accpara.cxx50
-rw-r--r--sw/source/core/access/accpara.hxx2
-rw-r--r--sw/source/core/access/accportions.cxx48
-rw-r--r--sw/source/core/access/accportions.hxx24
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/makefile.mk97
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx10
-rw-r--r--sw/source/core/attr/calbck.cxx40
-rw-r--r--sw/source/core/attr/cellatr.cxx12
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx4
-rw-r--r--sw/source/core/attr/format.cxx96
-rw-r--r--sw/source/core/attr/hints.cxx40
-rw-r--r--sw/source/core/attr/swatrset.cxx38
-rw-r--r--sw/source/core/bastyp/bparr.cxx92
-rw-r--r--sw/source/core/bastyp/breakit.cxx12
-rw-r--r--sw/source/core/bastyp/calc.cxx148
-rw-r--r--sw/source/core/bastyp/index.cxx10
-rw-r--r--sw/source/core/bastyp/init.cxx86
-rw-r--r--sw/source/core/bastyp/makefile.mk79
-rw-r--r--sw/source/core/bastyp/swcache.cxx40
-rw-r--r--sw/source/core/bastyp/swrect.cxx18
-rw-r--r--sw/source/core/bastyp/swregion.cxx32
-rw-r--r--sw/source/core/bastyp/swtypes.cxx3
-rw-r--r--sw/source/core/bastyp/tabcol.cxx20
-rw-r--r--sw/source/core/crsr/bookmrk.cxx18
-rw-r--r--sw/source/core/crsr/callnk.cxx14
-rw-r--r--sw/source/core/crsr/callnk.hxx10
-rw-r--r--sw/source/core/crsr/crsrsh.cxx505
-rw-r--r--sw/source/core/crsr/crstrvl.cxx322
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx30
-rw-r--r--sw/source/core/crsr/findattr.cxx243
-rw-r--r--sw/source/core/crsr/findcoll.cxx31
-rw-r--r--sw/source/core/crsr/findfmt.cxx14
-rw-r--r--sw/source/core/crsr/findtxt.cxx94
-rw-r--r--sw/source/core/crsr/makefile.mk80
-rw-r--r--sw/source/core/crsr/pam.cxx220
-rw-r--r--sw/source/core/crsr/paminit.cxx14
-rw-r--r--sw/source/core/crsr/swcrsr.cxx454
-rw-r--r--sw/source/core/crsr/trvlcol.cxx8
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx60
-rw-r--r--sw/source/core/crsr/trvlreg.cxx74
-rw-r--r--sw/source/core/crsr/trvltbl.cxx122
-rw-r--r--sw/source/core/crsr/unocrsr.cxx32
-rw-r--r--sw/source/core/crsr/viscrs.cxx52
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx8
-rw-r--r--sw/source/core/doc/acmplwrd.cxx58
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx105
-rw-r--r--sw/source/core/doc/doc.cxx480
-rw-r--r--sw/source/core/doc/docbasic.cxx30
-rw-r--r--sw/source/core/doc/docbm.cxx105
-rw-r--r--sw/source/core/doc/docchart.cxx12
-rw-r--r--sw/source/core/doc/doccomp.cxx335
-rw-r--r--sw/source/core/doc/doccorr.cxx243
-rw-r--r--sw/source/core/doc/docdde.cxx42
-rw-r--r--sw/source/core/doc/docdesc.cxx150
-rw-r--r--sw/source/core/doc/docdraw.cxx98
-rw-r--r--sw/source/core/doc/docedt.cxx242
-rw-r--r--sw/source/core/doc/docfld.cxx350
-rw-r--r--sw/source/core/doc/docfly.cxx203
-rw-r--r--sw/source/core/doc/docfmt.cxx395
-rw-r--r--sw/source/core/doc/docftn.cxx74
-rw-r--r--sw/source/core/doc/docglbl.cxx67
-rw-r--r--sw/source/core/doc/docglos.cxx26
-rw-r--r--sw/source/core/doc/doclay.cxx288
-rw-r--r--sw/source/core/doc/docnew.cxx165
-rw-r--r--sw/source/core/doc/docnum.cxx507
-rw-r--r--sw/source/core/doc/docredln.cxx536
-rw-r--r--sw/source/core/doc/docruby.cxx49
-rw-r--r--sw/source/core/doc/docsort.cxx196
-rw-r--r--sw/source/core/doc/docstat.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx272
-rw-r--r--sw/source/core/doc/extinput.cxx32
-rw-r--r--sw/source/core/doc/fmtcol.cxx94
-rw-r--r--sw/source/core/doc/ftnidx.cxx68
-rw-r--r--sw/source/core/doc/gctable.cxx128
-rw-r--r--sw/source/core/doc/htmltbl.cxx480
-rw-r--r--sw/source/core/doc/lineinfo.cxx10
-rw-r--r--sw/source/core/doc/list.cxx8
-rw-r--r--sw/source/core/doc/makefile.mk92
-rw-r--r--sw/source/core/doc/notxtfrm.cxx102
-rw-r--r--sw/source/core/doc/number.cxx130
-rw-r--r--sw/source/core/doc/poolfmt.cxx419
-rw-r--r--sw/source/core/doc/sortopt.cxx10
-rw-r--r--sw/source/core/doc/swserv.cxx38
-rw-r--r--sw/source/core/doc/tblafmt.cxx220
-rw-r--r--sw/source/core/doc/tblcpy.cxx213
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1005
-rw-r--r--sw/source/core/doc/visiturl.cxx16
-rw-r--r--sw/source/core/docnode/makefile.mk73
-rw-r--r--sw/source/core/docnode/ndcopy.cxx246
-rw-r--r--sw/source/core/docnode/ndindex.cxx6
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx64
-rw-r--r--sw/source/core/docnode/ndnum.cxx18
-rw-r--r--sw/source/core/docnode/ndsect.cxx212
-rw-r--r--sw/source/core/docnode/ndtbl.cxx1065
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx348
-rw-r--r--sw/source/core/docnode/node.cxx258
-rw-r--r--sw/source/core/docnode/node2lay.cxx54
-rw-r--r--sw/source/core/docnode/nodes.cxx335
-rw-r--r--sw/source/core/docnode/section.cxx171
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx88
-rw-r--r--sw/source/core/draw/dcontact.cxx58
-rw-r--r--sw/source/core/draw/dflyobj.cxx76
-rw-r--r--sw/source/core/draw/dpage.cxx12
-rw-r--r--sw/source/core/draw/drawdoc.cxx16
-rw-r--r--sw/source/core/draw/dview.cxx110
-rw-r--r--sw/source/core/draw/makefile.mk58
-rw-r--r--sw/source/core/edit/acorrect.cxx88
-rw-r--r--sw/source/core/edit/autofmt.cxx502
-rw-r--r--sw/source/core/edit/edatmisc.cxx38
-rw-r--r--sw/source/core/edit/edattr.cxx108
-rw-r--r--sw/source/core/edit/eddel.cxx52
-rw-r--r--sw/source/core/edit/edfcol.cxx23
-rw-r--r--sw/source/core/edit/edfld.cxx97
-rw-r--r--sw/source/core/edit/edfldexp.cxx16
-rw-r--r--sw/source/core/edit/edfmt.cxx22
-rw-r--r--sw/source/core/edit/edglbldc.cxx92
-rw-r--r--sw/source/core/edit/edglss.cxx48
-rw-r--r--sw/source/core/edit/editsh.cxx136
-rw-r--r--sw/source/core/edit/edlingu.cxx55
-rw-r--r--sw/source/core/edit/ednumber.cxx172
-rw-r--r--sw/source/core/edit/edredln.cxx26
-rw-r--r--sw/source/core/edit/edsect.cxx45
-rw-r--r--sw/source/core/edit/edtab.cxx99
-rw-r--r--sw/source/core/edit/edtox.cxx96
-rw-r--r--sw/source/core/edit/edundo.cxx212
-rw-r--r--sw/source/core/edit/edws.cxx56
-rw-r--r--sw/source/core/edit/makefile.mk71
-rw-r--r--sw/source/core/except/dbgloop.cxx168
-rw-r--r--sw/source/core/except/errhdl.cxx136
-rw-r--r--sw/source/core/fields/authfld.cxx79
-rw-r--r--sw/source/core/fields/cellfml.cxx76
-rw-r--r--sw/source/core/fields/chpfld.cxx14
-rw-r--r--sw/source/core/fields/dbfld.cxx129
-rw-r--r--sw/source/core/fields/ddefld.cxx36
-rw-r--r--sw/source/core/fields/ddetbl.cxx18
-rw-r--r--sw/source/core/fields/docufld.cxx143
-rw-r--r--sw/source/core/fields/expfld.cxx210
-rw-r--r--sw/source/core/fields/fldbas.cxx109
-rw-r--r--sw/source/core/fields/flddat.cxx20
-rw-r--r--sw/source/core/fields/flddropdown.cxx6
-rw-r--r--sw/source/core/fields/fldlst.cxx28
-rw-r--r--sw/source/core/fields/macrofld.cxx37
-rw-r--r--sw/source/core/fields/makefile.mk92
-rw-r--r--sw/source/core/fields/reffld.cxx87
-rw-r--r--sw/source/core/fields/scrptfld.cxx6
-rw-r--r--sw/source/core/fields/tblcalc.cxx60
-rw-r--r--sw/source/core/fields/usrfld.cxx41
-rw-r--r--sw/source/core/frmedt/fecopy.cxx191
-rw-r--r--sw/source/core/frmedt/fedesc.cxx46
-rw-r--r--sw/source/core/frmedt/fefly1.cxx166
-rw-r--r--sw/source/core/frmedt/feflyole.cxx12
-rw-r--r--sw/source/core/frmedt/feshview.cxx323
-rw-r--r--sw/source/core/frmedt/fetab.cxx312
-rw-r--r--sw/source/core/frmedt/fews.cxx270
-rw-r--r--sw/source/core/frmedt/makefile.mk76
-rw-r--r--sw/source/core/frmedt/tblsel.cxx402
-rw-r--r--sw/source/core/graphic/grfatr.cxx48
-rw-r--r--sw/source/core/graphic/makefile.mk53
-rw-r--r--sw/source/core/graphic/ndgrf.cxx112
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx6
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx10
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx (renamed from sw/inc/SwUndoFmt.hxx)43
-rw-r--r--sw/source/core/inc/SwUndoPageDesc.hxx (renamed from sw/inc/SwUndoPageDesc.hxx)25
-rw-r--r--sw/source/core/inc/SwUndoTOXChange.hxx (renamed from sw/inc/SwUndoTOXChange.hxx)14
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx58
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx288
-rw-r--r--sw/source/core/inc/UndoBookmark.hxx83
-rw-r--r--sw/source/core/inc/UndoCore.hxx263
-rw-r--r--sw/source/core/inc/UndoDelete.hxx115
-rw-r--r--sw/source/core/inc/UndoDraw.hxx150
-rw-r--r--sw/source/core/inc/UndoInsert.hxx235
-rw-r--r--sw/source/core/inc/UndoManager.hxx124
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx150
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx105
-rw-r--r--sw/source/core/inc/UndoRedline.hxx145
-rw-r--r--sw/source/core/inc/UndoSection.hxx82
-rw-r--r--sw/source/core/inc/UndoSort.hxx97
-rw-r--r--sw/source/core/inc/UndoSplitMove.hxx96
-rw-r--r--sw/source/core/inc/UndoTable.hxx391
-rw-r--r--sw/source/core/inc/acorrect.hxx36
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx58
-rw-r--r--sw/source/core/inc/blink.hxx16
-rw-r--r--sw/source/core/inc/bodyfrm.hxx2
-rw-r--r--sw/source/core/inc/cellfrm.hxx11
-rw-r--r--sw/source/core/inc/cntfrm.hxx44
-rw-r--r--sw/source/core/inc/dbg_lay.hxx20
-rw-r--r--sw/source/core/inc/dbgloop.hxx (renamed from sw/source/ui/ribbar/tblctrl.src)93
-rw-r--r--sw/source/core/inc/dflyobj.hxx16
-rw-r--r--sw/source/core/inc/docfld.hxx32
-rw-r--r--sw/source/core/inc/docsort.hxx60
-rw-r--r--sw/source/core/inc/doctxm.hxx10
-rw-r--r--sw/source/core/inc/drawdev.hxx28
-rw-r--r--sw/source/core/inc/drawfont.hxx154
-rw-r--r--sw/source/core/inc/dview.hxx8
-rw-r--r--sw/source/core/inc/flowfrm.hxx94
-rw-r--r--sw/source/core/inc/flyfrm.hxx129
-rw-r--r--sw/source/core/inc/flyfrms.hxx18
-rw-r--r--sw/source/core/inc/fntcache.hxx46
-rw-r--r--sw/source/core/inc/frame.hxx434
-rw-r--r--sw/source/core/inc/frminf.hxx12
-rw-r--r--sw/source/core/inc/frmtool.hxx152
-rw-r--r--sw/source/core/inc/ftnboss.hxx12
-rw-r--r--sw/source/core/inc/ftnfrm.hxx22
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/layact.hxx148
-rw-r--r--sw/source/core/inc/laycache.hxx4
-rw-r--r--sw/source/core/inc/layfrm.hxx47
-rw-r--r--sw/source/core/inc/layouter.hxx10
-rw-r--r--sw/source/core/inc/mvsave.hxx54
-rw-r--r--sw/source/core/inc/node2lay.hxx6
-rw-r--r--sw/source/core/inc/noteurl.hxx6
-rw-r--r--sw/source/core/inc/notxtfrm.hxx19
-rw-r--r--sw/source/core/inc/pagefrm.hxx122
-rw-r--r--sw/source/core/inc/pamtyp.hxx50
-rw-r--r--sw/source/core/inc/rolbck.hxx (renamed from sw/inc/rolbck.hxx)106
-rw-r--r--sw/source/core/inc/rootfrm.hxx116
-rw-r--r--sw/source/core/inc/rowfrm.hxx24
-rw-r--r--sw/source/core/inc/scriptinfo.hxx105
-rw-r--r--sw/source/core/inc/sectfrm.hxx60
-rw-r--r--sw/source/core/inc/swblocks.hxx70
-rw-r--r--sw/source/core/inc/swcache.hxx68
-rw-r--r--sw/source/core/inc/swfont.hxx354
-rw-r--r--sw/source/core/inc/tabfrm.hxx91
-rw-r--r--sw/source/core/inc/tblrwcl.hxx92
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx110
-rw-r--r--sw/source/core/inc/txtfrm.hxx56
-rw-r--r--sw/source/core/inc/txttypes.hxx4
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx11
-rw-r--r--sw/source/core/inc/unometa.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx55
-rw-r--r--sw/source/core/inc/wrong.hxx28
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx101
-rw-r--r--sw/source/core/layout/calcmove.cxx291
-rw-r--r--sw/source/core/layout/colfrm.cxx77
-rw-r--r--sw/source/core/layout/dbg_lay.cxx130
-rw-r--r--sw/source/core/layout/findfrm.cxx85
-rw-r--r--sw/source/core/layout/flowfrm.cxx326
-rw-r--r--sw/source/core/layout/fly.cxx205
-rw-r--r--sw/source/core/layout/flycnt.cxx273
-rw-r--r--sw/source/core/layout/flyincnt.cxx30
-rw-r--r--sw/source/core/layout/flylay.cxx80
-rw-r--r--sw/source/core/layout/flypos.cxx14
-rw-r--r--sw/source/core/layout/frmtool.cxx274
-rw-r--r--sw/source/core/layout/ftnfrm.cxx284
-rw-r--r--sw/source/core/layout/hffrm.cxx38
-rw-r--r--sw/source/core/layout/layact.cxx386
-rw-r--r--sw/source/core/layout/laycache.cxx223
-rw-r--r--sw/source/core/layout/layhelp.hxx86
-rw-r--r--sw/source/core/layout/layouter.cxx36
-rw-r--r--sw/source/core/layout/makefile.mk105
-rw-r--r--sw/source/core/layout/newfrm.cxx92
-rw-r--r--sw/source/core/layout/objectformatter.cxx4
-rw-r--r--sw/source/core/layout/pagechg.cxx216
-rw-r--r--sw/source/core/layout/pagedesc.cxx22
-rw-r--r--sw/source/core/layout/paintfrm.cxx415
-rw-r--r--sw/source/core/layout/sectfrm.cxx332
-rw-r--r--sw/source/core/layout/softpagebreak.cxx4
-rw-r--r--sw/source/core/layout/ssfrm.cxx102
-rw-r--r--sw/source/core/layout/tabfrm.cxx488
-rw-r--r--sw/source/core/layout/trvlfrm.cxx324
-rw-r--r--sw/source/core/layout/unusedf.cxx30
-rw-r--r--sw/source/core/layout/virtoutp.cxx24
-rw-r--r--sw/source/core/layout/virtoutp.hxx8
-rw-r--r--sw/source/core/layout/wsfrm.cxx312
-rw-r--r--sw/source/core/makefile.mk99
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx101
-rw-r--r--sw/source/core/objectpositioning/makefile.mk62
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx123
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx12
-rw-r--r--sw/source/core/ole/makefile.mk55
-rw-r--r--sw/source/core/ole/ndole.cxx88
-rw-r--r--sw/source/core/para/makefile.mk57
-rw-r--r--sw/source/core/para/paratr.cxx8
-rw-r--r--sw/source/core/sw3io/makefile.mk52
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx30
-rw-r--r--sw/source/core/sw3io/swacorr.cxx12
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx125
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx34
-rw-r--r--sw/source/core/swg/makefile.mk55
-rw-r--r--sw/source/core/swg/swblocks.cxx180
-rw-r--r--sw/source/core/table/makefile.mk48
-rw-r--r--sw/source/core/table/swnewtable.cxx362
-rw-r--r--sw/source/core/table/swtable.cxx399
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx52
-rw-r--r--sw/source/core/text/atrhndl.hxx24
-rw-r--r--sw/source/core/text/atrstck.cxx64
-rw-r--r--sw/source/core/text/blink.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx37
-rw-r--r--sw/source/core/text/frmform.cxx24
-rw-r--r--sw/source/core/text/frmpaint.cxx8
-rw-r--r--sw/source/core/text/guess.cxx18
-rw-r--r--sw/source/core/text/inftxt.cxx110
-rw-r--r--sw/source/core/text/inftxt.hxx42
-rw-r--r--sw/source/core/text/itradj.cxx28
-rw-r--r--sw/source/core/text/itratr.cxx42
-rw-r--r--sw/source/core/text/itratr.hxx6
-rw-r--r--sw/source/core/text/itrcrsr.cxx48
-rw-r--r--sw/source/core/text/itrform2.cxx56
-rw-r--r--sw/source/core/text/itrform2.hxx4
-rw-r--r--sw/source/core/text/itrpaint.cxx22
-rw-r--r--sw/source/core/text/itrtxt.cxx22
-rw-r--r--sw/source/core/text/itrtxt.hxx4
-rw-r--r--sw/source/core/text/makefile.mk104
-rw-r--r--sw/source/core/text/pordrop.hxx6
-rw-r--r--sw/source/core/text/porexp.hxx8
-rw-r--r--sw/source/core/text/porfld.cxx62
-rw-r--r--sw/source/core/text/porfld.hxx12
-rw-r--r--sw/source/core/text/porfly.cxx12
-rw-r--r--sw/source/core/text/porftn.hxx4
-rw-r--r--sw/source/core/text/porglue.cxx2
-rw-r--r--sw/source/core/text/porlay.cxx198
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.cxx16
-rw-r--r--sw/source/core/text/pormulti.cxx174
-rw-r--r--sw/source/core/text/pormulti.hxx24
-rw-r--r--sw/source/core/text/porrst.cxx4
-rw-r--r--sw/source/core/text/porrst.hxx4
-rw-r--r--sw/source/core/text/portab.hxx6
-rw-r--r--sw/source/core/text/portxt.cxx18
-rw-r--r--sw/source/core/text/redlnitr.cxx6
-rw-r--r--sw/source/core/text/redlnitr.hxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx30
-rw-r--r--sw/source/core/text/txtfld.cxx94
-rw-r--r--sw/source/core/text/txtfly.cxx24
-rw-r--r--sw/source/core/text/txtfly.hxx2
-rw-r--r--sw/source/core/text/txtfrm.cxx125
-rw-r--r--sw/source/core/text/txtftn.cxx26
-rw-r--r--sw/source/core/text/txthyph.cxx2
-rw-r--r--sw/source/core/text/txtio.cxx6
-rw-r--r--sw/source/core/text/txttab.cxx19
-rw-r--r--sw/source/core/text/widorp.cxx12
-rw-r--r--sw/source/core/text/wrong.cxx14
-rw-r--r--sw/source/core/tox/makefile.mk56
-rw-r--r--sw/source/core/tox/tox.cxx130
-rw-r--r--sw/source/core/tox/toxhlp.cxx2
-rw-r--r--sw/source/core/tox/txmsrt.cxx123
-rw-r--r--sw/source/core/txtnode/atrfld.cxx21
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx20
-rw-r--r--sw/source/core/txtnode/atrftn.cxx40
-rw-r--r--sw/source/core/txtnode/atrtox.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx44
-rw-r--r--sw/source/core/txtnode/fntcache.cxx198
-rw-r--r--sw/source/core/txtnode/fntcap.cxx60
-rw-r--r--sw/source/core/txtnode/makefile.mk77
-rw-r--r--sw/source/core/txtnode/ndhints.cxx58
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx430
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx170
-rw-r--r--sw/source/core/txtnode/thints.cxx245
-rw-r--r--sw/source/core/txtnode/txatritr.cxx14
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx38
-rw-r--r--sw/source/core/txtnode/txtedt.cxx239
-rw-r--r--sw/source/core/undo/SwUndoField.cxx41
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx123
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx96
-rw-r--r--sw/source/core/undo/SwUndoTOXChange.cxx15
-rw-r--r--sw/source/core/undo/docundo.cxx1128
-rw-r--r--sw/source/core/undo/makefile.mk81
-rw-r--r--sw/source/core/undo/rolbck.cxx164
-rw-r--r--sw/source/core/undo/unattr.cxx332
-rw-r--r--sw/source/core/undo/unbkmk.cxx18
-rw-r--r--sw/source/core/undo/undel.cxx160
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/core/undo/undobj.cxx371
-rw-r--r--sw/source/core/undo/undobj1.cxx185
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx9
-rw-r--r--sw/source/core/undo/undraw.cxx109
-rw-r--r--sw/source/core/undo/unfmco.cxx42
-rw-r--r--sw/source/core/undo/unins.cxx347
-rw-r--r--sw/source/core/undo/unmove.cxx49
-rw-r--r--sw/source/core/undo/unnum.cxx208
-rw-r--r--sw/source/core/undo/unoutl.cxx28
-rw-r--r--sw/source/core/undo/unovwr.cxx126
-rw-r--r--sw/source/core/undo/unredln.cxx188
-rw-r--r--sw/source/core/undo/unsect.cxx72
-rw-r--r--sw/source/core/undo/unsort.cxx106
-rw-r--r--sw/source/core/undo/unspnd.cxx56
-rw-r--r--sw/source/core/undo/untbl.cxx695
-rw-r--r--sw/source/core/undo/untblk.cxx90
-rw-r--r--sw/source/core/unocore/makefile.mk122
-rw-r--r--sw/source/core/unocore/swunohelper.cxx52
-rw-r--r--sw/source/core/unocore/unobkm.cxx9
-rw-r--r--sw/source/core/unocore/unochart.cxx12
-rw-r--r--sw/source/core/unocore/unocoll.cxx6
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx36
-rw-r--r--sw/source/core/unocore/unodraw.cxx19
-rw-r--r--sw/source/core/unocore/unoevent.cxx4
-rw-r--r--sw/source/core/unocore/unofield.cxx65
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx18
-rw-r--r--sw/source/core/unocore/unoframe.cxx54
-rw-r--r--sw/source/core/unocore/unoidx.cxx12
-rw-r--r--sw/source/core/unocore/unomap.cxx3
-rw-r--r--sw/source/core/unocore/unoobj.cxx73
-rw-r--r--sw/source/core/unocore/unoobj2.cxx47
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx12
-rw-r--r--sw/source/core/unocore/unoport.cxx8
-rw-r--r--sw/source/core/unocore/unoportenum.cxx54
-rw-r--r--sw/source/core/unocore/unoprnms.cxx6
-rw-r--r--sw/source/core/unocore/unoredline.cxx10
-rw-r--r--sw/source/core/unocore/unoredlines.cxx4
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx15
-rw-r--r--sw/source/core/unocore/unosett.cxx58
-rw-r--r--sw/source/core/unocore/unosrch.cxx64
-rw-r--r--sw/source/core/unocore/unostyle.cxx55
-rw-r--r--sw/source/core/unocore/unotbl.cxx123
-rw-r--r--sw/source/core/unocore/unotext.cxx68
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx12
-rw-r--r--sw/source/core/view/makefile.mk61
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx9
-rw-r--r--sw/source/core/view/printdata.cxx198
-rw-r--r--sw/source/core/view/vdraw.cxx30
-rw-r--r--sw/source/core/view/viewimp.cxx28
-rw-r--r--sw/source/core/view/viewpg.cxx6
-rw-r--r--sw/source/core/view/viewsh.cxx281
-rw-r--r--sw/source/core/view/vnew.cxx26
-rw-r--r--sw/source/core/view/vprint.cxx215
-rw-r--r--sw/source/filter/ascii/ascatr.cxx20
-rw-r--r--sw/source/filter/ascii/makefile.mk57
-rw-r--r--sw/source/filter/ascii/parasc.cxx46
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx22
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx660
-rw-r--r--sw/source/filter/basflt/iodetect.cxx76
-rw-r--r--sw/source/filter/basflt/makefile.mk57
-rw-r--r--sw/source/filter/basflt/shellio.cxx168
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx8
-rw-r--r--sw/source/filter/html/css1atr.cxx330
-rw-r--r--sw/source/filter/html/htmlatr.cxx478
-rw-r--r--sw/source/filter/html/htmlbas.cxx30
-rw-r--r--sw/source/filter/html/htmlcss1.cxx412
-rw-r--r--sw/source/filter/html/htmlctxt.cxx108
-rw-r--r--sw/source/filter/html/htmldraw.cxx6
-rw-r--r--sw/source/filter/html/htmlfld.cxx88
-rw-r--r--sw/source/filter/html/htmlfldw.cxx56
-rw-r--r--sw/source/filter/html/htmlfly.cxx262
-rw-r--r--sw/source/filter/html/htmlfly.hxx38
-rw-r--r--sw/source/filter/html/htmlflyt.cxx12
-rw-r--r--sw/source/filter/html/htmlform.cxx24
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/html/htmlftn.cxx70
-rw-r--r--sw/source/filter/html/htmlgrin.cxx203
-rw-r--r--sw/source/filter/html/htmlnum.cxx8
-rw-r--r--sw/source/filter/html/htmlplug.cxx114
-rw-r--r--sw/source/filter/html/htmlsect.cxx18
-rw-r--r--sw/source/filter/html/htmltab.cxx29
-rw-r--r--sw/source/filter/html/htmltabw.cxx17
-rw-r--r--sw/source/filter/html/makefile.mk79
-rw-r--r--sw/source/filter/html/parcss1.cxx154
-rw-r--r--sw/source/filter/html/svxcss1.cxx642
-rw-r--r--sw/source/filter/html/swcss1.hxx94
-rw-r--r--sw/source/filter/html/swhtml.cxx602
-rw-r--r--sw/source/filter/html/swhtml.hxx8
-rw-r--r--sw/source/filter/html/wrthtml.cxx16
-rw-r--r--sw/source/filter/html/wrthtml.hxx6
-rw-r--r--sw/source/filter/inc/fltbase.hxx26
-rw-r--r--sw/source/filter/inc/fltglbls.hxx46
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx240
-rw-r--r--sw/source/filter/inc/msfilter.hxx12
-rw-r--r--sw/source/filter/inc/rtf.hxx70
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx172
-rw-r--r--sw/source/filter/makefile.mk67
-rw-r--r--sw/source/filter/rtf/makefile.mk60
-rw-r--r--sw/source/filter/rtf/rtffld.cxx58
-rw-r--r--sw/source/filter/rtf/rtffly.cxx182
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx137
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx143
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx463
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx61
-rw-r--r--sw/source/filter/writer/makefile.mk58
-rw-r--r--sw/source/filter/writer/writer.cxx86
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx10
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx220
-rw-r--r--sw/source/filter/ww1/fltshell.cxx381
-rw-r--r--sw/source/filter/ww1/makefile.mk93
-rw-r--r--sw/source/filter/ww1/w1class.cxx354
-rw-r--r--sw/source/filter/ww1/w1class.hxx612
-rw-r--r--sw/source/filter/ww1/w1filter.cxx206
-rw-r--r--sw/source/filter/ww1/w1par.cxx16
-rw-r--r--sw/source/filter/ww1/w1par.hxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx139
-rw-r--r--sw/source/filter/ww1/w1struct.hxx516
-rw-r--r--sw/source/filter/ww8/README-rtf.txt31
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx6
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx6
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx46
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx121
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx42
-rw-r--r--sw/source/filter/ww8/docxexport.cxx21
-rw-r--r--sw/source/filter/ww8/docxexport.hxx14
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx125
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx7
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx1
-rw-r--r--sw/source/filter/ww8/escher.hxx32
-rw-r--r--sw/source/filter/ww8/makefile.mk91
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx112
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx48
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx145
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx37
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx9
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx9
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.cxx10
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.hxx7
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx13
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx9
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx40
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx8
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx18
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx193
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx114
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx137
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx277
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx466
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx364
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx78
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx374
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx50
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx20
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx10
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx296
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx26
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx58
-rw-r--r--sw/source/filter/ww8/ww8par.cxx497
-rw-r--r--sw/source/filter/ww8/ww8par.hxx402
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx332
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx68
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx74
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx50
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx142
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx466
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx636
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx940
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx300
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx6
-rw-r--r--sw/source/filter/xml/makefile.mk76
-rw-r--r--sw/source/filter/xml/swxml.cxx28
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx6
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx8
-rw-r--r--sw/source/filter/xml/xmlitem.cxx6
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx4
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx38
-rw-r--r--sw/source/filter/xml/xmltbli.cxx16
-rw-r--r--sw/source/filter/xml/xmltbli.hxx6
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/ui/app/appenv.cxx78
-rw-r--r--sw/source/ui/app/apphdl.cxx44
-rw-r--r--sw/source/ui/app/applab.cxx2
-rw-r--r--sw/source/ui/app/appopt.cxx114
-rw-r--r--sw/source/ui/app/docsh.cxx211
-rw-r--r--sw/source/ui/app/docsh2.cxx303
-rw-r--r--sw/source/ui/app/docshini.cxx91
-rw-r--r--sw/source/ui/app/docst.cxx155
-rw-r--r--sw/source/ui/app/docstyle.cxx430
-rw-r--r--sw/source/ui/app/mainwn.cxx12
-rw-r--r--sw/source/ui/app/makefile.mk95
-rw-r--r--sw/source/ui/app/mn.src506
-rw-r--r--sw/source/ui/app/swmodul1.cxx20
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/app/swwait.cxx18
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx12
-rw-r--r--sw/source/ui/cctrl/makefile.mk59
-rw-r--r--sw/source/ui/cctrl/popbox.cxx4
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx30
-rw-r--r--sw/source/ui/chrdlg/break.cxx45
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx12
-rw-r--r--sw/source/ui/chrdlg/ccoll.src5
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx30
-rw-r--r--sw/source/ui/chrdlg/chardlg.src8
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx142
-rw-r--r--sw/source/ui/chrdlg/drpcps.src7
-rw-r--r--sw/source/ui/chrdlg/makefile.mk72
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx66
-rw-r--r--sw/source/ui/chrdlg/numpara.src8
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx26
-rw-r--r--sw/source/ui/chrdlg/swbreak.src8
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx48
-rw-r--r--sw/source/ui/config/barcfg.cxx4
-rw-r--r--sw/source/ui/config/caption.cxx8
-rw-r--r--sw/source/ui/config/cfgitems.cxx38
-rw-r--r--sw/source/ui/config/fontcfg.cxx16
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.src22
-rw-r--r--sw/source/ui/config/makefile.mk87
-rw-r--r--sw/source/ui/config/modcfg.cxx44
-rw-r--r--sw/source/ui/config/optcomp.cxx82
-rw-r--r--sw/source/ui/config/optcomp.src3
-rw-r--r--sw/source/ui/config/optdlg.hrc15
-rw-r--r--sw/source/ui/config/optdlg.src107
-rw-r--r--sw/source/ui/config/optload.cxx112
-rw-r--r--sw/source/ui/config/optload.src18
-rw-r--r--sw/source/ui/config/optpage.cxx481
-rw-r--r--sw/source/ui/config/prtopt.cxx5
-rw-r--r--sw/source/ui/config/redlopt.src8
-rw-r--r--sw/source/ui/config/uinums.cxx114
-rw-r--r--sw/source/ui/config/usrpref.cxx186
-rw-r--r--sw/source/ui/config/viewopt.cxx44
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx10
-rw-r--r--sw/source/ui/dbui/addresslistdialog.src5
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src13
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx16
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src7
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx210
-rw-r--r--sw/source/ui/dbui/dbinsdlg.src21
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx347
-rw-r--r--sw/source/ui/dbui/dbtree.cxx34
-rw-r--r--sw/source/ui/dbui/dbui.src1
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx6
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src1
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx8
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src1
-rw-r--r--sw/source/ui/dbui/makefile.mk108
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx87
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src23
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.src8
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx20
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.src6
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx20
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.src6
-rw-r--r--sw/source/ui/dbui/mmmergepage.src6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx63
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src27
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.src2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.src7
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src1
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx4
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx38
-rw-r--r--sw/source/ui/dialog/abstract.cxx8
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx68
-rw-r--r--sw/source/ui/dialog/ascfldlg.src6
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx32
-rw-r--r--sw/source/ui/dialog/docstdlg.src1
-rw-r--r--sw/source/ui/dialog/macassgn.cxx16
-rw-r--r--sw/source/ui/dialog/makefile.mk99
-rw-r--r--sw/source/ui/dialog/regionsw.cxx44
-rw-r--r--sw/source/ui/dialog/regionsw.src44
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx5
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx122
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx117
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx378
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx182
-rw-r--r--sw/source/ui/dochdl/makefile.mk65
-rw-r--r--sw/source/ui/dochdl/selglos.src3
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx392
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx21
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx17
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx15
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx11
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx27
-rw-r--r--sw/source/ui/docvw/access.src19
-rw-r--r--sw/source/ui/docvw/docvw.src22
-rw-r--r--sw/source/ui/docvw/edtdd.cxx84
-rw-r--r--sw/source/ui/docvw/edtwin.cxx884
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx43
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx24
-rw-r--r--sw/source/ui/docvw/extedit.cxx2
-rw-r--r--sw/source/ui/docvw/makefile.mk70
-rw-r--r--sw/source/ui/docvw/romenu.cxx80
-rw-r--r--sw/source/ui/docvw/romenu.hxx8
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx127
-rw-r--r--sw/source/ui/envelp/envfmt.cxx70
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envfmt.src9
-rw-r--r--sw/source/ui/envelp/envimg.cxx14
-rw-r--r--sw/source/ui/envelp/envlop.src7
-rw-r--r--sw/source/ui/envelp/envlop1.cxx52
-rw-r--r--sw/source/ui/envelp/envprt.cxx20
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/envprt.src17
-rw-r--r--sw/source/ui/envelp/label.src44
-rw-r--r--sw/source/ui/envelp/label1.cxx20
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx4
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx52
-rw-r--r--sw/source/ui/envelp/labfmt.hxx6
-rw-r--r--sw/source/ui/envelp/labfmt.src11
-rw-r--r--sw/source/ui/envelp/labimg.cxx6
-rw-r--r--sw/source/ui/envelp/labprt.cxx18
-rw-r--r--sw/source/ui/envelp/labprt.hxx6
-rw-r--r--sw/source/ui/envelp/labprt.src6
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx51
-rw-r--r--sw/source/ui/envelp/mailmrge.src29
-rw-r--r--sw/source/ui/envelp/makefile.mk79
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx7
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx10
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src3
-rw-r--r--sw/source/ui/fldui/changedb.cxx20
-rw-r--r--sw/source/ui/fldui/changedb.src2
-rw-r--r--sw/source/ui/fldui/flddb.cxx78
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddb.src8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx100
-rw-r--r--sw/source/ui/fldui/flddinf.hxx10
-rw-r--r--sw/source/ui/fldui/flddinf.src3
-rw-r--r--sw/source/ui/fldui/flddok.cxx128
-rw-r--r--sw/source/ui/fldui/flddok.hxx12
-rw-r--r--sw/source/ui/fldui/flddok.src8
-rw-r--r--sw/source/ui/fldui/fldedt.cxx39
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx142
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx6
-rw-r--r--sw/source/ui/fldui/fldfunc.src15
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx288
-rw-r--r--sw/source/ui/fldui/fldpage.cxx40
-rw-r--r--sw/source/ui/fldui/fldpage.hxx44
-rw-r--r--sw/source/ui/fldui/fldref.cxx146
-rw-r--r--sw/source/ui/fldui/fldref.hxx6
-rw-r--r--sw/source/ui/fldui/fldref.src5
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx28
-rw-r--r--sw/source/ui/fldui/fldvar.cxx238
-rw-r--r--sw/source/ui/fldui/fldvar.hxx16
-rw-r--r--sw/source/ui/fldui/fldvar.src9
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx28
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx22
-rw-r--r--sw/source/ui/fldui/inpdlg.src3
-rw-r--r--sw/source/ui/fldui/javaedit.cxx14
-rw-r--r--sw/source/ui/fldui/javaedit.src9
-rw-r--r--sw/source/ui/fldui/makefile.mk90
-rw-r--r--sw/source/ui/fldui/xfldui.cxx10
-rw-r--r--sw/source/ui/fmtui/makefile.mk54
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx52
-rw-r--r--sw/source/ui/frmdlg/colex.cxx74
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx34
-rw-r--r--sw/source/ui/frmdlg/column.cxx253
-rw-r--r--sw/source/ui/frmdlg/column.hrc1
-rw-r--r--sw/source/ui/frmdlg/column.src27
-rw-r--r--sw/source/ui/frmdlg/cption.cxx8
-rw-r--r--sw/source/ui/frmdlg/cption.src13
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx19
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx64
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx575
-rw-r--r--sw/source/ui/frmdlg/frmpage.src44
-rw-r--r--sw/source/ui/frmdlg/makefile.mk78
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx90
-rw-r--r--sw/source/ui/frmdlg/wrap.src14
-rw-r--r--sw/source/ui/globdoc/makefile.mk54
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx2
-rw-r--r--sw/source/ui/inc/abstract.hxx4
-rw-r--r--sw/source/ui/inc/annotsh.hxx5
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx2
-rw-r--r--sw/source/ui/inc/basesh.hxx4
-rw-r--r--sw/source/ui/inc/bmpwin.hxx16
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx12
-rw-r--r--sw/source/ui/inc/break.hxx12
-rw-r--r--sw/source/ui/inc/caption.hxx40
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx14
-rw-r--r--sw/source/ui/inc/cfgitems.hxx132
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx10
-rw-r--r--sw/source/ui/inc/cnttab.hxx8
-rw-r--r--sw/source/ui/inc/colex.hxx8
-rw-r--r--sw/source/ui/inc/colmgr.hxx48
-rw-r--r--sw/source/ui/inc/column.hxx44
-rw-r--r--sw/source/ui/inc/conarc.hxx8
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx8
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx8
-rw-r--r--sw/source/ui/inc/conrect.hxx10
-rw-r--r--sw/source/ui/inc/content.hxx66
-rw-r--r--sw/source/ui/inc/conttree.hxx120
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx16
-rw-r--r--sw/source/ui/inc/dbtree.hxx10
-rw-r--r--sw/source/ui/inc/docfnote.hxx2
-rw-r--r--sw/source/ui/inc/docstdlg.hxx19
-rw-r--r--sw/source/ui/inc/drawbase.hxx26
-rw-r--r--sw/source/ui/inc/drpcps.hxx16
-rw-r--r--sw/source/ui/inc/drwbassh.hxx8
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx9
-rw-r--r--sw/source/ui/inc/dselect.hxx4
-rw-r--r--sw/source/ui/inc/edtwin.hxx90
-rw-r--r--sw/source/ui/inc/envimg.hxx4
-rw-r--r--sw/source/ui/inc/envlop.hxx8
-rw-r--r--sw/source/ui/inc/fldedt.hxx6
-rw-r--r--sw/source/ui/inc/fldmgr.hxx80
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx16
-rw-r--r--sw/source/ui/inc/fldwrap.hxx10
-rw-r--r--sw/source/ui/inc/fontcfg.hxx12
-rw-r--r--sw/source/ui/inc/formedt.hxx6
-rw-r--r--sw/source/ui/inc/frmdlg.hxx19
-rw-r--r--sw/source/ui/inc/frmmgr.hxx23
-rw-r--r--sw/source/ui/inc/frmpage.hxx104
-rw-r--r--sw/source/ui/inc/glosbib.hxx9
-rw-r--r--sw/source/ui/inc/glosdoc.hxx24
-rw-r--r--sw/source/ui/inc/gloshdl.hxx50
-rw-r--r--sw/source/ui/inc/gloslst.hxx16
-rw-r--r--sw/source/ui/inc/glossary.hxx12
-rw-r--r--sw/source/ui/inc/glshell.hxx4
-rw-r--r--sw/source/ui/inc/initui.hxx2
-rw-r--r--sw/source/ui/inc/inpdlg.hxx2
-rw-r--r--sw/source/ui/inc/inputwin.hxx33
-rw-r--r--sw/source/ui/inc/insfnote.hxx14
-rw-r--r--sw/source/ui/inc/insrule.hxx6
-rw-r--r--sw/source/ui/inc/instable.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx12
-rw-r--r--sw/source/ui/inc/label.hxx8
-rw-r--r--sw/source/ui/inc/langhelper.hxx8
-rw-r--r--sw/source/ui/inc/linenum.hxx8
-rw-r--r--sw/source/ui/inc/macassgn.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx2
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/ui/inc/mailmrge.hxx8
-rw-r--r--sw/source/ui/inc/mergetbl.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx10
-rw-r--r--sw/source/ui/inc/multmrk.hxx2
-rw-r--r--sw/source/ui/inc/navicont.hxx8
-rw-r--r--sw/source/ui/inc/navipi.hxx36
-rw-r--r--sw/source/ui/inc/navmgr.hxx4
-rw-r--r--sw/source/ui/inc/num.hxx24
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx32
-rw-r--r--sw/source/ui/inc/numpara.hxx10
-rw-r--r--sw/source/ui/inc/numprevw.hxx10
-rw-r--r--sw/source/ui/inc/olmenu.hxx4
-rw-r--r--sw/source/ui/inc/optcomp.hxx8
-rw-r--r--sw/source/ui/inc/optload.hxx12
-rw-r--r--sw/source/ui/inc/optpage.hxx70
-rw-r--r--sw/source/ui/inc/outline.hxx20
-rw-r--r--sw/source/ui/inc/pgfnote.hxx8
-rw-r--r--sw/source/ui/inc/pggrid.hxx4
-rw-r--r--sw/source/ui/inc/prcntfld.hxx10
-rw-r--r--sw/source/ui/inc/pview.hxx57
-rw-r--r--sw/source/ui/inc/redlndlg.hxx36
-rw-r--r--sw/source/ui/inc/regionsw.hxx22
-rw-r--r--sw/source/ui/inc/ribbar.hrc3
-rw-r--r--sw/source/ui/inc/rowht.hxx2
-rw-r--r--sw/source/ui/inc/scroll.hxx24
-rw-r--r--sw/source/ui/inc/selglos.hxx8
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx10
-rw-r--r--sw/source/ui/inc/split.hxx10
-rw-r--r--sw/source/ui/inc/splittbl.hxx4
-rw-r--r--sw/source/ui/inc/srcedtw.hxx30
-rw-r--r--sw/source/ui/inc/srcview.hxx20
-rw-r--r--sw/source/ui/inc/srtdlg.hxx8
-rw-r--r--sw/source/ui/inc/swcont.hxx16
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx68
-rw-r--r--sw/source/ui/inc/swlbox.hxx34
-rw-r--r--sw/source/ui/inc/swmn_tmpl.hrc386
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx2
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx2
-rw-r--r--sw/source/ui/inc/swtablerep.hxx46
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx8
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx66
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx12
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx14
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/ui/inc/syncbtn.hxx2
-rw-r--r--sw/source/ui/inc/tabledlg.hxx4
-rw-r--r--sw/source/ui/inc/tablemgr.hxx18
-rw-r--r--sw/source/ui/inc/tabsh.hxx4
-rw-r--r--sw/source/ui/inc/tautofmt.hxx14
-rw-r--r--sw/source/ui/inc/tblctrl.hxx2
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx6
-rw-r--r--sw/source/ui/inc/textcontrolcombo.hxx10
-rw-r--r--sw/source/ui/inc/textsh.hxx2
-rw-r--r--sw/source/ui/inc/titlepage.hxx2
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx14
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toolbox.hrc (renamed from sw/source/ui/inc/toolbox_tmpl.hrc)0
-rw-r--r--sw/source/ui/inc/toxmgr.hxx104
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx16
-rw-r--r--sw/source/ui/inc/uinums.hxx20
-rw-r--r--sw/source/ui/inc/uitool.hxx20
-rw-r--r--sw/source/ui/inc/uivwimp.hxx9
-rw-r--r--sw/source/ui/inc/unotools.hxx2
-rw-r--r--sw/source/ui/inc/unotxvw.hxx14
-rw-r--r--sw/source/ui/inc/usrpref.hxx31
-rw-r--r--sw/source/ui/inc/view.hxx220
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx6
-rw-r--r--sw/source/ui/inc/workctrl.hxx30
-rw-r--r--sw/source/ui/inc/wrap.hxx32
-rw-r--r--sw/source/ui/inc/wrtsh.hxx382
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx12
-rw-r--r--sw/source/ui/index/cnttab.cxx137
-rw-r--r--sw/source/ui/index/cnttab.hrc1
-rw-r--r--sw/source/ui/index/cnttab.src78
-rw-r--r--sw/source/ui/index/idxmrk.src13
-rw-r--r--sw/source/ui/index/makefile.mk67
-rw-r--r--sw/source/ui/index/multmrk.cxx4
-rw-r--r--sw/source/ui/index/multmrk.src3
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx61
-rw-r--r--sw/source/ui/index/toxmgr.cxx68
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx6
-rw-r--r--sw/source/ui/lingu/makefile.mk56
-rw-r--r--sw/source/ui/lingu/olmenu.cxx61
-rw-r--r--sw/source/ui/makefile.mk101
-rw-r--r--sw/source/ui/misc/bookmark.cxx45
-rw-r--r--sw/source/ui/misc/bookmark.src4
-rw-r--r--sw/source/ui/misc/docfnote.cxx65
-rw-r--r--sw/source/ui/misc/docfnote.src26
-rw-r--r--sw/source/ui/misc/glosbib.cxx97
-rw-r--r--sw/source/ui/misc/glosbib.src5
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx35
-rw-r--r--sw/source/ui/misc/glossary.src23
-rw-r--r--sw/source/ui/misc/glshell.cxx30
-rw-r--r--sw/source/ui/misc/impfnote.hxx16
-rw-r--r--sw/source/ui/misc/insfnote.cxx56
-rw-r--r--sw/source/ui/misc/insfnote.hrc4
-rw-r--r--sw/source/ui/misc/insfnote.src15
-rw-r--r--sw/source/ui/misc/insrule.cxx8
-rw-r--r--sw/source/ui/misc/linenum.cxx41
-rw-r--r--sw/source/ui/misc/linenum.src11
-rw-r--r--sw/source/ui/misc/makefile.mk93
-rw-r--r--sw/source/ui/misc/num.cxx169
-rw-r--r--sw/source/ui/misc/num.src12
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx20
-rw-r--r--sw/source/ui/misc/outline.cxx219
-rw-r--r--sw/source/ui/misc/outline.src10
-rw-r--r--sw/source/ui/misc/pgfnote.cxx56
-rw-r--r--sw/source/ui/misc/pgfnote.src8
-rw-r--r--sw/source/ui/misc/pggrid.cxx18
-rw-r--r--sw/source/ui/misc/pggrid.src13
-rw-r--r--sw/source/ui/misc/redlndlg.cxx227
-rw-r--r--sw/source/ui/misc/srtdlg.cxx126
-rw-r--r--sw/source/ui/misc/srtdlg.src25
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx16
-rw-r--r--sw/source/ui/misc/titlepage.cxx48
-rw-r--r--sw/source/ui/ribbar/conarc.cxx16
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/conform.cxx28
-rw-r--r--sw/source/ui/ribbar/conpoly.cxx18
-rw-r--r--sw/source/ui/ribbar/conrect.cxx34
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx143
-rw-r--r--sw/source/ui/ribbar/dselect.cxx18
-rwxr-xr-x[-rw-r--r--]sw/source/ui/ribbar/inputwin.cxx165
-rw-r--r--sw/source/ui/ribbar/inputwin.src12
-rw-r--r--sw/source/ui/ribbar/makefile.mk69
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx4
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx10
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx110
-rw-r--r--sw/source/ui/ribbar/workctrl.src145
-rw-r--r--sw/source/ui/shells/annotsh.cxx124
-rw-r--r--sw/source/ui/shells/basesh.cxx377
-rw-r--r--sw/source/ui/shells/beziersh.cxx30
-rw-r--r--sw/source/ui/shells/drawdlg.cxx38
-rw-r--r--sw/source/ui/shells/drawsh.cxx44
-rw-r--r--sw/source/ui/shells/drwbassh.cxx107
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx30
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx84
-rw-r--r--sw/source/ui/shells/frmsh.cxx116
-rw-r--r--sw/source/ui/shells/grfsh.cxx68
-rw-r--r--sw/source/ui/shells/grfshex.cxx1
-rwxr-xr-x[-rw-r--r--]sw/source/ui/shells/langhelper.cxx44
-rw-r--r--sw/source/ui/shells/listsh.cxx28
-rw-r--r--sw/source/ui/shells/makefile.mk84
-rw-r--r--sw/source/ui/shells/mediash.cxx12
-rw-r--r--sw/source/ui/shells/navsh.cxx14
-rw-r--r--sw/source/ui/shells/shells.src834
-rw-r--r--sw/source/ui/shells/tabsh.cxx233
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx148
-rw-r--r--sw/source/ui/shells/textglos.cxx24
-rw-r--r--sw/source/ui/shells/textidx.cxx26
-rw-r--r--sw/source/ui/shells/textsh.cxx200
-rw-r--r--sw/source/ui/shells/textsh1.cxx202
-rw-r--r--sw/source/ui/shells/textsh2.cxx22
-rw-r--r--sw/source/ui/shells/txtattr.cxx76
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx84
-rw-r--r--sw/source/ui/shells/txtnum.cxx30
-rw-r--r--sw/source/ui/smartmenu/makefile.mk53
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx14
-rw-r--r--sw/source/ui/table/chartins.cxx8
-rw-r--r--sw/source/ui/table/chartins.src6
-rw-r--r--sw/source/ui/table/colwd.cxx14
-rw-r--r--sw/source/ui/table/colwd.src4
-rw-r--r--sw/source/ui/table/convert.cxx26
-rw-r--r--sw/source/ui/table/convert.hrc3
-rw-r--r--sw/source/ui/table/convert.src20
-rw-r--r--sw/source/ui/table/instable.cxx16
-rw-r--r--sw/source/ui/table/instable.src11
-rw-r--r--sw/source/ui/table/makefile.mk81
-rw-r--r--sw/source/ui/table/mergetbl.cxx2
-rw-r--r--sw/source/ui/table/mergetbl.src4
-rw-r--r--sw/source/ui/table/rowht.cxx2
-rw-r--r--sw/source/ui/table/rowht.src4
-rw-r--r--sw/source/ui/table/splittbl.src6
-rw-r--r--sw/source/ui/table/swtablerep.cxx34
-rw-r--r--sw/source/ui/table/tabledlg.cxx384
-rw-r--r--sw/source/ui/table/tabledlg.hrc1
-rw-r--r--sw/source/ui/table/tabledlg.src41
-rw-r--r--sw/source/ui/table/tablemgr.cxx48
-rw-r--r--sw/source/ui/table/tablepg.hxx45
-rw-r--r--sw/source/ui/table/tautofmt.cxx118
-rw-r--r--sw/source/ui/table/tautofmt.src11
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx54
-rw-r--r--sw/source/ui/uiview/makefile.mk77
-rw-r--r--sw/source/ui/uiview/pview.cxx273
-rw-r--r--sw/source/ui/uiview/pview.src91
-rw-r--r--sw/source/ui/uiview/scroll.cxx26
-rw-r--r--sw/source/ui/uiview/srcview.cxx128
-rw-r--r--sw/source/ui/uiview/swcli.cxx23
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx16
-rw-r--r--sw/source/ui/uiview/view.cxx111
-rwxr-xr-x[-rw-r--r--]sw/source/ui/uiview/view.hrc0
-rw-r--r--sw/source/ui/uiview/view.src154
-rw-r--r--sw/source/ui/uiview/view0.cxx24
-rw-r--r--sw/source/ui/uiview/view1.cxx20
-rw-r--r--sw/source/ui/uiview/view2.cxx307
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx6
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx12
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx24
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx8
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx12
-rw-r--r--sw/source/ui/uiview/viewling.cxx6
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx80
-rw-r--r--sw/source/ui/uiview/viewport.cxx244
-rw-r--r--sw/source/ui/uiview/viewprt.cxx76
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx129
-rw-r--r--sw/source/ui/uiview/viewstat.cxx13
-rw-r--r--sw/source/ui/uiview/viewtab.cxx395
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx34
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.cxx370
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.hxx90
-rw-r--r--sw/source/ui/uno/detreg.cxx24
-rw-r--r--sw/source/ui/uno/makefile.mk82
-rw-r--r--sw/source/ui/uno/swdet2.cxx6
-rw-r--r--sw/source/ui/uno/swdetect.cxx31
-rw-r--r--sw/source/ui/uno/swdetect.hxx4
-rw-r--r--sw/source/ui/uno/unoatxt.cxx16
-rw-r--r--sw/source/ui/uno/unofreg.cxx93
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx42
-rw-r--r--sw/source/ui/uno/unomod.cxx64
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx223
-rw-r--r--sw/source/ui/uno/unotxvw.cxx33
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx36
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx18
-rw-r--r--sw/source/ui/utlui/condedit.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx31
-rw-r--r--sw/source/ui/utlui/glbltree.cxx224
-rw-r--r--sw/source/ui/utlui/gloslst.cxx76
-rw-r--r--sw/source/ui/utlui/gloslst.src1
-rw-r--r--sw/source/ui/utlui/initui.cxx18
-rw-r--r--sw/source/ui/utlui/makefile.mk79
-rw-r--r--sw/source/ui/utlui/navicfg.cxx4
-rw-r--r--sw/source/ui/utlui/navipi.cxx201
-rw-r--r--sw/source/ui/utlui/navipi.hrc1
-rw-r--r--sw/source/ui/utlui/navipi.src13
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx78
-rw-r--r--sw/source/ui/utlui/poolfmt.src23
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx10
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx10
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx4
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx6
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx14
-rw-r--r--sw/source/ui/utlui/uiitems.cxx20
-rw-r--r--sw/source/ui/utlui/uitool.cxx108
-rw-r--r--sw/source/ui/utlui/unotools.cxx8
-rw-r--r--sw/source/ui/utlui/unotools.src1
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx14
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx6
-rw-r--r--sw/source/ui/vba/makefile.mk140
-rw-r--r--sw/source/ui/vba/service.cxx14
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx2
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx25
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx5
-rw-r--r--sw/source/ui/vba/vbaeventshelper.cxx5
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx1
-rw-r--r--sw/source/ui/vba/vbafield.cxx10
-rw-r--r--sw/source/ui/vba/vbaselection.cxx2
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx18
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx6
-rw-r--r--sw/source/ui/web/makefile.mk62
-rw-r--r--sw/source/ui/web/web.src262
-rw-r--r--sw/source/ui/web/wtextsh.cxx2
-rw-r--r--sw/source/ui/web/wview.cxx29
-rw-r--r--sw/source/ui/wrtsh/delete.cxx36
-rw-r--r--sw/source/ui/wrtsh/makefile.mk62
-rw-r--r--sw/source/ui/wrtsh/move.cxx202
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx4
-rw-r--r--sw/source/ui/wrtsh/select.cxx238
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx209
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx91
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx16
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx56
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx72
-rw-r--r--sw/util/hidother.src18
-rw-r--r--sw/util/makefile.mk390
-rw-r--r--sw/util/msword.component37
-rw-r--r--sw/util/msword.map14
-rw-r--r--sw/util/sw.component104
-rw-r--r--sw/util/sw.flt136
-rw-r--r--sw/util/swd.component36
-rw-r--r--sw/util/swui.map6
-rw-r--r--sw/util/vbaswobj.component43
1428 files changed, 56756 insertions, 59635 deletions
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 1b896164099f..d708d3d76c2d 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -38,10 +38,6 @@ class SvxErrorHandler;
#define APPLICATIONNAME "smath3"
-#ifdef WIN
-#define RELEASE "WIN304"
-#endif
-
#ifdef PM2
#define RELEASE "PM304"
#endif
@@ -58,7 +54,7 @@ class SvxErrorHandler;
class SmResId : public ResId
{
public:
- SmResId(USHORT nId) :
+ SmResId(sal_uInt16 nId) :
ResId(nId)
{
}
@@ -67,31 +63,6 @@ public:
#endif
-#ifndef _DLL_
-class SmDLL;
-
-class SmApplicat: public SfxApplication
-{
-protected:
- SvxErrorHandler *pSvxErrorHandler;
-
- virtual void OpenClients();
-
- // initialization / deinitialization
- virtual void Init();
- virtual void Exit();
-
-public:
- void Main();
-
- SmApplicat() :
- SfxApplication("iso")
- {
- }
-
-};
-
-#endif
#endif
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
index 9d87ba0abd2b..9fc397eca0cc 100644
--- a/starmath/inc/config.hxx
+++ b/starmath/inc/config.hxx
@@ -48,7 +48,7 @@ public:
SmConfig();
virtual ~SmConfig();
- SmFontPickList & GetFontPickList(USHORT nIdent) { return vFontPickList[nIdent]; }
+ SmFontPickList & GetFontPickList(sal_uInt16 nIdent) { return vFontPickList[nIdent]; }
void ItemSetToConfig(const SfxItemSet &rSet);
void ConfigToItemSet(SfxItemSet &rSet) const;
diff --git a/starmath/inc/cursor.hxx b/starmath/inc/cursor.hxx
index b5fbd13e28cb..0de8931673d9 100644
--- a/starmath/inc/cursor.hxx
+++ b/starmath/inc/cursor.hxx
@@ -145,7 +145,7 @@ public:
void InsertElement(SmFormulaElement element);
/** Insert a command specified in commands.src*/
- void InsertCommand(USHORT nCommand);
+ void InsertCommand(sal_uInt16 nCommand);
/** Insert command text translated into line entries at position
*
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ea548a9ee528..316d1fb7ca62 100644..100755
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -70,10 +70,11 @@ class SmPrintOptionsTabPage : public SfxTabPage
MetricField aZoom;
FixedLine aFixedLine3;
CheckBox aNoRightSpaces;
+ CheckBox aSaveOnlyUsedSymbols;
DECL_LINK(SizeButtonClickHdl, Button *);
- virtual BOOL FillItemSet(SfxItemSet& rSet);
+ virtual sal_Bool FillItemSet(SfxItemSet& rSet);
virtual void Reset(const SfxItemSet& rSet);
public:
@@ -201,22 +202,22 @@ class SmCategoryDesc : public Resource
XubString Name;
XubString *Strings[4];
Bitmap *Graphics[4]; /* regular bitmaps */
- USHORT Minimum[4];
- USHORT Maximum[4];
- USHORT Value[4];
+ sal_uInt16 Minimum[4];
+ sal_uInt16 Maximum[4];
+ sal_uInt16 Value[4];
public:
- SmCategoryDesc(const ResId &rResId, USHORT nCategoryIdx);
+ SmCategoryDesc(const ResId &rResId, sal_uInt16 nCategoryIdx);
~SmCategoryDesc();
const XubString & GetName() const { return Name; }
- const XubString * GetString(USHORT Index) const { return Strings[Index]; }
- USHORT GetMinimum(USHORT Index) { return Minimum[Index]; }
- USHORT GetMaximum(USHORT Index) { return Maximum[Index]; }
- USHORT GetValue(USHORT Index) const { return Value[Index]; }
- void SetValue(USHORT Index, USHORT nVal) { Value[Index] = nVal;}
+ const XubString * GetString(sal_uInt16 Index) const { return Strings[Index]; }
+ sal_uInt16 GetMinimum(sal_uInt16 Index) { return Minimum[Index]; }
+ sal_uInt16 GetMaximum(sal_uInt16 Index) { return Maximum[Index]; }
+ sal_uInt16 GetValue(sal_uInt16 Index) const { return Value[Index]; }
+ void SetValue(sal_uInt16 Index, sal_uInt16 nVal) { Value[Index] = nVal;}
- const Bitmap * GetGraphic(USHORT Index) const
+ const Bitmap * GetGraphic(sal_uInt16 Index) const
{
return Graphics[Index];
}
@@ -242,7 +243,7 @@ class SmDistanceDialog : public ModalDialog
FixedLine aFixedLine;
SmCategoryDesc *Categories[NOCATEGORIES];
- USHORT nActiveCategory;
+ sal_uInt16 nActiveCategory;
bool bScaleAllBrackets;
DECL_LINK(GetFocusHdl, Control *);
@@ -251,8 +252,8 @@ class SmDistanceDialog : public ModalDialog
DECL_LINK(CheckBoxClickHdl, CheckBox *);
using Window::SetHelpId;
- void SetHelpId(MetricField &rField, ULONG nHelpId);
- void SetCategory(USHORT Category);
+ void SetHelpId(MetricField &rField, const rtl::OString& sHelpId);
+ void SetCategory(sal_uInt16 Category);
public:
SmDistanceDialog(Window *pParent, bool bFreeRes = true);
@@ -297,9 +298,9 @@ class SmShowSymbolSet : public Control
Size aOutputSize;
Link aSelectHdlLink;
Link aDblClickHdlLink;
- USHORT nLen;
- USHORT nRows, nColumns;
- USHORT nSelectSymbol;
+ sal_uInt16 nLen;
+ sal_uInt16 nRows, nColumns;
+ sal_uInt16 nSelectSymbol;
virtual void Paint(const Rectangle&);
virtual void MouseButtonDown(const MouseEvent& rMEvt);
@@ -312,8 +313,8 @@ public:
void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet);
- void SelectSymbol(USHORT nSymbol);
- USHORT GetSelectSymbol() const { return nSelectSymbol; }
+ void SelectSymbol(sal_uInt16 nSymbol);
+ sal_uInt16 GetSelectSymbol() const { return nSelectSymbol; }
void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; }
@@ -379,8 +380,8 @@ public:
virtual ~SmSymbolDialog();
bool SelectSymbolSet(const XubString &rSymbolSetName);
- void SelectSymbol(USHORT nSymbolPos);
- USHORT GetSelectedSymbol() const { return aSymbolSetDisplay.GetSelectSymbol(); }
+ void SelectSymbol(sal_uInt16 nSymbolPos);
+ sal_uInt16 GetSelectedSymbol() const { return aSymbolSetDisplay.GetSelectSymbol(); }
};
////////////////////////////////////////////////////////////////////////////////
@@ -395,8 +396,8 @@ public:
{
}
- void SetChar(xub_Unicode aChar);
- void SetFont(const Font &rFont);
+ void SetSymbol( const SmSym *pSym );
+ void SetSymbol( sal_UCS4 cChar, const Font &rFont );
};
////////////////////////////////////////////////////////////////////////////////
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 21b47a1f318c..97753d9446e1 100644..100755
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -31,19 +31,21 @@
#define SMDLL 1
-#include <sot/storage.hxx>
-#include <sot/sotref.hxx>
+#include <rtl/ustring.hxx>
+#include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx>
+#include <sot/sotref.hxx>
+#include <sot/storage.hxx>
#include <svl/lstner.hxx>
-#include <sfx2/docfac.hxx>
+#include <vcl/jobset.hxx>
#include <vcl/virdev.hxx>
+#include <set>
+
#include "format.hxx"
#include "parse.hxx"
#include "smmod.hxx"
-#include <vcl/jobset.hxx>
-
class SmNode;
class SfxMenuBarManager;
class SfxPrinter;
@@ -52,15 +54,15 @@ class SmCursor;
#define HINT_DATACHANGED 1004
-#define SM30BIDENT ((ULONG)0x534D3033L)
-#define SM30IDENT ((ULONG)0x30334d53L)
-#define SM304AIDENT ((ULONG)0x34303330L)
-#define SM30VERSION ((ULONG)0x00010000L)
+#define SM30BIDENT ((sal_uLong)0x534D3033L)
+#define SM30IDENT ((sal_uLong)0x30334d53L)
+#define SM304AIDENT ((sal_uLong)0x34303330L)
+#define SM30VERSION ((sal_uLong)0x00010000L)
#define SM50VERSION ((ULONG)0x00010001L) //Difference to SM30VERSION is
//the new border in the format.
-#define FRMIDENT ((ULONG)0x03031963L)
-#define FRMVERSION ((ULONG)0x00010001L)
+#define FRMIDENT ((sal_uLong)0x03031963L)
+#define FRMVERSION ((sal_uLong)0x00010001L)
#define STAROFFICE_XML "StarOffice XML (Math)"
#define MATHML_XML "MathML XML (Math)"
@@ -124,9 +126,10 @@ class SmDocShell : public SfxObjectShell, public SfxListener
nRightBorder,
nTopBorder,
nBottomBorder;
- USHORT nModifyCount;
+ sal_uInt16 nModifyCount;
bool bIsFormulaArranged;
SmCursor *pCursor;
+ std::set< rtl::OUString > aUsedSymbols; // to export used symbols only when saving
@@ -137,7 +140,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
virtual void Draw(OutputDevice *pDevice,
const JobSetup & rSetup,
- USHORT nAspect = ASPECT_CONTENT);
+ sal_uInt16 nAspect = ASPECT_CONTENT);
virtual void FillClass(SvGlobalName* pClassName,
sal_uInt32* pFormat,
@@ -147,16 +150,16 @@ class SmDocShell : public SfxObjectShell, public SfxListener
sal_Int32 nFileFormat,
sal_Bool bTemplate = sal_False ) const;
- virtual BOOL SetData( const String& rData );
- virtual ULONG GetMiscStatus() const;
+ virtual sal_Bool SetData( const String& rData );
+ virtual sal_uLong GetMiscStatus() const;
virtual void OnDocumentPrinterChanged( Printer * );
virtual sal_Bool InitNew( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- virtual BOOL Load( SfxMedium& rMedium );
+ virtual sal_Bool Load( SfxMedium& rMedium );
void ImplSave( SvStorageStreamRef xStrm );
- virtual BOOL Save();
- virtual BOOL SaveAs( SfxMedium& rMedium );
- virtual BOOL ConvertTo( SfxMedium &rMedium );
- virtual BOOL SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
+ virtual sal_Bool Save();
+ virtual sal_Bool SaveAs( SfxMedium& rMedium );
+ virtual sal_Bool ConvertTo( SfxMedium &rMedium );
+ virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
Printer *GetPrt();
OutputDevice* GetRefDev();
@@ -164,7 +167,7 @@ class SmDocShell : public SfxObjectShell, public SfxListener
bool IsFormulaArranged() const { return bIsFormulaArranged; }
void SetFormulaArranged(bool bVal) { bIsFormulaArranged = bVal; }
- virtual BOOL ConvertFrom(SfxMedium &rMedium);
+ virtual sal_Bool ConvertFrom(SfxMedium &rMedium);
/** Called whenever the formula is changed
* Deletes the current cursor
@@ -208,6 +211,8 @@ public:
const SmNode * GetFormulaTree() const { return pTree; }
void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
+ const std::set< rtl::OUString > & GetUsedSymbols() const { return aUsedSymbols; }
+
String GetAccessibleText();
EditEngine & GetEditEngine();
@@ -218,7 +223,7 @@ public:
void Repaint();
- virtual SfxUndoManager *GetUndoManager ();
+ virtual ::svl::IUndoManager *GetUndoManager ();
virtual SfxItemPool& GetPool() const;
@@ -226,7 +231,7 @@ public:
void GetState(SfxItemSet &);
virtual void SetVisArea (const Rectangle & rVisArea);
- virtual void SetModified(BOOL bModified);
+ virtual void SetModified(sal_Bool bModified);
/** Get a cursor for modifying this document
* @remarks Don't store this reference, a new cursor may be made...
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index 7525cd8e8586..454877dcaa7e 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -50,7 +50,7 @@ class CommandEvent;
/**************************************************************************/
void SmGetLeftSelectionPart(const ESelection &rSelection,
- USHORT &nPara, USHORT &nPos);
+ sal_uInt16 &nPara, sal_uInt16 &nPos);
/**************************************************************************/
@@ -123,7 +123,7 @@ public:
void Delete();
void SelectAll();
void InsertText(const String &rText);
- void InsertCommand(USHORT nCommand);
+ void InsertCommand(sal_uInt16 nCommand);
void MarkError(const Point &rPos);
void SelNextMark();
void SelPrevMark();
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 55899b9d0c9f..98c34c4f4dc2 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -35,7 +35,7 @@
#include <types.hxx>
-#define SM_FMT_VERSION_51 ((BYTE) 0x01)
+#define SM_FMT_VERSION_51 ((sal_uInt8) 0x01)
#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
#define FNTNAME_TIMES "Times New Roman"
@@ -99,7 +99,7 @@
enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
-String GetDefaultFontName( LanguageType nLang, USHORT nIdent );
+String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent );
class SmFormat : public SfxBroadcaster
{
@@ -107,10 +107,10 @@ class SmFormat : public SfxBroadcaster
bool bDefaultFont[FNT_END + 1];
Size aBaseSize;
long nVersion;
- USHORT vSize[SIZ_END + 1];
- USHORT vDist[DIS_END + 1];
+ sal_uInt16 vSize[SIZ_END + 1];
+ sal_uInt16 vDist[DIS_END + 1];
SmHorAlign eHorAlign;
- INT16 nGreekCharStyle;
+ sal_Int16 nGreekCharStyle;
bool bIsTextmode,
bScaleNormalBrackets;
@@ -121,18 +121,18 @@ public:
const Size & GetBaseSize() const { return aBaseSize; }
void SetBaseSize(const Size &rSize) { aBaseSize = rSize; }
- const SmFace & GetFont(USHORT nIdent) const { return vFont[nIdent]; }
- void SetFont(USHORT nIdent, const SmFace &rFont, bool bDefault = false);
- void SetFontSize(USHORT nIdent, const Size &rSize) { vFont[nIdent].SetSize( rSize ); }
+ const SmFace & GetFont(sal_uInt16 nIdent) const { return vFont[nIdent]; }
+ void SetFont(sal_uInt16 nIdent, const SmFace &rFont, bool bDefault = false);
+ void SetFontSize(sal_uInt16 nIdent, const Size &rSize) { vFont[nIdent].SetSize( rSize ); }
- void SetDefaultFont(USHORT nIdent, bool bVal) { bDefaultFont[nIdent] = bVal; }
- bool IsDefaultFont(USHORT nIdent) const { return bDefaultFont[nIdent]; }
+ void SetDefaultFont(sal_uInt16 nIdent, bool bVal) { bDefaultFont[nIdent] = bVal; }
+ bool IsDefaultFont(sal_uInt16 nIdent) const { return bDefaultFont[nIdent]; }
- USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; }
- void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;}
+ sal_uInt16 GetRelSize(sal_uInt16 nIdent) const { return vSize[nIdent]; }
+ void SetRelSize(sal_uInt16 nIdent, sal_uInt16 nVal) { vSize[nIdent] = nVal;}
- USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; }
- void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; }
+ sal_uInt16 GetDistance(sal_uInt16 nIdent) const { return vDist[nIdent]; }
+ void SetDistance(sal_uInt16 nIdent, sal_uInt16 nVal) { vDist[nIdent] = nVal; }
SmHorAlign GetHorAlign() const { return eHorAlign; }
void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; }
@@ -140,8 +140,8 @@ public:
bool IsTextmode() const { return bIsTextmode; }
void SetTextmode(bool bVal) { bIsTextmode = bVal; }
- INT16 GetGreekCharStyle() const { return nGreekCharStyle; }
- void SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
+ sal_Int16 GetGreekCharStyle() const { return nGreekCharStyle; }
+ void SetGreekCharStyle(sal_Int16 nVal) { nGreekCharStyle = nVal; }
bool IsScaleNormalBrackets() const { return bScaleNormalBrackets; }
void SetScaleNormalBrackets(bool bVal) { bScaleNormalBrackets = bVal; }
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
new file mode 100644
index 000000000000..f27b47edcdf3
--- /dev/null
+++ b/starmath/inc/helpids.h
@@ -0,0 +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 --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index dc631c564a3e..45589683c39f 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -99,7 +99,7 @@ class SmNode : public SmRect
SmNodeType eType;
SmScaleMode eScaleMode;
RectHorAlign eRectHorAlign;
- USHORT nFlags,
+ sal_uInt16 nFlags,
nAttributes;
bool bIsPhantom,
bIsDebug;
@@ -117,9 +117,9 @@ public:
virtual bool IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
- virtual SmNode * GetSubNode(USHORT nIndex);
- const SmNode * GetSubNode(USHORT nIndex) const
+ virtual sal_uInt16 GetNumSubNodes() const;
+ virtual SmNode * GetSubNode(sal_uInt16 nIndex);
+ const SmNode * GetSubNode(sal_uInt16 nIndex) const
{
return ((SmNode *) this)->GetSubNode(nIndex);
}
@@ -130,22 +130,22 @@ public:
return ((SmNode *) this)->GetLeftMost();
}
- USHORT & Flags() { return nFlags; }
- USHORT & Attributes() { return nAttributes; }
+ sal_uInt16 & Flags() { return nFlags; }
+ sal_uInt16 & Attributes() { return nAttributes; }
bool IsDebug() const { return bIsDebug; }
bool IsPhantom() const { return bIsPhantom; }
void SetPhantom(bool bIsPhantom);
void SetColor(const Color &rColor);
- void SetAttribut(USHORT nAttrib);
- void ClearAttribut(USHORT nAttrib);
+ void SetAttribut(sal_uInt16 nAttrib);
+ void ClearAttribut(sal_uInt16 nAttrib);
const SmFace & GetFont() const { return aFace; };
SmFace & GetFont() { return aFace; };
void SetFont(const SmFace &rFace);
- void SetFontSize(const Fraction &rRelSize, USHORT nType);
+ void SetFontSize(const Fraction &rRelSize, sal_uInt16 nType);
void SetSize(const Fraction &rScale);
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
@@ -170,21 +170,23 @@ public:
sal_Int32 GetAccessibleIndex() const { return nAccIndex; }
const SmNode * FindNodeWithAccessibleIndex(xub_StrLen nAccIndex) const;
- USHORT GetRow() const { return (USHORT)aNodeToken.nRow; }
- USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; }
+ sal_uInt16 GetRow() const { return (sal_uInt16)aNodeToken.nRow; }
+ sal_uInt16 GetColumn() const { return (sal_uInt16)aNodeToken.nCol; }
SmScaleMode GetScaleMode() const { return eScaleMode; }
void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; }
- virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
+ virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
+ virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
SmNodeType GetType() const { return eType; }
const SmToken & GetToken() const { return aNodeToken; }
- const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
+ const SmNode * FindTokenAt(sal_uInt16 nRow, sal_uInt16 nCol) const;
const SmNode * FindRectClosestTo(const Point &rPoint) const;
+ virtual long GetFormulaBaseline() const;
+
/** Accept a visitor
* Calls the method for this class on the visitor
*/
@@ -216,8 +218,8 @@ public:
* Returns -1, if pSubNode isn't a subnode of this.
*/
int IndexOfSubNode(SmNode* pSubNode){
- USHORT nSize = GetNumSubNodes();
- for(USHORT i = 0; i < nSize; i++)
+ sal_uInt16 nSize = GetNumSubNodes();
+ for(sal_uInt16 i = 0; i < nSize; i++)
if(pSubNode == GetSubNode(i))
return i;
return -1;
@@ -230,8 +232,8 @@ protected:
/** Sets parent on children of this node */
void ClaimPaternity(){
SmNode* pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ sal_uInt16 nSize = GetNumSubNodes();
+ for (sal_uInt16 i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetParent((SmStructureNode*)this); //Cast is valid if we have children
}
@@ -292,9 +294,9 @@ private:
/** Node whos children we're iterating over */
SmNode* pNode;
/** Size of the node */
- USHORT nSize;
+ sal_uInt16 nSize;
/** Current index in the node */
- USHORT nIndex;
+ sal_uInt16 nIndex;
/** Move reverse */
bool bIsReverse;
};
@@ -321,11 +323,11 @@ public:
virtual bool IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
- void SetNumSubNodes(USHORT nSize) { aSubNodes.resize(nSize); }
+ virtual sal_uInt16 GetNumSubNodes() const;
+ void SetNumSubNodes(sal_uInt16 nSize) { aSubNodes.resize(nSize); }
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(sal_uInt16 nIndex);
void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
void SetSubNodes(const SmNodeArray &rNodeArray);
@@ -367,9 +369,9 @@ protected:
public:
virtual bool IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
+ virtual sal_uInt16 GetNumSubNodes() const;
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(sal_uInt16 nIndex);
};
@@ -404,8 +406,8 @@ public:
: SmGraphicNode(NRECTANGLE, rNodeToken)
{}
- virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
+ virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
+ virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -433,8 +435,8 @@ public:
Size GetToSize() const { return aToSize; }
Polygon &GetPolygon() { return aPoly; }
- virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
+ virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
+ virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -451,7 +453,7 @@ public:
class SmTextNode : public SmVisibleNode
{
XubString aText;
- USHORT nFontDesc;
+ sal_uInt16 nFontDesc;
/** Index within text where the selection starts
* @remarks Only valid if SmNode::IsSelected() is true
*/
@@ -462,12 +464,12 @@ class SmTextNode : public SmVisibleNode
xub_StrLen nSelectionEnd;
protected:
- SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP );
+ SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 nFontDescP );
public:
- SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP );
+ SmTextNode(const SmToken &rNodeToken, sal_uInt16 nFontDescP );
- USHORT GetFontDesc() const { return nFontDesc; }
+ sal_uInt16 GetFontDesc() const { return nFontDesc; }
void SetText(const XubString &rText) { aText = rText; }
const XubString & GetText() const { return aText; }
/** Change the text of this node, including the underlying token */
@@ -516,7 +518,7 @@ class SmSpecialNode : public SmTextNode
bool bIsFromGreekSymbolSet;
protected:
- SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc);
+ SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, sal_uInt16 _nFontDesc);
public:
SmSpecialNode(const SmToken &rNodeToken);
@@ -571,8 +573,8 @@ protected:
public:
SmMathSymbolNode(const SmToken &rNodeToken);
- virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
+ virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nWidth);
+ virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -591,16 +593,16 @@ public:
*/
class SmRootSymbolNode : public SmMathSymbolNode
{
- ULONG nBodyWidth; // width of body (argument) of root sign
+ sal_uLong nBodyWidth; // width of body (argument) of root sign
public:
SmRootSymbolNode(const SmToken &rNodeToken)
: SmMathSymbolNode(NROOTSYMBOL, rNodeToken)
{}
- ULONG GetBodyWidth() const {return nBodyWidth;};
- virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
- virtual void AdaptToY(const OutputDevice &rDev, ULONG nHeight);
+ sal_uLong GetBodyWidth() const {return nBodyWidth;};
+ virtual void AdaptToX(const OutputDevice &rDev, sal_uLong nHeight);
+ virtual void AdaptToY(const OutputDevice &rDev, sal_uLong nHeight);
void Accept(SmVisitor* pVisitor);
};
@@ -662,6 +664,7 @@ public:
*/
class SmTableNode : public SmStructureNode
{
+ long nFormulaBaseline;
public:
SmTableNode(const SmToken &rNodeToken)
: SmStructureNode(NTABLE, rNodeToken)
@@ -671,6 +674,8 @@ public:
virtual SmNode * GetLeftMost();
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ virtual long GetFormulaBaseline() const;
+
void Accept(SmVisitor* pVisitor);
};
@@ -941,7 +946,7 @@ public:
/** Get super- or subscript
* @remarks this method may return NULL.
*/
- SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode( sal::static_int_cast< USHORT >(1 + eSubSup) ); };
+ SmNode * GetSubSup(SmSubSup eSubSup) { return GetSubNode( sal::static_int_cast< sal_uInt16 >(1 + eSubSup) ); };
/** Set the body */
void SetBody(SmNode* pBody) { SetSubNode(0, pBody); }
@@ -1134,7 +1139,7 @@ public:
*/
class SmFontNode : public SmStructureNode
{
- USHORT nSizeType;
+ sal_uInt16 nSizeType;
Fraction aFontSize;
public:
@@ -1145,9 +1150,9 @@ public:
aFontSize = Fraction(1L);
}
- void SetSizeParameter(const Fraction &rValue, USHORT nType);
+ void SetSizeParameter(const Fraction &rValue, sal_uInt16 nType);
const Fraction & GetSizeParameter() const {return aFontSize;}
- const USHORT& GetSizeType() const {return nSizeType;}
+ const sal_uInt16& GetSizeType() const {return nSizeType;}
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -1165,7 +1170,7 @@ public:
*/
class SmMatrixNode : public SmStructureNode
{
- USHORT nNumRows,
+ sal_uInt16 nNumRows,
nNumCols;
public:
@@ -1175,9 +1180,9 @@ public:
nNumRows = nNumCols = 0;
}
- USHORT GetNumRows() const {return nNumRows;}
- USHORT GetNumCols() const {return nNumCols;}
- void SetRowCol(USHORT nMatrixRows, USHORT nMatrixCols);
+ sal_uInt16 GetNumRows() const {return nNumRows;}
+ sal_uInt16 GetNumCols() const {return nNumCols;}
+ void SetRowCol(sal_uInt16 nMatrixRows, sal_uInt16 nMatrixCols);
using SmNode::GetLeftMost;
virtual SmNode * GetLeftMost();
@@ -1196,7 +1201,7 @@ public:
*/
class SmBlankNode : public SmGraphicNode
{
- USHORT nNum;
+ sal_uInt16 nNum;
public:
SmBlankNode(const SmToken &rNodeToken)
@@ -1207,8 +1212,8 @@ public:
void IncreaseBy(const SmToken &rToken);
void Clear() { nNum = 0; }
- USHORT GetBlankNum() const { return nNum; }
- void SetBlankNum(USHORT nNumber) { nNum = nNumber; }
+ sal_uInt16 GetBlankNum() const { return nNum; }
+ void SetBlankNum(sal_uInt16 nNumber) { nNum = nNumber; }
virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index bff93f5cfccc..cc17e951df28 100644..100755
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -33,6 +33,10 @@
#include <tools/stack.hxx>
#include <tools/string.hxx>
+#include <set>
+#include <stack>
+#include <list>
+
#include "types.hxx"
#include <vector>
@@ -40,6 +44,7 @@
class SmNode;
class SmDocShell;
+//////////////////////////////////////////////////////////////////////
// TokenGroups
#define TGOPER 0x00000001
@@ -115,24 +120,25 @@ enum SmTokenType
struct SmToken
{
- // token text
- String aText;
- // token info
- SmTokenType eType;
+
+ String aText; // token text
+ SmTokenType eType; // token info
sal_Unicode cMathChar;
+
// parse-help info
- ULONG nGroup;
- USHORT nLevel;
+ sal_uLong nGroup;
+ sal_uInt16 nLevel;
+
// token position
- USHORT nRow;
- xub_StrLen nCol;
+ sal_uInt16 nRow;
+ xub_StrLen nCol;
SmToken();
SmToken(SmTokenType eTokenType,
sal_Unicode cMath,
const sal_Char* pText,
- ULONG nTokenGroup = 0,
- USHORT nTokenLevel = 0);
+ sal_uLong nTokenGroup = 0,
+ sal_uInt16 nTokenLevel = 0);
};
@@ -159,6 +165,7 @@ struct SmErrorDesc
String Text;
};
+
DECLARE_STACK(SmNodeStack, SmNode *)
typedef ::std::vector< SmErrorDesc* > SmErrDescList;
@@ -179,25 +186,28 @@ struct SmTokenTableEntry
const sal_Char* pIdent;
SmTokenType eType;
sal_Unicode cMathChar;
- ULONG nGroup;
- USHORT nLevel;
+ sal_uLong nGroup;
+ sal_uInt16 nLevel;
};
class SmParser
{
- String BufferString;
- SmToken CurToken;
- SmNodeStack NodeStack;
- SmErrDescList ErrDescList;
- int CurError;
- LanguageType nLang;
- xub_StrLen BufferIndex,
- nTokenIndex;
- USHORT Row,
- ColOff;
- SmConvert eConversion;
+ String m_aBufferString;
+ SmToken m_aCurToken;
+ SmNodeStack m_aNodeStack;
+ SmErrDescList m_aErrDescList;
+ int m_nCurError;
+ LanguageType m_nLang;
+ xub_StrLen m_nBufferIndex,
+ m_nTokenIndex;
+ sal_uInt16 m_Row,
+ m_nColOff;
+ SmConvert m_eConversion;
bool bImportSymNames,
- bExportSymNames;
+ m_bExportSymNames;
+
+ // map of used symbols (used to reduce file size by exporting only actually used symbols)
+ std::set< rtl::OUString > m_aUsedSymbols;
// declare copy-constructor and assignment-operator private
SmParser(const SmParser &);
@@ -208,11 +218,11 @@ protected:
bool IsDelimiter( const String &rTxt, xub_StrLen nPos );
#endif
void NextToken();
- xub_StrLen GetTokenIndex() const { return nTokenIndex; }
- void Insert(const String &rText, USHORT nPos);
- void Replace( USHORT nPos, USHORT nLen, const String &rText );
+ xub_StrLen GetTokenIndex() const { return m_nTokenIndex; }
+ void Insert(const String &rText, sal_uInt16 nPos);
+ void Replace( sal_uInt16 nPos, sal_uInt16 nLen, const String &rText );
- inline bool TokenInGroup(ULONG nGroup);
+ inline bool TokenInGroup( sal_uLong nGroup );
// grammar
void Table();
@@ -221,7 +231,7 @@ protected:
void Relation();
void Sum();
void Product();
- void SubSup(ULONG nActiveGroup);
+ void SubSup(sal_uLong nActiveGroup);
void OpSubSup();
void Power();
void Blank();
@@ -246,11 +256,14 @@ protected:
void GlyphSpecial();
// end of grammar
- LanguageType GetLanguage() const { return nLang; }
- void SetLanguage( LanguageType nNewLang ) { nLang = nNewLang; }
+ LanguageType GetLanguage() const { return m_nLang; }
+ void SetLanguage( LanguageType nNewLang ) { m_nLang = nNewLang; }
void Error(SmParseError Error);
+ void ClearUsedSymbols() { m_aUsedSymbols.clear(); }
+ void AddToUsedSymbols( const String &rSymbolName ) { m_aUsedSymbols.insert( rSymbolName ); }
+
public:
SmParser();
@@ -259,27 +272,29 @@ public:
/** Parse rBuffer to formula subtree that constitutes an expression */
SmNode *ParseExpression(const String &rBuffer);
- const String & GetText() const { return BufferString; };
+ const String & GetText() const { return m_aBufferString; };
- SmConvert GetConversion() const { return eConversion; }
- void SetConversion(SmConvert eConv) { eConversion = eConv; }
+ SmConvert GetConversion() const { return m_eConversion; }
+ void SetConversion(SmConvert eConv) { m_eConversion = eConv; }
bool IsImportSymbolNames() const { return bImportSymNames; }
void SetImportSymbolNames(bool bVal) { bImportSymNames = bVal; }
- bool IsExportSymbolNames() const { return bExportSymNames; }
- void SetExportSymbolNames(bool bVal) { bExportSymNames = bVal; }
+ bool IsExportSymbolNames() const { return m_bExportSymNames; }
+ void SetExportSymbolNames(bool bVal) { m_bExportSymNames = bVal; }
size_t AddError(SmParseError Type, SmNode *pNode);
const SmErrorDesc* NextError();
const SmErrorDesc* PrevError();
const SmErrorDesc* GetError(size_t i = size_t(-1) );
static const SmTokenTableEntry* GetTokenTableEntry( const String &rName );
+ bool IsUsedSymbol( const String &rSymbolName ) const { return m_aUsedSymbols.find( rSymbolName ) != m_aUsedSymbols.end(); }
+ std::set< rtl::OUString > GetUsedSymbols() const { return m_aUsedSymbols; }
};
-inline bool SmParser::TokenInGroup(ULONG nGroup)
+inline bool SmParser::TokenInGroup( sal_uLong nGroup)
{
- return (CurToken.nGroup & nGroup) ? true : false;
+ return (m_aCurToken.nGroup & nGroup) ? true : false;
}
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index 053fc3add921..e486b1f7c7d5 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -104,15 +104,15 @@ class SmRect
nItalicRightSpace,
nLoAttrFence,
nHiAttrFence;
- USHORT nBorderWidth;
+ sal_uInt16 nBorderWidth;
bool bHasBaseline,
bHasAlignInfo;
protected:
void BuildRect (const OutputDevice &rDev, const SmFormat *pFormat,
- const XubString &rText, USHORT nBorderWidth);
+ const XubString &rText, sal_uInt16 nBorderWidth);
void Init(const OutputDevice &rDev, const SmFormat *pFormat,
- const XubString &rText, USHORT nBorderWidth);
+ const XubString &rText, sal_uInt16 nBorderWidth);
void ClearBaseline() { bHasBaseline = false; };
inline void CopyMBL(const SmRect& rRect);
@@ -128,12 +128,12 @@ public:
SmRect(const SmRect &rRect);
- USHORT GetBorderWidth() const { return nBorderWidth; }
+ sal_uInt16 GetBorderWidth() const { return nBorderWidth; }
void SetItalicSpaces(long nLeftSpace, long nRightSpace);
- void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; }
- void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; }
+ void SetWidth(sal_uLong nWidth) { aSize.Width() = nWidth; }
+ void SetHeight(sal_uLong nHeight) { aSize.Height() = nHeight; }
void SetLeft(long nLeft);
void SetRight(long nRight);
diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h
new file mode 100644
index 000000000000..d2f08c55f4c4
--- /dev/null
+++ b/starmath/inc/smcommands.h
@@ -0,0 +1,68 @@
+/*************************************************************************
+ *
+ * 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 SM_SNCOMMANDS_HRC
+#define SM_SMCOMMANDS_HRC
+
+#define CMD_SID_ADJUST ".uno:Adjust"
+#define CMD_SID_ALIGN ".uno:ChangeAlignment"
+#define CMD_SID_DISTANCE ".uno:ChangeDistance"
+#define CMD_SID_FONT ".uno:ChangeFont"
+#define CMD_SID_FONTSIZE ".uno:ChangeFontSize"
+#define CMD_SID_CMDBOXWINDOW ".uno:CommandWindow"
+#define CMD_SID_PREFERENCES ".uno:Preferences"
+#define CMD_SID_TEXT ".uno:ConfigName"
+#define CMD_SID_COPYOBJECT ".uno:CopyObject"
+#define CMD_SID_DRAW ".uno:Draw"
+#define CMD_SID_FITINWINDOW ".uno:FitInWindow"
+#define CMD_SID_FORMULACURSOR ".uno:FormelCursor"
+#define CMD_SID_GAPHIC_SM ".uno:Graphic"
+#define CMD_SID_INSERTCOMMAND ".uno:InsertCommand"
+#define CMD_SID_INSERTTEXT ".uno:InsertConfigName"
+#define CMD_SID_INSERT_FORMULA ".uno:InsertFormula"
+#define CMD_SID_LOADSYMBOLS ".uno:LoadSymbols"
+#define CMD_SID_MODIFYSTATUS ".uno:ModifyStatus"
+#define CMD_SID_NEXTERR ".uno:NextError"
+#define CMD_SID_NEXTMARK ".uno:NextMark"
+#define CMD_SID_PASTEOBJECT ".uno:PasteObject"
+#define CMD_SID_PREVERR ".uno:PrevError"
+#define CMD_SID_PREVMARK ".uno:PrevMark"
+#define CMD_SID_AUTO_REDRAW ".uno:RedrawAutomatic"
+#define CMD_SID_SAVESYMBOLS ".uno:SaveSymbols"
+#define CMD_SID_GETEDITTEXT ".uno:SetPaperSize"
+#define CMD_SID_SYMBOLS_CATALOGUE ".uno:SymbolCatalogue"
+#define CMD_SID_SYMBOLS ".uno:Symbols"
+#define CMD_SID_TEXTMODE ".uno:Textmode"
+#define CMD_SID_TEXTSTATUS ".uno:TextStatus"
+#define CMD_SID_TOOLBOXWINDOW ".uno:ToolBowWindow"
+#define CMD_SID_TOOLBOX ".uno:ToolBox"
+#define CMD_SID_VIEW100 ".uno:View100"
+#define CMD_SID_VIEW200 ".uno:View200"
+#define CMD_SID_VIEW050 ".uno:View50"
+#define CMD_SID_ZOOMIN ".uno:ZoomIn"
+#define CMD_SID_ZOOMOUT ".uno:ZoomOut"
+
+#endif
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index d7d86238bc84..3894c67e144d 100644
--- a/starmath/inc/smdll.hxx
+++ b/starmath/inc/smdll.hxx
@@ -43,7 +43,7 @@ public:
static void Init();
static void Exit();
- static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter **ppFilter,
+ static sal_uLong DetectFilter( SfxMedium& rMedium, const SfxFilter **ppFilter,
SfxFilterFlags nMust, SfxFilterFlags nDont );
};
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 20ce49801332..a75aee02c0a5 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -66,7 +66,7 @@ class VirtualDevice;
class SmResId : public ResId
{
public:
- SmResId(USHORT nId);
+ SmResId(sal_uInt16 nId);
};
class SmNamesArray : public Resource
@@ -77,7 +77,7 @@ class SmNamesArray : public Resource
public:
SmNamesArray( LanguageType nLang, int nRID ) :
Resource( SmResId(RID_LOCALIZED_NAMES) ),
- aNamesAry (SmResId( static_cast < USHORT > ( nRID ))),
+ aNamesAry (SmResId( static_cast < sal_uInt16 > ( nRID ))),
nLanguage (nLang)
{
FreeResource();
@@ -128,7 +128,6 @@ class SmModule : public SfxModule, utl::ConfigurationListener
SvtSysLocale *pSysLocale;
VirtualDevice *pVirtualDev;
- virtual void FillStatusBar(StatusBar &rBar);
void _CreateSysLocale() const;
void _CreateVirtualDev() const;
@@ -167,9 +166,9 @@ public:
}
//virtual methods for options dialog
- virtual SfxItemSet* CreateItemSet( USHORT nId );
- virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
- virtual SfxTabPage* CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet );
+ virtual SfxItemSet* CreateItemSet( sal_uInt16 nId );
+ virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
+ virtual SfxTabPage* CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxItemSet& rSet );
};
#define SM_MOD() ( *(SmModule**) GetAppData(SHL_SM) )
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 9b9766d8b1e0..f7aa0f21f03f 100644..100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -30,33 +30,34 @@
#include <svl/solar.hrc>
#include <sfx2/sfxsids.hrc>
#include <editeng/memberids.hrc>
+#include "helpids.h"
#define SID_NEXTERR (SID_SMA_START + 1)
#define SID_PREVERR (SID_SMA_START + 2)
#define SID_NEXTMARK (SID_SMA_START + 3)
#define SID_PREVMARK (SID_SMA_START + 4)
-#define SID_SYMBOLS_CATALOGUE (SID_SMA_START + 5)
+#define SID_SYMBOLS_CATALOGUE (SID_SMA_START + 5)
#define SID_PREFERENCES (SID_SMA_START + 6)
#define SID_VIEW050 (SID_SMA_START + 7)
#define SID_VIEW100 (SID_SMA_START + 8)
#define SID_VIEW200 (SID_SMA_START + 9)
-#define SID_ZOOMIN (SID_SMA_START + 10)
+#define SID_ZOOMIN (SID_SMA_START + 10)
#define SID_ZOOMOUT (SID_SMA_START + 11)
-#define SID_DRAW (SID_SMA_START + 12)
-#define SID_ADJUST (SID_SMA_START + 13)
+#define SID_DRAW (SID_SMA_START + 12)
+#define SID_ADJUST (SID_SMA_START + 13)
#define SID_TOOLBOX (SID_SMA_START + 14)
#define SID_FORMULACURSOR (SID_SMA_START + 15)
-#define SID_FONT (SID_SMA_START + 50)
+#define SID_FONT (SID_SMA_START + 50)
#define SID_FONTSIZE (SID_SMA_START + 51)
#define SID_DISTANCE (SID_SMA_START + 52)
-#define SID_ALIGN (SID_SMA_START + 53)
+#define SID_ALIGN (SID_SMA_START + 53)
#define SID_AUTO_REDRAW (SID_SMA_START + 55)
#define SID_SYMBOLS (SID_SMA_START + 56) // Has to be picked up again for now!
#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)
/** Command for inserting a symbol specified by a string (Inserts an SmSpecialNode) */
#define SID_INSERTSYMBOL (SID_SMA_START + 104)
@@ -83,10 +84,9 @@
#define SID_CMDBOXWINDOW (SID_SMA_START + 122)
#define SID_TOOLBOXWINDOW (SID_SMA_START + 123)
#define SID_NO_RIGHT_SPACES (SID_SMA_START + 124)
-#define SID_DUMMY (SID_SMA_START + 254)
+#define SID_SAVE_ONLY_USED_SYMBOLS (SID_SMA_START + 125)
+#define SID_DUMMY (SID_SMA_START + 254)
-//#define GID_FORMEL (RID_GROUPS_OFFSET + 1)
-//#define GID_ERROR (RID_GROUPS_OFFSET + 2)
//#define RID_OPTIONSDIALOG (RID_APP_START + 1)
#define RID_FONTDIALOG (RID_APP_START + 2)
@@ -101,7 +101,6 @@
#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
#define RID_MATH_TOOLBOX (RID_APP_START + 50)
-//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
@@ -447,300 +446,6 @@
#define MN_SUB_SENDTO (RID_APP_START + 3120)
-#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1)
-#define HID_SMA_FONTDIALOG (HID_SMA_START + 2)
-#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3)
-#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4)
-#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5)
-#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6)
-#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7)
-#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8)
-#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9)
-#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10)
-#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11)
-#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12)
-#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13)
-#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14)
-#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15)
-#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16)
-#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17)
-#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18)
-#define HID_SMA_OBJECTNAME (HID_SMA_START + 19)
-#define HID_SMA_VIEWNAME (HID_SMA_START + 20)
-#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21)
-#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22)
-#define HID_SMA_APPICO (HID_SMA_START + 23)
-#define HID_SMA_DOCICO (HID_SMA_START + 24)
-#define HID_SMA_TMPICO (HID_SMA_START + 25)
-#define HID_SMA_COMMANDMENU (HID_SMA_START + 26)
-#define HID_SMA_VIEWMENU (HID_SMA_START + 27)
-#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28)
-#define HID_SMA_FONTMENU (HID_SMA_START + 29)
-#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30)
-#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31)
-#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32)
-#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33)
-#define HID_SMA_FONTREGULAR (HID_SMA_START + 34)
-#define HID_SMA_FONTITALIC (HID_SMA_START + 35)
-#define HID_SMA_FONTBOLD (HID_SMA_START + 36)
-#define HID_SMA_PRINTOPTION (HID_SMA_START + 37)
-#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38)
-#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39)
-#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40)
-#define HID_SMA_CREATORSTR (HID_SMA_START + 41)
-#define HID_SMA_FILESMFTYP (HID_SMA_START + 42)
-#define HID_SMA_FILESYMTYP (HID_SMA_START + 43)
-#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44)
-#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45)
-
-#define HID_SMA_PLUSX (HID_SMA_START + 50)
-#define HID_SMA_MINUSX (HID_SMA_START + 51)
-#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52)
-#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53)
-#define HID_SMA_NEGX (HID_SMA_START + 54)
-#define HID_SMA_XPLUSY (HID_SMA_START + 55)
-#define HID_SMA_XMINUSY (HID_SMA_START + 56)
-#define HID_SMA_XCDOTY (HID_SMA_START + 57)
-#define HID_SMA_XTIMESY (HID_SMA_START + 58)
-#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59)
-#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60)
-#define HID_SMA_XDIVY (HID_SMA_START + 61)
-#define HID_SMA_XOVERY (HID_SMA_START + 62)
-#define HID_SMA_XODIVIDEY (HID_SMA_START + 63)
-#define HID_SMA_XODOTY (HID_SMA_START + 64)
-#define HID_SMA_XOMINUSY (HID_SMA_START + 65)
-#define HID_SMA_XOPLUSY (HID_SMA_START + 66)
-#define HID_SMA_XOTIMESY (HID_SMA_START + 67)
-#define HID_SMA_XANDY (HID_SMA_START + 68)
-#define HID_SMA_XORY (HID_SMA_START + 69)
-#define HID_SMA_XEQY (HID_SMA_START + 70)
-#define HID_SMA_XNEQY (HID_SMA_START + 71)
-#define HID_SMA_XLTY (HID_SMA_START + 72)
-#define HID_SMA_XGTY (HID_SMA_START + 73)
-#define HID_SMA_XLEY (HID_SMA_START + 74)
-#define HID_SMA_XGEY (HID_SMA_START + 75)
-#define HID_SMA_XLESLANTY (HID_SMA_START + 76)
-#define HID_SMA_XGESLANTY (HID_SMA_START + 77)
-#define HID_SMA_XLLY (HID_SMA_START + 78)
-#define HID_SMA_XGGY (HID_SMA_START + 79)
-#define HID_SMA_XDEFY (HID_SMA_START + 80)
-#define HID_SMA_XEQUIVY (HID_SMA_START + 81)
-#define HID_SMA_XAPPROXY (HID_SMA_START + 82)
-#define HID_SMA_XSIMY (HID_SMA_START + 83)
-#define HID_SMA_XSIMEQY (HID_SMA_START + 84)
-#define HID_SMA_XPROPY (HID_SMA_START + 85)
-#define HID_SMA_XORTHOY (HID_SMA_START + 86)
-#define HID_SMA_XPARALLELY (HID_SMA_START + 87)
-#define HID_SMA_XTOWARDY (HID_SMA_START + 88)
-#define HID_SMA_XTRANSLY (HID_SMA_START + 89)
-#define HID_SMA_XTRANSRY (HID_SMA_START + 90)
-#define HID_SMA_XINY (HID_SMA_START + 91)
-#define HID_SMA_XNOTINY (HID_SMA_START + 92)
-#define HID_SMA_XOWNSY (HID_SMA_START + 93)
-#define HID_SMA_XUNIONY (HID_SMA_START + 94)
-#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95)
-#define HID_SMA_XSETMINUSY (HID_SMA_START + 96)
-#define HID_SMA_XSLASHY (HID_SMA_START + 97)
-#define HID_SMA_XSUBSETY (HID_SMA_START + 98)
-#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99)
-#define HID_SMA_XSUPSETY (HID_SMA_START + 100)
-#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101)
-#define HID_SMA_XNSUBSETY (HID_SMA_START + 102)
-#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103)
-#define HID_SMA_XNSUPSETY (HID_SMA_START + 104)
-#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105)
-#define HID_SMA_ABSX (HID_SMA_START + 106)
-#define HID_SMA_FACTX (HID_SMA_START + 107)
-#define HID_SMA_SQRTX (HID_SMA_START + 108)
-#define HID_SMA_NROOTXY (HID_SMA_START + 109)
-#define HID_SMA_EX (HID_SMA_START + 110)
-#define HID_SMA_EXPX (HID_SMA_START + 111)
-#define HID_SMA_LNX (HID_SMA_START + 112)
-#define HID_SMA_LOGX (HID_SMA_START + 113)
-#define HID_SMA_SINX (HID_SMA_START + 114)
-#define HID_SMA_COSX (HID_SMA_START + 115)
-#define HID_SMA_TANX (HID_SMA_START + 116)
-#define HID_SMA_COTX (HID_SMA_START + 117)
-#define HID_SMA_ARCSINX (HID_SMA_START + 118)
-#define HID_SMA_ARCCOSX (HID_SMA_START + 119)
-#define HID_SMA_ARCTANX (HID_SMA_START + 120)
-#define HID_SMA_ARCCOTX (HID_SMA_START + 121)
-#define HID_SMA_SINHX (HID_SMA_START + 122)
-#define HID_SMA_COSHX (HID_SMA_START + 123)
-#define HID_SMA_TANHX (HID_SMA_START + 124)
-#define HID_SMA_COTHX (HID_SMA_START + 125)
-#define HID_SMA_ARSINHX (HID_SMA_START + 126)
-#define HID_SMA_ARCOSHX (HID_SMA_START + 127)
-#define HID_SMA_ARTANHX (HID_SMA_START + 128)
-#define HID_SMA_ARCOTHX (HID_SMA_START + 129)
-#define HID_SMA_SUMX (HID_SMA_START + 130)
-#define HID_SMA_PRODX (HID_SMA_START + 131)
-#define HID_SMA_COPRODX (HID_SMA_START + 132)
-#define HID_SMA_LIMX (HID_SMA_START + 133)
-#define HID_SMA_LIMINFX (HID_SMA_START + 134)
-#define HID_SMA_LIMSUPX (HID_SMA_START + 135)
-#define HID_SMA_EXISTS (HID_SMA_START + 136)
-#define HID_SMA_FORALL (HID_SMA_START + 137)
-#define HID_SMA_NABLA (HID_SMA_START + 138)
-#define HID_SMA_INTX (HID_SMA_START + 139)
-#define HID_SMA_IINTX (HID_SMA_START + 140)
-#define HID_SMA_IIINTX (HID_SMA_START + 141)
-#define HID_SMA_LINTX (HID_SMA_START + 142)
-#define HID_SMA_LLINTX (HID_SMA_START + 143)
-#define HID_SMA_LLLINTX (HID_SMA_START + 144)
-#define HID_SMA_FROMX (HID_SMA_START + 145)
-#define HID_SMA_TOX (HID_SMA_START + 146)
-#define HID_SMA_FROMXTOY (HID_SMA_START + 147)
-#define HID_SMA_XCIRCY (HID_SMA_START + 148)
-#define HID_SMA_XDIVIDESY (HID_SMA_START + 149)
-#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150)
-#define HID_SMA_DLARROW (HID_SMA_START + 151)
-#define HID_SMA_DLRARROW (HID_SMA_START + 152)
-#define HID_SMA_DRARROW (HID_SMA_START + 153)
-
-#define HID_SMA_MISC_CAT (HID_SMA_START + 154)
-#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155)
-#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156)
-#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157)
-#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158)
-#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159)
-#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160)
-#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161)
-#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162)
-
-#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163)
-#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164)
-#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165)
-#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166)
-#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167)
-#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168)
-#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169)
-#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170)
-#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171)
-#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172)
-#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173)
-#define HID_SMA_MISC_MENU (HID_SMA_START + 174)
-#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175)
-
-#define HID_SMA_ACUTEX (HID_SMA_START + 180)
-#define HID_SMA_BARX (HID_SMA_START + 181)
-#define HID_SMA_BREVEX (HID_SMA_START + 182)
-#define HID_SMA_CHECKX (HID_SMA_START + 183)
-#define HID_SMA_CIRCLEX (HID_SMA_START + 184)
-#define HID_SMA_DOTX (HID_SMA_START + 185)
-#define HID_SMA_DDOTX (HID_SMA_START + 186)
-#define HID_SMA_DDDOTX (HID_SMA_START + 187)
-#define HID_SMA_GRAVEX (HID_SMA_START + 188)
-#define HID_SMA_HATX (HID_SMA_START + 189)
-#define HID_SMA_TILDEX (HID_SMA_START + 190)
-#define HID_SMA_VECX (HID_SMA_START + 191)
-#define HID_SMA_UNDERLINEX (HID_SMA_START + 192)
-#define HID_SMA_OVERLINEX (HID_SMA_START + 193)
-#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194)
-#define HID_SMA_PHANTOMX (HID_SMA_START + 195)
-#define HID_SMA_BOLDX (HID_SMA_START + 196)
-#define HID_SMA_ITALX (HID_SMA_START + 197)
-#define HID_SMA_SIZEXY (HID_SMA_START + 198)
-#define HID_SMA_FONTXY (HID_SMA_START + 199)
-#define HID_SMA_COLORX (HID_SMA_START + 200)
-#define HID_SMA_LRGROUPX (HID_SMA_START + 201)
-#define HID_SMA_LRPARENTX (HID_SMA_START + 202)
-#define HID_SMA_LRBRACKETX (HID_SMA_START + 203)
-#define HID_SMA_LRBRACEX (HID_SMA_START + 204)
-#define HID_SMA_LRANGLEX (HID_SMA_START + 205)
-#define HID_SMA_LRCEILX (HID_SMA_START + 206)
-#define HID_SMA_LRFLOORX (HID_SMA_START + 207)
-#define HID_SMA_LRLINEX (HID_SMA_START + 208)
-#define HID_SMA_LRDLINEX (HID_SMA_START + 209)
-#define HID_SMA_SLRPARENTX (HID_SMA_START + 210)
-#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211)
-#define HID_SMA_SLRBRACEX (HID_SMA_START + 212)
-#define HID_SMA_SLRANGLEX (HID_SMA_START + 213)
-#define HID_SMA_SLRCEILX (HID_SMA_START + 214)
-#define HID_SMA_SLRFLOORX (HID_SMA_START + 215)
-#define HID_SMA_SLRLINEX (HID_SMA_START + 216)
-#define HID_SMA_SLRDLINEX (HID_SMA_START + 217)
-#define HID_SMA_RSUBX (HID_SMA_START + 218)
-#define HID_SMA_RSUPX (HID_SMA_START + 219)
-#define HID_SMA_LSUBX (HID_SMA_START + 220)
-#define HID_SMA_LSUPX (HID_SMA_START + 221)
-#define HID_SMA_SBLANK (HID_SMA_START + 222)
-#define HID_SMA_BLANK (HID_SMA_START + 223)
-#define HID_SMA_NEWLINE (HID_SMA_START + 224)
-#define HID_SMA_BINOMXY (HID_SMA_START + 225)
-#define HID_SMA_STACK (HID_SMA_START + 226)
-#define HID_SMA_MATRIX (HID_SMA_START + 227)
-#define HID_SMA_ALIGNLX (HID_SMA_START + 228)
-#define HID_SMA_ALIGNCX (HID_SMA_START + 229)
-#define HID_SMA_ALIGNRX (HID_SMA_START + 230)
-#define HID_SMA_ALEPH (HID_SMA_START + 231)
-#define HID_SMA_EMPTYSET (HID_SMA_START + 232)
-#define HID_SMA_RE (HID_SMA_START + 233)
-#define HID_SMA_IM (HID_SMA_START + 234)
-#define HID_SMA_INFINITY (HID_SMA_START + 235)
-#define HID_SMA_PARTIAL (HID_SMA_START + 236)
-#define HID_SMA_WP (HID_SMA_START + 237)
-#define HID_SMA_DOTSAXIS (HID_SMA_START + 238)
-#define HID_SMA_DOTSUP (HID_SMA_START + 239)
-#define HID_SMA_DOTSDOWN (HID_SMA_START + 240)
-#define HID_SMA_DOTSLOW (HID_SMA_START + 241)
-#define HID_SMA_DOTSVERT (HID_SMA_START + 242)
-#define HID_SMA_NOSPACE (HID_SMA_START + 243)
-
-#define HID_SMA_SETN (HID_SMA2_START + 1)
-#define HID_SMA_SETZ (HID_SMA2_START + 2)
-#define HID_SMA_SETQ (HID_SMA2_START + 3)
-#define HID_SMA_SETR (HID_SMA2_START + 4)
-#define HID_SMA_SETC (HID_SMA2_START + 5)
-#define HID_SMA_WIDEHATX (HID_SMA2_START + 6)
-#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7)
-#define HID_SMA_WIDEVECX (HID_SMA2_START + 8)
-#define HID_SMA_CSUBX (HID_SMA2_START + 9)
-#define HID_SMA_CSUPX (HID_SMA2_START + 10)
-#define HID_SMA_HBAR (HID_SMA2_START + 11)
-#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12)
-#define HID_SMA_LEFTARROW (HID_SMA2_START + 13)
-#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14)
-#define HID_SMA_UPARROW (HID_SMA2_START + 15)
-#define HID_SMA_DOWNARROW (HID_SMA2_START + 16)
-
-#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17)
-#define HID_SMA_LINE_DIST (HID_SMA2_START + 18)
-#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19)
-#define HID_SMA_SUP_DIST (HID_SMA2_START + 20)
-#define HID_SMA_SUB_DIST (HID_SMA2_START + 21)
-#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22)
-#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23)
-#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24)
-#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25)
-#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26)
-#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27)
-#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28)
-#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29)
-#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30)
-#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31)
-#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32)
-#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33)
-#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34)
-#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35)
-#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36)
-#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37)
-#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38)
-#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39)
-#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40)
-#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41)
-#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42)
-#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43)
-#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44)
-#define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45)
-#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46)
-#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47)
-#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48)
-#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49)
-
-#define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50)
-#define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51)
-
#define BMP_ARROW_RIGHT 1
#define MN_WIN 60
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 0fcaa032ff36..aa6264989bcd 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -83,24 +83,24 @@ private:
String m_aName;
String m_aExportName;
String m_aSetName;
- sal_Unicode m_cChar;
+ sal_UCS4 m_cChar;
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);
SmSym(const SmSym& rSymbol);
SmSym& operator = (const SmSym& rSymbol);
const Font& GetFace() const { return m_aFace; }
- sal_Unicode GetCharacter() const { return m_cChar; }
+ sal_UCS4 GetCharacter() const { return m_cChar; }
const String& GetName() const { return m_aName; }
void SetFace( const Font& rFont ) { m_aFace = rFont; }
- void SetCharacter( sal_Unicode cChar ) { m_cChar = cChar; }
+ void SetCharacter( sal_UCS4 cChar ) { m_cChar = cChar; }
//! since the symbol name is also used as key in the map it should not be possible to change the name
//! because ten the key would not be the same as its supposed copy here
@@ -169,7 +169,7 @@ public:
std::set< String > GetSymbolSetNames() const;
const SymbolPtrVec_t GetSymbolSet( const String& rSymbolSetName );
- USHORT GetSymbolCount() const { return static_cast< USHORT >(m_aSymbols.size()); }
+ sal_uInt16 GetSymbolCount() const { return static_cast< sal_uInt16 >(m_aSymbols.size()); }
const SymbolPtrVec_t GetSymbols() const;
bool AddOrReplaceSymbol( const SmSym & rSymbol, bool bForceChange = false );
void RemoveSymbol( const String & rSymbolName );
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 516a265731a4..4242867f3130 100644
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -32,12 +32,10 @@
#include <sfx2/basedlgs.hxx>
#include <sfx2/childwin.hxx>
#include <vcl/toolbox.hxx>
+
#include "smmod.hxx"
#include "config.hxx"
-
-#include "dialog.hrc"
-
-#define NUM_TBX_CATEGORIES 9
+#include "toolbox.hrc"
class SmToolBoxWindow : public SfxFloatingWindow
{
@@ -48,18 +46,18 @@ protected:
ToolBox *pToolBoxCmd;
ToolBox *vToolBoxCategories[NUM_TBX_CATEGORIES];
ImageList *aImageLists [NUM_TBX_CATEGORIES + 1]; /* regular */
- USHORT nActiveCategoryRID;
+ sal_uInt16 nActiveCategoryRID;
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void GetFocus();
- void ApplyImageLists( USHORT nCategoryRID );
+ void ApplyImageLists( sal_uInt16 nCategoryRID );
DECL_LINK( CategoryClickHdl, ToolBox* );
DECL_LINK( CmdSelectHdl, ToolBox* );
SmViewShell * GetView();
- const ImageList * GetImageList( USHORT nResId );
+ const ImageList * GetImageList( sal_uInt16 nResId );
public:
SmToolBoxWindow(SfxBindings *pBindings,
@@ -72,7 +70,7 @@ public:
virtual void DataChanged( const DataChangedEvent &rEvt );
void AdjustPosSize( bool bSetPos );
- void SetCategory(USHORT nCategory);
+ void SetCategory(sal_uInt16 nCategory);
};
/**************************************************************************/
@@ -83,7 +81,7 @@ class SmToolBoxWrapper : public SfxChildWindow
protected:
SmToolBoxWrapper(Window *pParentWindow,
- USHORT, SfxBindings*, SfxChildWinInfo*);
+ sal_uInt16, SfxBindings*, SfxChildWinInfo*);
};
#endif
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index ba84bd08cc70..693ea3bc9b2e 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -95,7 +95,7 @@ public:
//XServiceInfo
virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
- virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
+ virtual sal_Bool SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
virtual void SAL_CALL setParent( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xParent ) throw( ::com::sun::star::lang::NoSupportException, ::com::sun::star::uno::RuntimeException );
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index 3dca4c91c7d8..a4e70e1b648d 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -41,10 +41,6 @@ class String;
#define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
-/////////////////////////////////////////////////////////////////
-
-const ByteString ExportString( const String& rString );
-const String ImportString( const ByteString& rByteString );
/////////////////////////////////////////////////////////////////
@@ -141,7 +137,7 @@ SmFace & operator *= (SmFace &rFace, const Fraction &rFrac);
class SmPickList : public SfxPtrArr
{
protected:
- USHORT nSize;
+ sal_uInt16 nSize;
virtual void *CreateItem(const String& rString) = 0;
virtual void *CreateItem(const void *pItem) = 0;
@@ -151,18 +147,18 @@ protected:
virtual String GetStringItem(void *pItem) = 0;
- void *GetPtr(USHORT nPos) const { return SfxPtrArr::GetObject(nPos); }
- void *&GetPtr(USHORT nPos) { return SfxPtrArr::GetObject(nPos); }
- void InsertPtr(USHORT nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); }
- void RemovePtr(USHORT nPos, USHORT nCount = 1) { SfxPtrArr::Remove(nPos, nCount); }
+ void *GetPtr(sal_uInt16 nPos) const { return SfxPtrArr::GetObject(nPos); }
+ void *&GetPtr(sal_uInt16 nPos) { return SfxPtrArr::GetObject(nPos); }
+ void InsertPtr(sal_uInt16 nPos, void *pItem) { SfxPtrArr::Insert(nPos, pItem); }
+ void RemovePtr(sal_uInt16 nPos, sal_uInt16 nCount = 1) { SfxPtrArr::Remove(nPos, nCount); }
public:
- SmPickList(USHORT nInitSize = 0, USHORT nMaxSize = 5);
+ SmPickList(sal_uInt16 nInitSize = 0, sal_uInt16 nMaxSize = 5);
virtual ~SmPickList();
SmPickList& operator = (const SmPickList& rList);
- void *Get(USHORT nPos = 0) const { return GetPtr(nPos); }
+ void *Get(sal_uInt16 nPos = 0) const { return GetPtr(nPos); }
using SfxPtrArr::Insert;
void Insert(const void* pItem);
void Update(const void* pItem, const void *pNewItem);
@@ -170,10 +166,10 @@ public:
void Remove(const void* pItem);
using SfxPtrArr::operator [];
- void *operator [] (USHORT nPos) const { return GetPtr(nPos); }
+ void *operator [] (sal_uInt16 nPos) const { return GetPtr(nPos); }
- USHORT GetSize() const { return nSize; }
- USHORT Count() const { return SfxPtrArr::Count(); }
+ sal_uInt16 GetSize() const { return nSize; }
+ sal_uInt16 Count() const { return SfxPtrArr::Count(); }
void Clear();
};
@@ -200,7 +196,7 @@ protected:
public:
SmFontPickList()
: SmPickList(0, 5) {}
- SmFontPickList(USHORT nInitSize, USHORT nMaxSize)
+ SmFontPickList(sal_uInt16 nInitSize, sal_uInt16 nMaxSize)
: SmPickList(nInitSize, nMaxSize) {}
SmFontPickList(const SmPickList& rOrig )
: SmPickList(rOrig) {}
@@ -215,11 +211,11 @@ public:
using SmPickList::Contains;
inline bool Contains(const Font &rFont) const;
- inline Font Get(USHORT nPos = 0) const;
+ inline Font Get(sal_uInt16 nPos = 0) const;
inline SmFontPickList& operator = (const SmFontPickList& rList);
using SfxPtrArr::operator [];
- inline Font operator [] (USHORT nPos) const;
+ inline Font operator [] (sal_uInt16 nPos) const;
void ReadFrom(const SmFontDialog& rDialog);
void WriteTo(SmFontDialog& rDialog) const;
@@ -230,12 +226,12 @@ inline SmFontPickList& SmFontPickList::operator = (const SmFontPickList& rList)
*(SmPickList *)this = *(SmPickList *)&rList; return *this;
}
-inline Font SmFontPickList::operator [] (USHORT nPos) const
+inline Font SmFontPickList::operator [] (sal_uInt16 nPos) const
{
return *((Font *)SmPickList::operator[](nPos));
}
-inline Font SmFontPickList::Get(USHORT nPos) const
+inline Font SmFontPickList::Get(sal_uInt16 nPos) const
{
return nPos < Count() ? *((Font *)SmPickList::Get(nPos)) : Font();
}
@@ -257,7 +253,7 @@ protected:
DECL_LINK(SelectHdl, ListBox *);
public:
- SmFontPickListBox(Window* pParent, const ResId& rResId, USHORT nMax = 4);
+ SmFontPickListBox(Window* pParent, const ResId& rResId, sal_uInt16 nMax = 4);
SmFontPickListBox& operator = (const SmFontPickList& rList);
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 081dc2388f8c..d1d9e7e99b1d 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -64,7 +64,7 @@ public:
void ShowCursor(bool bShow);
bool IsLineVisible() const { return bIsLineVisible; }
void ShowLine(bool bShow);
- const SmNode * SetCursorPos(USHORT nRow, USHORT nCol);
+ const SmNode * SetCursorPos(sal_uInt16 nRow, sal_uInt16 nCol);
protected:
void SetIsCursorVisible(bool bVis) { bIsCursorVisible = bVis; }
using Window::SetCursor;
@@ -78,7 +78,7 @@ private:
SmGraphicAccessible * pAccessible;
SmViewShell *pViewShell;
- USHORT nZoom;
+ sal_uInt16 nZoom;
short nModifyCount;
protected:
@@ -109,9 +109,9 @@ public:
SmViewShell * GetView() { return pViewShell; }
using Window::SetZoom;
- void SetZoom(USHORT Factor);
+ void SetZoom(sal_uInt16 Factor);
using Window::GetZoom;
- USHORT GetZoom() const { return nZoom; }
+ sal_uInt16 GetZoom() const { return nZoom; }
const Point & GetFormulaDrawPos() const { return aFormulaDrawPos; }
@@ -135,8 +135,8 @@ class SmGraphicController: public SfxControllerItem
protected:
SmGraphicWindow &rGraphic;
public:
- SmGraphicController(SmGraphicWindow &, USHORT, SfxBindings & );
- virtual void StateChanged(USHORT nSID,
+ SmGraphicController(SmGraphicWindow &, sal_uInt16, SfxBindings & );
+ virtual void StateChanged(sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState);
};
@@ -149,12 +149,12 @@ protected:
SmEditWindow &rEdit;
public:
- SmEditController(SmEditWindow &, USHORT, SfxBindings & );
+ SmEditController(SmEditWindow &, sal_uInt16, SfxBindings & );
#if OSL_DEBUG_LEVEL > 1
virtual ~SmEditController();
#endif
- virtual void StateChanged(USHORT nSID,
+ virtual void StateChanged(sal_uInt16 nSID,
SfxItemState eState,
const SfxPoolItem* pState);
};
@@ -206,7 +206,7 @@ class SmCmdBoxWrapper : public SfxChildWindow
protected:
SmCmdBoxWrapper(Window *pParentWindow,
- USHORT nId,
+ sal_uInt16 nId,
SfxBindings *pBindings,
SfxChildWinInfo *pInfo);
@@ -264,20 +264,20 @@ protected:
void DrawText(OutputDevice& rDevice,
const Point& rPosition,
const String& rText,
- USHORT MaxWidth);
+ sal_uInt16 MaxWidth);
- virtual USHORT Print(SfxProgress &rProgress, BOOL bIsAPI, PrintDialog *pPrintDialog = 0);
- virtual SfxPrinter *GetPrinter(BOOL bCreate = FALSE);
- virtual USHORT SetPrinter(SfxPrinter *pNewPrinter,
- USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false);
+ virtual sal_uInt16 Print(SfxProgress &rProgress, sal_Bool bIsAPI);
+ virtual SfxPrinter *GetPrinter(sal_Bool bCreate = sal_False);
+ virtual sal_uInt16 SetPrinter(SfxPrinter *pNewPrinter,
+ sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false);
bool Insert( SfxMedium& rMedium );
bool InsertFrom(SfxMedium &rMedium);
virtual SfxTabPage *CreatePrintOptionsPage(Window *pParent,
const SfxItemSet &rOptions);
- virtual void Deactivate(BOOL IsMDIActivate);
- virtual void Activate(BOOL IsMDIActivate);
+ virtual void Deactivate(sal_Bool IsMDIActivate);
+ virtual void Activate(sal_Bool IsMDIActivate);
virtual Size GetOptimalSizePixel() const;
virtual void AdjustPosSizePixel(const Point &rPos, const Size &rSize);
virtual void InnerResizePixel(const Point &rOfs, const Size &rSize);
diff --git a/starmath/prj/build.lst b/starmath/prj/build.lst
index 1eb4c2334f25..70de9d63d427 100644
--- a/starmath/prj/build.lst
+++ b/starmath/prj/build.lst
@@ -1,4 +1,4 @@
-sm starmath : l10n svx dtrans NULL
+sm starmath : LIBXSLT:libxslt L10N:l10n svx NULL
sm starmath usr1 - all sm_mkout NULL
sm starmath\inc nmake - all sm_inc NULL
sm starmath\prj get - all sm_prj NULL
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index bc48875e81e6..78bae57498ea 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -19,3 +19,5 @@ mkdir: %_DEST%\inc%_EXT%\starmath
..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
+..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
+..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
diff --git a/starmath/qa/unoapi/knownissues.xcl b/starmath/qa/unoapi/knownissues.xcl
index e11895ef3fe4..f82014a51a33 100644
--- a/starmath/qa/unoapi/knownissues.xcl
+++ b/starmath/qa/unoapi/knownissues.xcl
@@ -16,3 +16,6 @@ sm.SmGraphicAccessible::com::sun::star::accessibility::XAccessibleText
### i111220 ###
sm.XMLMetaExporter::com::sun::star::document::XFilter
+
+### i112743 ###
+sm.XMLSettingsExporter::com::sun::star::document::XFilter
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index 99399c8396e3..8779706b08e2 100644..100755
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -403,8 +403,8 @@ SfxVoidItem InsertConfigName SID_INSERTSYMBOL
]
//--------------------------------------------------------------------------
-SfxBoolItem InsertFormula SID_INSERT_FORMULA
-(SfxStringItem Name SID_INSERT_FORMULA,SfxStringItem Filter FN_PARAM_1)
+SfxBoolItem ImportFormula SID_IMPORT_FORMULA
+(SfxStringItem Name SID_IMPORT_FORMULA,SfxStringItem Filter FN_PARAM_1)
[
/* flags: */
AutoUpdate = FALSE,
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index f96690b5c1f0..cc259af5d117 100644..100755
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -275,7 +275,7 @@ interface FormulaView
ExecMethod = Execute ;
StateMethod = GetState ;
]
- SID_INSERT_FORMULA //idlpp ole : no , status : no
+ SID_IMPORT_FORMULA //idlpp ole : no , status : no
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index c53319e2cfe1..590d3fa5eb68 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -338,8 +338,8 @@ sal_Int32 SAL_CALL SmGraphicAccessible::getAccessibleIndexInParent()
Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0;
if (pAccParent)
{
- USHORT nCnt = pAccParent->GetAccessibleChildWindowCount();
- for (USHORT i = 0; i < nCnt && nIdx == -1; ++i)
+ sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount();
+ for (sal_uInt16 i = 0; i < nCnt && nIdx == -1; ++i)
if (pAccParent->GetAccessibleChildWindow( i ) == pWin)
nIdx = i;
}
@@ -487,7 +487,7 @@ Sequence< beans::PropertyValue > SAL_CALL SmGraphicAccessible::getCharacterAttri
throw (IndexOutOfBoundsException, RuntimeException)
{
SolarMutexGuard aGuard;
- INT32 nLen = GetAccessibleText_Impl().Len();
+ sal_Int32 nLen = GetAccessibleText_Impl().Len();
if (!(0 <= nIndex && nIndex < nLen))
throw IndexOutOfBoundsException();
return Sequence< beans::PropertyValue >();
@@ -667,11 +667,11 @@ sal_Bool SAL_CALL SmGraphicAccessible::setSelection(
throw (IndexOutOfBoundsException, RuntimeException)
{
SolarMutexGuard aGuard;
- INT32 nLen = GetAccessibleText_Impl().Len();
+ sal_Int32 nLen = GetAccessibleText_Impl().Len();
if (!(0 <= nStartIndex && nStartIndex < nLen) ||
!(0 <= nEndIndex && nEndIndex < nLen))
throw IndexOutOfBoundsException();
- return FALSE;
+ return sal_False;
}
OUString SAL_CALL SmGraphicAccessible::getText()
@@ -895,7 +895,7 @@ SmViewForwarder::~SmViewForwarder()
{
}
-BOOL SmViewForwarder::IsValid() const
+sal_Bool SmViewForwarder::IsValid() const
{
return rEditAcc.GetEditView() != 0;
}
@@ -992,13 +992,13 @@ IMPL_LINK(SmTextForwarder, NotifyHdl, EENotify*, aNotify)
return 0;
}
-USHORT SmTextForwarder::GetParagraphCount() const
+sal_uInt16 SmTextForwarder::GetParagraphCount() const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetParagraphCount() : 0;
}
-USHORT SmTextForwarder::GetTextLen( USHORT nParagraph ) const
+sal_uInt16 SmTextForwarder::GetTextLen( sal_uInt16 nParagraph ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetTextLen( nParagraph ) : 0;
@@ -1014,7 +1014,7 @@ String SmTextForwarder::GetText( const ESelection& rSel ) const
return aRet;
}
-SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib ) const
+SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
OSL_ENSURE( pEditEngine, "EditEngine missing" );
@@ -1044,17 +1044,17 @@ SfxItemSet SmTextForwarder::GetAttribs( const ESelection& rSel, BOOL bOnlyHardAt
}
}
-SfxItemSet SmTextForwarder::GetParaAttribs( USHORT nPara ) const
+SfxItemSet SmTextForwarder::GetParaAttribs( sal_uInt16 nPara ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
OSL_ENSURE( pEditEngine, "EditEngine missing" );
SfxItemSet aSet( pEditEngine->GetParaAttribs( nPara ) );
- USHORT nWhich = EE_PARA_START;
+ sal_uInt16 nWhich = EE_PARA_START;
while( nWhich <= EE_PARA_END )
{
- if( aSet.GetItemState( nWhich, TRUE ) != SFX_ITEM_ON )
+ if( aSet.GetItemState( nWhich, sal_True ) != SFX_ITEM_ON )
{
if( pEditEngine->HasParaAttrib( nPara, nWhich ) )
aSet.Put( pEditEngine->GetParaAttrib( nPara, nWhich ) );
@@ -1065,7 +1065,7 @@ SfxItemSet SmTextForwarder::GetParaAttribs( USHORT nPara ) const
return aSet;
}
-void SmTextForwarder::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void SmTextForwarder::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
@@ -1085,7 +1085,7 @@ void SmTextForwarder::RemoveAttribs( const ESelection& rSelection, sal_Bool bRem
pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
}
-void SmTextForwarder::GetPortions( USHORT nPara, SvUShorts& rList ) const
+void SmTextForwarder::GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
@@ -1120,15 +1120,15 @@ void SmTextForwarder::QuickSetAttribs( const SfxItemSet& rSet, const ESelection&
pEditEngine->QuickSetAttribs( rSet, rSel );
}
-BOOL SmTextForwarder::IsValid() const
+sal_Bool SmTextForwarder::IsValid() const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
// cannot reliably query EditEngine state
// while in the middle of an update
- return pEditEngine ? pEditEngine->GetUpdateMode() : FALSE;
+ return pEditEngine ? pEditEngine->GetUpdateMode() : sal_False;
}
-XubString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
XubString aTxt;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1137,11 +1137,11 @@ XubString SmTextForwarder::CalcFieldValue( const SvxFieldItem& rField, USHORT nP
return aTxt;
}
-void SmTextForwarder::FieldClicked(const SvxFieldItem&, USHORT, USHORT)
+void SmTextForwarder::FieldClicked(const SvxFieldItem&, sal_uInt16, sal_uInt16)
{
}
-USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, USHORT nWhich )
+sal_uInt16 GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSel, sal_uInt16 nWhich )
{
EECharAttribArray aAttribs;
@@ -1150,16 +1150,16 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
SfxItemState eState = SFX_ITEM_DEFAULT;
// check all paragraphs inside the selection
- for( USHORT nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
+ for( sal_uInt16 nPara = rSel.nStartPara; nPara <= rSel.nEndPara; nPara++ )
{
SfxItemState eParaState = SFX_ITEM_DEFAULT;
// calculate start and endpos for this paragraph
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if( rSel.nStartPara == nPara )
nPos = rSel.nStartPos;
- USHORT nEndPos = rSel.nEndPos;
+ sal_uInt16 nEndPos = rSel.nEndPos;
if( rSel.nEndPara != nPara )
nEndPos = rEditEngine.GetTextLen( nPara );
@@ -1169,11 +1169,11 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
bool bEmpty = true; // we found no item inside the selektion of this paragraph
bool bGaps = false; // we found items but theire gaps between them
- USHORT nLastEnd = nPos;
+ sal_uInt16 nLastEnd = nPos;
const SfxPoolItem* pParaItem = NULL;
- for( USHORT nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
+ for( sal_uInt16 nAttrib = 0; nAttrib < aAttribs.Count(); nAttrib++ )
{
struct EECharAttrib aAttrib = aAttribs.GetObject( nAttrib );
OSL_ENSURE( aAttrib.pAttr, "GetCharAttribs gives corrupt data" );
@@ -1234,18 +1234,18 @@ USHORT GetSvxEditEngineItemState( EditEngine& rEditEngine, const ESelection& rSe
return eState;
}
-USHORT SmTextForwarder::GetItemState( const ESelection& rSel, USHORT nWhich ) const
+sal_uInt16 SmTextForwarder::GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const
{
- USHORT nState = SFX_ITEM_DISABLED;
+ sal_uInt16 nState = SFX_ITEM_DISABLED;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
nState = GetSvxEditEngineItemState( *pEditEngine, rSel, nWhich );
return nState;
}
-USHORT SmTextForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
+sal_uInt16 SmTextForwarder::GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const
{
- USHORT nState = SFX_ITEM_DISABLED;
+ sal_uInt16 nState = SFX_ITEM_DISABLED;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
{
@@ -1255,30 +1255,30 @@ USHORT SmTextForwarder::GetItemState( USHORT nPara, USHORT nWhich ) const
return nState;
}
-LanguageType SmTextForwarder::GetLanguage( USHORT nPara, USHORT nIndex ) const
+LanguageType SmTextForwarder::GetLanguage( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLanguage(nPara, nIndex) : LANGUAGE_NONE;
}
-USHORT SmTextForwarder::GetFieldCount( USHORT nPara ) const
+sal_uInt16 SmTextForwarder::GetFieldCount( sal_uInt16 nPara ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetFieldCount(nPara) : 0;
}
-EFieldInfo SmTextForwarder::GetFieldInfo( USHORT nPara, USHORT nField ) const
+EFieldInfo SmTextForwarder::GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetFieldInfo( nPara, nField ) : EFieldInfo();
}
-EBulletInfo SmTextForwarder::GetBulletInfo( USHORT /*nPara*/ ) const
+EBulletInfo SmTextForwarder::GetBulletInfo( sal_uInt16 /*nPara*/ ) const
{
return EBulletInfo();
}
-Rectangle SmTextForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
+Rectangle SmTextForwarder::GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
Rectangle aRect(0,0,0,0);
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1302,7 +1302,7 @@ Rectangle SmTextForwarder::GetCharBounds( USHORT nPara, USHORT nIndex ) const
return aRect;
}
-Rectangle SmTextForwarder::GetParaBounds( USHORT nPara ) const
+Rectangle SmTextForwarder::GetParaBounds( sal_uInt16 nPara ) const
{
Rectangle aRect(0,0,0,0);
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1310,8 +1310,8 @@ Rectangle SmTextForwarder::GetParaBounds( USHORT nPara ) const
if (pEditEngine)
{
const Point aPnt = pEditEngine->GetDocPosTopLeft( nPara );
- const ULONG nWidth = pEditEngine->CalcTextWidth();
- const ULONG nHeight = pEditEngine->GetTextHeight( nPara );
+ const sal_uLong nWidth = pEditEngine->CalcTextWidth();
+ const sal_uLong nHeight = pEditEngine->GetTextHeight( nPara );
aRect = Rectangle( aPnt.X(), aPnt.Y(), aPnt.X() + nWidth, aPnt.Y() + nHeight );
}
@@ -1330,7 +1330,7 @@ OutputDevice* SmTextForwarder::GetRefDevice() const
return pEditEngine ? pEditEngine->GetRefDevice() : 0;
}
-sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USHORT& nIndex ) const
+sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, sal_uInt16& nPara, sal_uInt16& nIndex ) const
{
sal_Bool bRes = sal_False;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1344,7 +1344,7 @@ sal_Bool SmTextForwarder::GetIndexAtPoint( const Point& rPos, USHORT& nPara, USH
return bRes;
}
-sal_Bool SmTextForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const
+sal_Bool SmTextForwarder::GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const
{
sal_Bool bRes = sal_False;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1365,7 +1365,7 @@ sal_Bool SmTextForwarder::GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& n
return bRes;
}
-sal_Bool SmTextForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const
+sal_Bool SmTextForwarder::GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ?
@@ -1373,31 +1373,31 @@ sal_Bool SmTextForwarder::GetAttributeRun( USHORT& nStartIndex, USHORT& nEndInde
: sal_False;
}
-USHORT SmTextForwarder::GetLineCount( USHORT nPara ) const
+sal_uInt16 SmTextForwarder::GetLineCount( sal_uInt16 nPara ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLineCount(nPara) : 0;
}
-USHORT SmTextForwarder::GetLineLen( USHORT nPara, USHORT nLine ) const
+sal_uInt16 SmTextForwarder::GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLineLen(nPara, nLine) : 0;
}
-void SmTextForwarder::GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nPara, USHORT nLine ) const
+void SmTextForwarder::GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nPara, sal_uInt16 nLine ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
pEditEngine->GetLineBoundaries(rStart, rEnd, nPara, nLine);
}
-USHORT SmTextForwarder::GetLineNumberAtIndex( USHORT nPara, USHORT nIndex ) const
+sal_uInt16 SmTextForwarder::GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nIndex ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
return pEditEngine ? pEditEngine->GetLineNumberAtIndex(nPara, nIndex) : 0;
}
-sal_Bool SmTextForwarder::QuickFormatDoc( BOOL /*bFull*/ )
+sal_Bool SmTextForwarder::QuickFormatDoc( sal_Bool /*bFull*/ )
{
sal_Bool bRes = sal_False;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1409,13 +1409,13 @@ sal_Bool SmTextForwarder::QuickFormatDoc( BOOL /*bFull*/ )
return bRes;
}
-sal_Int16 SmTextForwarder::GetDepth( USHORT /*nPara*/ ) const
+sal_Int16 SmTextForwarder::GetDepth( sal_uInt16 /*nPara*/ ) const
{
// math has no outliner...
return -1;
}
-sal_Bool SmTextForwarder::SetDepth( USHORT /*nPara*/, sal_Int16 nNewDepth )
+sal_Bool SmTextForwarder::SetDepth( sal_uInt16 /*nPara*/, sal_Int16 nNewDepth )
{
// math has no outliner...
return -1 == nNewDepth; // is it the value from 'GetDepth' ?
@@ -1464,12 +1464,12 @@ void SmTextForwarder::AppendParagraph()
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
if (pEditEngine)
{
- USHORT nParaCount = pEditEngine->GetParagraphCount();
+ sal_uInt16 nParaCount = pEditEngine->GetParagraphCount();
pEditEngine->InsertParagraph( nParaCount, String() );
}
}
-xub_StrLen SmTextForwarder::AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet )
+xub_StrLen SmTextForwarder::AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet )
{
xub_StrLen nRes = 0;
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
@@ -1513,7 +1513,7 @@ SmEditViewForwarder::~SmEditViewForwarder()
{
}
-BOOL SmEditViewForwarder::IsValid() const
+sal_Bool SmEditViewForwarder::IsValid() const
{
return rEditAcc.GetEditView() != 0;
}
@@ -1860,8 +1860,8 @@ sal_Int32 SAL_CALL SmEditAccessible::getAccessibleIndexInParent( )
Window *pAccParent = pWin ? pWin->GetAccessibleParentWindow() : 0;
if (pAccParent)
{
- USHORT nCnt = pAccParent->GetAccessibleChildWindowCount();
- for (USHORT i = 0; i < nCnt && nIdx == -1; ++i)
+ sal_uInt16 nCnt = pAccParent->GetAccessibleChildWindowCount();
+ for (sal_uInt16 i = 0; i < nCnt && nIdx == -1; ++i)
if (pAccParent->GetAccessibleChildWindow( i ) == pWin)
nIdx = i;
}
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index a0cb663d0839..a6b682b706fb 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -188,7 +188,7 @@ public:
SmViewForwarder( SmEditAccessible &rAcc );
virtual ~SmViewForwarder();
- virtual BOOL IsValid() const;
+ virtual sal_Bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
@@ -211,17 +211,17 @@ public:
SmTextForwarder( SmEditAccessible& rAcc, SmEditSource & rSource );
virtual ~SmTextForwarder();
- virtual USHORT GetParagraphCount() const;
- virtual USHORT GetTextLen( USHORT nParagraph ) const;
+ virtual sal_uInt16 GetParagraphCount() const;
+ virtual sal_uInt16 GetTextLen( sal_uInt16 nParagraph ) const;
virtual String GetText( const ESelection& rSel ) const;
- virtual SfxItemSet GetAttribs( const ESelection& rSel, BOOL bOnlyHardAttrib = EditEngineAttribs_All ) const;
- virtual SfxItemSet GetParaAttribs( USHORT nPara ) const;
- virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+ virtual SfxItemSet GetAttribs( const ESelection& rSel, sal_Bool bOnlyHardAttrib = EditEngineAttribs_All ) const;
+ virtual SfxItemSet GetParaAttribs( sal_uInt16 nPara ) const;
+ virtual void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
virtual void RemoveAttribs( const ESelection& rSelection, sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich );
- virtual void GetPortions( USHORT nPara, SvUShorts& rList ) const;
+ virtual void GetPortions( sal_uInt16 nPara, SvUShorts& rList ) const;
- virtual USHORT GetItemState( const ESelection& rSel, USHORT nWhich ) const;
- virtual USHORT GetItemState( USHORT nPara, USHORT nWhich ) const;
+ virtual sal_uInt16 GetItemState( const ESelection& rSel, sal_uInt16 nWhich ) const;
+ virtual sal_uInt16 GetItemState( sal_uInt16 nPara, sal_uInt16 nWhich ) const;
virtual void QuickInsertText( const String& rText, const ESelection& rSel );
virtual void QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel );
@@ -230,36 +230,36 @@ public:
virtual SfxItemPool* GetPool() const;
- virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor );
- virtual void FieldClicked(const SvxFieldItem&, USHORT, USHORT);
- virtual BOOL IsValid() const;
+ virtual XubString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor );
+ virtual void FieldClicked(const SvxFieldItem&, sal_uInt16, sal_uInt16);
+ virtual sal_Bool IsValid() const;
- virtual LanguageType GetLanguage( USHORT, USHORT ) const;
- virtual USHORT GetFieldCount( USHORT nPara ) const;
- virtual EFieldInfo GetFieldInfo( USHORT nPara, USHORT nField ) const;
- virtual EBulletInfo GetBulletInfo( USHORT nPara ) const;
- virtual Rectangle GetCharBounds( USHORT nPara, USHORT nIndex ) const;
- virtual Rectangle GetParaBounds( USHORT nPara ) const;
+ virtual LanguageType GetLanguage( sal_uInt16, sal_uInt16 ) const;
+ virtual sal_uInt16 GetFieldCount( sal_uInt16 nPara ) const;
+ virtual EFieldInfo GetFieldInfo( sal_uInt16 nPara, sal_uInt16 nField ) const;
+ virtual EBulletInfo GetBulletInfo( sal_uInt16 nPara ) const;
+ virtual Rectangle GetCharBounds( sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+ virtual Rectangle GetParaBounds( sal_uInt16 nPara ) const;
virtual MapMode GetMapMode() const;
virtual OutputDevice* GetRefDevice() const;
- virtual sal_Bool GetIndexAtPoint( const Point&, USHORT& nPara, USHORT& nIndex ) const;
- virtual sal_Bool GetWordIndices( USHORT nPara, USHORT nIndex, USHORT& nStart, USHORT& nEnd ) const;
- virtual sal_Bool GetAttributeRun( USHORT& nStartIndex, USHORT& nEndIndex, USHORT nPara, USHORT nIndex ) const;
- virtual USHORT GetLineCount( USHORT nPara ) const;
- virtual USHORT GetLineLen( USHORT nPara, USHORT nLine ) const;
- virtual void GetLineBoundaries( /*out*/USHORT &rStart, /*out*/USHORT &rEnd, USHORT nParagraph, USHORT nLine ) const;
- virtual USHORT GetLineNumberAtIndex( USHORT nPara, USHORT nLine ) const;
+ virtual sal_Bool GetIndexAtPoint( const Point&, sal_uInt16& nPara, sal_uInt16& nIndex ) const;
+ virtual sal_Bool GetWordIndices( sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt16& nStart, sal_uInt16& nEnd ) const;
+ virtual sal_Bool GetAttributeRun( sal_uInt16& nStartIndex, sal_uInt16& nEndIndex, sal_uInt16 nPara, sal_uInt16 nIndex ) const;
+ virtual sal_uInt16 GetLineCount( sal_uInt16 nPara ) const;
+ virtual sal_uInt16 GetLineLen( sal_uInt16 nPara, sal_uInt16 nLine ) const;
+ virtual void GetLineBoundaries( /*out*/sal_uInt16 &rStart, /*out*/sal_uInt16 &rEnd, sal_uInt16 nParagraph, sal_uInt16 nLine ) const;
+ virtual sal_uInt16 GetLineNumberAtIndex( sal_uInt16 nPara, sal_uInt16 nLine ) const;
virtual sal_Bool Delete( const ESelection& );
virtual sal_Bool InsertText( const String&, const ESelection& );
- virtual sal_Bool QuickFormatDoc( BOOL bFull=FALSE );
+ virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
- virtual sal_Int16 GetDepth( USHORT nPara ) const;
- virtual sal_Bool SetDepth( USHORT nPara, sal_Int16 nNewDepth );
+ virtual sal_Int16 GetDepth( sal_uInt16 nPara ) const;
+ virtual sal_Bool SetDepth( sal_uInt16 nPara, sal_Int16 nNewDepth );
virtual const SfxItemSet* GetEmptyItemSetPtr();
// implementation functions for XParagraphAppend and XTextPortionAppend
virtual void AppendParagraph();
- virtual xub_StrLen AppendTextPortion( USHORT nPara, const String &rText, const SfxItemSet &rSet );
+ virtual xub_StrLen AppendTextPortion( sal_uInt16 nPara, const String &rText, const SfxItemSet &rSet );
virtual void CopyText(const SvxTextForwarder& rSource);
};
@@ -278,7 +278,7 @@ public:
SmEditViewForwarder( SmEditAccessible& rAcc );
virtual ~SmEditViewForwarder();
- virtual BOOL IsValid() const;
+ virtual sal_Bool IsValid() const;
virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index d019a98118e9..89c42aa68731 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -50,8 +50,6 @@ static const char* aRootName = "Office.Math";
#define SYMBOL_LIST "SymbolList"
#define FONT_FORMAT_LIST "FontFormatList"
-SV_IMPL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry );
-
/////////////////////////////////////////////////////////////////
@@ -72,7 +70,7 @@ static Sequence< OUString > lcl_GetFontPropertyNames()
Sequence< OUString > aNames( 6 );
OUString *pNames = aNames.getArray();
- for( INT32 i = 0; *ppPropName; ++i, ++ppPropName )
+ for( sal_Int32 i = 0; *ppPropName; ++i, ++ppPropName )
{
pNames[i] = A2OU( *ppPropName );
}
@@ -97,7 +95,7 @@ static Sequence< OUString > lcl_GetSymbolPropertyNames()
Sequence< OUString > aNames( 4 );
OUString *pNames = aNames.getArray();
- for( INT32 i = 0; *ppPropName; ++i, ++ppPropName )
+ for( sal_Int32 i = 0; *ppPropName; ++i, ++ppPropName )
{
pNames[i] = A2OU( *ppPropName );
}
@@ -113,6 +111,8 @@ static const char * aMathPropNames[] =
"Print/Frame",
"Print/Size",
"Print/ZoomFactor",
+ "LoadSave/IsSaveOnlyUsedSymbols",
+ //"Misc/NoSymbolsWarning", @deprecated
"Misc/IgnoreSpacesRight",
"View/ToolboxVisible",
"View/AutoRedraw",
@@ -169,14 +169,14 @@ static const char * aFormatPropNames[] =
static Sequence< OUString > lcl_GetPropertyNames(
- const char * aPropNames[], USHORT nCount )
+ const char * aPropNames[], sal_uInt16 nCount )
{
const char** ppPropName = aPropNames;
Sequence< OUString > aNames( nCount );
OUString *pNames = aNames.getArray();
- for (INT32 i = 0; i < nCount; ++i, ++ppPropName)
+ for (sal_Int32 i = 0; i < nCount; ++i, ++ppPropName)
{
pNames[i] = A2OU( *ppPropName );
}
@@ -186,14 +186,14 @@ static Sequence< OUString > lcl_GetPropertyNames(
static Sequence< OUString > GetFormatPropertyNames()
{
- USHORT nCnt = SAL_N_ELEMENTS(aFormatPropNames);
+ sal_uInt16 nCnt = SAL_N_ELEMENTS(aFormatPropNames);
return lcl_GetPropertyNames( aFormatPropNames, nCnt );
}
static Sequence< OUString > GetOtherPropertyNames()
{
- USHORT nCnt = SAL_N_ELEMENTS(aMathPropNames);
+ sal_uInt16 nCnt = SAL_N_ELEMENTS(aMathPropNames);
return lcl_GetPropertyNames( aMathPropNames, nCnt );
}
@@ -202,14 +202,16 @@ static Sequence< OUString > GetOtherPropertyNames()
struct SmCfgOther
{
SmPrintSize ePrintSize;
- USHORT nPrintZoomFactor;
+ sal_uInt16 nPrintZoomFactor;
bool bPrintTitle;
bool bPrintFormulaText;
bool bPrintFrame;
+ bool bIsSaveOnlyUsedSymbols;
bool bIgnoreSpacesRight;
bool bToolboxVisible;
bool bAutoRedraw;
bool bFormulaCursor;
+ //sal_Bool bNoSymbolsWarning;
SmCfgOther();
};
@@ -222,7 +224,7 @@ SmCfgOther::SmCfgOther()
bPrintTitle = bPrintFormulaText =
bPrintFrame = bIgnoreSpacesRight =
bToolboxVisible = bAutoRedraw =
- bFormulaCursor = true;
+ bFormulaCursor = bIsSaveOnlyUsedSymbols = true;
}
/////////////////////////////////////////////////////////////////
@@ -242,11 +244,11 @@ SmFontFormat::SmFontFormat()
SmFontFormat::SmFontFormat( const Font &rFont )
{
aName = rFont.GetName();
- nCharSet = (INT16) rFont.GetCharSet();
- nFamily = (INT16) rFont.GetFamily();
- nPitch = (INT16) rFont.GetPitch();
- nWeight = (INT16) rFont.GetWeight();
- nItalic = (INT16) rFont.GetItalic();
+ nCharSet = (sal_Int16) rFont.GetCharSet();
+ nFamily = (sal_Int16) rFont.GetFamily();
+ nPitch = (sal_Int16) rFont.GetPitch();
+ nWeight = (sal_Int16) rFont.GetWeight();
+ nItalic = (sal_Int16) rFont.GetItalic();
}
@@ -291,10 +293,9 @@ SmFontFormatList::SmFontFormatList()
void SmFontFormatList::Clear()
{
- USHORT nCnt = aEntries.Count();
- if (nCnt)
+ if (!aEntries.empty())
{
- aEntries.Remove( 0, nCnt );
+ aEntries.clear();
SetModified( true );
}
}
@@ -308,7 +309,7 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
if (!pFntFmt)
{
SmFntFmtListEntry aEntry( rFntFmtId, rFntFmt );
- aEntries.Insert( aEntry, aEntries.Count() );
+ aEntries.push_back( aEntry );
SetModified( true );
}
}
@@ -316,35 +317,32 @@ void SmFontFormatList::AddFontFormat( const String &rFntFmtId,
void SmFontFormatList::RemoveFontFormat( const String &rFntFmtId )
{
- USHORT nPos = 0xFFFF;
// search for entry
- USHORT nCnt = aEntries.Count();
- for (USHORT i = 0; i < nCnt && nPos == 0xFFFF; ++i)
+ for (size_t i = 0; i < aEntries.size(); ++i)
{
if (aEntries[i].aId == rFntFmtId)
- nPos = i;
- }
-
- // remove entry if found
- if (nPos != 0xFFFF)
- {
- aEntries.Remove( nPos );
- SetModified( true );
+ {
+ // remove entry if found
+ aEntries.erase( aEntries.begin() + i );
+ SetModified( true );
+ break;
+ }
}
}
const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId ) const
{
- SmFontFormat *pRes = 0;
+ const SmFontFormat *pRes = 0;
- USHORT nCnt = aEntries.Count();
- USHORT i;
- for (i = 0; i < nCnt && !pRes; ++i)
+ for (size_t i = 0; i < aEntries.size(); ++i)
{
if (aEntries[i].aId == rFntFmtId)
+ {
pRes = &aEntries[i].aFntFmt;
+ break;
+ }
}
return pRes;
@@ -352,11 +350,11 @@ const SmFontFormat * SmFontFormatList::GetFontFormat( const String &rFntFmtId )
-const SmFontFormat * SmFontFormatList::GetFontFormat( USHORT nPos ) const
+const SmFontFormat * SmFontFormatList::GetFontFormat( size_t nPos ) const
{
- SmFontFormat *pRes = 0;
- if (nPos < aEntries.Count())
- pRes = &aEntries[ nPos ].aFntFmt;
+ const SmFontFormat *pRes = 0;
+ if (nPos < aEntries.size())
+ pRes = &aEntries[nPos].aFntFmt;
return pRes;
}
@@ -365,12 +363,13 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt ) co
{
String aRes;
- USHORT nCnt = aEntries.Count();
- USHORT i;
- for (i = 0; i < nCnt && 0 == aRes.Len(); ++i)
+ for (size_t i = 0; i < aEntries.size(); ++i)
{
if (aEntries[i].aFntFmt == rFntFmt)
+ {
aRes = aEntries[i].aId;
+ break;
+ }
}
return aRes;
@@ -389,10 +388,10 @@ const String SmFontFormatList::GetFontFormatId( const SmFontFormat &rFntFmt, boo
}
-const String SmFontFormatList::GetFontFormatId( USHORT nPos ) const
+const String SmFontFormatList::GetFontFormatId( size_t nPos ) const
{
String aRes;
- if (nPos < aEntries.Count())
+ if (nPos < aEntries.size())
aRes = aEntries[nPos].aId;
return aRes;
}
@@ -405,13 +404,16 @@ const String SmFontFormatList::GetNewFontFormatId() const
String aRes;
String aPrefix( RTL_CONSTASCII_USTRINGPARAM( "Id" ) );
- INT32 nCnt = GetCount();
- for (INT32 i = 1; i <= nCnt + 1 && 0 == aRes.Len(); ++i)
+ sal_Int32 nCnt = GetCount();
+ for (sal_Int32 i = 1; i <= nCnt + 1; ++i)
{
String aTmpId( aPrefix );
aTmpId += String::CreateFromInt32( i );
if (!GetFontFormat( aTmpId ))
+ {
aRes = aTmpId;
+ break;
+ }
}
OSL_ENSURE( 0 != aRes.Len(), "failed to create new FontFormatId" );
@@ -466,11 +468,11 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
const rtl::OUString &rBaseNode ) const
{
Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
OUString *pName = aNames.getArray();
- for (INT32 i = 0; i < nProps; ++i)
+ for (sal_Int32 i = 0; i < nProps; ++i)
{
OUString &rName = pName[i];
OUString aTmp( rName );
@@ -487,17 +489,17 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
{
const Any * pValue = aValues.getConstArray();
Font aFont;
- sal_Unicode cChar = '\0';
+ sal_UCS4 cChar = '\0';
String aSet;
bool bPredefined = false;
OUString aTmpStr;
- INT32 nTmp32 = 0;
+ sal_Int32 nTmp32 = 0;
bool bTmp = false;
bool bOK = true;
if (pValue->hasValue() && (*pValue >>= nTmp32))
- cChar = (sal_Unicode) nTmp32;
+ cChar = static_cast< sal_UCS4 >( nTmp32 );
else
bOK = false;
++pValue;
@@ -580,7 +582,7 @@ void SmMathConfig::GetSymbols( std::vector< SmSym > &rSymbols ) const
{
Sequence< OUString > aNodes( ((SmMathConfig*) this)->GetNodeNames( A2OU( SYMBOL_LIST ) ) );
const OUString *pNode = aNodes.getConstArray();
- INT32 nNodes = aNodes.getLength();
+ sal_Int32 nNodes = aNodes.getLength();
rSymbols.resize( nNodes );
std::vector< SmSym >::iterator aIt( rSymbols.begin() );
@@ -598,7 +600,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
Sequence< OUString > aNames = lcl_GetSymbolPropertyNames();
const OUString *pNames = aNames.getConstArray();
- sal_uIntPtr nSymbolProps = sal::static_int_cast< UINT32 >(aNames.getLength());
+ sal_uIntPtr nSymbolProps = sal::static_int_cast< sal_uInt32 >(aNames.getLength());
Sequence< PropertyValue > aValues( nCount * nSymbolProps );
PropertyValue *pValues = aValues.getArray();
@@ -620,7 +622,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
// Char
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT32) rSymbol.GetCharacter();
+ pVal->Value <<= static_cast< sal_UCS4 >( rSymbol.GetCharacter() );
pVal++;
// Set
pVal->Name = aNodeNameDelim;
@@ -633,7 +635,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
// Predefined
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (BOOL) rSymbol.IsPredefined();
+ pVal->Value <<= (sal_Bool) rSymbol.IsPredefined();
pVal++;
// FontFormatId
SmFontFormat aFntFmt( rSymbol.GetFace() );
@@ -671,9 +673,9 @@ void SmMathConfig::LoadFontFormatList()
Sequence< OUString > aNodes( GetNodeNames( A2OU( FONT_FORMAT_LIST ) ) );
const OUString *pNode = aNodes.getConstArray();
- INT32 nNodes = aNodes.getLength();
+ sal_Int32 nNodes = aNodes.getLength();
- for (INT32 i = 0; i < nNodes; ++i)
+ for (sal_Int32 i = 0; i < nNodes; ++i)
{
SmFontFormat aFntFmt;
ReadFontFormat( aFntFmt, pNode[i], A2OU( FONT_FORMAT_LIST ) );
@@ -692,11 +694,11 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
const OUString &rSymbolName, const OUString &rBaseNode ) const
{
Sequence< OUString > aNames = lcl_GetFontPropertyNames();
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
OUString *pName = aNames.getArray();
- for (INT32 i = 0; i < nProps; ++i)
+ for (sal_Int32 i = 0; i < nProps; ++i)
{
OUString &rName = pName[i];
OUString aTmp( rName );
@@ -714,7 +716,7 @@ void SmMathConfig::ReadFontFormat( SmFontFormat &rFontFormat,
const Any * pValue = aValues.getConstArray();
OUString aTmpStr;
- INT16 nTmp16 = 0;
+ sal_Int16 nTmp16 = 0;
bool bOK = true;
if (pValue->hasValue() && (*pValue >>= aTmpStr))
@@ -762,16 +764,16 @@ void SmMathConfig::SaveFontFormatList()
return;
Sequence< OUString > aNames = lcl_GetFontPropertyNames();
- INT32 nSymbolProps = aNames.getLength();
+ sal_Int32 nSymbolProps = aNames.getLength();
- USHORT nCount = rFntFmtList.GetCount();
+ size_t nCount = rFntFmtList.GetCount();
Sequence< PropertyValue > aValues( nCount * nSymbolProps );
PropertyValue *pValues = aValues.getArray();
PropertyValue *pVal = pValues;
OUString aDelim( OUString::valueOf( (sal_Unicode) '/' ) );
- for (USHORT i = 0; i < nCount; ++i)
+ for (size_t i = 0; i < nCount; ++i)
{
String aFntFmtId( rFntFmtList.GetFontFormatId( i ) );
const SmFontFormat aFntFmt( *rFntFmtList.GetFontFormat( aFntFmtId ) );
@@ -791,27 +793,27 @@ void SmMathConfig::SaveFontFormatList()
// CharSet
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT16) aFntFmt.nCharSet; // 6.0 file-format GetSOStoreTextEncoding not needed
+ pVal->Value <<= (sal_Int16) aFntFmt.nCharSet; // 6.0 file-format GetSOStoreTextEncoding not needed
pVal++;
// Family
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT16) aFntFmt.nFamily;
+ pVal->Value <<= (sal_Int16) aFntFmt.nFamily;
pVal++;
// Pitch
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT16) aFntFmt.nPitch;
+ pVal->Value <<= (sal_Int16) aFntFmt.nPitch;
pVal++;
// Weight
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT16) aFntFmt.nWeight;
+ pVal->Value <<= (sal_Int16) aFntFmt.nWeight;
pVal++;
// Italic
pVal->Name = aNodeNameDelim;
pVal->Name += *pName++;
- pVal->Value <<= (INT16) aFntFmt.nItalic;
+ pVal->Value <<= (sal_Int16) aFntFmt.nItalic;
pVal++;
}
OSL_ENSURE( pVal - pValues == nCount * nSymbolProps, "properties missing" );
@@ -823,13 +825,12 @@ void SmMathConfig::SaveFontFormatList()
void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
{
- size_t nCount = rSymbols.size();
- USHORT i;
+ size_t i;
// 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)
{
OSL_ENSURE( rSymbols[i].GetName().Len() > 0, "non named symbol" );
aUsedList.GetFontFormatId( SmFontFormat( rSymbols[i].GetFace() ) , true );
@@ -842,14 +843,14 @@ void SmMathConfig::StripFontFormatList( const std::vector< SmSym > &rSymbols )
// remove unused font-formats from list
SmFontFormatList &rFntFmtList = GetFontFormatList();
- USHORT nCnt = rFntFmtList.GetCount();
+ size_t nCnt = rFntFmtList.GetCount();
SmFontFormat *pTmpFormat = new SmFontFormat[ nCnt ];
String *pId = new String [ nCnt ];
- INT32 k;
+ size_t k;
for (k = 0; k < nCnt; ++k)
{
- pTmpFormat[k] = *rFntFmtList.GetFontFormat( (USHORT) k );
- pId[k] = rFntFmtList.GetFontFormatId( (USHORT) k );
+ pTmpFormat[k] = *rFntFmtList.GetFontFormat( k );
+ pId[k] = rFntFmtList.GetFontFormatId( k );
}
for (k = 0; k < nCnt; ++k)
{
@@ -869,7 +870,7 @@ void SmMathConfig::LoadOther()
pOther = new SmCfgOther;
Sequence< OUString > aNames( GetOtherPropertyNames() );
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
Sequence< Any > aValues( GetProperties( aNames ) );
if (nProps && aValues.getLength() == nProps)
@@ -877,7 +878,7 @@ void SmMathConfig::LoadOther()
const Any *pValues = aValues.getConstArray();
const Any *pVal = pValues;
- INT16 nTmp16 = 0;
+ sal_Int16 nTmp16 = 0;
bool bTmp = false;
// Print/Title
@@ -900,6 +901,10 @@ void SmMathConfig::LoadOther()
if (pVal->hasValue() && (*pVal >>= nTmp16))
pOther->nPrintZoomFactor = nTmp16;
++pVal;
+ // LoadSave/IsSaveOnlyUsedSymbols
+ if (pVal->hasValue() && (*pVal >>= bTmp))
+ pOther->bIsSaveOnlyUsedSymbols = bTmp;
+ ++pVal;
// Misc/IgnoreSpacesRight
if (pVal->hasValue() && (*pVal >>= bTmp))
pOther->bIgnoreSpacesRight = bTmp;
@@ -929,30 +934,32 @@ void SmMathConfig::SaveOther()
return;
const Sequence< OUString > aNames( GetOtherPropertyNames() );
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
Sequence< Any > aValues( nProps );
Any *pValues = aValues.getArray();
Any *pValue = pValues;
// Print/Title
- *pValue++ <<= (BOOL) pOther->bPrintTitle;
+ *pValue++ <<= (sal_Bool) pOther->bPrintTitle;
// Print/FormulaText
- *pValue++ <<= (BOOL) pOther->bPrintFormulaText;
+ *pValue++ <<= (sal_Bool) pOther->bPrintFormulaText;
// Print/Frame
- *pValue++ <<= (BOOL) pOther->bPrintFrame;
+ *pValue++ <<= (sal_Bool) pOther->bPrintFrame;
// Print/Size
- *pValue++ <<= (INT16) pOther->ePrintSize;
+ *pValue++ <<= (sal_Int16) pOther->ePrintSize;
// Print/ZoomFactor
- *pValue++ <<= (INT16) pOther->nPrintZoomFactor;
+ *pValue++ <<= (sal_Int16) pOther->nPrintZoomFactor;
+ // LoadSave/IsSaveOnlyUsedSymbols
+ *pValue++ <<= (sal_Bool) pOther->bIsSaveOnlyUsedSymbols;
// Misc/IgnoreSpacesRight
- *pValue++ <<= (BOOL) pOther->bIgnoreSpacesRight;
+ *pValue++ <<= (sal_Bool) pOther->bIgnoreSpacesRight;
// View/ToolboxVisible
- *pValue++ <<= (BOOL) pOther->bToolboxVisible;
+ *pValue++ <<= (sal_Bool) pOther->bToolboxVisible;
// View/AutoRedraw
- *pValue++ <<= (BOOL) pOther->bAutoRedraw;
+ *pValue++ <<= (sal_Bool) pOther->bAutoRedraw;
// View/FormulaCursor
- *pValue++ <<= (BOOL) pOther->bFormulaCursor;
+ *pValue++ <<= (sal_Bool) pOther->bFormulaCursor;
OSL_ENSURE( pValue - pValues == nProps, "property mismatch" );
PutProperties( aNames , aValues );
@@ -967,7 +974,7 @@ void SmMathConfig::LoadFormat()
Sequence< OUString > aNames( GetFormatPropertyNames() );
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
Sequence< Any > aValues( GetProperties( aNames ) );
if (nProps && aValues.getLength() == nProps)
@@ -976,7 +983,7 @@ void SmMathConfig::LoadFormat()
const Any *pVal = pValues;
OUString aTmpStr;
- INT16 nTmp16 = 0;
+ sal_Int16 nTmp16 = 0;
bool bTmp = false;
// StandardFormat/Textmode
@@ -1000,7 +1007,7 @@ void SmMathConfig::LoadFormat()
pFormat->SetBaseSize( Size(0, SmPtsTo100th_mm( nTmp16 )) );
++pVal;
- USHORT i;
+ sal_uInt16 i;
for (i = SIZ_BEGIN; i <= SIZ_END; ++i)
{
if (pVal->hasValue() && (*pVal >>= nTmp16))
@@ -1054,30 +1061,30 @@ void SmMathConfig::SaveFormat()
return;
const Sequence< OUString > aNames( GetFormatPropertyNames() );
- INT32 nProps = aNames.getLength();
+ sal_Int32 nProps = aNames.getLength();
Sequence< Any > aValues( nProps );
Any *pValues = aValues.getArray();
Any *pValue = pValues;
// StandardFormat/Textmode
- *pValue++ <<= (BOOL) pFormat->IsTextmode();
+ *pValue++ <<= (sal_Bool) pFormat->IsTextmode();
// StandardFormat/GreekCharStyle
- *pValue++ <<= (INT16) pFormat->GetGreekCharStyle();
+ *pValue++ <<= (sal_Int16) pFormat->GetGreekCharStyle();
// StandardFormat/ScaleNormalBracket
- *pValue++ <<= (BOOL) pFormat->IsScaleNormalBrackets();
+ *pValue++ <<= (sal_Bool) pFormat->IsScaleNormalBrackets();
// StandardFormat/HorizontalAlignment
- *pValue++ <<= (INT16) pFormat->GetHorAlign();
+ *pValue++ <<= (sal_Int16) pFormat->GetHorAlign();
// StandardFormat/BaseSize
- *pValue++ <<= (INT16) SmRoundFraction( Sm100th_mmToPts(
+ *pValue++ <<= (sal_Int16) SmRoundFraction( Sm100th_mmToPts(
pFormat->GetBaseSize().Height() ) );
- USHORT i;
+ sal_uInt16 i;
for (i = SIZ_BEGIN; i <= SIZ_END; ++i)
- *pValue++ <<= (INT16) pFormat->GetRelSize( i );
+ *pValue++ <<= (sal_Int16) pFormat->GetRelSize( i );
for (i = DIS_BEGIN; i <= DIS_END; ++i)
- *pValue++ <<= (INT16) pFormat->GetDistance( i );
+ *pValue++ <<= (sal_Int16) pFormat->GetDistance( i );
for (i = FNT_BEGIN; i < FNT_END; ++i)
{
@@ -1148,7 +1155,7 @@ void SmMathConfig::SetPrintSize( SmPrintSize eSize )
}
-USHORT SmMathConfig::GetPrintZoomFactor() const
+sal_uInt16 SmMathConfig::GetPrintZoomFactor() const
{
if (!pOther)
((SmMathConfig *) this)->LoadOther();
@@ -1156,7 +1163,7 @@ USHORT SmMathConfig::GetPrintZoomFactor() const
}
-void SmMathConfig::SetPrintZoomFactor( USHORT nVal )
+void SmMathConfig::SetPrintZoomFactor( sal_uInt16 nVal )
{
if (!pOther)
LoadOther();
@@ -1209,6 +1216,12 @@ void SmMathConfig::SetPrintFormulaText( bool bVal )
SetOtherIfNotEqual( pOther->bPrintFormulaText, bVal );
}
+bool SmMathConfig::IsSaveOnlyUsedSymbols() const
+{
+ if (!pOther)
+ ((SmMathConfig *) this)->LoadOther();
+ return pOther->bIsSaveOnlyUsedSymbols;
+}
bool SmMathConfig::IsPrintFrame() const
{
@@ -1226,6 +1239,14 @@ void SmMathConfig::SetPrintFrame( bool bVal )
}
+void SmMathConfig::SetSaveOnlyUsedSymbols( bool bVal )
+{
+ if (!pOther)
+ LoadOther();
+ SetOtherIfNotEqual( pOther->bIsSaveOnlyUsedSymbols, bVal );
+}
+
+
bool SmMathConfig::IsIgnoreSpacesRight() const
{
if (!pOther)
diff --git a/starmath/source/cfgitem.hxx b/starmath/source/cfgitem.hxx
index 3762d15fc6bc..e3fb818d4c4c 100644
--- a/starmath/source/cfgitem.hxx
+++ b/starmath/source/cfgitem.hxx
@@ -33,6 +33,7 @@
#ifndef _MATH_CFGITEM_HXX_
#define _MATH_CFGITEM_HXX_
+#include <deque>
#include <vector>
#include <com/sun/star/beans/PropertyValues.hpp>
@@ -42,7 +43,6 @@
#include <tools/solar.h>
#include <rtl/ustring.hxx>
#include <unotools/configitem.hxx>
-#include <svl/svarray.hxx>
#include <vcl/timer.hxx>
#include <symbol.hxx>
@@ -61,11 +61,11 @@ struct SmCfgOther;
struct SmFontFormat
{
String aName;
- INT16 nCharSet;
- INT16 nFamily;
- INT16 nPitch;
- INT16 nWeight;
- INT16 nItalic;
+ sal_Int16 nCharSet;
+ sal_Int16 nFamily;
+ sal_Int16 nPitch;
+ sal_Int16 nWeight;
+ sal_Int16 nItalic;
SmFontFormat();
SmFontFormat( const Font &rFont );
@@ -83,13 +83,9 @@ struct SmFntFmtListEntry
SmFntFmtListEntry( const String &rId, const SmFontFormat &rFntFmt );
};
-
-SV_DECL_OBJARR( SmFntFmtListEntryArr, SmFntFmtListEntry, 8, 8 )
-
-
class SmFontFormatList
{
- SmFntFmtListEntryArr aEntries;
+ std::deque<SmFntFmtListEntry> aEntries;
bool bModified;
// disallow copy-constructor and assignment-operator for now
@@ -104,12 +100,12 @@ 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( 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; }
@@ -190,15 +186,18 @@ public:
void SetPrintFrame( bool bVal );
SmPrintSize GetPrintSize() const;
void SetPrintSize( SmPrintSize eSize );
- USHORT GetPrintZoomFactor() const;
- void SetPrintZoomFactor( USHORT nVal );
+ sal_uInt16 GetPrintZoomFactor() const;
+ void SetPrintZoomFactor( sal_uInt16 nVal );
+ bool IsSaveOnlyUsedSymbols() const;
+ void SetSaveOnlyUsedSymbols( bool bVal );
bool IsIgnoreSpacesRight() const;
void SetIgnoreSpacesRight( bool bVal );
bool IsAutoRedraw() const;
void SetAutoRedraw( bool bVal );
bool IsShowFormulaCursor() const;
void SetShowFormulaCursor( bool bVal );
+ void SetAutoRedraw( sal_Bool bVal );
};
/////////////////////////////////////////////////////////////////
diff --git a/starmath/source/config.cxx b/starmath/source/config.cxx
index c9e36a93b51d..2bcfb43a0d1f 100644..100755
--- a/starmath/source/config.cxx
+++ b/starmath/source/config.cxx
@@ -63,33 +63,33 @@ void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
{
const SfxPoolItem *pItem = NULL;
- UINT16 nU16;
+ sal_uInt16 nU16;
bool bVal;
- if (rSet.GetItemState(SID_PRINTSIZE, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_PRINTSIZE, sal_True, &pItem) == SFX_ITEM_SET)
{ nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
SetPrintSize( (SmPrintSize) nU16 );
}
- if (rSet.GetItemState(SID_PRINTZOOM, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_PRINTZOOM, sal_True, &pItem) == SFX_ITEM_SET)
{ nU16 = ((const SfxUInt16Item *) pItem)->GetValue();
SetPrintZoomFactor( nU16 );
}
- if (rSet.GetItemState(SID_PRINTTITLE, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_PRINTTITLE, sal_True, &pItem) == SFX_ITEM_SET)
{ bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintTitle( bVal );
}
- if (rSet.GetItemState(SID_PRINTTEXT, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_PRINTTEXT, sal_True, &pItem) == SFX_ITEM_SET)
{ bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintFormulaText( bVal );
}
- if (rSet.GetItemState(SID_PRINTFRAME, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_PRINTFRAME, sal_True, &pItem) == SFX_ITEM_SET)
{ bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetPrintFrame( bVal );
}
- if (rSet.GetItemState(SID_AUTOREDRAW, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_AUTOREDRAW, sal_True, &pItem) == SFX_ITEM_SET)
{ bVal = ((const SfxBoolItem *) pItem)->GetValue();
SetAutoRedraw( bVal );
}
- if (rSet.GetItemState(SID_NO_RIGHT_SPACES, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rSet.GetItemState(SID_NO_RIGHT_SPACES, sal_True, &pItem) == SFX_ITEM_SET)
{ bVal = ((const SfxBoolItem *) pItem)->GetValue();
if (IsIgnoreSpacesRight() != bVal)
{
@@ -100,6 +100,10 @@ void SmConfig::ItemSetToConfig(const SfxItemSet &rSet)
Broadcast(SfxSimpleHint(HINT_FORMATCHANGED));
}
}
+ if (rSet.GetItemState(SID_SAVE_ONLY_USED_SYMBOLS, sal_True, &pItem) == SFX_ITEM_SET)
+ { bVal = ((const SfxBoolItem *) pItem)->GetValue();
+ SetSaveOnlyUsedSymbols( bVal );
+ }
SaveOther();
}
@@ -110,15 +114,16 @@ void SmConfig::ConfigToItemSet(SfxItemSet &rSet) const
const SfxItemPool *pPool = rSet.GetPool();
rSet.Put(SfxUInt16Item(pPool->GetWhich(SID_PRINTSIZE),
- (UINT16) GetPrintSize()));
+ (sal_uInt16) GetPrintSize()));
rSet.Put(SfxUInt16Item(pPool->GetWhich(SID_PRINTZOOM),
- (UINT16) GetPrintZoomFactor()));
+ (sal_uInt16) GetPrintZoomFactor()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_PRINTTITLE), IsPrintTitle()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_PRINTTEXT), IsPrintFormulaText()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_PRINTFRAME), IsPrintFrame()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_AUTOREDRAW), IsAutoRedraw()));
rSet.Put(SfxBoolItem(pPool->GetWhich(SID_NO_RIGHT_SPACES), IsIgnoreSpacesRight()));
+ rSet.Put(SfxBoolItem(pPool->GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), IsSaveOnlyUsedSymbols()));
}
diff --git a/starmath/source/cursor.cxx b/starmath/source/cursor.cxx
index e9eb20048869..558d305ab4d4 100644
--- a/starmath/source/cursor.cxx
+++ b/starmath/source/cursor.cxx
@@ -458,7 +458,7 @@ SmNodeList::iterator SmCursor::TakeSelectedNodesFromList(SmNodeList *pLineList,
len2 = start3 - start2,
len3 = aText.Len() - start3;
SmToken aToken = pText->GetToken();
- USHORT eFontDesc = pText->GetFontDesc();
+ sal_uInt16 eFontDesc = pText->GetFontDesc();
//If we need make segment 1
if(len1 > 0) {
int start1 = 0;
@@ -507,9 +507,9 @@ void SmCursor::InsertSubSup(SmSubSup eSubSup) {
if(HasSelection()) {
SmNode *pSNode = FindSelectedNode(pTree);
j_assert(pSNode != NULL, "There must be a selected node when HasSelection is true!");
- pLine = FindTopMostNodeInLine(pSNode, TRUE);
+ pLine = FindTopMostNodeInLine(pSNode, sal_True);
} else
- pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, FALSE);
+ pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, sal_False);
//Find Parent and offset in parent
SmStructureNode *pLineParent = pLine->GetParent();
@@ -610,7 +610,7 @@ bool SmCursor::InsertLimit(SmSubSup eSubSup, bool bMoveCaret) {
pSubject = (SmOperNode*)position->CaretPos.pSelectedNode;
else {
//If not, check if parent of the current line is a SmOperNode
- SmNode *pLineNode = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, FALSE);
+ SmNode *pLineNode = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, sal_False);
if(pLineNode->GetParent() && pLineNode->GetParent()->GetType() == NOPER)
pSubject = (SmOperNode*)pLineNode->GetParent();
}
@@ -678,9 +678,9 @@ void SmCursor::InsertBrackets(SmBracketType eBracketType) {
if(HasSelection()) {
SmNode *pSNode = FindSelectedNode(pTree);
j_assert(pSNode != NULL, "There must be a selected node if HasSelection()");
- pLine = FindTopMostNodeInLine(pSNode, TRUE);
+ pLine = FindTopMostNodeInLine(pSNode, sal_True);
} else
- pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, FALSE);
+ pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, sal_False);
//Find parent and offset in parent
SmStructureNode *pLineParent = pLine->GetParent();
@@ -814,9 +814,9 @@ bool SmCursor::InsertRow() {
if(HasSelection()) {
SmNode *pSNode = FindSelectedNode(pTree);
j_assert(pSNode != NULL, "There must be a selected node if HasSelection()");
- pLine = FindTopMostNodeInLine(pSNode, TRUE);
+ pLine = FindTopMostNodeInLine(pSNode, sal_True);
} else
- pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, FALSE);
+ pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, sal_False);
//Find parent and offset in parent
SmStructureNode *pLineParent = pLine->GetParent();
@@ -841,7 +841,7 @@ bool SmCursor::InsertRow() {
if(pLineParent->GetType() == NMATRIX)
pMatrix = (SmMatrixNode*)pLineParent;
- //If we're not in a context that supports InsertRow, return FALSE
+ //If we're not in a context that supports InsertRow, return sal_False
if(!pTable && !pMatrix)
return false;
@@ -903,8 +903,8 @@ bool SmCursor::InsertRow() {
//Find position after insert and patch the list
PosAfterInsert = PatchLineList(pLineList, it);
//Move other children
- USHORT rows = pMatrix->GetNumRows();
- USHORT cols = pMatrix->GetNumCols();
+ sal_uInt16 rows = pMatrix->GetNumRows();
+ sal_uInt16 cols = pMatrix->GetNumCols();
int nRowStart = (nParentIndex - nParentIndex % cols) + cols;
for( int i = pMatrix->GetNumSubNodes() + cols - 1; i >= nRowStart + cols; i--)
pMatrix->SetSubNode(i, pMatrix->GetSubNode(i - cols));
@@ -916,7 +916,7 @@ bool SmCursor::InsertRow() {
}
pMatrix->SetRowCol(rows + 1, cols);
} else
- j_assert(FALSE, "We must be either the context of a table or matrix!");
+ j_assert(sal_False, "We must be either the context of a table or matrix!");
//Finish editing
FinishEdit(pLineList, pLineParent, nParentIndex, PosAfterInsert);
@@ -934,9 +934,9 @@ void SmCursor::InsertFraction() {
if(HasSelection()) {
SmNode *pSNode = FindSelectedNode(pTree);
j_assert(pSNode != NULL, "There must be a selected node when HasSelection is true!");
- pLine = FindTopMostNodeInLine(pSNode, TRUE);
+ pLine = FindTopMostNodeInLine(pSNode, sal_True);
} else
- pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, FALSE);
+ pLine = FindTopMostNodeInLine(position->CaretPos.pSelectedNode, sal_False);
//Find Parent and offset in parent
SmStructureNode *pLineParent = pLine->GetParent();
@@ -1134,7 +1134,7 @@ void SmCursor::InsertSpecial(XubString aString) {
EndEdit();
}
-void SmCursor::InsertCommand(USHORT nCommand) {
+void SmCursor::InsertCommand(sal_uInt16 nCommand) {
switch(nCommand){
case RID_NEWLINE:
InsertRow();
@@ -1429,13 +1429,13 @@ void SmCursor::BeginEdit(){
bIsEnabledSetModifiedSmDocShell = pDocShell->IsEnableSetModified();
if( bIsEnabledSetModifiedSmDocShell )
- pDocShell->EnableSetModified( FALSE );
+ pDocShell->EnableSetModified( sal_False );
}
void SmCursor::EndEdit(){
if(--nEditSections > 0) return;
- pDocShell->SetFormulaArranged(FALSE);
+ pDocShell->SetFormulaArranged(sal_False);
//Okay, I don't know what this does... :)
//It's used in SmDocShell::SetText and with places where everything is modified.
//I think it does some magic, with sfx, but everything is totally undocumented so
@@ -1443,7 +1443,7 @@ void SmCursor::EndEdit(){
if ( bIsEnabledSetModifiedSmDocShell )
pDocShell->EnableSetModified( bIsEnabledSetModifiedSmDocShell );
//I think this notifies people around us that we've modified this document...
- pDocShell->SetModified(TRUE);
+ pDocShell->SetModified(sal_True);
//I think SmDocShell uses this value when it sends an update graphics event
//Anyway comments elsewhere suggests it need to be updated...
pDocShell->nModifyCount++;
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index d3800b09e9ac..f5725275e6cf 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -49,29 +49,6 @@ void SAL_CALL component_getImplementationEnvironment(
*ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
}
-sal_Bool SAL_CALL component_writeInfo( void* /*pServiceManager*/,
- void* pRegistryKey )
-{
- Reference< ::registry::XRegistryKey >
- xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
- OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
- OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
- // Eigentliche Implementierung und ihre Services registrieren
- sal_Int32 i;
- Reference< ::registry::XRegistryKey > xNewKey;
-
- xNewKey = xKey->createKey( aDelimiter + SmFilterDetect::impl_getStaticImplementationName() +
- aUnoServices );
-
- Sequence< OUString > aServices = SmFilterDetect::impl_getStaticSupportedServiceNames();
- for(i = 0; i < aServices.getLength(); i++ )
- xNewKey->createKey( aServices.getConstArray()[i] );
-
- return sal_True;
-}
-
void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
void* pServiceManager,
void* /*pRegistryKey*/ )
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index 2bb93aacbbfb..11c0e6e8e638 100644..100755
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -51,15 +51,18 @@
#include <svx/ucsubset.hxx>
-#include "config.hxx"
#include "dialog.hxx"
#include "starmath.hrc"
-
+#include "config.hxx"
#include "dialog.hrc"
#include "smmod.hxx"
#include "symbol.hxx"
#include "view.hxx"
#include "document.hxx"
+#include "unomodel.hxx"
+
+
+using ::rtl::OUString;
////////////////////////////////////////
//
@@ -79,9 +82,9 @@ class SmFontStyles
public:
SmFontStyles();
- USHORT GetCount() const { return 4; }
+ sal_uInt16 GetCount() const { return 4; }
const String & GetStyleName( const Font &rFont ) const;
- const String & GetStyleName( USHORT nIdx ) const;
+ const String & GetStyleName( sal_uInt16 nIdx ) const;
};
@@ -114,7 +117,7 @@ const String & SmFontStyles::GetStyleName( const Font &rFont ) const
}
-const String & SmFontStyles::GetStyleName( USHORT nIdx ) const
+const String & SmFontStyles::GetStyleName( sal_uInt16 nIdx ) const
{
// 0 = "normal", 1 = "italic",
// 2 = "bold", 3 = "bold italic"
@@ -145,10 +148,10 @@ void SetFontStyle(const XubString &rStyleName, Font &rFont)
{
// finden des Index passend zum StyleName fuer den leeren StyleName wird
// 0 (nicht bold nicht italic) angenommen.
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
if (rStyleName.Len())
{
- USHORT i;
+ sal_uInt16 i;
const SmFontStyles &rStyles = GetFontStyles();
for (i = 0; i < rStyles.GetCount(); i++)
if (rStyleName.CompareTo( rStyles.GetStyleName(i) ) == COMPARE_EQUAL)
@@ -185,8 +188,9 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &
aSizeScaled (this, SmResId( RB_FIT_TO_PAGE )),
aSizeZoomed (this, SmResId( RB_ZOOM )),
aZoom (this, SmResId( MF_ZOOM )),
- aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
- aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING ))
+ aFixedLine3 (this, SmResId( FL_MISC_OPTIONS )),
+ aNoRightSpaces (this, SmResId( CB_IGNORE_SPACING )),
+ aSaveOnlyUsedSymbols (this, SmResId( CB_SAVE_ONLY_USED_SYMBOLS ))
{
FreeResource();
@@ -198,9 +202,9 @@ SmPrintOptionsTabPage::SmPrintOptionsTabPage(Window *pParent, const SfxItemSet &
}
-BOOL SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet)
+sal_Bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet)
{
- UINT16 nPrintSize;
+ sal_uInt16 nPrintSize;
if (aSizeNormal.IsChecked())
nPrintSize = PRINT_SIZE_NORMAL;
else if (aSizeScaled.IsChecked())
@@ -208,12 +212,13 @@ BOOL SmPrintOptionsTabPage::FillItemSet(SfxItemSet& rSet)
else
nPrintSize = PRINT_SIZE_ZOOMED;
- rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (UINT16) nPrintSize));
- rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (UINT16) aZoom.GetValue()));
+ rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), (sal_uInt16) nPrintSize));
+ rSet.Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), (sal_uInt16) aZoom.GetValue()));
rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), aTitle.IsChecked()));
rSet.Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), aText.IsChecked()));
rSet.Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), aFrame.IsChecked()));
rSet.Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), aNoRightSpaces.IsChecked()));
+ rSet.Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), aSaveOnlyUsedSymbols.IsChecked()));
return true;
}
@@ -235,6 +240,7 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet& rSet)
aText.Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_PRINTTEXT))).GetValue());
aFrame.Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_PRINTFRAME))).GetValue());
aNoRightSpaces.Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue());
+ aSaveOnlyUsedSymbols.Check(((const SfxBoolItem &)rSet.Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue());
}
@@ -285,7 +291,7 @@ IMPL_LINK_INLINE_END( SmFontDialog, FontSelectHdl, ComboBox *, pComboBox )
IMPL_LINK( SmFontDialog, FontModifyHdl, ComboBox *, pComboBox )
{
// if font is available in list then use it
- USHORT nPos = pComboBox->GetEntryPos( pComboBox->GetText() );
+ sal_uInt16 nPos = pComboBox->GetEntryPos( pComboBox->GetText() );
if (COMBOBOX_ENTRY_NOTFOUND != nPos)
{
FontSelectHdl( pComboBox );
@@ -343,8 +349,8 @@ SmFontDialog::SmFontDialog(Window * pParent,
FontList aFontList( pFntListDevice );
- USHORT nCount = aFontList.GetFontNameCount();
- for (USHORT i = 0; i < nCount; i++)
+ sal_uInt16 nCount = aFontList.GetFontNameCount();
+ for (sal_uInt16 i = 0; i < nCount; i++)
aFontBox.InsertEntry( aFontList.GetFontName(i).GetName() );
Face.SetSize(Size(0, 24));
@@ -479,14 +485,14 @@ void SmFontSizeDialog::WriteTo(SmFormat &rFormat) const
{
rFormat.SetBaseSize( Size(0, SmPtsTo100th_mm( static_cast< long >(aBaseSize.GetValue()))) );
- rFormat.SetRelSize(SIZ_TEXT, (USHORT) aTextSize .GetValue());
- rFormat.SetRelSize(SIZ_INDEX, (USHORT) aIndexSize .GetValue());
- rFormat.SetRelSize(SIZ_FUNCTION, (USHORT) aFunctionSize.GetValue());
- rFormat.SetRelSize(SIZ_OPERATOR, (USHORT) aOperatorSize.GetValue());
- rFormat.SetRelSize(SIZ_LIMITS, (USHORT) aBorderSize .GetValue());
+ rFormat.SetRelSize(SIZ_TEXT, (sal_uInt16) aTextSize .GetValue());
+ rFormat.SetRelSize(SIZ_INDEX, (sal_uInt16) aIndexSize .GetValue());
+ rFormat.SetRelSize(SIZ_FUNCTION, (sal_uInt16) aFunctionSize.GetValue());
+ rFormat.SetRelSize(SIZ_OPERATOR, (sal_uInt16) aOperatorSize.GetValue());
+ rFormat.SetRelSize(SIZ_LIMITS, (sal_uInt16) aBorderSize .GetValue());
const Size aTmp (rFormat.GetBaseSize());
- for (USHORT i = FNT_BEGIN; i <= FNT_END; i++)
+ for (sal_uInt16 i = FNT_BEGIN; i <= FNT_END; i++)
rFormat.SetFontSize(i, aTmp);
rFormat.RequestApplyChanges();
@@ -624,7 +630,7 @@ void SmFontTypeDialog::WriteTo(SmFormat &rFormat) const
struct FieldMinMax
{
- USHORT nMin, nMax;
+ sal_uInt16 nMin, nMax;
};
// Data for min and max values of the 4 metric fields
@@ -653,7 +659,7 @@ static const FieldMinMax pMinMaxData[10][4] =
{{ 0, 10000 }, { 0, 10000 }, { 0, 10000 }, { 0, 10000 }}
};
-SmCategoryDesc::SmCategoryDesc(const ResId& rResId, USHORT nCategoryIdx) :
+SmCategoryDesc::SmCategoryDesc(const ResId& rResId, sal_uInt16 nCategoryIdx) :
Resource(rResId)
{
if (IsAvailableRes(ResId(1,*rResId.GetResMgr()).SetRT(RSC_STRING)))
@@ -704,7 +710,7 @@ IMPL_LINK( SmDistanceDialog, GetFocusHdl, Control *, pControl )
{
if (Categories[nActiveCategory])
{
- USHORT i;
+ sal_uInt16 i;
if (pControl == &aMetricField1)
i = 0;
@@ -758,7 +764,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox )
}
-void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
+void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId)
{
//! HelpID's die auf diese Weise explizit gesetzt werden, muessen im
//! util Verzeichnis im File "hidother.src" mit Hilfe von "hidspecial"
@@ -769,7 +775,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
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
@@ -777,13 +783,14 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId)
// for it too.
Edit *pSubEdit = rField.GetSubEdit();
if (pSubEdit)
- { pSubEdit->SetHelpId(nHelpId);
+ {
+ pSubEdit->SetHelpId(sHelpId);
pSubEdit->SetHelpText(aEmptyText);
}
}
-void SmDistanceDialog::SetCategory(USHORT nCategory)
+void SmDistanceDialog::SetCategory(sal_uInt16 nCategory)
{
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(/*0 <= nCategory &&*/ nCategory < NOCATEGORIES,
@@ -795,7 +802,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(NOCATEGORIES == 10, "Sm : array doesn't fit into the number of categories");
#endif
- ULONG const 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 },
@@ -825,10 +832,10 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
if (nActiveCategory != CATEGORY_NONE)
{
pCat = Categories[nActiveCategory];
- pCat->SetValue(0, (USHORT) aMetricField1.GetValue());
- pCat->SetValue(1, (USHORT) aMetricField2.GetValue());
- pCat->SetValue(2, (USHORT) aMetricField3.GetValue());
- pCat->SetValue(3, (USHORT) aMetricField4.GetValue());
+ pCat->SetValue(0, (sal_uInt16) aMetricField1.GetValue());
+ pCat->SetValue(1, (sal_uInt16) aMetricField2.GetValue());
+ pCat->SetValue(2, (sal_uInt16) aMetricField3.GetValue());
+ pCat->SetValue(3, (sal_uInt16) aMetricField4.GetValue());
if (nActiveCategory == 5)
bScaleAllBrackets = aCheckBox1.IsChecked();
@@ -839,7 +846,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
// aktivieren/deaktivieren der zugehoerigen Controls in Abhaengigkeit von der
// gewaehlten Kategorie.
bool bActive;
- for (USHORT i = 0; i < 4; i++)
+ for (sal_uInt16 i = 0; i < 4; i++)
{
FixedText *pFT = (FixedText * const) aWin[i][0];
MetricField *pMF = (MetricField * const) aWin[i][1];
@@ -855,7 +862,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory)
// setzen von Masseinheit und Anzahl der Nachkommastellen
FieldUnit eUnit;
- USHORT nDigits;
+ sal_uInt16 nDigits;
if (nCategory < 9)
{
eUnit = FUNIT_CUSTOM;
@@ -925,7 +932,7 @@ SmDistanceDialog::SmDistanceDialog(Window *pParent, bool bFreeRes)
aBitmap (this, SmResId(1)),
aFixedLine (this, SmResId(1))
{
- for (USHORT i = 0; i < NOCATEGORIES; i++)
+ for (sal_uInt16 i = 0; i < NOCATEGORIES; i++)
Categories[i] = new SmCategoryDesc(SmResId(i + 1), i);
nActiveCategory = CATEGORY_NONE;
bScaleAllBrackets = false;
@@ -1117,11 +1124,11 @@ void SmShowSymbolSet::Paint(const Rectangle&)
// MapUnit einstellen fuer die 'nLen' berechnet wurde
SetMapMode(MapMode(MAP_PIXEL));
- USHORT v = sal::static_int_cast< USHORT >((aVScrollBar.GetThumbPos() * nColumns));
+ sal_uInt16 v = sal::static_int_cast< sal_uInt16 >((aVScrollBar.GetThumbPos() * nColumns));
size_t nSymbols = aSymbolSet.size();
Color aTxtColor( GetTextColor() );
- for (USHORT i = v; i < nSymbols ; i++)
+ for (sal_uInt16 i = v; i < nSymbols ; i++)
{
SmSym aSymbol (*aSymbolSet[i]);
Font aFont (aSymbol.GetFace());
@@ -1135,11 +1142,13 @@ void SmShowSymbolSet::Paint(const Rectangle&)
SetTextColor( aTxtColor );
int nIV = i - v;
- Size aSize(GetTextWidth(aSymbol.GetCharacter()), GetTextHeight());
+ sal_UCS4 cChar = aSymbol.GetCharacter();
+ String aText( OUString( &cChar, 1 ) );
+ Size aSize( GetTextWidth( aText ), GetTextHeight());
DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2,
(nIV / nColumns) * nLen + (nLen - aSize.Height()) / 2),
- aSymbol.GetCharacter());
+ aText);
}
if (nSelectSymbol != SYMBOL_NONE)
@@ -1161,7 +1170,7 @@ void SmShowSymbolSet::MouseButtonDown(const MouseEvent& rMEvt)
{
long nPos = (rMEvt.GetPosPixel().Y() / nLen) * nColumns + (rMEvt.GetPosPixel().X() / nLen) +
aVScrollBar.GetThumbPos() * nColumns;
- SelectSymbol( sal::static_int_cast< USHORT >(nPos) );
+ SelectSymbol( sal::static_int_cast< sal_uInt16 >(nPos) );
aSelectHdlLink.Call(this);
@@ -1173,7 +1182,7 @@ void SmShowSymbolSet::MouseButtonDown(const MouseEvent& rMEvt)
void SmShowSymbolSet::KeyInput(const KeyEvent& rKEvt)
{
- USHORT n = nSelectSymbol;
+ sal_uInt16 n = nSelectSymbol;
if (n != SYMBOL_NONE)
{
@@ -1184,7 +1193,7 @@ void SmShowSymbolSet::KeyInput(const KeyEvent& rKEvt)
case KEY_LEFT: n -= 1; break;
case KEY_RIGHT: n += 1; break;
case KEY_HOME: n = 0; break;
- case KEY_END: n = static_cast< USHORT >(aSymbolSet.size() - 1); break;
+ case KEY_END: n = static_cast< sal_uInt16 >(aSymbolSet.size() - 1); break;
case KEY_PAGEUP: n -= nColumns * nRows; break;
case KEY_PAGEDOWN: n += nColumns * nRows; break;
@@ -1200,8 +1209,8 @@ void SmShowSymbolSet::KeyInput(const KeyEvent& rKEvt)
n = nSelectSymbol;
// adjust scrollbar
- if ((n < (USHORT) (aVScrollBar.GetThumbPos() * nColumns)) ||
- (n >= (USHORT) ((aVScrollBar.GetThumbPos() + nRows) * nColumns)))
+ if ((n < (sal_uInt16) (aVScrollBar.GetThumbPos() * nColumns)) ||
+ (n >= (sal_uInt16) ((aVScrollBar.GetThumbPos() + nRows) * nColumns)))
{
aVScrollBar.SetThumbPos(n / nColumns);
Invalidate();
@@ -1224,12 +1233,12 @@ SmShowSymbolSet::SmShowSymbolSet(Window *pParent, const ResId& rResId) :
nUseableWidth = aOutputSize.Width() - nScrollBarWidth;
// Hoehe von 16pt in Pixeln (passend zu 'aOutputSize')
- nLen = (USHORT) LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
+ nLen = (sal_uInt16) LogicToPixel(Size(0, 16), MapMode(MAP_POINT)).Height();
- nColumns = sal::static_int_cast< USHORT >(nUseableWidth / nLen);
+ nColumns = sal::static_int_cast< sal_uInt16 >(nUseableWidth / nLen);
if (nColumns > 2 && nColumns % 2 != 0)
nColumns--;
- nRows = sal::static_int_cast< USHORT >(aOutputSize.Height() / nLen);
+ nRows = sal::static_int_cast< sal_uInt16 >(aOutputSize.Height() / nLen);
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE(nColumns > 0, "Sm : no columns");
OSL_ENSURE(nRows > 0, "Sm : no rows");
@@ -1256,7 +1265,7 @@ void SmShowSymbolSet::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
{
aSymbolSet = rSymbolSet;
- if (static_cast< USHORT >(aSymbolSet.size()) > (nColumns * nRows))
+ if (static_cast< sal_uInt16 >(aSymbolSet.size()) > (nColumns * nRows))
{
aVScrollBar.SetRange(Range(0, ((aSymbolSet.size() + (nColumns - 1)) / nColumns) - nRows));
aVScrollBar.Enable(true);
@@ -1271,7 +1280,7 @@ void SmShowSymbolSet::SetSymbolSet(const SymbolPtrVec_t& rSymbolSet)
}
-void SmShowSymbolSet::SelectSymbol(USHORT nSymbol)
+void SmShowSymbolSet::SelectSymbol(sal_uInt16 nSymbol)
{
int v = (int) (aVScrollBar.GetThumbPos() * nColumns);
@@ -1311,7 +1320,7 @@ void SmShowSymbol::Paint(const Rectangle &rRect)
Size aTextSize(GetTextWidth(rText), GetTextHeight());
DrawText(Point((GetOutputSize().Width() - aTextSize.Width()) / 2,
- (GetOutputSize().Height() - aTextSize.Height()) / 2), rText);
+ (GetOutputSize().Height() * 7/10)), rText);
}
@@ -1328,17 +1337,14 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol)
{
if (pSymbol)
{
- Color aTxtColor( GetTextColor() );
-
Font aFont (pSymbol->GetFace());
aFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
- aFont.SetAlign(ALIGN_TOP);
+ aFont.SetAlign(ALIGN_BASELINE);
SetFont(aFont);
- // keep old text color (font may have different color set)
- SetTextColor(aTxtColor);
-
- SetText(XubString(pSymbol->GetCharacter()));
+ sal_UCS4 cChar = pSymbol->GetCharacter();
+ String aText( OUString( &cChar, 1 ) );
+ SetText( aText );
}
// 'Invalidate' fuellt den background mit der background-Farbe.
@@ -1408,7 +1414,7 @@ IMPL_LINK( SmSymbolDialog, EditClickHdl, Button *, EMPTYARG pButton )
// altes SymbolSet merken
XubString aOldSymbolSet (aSymbolSets.GetSelectEntry());
- USHORT nSymPos = GetSelectedSymbol();
+ sal_uInt16 nSymPos = GetSelectedSymbol();
// Dialog an evtl geaenderte Daten des SymbolSet Manager anpassen
if (pDialog->Execute() == RET_OK && rSymbolMgr.IsModified())
@@ -1430,7 +1436,7 @@ IMPL_LINK( SmSymbolDialog, EditClickHdl, Button *, EMPTYARG pButton )
}
if (nSymPos >= aSymbolSet.size())
- nSymPos = static_cast< USHORT >(aSymbolSet.size()) - 1;
+ nSymPos = static_cast< sal_uInt16 >(aSymbolSet.size()) - 1;
SelectSymbol( nSymPos );
delete pDialog;
@@ -1461,7 +1467,7 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton )
const SmSym *pSym = GetSymbol();
if (pSym)
{
- XubString aText ('%');
+ String aText ('%');
aText += pSym->GetName();
aText += (sal_Unicode)' ';
@@ -1568,7 +1574,7 @@ void SmSymbolDialog::DataChanged( const DataChangedEvent& rDCEvt )
bool SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
{
bool bRet = false;
- USHORT nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
+ sal_uInt16 nPos = aSymbolSets.GetEntryPos(rSymbolSetName);
aSymbolSetName = String();
aSymbolSet.clear();
@@ -1595,10 +1601,10 @@ bool SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
}
-void SmSymbolDialog::SelectSymbol(USHORT nSymbolNo)
+void SmSymbolDialog::SelectSymbol(sal_uInt16 nSymbolNo)
{
const SmSym *pSym = NULL;
- if (aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< USHORT >(aSymbolSet.size()))
+ if (aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size()))
pSym = aSymbolSet[ nSymbolNo ];
aSymbolSetDisplay.SelectSymbol(nSymbolNo);
@@ -1609,8 +1615,8 @@ void SmSymbolDialog::SelectSymbol(USHORT nSymbolNo)
const SmSym * SmSymbolDialog::GetSymbol() const
{
- USHORT nSymbolNo = aSymbolSetDisplay.GetSelectSymbol();
- bool bValid = aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< USHORT >(aSymbolSet.size());
+ sal_uInt16 nSymbolNo = aSymbolSetDisplay.GetSelectSymbol();
+ bool bValid = aSymbolSetName.Len() > 0 && nSymbolNo < static_cast< sal_uInt16 >(aSymbolSet.size());
return bValid ? aSymbolSet[ nSymbolNo ] : NULL;
}
@@ -1622,42 +1628,44 @@ void SmShowChar::Paint(const Rectangle &rRect)
{
Control::Paint( rRect );
- XubString Text (GetText ());
- if (Text.Len() > 0)
+ OUString aText( GetText() );
+ if (aText.getLength() > 0)
{
- Size aTextSize(GetTextWidth(Text), GetTextHeight());
+#if OSL_DEBUG_LEVEL > 1
+ sal_Int32 nPos = 0;
+ sal_UCS4 cChar = aText.iterateCodePoints( &nPos );
+ (void) cChar;
+#endif
+ Size aTextSize(GetTextWidth(aText), GetTextHeight());
DrawText(Point((GetOutputSize().Width() - aTextSize.Width()) / 2,
- (GetOutputSize().Height() - aTextSize.Height()) / 2), Text);
+ (GetOutputSize().Height() * 7/10)), aText);
}
}
-void SmShowChar::SetChar(xub_Unicode aChar)
+void SmShowChar::SetSymbol( const SmSym *pSym )
{
- SetText(XubString(aChar));
- Invalidate();
+ if (pSym)
+ SetSymbol( pSym->GetCharacter(), pSym->GetFace() );
}
-void SmShowChar::SetFont(const Font &rFont)
+void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont )
{
- Color aTxtColor( GetTextColor() );
-
- Font aFont (rFont);
- Size aSize (Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
-
- aFont.SetSize(aSize);
- aFont.SetAlign(ALIGN_TOP);
+ Font aFont( rFont );
+ aFont.SetSize( Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3) );
+ aFont.SetAlign(ALIGN_BASELINE);
+ SetFont(aFont);
aFont.SetTransparent(true);
- Control::SetFont(aFont);
- // keep text color (new font may have different one)
- SetTextColor( aTxtColor );
+ String aText( OUString( &cChar, 1) );
+ SetText( aText );
Invalidate();
}
+
////////////////////////////////////////////////////////////////////////////////
void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, bool bDeleteText)
@@ -1707,8 +1715,8 @@ void SmSymDefineDialog::FillFonts(bool bDelete)
// ueber die 'FontStyleBox' gewaehlt und nicht auch noch hier)
if (pFontList)
{
- USHORT nCount = pFontList->GetFontNameCount();
- for (USHORT i = 0; i < nCount; i++)
+ sal_uInt16 nCount = pFontList->GetFontNameCount();
+ for (sal_uInt16 i = 0; i < nCount; i++)
aFonts.InsertEntry( pFontList->GetFontName(i).GetName() );
}
}
@@ -1725,7 +1733,7 @@ void SmSymDefineDialog::FillStyles(bool bDeleteText)
{
// eigene StyleName's verwenden
const SmFontStyles &rStyles = GetFontStyles();
- for (USHORT i = 0; i < rStyles.GetCount(); i++)
+ for (sal_uInt16 i = 0; i < rStyles.GetCount(); i++)
aStyles.InsertEntry( rStyles.GetStyleName(i) );
#if OSL_DEBUG_LEVEL > 1
@@ -1816,7 +1824,7 @@ IMPL_LINK( SmSymDefineDialog, FontChangeHdl, ListBox *, EMPTYARG pListBox )
IMPL_LINK( SmSymDefineDialog, SubsetChangeHdl, ListBox *, EMPTYARG pListBox )
{
(void) pListBox;
- USHORT nPos = aFontsSubsetLB.GetSelectEntryPos();
+ sal_uInt16 nPos = aFontsSubsetLB.GetSelectEntryPos();
if (LISTBOX_ENTRY_NOTFOUND != nPos)
{
const Subset* pSubset = reinterpret_cast<const Subset*> (aFontsSubsetLB.GetEntryData( nPos ));
@@ -1843,7 +1851,7 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
{
- sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
+ sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
#if OSL_DEBUG_LEVEL > 1
OSL_ENSURE( pSubsetMap, "SubsetMap missing" );
@@ -1857,9 +1865,18 @@ IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
aFontsSubsetLB.SetNoSelection();
}
- // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
- aSymbolDisplay.SetChar( sal::static_int_cast< sal_Unicode >(cChar) );
+ aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
+
UpdateButtons();
+
+ // display Unicode position as symbol name while iterating over characters
+ const String aHex( String::CreateFromInt64( cChar, 16 ).ToUpperAscii() );
+ const String aPattern( A2OU( aHex.Len() > 4 ? "Ux000000" : "Ux0000" ) );
+ String aUnicodePos( aPattern.Copy( 0, aPattern.Len() - aHex.Len() ) );
+ aUnicodePos += aHex;
+ aSymbols.SetText( aUnicodePos );
+ aSymbolName.SetText( aUnicodePos );
+
return 0;
}
@@ -1873,16 +1890,13 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
#endif
// add symbol
- // 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() );
//OSL_ENSURE( aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL, "symbol already exists" );
aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol );
// update display of new symbol
- aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
- aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+ aSymbolDisplay.SetSymbol( &aNewSymbol );
aSymbolName.SetText( aNewSymbol.GetName() );
aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
@@ -1909,10 +1923,8 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
// 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 bNameChanged = aOldSymbols.GetText() != aSymbols.GetText();
@@ -1925,8 +1937,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
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() );
@@ -2182,7 +2193,7 @@ bool SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
rComboBox.SetText(aNormName);
bool bRet = false;
- USHORT nPos = rComboBox.GetEntryPos(aNormName);
+ sal_uInt16 nPos = rComboBox.GetEntryPos(aNormName);
if (nPos != COMBOBOX_ENTRY_NOTFOUND)
{
@@ -2235,8 +2246,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
aSymName = pSymbol->GetName();
aSymSetName = rSymbolSetName;
- aOldSymbolDisplay.SetFont(pSymbol->GetFace());
- aOldSymbolDisplay.SetChar(pSymbol->GetCharacter());
+ aOldSymbolDisplay.SetSymbol( pSymbol );
}
else
{ // loeschen des angezeigten Symbols
@@ -2263,7 +2273,7 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
rComboBox.SetText(aNormName);
bool bRet = false;
- USHORT nPos = rComboBox.GetEntryPos(aNormName);
+ sal_uInt16 nPos = rComboBox.GetEntryPos(aNormName);
bool bIsOld = &rComboBox == &aOldSymbols;
@@ -2290,6 +2300,10 @@ bool SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
// das zugehoerige Zeichen auswaehlen
SelectChar(pSymbol->GetCharacter());
+
+ // since SelectChar will also set the unicode point as text in the
+ // symbols box, we have to set the symbol name again to get that one displayed
+ aSymbols.SetText( pSymbol->GetName() );
}
}
@@ -2342,11 +2356,11 @@ void SmSymDefineDialog::SetFont(const XubString &rFontName, const XubString &rSt
const Subset* pSubset;
while( NULL != (pSubset = pSubsetMap->GetNextSubset( bFirst )) )
{
- USHORT nPos = aFontsSubsetLB.InsertEntry( pSubset->GetName());
+ sal_uInt16 nPos = aFontsSubsetLB.InsertEntry( pSubset->GetName());
aFontsSubsetLB.SetEntryData( nPos, (void *) pSubset );
// subset must live at least as long as the selected font !!!
if( bFirst )
- aFontsSubsetLB.SelectEntryPos( nPos );
+ aFontsSubsetLB.SelectEntryPos( nPos );
bFirst = false;
}
if( bFirst )
@@ -2358,7 +2372,7 @@ void SmSymDefineDialog::SetFont(const XubString &rFontName, const XubString &rSt
bool SmSymDefineDialog::SelectFont(const XubString &rFontName, bool bApplyFont)
{
bool bRet = false;
- USHORT nPos = aFonts.GetEntryPos(rFontName);
+ sal_uInt16 nPos = aFonts.GetEntryPos(rFontName);
if (nPos != LISTBOX_ENTRY_NOTFOUND)
{
@@ -2366,8 +2380,12 @@ bool SmSymDefineDialog::SelectFont(const XubString &rFontName, bool bApplyFont)
if (aStyles.GetEntryCount() > 0)
SelectStyle(aStyles.GetEntry(0));
if (bApplyFont)
+ {
SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
bRet = true;
+ aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+ }
+ bRet = sal_True;
}
else
aFonts.SetNoSelection();
@@ -2382,7 +2400,7 @@ bool SmSymDefineDialog::SelectFont(const XubString &rFontName, bool bApplyFont)
bool SmSymDefineDialog::SelectStyle(const XubString &rStyleName, bool bApplyFont)
{
bool bRet = false;
- USHORT nPos = aStyles.GetEntryPos(rStyleName);
+ sal_uInt16 nPos = aStyles.GetEntryPos(rStyleName);
// falls der Style nicht zur Auswahl steht nehmen wir den erst moeglichen
// (sofern vorhanden)
@@ -2393,8 +2411,12 @@ bool SmSymDefineDialog::SelectStyle(const XubString &rStyleName, bool bApplyFont
{
aStyles.SetText(aStyles.GetEntry(nPos));
if (bApplyFont)
+ {
SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
bRet = true;
+ aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+ }
+ bRet = sal_True;
}
else
aStyles.SetText(XubString());
@@ -2408,7 +2430,7 @@ bool SmSymDefineDialog::SelectStyle(const XubString &rStyleName, bool bApplyFont
void SmSymDefineDialog::SelectChar(xub_Unicode cChar)
{
aCharsetDisplay.SelectCharacter( cChar );
- aSymbolDisplay.SetChar( cChar );
+ aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
UpdateButtons();
}
diff --git a/starmath/source/dialog.hrc b/starmath/source/dialog.hrc
index 29d87ba1d287..9e3e58493ab3 100644..100755
--- a/starmath/source/dialog.hrc
+++ b/starmath/source/dialog.hrc
@@ -31,17 +31,18 @@
#define FL_PRINTOPTIONS 10
#define CB_TITLEROW 11
-#define CB_EQUATION_TEXT 12
+#define CB_EQUATION_TEXT 12
#define CB_FRAME 13
#define FL_PRINT_FORMAT 20
-#define RB_ORIGINAL_SIZE 21
-#define RB_FIT_TO_PAGE 22
+#define RB_ORIGINAL_SIZE 21
+#define RB_FIT_TO_PAGE 22
#define RB_ZOOM 23
#define MF_ZOOM 24
#define FL_MISC_OPTIONS 30
-#define CB_IGNORE_SPACING 31
+#define CB_IGNORE_SPACING 31
+#define CB_SAVE_ONLY_USED_SYMBOLS 32
#define FT_FONTS_SUBSET 110
#define LB_FONTS_SUBSET 111
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 1e8e4f9e05e9..337e038df69e 100644..100755
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -39,6 +39,8 @@
#include <comphelper/storagehelper.hxx>
#include <rtl/logfile.hxx>
#include <rtl/ustring.hxx>
+#include <unotools/eventcfg.hxx>
+#include <sfx2/event.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/docfile.hxx>
@@ -77,7 +79,7 @@
#include <editeng/unolingu.hxx>
#include <ucbhelper/content.hxx>
#include <vcl/mapmod.hxx>
-#include <vcl/mapunit.hxx>
+#include <tools/mapunit.hxx>
#include <vcl/msgbox.hxx>
#include <sfx2/sfx.hrc>
#include <document.hxx>
@@ -98,6 +100,7 @@
#include <sfx2/sfxsids.hrc>
#include <svx/svxids.hrc>
#include "cursor.hxx"
+#include <tools/diagnose_ex.h>
#include "visitors.hxx"
#include "accessibility.hxx"
@@ -108,7 +111,7 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::uno;
-#define DOCUMENT_BUFFER_SIZE (USHORT)32768
+#define DOCUMENT_BUFFER_SIZE (sal_uInt16)32768
static const char pStarMathDoc[] = "StarMathDocument";
@@ -183,7 +186,14 @@ void SmDocShell::SetText(const String& rBuffer)
{
pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_TEXT);
if ( SFX_CREATE_MODE_EMBEDDED == GetCreateMode() )
+ {
+ // have SwOleClient::FormatChanged() to align the modified formula properly
+ // even if the vis area does not change (e.g. when formula text changes from
+ // "{a over b + c} over d" to "d over {a over b + c}"
+ SFX_APP()->NotifyEvent(SfxEventHint( SFX_EVENT_VISAREACHANGED, GlobalEventConfig::GetEventName(STR_EVENT_VISAREACHANGED), this));
+
Repaint();
+ }
else
pViewSh->GetGraphicWindow().Invalidate();
}
@@ -255,6 +265,7 @@ void SmDocShell::Parse()
nModifyCount++; //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
SetFormulaArranged( false );
InvalidateCursor();
+ aUsedSymbols = aInterpreter.GetUsedSymbols();
}
@@ -297,9 +308,9 @@ void SmDocShell::ArrangeFormula()
// format/draw formulas always from left to right,
// and numbers should not be converted
- ULONG nLayoutMode = pOutDev->GetLayoutMode();
+ sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
pOutDev->SetLayoutMode( TEXT_LAYOUT_BIDI_LTR );
- INT16 nDigitLang = pOutDev->GetDigitLanguage();
+ sal_Int16 nDigitLang = pOutDev->GetDigitLanguage();
pOutDev->SetDigitLanguage( LANGUAGE_ENGLISH );
//
pTree->Arrange(*pOutDev, rFormat);
@@ -325,10 +336,10 @@ void SetEditEngineDefaultFonts(
SvtLinguConfig().GetOptions( aOpt );
//
struct FontDta {
- INT16 nFallbackLang;
- INT16 nLang;
- USHORT nFontType;
- USHORT nFontInfoId;
+ sal_Int16 nFallbackLang;
+ sal_Int16 nLang;
+ sal_uInt16 nFontType;
+ sal_uInt16 nFontInfoId;
} aTable[3] =
{
// info to get western font to be used
@@ -388,7 +399,7 @@ EditEngine& SmDocShell::GetEditEngine()
pEditEngine = new EditEngine( pEditEngineItemPool );
pEditEngine->EnableUndo( true );
- pEditEngine->SetDefTab( USHORT(
+ pEditEngine->SetDefTab( sal_uInt16(
Application::GetDefaultDevice()->GetTextWidth( C2S("XXXX") ) ) );
pEditEngine->SetControlWord(
@@ -451,7 +462,7 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel
//! the draw mode needs to be set to default, because when imbedding
//! Math for example in Calc in "a over b" the fraction bar may not
//! be visible else. More generally: the FillColor may have been changed.
- ULONG nOldDrawMode = DRAWMODE_DEFAULT;
+ sal_uLong nOldDrawMode = DRAWMODE_DEFAULT;
bool bRestoreDrawMode = false;
if (OUTDEV_WINDOW == rDev.GetOutDevType() &&
((Window &) rDev).GetSettings().GetStyleSettings().GetHighContrastMode())
@@ -463,9 +474,9 @@ void SmDocShell::DrawFormula(OutputDevice &rDev, Point &rPosition, bool bDrawSel
// format/draw formulas always from left to right
// and numbers should not be converted
- ULONG nLayoutMode = rDev.GetLayoutMode();
+ sal_uLong nLayoutMode = rDev.GetLayoutMode();
rDev.SetLayoutMode( TEXT_LAYOUT_BIDI_LTR );
- INT16 nDigitLang = rDev.GetDigitLanguage();
+ sal_Int16 nDigitLang = rDev.GetDigitLanguage();
rDev.SetDigitLanguage( LANGUAGE_ENGLISH );
//Set selection if any
@@ -737,7 +748,7 @@ SmDocShell::~SmDocShell()
}
-BOOL SmDocShell::SetData( const String& rData )
+sal_Bool SmDocShell::SetData( const String& rData )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetData" );
@@ -746,7 +757,7 @@ BOOL SmDocShell::SetData( const String& rData )
}
-BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
+sal_Bool SmDocShell::ConvertFrom(SfxMedium &rMedium)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertFrom" );
@@ -797,7 +808,7 @@ BOOL SmDocShell::ConvertFrom(SfxMedium &rMedium)
}
-BOOL SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage )
+sal_Bool SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::InitNew" );
@@ -811,7 +822,7 @@ BOOL SmDocShell::InitNew( const uno::Reference < embed::XStorage >& xStorage )
}
-BOOL SmDocShell::Load( SfxMedium& rMedium )
+sal_Bool SmDocShell::Load( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Load" );
@@ -834,7 +845,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
// is this a fabulous math package ?
Reference<com::sun::star::frame::XModel> xModel(GetModel());
SmXMLImportWrapper aEquation(xModel);
- ULONG nError = aEquation.Import(rMedium);
+ sal_uLong nError = aEquation.Import(rMedium);
bRet = 0 == nError;
SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
}
@@ -852,7 +863,7 @@ BOOL SmDocShell::Load( SfxMedium& rMedium )
//------------------------------------------------------------------
-BOOL SmDocShell::Save()
+sal_Bool SmDocShell::Save()
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Save" );
@@ -923,7 +934,7 @@ void SmDocShell::UpdateText()
}
-BOOL SmDocShell::SaveAs( SfxMedium& rMedium )
+sal_Bool SmDocShell::SaveAs( SfxMedium& rMedium )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveAs" );
@@ -947,7 +958,7 @@ BOOL SmDocShell::SaveAs( SfxMedium& rMedium )
return bRet;
}
-BOOL SmDocShell::ConvertTo( SfxMedium &rMedium )
+sal_Bool SmDocShell::ConvertTo( SfxMedium &rMedium )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::ConvertTo" );
@@ -981,7 +992,7 @@ BOOL SmDocShell::ConvertTo( SfxMedium &rMedium )
return bRet;
}
-BOOL SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
+sal_Bool SmDocShell::SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage )
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SaveCompleted" );
@@ -1004,7 +1015,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SmFormat aNewFormat( aOldFormat );
aNewFormat.SetTextmode(!aOldFormat.IsTextmode());
- SfxUndoManager *pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
new SmFormatAction(this, aOldFormat, aNewFormat));
@@ -1047,7 +1058,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
SmFormat aNewFormat( aOldFormat );
pFontTypeDialog->WriteTo(aNewFormat);
- SfxUndoManager *pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
new SmFormatAction(this, aOldFormat, aNewFormat));
@@ -1071,7 +1082,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
pFontSizeDialog->WriteTo(aNewFormat);
- SfxUndoManager *pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
new SmFormatAction(this, aOldFormat, aNewFormat));
@@ -1095,7 +1106,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
pDistanceDialog->WriteTo(aNewFormat);
- SfxUndoManager *pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
new SmFormatAction(this, aOldFormat, aNewFormat));
@@ -1124,7 +1135,7 @@ void SmDocShell::Execute(SfxRequest& rReq)
pAlignDialog->WriteTo( aFmt );
pp->GetConfig()->SetStandardFormat( aFmt );
- SfxUndoManager *pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager *pTmpUndoMgr = GetUndoManager();
if (pTmpUndoMgr)
pTmpUndoMgr->AddUndoAction(
new SmFormatAction(this, aOldFormat, aNewFormat));
@@ -1147,31 +1158,38 @@ void SmDocShell::Execute(SfxRequest& rReq)
case SID_UNDO:
case SID_REDO:
{
- SfxUndoManager* pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager* pTmpUndoMgr = GetUndoManager();
if( pTmpUndoMgr )
{
- USHORT nId = rReq.GetSlot(), nCnt = 1;
+ sal_uInt16 nId = rReq.GetSlot(), nCnt = 1;
const SfxItemSet* pArgs = rReq.GetArgs();
const SfxPoolItem* pItem;
if( pArgs && SFX_ITEM_SET == pArgs->GetItemState( nId, false, &pItem ))
nCnt = ((SfxUInt16Item*)pItem)->GetValue();
- BOOL (SfxUndoManager:: *fnDo)( USHORT );
+ sal_Bool (::svl::IUndoManager:: *fnDo)();
sal_uInt16 nCount;
if( SID_UNDO == rReq.GetSlot() )
{
nCount = pTmpUndoMgr->GetUndoActionCount();
- fnDo = &SfxUndoManager::Undo;
+ fnDo = &::svl::IUndoManager::Undo;
}
else
{
nCount = pTmpUndoMgr->GetRedoActionCount();
- fnDo = &SfxUndoManager::Redo;
+ fnDo = &::svl::IUndoManager::Redo;
}
- for( ; nCnt && nCount; --nCnt, --nCount )
- (pTmpUndoMgr->*fnDo)( 0 );
+ try
+ {
+ for( ; nCnt && nCount; --nCnt, --nCount )
+ (pTmpUndoMgr->*fnDo)();
+ }
+ catch( const Exception& e )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
Repaint();
UpdateText();
@@ -1199,7 +1217,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
SfxWhichIter aIter(rSet);
- for (USHORT nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich())
+ for (sal_uInt16 nWh = aIter.FirstWhich(); 0 != nWh; nWh = aIter.NextWhich())
{
switch (nWh)
{
@@ -1255,27 +1273,27 @@ void SmDocShell::GetState(SfxItemSet &rSet)
case SID_GETUNDOSTRINGS:
case SID_GETREDOSTRINGS:
{
- SfxUndoManager* pTmpUndoMgr = GetUndoManager();
+ ::svl::IUndoManager* pTmpUndoMgr = GetUndoManager();
if( pTmpUndoMgr )
{
- UniString(SfxUndoManager:: *fnGetComment)( USHORT ) const;
+ UniString(::svl::IUndoManager:: *fnGetComment)( size_t, bool const ) const;
sal_uInt16 nCount;
if( SID_GETUNDOSTRINGS == nWh )
{
nCount = pTmpUndoMgr->GetUndoActionCount();
- fnGetComment = &SfxUndoManager::GetUndoActionComment;
+ fnGetComment = &::svl::IUndoManager::GetUndoActionComment;
}
else
{
nCount = pTmpUndoMgr->GetRedoActionCount();
- fnGetComment = &SfxUndoManager::GetRedoActionComment;
+ fnGetComment = &::svl::IUndoManager::GetRedoActionComment;
}
if( nCount )
{
String sList;
for( sal_uInt16 n = 0; n < nCount; ++n )
- ( sList += (pTmpUndoMgr->*fnGetComment)( n ) )
+ ( sList += (pTmpUndoMgr->*fnGetComment)( n, ::svl::IUndoManager::TopLevel ) )
+= '\n';
SfxStringListItem aItem( nWh );
@@ -1292,7 +1310,7 @@ void SmDocShell::GetState(SfxItemSet &rSet)
}
-SfxUndoManager *SmDocShell::GetUndoManager()
+::svl::IUndoManager *SmDocShell::GetUndoManager()
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::GetUndoManager" );
@@ -1313,7 +1331,7 @@ void SmDocShell::SaveSymbols()
void SmDocShell::Draw(OutputDevice *pDevice,
const JobSetup &,
- USHORT /*nAspect*/)
+ sal_uInt16 /*nAspect*/)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::Draw" );
@@ -1390,13 +1408,13 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
}
}
-ULONG SmDocShell::GetMiscStatus() const
+sal_uLong SmDocShell::GetMiscStatus() const
{
return SfxObjectShell::GetMiscStatus() | SVOBJ_MISCSTATUS_NOTRESIZEABLE
| SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE;
}
-void SmDocShell::SetModified(BOOL bModified)
+void SmDocShell::SetModified(sal_Bool bModified)
{
RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetModified" );
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 5423bb937b0f..bfc0309ebe71 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -82,7 +82,7 @@ using namespace com::sun::star::uno;
void SmGetLeftSelectionPart(const ESelection &rSel,
- USHORT &nPara, USHORT &nPos)
+ sal_uInt16 &nPara, sal_uInt16 &nPos)
// returns paragraph number and position of the selections left part
{
// compare start and end of selection and use the one that comes first
@@ -248,7 +248,7 @@ void SmEditWindow::DataChanged( const DataChangedEvent& )
//! see also SmDocShell::GetEditEngine() !
//!
- pEditEngine->SetDefTab( USHORT( GetTextWidth( C2S("XXXX") ) ) );
+ pEditEngine->SetDefTab( sal_uInt16( GetTextWidth( C2S("XXXX") ) ) );
SetEditEngineDefaultFonts( *pEditEngine, *pEditEngineItemPool );
@@ -289,7 +289,7 @@ IMPL_LINK(SmEditWindow, CursorMoveTimerHdl, Timer *, EMPTYARG /*pTimer*/)
if (pView)
{
// get row and column to look for
- USHORT nRow, nCol;
+ sal_uInt16 nRow, nCol;
SmGetLeftSelectionPart(aNewSelection, nRow, nCol);
nRow++;
nCol++;
@@ -701,7 +701,7 @@ bool SmEditWindow::IsAllSelected() const
if (pEditEngine && pEditView)
{
ESelection eSelection( pEditView->GetSelection() );
- INT32 nParaCnt = pEditEngine->GetParagraphCount();
+ sal_Int32 nParaCnt = pEditEngine->GetParagraphCount();
if (!(nParaCnt - 1))
{
String Text( pEditEngine->GetText( LINEEND_LF ) );
@@ -725,7 +725,7 @@ void SmEditWindow::SelectAll()
}
}
-void SmEditWindow::InsertCommand(USHORT nCommand)
+void SmEditWindow::InsertCommand(sal_uInt16 nCommand)
{
OSL_ENSURE( pEditView, "EditView missing" );
if (pEditView)
@@ -764,7 +764,7 @@ void SmEditWindow::MarkError(const Point &rPos)
if (pEditView)
{
const xub_StrLen nCol = sal::static_int_cast< xub_StrLen >(rPos.X());
- const USHORT nRow = sal::static_int_cast< USHORT >(rPos.Y() - 1);
+ const sal_uInt16 nRow = sal::static_int_cast< sal_uInt16 >(rPos.Y() - 1);
pEditView->SetSelection(ESelection(nRow, nCol - 1, nRow, nCol));
GrabFocus();
@@ -779,10 +779,10 @@ void SmEditWindow::SelNextMark()
if (pEditEngine && pEditView)
{
ESelection eSelection = pEditView->GetSelection();
- USHORT Pos = eSelection.nEndPos;
+ sal_uInt16 Pos = eSelection.nEndPos;
String aMark (C2S("<?>"));
String aText;
- USHORT nCounts = pEditEngine->GetParagraphCount();
+ sal_uInt16 nCounts = pEditEngine->GetParagraphCount();
while (eSelection.nEndPara < nCounts)
{
@@ -809,15 +809,15 @@ void SmEditWindow::SelPrevMark()
if (pEditEngine && pEditView)
{
ESelection eSelection = pEditView->GetSelection();
- USHORT Pos = STRING_NOTFOUND;
+ sal_uInt16 Pos = STRING_NOTFOUND;
xub_StrLen Max = eSelection.nStartPos;
String Text( pEditEngine->GetText( eSelection.nStartPara ) );
String aMark (C2S("<?>"));
- USHORT nCounts = pEditEngine->GetParagraphCount();
+ sal_uInt16 nCounts = pEditEngine->GetParagraphCount();
do
{
- USHORT Fnd = Text.Search(aMark, 0);
+ sal_uInt16 Fnd = Text.Search(aMark, 0);
while ((Fnd < Max) && (Fnd != STRING_NOTFOUND))
{
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 77d543d61e76..0e612126b00f 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -38,7 +38,7 @@
/////////////////////////////////////////////////////////////////
// Latin default-fonts
-static const USHORT aLatinDefFnts[FNT_END] =
+static const sal_uInt16 aLatinDefFnts[FNT_END] =
{
DEFAULTFONT_SERIF, // FNT_VARIABLE
DEFAULTFONT_SERIF, // FNT_FUNCTION
@@ -54,7 +54,7 @@ static const USHORT aLatinDefFnts[FNT_END] =
//! we use non-asian fonts for variables, functions and numbers since they
//! look better and even in asia only latin letters will be used for those.
//! At least that's what I was told...
-static const USHORT aCJKDefFnts[FNT_END] =
+static const sal_uInt16 aCJKDefFnts[FNT_END] =
{
DEFAULTFONT_SERIF, // FNT_VARIABLE
DEFAULTFONT_SERIF, // FNT_FUNCTION
@@ -67,7 +67,7 @@ static const USHORT aCJKDefFnts[FNT_END] =
};
// CTL default-fonts
-static const USHORT aCTLDefFnts[FNT_END] =
+static const sal_uInt16 aCTLDefFnts[FNT_END] =
{
DEFAULTFONT_CTL_TEXT, // FNT_VARIABLE
DEFAULTFONT_CTL_TEXT, // FNT_FUNCTION
@@ -80,7 +80,7 @@ static const USHORT aCTLDefFnts[FNT_END] =
};
-String GetDefaultFontName( LanguageType nLang, USHORT nIdent )
+String GetDefaultFontName( LanguageType nLang, sal_uInt16 nIdent )
{
OSL_ENSURE( /*FNT_BEGIN <= nIdent &&*/ nIdent <= FNT_END,
"index out opd range" );
@@ -89,7 +89,7 @@ String GetDefaultFontName( LanguageType nLang, USHORT nIdent )
return String::CreateFromAscii( FNTNAME_MATH );
else
{
- const USHORT *pTable;
+ const sal_uInt16 *pTable;
switch ( SvtLanguageOptions::GetScriptTypeOfLanguage( nLang ) )
{
case SCRIPTTYPE_LATIN : pTable = aLatinDefFnts; break;
@@ -167,7 +167,7 @@ SmFormat::SmFormat()
vFont[FNT_SANS] .SetItalic(ITALIC_NONE);
vFont[FNT_FIXED] .SetItalic(ITALIC_NONE);
- for ( USHORT i = FNT_BEGIN; i <= FNT_END; i++ )
+ for ( sal_uInt16 i = FNT_BEGIN; i <= FNT_END; i++ )
{
SmFace &rFace = vFont[i];
rFace.SetTransparent( true );
@@ -178,7 +178,7 @@ SmFormat::SmFormat()
}
-void SmFormat::SetFont(USHORT nIdent, const SmFace &rFont, bool bDefault )
+void SmFormat::SetFont(sal_uInt16 nIdent, const SmFace &rFont, bool bDefault )
{
vFont[nIdent] = rFont;
vFont[nIdent].SetTransparent( true );
@@ -196,7 +196,7 @@ SmFormat & SmFormat::operator = (const SmFormat &rFormat)
SetGreekCharStyle(rFormat.GetGreekCharStyle());
SetScaleNormalBrackets(rFormat.IsScaleNormalBrackets());
- USHORT i;
+ sal_uInt16 i;
for (i = FNT_BEGIN; i <= FNT_END; i++)
{
SetFont(i, rFormat.GetFont(i));
@@ -219,7 +219,7 @@ bool SmFormat::operator == (const SmFormat &rFormat) const
bIsTextmode == rFormat.bIsTextmode &&
bScaleNormalBrackets == rFormat.bScaleNormalBrackets;
- USHORT i;
+ sal_uInt16 i;
for (i = 0; i <= SIZ_END && bRes; ++i)
{
if (vSize[i] != rFormat.vSize[i])
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index b91691754ac8..520708b5552d 100644..100755
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -45,10 +45,13 @@ SMDLL=TRUE
SRS2NAME =smres
SRC2FILES = smres.src \
symbol.src \
+ toolbox.src \
commands.src
SLO1FILES = \
$(SLO)$/accessibility.obj \
+ $(SLO)$/caret.obj \
+ $(SLO)$/cursor.obj \
$(SLO)$/edit.obj \
$(SLO)$/eqnolefilehdr.obj \
$(SLO)$/mathmlexport.obj \
@@ -62,21 +65,19 @@ SLO1FILES = \
$(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)$/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)$/utility.obj \
$(SLO)$/rect.obj \
$(SLO)$/unomodel.obj \
- $(SLO)$/view.obj
+ $(SLO)$/view.obj \
+ $(SLO)$/visitors.obj
SLO2FILES = \
$(SLO)$/register.obj \
@@ -95,9 +96,6 @@ LIB1OBJFILES = \
# --- Targets -------------------------------------------------------
-LOCALIZE_ME = menu_tmpl.src
-
-
.INCLUDE : target.mk
$(INCCOM)$/dllname.hxx: makefile.mk
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 30bf7eb26017..279f0b2786f3 100644..100755
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -80,6 +80,7 @@
#include <unomodel.hxx>
#include <document.hxx>
#include <utility.hxx>
+#include <config.hxx>
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
@@ -726,6 +727,9 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps)
PropertyValue* pProps = rProps.getArray();
if (pProps)
{
+ SmConfig *pConfig = SM_MOD()->GetConfig();
+ const bool bUsedSymbolsOnly = pConfig ? pConfig->IsSaveOnlyUsedSymbols() : false;
+
const OUString sFormula ( RTL_CONSTASCII_USTRINGPARAM ( "Formula" ) );
const OUString sBasicLibraries ( RTL_CONSTASCII_USTRINGPARAM ( "BasicLibraries" ) );
const OUString sDialogLibraries ( RTL_CONSTASCII_USTRINGPARAM ( "DialogLibraries" ) );
@@ -739,7 +743,14 @@ void SmXMLExport::GetConfigurationSettings( Sequence < PropertyValue > & rProps)
rPropName != sRuntimeUID)
{
pProps->Name = rPropName;
- pProps->Value = xProps->getPropertyValue(rPropName);
+
+ rtl::OUString aActualName( rPropName );
+
+ // handle 'save used symbols only'
+ if (bUsedSymbolsOnly && rPropName.equalsAscii("Symbols"))
+ aActualName = OUString( RTL_CONSTASCII_USTRINGPARAM ( "UserDefinedSymbolsInUse" ) );
<