summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:24:23 +0200
commitf6fbd3173fd322ee1382ec3ac93c0d9daa03f9f3 (patch)
treeeeec54a98deecb420e00351f2499cf5ed3815abd
parentef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit bb2d8bb585f9c91b8ce3a9e0317b6987f5e95ef4 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:46 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit f58dcf55d8fca8240c459f74b8e819a5a3dda6d4 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:31 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master. commit 8ab96261731432608bbcf733775a4fc84afa75e5 Author: Noel Power <noel.power@novell.com> Date: Mon Feb 7 12:02:12 2011 +0000 fix for bnc#655763 cherry picked from 7c85cd305fcfaa4d714d5d83a7a1f22000a57a8f reviewed in bug https://bugzilla.novell.com/show_bug.cgi?id=655763#c6 Signed-off-by: Cedric Bosdonnat <cbosdonnat@novell.com> sw/source/core/unocore/unotext.cxx | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) commit 5632452090c2cf97e1700abb41684ceab4d04839 Author: Caolán McNamara <caolanm@redhat.com> Date: Thu Nov 11 13:31:33 2010 +0000 Resolves: #i25247#, #i25561#, #i48064#, #i92341# CTL/Other Default Font Signed-off-by: Cédric Bosdonnat <cedricbosdo@openoffice.org> sw/source/filter/ww8/ww8par2.cxx | 19 ++++--------------- sw/source/filter/ww8/ww8par6.cxx | 12 ++++++------ sw/source/filter/ww8/ww8scan.cxx | 17 +++++++++++------ sw/source/filter/ww8/ww8scan.hxx | 8 +++++--- 4 files changed, 26 insertions(+), 30 deletions(-) commit b36353099d6c2518fcbe0c86e1254249b7114650 Author: Petr Mladek <pmladek@suse.cz> Date: Wed Feb 2 17:06:01 2011 +0100 RTF export crasher (bnc#656503) Signed off by Cedric sw/source/filter/ww8/wrtw8nds.cxx | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) commit b61d4e3e3d519672f908f87ad1987b02cf14c40e Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Thu Nov 18 12:37:58 2010 +0100 Fixed an infinite loop while exporting some files in doc/docx/rtf sw/source/filter/ww8/wrtww8.hxx | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 60fc5e3665587389888e83c8970f1f216a72efbc Author: Andras Timar <timar@fsf.hu> Date: Tue Jan 25 21:14:53 2011 +0100 translations need more space on word count dialog sw/source/ui/dialog/wordcountdialog.src | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) commit 8b28483538dc426475d651687b5505cf94149d22 Author: Noel Power <noel.power@novell.com> Date: Mon Jan 10 15:23:27 2011 +0000 bnc#660816 improve formfield checkbox binary export ( and import ) sw/source/core/crsr/bookmrk.cxx | 8 ++++++++ sw/source/filter/ww8/wrtww8.cxx | 37 +++++++++++++++++++++---------------- sw/source/filter/ww8/ww8par3.cxx | 2 ++ 3 files changed, 31 insertions(+), 16 deletions(-) commit 866e4b44f7d5ea75ba31ad78b6c8b58067627788 Author: Kohei Yoshida <kyoshida@novell.com> Date: Fri Jan 14 11:54:40 2011 -0500 Remove pesky on-line registration menu entry. (fdo#33112) sw/uiconfig/swform/menubar/menubar.xml | 1 - sw/uiconfig/swreport/menubar/menubar.xml | 1 - sw/uiconfig/swxform/menubar/menubar.xml | 1 - 3 files changed, 0 insertions(+), 3 deletions(-) commit 0bc34a89434f97f5c25fae9d3529c292aba8e9e6 Author: Caolán McNamara <caolanm@redhat.com> Date: Fri Jan 14 11:44:23 2011 +0000 Resolves: fdo#32633 use standard Edit button width of 50 (cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb) sw/source/ui/misc/titlepage.src | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) commit 6d54edb9fa96fd915a90b06886781827acd2fcde Author: Caolán McNamara <caolanm@redhat.com> Date: Tue Jan 11 20:33:41 2011 +0000 fix this to build sw/source/core/crsr/pam.cxx | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) commit 8d9cf3fdfda0bf4b2ae2464edc0397b0e296f015 Author: Cédric Bosdonnat <cedricbosdo@openoffice.org> Date: Tue Jan 11 20:18:26 2011 +0100 n#657135: Enhanced fields fixes (key inputs, and 0-length fields import) sw/source/core/crsr/bookmrk.cxx | 2 +- sw/source/core/crsr/pam.cxx | 5 +++-- sw/source/filter/ww8/wrtw8nds.cxx | 6 +++--- sw/source/filter/ww8/ww8scan.hxx | 2 +- sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) commit bc6fea9e91ce63236322a1725a725f7fb98aab47 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:58 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit a6d2bb18dd88894c92080214ff7a5c6178ad92cc Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:10 2011 +0100 Branch libreoffice-3-3-0 This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release. Only very safe changes, reviewed by three people are allowed. If you want to commit more complicated fix for the next 3.3.x release, please use the 'libreoffice-3-3' branch. If you want to build something cool, unstable, and risky, use master.
Notes
Notes: split repo tag: writer_libreoffice-3.3.1.1
-rw-r--r--starmath/inc/action.hxx4
-rw-r--r--starmath/inc/applicat.hxx10
-rw-r--r--starmath/inc/config.hxx6
-rw-r--r--starmath/inc/dialog.hxx268
-rw-r--r--starmath/inc/document.hxx102
-rw-r--r--starmath/inc/edit.hxx66
-rw-r--r--starmath/inc/format.hxx150
-rw-r--r--starmath/inc/node.hxx198
-rw-r--r--starmath/inc/parse.hxx250
-rw-r--r--starmath/inc/pch/precompiled_starmath.cxx2
-rw-r--r--starmath/inc/pch/precompiled_starmath.hxx2
-rw-r--r--starmath/inc/rect.hxx120
-rw-r--r--starmath/inc/smdll.hxx2
-rw-r--r--starmath/inc/smmod.hxx12
-rw-r--r--starmath/inc/starmath.hrc1298
-rw-r--r--starmath/inc/symbol.hxx18
-rw-r--r--starmath/inc/toolbox.hxx16
-rw-r--r--starmath/inc/types.hxx4
-rw-r--r--starmath/inc/unomodel.hxx6
-rw-r--r--starmath/inc/utility.hxx116
-rw-r--r--starmath/inc/view.hxx62
-rw-r--r--starmath/sdi/smath.sdi1106
-rw-r--r--starmath/sdi/smitems.sdi156
-rw-r--r--starmath/sdi/smslots.sdi2
-rw-r--r--starmath/source/accessibility.cxx40
-rw-r--r--starmath/source/accessibility.hxx102
-rw-r--r--starmath/source/action.cxx2
-rw-r--r--starmath/source/cfgitem.cxx62
-rw-r--r--starmath/source/cfgitem.hxx2
-rw-r--r--starmath/source/commands.src354
-rw-r--r--starmath/source/config.cxx18
-rw-r--r--starmath/source/detreg.cxx10
-rw-r--r--starmath/source/dialog.cxx196
-rw-r--r--starmath/source/dialog.hrc10
-rw-r--r--starmath/source/document.cxx36
-rw-r--r--starmath/source/edit.cxx30
-rw-r--r--starmath/source/eqnolefilehdr.cxx4
-rw-r--r--starmath/source/eqnolefilehdr.hxx2
-rw-r--r--starmath/source/format.cxx80
-rw-r--r--starmath/source/math_pch.cxx10
-rw-r--r--starmath/source/mathmlexport.cxx2
-rw-r--r--starmath/source/mathmlexport.hxx6
-rw-r--r--starmath/source/mathmlimport.cxx2
-rw-r--r--starmath/source/mathmlimport.hxx16
-rw-r--r--starmath/source/mathtype.cxx28
-rw-r--r--starmath/source/mathtype.hxx10
-rw-r--r--starmath/source/menu_tmpl.src2
-rw-r--r--starmath/source/node.cxx254
-rw-r--r--starmath/source/parse.cxx430
-rw-r--r--starmath/source/rect.cxx116
-rw-r--r--starmath/source/register.cxx10
-rw-r--r--starmath/source/smdetect.cxx2
-rw-r--r--starmath/source/smdetect.hxx2
-rw-r--r--starmath/source/smdll.cxx2
-rw-r--r--starmath/source/smmod.cxx24
-rw-r--r--starmath/source/smres.src8
-rw-r--r--starmath/source/symbol.cxx20
-rw-r--r--starmath/source/symbol.src2
-rw-r--r--starmath/source/toolbox.cxx10
-rw-r--r--starmath/source/toolbox.hrc2
-rw-r--r--starmath/source/typemap.cxx2
-rw-r--r--starmath/source/types.cxx2
-rw-r--r--starmath/source/unodoc.cxx2
-rw-r--r--starmath/source/unomodel.cxx120
-rw-r--r--starmath/source/utility.cxx32
-rw-r--r--starmath/source/view.cxx84
-rw-r--r--starmath/util/hidother.src170
-rwxr-xr-xstarmath/workben/smath-dump-watch.sh8
-rw-r--r--sw/inc/AnnotationWin.hxx20
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx2
-rw-r--r--sw/inc/IDocumentChartDataProviderAccess.hxx2
-rw-r--r--sw/inc/IDocumentContentOperations.hxx4
-rw-r--r--sw/inc/IDocumentDeviceAccess.hxx6
-rw-r--r--sw/inc/IDocumentDrawModelAccess.hxx2
-rw-r--r--sw/inc/IDocumentExternalData.hxx6
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx4
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx2
-rw-r--r--sw/inc/IDocumentLineNumberAccess.hxx2
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx24
-rw-r--r--sw/inc/IDocumentListItems.hxx2
-rw-r--r--sw/inc/IDocumentListsAccess.hxx2
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx34
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx2
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx2
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx2
-rw-r--r--sw/inc/IDocumentState.hxx36
-rw-r--r--sw/inc/IDocumentStatistics.hxx6
-rw-r--r--sw/inc/IDocumentStylePoolAccess.hxx2
-rw-r--r--sw/inc/IDocumentTimerAccess.hxx10
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx8
-rw-r--r--sw/inc/IGrammarContact.hxx8
-rw-r--r--sw/inc/IInterface.hxx34
-rw-r--r--sw/inc/IMark.hxx2
-rw-r--r--sw/inc/PostItMgr.hxx76
-rw-r--r--sw/inc/RefreshListenerContainer.hxx2
-rw-r--r--sw/inc/SidebarWin.hxx82
-rw-r--r--sw/inc/SwAppletImpl.hxx6
-rw-r--r--sw/inc/SwCapObjType.hxx2
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx8
-rw-r--r--sw/inc/SwNodeNum.hxx2
-rw-r--r--sw/inc/SwNumberTree.hxx2
-rw-r--r--sw/inc/SwNumberTreeTypes.hxx2
-rw-r--r--sw/inc/SwRewriter.hxx2
-rw-r--r--sw/inc/SwSmartTagMgr.hxx8
-rw-r--r--sw/inc/SwStyleNameMapper.hxx30
-rw-r--r--sw/inc/SwUndoField.hxx2
-rw-r--r--sw/inc/SwUndoFmt.hxx2
-rw-r--r--sw/inc/SwUndoPageDesc.hxx8
-rw-r--r--sw/inc/SwUndoTOXChange.hxx2
-rw-r--r--sw/inc/SwXMLSectionList.hxx16
-rw-r--r--sw/inc/TextCursorHelper.hxx10
-rw-r--r--sw/inc/accessibilityoptions.hxx2
-rw-r--r--sw/inc/accmap.hxx4
-rw-r--r--sw/inc/acmplwrd.hxx4
-rw-r--r--sw/inc/anchoreddrawobject.hxx2
-rw-r--r--sw/inc/anchoredobject.hxx2
-rw-r--r--sw/inc/authfld.hxx96
-rw-r--r--sw/inc/authratr.hxx10
-rw-r--r--sw/inc/bparr.hxx36
-rw-r--r--sw/inc/breakit.hxx12
-rw-r--r--sw/inc/calbck.hxx58
-rw-r--r--sw/inc/calc.hxx128
-rw-r--r--sw/inc/ccoll.hxx18
-rw-r--r--sw/inc/cellatr.hxx30
-rw-r--r--sw/inc/cellfml.hxx24
-rw-r--r--sw/inc/charatr.hxx20
-rw-r--r--sw/inc/charfmt.hxx2
-rw-r--r--sw/inc/chcmprse.hxx4
-rw-r--r--sw/inc/checkit.hxx2
-rw-r--r--sw/inc/chpfld.hxx22
-rw-r--r--sw/inc/chrdlg.hrc4
-rw-r--r--sw/inc/cmdid.h1360
-rw-r--r--sw/inc/colwd.hxx20
-rw-r--r--sw/inc/comcore.hrc86
-rw-r--r--sw/inc/crsrsh.hxx2
-rw-r--r--sw/inc/crsskip.hxx6
-rw-r--r--sw/inc/crstate.hxx60
-rw-r--r--sw/inc/cshtyp.hxx16
-rw-r--r--sw/inc/dbfld.hxx146
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx98
-rw-r--r--sw/inc/dbui.hrc40
-rw-r--r--sw/inc/dcontact.hxx12
-rw-r--r--sw/inc/ddefld.hxx32
-rw-r--r--sw/inc/dialog.hrc24
-rw-r--r--sw/inc/dlelstnr.hxx12
-rw-r--r--sw/inc/dobjfac.hxx2
-rw-r--r--sw/inc/doc.hxx276
-rw-r--r--sw/inc/docary.hxx6
-rw-r--r--sw/inc/docfac.hxx4
-rw-r--r--sw/inc/dochdl.hrc8
-rw-r--r--sw/inc/docsh.hxx90
-rw-r--r--sw/inc/docstat.hxx20
-rw-r--r--sw/inc/docstyle.hxx122
-rw-r--r--sw/inc/docufld.hxx346
-rw-r--r--sw/inc/dpage.hxx8
-rw-r--r--sw/inc/drawdoc.hxx6
-rw-r--r--sw/inc/edglbldc.hxx6
-rw-r--r--sw/inc/edimp.hxx8
-rw-r--r--sw/inc/editsh.hxx122
-rw-r--r--sw/inc/envelp.hrc6
-rw-r--r--sw/inc/errhdl.hxx8
-rw-r--r--sw/inc/error.h14
-rw-r--r--sw/inc/expfld.hxx220
-rw-r--r--sw/inc/extinput.hxx8
-rw-r--r--sw/inc/fchrfmt.hxx12
-rw-r--r--sw/inc/fesh.hxx152
-rw-r--r--sw/inc/fldbas.hxx218
-rw-r--r--sw/inc/flddat.hxx42
-rw-r--r--sw/inc/flddropdown.hxx2
-rw-r--r--sw/inc/fldinit.hxx2
-rw-r--r--sw/inc/fldui.hrc368
-rw-r--r--sw/inc/fldupde.hxx2
-rw-r--r--sw/inc/flyenum.hxx16
-rw-r--r--sw/inc/flypos.hxx8
-rw-r--r--sw/inc/fmtanchr.hxx14
-rw-r--r--sw/inc/fmtautofmt.hxx8
-rw-r--r--sw/inc/fmtclbl.hxx2
-rw-r--r--sw/inc/fmtclds.hxx58
-rw-r--r--sw/inc/fmtcnct.hxx8
-rw-r--r--sw/inc/fmtcntnt.hxx6
-rw-r--r--sw/inc/fmtcol.hxx60
-rw-r--r--sw/inc/fmtcolfunc.hxx2
-rw-r--r--sw/inc/fmteiro.hxx2
-rw-r--r--sw/inc/fmtflcnt.hxx12
-rw-r--r--sw/inc/fmtfld.hxx26
-rw-r--r--sw/inc/fmtfollowtextflow.hxx2
-rw-r--r--sw/inc/fmtfordr.hxx6
-rw-r--r--sw/inc/fmtfsize.hxx28
-rw-r--r--sw/inc/fmtftn.hxx16
-rw-r--r--sw/inc/fmtftntx.hxx54
-rw-r--r--sw/inc/fmthdft.hxx14
-rw-r--r--sw/inc/fmtinfmt.hxx46
-rw-r--r--sw/inc/fmtline.hxx16
-rw-r--r--sw/inc/fmtlsplt.hxx2
-rw-r--r--sw/inc/fmtmeta.hxx2
-rw-r--r--sw/inc/fmtornt.hxx14
-rw-r--r--sw/inc/fmtpdsc.hxx22
-rw-r--r--sw/inc/fmtrfmrk.hxx10
-rw-r--r--sw/inc/fmtrowsplt.hxx2
-rw-r--r--sw/inc/fmtruby.hxx44
-rw-r--r--sw/inc/fmtsrnd.hxx32
-rw-r--r--sw/inc/fmtsrndenum.hxx2
-rw-r--r--sw/inc/fmtui.hrc54
-rw-r--r--sw/inc/fmturl.hxx32
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx2
-rw-r--r--sw/inc/format.hxx62
-rw-r--r--sw/inc/frmatr.hxx14
-rw-r--r--sw/inc/frmfmt.hxx10
-rw-r--r--sw/inc/ftnidx.hxx8
-rw-r--r--sw/inc/ftninfo.hxx24
-rw-r--r--sw/inc/globals.hrc184
-rw-r--r--sw/inc/globdoc.hxx4
-rw-r--r--sw/inc/grfatr.hxx72
-rw-r--r--sw/inc/helpid.h1160
-rw-r--r--sw/inc/hfspacingitem.hxx2
-rw-r--r--sw/inc/hhcwrp.hxx18
-rw-r--r--sw/inc/hintids.hxx136
-rw-r--r--sw/inc/hints.hxx4
-rw-r--r--sw/inc/htmltbl.hxx104
-rw-r--r--sw/inc/index.hrc20
-rw-r--r--sw/inc/index.hxx16
-rw-r--r--sw/inc/inetfld.hxx26
-rw-r--r--sw/inc/init.hxx6
-rw-r--r--sw/inc/io.hxx2
-rw-r--r--sw/inc/iodetect.hxx6
-rw-r--r--sw/inc/istyleaccess.hxx2
-rw-r--r--sw/inc/itabenum.hxx2
-rw-r--r--sw/inc/lineinfo.hxx62
-rw-r--r--sw/inc/linkenum.hxx2
-rw-r--r--sw/inc/list.hxx2
-rw-r--r--sw/inc/listfunc.hxx2
-rw-r--r--sw/inc/mdiexp.hxx6
-rw-r--r--sw/inc/modcfg.hxx226
-rw-r--r--sw/inc/modeltoviewhelper.hxx2
-rw-r--r--sw/inc/ndarr.hxx56
-rw-r--r--sw/inc/ndgrf.hxx58
-rw-r--r--sw/inc/ndhints.hxx2
-rw-r--r--sw/inc/ndindex.hxx8
-rw-r--r--sw/inc/ndnotxt.hxx24
-rw-r--r--sw/inc/ndole.hxx26
-rw-r--r--sw/inc/ndtxt.hxx16
-rw-r--r--sw/inc/ndtyp.hxx18
-rw-r--r--sw/inc/newhdl.hxx24
-rw-r--r--sw/inc/node.hxx32
-rw-r--r--sw/inc/numrule.hxx58
-rw-r--r--sw/inc/pagedesc.hxx102
-rw-r--r--sw/inc/pageiter.hxx2
-rw-r--r--sw/inc/pam.hxx48
-rw-r--r--sw/inc/paratr.hxx68
-rw-r--r--sw/inc/pausethreadstarting.hxx2
-rw-r--r--sw/inc/pch/precompiled_sw.cxx2
-rw-r--r--sw/inc/pch/precompiled_sw.hxx2
-rw-r--r--sw/inc/poolfmt.hrc350
-rw-r--r--sw/inc/poolfmt.hxx390
-rw-r--r--sw/inc/printdata.hxx32
-rw-r--r--sw/inc/pvprtdat.hxx38
-rw-r--r--sw/inc/rcid.hrc180
-rw-r--r--sw/inc/redline.hxx44
-rw-r--r--sw/inc/redlnaut.hxx2
-rw-r--r--sw/inc/reffld.hxx26
-rw-r--r--sw/inc/ring.hxx12
-rw-r--r--sw/inc/rolbck.hxx2
-rw-r--r--sw/inc/rubylist.hxx14
-rw-r--r--sw/inc/section.hxx30
-rw-r--r--sw/inc/shellid.hxx68
-rw-r--r--sw/inc/shellio.hxx52
-rw-r--r--sw/inc/shellres.hxx44
-rw-r--r--sw/inc/sortopt.hxx28
-rw-r--r--sw/inc/splargs.hxx24
-rw-r--r--sw/inc/statstr.hrc26
-rw-r--r--sw/inc/stringhash.hxx10
-rw-r--r--sw/inc/swabstdlg.hxx132
-rw-r--r--sw/inc/swacorr.hxx14
-rw-r--r--sw/inc/swatrset.hxx32
-rw-r--r--sw/inc/swbaslnk.hxx10
-rw-r--r--sw/inc/swcalwrp.hxx2
-rw-r--r--sw/inc/swcli.hxx6
-rw-r--r--sw/inc/swcrsr.hxx18
-rw-r--r--sw/inc/swdbdata.hxx6
-rw-r--r--sw/inc/swdbtoolsclient.hxx10
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swdll.hxx8
-rw-r--r--sw/inc/swerror.h46
-rw-r--r--sw/inc/swevent.hxx12
-rw-r--r--sw/inc/swfltopt.hxx2
-rw-r--r--sw/inc/swgstr.hxx68
-rw-r--r--sw/inc/swhints.hxx6
-rw-r--r--sw/inc/swmodule.hxx118
-rw-r--r--sw/inc/swprtopt.hxx14
-rw-r--r--sw/inc/swrect.hxx12
-rw-r--r--sw/inc/swregion.hxx6
-rw-r--r--sw/inc/swserv.hxx2
-rw-r--r--sw/inc/swstyle.h4
-rw-r--r--sw/inc/swtable.hxx60
-rw-r--r--sw/inc/swtblfmt.hxx8
-rw-r--r--sw/inc/swtypes.hxx94
-rw-r--r--sw/inc/swundo.hxx18
-rw-r--r--sw/inc/swunodef.hxx10
-rw-r--r--sw/inc/swunohelper.hxx6
-rw-r--r--sw/inc/swurl.hxx6
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx24
-rw-r--r--sw/inc/tblafmt.hxx112
-rw-r--r--sw/inc/tblenum.hxx22
-rw-r--r--sw/inc/tblsel.hxx44
-rw-r--r--sw/inc/tgrditem.hxx18
-rw-r--r--sw/inc/tox.hxx236
-rw-r--r--sw/inc/toxe.hxx4
-rw-r--r--sw/inc/toxinit.hxx2
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/txatbase.hxx22
-rw-r--r--sw/inc/txatritr.hxx12
-rw-r--r--sw/inc/txtatr.hxx4
-rw-r--r--sw/inc/txtflcnt.hxx6
-rw-r--r--sw/inc/txtfld.hxx2
-rw-r--r--sw/inc/txtftn.hxx2
-rw-r--r--sw/inc/txtinet.hxx2
-rw-r--r--sw/inc/txtrfmrk.hxx2
-rw-r--r--sw/inc/txttxmrk.hxx2
-rw-r--r--sw/inc/undobj.hxx136
-rw-r--r--sw/inc/unoatxt.hxx74
-rw-r--r--sw/inc/unobaseclass.hxx4
-rw-r--r--sw/inc/unobookmark.hxx2
-rw-r--r--sw/inc/unochart.hxx8
-rw-r--r--sw/inc/unocoll.hxx156
-rw-r--r--sw/inc/unocore.hrc2
-rw-r--r--sw/inc/unocrsr.hxx14
-rw-r--r--sw/inc/unocrsrhelper.hxx20
-rw-r--r--sw/inc/unodraw.hxx38
-rw-r--r--sw/inc/unoevent.hxx12
-rw-r--r--sw/inc/unoevtlstnr.hxx14
-rw-r--r--sw/inc/unofield.hxx54
-rw-r--r--sw/inc/unoflatpara.hxx4
-rw-r--r--sw/inc/unofootnote.hxx2
-rw-r--r--sw/inc/unoframe.hxx34
-rw-r--r--sw/inc/unoidx.hxx2
-rw-r--r--sw/inc/unomailmerge.hxx2
-rw-r--r--sw/inc/unomap.hxx226
-rw-r--r--sw/inc/unomid.h82
-rw-r--r--sw/inc/unomod.hxx62
-rw-r--r--sw/inc/unoparaframeenum.hxx2
-rw-r--r--sw/inc/unoparagraph.hxx2
-rw-r--r--sw/inc/unoport.hxx18
-rw-r--r--sw/inc/unoprnms.hxx1232
-rw-r--r--sw/inc/unoredline.hxx18
-rw-r--r--sw/inc/unoredlines.hxx10
-rw-r--r--sw/inc/unorefmark.hxx2
-rw-r--r--sw/inc/unosection.hxx2
-rw-r--r--sw/inc/unosett.hxx88
-rw-r--r--sw/inc/unosrch.hxx52
-rw-r--r--sw/inc/unostyle.hxx78
-rw-r--r--sw/inc/unotbl.hxx96
-rw-r--r--sw/inc/unotext.hxx6
-rw-r--r--sw/inc/unotextbodyhf.hxx2
-rw-r--r--sw/inc/unotextcursor.hxx2
-rw-r--r--sw/inc/unotextrange.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx100
-rw-r--r--sw/inc/usrfld.hxx58
-rw-r--r--sw/inc/viewopt.hxx222
-rw-r--r--sw/inc/viewsh.hxx80
-rw-r--r--sw/inc/viscrs.hxx36
-rw-r--r--sw/inc/wdocsh.hxx8
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java2
-rw-r--r--sw/qa/complex/checkColor/CheckChangeColor.java2
-rw-r--r--sw/qa/complex/indeterminateState/CheckIndeterminateState.java2
-rw-r--r--sw/qa/complex/writer/CheckBookmarks.java2
-rw-r--r--sw/qa/complex/writer/CheckFlies.java2
-rw-r--r--sw/qa/complex/writer/CheckIndexedPropertyValues.java2
-rw-r--r--sw/qa/complex/writer/CheckNamedPropertyValues.java2
-rw-r--r--sw/qa/complex/writer/TextPortionEnumerationTest.java2
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx350
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx24
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx68
-rw-r--r--sw/qa/core/export.map2
-rw-r--r--sw/sdi/_annotsh.sdi10
-rw-r--r--sw/sdi/_basesh.sdi4
-rw-r--r--sw/sdi/_beziers.sdi2
-rw-r--r--sw/sdi/_docsh.sdi2
-rw-r--r--sw/sdi/_drwbase.sdi2
-rw-r--r--sw/sdi/_formsh.sdi2
-rw-r--r--sw/sdi/_frmsh.sdi2
-rw-r--r--sw/sdi/_grfsh.sdi48
-rw-r--r--sw/sdi/_listsh.sdi2
-rw-r--r--sw/sdi/_mediash.sdi4
-rw-r--r--sw/sdi/_olesh.sdi2
-rw-r--r--sw/sdi/_tabsh.sdi6
-rw-r--r--sw/sdi/_textsh.sdi22
-rw-r--r--sw/sdi/_viewsh.sdi30
-rw-r--r--sw/sdi/annotsh.sdi74
-rw-r--r--sw/sdi/basesh.sdi2
-rw-r--r--sw/sdi/beziersh.sdi2
-rw-r--r--sw/sdi/docsh.sdi2
-rw-r--r--sw/sdi/drawsh.sdi20
-rw-r--r--sw/sdi/drwbassh.sdi2
-rw-r--r--sw/sdi/drwtxtsh.sdi8
-rw-r--r--sw/sdi/formsh.sdi2
-rw-r--r--sw/sdi/frmsh.sdi2
-rw-r--r--sw/sdi/grfsh.sdi2
-rw-r--r--sw/sdi/listsh.sdi2
-rw-r--r--sw/sdi/mediash.sdi2
-rw-r--r--sw/sdi/olesh.sdi2
-rw-r--r--sw/sdi/swinterf.c4
-rw-r--r--sw/sdi/switems.sdi2
-rw-r--r--sw/sdi/swslots.hrc2
-rw-r--r--sw/sdi/swslots.sdi2
-rw-r--r--sw/sdi/tabsh.sdi2
-rw-r--r--sw/sdi/textsh.sdi2
-rw-r--r--sw/sdi/viewsh.sdi10
-rw-r--r--sw/sdi/wbasesh.sdi2
-rw-r--r--sw/sdi/wbeziers.sdi2
-rw-r--r--sw/sdi/wdocsh.sdi2
-rw-r--r--sw/sdi/wdrwbase.sdi2
-rw-r--r--sw/sdi/wformsh.sdi2
-rw-r--r--sw/sdi/wfrmsh.sdi2
-rw-r--r--sw/sdi/wgrfsh.sdi2
-rw-r--r--sw/sdi/wlistsh.sdi2
-rw-r--r--sw/sdi/wolesh.sdi2
-rw-r--r--sw/sdi/wrtapp.sdi6
-rw-r--r--sw/sdi/wtabsh.sdi2
-rw-r--r--sw/sdi/wtextsh.sdi2
-rw-r--r--sw/sdi/wviewsh.sdi10
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx2
-rw-r--r--sw/source/core/access/acccell.hxx14
-rw-r--r--sw/source/core/access/acccontext.cxx4
-rw-r--r--sw/source/core/access/acccontext.hxx68
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accdoc.hxx22
-rw-r--r--sw/source/core/access/accembedded.cxx2
-rw-r--r--sw/source/core/access/accembedded.hxx6
-rw-r--r--sw/source/core/access/accfootnote.cxx4
-rw-r--r--sw/source/core/access/accfootnote.hxx6
-rw-r--r--sw/source/core/access/accframebase.cxx2
-rw-r--r--sw/source/core/access/accframebase.hxx6
-rw-r--r--sw/source/core/access/accgraphic.cxx2
-rw-r--r--sw/source/core/access/accgraphic.hxx8
-rw-r--r--sw/source/core/access/accheaderfooter.cxx2
-rw-r--r--sw/source/core/access/accheaderfooter.hxx10
-rw-r--r--sw/source/core/access/acchyperlink.cxx22
-rw-r--r--sw/source/core/access/acchyperlink.hxx4
-rw-r--r--sw/source/core/access/acchypertextdata.cxx2
-rw-r--r--sw/source/core/access/acchypertextdata.hxx4
-rw-r--r--sw/source/core/access/accmap.cxx22
-rw-r--r--sw/source/core/access/accnotextframe.cxx2
-rw-r--r--sw/source/core/access/accnotextframe.hxx6
-rw-r--r--sw/source/core/access/accpage.cxx2
-rw-r--r--sw/source/core/access/accpage.hxx8
-rw-r--r--sw/source/core/access/accpara.hxx18
-rw-r--r--sw/source/core/access/accportions.cxx2
-rw-r--r--sw/source/core/access/accportions.hxx2
-rw-r--r--sw/source/core/access/accpreview.cxx2
-rw-r--r--sw/source/core/access/accpreview.hxx12
-rw-r--r--sw/source/core/access/accselectionhelper.cxx2
-rw-r--r--sw/source/core/access/accselectionhelper.hxx2
-rw-r--r--sw/source/core/access/acctable.cxx14
-rw-r--r--sw/source/core/access/acctable.hxx10
-rw-r--r--sw/source/core/access/acctextframe.cxx2
-rw-r--r--sw/source/core/access/acctextframe.hxx6
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx2
-rw-r--r--sw/source/core/attr/calbck.cxx108
-rw-r--r--sw/source/core/attr/cellatr.cxx24
-rw-r--r--sw/source/core/attr/fmtfollowtextflow.cxx2
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx2
-rw-r--r--sw/source/core/attr/format.cxx52
-rw-r--r--sw/source/core/attr/hints.cxx8
-rw-r--r--sw/source/core/attr/swatrset.cxx12
-rw-r--r--sw/source/core/bastyp/SwSmartTagMgr.cxx8
-rw-r--r--sw/source/core/bastyp/bparr.cxx30
-rw-r--r--sw/source/core/bastyp/breakit.cxx6
-rw-r--r--sw/source/core/bastyp/calc.cxx380
-rw-r--r--sw/source/core/bastyp/checkit.cxx2
-rw-r--r--sw/source/core/bastyp/index.cxx48
-rw-r--r--sw/source/core/bastyp/init.cxx284
-rw-r--r--sw/source/core/bastyp/ring.cxx6
-rw-r--r--sw/source/core/bastyp/swcache.cxx116
-rw-r--r--sw/source/core/bastyp/swrect.cxx54
-rw-r--r--sw/source/core/bastyp/swregion.cxx42
-rw-r--r--sw/source/core/bastyp/swtypes.cxx28
-rw-r--r--sw/source/core/bastyp/tabcol.cxx12
-rw-r--r--sw/source/core/crsr/BlockCursor.cxx2
-rw-r--r--sw/source/core/crsr/BlockCursor.hxx4
-rw-r--r--sw/source/core/crsr/IBlockCursor.hxx8
-rw-r--r--sw/source/core/crsr/bookmrk.cxx12
-rw-r--r--sw/source/core/crsr/callnk.cxx8
-rw-r--r--sw/source/core/crsr/callnk.hxx4
-rw-r--r--sw/source/core/crsr/crbm.cxx8
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx2
-rw-r--r--sw/source/core/crsr/crsrsh.cxx160
-rw-r--r--sw/source/core/crsr/crstrvl.cxx82
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx2
-rw-r--r--sw/source/core/crsr/findattr.cxx96
-rw-r--r--sw/source/core/crsr/findcoll.cxx2
-rw-r--r--sw/source/core/crsr/findfmt.cxx8
-rw-r--r--sw/source/core/crsr/findtxt.cxx16
-rw-r--r--sw/source/core/crsr/pam.cxx6
-rw-r--r--sw/source/core/crsr/paminit.cxx66
-rw-r--r--sw/source/core/crsr/swcrsr.cxx74
-rw-r--r--sw/source/core/crsr/trvlcol.cxx4
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx12
-rw-r--r--sw/source/core/crsr/trvlreg.cxx12
-rw-r--r--sw/source/core/crsr/trvltbl.cxx40
-rw-r--r--sw/source/core/crsr/unocrsr.cxx8
-rw-r--r--sw/source/core/crsr/viscrs.cxx38
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx50
-rw-r--r--sw/source/core/doc/acmplwrd.cxx2
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx28
-rw-r--r--sw/source/core/doc/doc.cxx194
-rw-r--r--sw/source/core/doc/docbasic.cxx10
-rw-r--r--sw/source/core/doc/docbm.cxx58
-rw-r--r--sw/source/core/doc/docchart.cxx4
-rw-r--r--sw/source/core/doc/doccomp.cxx34
-rw-r--r--sw/source/core/doc/doccorr.cxx10
-rw-r--r--sw/source/core/doc/docdde.cxx54
-rw-r--r--sw/source/core/doc/docdesc.cxx52
-rw-r--r--sw/source/core/doc/docdraw.cxx36
-rw-r--r--sw/source/core/doc/docedt.cxx80
-rw-r--r--sw/source/core/doc/docfld.cxx116
-rw-r--r--sw/source/core/doc/docfly.cxx34
-rw-r--r--sw/source/core/doc/docfmt.cxx70
-rw-r--r--sw/source/core/doc/docftn.cxx8
-rw-r--r--sw/source/core/doc/docglbl.cxx44
-rw-r--r--sw/source/core/doc/docglos.cxx4
-rw-r--r--sw/source/core/doc/doclay.cxx136
-rw-r--r--sw/source/core/doc/docnew.cxx40
-rw-r--r--sw/source/core/doc/docnum.cxx66
-rw-r--r--sw/source/core/doc/docredln.cxx98
-rw-r--r--sw/source/core/doc/docruby.cxx48
-rw-r--r--sw/source/core/doc/docsort.cxx62
-rw-r--r--sw/source/core/doc/docstat.cxx16
-rw-r--r--sw/source/core/doc/doctxm.cxx114
-rw-r--r--sw/source/core/doc/docxforms.cxx6
-rw-r--r--sw/source/core/doc/extinput.cxx2
-rw-r--r--sw/source/core/doc/fmtcol.cxx20
-rw-r--r--sw/source/core/doc/ftnidx.cxx22
-rw-r--r--sw/source/core/doc/gctable.cxx10
-rw-r--r--sw/source/core/doc/htmltbl.cxx54
-rw-r--r--sw/source/core/doc/lineinfo.cxx2
-rw-r--r--sw/source/core/doc/list.cxx2
-rw-r--r--sw/source/core/doc/notxtfrm.cxx96
-rw-r--r--sw/source/core/doc/number.cxx16
-rw-r--r--sw/source/core/doc/poolfmt.cxx290
-rw-r--r--sw/source/core/doc/sortopt.cxx4
-rw-r--r--sw/source/core/doc/swserv.cxx4
-rw-r--r--sw/source/core/doc/swstylemanager.cxx2
-rw-r--r--sw/source/core/doc/swstylemanager.hxx4
-rw-r--r--sw/source/core/doc/tblafmt.cxx94
-rw-r--r--sw/source/core/doc/tblcpy.cxx46
-rw-r--r--sw/source/core/doc/tblrwcl.cxx198
-rw-r--r--sw/source/core/doc/visiturl.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx2
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx2
-rw-r--r--sw/source/core/docnode/ndcopy.cxx46
-rw-r--r--sw/source/core/docnode/ndindex.cxx12
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx4
-rw-r--r--sw/source/core/docnode/ndnum.cxx80
-rw-r--r--sw/source/core/docnode/ndsect.cxx26
-rw-r--r--sw/source/core/docnode/ndtbl.cxx140
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx138
-rw-r--r--sw/source/core/docnode/node.cxx176
-rw-r--r--sw/source/core/docnode/node2lay.cxx8
-rw-r--r--sw/source/core/docnode/nodes.cxx534
-rw-r--r--sw/source/core/docnode/observablethread.cxx2
-rw-r--r--sw/source/core/docnode/pausethreadstarting.cxx2
-rw-r--r--sw/source/core/docnode/retrievedinputstreamdata.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstream.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstreamconsumer.cxx2
-rw-r--r--sw/source/core/docnode/section.cxx46
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx40
-rw-r--r--sw/source/core/docnode/swthreadjoiner.cxx2
-rw-r--r--sw/source/core/docnode/swthreadmanager.cxx2
-rw-r--r--sw/source/core/docnode/threadlistener.cxx2
-rw-r--r--sw/source/core/docnode/threadmanager.cxx2
-rw-r--r--sw/source/core/draw/dcontact.cxx82
-rw-r--r--sw/source/core/draw/dflyobj.cxx64
-rw-r--r--sw/source/core/draw/dobjfac.cxx2
-rw-r--r--sw/source/core/draw/dpage.cxx18
-rw-r--r--sw/source/core/draw/drawdoc.cxx2
-rw-r--r--sw/source/core/draw/dview.cxx58
-rw-r--r--sw/source/core/edit/acorrect.cxx26
-rw-r--r--sw/source/core/edit/autofmt.cxx254
-rw-r--r--sw/source/core/edit/edatmisc.cxx14
-rw-r--r--sw/source/core/edit/edattr.cxx22
-rw-r--r--sw/source/core/edit/eddel.cxx26
-rw-r--r--sw/source/core/edit/edfcol.cxx12
-rw-r--r--sw/source/core/edit/edfld.cxx54
-rw-r--r--sw/source/core/edit/edfldexp.cxx4
-rw-r--r--sw/source/core/edit/edfmt.cxx4
-rw-r--r--sw/source/core/edit/edglbldc.cxx10
-rw-r--r--sw/source/core/edit/edglss.cxx26
-rw-r--r--sw/source/core/edit/editsh.cxx90
-rw-r--r--sw/source/core/edit/edlingu.cxx176
-rw-r--r--sw/source/core/edit/ednumber.cxx42
-rw-r--r--sw/source/core/edit/edredln.cxx2
-rw-r--r--sw/source/core/edit/edsect.cxx14
-rw-r--r--sw/source/core/edit/edtab.cxx12
-rw-r--r--sw/source/core/edit/edtox.cxx42
-rw-r--r--sw/source/core/edit/edundo.cxx20
-rw-r--r--sw/source/core/edit/edws.cxx26
-rw-r--r--sw/source/core/except/dbgloop.cxx12
-rw-r--r--sw/source/core/except/errhdl.cxx24
-rw-r--r--sw/source/core/fields/authfld.cxx34
-rw-r--r--sw/source/core/fields/cellfml.cxx102
-rw-r--r--sw/source/core/fields/chpfld.cxx24
-rw-r--r--sw/source/core/fields/dbfld.cxx20
-rw-r--r--sw/source/core/fields/ddefld.cxx16
-rw-r--r--sw/source/core/fields/ddetbl.cxx6
-rw-r--r--sw/source/core/fields/docufld.cxx114
-rw-r--r--sw/source/core/fields/expfld.cxx54
-rw-r--r--sw/source/core/fields/fldbas.cxx94
-rw-r--r--sw/source/core/fields/flddat.cxx2
-rw-r--r--sw/source/core/fields/flddropdown.cxx2
-rw-r--r--sw/source/core/fields/fldlst.cxx8
-rw-r--r--sw/source/core/fields/macrofld.cxx4
-rw-r--r--sw/source/core/fields/postithelper.cxx8
-rw-r--r--sw/source/core/fields/reffld.cxx46
-rw-r--r--sw/source/core/fields/scrptfld.cxx2
-rw-r--r--sw/source/core/fields/tblcalc.cxx14
-rw-r--r--sw/source/core/fields/textapi.cxx24
-rw-r--r--sw/source/core/fields/usrfld.cxx20
-rw-r--r--sw/source/core/frmedt/fecopy.cxx52
-rw-r--r--sw/source/core/frmedt/fedesc.cxx26
-rw-r--r--sw/source/core/frmedt/fefly1.cxx206
-rw-r--r--sw/source/core/frmedt/feflyole.cxx4
-rw-r--r--sw/source/core/frmedt/feshview.cxx286
-rw-r--r--sw/source/core/frmedt/fetab.cxx206
-rw-r--r--sw/source/core/frmedt/fews.cxx122
-rw-r--r--sw/source/core/frmedt/tblsel.cxx114
-rw-r--r--sw/source/core/graphic/grfatr.cxx10
-rw-r--r--sw/source/core/graphic/ndgrf.cxx16
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx16
-rw-r--r--sw/source/core/inc/MarkManager.hxx16
-rw-r--r--sw/source/core/inc/SwGrammarMarkUp.hxx8
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx10
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx4
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx34
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx16
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx2
-rw-r--r--sw/source/core/inc/acorrect.hxx14
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/blink.hxx16
-rw-r--r--sw/source/core/inc/bodyfrm.hxx6
-rw-r--r--sw/source/core/inc/bookmrk.hxx4
-rw-r--r--sw/source/core/inc/cntfrm.hxx32
-rw-r--r--sw/source/core/inc/colfrm.hxx4
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx2
-rw-r--r--sw/source/core/inc/dbg_lay.hxx54
-rw-r--r--sw/source/core/inc/dbgloop.hxx10
-rw-r--r--sw/source/core/inc/dflyobj.hxx40
-rw-r--r--sw/source/core/inc/docfld.hxx36
-rw-r--r--sw/source/core/inc/docsort.hxx76
-rw-r--r--sw/source/core/inc/doctxm.hxx30
-rw-r--r--sw/source/core/inc/drawdev.hxx14
-rw-r--r--sw/source/core/inc/drawfont.hxx12
-rw-r--r--sw/source/core/inc/dview.hxx12
-rw-r--r--sw/source/core/inc/environmentofanchoredobject.hxx2
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx2
-rw-r--r--sw/source/core/inc/flowfrm.hxx52
-rw-r--r--sw/source/core/inc/flyfrm.hxx52
-rw-r--r--sw/source/core/inc/flyfrms.hxx10
-rw-r--r--sw/source/core/inc/fntcache.hxx14
-rw-r--r--sw/source/core/inc/frame.hxx230
-rw-r--r--sw/source/core/inc/frminf.hxx10
-rw-r--r--sw/source/core/inc/frmtool.hxx72
-rw-r--r--sw/source/core/inc/ftnboss.hxx20
-rw-r--r--sw/source/core/inc/ftnfrm.hxx34
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/ifinishedthreadlistener.hxx2
-rw-r--r--sw/source/core/inc/ithreadlistenerowner.hxx2
-rw-r--r--sw/source/core/inc/layact.hxx104
-rw-r--r--sw/source/core/inc/laycache.hxx2
-rw-r--r--sw/source/core/inc/layfrm.hxx12
-rw-r--r--sw/source/core/inc/layouter.hxx2
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx2
-rw-r--r--sw/source/core/inc/mvsave.hxx14
-rw-r--r--sw/source/core/inc/node2lay.hxx8
-rw-r--r--sw/source/core/inc/noteurl.hxx12
-rw-r--r--sw/source/core/inc/notxtfrm.hxx6
-rw-r--r--sw/source/core/inc/objectformatter.hxx2
-rw-r--r--sw/source/core/inc/observablethread.hxx2
-rw-r--r--sw/source/core/inc/pagefrm.hxx78
-rw-r--r--sw/source/core/inc/pamtyp.hxx10
-rw-r--r--sw/source/core/inc/ptqueue.hxx2
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx2
-rw-r--r--sw/source/core/inc/retrieveinputstream.hxx2
-rw-r--r--sw/source/core/inc/retrieveinputstreamconsumer.hxx2
-rw-r--r--sw/source/core/inc/rootfrm.hxx92
-rw-r--r--sw/source/core/inc/rowfrm.hxx4
-rw-r--r--sw/source/core/inc/scriptinfo.hxx6
-rw-r--r--sw/source/core/inc/sectfrm.hxx20
-rw-r--r--sw/source/core/inc/setmapvirtdev.hxx2
-rw-r--r--sw/source/core/inc/sortedobjs.hxx2
-rw-r--r--sw/source/core/inc/sortedobjsimpl.hxx2
-rw-r--r--sw/source/core/inc/swblocks.hxx102
-rw-r--r--sw/source/core/inc/swcache.hxx64
-rw-r--r--sw/source/core/inc/swfntcch.hxx4
-rw-r--r--sw/source/core/inc/swfont.hxx82
-rw-r--r--sw/source/core/inc/swselectionlist.hxx6
-rw-r--r--sw/source/core/inc/swthreadjoiner.hxx2
-rw-r--r--sw/source/core/inc/swthreadmanager.hxx2
-rw-r--r--sw/source/core/inc/tabfrm.hxx36
-rw-r--r--sw/source/core/inc/tblrwcl.hxx12
-rw-r--r--sw/source/core/inc/textapi.hxx30
-rw-r--r--sw/source/core/inc/threadlistener.hxx2
-rw-r--r--sw/source/core/inc/threadmanager.hxx2
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx44
-rw-r--r--sw/source/core/inc/txtfrm.hxx86
-rw-r--r--sw/source/core/inc/txttypes.hxx92
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx2
-rw-r--r--sw/source/core/inc/unofldmid.h20
-rw-r--r--sw/source/core/inc/unometa.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx58
-rw-r--r--sw/source/core/inc/visiturl.hxx6
-rw-r--r--sw/source/core/inc/wrong.hxx4
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/anchoredobject.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx136
-rw-r--r--sw/source/core/layout/calcmove.cxx120
-rw-r--r--sw/source/core/layout/colfrm.cxx34
-rw-r--r--sw/source/core/layout/dbg_lay.cxx228
-rw-r--r--sw/source/core/layout/findfrm.cxx144
-rw-r--r--sw/source/core/layout/flowfrm.cxx250
-rw-r--r--sw/source/core/layout/fly.cxx188
-rw-r--r--sw/source/core/layout/flycnt.cxx92
-rw-r--r--sw/source/core/layout/flyincnt.cxx72
-rw-r--r--sw/source/core/layout/flylay.cxx96
-rw-r--r--sw/source/core/layout/flypos.cxx4
-rw-r--r--sw/source/core/layout/frmtool.cxx298
-rw-r--r--sw/source/core/layout/ftnfrm.cxx346
-rw-r--r--sw/source/core/layout/hffrm.cxx34
-rw-r--r--sw/source/core/layout/layact.cxx172
-rw-r--r--sw/source/core/layout/laycache.cxx12
-rw-r--r--sw/source/core/layout/layhelp.hxx42
-rw-r--r--sw/source/core/layout/layouter.cxx14
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx2
-rw-r--r--sw/source/core/layout/newfrm.cxx46
-rw-r--r--sw/source/core/layout/objectformatter.cxx2
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.cxx2
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx2
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx2
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx2
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.cxx2
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.hxx2
-rw-r--r--sw/source/core/layout/pagechg.cxx294
-rw-r--r--sw/source/core/layout/pagedesc.cxx70
-rw-r--r--sw/source/core/layout/paintfrm.cxx300
-rw-r--r--sw/source/core/layout/sectfrm.cxx198
-rw-r--r--sw/source/core/layout/softpagebreak.cxx6
-rw-r--r--sw/source/core/layout/sortedobjs.cxx2
-rw-r--r--sw/source/core/layout/sortedobjsimpl.cxx2
-rw-r--r--sw/source/core/layout/ssfrm.cxx34
-rw-r--r--sw/source/core/layout/swselectionlist.cxx4
-rw-r--r--sw/source/core/layout/tabfrm.cxx232
-rw-r--r--sw/source/core/layout/trvlfrm.cxx308
-rw-r--r--sw/source/core/layout/unusedf.cxx2
-rw-r--r--sw/source/core/layout/virtoutp.cxx10
-rw-r--r--sw/source/core/layout/virtoutp.hxx24
-rw-r--r--sw/source/core/layout/wsfrm.cxx328
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/environmentofanchoredobject.cxx2
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx2
-rw-r--r--sw/source/core/ole/ndole.cxx16
-rw-r--r--sw/source/core/para/paratr.cxx24
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx182
-rw-r--r--sw/source/core/sw3io/swacorr.cxx12
-rw-r--r--sw/source/core/swg/SwXMLBlockExport.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx6
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx2
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx6
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx12
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx12
-rw-r--r--sw/source/core/swg/swblocks.cxx16
-rw-r--r--sw/source/core/table/swnewtable.cxx6
-rw-r--r--sw/source/core/table/swtable.cxx158
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx6
-rw-r--r--sw/source/core/text/SwGrammarMarkUp.cxx4
-rw-r--r--sw/source/core/text/atrhndl.hxx2
-rw-r--r--sw/source/core/text/atrstck.cxx12
-rw-r--r--sw/source/core/text/blink.cxx8
-rw-r--r--sw/source/core/text/frmcrsr.cxx54
-rw-r--r--sw/source/core/text/frmform.cxx102
-rw-r--r--sw/source/core/text/frminf.cxx30
-rw-r--r--sw/source/core/text/frmpaint.cxx28
-rw-r--r--sw/source/core/text/guess.cxx8
-rw-r--r--sw/source/core/text/guess.hxx14
-rw-r--r--sw/source/core/text/inftxt.cxx122
-rw-r--r--sw/source/core/text/inftxt.hxx136
-rw-r--r--sw/source/core/text/itradj.cxx2
-rw-r--r--sw/source/core/text/itratr.cxx46
-rw-r--r--sw/source/core/text/itratr.hxx10
-rw-r--r--sw/source/core/text/itrcrsr.cxx52
-rw-r--r--sw/source/core/text/itrform2.cxx86
-rw-r--r--sw/source/core/text/itrform2.hxx22
-rw-r--r--sw/source/core/text/itrpaint.cxx30
-rw-r--r--sw/source/core/text/itrpaint.hxx2
-rw-r--r--sw/source/core/text/itrtxt.cxx18
-rw-r--r--sw/source/core/text/itrtxt.hxx24
-rw-r--r--sw/source/core/text/noteurl.cxx2
-rw-r--r--sw/source/core/text/pordrop.hxx14
-rw-r--r--sw/source/core/text/porexp.cxx20
-rw-r--r--sw/source/core/text/porexp.hxx14
-rw-r--r--sw/source/core/text/porfld.cxx50
-rw-r--r--sw/source/core/text/porfld.hxx36
-rw-r--r--sw/source/core/text/porfly.cxx40
-rw-r--r--sw/source/core/text/porfly.hxx10
-rw-r--r--sw/source/core/text/porftn.hxx16
-rw-r--r--sw/source/core/text/porglue.cxx34
-rw-r--r--sw/source/core/text/porglue.hxx18
-rw-r--r--sw/source/core/text/porhyph.hxx8
-rw-r--r--sw/source/core/text/porlay.cxx52
-rw-r--r--sw/source/core/text/porlay.hxx76
-rw-r--r--sw/source/core/text/porlin.cxx36
-rw-r--r--sw/source/core/text/porlin.hxx76
-rw-r--r--sw/source/core/text/pormulti.cxx42
-rw-r--r--sw/source/core/text/pormulti.hxx34
-rw-r--r--sw/source/core/text/porref.cxx6
-rw-r--r--sw/source/core/text/porref.hxx6
-rw-r--r--sw/source/core/text/porrst.cxx22
-rw-r--r--sw/source/core/text/porrst.hxx14
-rw-r--r--sw/source/core/text/portab.hxx4
-rw-r--r--sw/source/core/text/portox.cxx6
-rw-r--r--sw/source/core/text/portox.hxx6
-rw-r--r--sw/source/core/text/portxt.cxx2
-rw-r--r--sw/source/core/text/portxt.hxx8
-rw-r--r--sw/source/core/text/possiz.hxx10
-rw-r--r--sw/source/core/text/redlnitr.cxx30
-rw-r--r--sw/source/core/text/redlnitr.hxx8
-rw-r--r--sw/source/core/text/txtcache.cxx60
-rw-r--r--sw/source/core/text/txtcache.hxx4
-rw-r--r--sw/source/core/text/txtcfg.hxx4
-rw-r--r--sw/source/core/text/txtdrop.cxx14
-rw-r--r--sw/source/core/text/txtfld.cxx10
-rw-r--r--sw/source/core/text/txtfly.cxx82
-rw-r--r--sw/source/core/text/txtfly.hxx14
-rw-r--r--sw/source/core/text/txtfrm.cxx90
-rw-r--r--sw/source/core/text/txtftn.cxx92
-rw-r--r--sw/source/core/text/txthyph.cxx28
-rw-r--r--sw/source/core/text/txtinit.cxx16
-rw-r--r--sw/source/core/text/txtio.cxx6
-rw-r--r--sw/source/core/text/txtpaint.cxx4
-rw-r--r--sw/source/core/text/txtpaint.hxx26
-rw-r--r--sw/source/core/text/txttab.cxx4
-rw-r--r--sw/source/core/text/widorp.cxx38
-rw-r--r--sw/source/core/text/widorp.hxx14
-rw-r--r--sw/source/core/text/wrong.cxx10
-rw-r--r--sw/source/core/tox/tox.cxx4
-rw-r--r--sw/source/core/tox/toxhlp.cxx12
-rw-r--r--sw/source/core/tox/txmsrt.cxx26
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx6
-rw-r--r--sw/source/core/txtnode/atrfld.cxx12
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx8
-rw-r--r--sw/source/core/txtnode/atrftn.cxx24
-rw-r--r--sw/source/core/txtnode/atrref.cxx4
-rw-r--r--sw/source/core/txtnode/atrtox.cxx2
-rw-r--r--sw/source/core/txtnode/chrfmt.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx12
-rw-r--r--sw/source/core/txtnode/fntcache.cxx62
-rw-r--r--sw/source/core/txtnode/fntcap.cxx38
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx6
-rw-r--r--sw/source/core/txtnode/ndhints.cxx4
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx128
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx14
-rw-r--r--sw/source/core/txtnode/swfont.cxx40
-rw-r--r--sw/source/core/txtnode/thints.cxx66
-rw-r--r--sw/source/core/txtnode/txatbase.cxx2
-rw-r--r--sw/source/core/txtnode/txatritr.cxx4
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx16
-rw-r--r--sw/source/core/txtnode/txtedt.cxx32
-rw-r--r--sw/source/core/undo/SwRewriter.cxx2
-rw-r--r--sw/source/core/undo/SwUndoField.cxx2
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx2
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx2
-rw-r--r--sw/source/core/undo/SwUndoTOXChange.cxx4
-rw-r--r--sw/source/core/undo/docundo.cxx46
-rw-r--r--sw/source/core/undo/rolbck.cxx30
-rw-r--r--sw/source/core/undo/unattr.cxx16
-rw-r--r--sw/source/core/undo/unbkmk.cxx6
-rw-r--r--sw/source/core/undo/undel.cxx28
-rw-r--r--sw/source/core/undo/undo.hrc130
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/core/undo/undobj.cxx46
-rw-r--r--sw/source/core/undo/undobj1.cxx26
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx2
-rw-r--r--sw/source/core/undo/undraw.cxx10
-rw-r--r--sw/source/core/undo/unfmco.cxx6
-rw-r--r--sw/source/core/undo/unins.cxx18
-rw-r--r--sw/source/core/undo/unmove.cxx18
-rw-r--r--sw/source/core/undo/unnum.cxx24
-rw-r--r--sw/source/core/undo/unoutl.cxx4
-rw-r--r--sw/source/core/undo/unovwr.cxx18
-rw-r--r--sw/source/core/undo/unredln.cxx16
-rw-r--r--sw/source/core/undo/unsect.cxx4
-rw-r--r--sw/source/core/undo/unsort.cxx10
-rw-r--r--sw/source/core/undo/unspnd.cxx2
-rw-r--r--sw/source/core/undo/untbl.cxx52
-rw-r--r--sw/source/core/undo/untblk.cxx16
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx2
-rw-r--r--sw/source/core/unocore/TextCursorHelper.cxx2
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx2
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx2
-rw-r--r--sw/source/core/unocore/swunohelper.cxx6
-rw-r--r--sw/source/core/unocore/unobkm.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx24
-rw-r--r--sw/source/core/unocore/unocoll.cxx22
-rw-r--r--sw/source/core/unocore/unocore.src2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx26
-rw-r--r--sw/source/core/unocore/unodraw.cxx70
-rw-r--r--sw/source/core/unocore/unoevent.cxx72
-rw-r--r--sw/source/core/unocore/unoevtlstnr.cxx8
-rw-r--r--sw/source/core/unocore/unofield.cxx270
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx70
-rw-r--r--sw/source/core/unocore/unoftn.cxx2
-rw-r--r--sw/source/core/unocore/unoidx.cxx8
-rw-r--r--sw/source/core/unocore/unomap.cxx1204
-rw-r--r--sw/source/core/unocore/unoobj.cxx16
-rw-r--r--sw/source/core/unocore/unoobj2.cxx14
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx6
-rw-r--r--sw/source/core/unocore/unoport.cxx8
-rw-r--r--sw/source/core/unocore/unoportenum.cxx22
-rw-r--r--sw/source/core/unocore/unoprnms.cxx1220
-rw-r--r--sw/source/core/unocore/unoredline.cxx28
-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.cxx2
-rw-r--r--sw/source/core/unocore/unosett.cxx114
-rw-r--r--sw/source/core/unocore/unosrch.cxx66
-rw-r--r--sw/source/core/unocore/unostyle.cxx44
-rw-r--r--sw/source/core/unocore/unotbl.cxx192
-rw-r--r--sw/source/core/unocore/unotext.cxx43
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx50
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx2
-rw-r--r--sw/source/core/view/printdata.cxx72
-rw-r--r--sw/source/core/view/vdraw.cxx12
-rw-r--r--sw/source/core/view/viewimp.cxx4
-rw-r--r--sw/source/core/view/viewpg.cxx14
-rw-r--r--sw/source/core/view/viewsh.cxx22
-rw-r--r--sw/source/core/view/vnew.cxx4
-rw-r--r--sw/source/core/view/vprint.cxx30
-rw-r--r--sw/source/filter/ascii/ascatr.cxx12
-rw-r--r--sw/source/filter/ascii/parasc.cxx26
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx30
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx4
-rw-r--r--sw/source/filter/basflt/docfact.cxx26
-rw-r--r--sw/source/filter/basflt/fltini.cxx22
-rw-r--r--sw/source/filter/basflt/iodetect.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx22
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx2
-rw-r--r--sw/source/filter/html/css1atr.cxx388
-rw-r--r--sw/source/filter/html/css1kywd.cxx2
-rw-r--r--sw/source/filter/html/css1kywd.hxx2
-rw-r--r--sw/source/filter/html/htmlatr.cxx344
-rw-r--r--sw/source/filter/html/htmlbas.cxx22
-rw-r--r--sw/source/filter/html/htmlcss1.cxx114
-rw-r--r--sw/source/filter/html/htmlctxt.cxx18
-rw-r--r--sw/source/filter/html/htmldraw.cxx104
-rw-r--r--sw/source/filter/html/htmlfld.cxx184
-rw-r--r--sw/source/filter/html/htmlfld.hxx2
-rw-r--r--sw/source/filter/html/htmlfldw.cxx122
-rw-r--r--sw/source/filter/html/htmlfly.cxx84
-rw-r--r--sw/source/filter/html/htmlfly.hxx64
-rw-r--r--sw/source/filter/html/htmlflyt.cxx522
-rw-r--r--sw/source/filter/html/htmlform.cxx94
-rw-r--r--sw/source/filter/html/htmlform.hxx10
-rw-r--r--sw/source/filter/html/htmlforw.cxx4
-rw-r--r--sw/source/filter/html/htmlftn.cxx20
-rw-r--r--sw/source/filter/html/htmlgrin.cxx26
-rw-r--r--sw/source/filter/html/htmlnum.cxx38
-rw-r--r--sw/source/filter/html/htmlnum.hxx16
-rw-r--r--sw/source/filter/html/htmlplug.cxx28
-rw-r--r--sw/source/filter/html/htmlsect.cxx18
-rw-r--r--sw/source/filter/html/htmltab.cxx306
-rw-r--r--sw/source/filter/html/htmltabw.cxx44
-rw-r--r--sw/source/filter/html/htmlvsh.hxx2
-rw-r--r--sw/source/filter/html/parcss1.cxx24
-rw-r--r--sw/source/filter/html/parcss1.hxx56
-rw-r--r--sw/source/filter/html/svxcss1.cxx250
-rw-r--r--sw/source/filter/html/svxcss1.hxx68
-rw-r--r--sw/source/filter/html/swcss1.hxx14
-rw-r--r--sw/source/filter/html/swhtml.cxx130
-rw-r--r--sw/source/filter/html/swhtml.hxx258
-rw-r--r--sw/source/filter/html/wrthtml.cxx48
-rw-r--r--sw/source/filter/html/wrthtml.hxx280
-rw-r--r--sw/source/filter/inc/fltbase.hxx18
-rw-r--r--sw/source/filter/inc/fltglbls.hxx48
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx114
-rw-r--r--sw/source/filter/inc/msfilter.hxx70
-rw-r--r--sw/source/filter/inc/rtf.hxx22
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx6
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx86
-rw-r--r--sw/source/filter/inc/wwstyles.hxx18
-rw-r--r--sw/source/filter/rtf/rtffld.cxx158
-rw-r--r--sw/source/filter/rtf/rtffly.cxx136
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx74
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx28
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx18
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx64
-rw-r--r--sw/source/filter/writer/writer.cxx14
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx2
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx26
-rw-r--r--sw/source/filter/ww1/fltshell.cxx154
-rw-r--r--sw/source/filter/ww1/w1class.cxx58
-rw-r--r--sw/source/filter/ww1/w1class.hxx152
-rw-r--r--sw/source/filter/ww1/w1filter.cxx124
-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.cxx100
-rw-r--r--sw/source/filter/ww1/w1struct.hxx260
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx50
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx22
-rw-r--r--sw/source/filter/ww8/WW8FibData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx4
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx48
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx42
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx288
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx70
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx18
-rw-r--r--sw/source/filter/ww8/docxexport.cxx38
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx2
-rw-r--r--sw/source/filter/ww8/dump/dump8.cxx4
-rw-r--r--sw/source/filter/ww8/dump/dump8a.cxx896
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.cxx12
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.hxx4
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.cxx20
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.hxx2
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.cxx26
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.hxx6
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.cxx700
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.hxx872
-rw-r--r--sw/source/filter/ww8/dump/ww8struc.hxx662
-rw-r--r--sw/source/filter/ww8/fields.cxx2
-rw-r--r--sw/source/filter/ww8/fields.hxx10
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx2
-rw-r--r--sw/source/filter/ww8/needed_cast.hxx4
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx10
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx36
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx2
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx2
-rw-r--r--sw/source/filter/ww8/staticassert.hxx2
-rw-r--r--sw/source/filter/ww8/styles.cxx8
-rw-r--r--sw/source/filter/ww8/tracer.cxx2
-rw-r--r--sw/source/filter/ww8/tracer.hxx4
-rw-r--r--sw/source/filter/ww8/types.hxx6
-rw-r--r--sw/source/filter/ww8/typessw.hxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx2
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx6
-rw-r--r--sw/source/filter/ww8/writerwordglue.hxx4
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx11
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx4
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx239
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx6
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx12
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx8
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx2
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par.cxx34
-rw-r--r--sw/source/filter/ww8/ww8par.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx45
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx4
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx2
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx36
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx145
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx210
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx2
-rw-r--r--sw/source/filter/xml/ForbiddenCharactersEnum.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx36
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx42
-rw-r--r--sw/source/filter/xml/swxml.cxx10
-rw-r--r--sw/source/filter/xml/wrtxml.cxx62
-rw-r--r--sw/source/filter/xml/wrtxml.hxx10
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx18
-rw-r--r--sw/source/filter/xml/xmlbrshe.hxx10
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx12
-rw-r--r--sw/source/filter/xml/xmlexp.cxx22
-rw-r--r--sw/source/filter/xml/xmlexp.hxx28
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx36
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx14
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx20
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx2
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx50
-rw-r--r--sw/source/filter/xml/xmlimp.hxx80
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx16
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx4
-rw-r--r--sw/source/filter/xml/xmlitem.cxx2
-rw-r--r--sw/source/filter/xml/xmlitem.hxx10
-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/xmlitemm.cxx12
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx16
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx2
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx34
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx10
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx16
-rw-r--r--sw/source/filter/xml/xmlscript.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx22
-rw-r--r--sw/source/filter/xml/xmltbli.cxx64
-rw-r--r--sw/source/filter/xml/xmltbli.hxx36
-rw-r--r--sw/source/filter/xml/xmltext.cxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx4
-rw-r--r--sw/source/filter/xml/xmltexte.hxx8
-rw-r--r--sw/source/filter/xml/xmltexti.cxx12
-rw-r--r--sw/source/filter/xml/xmltexti.hxx22
-rw-r--r--sw/source/ui/app/app.src22
-rw-r--r--sw/source/ui/app/appenv.cxx20
-rw-r--r--sw/source/ui/app/apphdl.cxx18
-rw-r--r--sw/source/ui/app/applab.cxx32
-rw-r--r--sw/source/ui/app/appopt.cxx40
-rw-r--r--sw/source/ui/app/docsh.cxx62
-rw-r--r--sw/source/ui/app/docsh2.cxx98
-rw-r--r--sw/source/ui/app/docshdrw.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx20
-rw-r--r--sw/source/ui/app/docst.cxx52
-rw-r--r--sw/source/ui/app/docstyle.cxx214
-rw-r--r--sw/source/ui/app/error.src14
-rw-r--r--sw/source/ui/app/mainwn.cxx4
-rw-r--r--sw/source/ui/app/mn.src4
-rw-r--r--sw/source/ui/app/swdll.cxx2
-rw-r--r--sw/source/ui/app/swmodul1.cxx20
-rw-r--r--sw/source/ui/app/swmodule.cxx16
-rw-r--r--sw/source/ui/app/swwait.cxx2
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx8
-rw-r--r--sw/source/ui/cctrl/popbox.cxx2
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx2
-rw-r--r--sw/source/ui/chrdlg/break.cxx12
-rw-r--r--sw/source/ui/chrdlg/break.hrc20
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx60
-rw-r--r--sw/source/ui/chrdlg/ccoll.hrc20
-rw-r--r--sw/source/ui/chrdlg/ccoll.src2
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx36
-rw-r--r--sw/source/ui/chrdlg/chardlg.hrc8
-rw-r--r--sw/source/ui/chrdlg/chardlg.src2
-rw-r--r--sw/source/ui/chrdlg/chrdlg.src2
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx114
-rw-r--r--sw/source/ui/chrdlg/drpcps.hrc4
-rw-r--r--sw/source/ui/chrdlg/drpcps.src2
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx24
-rw-r--r--sw/source/ui/chrdlg/numpara.hrc8
-rw-r--r--sw/source/ui/chrdlg/numpara.src2
-rw-r--r--sw/source/ui/chrdlg/paradlg.hrc2
-rw-r--r--sw/source/ui/chrdlg/paradlg.src2
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx14
-rw-r--r--sw/source/ui/chrdlg/swbreak.src2
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx38
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/barcfg.cxx10
-rw-r--r--sw/source/ui/config/caption.cxx6
-rw-r--r--sw/source/ui/config/cfgitems.cxx144
-rw-r--r--sw/source/ui/config/config.hrc40
-rw-r--r--sw/source/ui/config/dbconfig.cxx2
-rw-r--r--sw/source/ui/config/fontcfg.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.hrc2
-rw-r--r--sw/source/ui/config/mailconfigpage.src4
-rw-r--r--sw/source/ui/config/modcfg.cxx110
-rw-r--r--sw/source/ui/config/optcomp.cxx94
-rw-r--r--sw/source/ui/config/optcomp.hrc40
-rw-r--r--sw/source/ui/config/optcomp.src2
-rw-r--r--sw/source/ui/config/optdlg.hrc80
-rw-r--r--sw/source/ui/config/optdlg.src12
-rw-r--r--sw/source/ui/config/optload.cxx100
-rw-r--r--sw/source/ui/config/optload.hrc88
-rw-r--r--sw/source/ui/config/optload.src2
-rw-r--r--sw/source/ui/config/optpage.cxx262
-rw-r--r--sw/source/ui/config/prtopt.cxx32
-rw-r--r--sw/source/ui/config/redlopt.hrc2
-rw-r--r--sw/source/ui/config/redlopt.src2
-rw-r--r--sw/source/ui/config/uinums.cxx52
-rw-r--r--sw/source/ui/config/usrpref.cxx62
-rw-r--r--sw/source/ui/config/viewopt.cxx90
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hrc2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/addresslistdialog.src2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hrc6
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src6
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hrc6
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx2
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src6
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx28
-rw-r--r--sw/source/ui/dbui/dbinsdlg.hrc48
-rw-r--r--sw/source/ui/dbui/dbinsdlg.src4
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx58
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hrc2
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx8
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.src2
-rw-r--r--sw/source/ui/dbui/dbtree.cxx18
-rw-r--r--sw/source/ui/dbui/dbui.cxx50
-rw-r--r--sw/source/ui/dbui/dbui.src6
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx180
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.hrc2
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src2
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.hrc2
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hrc10
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx70
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src18
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hrc2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.src2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hrc2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx42
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.src32
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hrc8
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx28
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.src2
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmmergepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx10
-rw-r--r--sw/source/ui/dbui/mmmergepage.src2
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hrc4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx4
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx6
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.src2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hrc2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx12
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.src2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hrc2
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx8
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src2
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx4
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx8
-rw-r--r--sw/source/ui/dialog/abstract.cxx2
-rw-r--r--sw/source/ui/dialog/abstract.hrc16
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx40
-rw-r--r--sw/source/ui/dialog/ascfldlg.hrc16
-rw-r--r--sw/source/ui/dialog/ascfldlg.src2
-rw-r--r--sw/source/ui/dialog/dialog.src2
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx40
-rw-r--r--sw/source/ui/dialog/docstdlg.hrc32
-rw-r--r--sw/source/ui/dialog/docstdlg.src2
-rw-r--r--sw/source/ui/dialog/macassgn.cxx16
-rw-r--r--sw/source/ui/dialog/regionsw.cxx4
-rw-r--r--sw/source/ui/dialog/regionsw.hrc16
-rw-r--r--sw/source/ui/dialog/regionsw.src2
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx2
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx76
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx184
-rw-r--r--sw/source/ui/dialog/swuiexp.cxx2
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx6
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx172
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx2
-rw-r--r--sw/source/ui/dialog/wordcountdialog.hrc2
-rw-r--r--sw/source/ui/dialog/wordcountdialog.src6
-rw-r--r--sw/source/ui/dochdl/dochdl.src2
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx34
-rw-r--r--sw/source/ui/dochdl/selglos.cxx2
-rw-r--r--sw/source/ui/dochdl/selglos.hrc10
-rw-r--r--sw/source/ui/dochdl/selglos.src2
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx122
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx68
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx14
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx12
-rw-r--r--sw/source/ui/docvw/edtdd.cxx20
-rw-r--r--sw/source/ui/docvw/edtwin.cxx33
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx16
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx24
-rw-r--r--sw/source/ui/docvw/romenu.cxx32
-rw-r--r--sw/source/ui/docvw/romenu.hxx14
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx46
-rw-r--r--sw/source/ui/envelp/envelp.src2
-rw-r--r--sw/source/ui/envelp/envfmt.cxx44
-rw-r--r--sw/source/ui/envelp/envfmt.hrc46
-rw-r--r--sw/source/ui/envelp/envfmt.hxx16
-rw-r--r--sw/source/ui/envelp/envfmt.src2
-rw-r--r--sw/source/ui/envelp/envimg.cxx30
-rw-r--r--sw/source/ui/envelp/envlop.hrc6
-rw-r--r--sw/source/ui/envelp/envlop.src2
-rw-r--r--sw/source/ui/envelp/envlop1.cxx14
-rw-r--r--sw/source/ui/envelp/envprt.cxx2
-rw-r--r--sw/source/ui/envelp/envprt.hrc2
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/envprt.src2
-rw-r--r--sw/source/ui/envelp/label.hrc92
-rw-r--r--sw/source/ui/envelp/label.src4
-rw-r--r--sw/source/ui/envelp/label1.cxx134
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx24
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx58
-rw-r--r--sw/source/ui/envelp/labfmt.hrc8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx62
-rw-r--r--sw/source/ui/envelp/labfmt.src4
-rw-r--r--sw/source/ui/envelp/labimg.cxx362
-rw-r--r--sw/source/ui/envelp/labimp.hxx26
-rw-r--r--sw/source/ui/envelp/labprt.cxx22
-rw-r--r--sw/source/ui/envelp/labprt.hrc4
-rw-r--r--sw/source/ui/envelp/labprt.hxx6
-rw-r--r--sw/source/ui/envelp/labprt.src2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx50
-rw-r--r--sw/source/ui/envelp/mailmrge.hrc56
-rw-r--r--sw/source/ui/envelp/mailmrge.src10
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx178
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.hrc4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx4
-rw-r--r--sw/source/ui/fldui/changedb.cxx22
-rw-r--r--sw/source/ui/fldui/changedb.hrc20
-rw-r--r--sw/source/ui/fldui/changedb.src4
-rw-r--r--sw/source/ui/fldui/flddb.cxx26
-rw-r--r--sw/source/ui/fldui/flddb.hxx48
-rw-r--r--sw/source/ui/fldui/flddb.src2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx26
-rw-r--r--sw/source/ui/fldui/flddinf.hxx34
-rw-r--r--sw/source/ui/fldui/flddinf.src2
-rw-r--r--sw/source/ui/fldui/flddok.cxx42
-rw-r--r--sw/source/ui/fldui/flddok.hxx50
-rw-r--r--sw/source/ui/fldui/flddok.src2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx42
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx48
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx46
-rw-r--r--sw/source/ui/fldui/fldfunc.src2
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx244
-rw-r--r--sw/source/ui/fldui/fldpage.cxx14
-rw-r--r--sw/source/ui/fldui/fldpage.hxx20
-rw-r--r--sw/source/ui/fldui/fldref.cxx56
-rw-r--r--sw/source/ui/fldui/fldref.hxx30
-rw-r--r--sw/source/ui/fldui/fldref.src2
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx14
-rw-r--r--sw/source/ui/fldui/fldtdlg.hrc176
-rw-r--r--sw/source/ui/fldui/fldtdlg.src2
-rw-r--r--sw/source/ui/fldui/fldui.src2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx130
-rw-r--r--sw/source/ui/fldui/fldvar.hxx70
-rw-r--r--sw/source/ui/fldui/fldvar.src2
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx16
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx16
-rw-r--r--sw/source/ui/fldui/inpdlg.hrc16
-rw-r--r--sw/source/ui/fldui/inpdlg.src2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx20
-rw-r--r--sw/source/ui/fldui/javaedit.hrc30
-rw-r--r--sw/source/ui/fldui/javaedit.src2
-rw-r--r--sw/source/ui/fldui/xfldui.cxx4
-rw-r--r--sw/source/ui/fmtui/fmtui.src30
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx78
-rw-r--r--sw/source/ui/fmtui/tmpdlg.src42
-rw-r--r--sw/source/ui/frmdlg/colex.cxx4
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx12
-rw-r--r--sw/source/ui/frmdlg/column.cxx76
-rw-r--r--sw/source/ui/frmdlg/column.hrc68
-rw-r--r--sw/source/ui/frmdlg/column.src12
-rw-r--r--sw/source/ui/frmdlg/cption.cxx36
-rw-r--r--sw/source/ui/frmdlg/cption.hrc14
-rw-r--r--sw/source/ui/frmdlg/cption.src2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx30
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx52
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx172
-rw-r--r--sw/source/ui/frmdlg/frmpage.hrc100
-rw-r--r--sw/source/ui/frmdlg/frmpage.src2
-rw-r--r--sw/source/ui/frmdlg/frmui.src2
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx2
-rw-r--r--sw/source/ui/frmdlg/pattern.hrc28
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx38
-rw-r--r--sw/source/ui/frmdlg/wrap.hrc50
-rw-r--r--sw/source/ui/frmdlg/wrap.src2
-rw-r--r--sw/source/ui/globdoc/globdoc.cxx6
-rw-r--r--sw/source/ui/globdoc/globdoc.src2
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx6
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx8
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx10
-rw-r--r--sw/source/ui/inc/abstract.hxx22
-rw-r--r--sw/source/ui/inc/actctrl.hxx20
-rw-r--r--sw/source/ui/inc/addrdlg.hxx2
-rw-r--r--sw/source/ui/inc/annotsh.hxx36
-rw-r--r--sw/source/ui/inc/app.hrc84
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx32
-rw-r--r--sw/source/ui/inc/autoedit.hxx2
-rw-r--r--sw/source/ui/inc/barcfg.hxx2
-rw-r--r--sw/source/ui/inc/basesh.hxx38
-rw-r--r--sw/source/ui/inc/beziersh.hxx6
-rw-r--r--sw/source/ui/inc/bmpwin.hxx4
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx28
-rw-r--r--sw/source/ui/inc/break.hxx26
-rw-r--r--sw/source/ui/inc/caption.hxx60
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx22
-rw-r--r--sw/source/ui/inc/cfgid.h8
-rw-r--r--sw/source/ui/inc/cfgitems.hxx64
-rw-r--r--sw/source/ui/inc/changedb.hxx36
-rw-r--r--sw/source/ui/inc/chartins.hxx2
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx24
-rw-r--r--sw/source/ui/inc/cnttab.hxx10
-rw-r--r--sw/source/ui/inc/colex.hxx6
-rw-r--r--sw/source/ui/inc/colmgr.hxx56
-rw-r--r--sw/source/ui/inc/column.hxx138
-rw-r--r--sw/source/ui/inc/conarc.hxx12
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx12
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx6
-rw-r--r--sw/source/ui/inc/conrect.hxx8
-rw-r--r--sw/source/ui/inc/content.hxx110
-rw-r--r--sw/source/ui/inc/conttree.hxx244
-rw-r--r--sw/source/ui/inc/convert.hxx36
-rw-r--r--sw/source/ui/inc/cption.hxx36
-rw-r--r--sw/source/ui/inc/dbconfig.hxx6
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx68
-rw-r--r--sw/source/ui/inc/dbtree.hxx26
-rw-r--r--sw/source/ui/inc/dbui.hxx24
-rw-r--r--sw/source/ui/inc/dialmgr.hxx12
-rw-r--r--sw/source/ui/inc/docfnote.hxx2
-rw-r--r--sw/source/ui/inc/docstdlg.hxx6
-rw-r--r--sw/source/ui/inc/drawbase.hxx16
-rw-r--r--sw/source/ui/inc/drawsh.hxx16
-rw-r--r--sw/source/ui/inc/drformsh.hxx8
-rw-r--r--sw/source/ui/inc/drpcps.hxx38
-rw-r--r--sw/source/ui/inc/drwbassh.hxx20
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx52
-rw-r--r--sw/source/ui/inc/dselect.hxx6
-rw-r--r--sw/source/ui/inc/edtwin.hxx226
-rw-r--r--sw/source/ui/inc/envimg.hxx14
-rw-r--r--sw/source/ui/inc/envlop.hxx32
-rw-r--r--sw/source/ui/inc/fldedt.hxx14
-rw-r--r--sw/source/ui/inc/fldmgr.hxx76
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx18
-rw-r--r--sw/source/ui/inc/fldwrap.hxx6
-rw-r--r--sw/source/ui/inc/fontcfg.hxx6
-rw-r--r--sw/source/ui/inc/formatclipboard.hxx2
-rw-r--r--sw/source/ui/inc/formedt.hxx50
-rw-r--r--sw/source/ui/inc/frmdlg.hxx16
-rw-r--r--sw/source/ui/inc/frmmgr.hxx92
-rw-r--r--sw/source/ui/inc/frmpage.hxx186
-rw-r--r--sw/source/ui/inc/frmsh.hxx16
-rw-r--r--sw/source/ui/inc/frmui.hrc74
-rw-r--r--sw/source/ui/inc/globals.h2
-rw-r--r--sw/source/ui/inc/globdoc.hrc10
-rw-r--r--sw/source/ui/inc/glosbib.hxx36
-rw-r--r--sw/source/ui/inc/glosdoc.hxx44
-rw-r--r--sw/source/ui/inc/gloshdl.hxx60
-rw-r--r--sw/source/ui/inc/gloslst.hxx42
-rw-r--r--sw/source/ui/inc/glossary.hxx92
-rw-r--r--sw/source/ui/inc/glshell.hxx44
-rw-r--r--sw/source/ui/inc/grfsh.hxx8
-rw-r--r--sw/source/ui/inc/hidfunc.h650
-rw-r--r--sw/source/ui/inc/hyp.hxx32
-rw-r--r--sw/source/ui/inc/idxmrk.hxx10
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx24
-rw-r--r--sw/source/ui/inc/initui.hxx22
-rw-r--r--sw/source/ui/inc/inpdlg.hxx26
-rw-r--r--sw/source/ui/inc/inputwin.hxx70
-rw-r--r--sw/source/ui/inc/insfnote.hxx40
-rw-r--r--sw/source/ui/inc/insrule.hxx20
-rw-r--r--sw/source/ui/inc/instable.hxx34
-rw-r--r--sw/source/ui/inc/javaedit.hxx20
-rw-r--r--sw/source/ui/inc/label.hxx42
-rw-r--r--sw/source/ui/inc/labelcfg.hxx8
-rw-r--r--sw/source/ui/inc/labimg.hxx126
-rw-r--r--sw/source/ui/inc/langhelper.hxx16
-rw-r--r--sw/source/ui/inc/linenum.hxx50
-rw-r--r--sw/source/ui/inc/listsh.hxx6
-rw-r--r--sw/source/ui/inc/macassgn.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx10
-rw-r--r--sw/source/ui/inc/maildispatcher.hxx72
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx2
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx16
-rw-r--r--sw/source/ui/inc/mailmrge.hxx66
-rw-r--r--sw/source/ui/inc/mediash.hxx6
-rw-r--r--sw/source/ui/inc/mergetbl.hxx14
-rw-r--r--sw/source/ui/inc/misc.hrc106
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx14
-rw-r--r--sw/source/ui/inc/multmrk.hxx22
-rw-r--r--sw/source/ui/inc/navicfg.hxx42
-rw-r--r--sw/source/ui/inc/navicont.hxx24
-rw-r--r--sw/source/ui/inc/navipi.hxx100
-rw-r--r--sw/source/ui/inc/num.hxx78
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx14
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx30
-rw-r--r--sw/source/ui/inc/numpara.hxx42
-rw-r--r--sw/source/ui/inc/numprevw.hxx26
-rw-r--r--sw/source/ui/inc/olesh.hxx2
-rw-r--r--sw/source/ui/inc/olmenu.hxx18
-rw-r--r--sw/source/ui/inc/optcomp.hxx46
-rw-r--r--sw/source/ui/inc/optload.hxx118
-rw-r--r--sw/source/ui/inc/optpage.hxx252
-rw-r--r--sw/source/ui/inc/outline.hxx80
-rw-r--r--sw/source/ui/inc/pardlg.hxx6
-rw-r--r--sw/source/ui/inc/pattern.hxx2
-rw-r--r--sw/source/ui/inc/pgfnote.hxx42
-rw-r--r--sw/source/ui/inc/pggrid.hxx10
-rw-r--r--sw/source/ui/inc/popbox.hxx12
-rw-r--r--sw/source/ui/inc/popup.hrc36
-rw-r--r--sw/source/ui/inc/prcntfld.hxx12
-rw-r--r--sw/source/ui/inc/prtopt.hxx4
-rw-r--r--sw/source/ui/inc/pview.hxx16
-rw-r--r--sw/source/ui/inc/redlndlg.hxx134
-rw-r--r--sw/source/ui/inc/regionsw.hxx100
-rw-r--r--sw/source/ui/inc/ribbar.hrc72
-rw-r--r--sw/source/ui/inc/rowht.hxx14
-rw-r--r--sw/source/ui/inc/scroll.hxx30
-rw-r--r--sw/source/ui/inc/selglos.hxx20
-rw-r--r--sw/source/ui/inc/sharedconnection.hxx2
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx8
-rw-r--r--sw/source/ui/inc/shells.hrc34
-rw-r--r--sw/source/ui/inc/split.hxx16
-rw-r--r--sw/source/ui/inc/splittbl.hxx18
-rw-r--r--sw/source/ui/inc/srcedtw.hxx94
-rw-r--r--sw/source/ui/inc/srcview.hxx36
-rw-r--r--sw/source/ui/inc/srtdlg.hxx60
-rw-r--r--sw/source/ui/inc/stmenu.hxx6
-rw-r--r--sw/source/ui/inc/swcont.hxx50
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx68
-rw-r--r--sw/source/ui/inc/swlbox.hxx52
-rw-r--r--sw/source/ui/inc/swmn_tmpl.hrc22
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx10
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx18
-rw-r--r--sw/source/ui/inc/swtablerep.hxx76
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx32
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx394
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx198
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx4
-rw-r--r--sw/source/ui/inc/swvset.hxx4
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx10
-rw-r--r--sw/source/ui/inc/syncbtn.hxx8
-rw-r--r--sw/source/ui/inc/table.hrc32
-rw-r--r--sw/source/ui/inc/tabledlg.hxx6
-rw-r--r--sw/source/ui/inc/tablemgr.hxx22
-rw-r--r--sw/source/ui/inc/tabsh.hxx14
-rw-r--r--sw/source/ui/inc/tautofmt.hxx56
-rw-r--r--sw/source/ui/inc/tblctrl.hxx6
-rw-r--r--sw/source/ui/inc/tblnumfm.hxx2
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx2
-rw-r--r--sw/source/ui/inc/textcontrolcombo.hxx22
-rw-r--r--sw/source/ui/inc/textsh.hxx54
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx12
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toolbox_tmpl.hrc2
-rw-r--r--sw/source/ui/inc/toxmgr.hxx218
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx18
-rw-r--r--sw/source/ui/inc/uinums.hxx26
-rw-r--r--sw/source/ui/inc/uitool.hxx14
-rw-r--r--sw/source/ui/inc/uivwimp.hxx34
-rw-r--r--sw/source/ui/inc/unodispatch.hxx8
-rw-r--r--sw/source/ui/inc/unotools.hxx48
-rw-r--r--sw/source/ui/inc/unotxvw.hxx20
-rw-r--r--sw/source/ui/inc/usrpref.hxx54
-rw-r--r--sw/source/ui/inc/utlui.hrc88
-rw-r--r--sw/source/ui/inc/view.hxx368
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx2
-rw-r--r--sw/source/ui/inc/web.hrc56
-rw-r--r--sw/source/ui/inc/wformsh.hxx2
-rw-r--r--sw/source/ui/inc/wfrmsh.hxx2
-rw-r--r--sw/source/ui/inc/wgrfsh.hxx2
-rw-r--r--sw/source/ui/inc/wlistsh.hxx2
-rw-r--r--sw/source/ui/inc/wolesh.hxx2
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx4
-rw-r--r--sw/source/ui/inc/workctrl.hxx76
-rw-r--r--sw/source/ui/inc/wrap.hxx72
-rw-r--r--sw/source/ui/inc/wrtsh.hxx376
-rw-r--r--sw/source/ui/inc/wtabsh.hxx2
-rw-r--r--sw/source/ui/inc/wtextsh.hxx2
-rw-r--r--sw/source/ui/inc/wview.hxx4
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx8
-rw-r--r--sw/source/ui/index/cnttab.cxx498
-rw-r--r--sw/source/ui/index/cnttab.hrc236
-rw-r--r--sw/source/ui/index/cnttab.src88
-rw-r--r--sw/source/ui/index/idxmrk.cxx14
-rw-r--r--sw/source/ui/index/idxmrk.hrc102
-rw-r--r--sw/source/ui/index/idxmrk.src166
-rw-r--r--sw/source/ui/index/multmrk.cxx10
-rw-r--r--sw/source/ui/index/multmrk.hrc12
-rw-r--r--sw/source/ui/index/multmrk.src2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx192
-rw-r--r--sw/source/ui/index/toxmgr.cxx14
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx8
-rw-r--r--sw/source/ui/lingu/hyp.cxx8
-rw-r--r--sw/source/ui/lingu/olmenu.cxx34
-rw-r--r--sw/source/ui/lingu/olmenu.hrc2
-rw-r--r--sw/source/ui/lingu/olmenu.src14
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx16
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.hxx14
-rw-r--r--sw/source/ui/misc/autocorr.src2
-rw-r--r--sw/source/ui/misc/bookmark.cxx20
-rw-r--r--sw/source/ui/misc/bookmark.hrc10
-rw-r--r--sw/source/ui/misc/bookmark.src2
-rw-r--r--sw/source/ui/misc/docfnote.cxx18
-rw-r--r--sw/source/ui/misc/docfnote.hrc40
-rw-r--r--sw/source/ui/misc/docfnote.src2
-rw-r--r--sw/source/ui/misc/glosbib.cxx30
-rw-r--r--sw/source/ui/misc/glosbib.hrc14
-rw-r--r--sw/source/ui/misc/glosbib.src2
-rw-r--r--sw/source/ui/misc/glosdoc.cxx42
-rw-r--r--sw/source/ui/misc/glossary.cxx76
-rw-r--r--sw/source/ui/misc/glossary.hrc68
-rw-r--r--sw/source/ui/misc/glossary.src2
-rw-r--r--sw/source/ui/misc/glshell.cxx4
-rw-r--r--sw/source/ui/misc/impfnote.hxx48
-rw-r--r--sw/source/ui/misc/insfnote.cxx24
-rw-r--r--sw/source/ui/misc/insfnote.hrc24
-rw-r--r--sw/source/ui/misc/insfnote.src2
-rw-r--r--sw/source/ui/misc/insrule.cxx4
-rw-r--r--sw/source/ui/misc/insrule.hrc10
-rw-r--r--sw/source/ui/misc/insrule.src2
-rw-r--r--sw/source/ui/misc/linenum.cxx70
-rw-r--r--sw/source/ui/misc/linenum.hrc16
-rw-r--r--sw/source/ui/misc/linenum.src2
-rw-r--r--sw/source/ui/misc/num.cxx24
-rw-r--r--sw/source/ui/misc/num.hrc16
-rw-r--r--sw/source/ui/misc/num.src4
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx8
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.src20
-rw-r--r--sw/source/ui/misc/outline.cxx134
-rw-r--r--sw/source/ui/misc/outline.hrc22
-rw-r--r--sw/source/ui/misc/outline.src4
-rw-r--r--sw/source/ui/misc/pgfnote.cxx46
-rw-r--r--sw/source/ui/misc/pgfnote.hrc32
-rw-r--r--sw/source/ui/misc/pgfnote.src2
-rw-r--r--sw/source/ui/misc/pggrid.cxx28
-rw-r--r--sw/source/ui/misc/pggrid.hrc2
-rw-r--r--sw/source/ui/misc/pggrid.src2
-rw-r--r--sw/source/ui/misc/redlndlg.cxx84
-rw-r--r--sw/source/ui/misc/redlndlg.hrc22
-rw-r--r--sw/source/ui/misc/redlndlg.src2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx64
-rw-r--r--sw/source/ui/misc/srtdlg.hrc10
-rw-r--r--sw/source/ui/misc/srtdlg.src2
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx8
-rw-r--r--sw/source/ui/misc/titlepage.src6
-rw-r--r--sw/source/ui/ribbar/conarc.cxx10
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx4
-rw-r--r--sw/source/ui/ribbar/conform.cxx2
-rw-r--r--sw/source/ui/ribbar/conpoly.cxx2
-rw-r--r--sw/source/ui/ribbar/conrect.cxx2
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx12
-rw-r--r--sw/source/ui/ribbar/dselect.cxx4
-rw-r--r--sw/source/ui/ribbar/inputwin.cxx32
-rw-r--r--sw/source/ui/ribbar/inputwin.hrc70
-rw-r--r--sw/source/ui/ribbar/inputwin.src2
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx8
-rw-r--r--sw/source/ui/ribbar/tblctrl.hrc4
-rw-r--r--sw/source/ui/ribbar/tblctrl.src2
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx12
-rw-r--r--sw/source/ui/ribbar/tbxanchr.src2
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx6
-rw-r--r--sw/source/ui/ribbar/workctrl.hrc30
-rw-r--r--sw/source/ui/ribbar/workctrl.src2
-rw-r--r--sw/source/ui/shells/annotsh.cxx18
-rw-r--r--sw/source/ui/shells/basesh.cxx64
-rw-r--r--sw/source/ui/shells/beziersh.cxx10
-rw-r--r--sw/source/ui/shells/drawdlg.cxx14
-rw-r--r--sw/source/ui/shells/drawsh.cxx22
-rw-r--r--sw/source/ui/shells/drformsh.cxx4
-rw-r--r--sw/source/ui/shells/drwbassh.cxx22
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx56
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx26
-rw-r--r--sw/source/ui/shells/frmsh.cxx38
-rw-r--r--sw/source/ui/shells/grfsh.cxx30
-rw-r--r--sw/source/ui/shells/grfshex.cxx18
-rw-r--r--sw/source/ui/shells/langhelper.cxx62
-rw-r--r--sw/source/ui/shells/listsh.cxx4
-rw-r--r--sw/source/ui/shells/mediash.cxx18
-rw-r--r--sw/source/ui/shells/olesh.cxx2
-rw-r--r--sw/source/ui/shells/shells.src2
-rw-r--r--sw/source/ui/shells/slotadd.cxx2
-rw-r--r--sw/source/ui/shells/tabsh.cxx80
-rw-r--r--sw/source/ui/shells/textfld.cxx32
-rw-r--r--sw/source/ui/shells/textglos.cxx2
-rw-r--r--sw/source/ui/shells/textidx.cxx12
-rw-r--r--sw/source/ui/shells/textsh.cxx12
-rw-r--r--sw/source/ui/shells/textsh1.cxx14
-rw-r--r--sw/source/ui/shells/textsh2.cxx28
-rw-r--r--sw/source/ui/shells/txtattr.cxx42
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx28
-rw-r--r--sw/source/ui/shells/txtnum.cxx2
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx2
-rw-r--r--sw/source/ui/smartmenu/stmenu.hrc2
-rw-r--r--sw/source/ui/smartmenu/stmenu.src2
-rw-r--r--sw/source/ui/table/chartins.cxx4
-rw-r--r--sw/source/ui/table/chartins.hrc10
-rw-r--r--sw/source/ui/table/chartins.src2
-rw-r--r--sw/source/ui/table/colwd.cxx16
-rw-r--r--sw/source/ui/table/colwd.hrc16
-rw-r--r--sw/source/ui/table/colwd.src2
-rw-r--r--sw/source/ui/table/convert.cxx22
-rw-r--r--sw/source/ui/table/convert.hrc34
-rw-r--r--sw/source/ui/table/convert.src2
-rw-r--r--sw/source/ui/table/instable.cxx30
-rw-r--r--sw/source/ui/table/instable.hrc32
-rw-r--r--sw/source/ui/table/instable.src2
-rw-r--r--sw/source/ui/table/mergetbl.cxx14
-rw-r--r--sw/source/ui/table/mergetbl.hrc6
-rw-r--r--sw/source/ui/table/mergetbl.src2
-rw-r--r--sw/source/ui/table/rowht.cxx2
-rw-r--r--sw/source/ui/table/rowht.hrc12
-rw-r--r--sw/source/ui/table/rowht.src2
-rw-r--r--sw/source/ui/table/splittbl.cxx18
-rw-r--r--sw/source/ui/table/splittbl.hrc10
-rw-r--r--sw/source/ui/table/splittbl.src2
-rw-r--r--sw/source/ui/table/swtablerep.cxx4
-rw-r--r--sw/source/ui/table/table.src2
-rw-r--r--sw/source/ui/table/tabledlg.cxx152
-rw-r--r--sw/source/ui/table/tabledlg.hrc124
-rw-r--r--sw/source/ui/table/tabledlg.src14
-rw-r--r--sw/source/ui/table/tablemgr.cxx20
-rw-r--r--sw/source/ui/table/tablepg.hxx198
-rw-r--r--sw/source/ui/table/tautofmt.cxx172
-rw-r--r--sw/source/ui/table/tautofmt.hrc64
-rw-r--r--sw/source/ui/table/tautofmt.src2
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx8
-rw-r--r--sw/source/ui/uiview/pview.cxx54
-rw-r--r--sw/source/ui/uiview/pview.hrc28
-rw-r--r--sw/source/ui/uiview/pview.src2
-rw-r--r--sw/source/ui/uiview/scroll.cxx10
-rw-r--r--sw/source/ui/uiview/srcview.cxx34
-rw-r--r--sw/source/ui/uiview/swcli.cxx10
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx6
-rw-r--r--sw/source/ui/uiview/view.cxx126
-rw-r--r--sw/source/ui/uiview/view.hrc36
-rw-r--r--sw/source/ui/uiview/view.src2
-rw-r--r--sw/source/ui/uiview/view0.cxx6
-rw-r--r--sw/source/ui/uiview/view1.cxx6
-rw-r--r--sw/source/ui/uiview/view2.cxx118
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx2
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx2
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx4
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx34
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx2
-rw-r--r--sw/source/ui/uiview/viewling.cxx82
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx20
-rw-r--r--sw/source/ui/uiview/viewport.cxx86
-rw-r--r--sw/source/ui/uiview/viewprt.cxx34
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx60
-rw-r--r--sw/source/ui/uiview/viewstat.cxx12
-rw-r--r--sw/source/ui/uiview/viewtab.cxx72
-rw-r--r--sw/source/ui/uno/RefreshListenerContainer.cxx2
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx80
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx10
-rw-r--r--sw/source/ui/uno/SwXFilterOptions.cxx2
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.cxx40
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.hxx6
-rw-r--r--sw/source/ui/uno/detreg.cxx12
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx20
-rw-r--r--sw/source/ui/uno/swdet2.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.hxx6
-rw-r--r--sw/source/ui/uno/unoatxt.cxx14
-rw-r--r--sw/source/ui/uno/unodefaults.cxx2
-rw-r--r--sw/source/ui/uno/unodefaults.hxx2
-rw-r--r--sw/source/ui/uno/unodispatch.cxx10
-rw-r--r--sw/source/ui/uno/unodoc.cxx2
-rw-r--r--sw/source/ui/uno/unofreg.cxx32
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx38
-rw-r--r--sw/source/ui/uno/unomod.cxx142
-rw-r--r--sw/source/ui/uno/unomodule.cxx2
-rw-r--r--sw/source/ui/uno/unomodule.hxx26
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx46
-rw-r--r--sw/source/ui/uno/unotxvw.cxx50
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx148
-rw-r--r--sw/source/ui/utlui/attrdesc.hrc138
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx6
-rw-r--r--sw/source/ui/utlui/condedit.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx164
-rw-r--r--sw/source/ui/utlui/glbltree.cxx106
-rw-r--r--sw/source/ui/utlui/gloslst.cxx32
-rw-r--r--sw/source/ui/utlui/gloslst.hrc2
-rw-r--r--sw/source/ui/utlui/gloslst.src2
-rw-r--r--sw/source/ui/utlui/initui.cxx38
-rw-r--r--sw/source/ui/utlui/initui.hrc48
-rw-r--r--sw/source/ui/utlui/initui.src2
-rw-r--r--sw/source/ui/utlui/navicfg.cxx22
-rw-r--r--sw/source/ui/utlui/navipi.cxx48
-rw-r--r--sw/source/ui/utlui/navipi.hrc50
-rw-r--r--sw/source/ui/utlui/navipi.src28
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx38
-rw-r--r--sw/source/ui/utlui/poolfmt.src2
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx14
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx2
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx2
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx36
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx6
-rw-r--r--sw/source/ui/utlui/uiitems.cxx10
-rw-r--r--sw/source/ui/utlui/uitool.cxx46
-rw-r--r--sw/source/ui/utlui/unotools.cxx20
-rw-r--r--sw/source/ui/utlui/unotools.hrc6
-rw-r--r--sw/source/ui/utlui/unotools.src8
-rw-r--r--sw/source/ui/utlui/utlui.src6
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx2
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx2
-rw-r--r--sw/source/ui/vba/service.cxx12
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx6
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx2
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx6
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx6
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx12
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx10
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx6
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx6
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx4
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx26
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx6
-rw-r--r--sw/source/ui/vba/vbaborders.hxx8
-rw-r--r--sw/source/ui/vba/vbadialog.cxx8
-rw-r--r--sw/source/ui/vba/vbadialog.hxx2
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx6
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx4
-rw-r--r--sw/source/ui/vba/vbadocument.cxx54
-rw-r--r--sw/source/ui/vba/vbadocument.hxx2
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx140
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx4
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx14
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx4
-rw-r--r--sw/source/ui/vba/vbafind.cxx12
-rw-r--r--sw/source/ui/vba/vbafind.hxx2
-rw-r--r--sw/source/ui/vba/vbafont.cxx26
-rw-r--r--sw/source/ui/vba/vbafont.hxx2
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx22
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx2
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.hxx2
-rw-r--r--sw/source/ui/vba/vbainformationhelper.cxx4
-rw-r--r--sw/source/ui/vba/vbainformationhelper.hxx2
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx10
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx4
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx16
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx10
-rw-r--r--sw/source/ui/vba/vbapalette.cxx4
-rw-r--r--sw/source/ui/vba/vbapalette.hxx2
-rw-r--r--sw/source/ui/vba/vbapane.cxx8
-rw-r--r--sw/source/ui/vba/vbapane.hxx4
-rw-r--r--sw/source/ui/vba/vbapanes.cxx8
-rw-r--r--sw/source/ui/vba/vbapanes.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx20
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx6
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx18
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx4
-rw-r--r--sw/source/ui/vba/vbarange.hxx4
-rw-r--r--sw/source/ui/vba/vbarangehelper.cxx8
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx2
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx6
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx2
-rw-r--r--sw/source/ui/vba/vbasection.cxx6
-rw-r--r--sw/source/ui/vba/vbasection.hxx2
-rw-r--r--sw/source/ui/vba/vbasections.cxx14
-rw-r--r--sw/source/ui/vba/vbasections.hxx6
-rw-r--r--sw/source/ui/vba/vbaselection.hxx4
-rw-r--r--sw/source/ui/vba/vbastyle.cxx8
-rw-r--r--sw/source/ui/vba/vbastyle.hxx2
-rw-r--r--sw/source/ui/vba/vbastyles.cxx16
-rw-r--r--sw/source/ui/vba/vbastyles.hxx6
-rw-r--r--sw/source/ui/vba/vbasystem.hxx4
-rw-r--r--sw/source/ui/vba/vbatable.cxx20
-rw-r--r--sw/source/ui/vba/vbatable.hxx2
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx4
-rw-r--r--sw/source/ui/vba/vbatables.hxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx4
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx4
-rw-r--r--sw/source/ui/vba/vbavariable.cxx6
-rw-r--r--sw/source/ui/vba/vbavariable.hxx4
-rw-r--r--sw/source/ui/vba/vbavariables.cxx6
-rw-r--r--sw/source/ui/vba/vbavariables.hxx6
-rw-r--r--sw/source/ui/vba/vbaview.cxx34
-rw-r--r--sw/source/ui/vba/vbaview.hxx4
-rw-r--r--sw/source/ui/vba/vbawindow.hxx6
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx8
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx2
-rw-r--r--sw/source/ui/vba/wordvbahelper.hxx6
-rw-r--r--sw/source/ui/web/wdocsh.cxx6
-rw-r--r--sw/source/ui/web/web.src2
-rw-r--r--sw/source/ui/web/wformsh.cxx2
-rw-r--r--sw/source/ui/web/wfrmsh.cxx2
-rw-r--r--sw/source/ui/web/wgrfsh.cxx2
-rw-r--r--sw/source/ui/web/wlistsh.cxx2
-rw-r--r--sw/source/ui/web/wolesh.cxx2
-rw-r--r--sw/source/ui/web/wtabsh.cxx2
-rw-r--r--sw/source/ui/web/wtextsh.cxx2
-rw-r--r--sw/source/ui/web/wview.cxx8
-rw-r--r--sw/source/ui/wrtsh/delete.cxx10
-rw-r--r--sw/source/ui/wrtsh/move.cxx32
-rw-r--r--sw/source/ui/wrtsh/select.cxx48
-rw-r--r--sw/source/ui/wrtsh/wrtsh.hrc2
-rw-r--r--sw/source/ui/wrtsh/wrtsh.src2
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx74
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx24
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx2
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx12
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx6
-rw-r--r--sw/uiconfig/sglobal/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/sglobal/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/sglobal/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/sglobal/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/sweb/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/sweb/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/sweb/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/sweb/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swform/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swform/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swform/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swform/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swform/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swreport/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swreport/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swreport/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swreport/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swreport/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swriter/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swriter/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swriter/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swriter/toolbar/symbolshapes.xml6
-rw-r--r--sw/uiconfig/swxform/menubar/menubar.xml1
-rw-r--r--sw/uiconfig/swxform/toolbar/arrowshapes.xml22
-rw-r--r--sw/uiconfig/swxform/toolbar/basicshapes.xml14
-rw-r--r--sw/uiconfig/swxform/toolbar/flowchartshapes.xml26
-rw-r--r--sw/uiconfig/swxform/toolbar/symbolshapes.xml6
-rw-r--r--sw/util/hidother.hrc4
-rw-r--r--sw/util/hidother.src326
-rw-r--r--sw/xml/writer.xml60
1952 files changed, 39576 insertions, 39543 deletions
diff --git a/starmath/inc/action.hxx b/starmath/inc/action.hxx
index 2463edc983f0..5583cf93602a 100644
--- a/starmath/inc/action.hxx
+++ b/starmath/inc/action.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -36,7 +36,7 @@ class SmDocShell;
class SmFormatAction: public SfxUndoAction
{
- SmDocShell *pDoc;
+ SmDocShell *pDoc;
SmFormat aOldFormat;
SmFormat aNewFormat;
diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 1b896164099f..e23290682c6c 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -34,8 +34,8 @@ class SvxErrorHandler;
#include <sfx2/app.hxx>
-#define SMDLL 1
-#define APPLICATIONNAME "smath3"
+#define SMDLL 1
+#define APPLICATIONNAME "smath3"
#ifdef WIN
@@ -75,10 +75,10 @@ class SmApplicat: public SfxApplication
protected:
SvxErrorHandler *pSvxErrorHandler;
- virtual void OpenClients();
+ virtual void OpenClients();
// initialization / deinitialization
- virtual void Init();
+ virtual void Init();
virtual void Exit();
public:
diff --git a/starmath/inc/config.hxx b/starmath/inc/config.hxx
index 9d87ba0abd2b..2c225ea818bb 100644
--- a/starmath/inc/config.hxx
+++ b/starmath/inc/config.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -42,14 +42,14 @@ class SfxItemSet;
class SmConfig : public SmMathConfig, public SfxBroadcaster
{
- SmFontPickList vFontPickList[7];
+ SmFontPickList vFontPickList[7];
public:
SmConfig();
virtual ~SmConfig();
SmFontPickList & GetFontPickList(USHORT nIdent) { return vFontPickList[nIdent]; }
-
+
void ItemSetToConfig(const SfxItemSet &rSet);
void ConfigToItemSet(SfxItemSet &rSet) const;
};
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index fcad9688f940..b758df5e2adf 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -50,32 +50,32 @@
#include "symbol.hxx"
class SubsetMap;
-#define CATEGORY_NONE 0xFFFF
+#define CATEGORY_NONE 0xFFFF
/**************************************************************************/
-void SetFontStyle(const XubString &rStyleName, Font &rFont);
+void SetFontStyle(const XubString &rStyleName, Font &rFont);
/**************************************************************************/
class SmPrintOptionsTabPage : public SfxTabPage
{
FixedLine aFixedLine1;
- CheckBox aTitle;
- CheckBox aText;
- CheckBox aFrame;
+ CheckBox aTitle;
+ CheckBox aText;
+ CheckBox aFrame;
FixedLine aFixedLine2;
- RadioButton aSizeNormal;
- RadioButton aSizeScaled;
- RadioButton aSizeZoomed;
- MetricField aZoom;
+ RadioButton aSizeNormal;
+ RadioButton aSizeScaled;
+ RadioButton aSizeZoomed;
+ MetricField aZoom;
FixedLine aFixedLine3;
- CheckBox aNoRightSpaces;
+ CheckBox aNoRightSpaces;
DECL_LINK(SizeButtonClickHdl, Button *);
- virtual BOOL FillItemSet(SfxItemSet& rSet);
- virtual void Reset(const SfxItemSet& rSet);
+ virtual BOOL FillItemSet(SfxItemSet& rSet);
+ virtual void Reset(const SfxItemSet& rSet);
public:
static SfxTabPage* Create(Window *pWindow, const SfxItemSet &rSet);
@@ -87,7 +87,7 @@ public:
class SmShowFont : public Control
{
- virtual void Paint(const Rectangle&);
+ virtual void Paint(const Rectangle&);
public:
SmShowFont(Window *pParent, const ResId& rResId) :
@@ -100,16 +100,16 @@ public:
class SmFontDialog : public ModalDialog
{
- FixedText aFixedText1;
- ComboBox aFontBox;
- CheckBox aBoldCheckBox;
- CheckBox aItalicCheckBox;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- SmShowFont aShowFont;
+ FixedText aFixedText1;
+ ComboBox aFontBox;
+ CheckBox aBoldCheckBox;
+ CheckBox aItalicCheckBox;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ SmShowFont aShowFont;
FixedText aFixedText2;
- Font Face;
+ Font Face;
DECL_LINK(FontSelectHdl, ComboBox *);
DECL_LINK(FontModifyHdl, ComboBox *);
@@ -122,30 +122,30 @@ class SmFontDialog : public ModalDialog
public:
SmFontDialog(Window * pParent, OutputDevice *pFntListDevice, BOOL bHideCheckboxes, BOOL bFreeRes = TRUE);
- const Font& GetFont() const { return Face; }
- void SetFont(const Font &rFont);
+ const Font& GetFont() const { return Face; }
+ void SetFont(const Font &rFont);
};
/**************************************************************************/
class SmFontSizeDialog : public ModalDialog
{
- FixedText aFixedText1;
- MetricField aBaseSize;
- FixedText aFixedText4;
- MetricField aTextSize;
- FixedText aFixedText5;
- MetricField aIndexSize;
- FixedText aFixedText6;
- MetricField aFunctionSize;
- FixedText aFixedText7;
- MetricField aOperatorSize;
- FixedText aFixedText8;
- MetricField aBorderSize;
+ FixedText aFixedText1;
+ MetricField aBaseSize;
+ FixedText aFixedText4;
+ MetricField aTextSize;
+ FixedText aFixedText5;
+ MetricField aIndexSize;
+ FixedText aFixedText6;
+ MetricField aFunctionSize;
+ FixedText aFixedText7;
+ MetricField aOperatorSize;
+ FixedText aFixedText8;
+ MetricField aBorderSize;
FixedLine aFixedLine1;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- PushButton aDefaultButton;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ PushButton aDefaultButton;
DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -160,26 +160,26 @@ public:
class SmFontTypeDialog : public ModalDialog
{
- FixedText aFixedText1;
- SmFontPickListBox aVariableFont;
- FixedText aFixedText2;
- SmFontPickListBox aFunctionFont;
- FixedText aFixedText3;
- SmFontPickListBox aNumberFont;
- FixedText aFixedText4;
- SmFontPickListBox aTextFont;
- FixedText aFixedText5;
- SmFontPickListBox aSerifFont;
- FixedText aFixedText6;
- SmFontPickListBox aSansFont;
- FixedText aFixedText7;
- SmFontPickListBox aFixedFont;
+ FixedText aFixedText1;
+ SmFontPickListBox aVariableFont;
+ FixedText aFixedText2;
+ SmFontPickListBox aFunctionFont;
+ FixedText aFixedText3;
+ SmFontPickListBox aNumberFont;
+ FixedText aFixedText4;
+ SmFontPickListBox aTextFont;
+ FixedText aFixedText5;
+ SmFontPickListBox aSerifFont;
+ FixedText aFixedText6;
+ SmFontPickListBox aSansFont;
+ FixedText aFixedText7;
+ SmFontPickListBox aFixedFont;
FixedLine aFixedLine1;
FixedLine aFixedLine2;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ MenuButton aMenuButton;
+ PushButton aDefaultButton;
OutputDevice *pFontListDev;
@@ -195,12 +195,12 @@ public:
/**************************************************************************/
-#define NOCATEGORIES 10
+#define NOCATEGORIES 10
class SmCategoryDesc : public Resource
{
XubString Name;
- XubString *Strings[4];
+ XubString *Strings[4];
Bitmap *Graphics[4]; /* regular bitmaps */
Bitmap *GraphicsH[4]; /* high contrast bitmaps */
USHORT Minimum[4];
@@ -212,12 +212,12 @@ public:
SmCategoryDesc(const ResId &rResId, USHORT 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 & 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;}
void SetHighContrast( BOOL bVal ) { bIsHighContrast = bVal; }
const Bitmap * GetGraphic(USHORT Index) const
@@ -229,25 +229,25 @@ public:
class SmDistanceDialog : public ModalDialog
{
- FixedText aFixedText1;
- MetricField aMetricField1;
- FixedText aFixedText2;
- MetricField aMetricField2;
- FixedText aFixedText3;
- MetricField aMetricField3;
- CheckBox aCheckBox1;
- FixedText aFixedText4;
- MetricField aMetricField4;
- OKButton aOKButton1;
- CancelButton aCancelButton1;
- MenuButton aMenuButton;
- PushButton aDefaultButton;
- FixedBitmap aBitmap;
+ FixedText aFixedText1;
+ MetricField aMetricField1;
+ FixedText aFixedText2;
+ MetricField aMetricField2;
+ FixedText aFixedText3;
+ MetricField aMetricField3;
+ CheckBox aCheckBox1;
+ FixedText aFixedText4;
+ MetricField aMetricField4;
+ OKButton aOKButton1;
+ CancelButton aCancelButton1;
+ MenuButton aMenuButton;
+ PushButton aDefaultButton;
+ FixedBitmap aBitmap;
FixedLine aFixedLine;
SmCategoryDesc *Categories[NOCATEGORIES];
- USHORT nActiveCategory;
- BOOL bScaleAllBrackets;
+ USHORT nActiveCategory;
+ BOOL bScaleAllBrackets;
DECL_LINK(GetFocusHdl, Control *);
DECL_LINK(MenuSelectHdl, Menu *);
@@ -255,8 +255,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, ULONG nHelpId);
+ void SetCategory(USHORT Category);
void ApplyImages();
@@ -281,9 +281,9 @@ class SmAlignDialog : public ModalDialog
RadioButton aCenter;
RadioButton aRight;
FixedLine aFixedLine1;
- OKButton aOKButton1;
+ OKButton aOKButton1;
CancelButton aCancelButton1;
- PushButton aDefaultButton;
+ PushButton aDefaultButton;
DECL_LINK(DefaultButtonClickHdl, Button *);
@@ -299,17 +299,17 @@ public:
class SmShowSymbolSet : public Control
{
SymbolPtrVec_t aSymbolSet;
- ScrollBar aVScrollBar;
- Size aOutputSize;
- Link aSelectHdlLink;
- Link aDblClickHdlLink;
- USHORT nLen;
- USHORT nRows, nColumns;
- USHORT nSelectSymbol;
-
- virtual void Paint(const Rectangle&);
- virtual void MouseButtonDown(const MouseEvent& rMEvt);
- virtual void KeyInput(const KeyEvent& rKEvt);
+ ScrollBar aVScrollBar;
+ Size aOutputSize;
+ Link aSelectHdlLink;
+ Link aDblClickHdlLink;
+ USHORT nLen;
+ USHORT nRows, nColumns;
+ USHORT nSelectSymbol;
+
+ virtual void Paint(const Rectangle&);
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual void KeyInput(const KeyEvent& rKEvt);
DECL_LINK( ScrollHdl, ScrollBar* );
@@ -318,8 +318,8 @@ public:
void SetSymbolSet(const SymbolPtrVec_t& rSymbolSet);
- void SelectSymbol(USHORT nSymbol);
- USHORT GetSelectSymbol() const { return nSelectSymbol; }
+ void SelectSymbol(USHORT nSymbol);
+ USHORT GetSelectSymbol() const { return nSelectSymbol; }
void SetSelectHdl(const Link& rLink) { aSelectHdlLink = rLink; }
void SetDblClickHdl(const Link& rLink) { aDblClickHdlLink = rLink; }
@@ -331,15 +331,15 @@ class SmShowSymbol : public Control
{
Link aDblClickHdlLink;
- virtual void Paint(const Rectangle&);
- virtual void MouseButtonDown(const MouseEvent& rMEvt);
+ virtual void Paint(const Rectangle&);
+ virtual void MouseButtonDown(const MouseEvent& rMEvt);
public:
SmShowSymbol(Window *pParent, const ResId& rResId) :
Control(pParent, rResId) {}
- void SetSymbol(const SmSym *pSymbol);
- void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
+ void SetSymbol(const SmSym *pSymbol);
+ void SetDblClickHdl(const Link &rLink) { aDblClickHdlLink = rLink; }
};
////////////////////////////////////////////////////////////////////////////////
@@ -348,18 +348,18 @@ class SmSymDefineDialog;
class SmSymbolDialog : public ModalDialog
{
- FixedText aSymbolSetText;
- ListBox aSymbolSets;
+ FixedText aSymbolSetText;
+ ListBox aSymbolSets;
SmShowSymbolSet aSymbolSetDisplay;
- FixedText aSymbolName;
- SmShowSymbol aSymbolDisplay;
- PushButton aGetBtn;
- PushButton aCloseBtn;
- PushButton aEditBtn;
+ FixedText aSymbolName;
+ SmShowSymbol aSymbolDisplay;
+ PushButton aGetBtn;
+ PushButton aCloseBtn;
+ PushButton aEditBtn;
SmViewShell &rViewSh;
SmSymbolManager &rSymbolMgr;
-
+
String aSymbolSetName;
SymbolPtrVec_t aSymbolSet;
@@ -372,7 +372,7 @@ class SmSymbolDialog : public ModalDialog
DECL_LINK(EditClickHdl, Button *);
DECL_LINK(GetClickHdl, Button *);
- void FillSymbolSets(BOOL bDeleteText = TRUE);
+ void FillSymbolSets(BOOL bDeleteText = TRUE);
void SetSymbolSetManager(SmSymbolManager &rMgr);
const SmSym *GetSymbol() const;
void InitColor_Impl();
@@ -384,7 +384,7 @@ public:
SmSymbolManager &rSymbolMgr, SmViewShell &rViewShell, BOOL bFreeRes = TRUE);
virtual ~SmSymbolDialog();
- BOOL SelectSymbolSet(const XubString &rSymbolSetName);
+ BOOL SelectSymbolSet(const XubString &rSymbolSetName);
void SelectSymbol(USHORT nSymbolPos);
USHORT GetSelectedSymbol() const { return aSymbolSetDisplay.GetSelectSymbol(); }
};
@@ -393,7 +393,7 @@ public:
class SmShowChar : public Control
{
- virtual void Paint(const Rectangle&);
+ virtual void Paint(const Rectangle&);
public:
SmShowChar(Window *pParent, const ResId& rResId)
@@ -401,8 +401,8 @@ public:
{
}
- void SetChar(xub_Unicode aChar);
- void SetFont(const Font &rFont);
+ void SetChar(xub_Unicode aChar);
+ void SetFont(const Font &rFont);
};
////////////////////////////////////////////////////////////////////////////////
@@ -441,7 +441,7 @@ class SmSymDefineDialog : public ModalDialog
SmSymbolManager aSymbolMgrCopy,
&rSymbolMgr;
- const SmSym *pOrigSymbol;
+ const SmSym *pOrigSymbol;
const SubsetMap *pSubsetMap;
FontList *pFontList;
@@ -457,22 +457,22 @@ class SmSymDefineDialog : public ModalDialog
DECL_LINK(ChangeClickHdl, Button *);
DECL_LINK(DeleteClickHdl, Button *);
- void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
- void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
- void FillFonts(BOOL bDeleteText = TRUE);
- void FillStyles(BOOL bDeleteText = TRUE);
+ void FillSymbols(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
+ void FillSymbolSets(ComboBox &rComboBox, BOOL bDeleteText = TRUE);
+ void FillFonts(BOOL bDeleteText = TRUE);
+ void FillStyles(BOOL bDeleteText = TRUE);
void SetSymbolSetManager(const SmSymbolManager &rMgr);
- void SetFont(const XubString &rFontName, const XubString &rStyleName);
- void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
- void UpdateButtons();
+ void SetFont(const XubString &rFontName, const XubString &rStyleName);
+ void SetOrigSymbol(const SmSym *pSymbol, const XubString &rSymbolSetName);
+ void UpdateButtons();
- BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
+ BOOL SelectSymbolSet(ComboBox &rComboBox, const XubString &rSymbolSetName,
BOOL bDeleteText);
- BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
+ BOOL SelectSymbol(ComboBox &rComboBox, const XubString &rSymbolName,
BOOL bDeleteText);
- BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont);
- BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont);
+ BOOL SelectFont(const XubString &rFontName, BOOL bApplyFont);
+ BOOL SelectStyle(const XubString &rStyleName, BOOL bApplyFont);
SmSym * GetSymbol(const ComboBox &rComboBox);
const SmSym * GetSymbol(const ComboBox &rComboBox) const
@@ -491,31 +491,31 @@ public:
using OutputDevice::SetFont;
// Dialog
- virtual short Execute();
+ virtual short Execute();
BOOL SelectOldSymbolSet(const XubString &rSymbolSetName)
{
return SelectSymbolSet(aOldSymbolSets, rSymbolSetName, FALSE);
}
-
+
BOOL SelectOldSymbol(const XubString &rSymbolName)
{
return SelectSymbol(aOldSymbols, rSymbolName, FALSE);
}
-
+
BOOL SelectSymbolSet(const XubString &rSymbolSetName)
{
return SelectSymbolSet(aSymbolSets, rSymbolSetName, FALSE);
}
-
+
BOOL SelectSymbol(const XubString &rSymbolName)
{
return SelectSymbol(aSymbols, rSymbolName, FALSE);
}
-
+
BOOL SelectFont(const XubString &rFontName) { return SelectFont(rFontName, TRUE); }
- BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); };
- void SelectChar(xub_Unicode cChar);
+ BOOL SelectStyle(const XubString &rStyleName) { return SelectStyle(rStyleName, TRUE); };
+ void SelectChar(xub_Unicode cChar);
};
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 6f73e2244009..6cf38965deba 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -29,7 +29,7 @@
#ifndef DOCUMENT_HXX
#define DOCUMENT_HXX
-#define SMDLL 1
+#define SMDLL 1
#include <sot/storage.hxx>
#include <sot/sotref.hxx>
@@ -50,20 +50,20 @@ class SfxPrinter;
class Printer;
class SmCursor;
-#define HINT_DATACHANGED 1004
+#define HINT_DATACHANGED 1004
-#define SM30BIDENT ((ULONG)0x534D3033L)
-#define SM30IDENT ((ULONG)0x30334d53L)
+#define SM30BIDENT ((ULONG)0x534D3033L)
+#define SM30IDENT ((ULONG)0x30334d53L)
#define SM304AIDENT ((ULONG)0x34303330L)
#define SM30VERSION ((ULONG)0x00010000L)
-#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
+#define SM50VERSION ((ULONG)0x00010001L) //Unterschied zur SM30VERSION ist
//der neue Border im Format.
-#define FRMIDENT ((ULONG)0x03031963L)
-#define FRMVERSION ((ULONG)0x00010001L)
+#define FRMIDENT ((ULONG)0x03031963L)
+#define FRMVERSION ((ULONG)0x00010001L)
-#define STAROFFICE_XML "StarOffice XML (Math)"
-#define MATHML_XML "MathML XML (Math)"
+#define STAROFFICE_XML "StarOffice XML (Math)"
+#define MATHML_XML "MathML XML (Math)"
/* Zugriff auf den Drucker sollte ausschliesslich ueber diese Klasse erfolgen
* ==========================================================================
@@ -111,22 +111,22 @@ class SmDocShell : public SfxObjectShell, public SfxListener
friend class SmModel;
friend class SmCursor;
- String aText;
- SmFormat aFormat;
- SmParser aInterpreter;
+ String aText;
+ SmFormat aFormat;
+ SmParser aInterpreter;
String aAccText;
- SmNode *pTree;
+ SmNode *pTree;
SfxMenuBarManager *pMenuMgr;
- SfxItemPool *pEditEngineItemPool;
- EditEngine *pEditEngine;
- SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
- Printer *pTmpPrinter; //ebenfalls
- long nLeftBorder,
+ SfxItemPool *pEditEngineItemPool;
+ EditEngine *pEditEngine;
+ SfxPrinter *pPrinter; //Siehe Kommentar zum SmPrinter Access!
+ Printer *pTmpPrinter; //ebenfalls
+ long nLeftBorder,
nRightBorder,
nTopBorder,
nBottomBorder;
- USHORT nModifyCount;
- BOOL bIsFormulaArranged;
+ USHORT nModifyCount;
+ BOOL bIsFormulaArranged;
SmCursor *pCursor;
@@ -136,11 +136,11 @@ class SmDocShell : public SfxObjectShell, public SfxListener
BOOL WriteAsMathType3( SfxMedium& );
- virtual void Draw(OutputDevice *pDevice,
+ virtual void Draw(OutputDevice *pDevice,
const JobSetup & rSetup,
USHORT nAspect = ASPECT_CONTENT);
- virtual void FillClass(SvGlobalName* pClassName,
+ virtual void FillClass(SvGlobalName* pClassName,
sal_uInt32* pFormat,
String* pAppName,
String* pFullTypeName,
@@ -148,13 +148,13 @@ 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 void OnDocumentPrinterChanged( Printer * );
+ virtual BOOL SetData( const String& rData );
+ virtual 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 );
- void ImplSave( SvStorageStreamRef xStrm );
- virtual BOOL Save();
+ 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 );
@@ -162,10 +162,10 @@ class SmDocShell : public SfxObjectShell, public SfxListener
Printer *GetPrt();
OutputDevice* GetRefDev();
- BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
- void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
+ BOOL IsFormulaArranged() const { return bIsFormulaArranged; }
+ void SetFormulaArranged(BOOL bVal) { bIsFormulaArranged = bVal; }
- virtual BOOL ConvertFrom(SfxMedium &rMedium);
+ virtual BOOL ConvertFrom(SfxMedium &rMedium);
/** Called whenever the formula is changed
* Deletes the current cursor
@@ -179,10 +179,10 @@ public:
SFX_DECL_OBJECTFACTORY();
SmDocShell( const sal_uInt64 i_nSfxCreationFlags );
- virtual ~SmDocShell();
+ virtual ~SmDocShell();
- void LoadSymbols();
- void SaveSymbols();
+ void LoadSymbols();
+ void SaveSymbols();
void ArrangeFormula();
@@ -190,9 +190,9 @@ public:
//und fuer die Kommunikation mit dem SFX!
//Alle internen Verwendungen des Printers sollten ausschlieslich uber
//den SmPrinterAccess funktionieren.
- BOOL HasPrinter() { return 0 != pPrinter; }
- SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
- void SetPrinter( SfxPrinter * );
+ BOOL HasPrinter() { return 0 != pPrinter; }
+ SfxPrinter *GetPrinter() { GetPrt(); return pPrinter; }
+ void SetPrinter( SfxPrinter * );
const String GetComment() const;
@@ -200,32 +200,32 @@ public:
sal_Bool ReplaceBadChars();
void UpdateText();
- void SetText(const String& rBuffer);
- String& GetText() { return (aText); }
- void SetFormat(SmFormat& rFormat);
+ void SetText(const String& rBuffer);
+ String& GetText() { return (aText); }
+ void SetFormat(SmFormat& rFormat);
const SmFormat& GetFormat() { return (aFormat); }
- void Parse();
- SmParser & GetParser() { return aInterpreter; }
- const SmNode * GetFormulaTree() const { return pTree; }
- void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
+ void Parse();
+ SmParser & GetParser() { return aInterpreter; }
+ const SmNode * GetFormulaTree() const { return pTree; }
+ void SetFormulaTree(SmNode *&rTree) { pTree = rTree; }
String GetAccessibleText();
- EditEngine & GetEditEngine();
- SfxItemPool & GetEditEngineItemPool();
+ EditEngine & GetEditEngine();
+ SfxItemPool & GetEditEngineItemPool();
- void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
- Size GetSize();
+ void DrawFormula(OutputDevice &rDev, Point &rPosition, BOOL bDrawSelection = FALSE);
+ Size GetSize();
void Repaint();
- virtual SfxUndoManager *GetUndoManager ();
+ virtual SfxUndoManager *GetUndoManager ();
virtual SfxItemPool& GetPool() const;
- void Execute( SfxRequest& rReq );
- void GetState(SfxItemSet &);
+ void Execute( SfxRequest& rReq );
+ void GetState(SfxItemSet &);
virtual void SetVisArea (const Rectangle & rVisArea);
virtual void SetModified(BOOL bModified);
diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx
index cfb5ddffda8b..7249cc3a44e9 100644
--- a/starmath/inc/edit.hxx
+++ b/starmath/inc/edit.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -61,13 +61,13 @@ class SmEditWindow : public Window, public DropTargetHelper
SmEditAccessible * pAccessible;
SmCmdBoxWindow &rCmdBox;
- EditView *pEditView;
- ScrollBar *pHScrollBar,
+ EditView *pEditView;
+ ScrollBar *pHScrollBar,
*pVScrollBar;
ScrollBarBox *pScrollBox;
- Timer aModifyTimer,
+ Timer aModifyTimer,
aCursorMoveTimer;
- ESelection aOldSelection;
+ ESelection aOldSelection;
virtual void KeyInput(const KeyEvent& rKEvt);
virtual void Command(const CommandEvent& rCEvt);
@@ -88,12 +88,12 @@ class SmEditWindow : public Window, public DropTargetHelper
DECL_LINK(EditStatusHdl ,EditStatus *);
DECL_LINK(ScrollHdl, ScrollBar *);
- void CreateEditView();
+ void CreateEditView();
- Rectangle AdjustScrollBars();
- void SetScrollBarRanges();
- void InitScrollBars();
- void InvalidateSlots();
+ Rectangle AdjustScrollBars();
+ void SetScrollBarRanges();
+ void InitScrollBars();
+ void InvalidateSlots();
public:
SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin );
@@ -106,30 +106,30 @@ public:
SfxItemPool * GetEditEngineItemPool();
// Window
- virtual void SetText(const XubString &rText);
+ virtual void SetText(const XubString &rText);
virtual String GetText() const;
- virtual void GetFocus();
- virtual void LoseFocus();
-
- ESelection GetSelection() const;
- void SetSelection(const ESelection &rSel);
-
- BOOL IsEmpty() const;
- BOOL IsSelected() const;
- BOOL IsAllSelected() const;
- void Cut();
- void Copy();
- void Paste();
- void Delete();
- void SelectAll();
- void InsertText(const String &rText);
- void InsertCommand(USHORT nCommand);
- void MarkError(const Point &rPos);
- void SelNextMark();
- void SelPrevMark();
- BOOL HasMark(const String &rText) const;
-
- void Flush();
+ virtual void GetFocus();
+ virtual void LoseFocus();
+
+ ESelection GetSelection() const;
+ void SetSelection(const ESelection &rSel);
+
+ BOOL IsEmpty() const;
+ BOOL IsSelected() const;
+ BOOL IsAllSelected() const;
+ void Cut();
+ void Copy();
+ void Paste();
+ void Delete();
+ void SelectAll();
+ void InsertText(const String &rText);
+ void InsertCommand(USHORT nCommand);
+ void MarkError(const Point &rPos);
+ void SelNextMark();
+ void SelPrevMark();
+ BOOL HasMark(const String &rText) const;
+
+ void Flush();
void DeleteEditView( SmViewShell &rView );
void ApplyColorConfigValues( const svtools::ColorConfig &rColorCfg );
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index f4cddc3bbdc9..6823ba82dc87 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -35,91 +35,91 @@
#include <types.hxx>
-#define SM_FMT_VERSION_51 ((BYTE) 0x01)
-#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
+#define SM_FMT_VERSION_51 ((BYTE) 0x01)
+#define SM_FMT_VERSION_NOW SM_FMT_VERSION_51
-#define FNTNAME_TIMES "Times New Roman"
-#define FNTNAME_HELV "Helvetica"
-#define FNTNAME_COUR "Courier"
+#define FNTNAME_TIMES "Times New Roman"
+#define FNTNAME_HELV "Helvetica"
+#define FNTNAME_COUR "Courier"
#define FNTNAME_MATH FONTNAME_MATH
// symbolic names used as array indices
-#define SIZ_BEGIN 0
-#define SIZ_TEXT 0
-#define SIZ_INDEX 1
-#define SIZ_FUNCTION 2
-#define SIZ_OPERATOR 3
-#define SIZ_LIMITS 4
-#define SIZ_END 4
+#define SIZ_BEGIN 0
+#define SIZ_TEXT 0
+#define SIZ_INDEX 1
+#define SIZ_FUNCTION 2
+#define SIZ_OPERATOR 3
+#define SIZ_LIMITS 4
+#define SIZ_END 4
// symbolic names used as array indices
-#define FNT_BEGIN 0
-#define FNT_VARIABLE 0
-#define FNT_FUNCTION 1
-#define FNT_NUMBER 2
-#define FNT_TEXT 3
-#define FNT_SERIF 4
-#define FNT_SANS 5
-#define FNT_FIXED 6
-#define FNT_MATH 7
-#define FNT_END 7
+#define FNT_BEGIN 0
+#define FNT_VARIABLE 0
+#define FNT_FUNCTION 1
+#define FNT_NUMBER 2
+#define FNT_TEXT 3
+#define FNT_SERIF 4
+#define FNT_SANS 5
+#define FNT_FIXED 6
+#define FNT_MATH 7
+#define FNT_END 7
// symbolic names used as array indices
-#define DIS_BEGIN 0
-#define DIS_HORIZONTAL 0
-#define DIS_VERTICAL 1
-#define DIS_ROOT 2
-#define DIS_SUPERSCRIPT 3
-#define DIS_SUBSCRIPT 4
-#define DIS_NUMERATOR 5
-#define DIS_DENOMINATOR 6
-#define DIS_FRACTION 7
-#define DIS_STROKEWIDTH 8
-#define DIS_UPPERLIMIT 9
-#define DIS_LOWERLIMIT 10
-#define DIS_BRACKETSIZE 11
-#define DIS_BRACKETSPACE 12
-#define DIS_MATRIXROW 13
-#define DIS_MATRIXCOL 14
-#define DIS_ORNAMENTSIZE 15
-#define DIS_ORNAMENTSPACE 16
-#define DIS_OPERATORSIZE 17
-#define DIS_OPERATORSPACE 18
-#define DIS_LEFTSPACE 19
-#define DIS_RIGHTSPACE 20
-#define DIS_TOPSPACE 21
-#define DIS_BOTTOMSPACE 22
-#define DIS_NORMALBRACKETSIZE 23
-#define DIS_END 23
+#define DIS_BEGIN 0
+#define DIS_HORIZONTAL 0
+#define DIS_VERTICAL 1
+#define DIS_ROOT 2
+#define DIS_SUPERSCRIPT 3
+#define DIS_SUBSCRIPT 4
+#define DIS_NUMERATOR 5
+#define DIS_DENOMINATOR 6
+#define DIS_FRACTION 7
+#define DIS_STROKEWIDTH 8
+#define DIS_UPPERLIMIT 9
+#define DIS_LOWERLIMIT 10
+#define DIS_BRACKETSIZE 11
+#define DIS_BRACKETSPACE 12
+#define DIS_MATRIXROW 13
+#define DIS_MATRIXCOL 14
+#define DIS_ORNAMENTSIZE 15
+#define DIS_ORNAMENTSPACE 16
+#define DIS_OPERATORSIZE 17
+#define DIS_OPERATORSPACE 18
+#define DIS_LEFTSPACE 19
+#define DIS_RIGHTSPACE 20
+#define DIS_TOPSPACE 21
+#define DIS_BOTTOMSPACE 22
+#define DIS_NORMALBRACKETSIZE 23
+#define DIS_END 23
// to be broadcastet on format changes:
-#define HINT_FORMATCHANGED 10003
+#define HINT_FORMATCHANGED 10003
-enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
+enum SmHorAlign { AlignLeft, AlignCenter, AlignRight };
String GetDefaultFontName( LanguageType nLang, USHORT nIdent );
class SmFormat : public SfxBroadcaster
{
- SmFace vFont[FNT_END + 1];
+ SmFace vFont[FNT_END + 1];
BOOL bDefaultFont[FNT_END + 1];
- Size aBaseSize;
- long nVersion;
- USHORT vSize[SIZ_END + 1];
- USHORT vDist[DIS_END + 1];
- SmHorAlign eHorAlign;
+ Size aBaseSize;
+ long nVersion;
+ USHORT vSize[SIZ_END + 1];
+ USHORT vDist[DIS_END + 1];
+ SmHorAlign eHorAlign;
INT16 nGreekCharStyle;
- BOOL bIsTextmode,
+ BOOL bIsTextmode,
bScaleNormalBrackets;
public:
SmFormat();
SmFormat(const SmFormat &rFormat) : SfxBroadcaster() { *this = rFormat; }
- const Size & GetBaseSize() const { return aBaseSize; }
- void SetBaseSize(const Size &rSize) { aBaseSize = rSize; }
+ 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);
@@ -128,30 +128,30 @@ public:
void SetDefaultFont(USHORT nIdent, BOOL bVal) { bDefaultFont[nIdent] = bVal; }
BOOL IsDefaultFont(USHORT nIdent) const { return bDefaultFont[nIdent]; }
- USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; }
- void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;}
-
- USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; }
- void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; }
+ USHORT GetRelSize(USHORT nIdent) const { return vSize[nIdent]; }
+ void SetRelSize(USHORT nIdent, USHORT nVal) { vSize[nIdent] = nVal;}
- SmHorAlign GetHorAlign() const { return eHorAlign; }
- void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; }
+ USHORT GetDistance(USHORT nIdent) const { return vDist[nIdent]; }
+ void SetDistance(USHORT nIdent, USHORT nVal) { vDist[nIdent] = nVal; }
- BOOL IsTextmode() const { return bIsTextmode; }
- void SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
+ SmHorAlign GetHorAlign() const { return eHorAlign; }
+ void SetHorAlign(SmHorAlign eAlign) { eHorAlign = eAlign; }
+ BOOL IsTextmode() const { return bIsTextmode; }
+ void SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
+
INT16 GetGreekCharStyle() const { return nGreekCharStyle; }
void SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
- BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; }
- void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
+ BOOL IsScaleNormalBrackets() const { return bScaleNormalBrackets; }
+ void SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
- long GetVersion() const { return nVersion; }
+ long GetVersion() const { return nVersion; }
//! at time (5.1) use only the lower byte!!!
- void SetVersion(long nVer) { nVersion = nVer; }
+ void SetVersion(long nVer) { nVersion = nVer; }
- SmFormat & operator = (const SmFormat &rFormat);
+ SmFormat & operator = (const SmFormat &rFormat);
BOOL operator == (const SmFormat &rFormat) const;
inline BOOL operator != (const SmFormat &rFormat) const;
@@ -162,7 +162,7 @@ public:
}
};
-
+
inline BOOL SmFormat::operator != (const SmFormat &rFormat) const
{
return !(*this == rFormat);
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index a8589c682dd4..153db2d38c05 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -60,27 +60,27 @@
#include "format.hxx"
-#define ATTR_BOLD 0x0001
-#define ATTR_ITALIC 0x0002
+#define ATTR_BOLD 0x0001
+#define ATTR_ITALIC 0x0002
-#define FNTSIZ_ABSOLUT 1
-#define FNTSIZ_PLUS 2
-#define FNTSIZ_MINUS 3
+#define FNTSIZ_ABSOLUT 1
+#define FNTSIZ_PLUS 2
+#define FNTSIZ_MINUS 3
#define FNTSIZ_MULTIPLY 4
-#define FNTSIZ_DIVIDE 5
+#define FNTSIZ_DIVIDE 5
// flags to interdict respective status changes
-#define FLG_FONT 0x0001
-#define FLG_SIZE 0x0002
-#define FLG_BOLD 0x0004
-#define FLG_ITALIC 0x0008
-#define FLG_COLOR 0x0010
-#define FLG_VISIBLE 0x0020
-#define FLG_HORALIGN 0x0040
+#define FLG_FONT 0x0001
+#define FLG_SIZE 0x0002
+#define FLG_BOLD 0x0004
+#define FLG_ITALIC 0x0008
+#define FLG_COLOR 0x0010
+#define FLG_VISIBLE 0x0020
+#define FLG_HORALIGN 0x0040
-extern SmFormat *pActiveFormat;
+extern SmFormat *pActiveFormat;
class SmVisitor;
class SmDocShell;
@@ -93,14 +93,14 @@ typedef std::vector< SmStructureNode * > SmStructureNodeArray;
////////////////////////////////////////////////////////////////////////////////
-enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT };
+enum SmScaleMode { SCALE_NONE, SCALE_WIDTH, SCALE_HEIGHT };
enum SmNodeType
{
- NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN,
- NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER,
- NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT,
- NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
+ NTABLE, NBRACE, NBRACEBODY, NOPER, NALIGN,
+ NATTRIBUT, NFONT, NUNHOR, NBINHOR, NBINVER,
+ NBINDIAGONAL, NSUBSUP, NMATRIX, NPLACE, NTEXT,
+ NSPECIAL, NGLYPH_SPECIAL, NMATH, NBLANK, NERROR,
NLINE, NEXPRESSION, NPOLYLINE, NROOT, NROOTSYMBOL,
NRECTANGLE, NVERTICAL_BRACE
};
@@ -111,15 +111,15 @@ enum SmNodeType
class SmNode : public SmRect
{
- SmFace aFace;
+ SmFace aFace;
- SmToken aNodeToken;
- SmNodeType eType;
- SmScaleMode eScaleMode;
- RectHorAlign eRectHorAlign;
- USHORT nFlags,
+ SmToken aNodeToken;
+ SmNodeType eType;
+ SmScaleMode eScaleMode;
+ RectHorAlign eRectHorAlign;
+ USHORT nFlags,
nAttributes;
- BOOL bIsPhantom,
+ BOOL bIsPhantom,
bIsDebug;
BOOL bIsSelected;
@@ -131,7 +131,7 @@ protected:
sal_Int32 nAccIndex;
public:
- virtual ~SmNode();
+ virtual ~SmNode();
virtual BOOL IsVisible() const;
@@ -142,14 +142,14 @@ public:
return ((SmNode *) this)->GetSubNode(nIndex);
}
- virtual SmNode * GetLeftMost();
+ virtual SmNode * GetLeftMost();
const SmNode * GetLeftMost() const
{
return ((SmNode *) this)->GetLeftMost();
}
- USHORT & Flags() { return nFlags; }
- USHORT & Attributes() { return nAttributes; }
+ USHORT & Flags() { return nFlags; }
+ USHORT & Attributes() { return nAttributes; }
BOOL IsDebug() const { return bIsDebug; }
BOOL IsPhantom() const { return bIsPhantom; }
@@ -160,7 +160,7 @@ public:
void ClearAttribut(USHORT nAttrib);
const SmFace & GetFont() const { return aFace; };
- SmFace & GetFont() { return aFace; };
+ SmFace & GetFont() { return aFace; };
void SetFont(const SmFace &rFace);
void SetFontSize(const Fraction &rRelSize, USHORT nType);
@@ -177,7 +177,7 @@ public:
RectHorAlign GetRectHorAlign() const { return eRectHorAlign; }
const SmRect & GetRect() const { return *this; }
- SmRect & GetRect() { return *this; }
+ SmRect & GetRect() { return *this; }
virtual void Move(const Point &rPosition);
void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); }
@@ -192,20 +192,20 @@ 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; }
+ USHORT GetRow() const { return (USHORT)aNodeToken.nRow; }
+ USHORT GetColumn() const { return (USHORT)aNodeToken.nCol; }
- SmScaleMode GetScaleMode() const { return eScaleMode; }
- void SetScaleMode(SmScaleMode eMode) { eScaleMode = eMode; }
+ 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);
- SmNodeType GetType() const { return eType; }
- const SmToken & GetToken() const { return aNodeToken; }
+ SmNodeType GetType() const { return eType; }
+ const SmToken & GetToken() const { return aNodeToken; }
- const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
- const SmNode * FindRectClosestTo(const Point &rPoint) const;
+ const SmNode * FindTokenAt(USHORT nRow, USHORT nCol) const;
+ const SmNode * FindRectClosestTo(const Point &rPoint) const;
/** Accept a visitor
* Calls the method for this class on the visitor
@@ -252,8 +252,8 @@ protected:
/** Sets parent on children of this node */
void ClaimPaternity(){
SmNode* pNode;
- USHORT nSize = GetNumSubNodes();
- for (USHORT i = 0; i < nSize; i++)
+ USHORT nSize = GetNumSubNodes();
+ for (USHORT i = 0; i < nSize; i++)
if (NULL != (pNode = GetSubNode(i)))
pNode->SetParent((SmStructureNode*)this); //Cast is valid if we have children
}
@@ -334,20 +334,20 @@ class SmStructureNode : public SmNode
protected:
SmStructureNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmNode(eNodeType, rNodeToken)
+ : SmNode(eNodeType, rNodeToken)
{}
public:
SmStructureNode( const SmStructureNode &rNode );
virtual ~SmStructureNode();
- virtual BOOL IsVisible() const;
+ virtual BOOL IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
+ virtual USHORT GetNumSubNodes() const;
void SetNumSubNodes(USHORT nSize) { aSubNodes.resize(nSize); }
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(USHORT nIndex);
void SetSubNodes(SmNode *pFirst, SmNode *pSecond, SmNode *pThird = NULL);
void SetSubNodes(const SmNodeArray &rNodeArray);
@@ -381,15 +381,15 @@ class SmVisibleNode : public SmNode
{
protected:
SmVisibleNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmNode(eNodeType, rNodeToken)
+ : SmNode(eNodeType, rNodeToken)
{}
public:
- virtual BOOL IsVisible() const;
- virtual USHORT GetNumSubNodes() const;
+ virtual BOOL IsVisible() const;
+ virtual USHORT GetNumSubNodes() const;
using SmNode::GetSubNode;
- virtual SmNode * GetSubNode(USHORT nIndex);
+ virtual SmNode * GetSubNode(USHORT nIndex);
};
@@ -400,7 +400,7 @@ class SmGraphicNode : public SmVisibleNode
{
protected:
SmGraphicNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmVisibleNode(eNodeType, rNodeToken)
+ : SmVisibleNode(eNodeType, rNodeToken)
{}
public:
@@ -421,7 +421,7 @@ class SmRectangleNode : public SmGraphicNode
public:
SmRectangleNode(const SmToken &rNodeToken)
- : SmGraphicNode(NRECTANGLE, rNodeToken)
+ : SmGraphicNode(NRECTANGLE, rNodeToken)
{}
virtual void AdaptToX(const OutputDevice &rDev, ULONG nWidth);
@@ -446,14 +446,14 @@ public:
*/
class SmPolyLineNode : public SmGraphicNode
{
- Polygon aPoly;
- Size aToSize;
- long nWidth;
+ Polygon aPoly;
+ Size aToSize;
+ long nWidth;
public:
SmPolyLineNode(const SmToken &rNodeToken);
- long GetWidth() const { return nWidth; }
+ long GetWidth() const { return nWidth; }
Size GetToSize() const { return aToSize; }
Polygon &GetPolygon() { return aPoly; }
@@ -495,9 +495,9 @@ protected:
public:
SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP );
- USHORT GetFontDesc() const { return nFontDesc; }
- void SetText(const XubString &rText) { aText = rText; }
- const XubString & GetText() const { return aText; }
+ USHORT 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 */
void ChangeText(const XubString &rText) {
aText = rText;
@@ -580,7 +580,7 @@ class SmGlyphSpecialNode : public SmSpecialNode
{
public:
SmGlyphSpecialNode(const SmToken &rNodeToken)
- : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
+ : SmSpecialNode(NGLYPH_SPECIAL, rNodeToken, FNT_MATH)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -598,7 +598,7 @@ class SmMathSymbolNode : public SmSpecialNode
{
protected:
SmMathSymbolNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
+ : SmSpecialNode(eNodeType, rNodeToken, FNT_MATH)
{
xub_Unicode cChar = GetToken().cMathChar;
if ((xub_Unicode) '\0' != cChar)
@@ -659,7 +659,7 @@ class SmPlaceNode : public SmMathSymbolNode
{
public:
SmPlaceNode(const SmToken &rNodeToken)
- : SmMathSymbolNode(NPLACE, rNodeToken)
+ : SmMathSymbolNode(NPLACE, rNodeToken)
{
}
SmPlaceNode() : SmMathSymbolNode(NPLACE, SmToken(TPLACE, MS_PLACE, "<?>")) {};
@@ -681,7 +681,7 @@ class SmErrorNode : public SmMathSymbolNode
{
public:
SmErrorNode(SmParseError /*eError*/, const SmToken &rNodeToken)
- : SmMathSymbolNode(NERROR, rNodeToken)
+ : SmMathSymbolNode(NERROR, rNodeToken)
{
SetText((xub_Unicode) MS_ERROR);
}
@@ -705,7 +705,7 @@ class SmTableNode : public SmStructureNode
{
public:
SmTableNode(const SmToken &rNodeToken)
- : SmStructureNode(NTABLE, rNodeToken)
+ : SmStructureNode(NTABLE, rNodeToken)
{}
using SmNode::GetLeftMost;
@@ -729,14 +729,14 @@ class SmLineNode : public SmStructureNode
protected:
SmLineNode(SmNodeType eNodeType, const SmToken &rNodeToken)
- : SmStructureNode(eNodeType, rNodeToken)
+ : SmStructureNode(eNodeType, rNodeToken)
{
bUseExtraSpaces = TRUE;
}
public:
SmLineNode(const SmToken &rNodeToken)
- : SmStructureNode(NLINE, rNodeToken)
+ : SmStructureNode(NLINE, rNodeToken)
{
bUseExtraSpaces = TRUE;
}
@@ -762,7 +762,7 @@ class SmExpressionNode : public SmLineNode
{
public:
SmExpressionNode(const SmToken &rNodeToken)
- : SmLineNode(NEXPRESSION, rNodeToken)
+ : SmLineNode(NEXPRESSION, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -781,7 +781,7 @@ class SmUnHorNode : public SmStructureNode
{
public:
SmUnHorNode(const SmToken &rNodeToken)
- : SmStructureNode(NUNHOR, rNodeToken)
+ : SmStructureNode(NUNHOR, rNodeToken)
{
SetNumSubNodes(2);
}
@@ -813,7 +813,7 @@ protected:
public:
SmRootNode(const SmToken &rNodeToken)
- : SmStructureNode(NROOT, rNodeToken)
+ : SmStructureNode(NROOT, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -841,7 +841,7 @@ class SmBinHorNode : public SmStructureNode
{
public:
SmBinHorNode(const SmToken &rNodeToken)
- : SmStructureNode(NBINHOR, rNodeToken)
+ : SmStructureNode(NBINHOR, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -869,7 +869,7 @@ class SmBinVerNode : public SmStructureNode
{
public:
SmBinVerNode(const SmToken &rNodeToken)
- : SmStructureNode(NBINVER, rNodeToken)
+ : SmStructureNode(NBINVER, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -897,16 +897,16 @@ public:
*/
class SmBinDiagonalNode : public SmStructureNode
{
- BOOL bAscending;
+ BOOL bAscending;
- void GetOperPosSize(Point &rPos, Size &rSize,
+ void GetOperPosSize(Point &rPos, Size &rSize,
const Point &rDiagPoint, double fAngleDeg) const;
public:
SmBinDiagonalNode(const SmToken &rNodeToken);
- BOOL IsAscending() const { return bAscending; }
- void SetAscending(BOOL bVal) { bAscending = bVal; }
+ BOOL IsAscending() const { return bAscending; }
+ void SetAscending(BOOL bVal) { bAscending = bVal; }
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
void Accept(SmVisitor* pVisitor);
@@ -922,19 +922,19 @@ public:
* See graphic for positions at char:
*
* \code
- * CSUP
+ * CSUP
*
* LSUP H H RSUP
- * H H
- * HHHH
- * H H
+ * H H
+ * HHHH
+ * H H
* LSUB H H RSUB
*
- * CSUB
+ * CSUB
* \endcode
*/
enum SmSubSup
-{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP
+{ CSUB, CSUP, RSUB, RSUP, LSUB, LSUP
};
/** numbers of entries in the above enum (that is: the number of possible
@@ -962,14 +962,14 @@ class SmSubSupNode : public SmStructureNode
public:
SmSubSupNode(const SmToken &rNodeToken)
- : SmStructureNode(NSUBSUP, rNodeToken)
+ : SmStructureNode(NSUBSUP, rNodeToken)
{
SetNumSubNodes(1 + SUBSUP_NUM_ENTRIES);
bUseLimits = FALSE;
}
/** Get body (Not NULL) */
- SmNode * GetBody() { return GetSubNode(0); }
+ SmNode * GetBody() { return GetSubNode(0); }
/** Get body (Not NULL) */
const SmNode * GetBody() const
{
@@ -1016,7 +1016,7 @@ class SmBraceNode : public SmStructureNode
{
public:
SmBraceNode(const SmToken &rNodeToken)
- : SmStructureNode(NBRACE, rNodeToken)
+ : SmStructureNode(NBRACE, rNodeToken)
{
SetNumSubNodes(3);
}
@@ -1045,8 +1045,8 @@ class SmBracebodyNode : public SmStructureNode
public:
inline SmBracebodyNode(const SmToken &rNodeToken);
- virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
- long GetBodyHeight() const { return nBodyHeight; }
+ virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ long GetBodyHeight() const { return nBodyHeight; }
void Accept(SmVisitor* pVisitor);
};
@@ -1077,7 +1077,7 @@ class SmVerticalBraceNode : public SmStructureNode
public:
inline SmVerticalBraceNode(const SmToken &rNodeToken);
- virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
+ virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
void Accept(SmVisitor* pVisitor);
};
@@ -1108,12 +1108,12 @@ class SmOperNode : public SmStructureNode
{
public:
SmOperNode(const SmToken &rNodeToken)
- : SmStructureNode(NOPER, rNodeToken)
+ : SmStructureNode(NOPER, rNodeToken)
{
SetNumSubNodes(2);
}
- SmNode * GetSymbol();
+ SmNode * GetSymbol();
const SmNode * GetSymbol() const
{
return ((SmOperNode *) this)->GetSymbol();
@@ -1134,7 +1134,7 @@ class SmAlignNode : public SmStructureNode
{
public:
SmAlignNode(const SmToken &rNodeToken)
- : SmStructureNode(NALIGN, rNodeToken)
+ : SmStructureNode(NALIGN, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -1158,7 +1158,7 @@ class SmAttributNode : public SmStructureNode
{
public:
SmAttributNode(const SmToken &rNodeToken)
- : SmStructureNode(NATTRIBUT, rNodeToken)
+ : SmStructureNode(NATTRIBUT, rNodeToken)
{}
virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
@@ -1175,12 +1175,12 @@ public:
*/
class SmFontNode : public SmStructureNode
{
- USHORT nSizeType;
- Fraction aFontSize;
+ USHORT nSizeType;
+ Fraction aFontSize;
public:
SmFontNode(const SmToken &rNodeToken)
- : SmStructureNode(NFONT, rNodeToken)
+ : SmStructureNode(NFONT, rNodeToken)
{
nSizeType = FNTSIZ_MULTIPLY;
aFontSize = Fraction(1L);
@@ -1206,12 +1206,12 @@ public:
*/
class SmMatrixNode : public SmStructureNode
{
- USHORT nNumRows,
+ USHORT nNumRows,
nNumCols;
public:
SmMatrixNode(const SmToken &rNodeToken)
- : SmStructureNode(NMATRIX, rNodeToken)
+ : SmStructureNode(NMATRIX, rNodeToken)
{
nNumRows = nNumCols = 0;
}
@@ -1237,17 +1237,17 @@ public:
*/
class SmBlankNode : public SmGraphicNode
{
- USHORT nNum;
+ USHORT nNum;
public:
SmBlankNode(const SmToken &rNodeToken)
- : SmGraphicNode(NBLANK, rNodeToken)
+ : SmGraphicNode(NBLANK, rNodeToken)
{
nNum = 0;
}
void IncreaseBy(const SmToken &rToken);
- void Clear() { nNum = 0; }
+ void Clear() { nNum = 0; }
USHORT GetBlankNum() const { return nNum; }
void SetBlankNum(USHORT nNumber) { nNum = nNumber; }
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 5018340b5a01..f549abf4c285 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -41,87 +41,87 @@ class SmDocShell;
// TokenGroups
-#define TGOPER 0x00000001
-#define TGRELATION 0x00000002
-#define TGSUM 0x00000004
-#define TGPRODUCT 0x00000008
-#define TGUNOPER 0x00000010
-#define TGPOWER 0x00000020
-#define TGATTRIBUT 0x00000040
-#define TGALIGN 0x00000080
-#define TGFUNCTION 0x00000100
-#define TGBLANK 0x00000200
-#define TGLBRACES 0x00000400
-#define TGRBRACES 0x00000800
-#define TGCOLOR 0x00001000
-#define TGFONT 0x00002000
-#define TGSTANDALONE 0x00004000
-#define TGDISCARDED 0x00008000
-#define TGLIMIT 0x00010000
-#define TGFONTATTR 0x00020000
+#define TGOPER 0x00000001
+#define TGRELATION 0x00000002
+#define TGSUM 0x00000004
+#define TGPRODUCT 0x00000008
+#define TGUNOPER 0x00000010
+#define TGPOWER 0x00000020
+#define TGATTRIBUT 0x00000040
+#define TGALIGN 0x00000080
+#define TGFUNCTION 0x00000100
+#define TGBLANK 0x00000200
+#define TGLBRACES 0x00000400
+#define TGRBRACES 0x00000800
+#define TGCOLOR 0x00001000
+#define TGFONT 0x00002000
+#define TGSTANDALONE 0x00004000
+#define TGDISCARDED 0x00008000
+#define TGLIMIT 0x00010000
+#define TGFONTATTR 0x00020000
enum SmTokenType
{
- TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT,
- TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY,
- TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH,
- TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP,
- TCSUB, TCSUP, TLSUB, TLSUP, TGT,
- TLT, TAND, TOR, TINTERSECT, TUNION,
- TNEWLINE, TBINOM, TFROM, TTO, TINT,
- TSUM, TOPER, TABS, TSQRT, TFACT,
- TNROOT, TOVER, TTIMES, TGE, TLE,
- TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT,
- TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR,
- TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT,
- TDDDOT, TGRAVE, THAT, TTILDE, TVEC,
- TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC,
- TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE,
- TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT,
- TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE,
- TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE,
- TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR,
- TSIN, TCOS, TTAN, TCOT, TFUNC,
- TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE,
- TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ,
- TEQUIV, TDEF, TPROP, TSIM, TSIMEQ,
- TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN,
- TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS,
- TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
- TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
- TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
- TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
- TSINH, TCOSH, TTANH, TCOTH, TASIN,
- TACOS, TATAN, TLN, TLOG, TUOPER,
- TBOPER, TBLACK, TWHITE, TRED, TGREEN,
- TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,
- TSANS, TSERIF, TPOINT, TASINH, TACOSH,
- TATANH, TACOTH, TACOT, TEXP, TCDOT,
- TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
- TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI,
- TBACKEPSILON, TALEPH, TIM, TRE, TWP,
- TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF,
- TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE,
- TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR,
- TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES,
- TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR,
- TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH,
- TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
- TUNKNOWN, TDEBUG
+ TEND, TLGROUP, TRGROUP, TLPARENT, TRPARENT,
+ TLBRACKET, TRBRACKET, TPLUS, TMINUS, TMULTIPLY,
+ TDIVIDEBY, TASSIGN, TPOUND, TSPECIAL, TSLASH,
+ TBACKSLASH, TBLANK, TSBLANK, TRSUB, TRSUP,
+ TCSUB, TCSUP, TLSUB, TLSUP, TGT,
+ TLT, TAND, TOR, TINTERSECT, TUNION,
+ TNEWLINE, TBINOM, TFROM, TTO, TINT,
+ TSUM, TOPER, TABS, TSQRT, TFACT,
+ TNROOT, TOVER, TTIMES, TGE, TLE,
+ TGG, TLL, TDOTSAXIS, TDOTSLOW, TDOTSVERT,
+ TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR,
+ TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT,
+ TDDDOT, TGRAVE, THAT, TTILDE, TVEC,
+ TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC,
+ TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE,
+ TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT,
+ TRIGHT, TLANGLE, TLBRACE, TLLINE, TLDLINE,
+ TLCEIL, TLFLOOR, TNONE, TMLINE, TRANGLE,
+ TRBRACE, TRLINE, TRDLINE, TRCEIL, TRFLOOR,
+ TSIN, TCOS, TTAN, TCOT, TFUNC,
+ TSTACK, TMATRIX, TMATFORM, TDPOUND, TPLACE,
+ TTEXT, TNUMBER, TCHARACTER, TIDENT, TNEQ,
+ TEQUIV, TDEF, TPROP, TSIM, TSIMEQ,
+ TAPPROX, TPARALLEL, TORTHO, TIN, TNOTIN,
+ TSUBSET, TSUBSETEQ, TSUPSET, TSUPSETEQ, TPLUSMINUS,
+ TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
+ TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
+ TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
+ TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
+ TSINH, TCOSH, TTANH, TCOTH, TASIN,
+ TACOS, TATAN, TLN, TLOG, TUOPER,
+ TBOPER, TBLACK, TWHITE, TRED, TGREEN,
+ TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,
+ TSANS, TSERIF, TPOINT, TASINH, TACOSH,
+ TATANH, TACOTH, TACOT, TEXP, TCDOT,
+ TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,
+ TNSUBSETEQ, TNSUPSETEQ, TPARTIAL, TNEG, TNI,
+ TBACKEPSILON, TALEPH, TIM, TRE, TWP,
+ TEMPTYSET, TINFINITY, TESCAPE, TLIMSUP, TLIMINF,
+ TNDIVIDES, TDRARROW, TDLARROW, TDLRARROW, TUNDERBRACE,
+ TOVERBRACE, TCIRC, TTOP, THBAR, TLAMBDABAR,
+ TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES,
+ TNDIBVIDES, TSETN, TSETZ, TSETQ, TSETR,
+ TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, TWIDESLASH,
+ TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
+ TUNKNOWN, TDEBUG
};
struct SmToken
{
// token text
- String aText;
+ String aText;
// token info
SmTokenType eType;
- sal_Unicode cMathChar;
+ sal_Unicode cMathChar;
// parse-help info
- ULONG nGroup;
- USHORT nLevel;
+ ULONG nGroup;
+ USHORT nLevel;
// token position
USHORT nRow;
xub_StrLen nCol;
@@ -137,16 +137,16 @@ struct SmToken
enum SmParseError
{
- PE_NONE, PE_UNEXPECTED_END_OF_INPUT,
- PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN,
- PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED,
- PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED,
- PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED,
- PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED,
- PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED,
- PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH,
- PE_RIGHT_EXPECTED, PE_FONT_EXPECTED,
- PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN,
+ PE_NONE, PE_UNEXPECTED_END_OF_INPUT,
+ PE_UNEXPECTED_CHAR, PE_UNEXPECTED_TOKEN,
+ PE_FUNC_EXPECTED, PE_UNOPER_EXPECTED,
+ PE_BINOPER_EXPECTED, PE_SYMBOL_EXPECTED,
+ PE_IDENTIFIER_EXPECTED, PE_POUND_EXPECTED,
+ PE_COLOR_EXPECTED, PE_LGROUP_EXPECTED,
+ PE_RGROUP_EXPECTED, PE_LBRACE_EXPECTED,
+ PE_RBRACE_EXPECTED, PE_PARENT_MISMATCH,
+ PE_RIGHT_EXPECTED, PE_FONT_EXPECTED,
+ PE_SIZE_EXPECTED, PE_DOUBLE_ALIGN,
PE_DOUBLE_SUBSUPSCRIPT
};
@@ -154,8 +154,8 @@ enum SmParseError
struct SmErrorDesc
{
SmParseError Type;
- SmNode *pNode;
- String Text;
+ SmNode *pNode;
+ String Text;
};
DECLARE_STACK(SmNodeStack, SmNode *)
@@ -175,11 +175,11 @@ enum SmConvert
struct SmTokenTableEntry
{
- const sal_Char* pIdent;
- SmTokenType eType;
- sal_Unicode cMathChar;
- ULONG nGroup;
- USHORT nLevel;
+ const sal_Char* pIdent;
+ SmTokenType eType;
+ sal_Unicode cMathChar;
+ ULONG nGroup;
+ USHORT nLevel;
};
class SmParser
@@ -204,57 +204,57 @@ class SmParser
protected:
#if OSL_DEBUG_LEVEL
- BOOL IsDelimiter( const String &rTxt, xub_StrLen nPos );
+ 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 NextToken();
+ xub_StrLen GetTokenIndex() const { return nTokenIndex; }
+ void Insert(const String &rText, USHORT nPos);
void Replace( USHORT nPos, USHORT nLen, const String &rText );
- inline BOOL TokenInGroup(ULONG nGroup);
+ inline BOOL TokenInGroup(ULONG nGroup);
// grammar
- void Table();
- void Line();
- void Expression();
- void Relation();
- void Sum();
- void Product();
- void SubSup(ULONG nActiveGroup);
- void OpSubSup();
- void Power();
- void Blank();
- void Term();
- void Escape();
- void Operator();
- void Oper();
- void UnOper();
- void Align();
- void FontAttribut();
- void Attribut();
- void Font();
- void FontSize();
- void Color();
- void Brace();
- void Bracebody(BOOL bIsLeftRight);
- void Function();
- void Binom();
- void Stack();
- void Matrix();
- void Special();
- void GlyphSpecial();
+ void Table();
+ void Line();
+ void Expression();
+ void Relation();
+ void Sum();
+ void Product();
+ void SubSup(ULONG nActiveGroup);
+ void OpSubSup();
+ void Power();
+ void Blank();
+ void Term();
+ void Escape();
+ void Operator();
+ void Oper();
+ void UnOper();
+ void Align();
+ void FontAttribut();
+ void Attribut();
+ void Font();
+ void FontSize();
+ void Color();
+ void Brace();
+ void Bracebody(BOOL bIsLeftRight);
+ void Function();
+ void Binom();
+ void Stack();
+ void Matrix();
+ void Special();
+ void GlyphSpecial();
// end of grammar
LanguageType GetLanguage() const { return nLang; }
void SetLanguage( LanguageType nNewLang ) { nLang = nNewLang; }
- void Error(SmParseError Error);
+ void Error(SmParseError Error);
public:
SmParser();
/** Parse rBuffer to formula tree */
- SmNode *Parse(const String &rBuffer);
+ SmNode *Parse(const String &rBuffer);
/** Parse rBuffer to formula subtree that constitutes an expression */
SmNode *ParseExpression(const String &rBuffer);
@@ -268,11 +268,11 @@ public:
BOOL IsExportSymbolNames() const { return bExportSymNames; }
void SetExportSymbolNames(BOOL bVal) { bExportSymNames = bVal; }
- USHORT AddError(SmParseError Type, SmNode *pNode);
+ USHORT AddError(SmParseError Type, SmNode *pNode);
- const SmErrorDesc * NextError();
- const SmErrorDesc * PrevError();
- const SmErrorDesc * GetError(USHORT i = 0xFFFF);
+ const SmErrorDesc * NextError();
+ const SmErrorDesc * PrevError();
+ const SmErrorDesc * GetError(USHORT i = 0xFFFF);
static const SmTokenTableEntry* GetTokenTableEntry( const String &rName );
};
diff --git a/starmath/inc/pch/precompiled_starmath.cxx b/starmath/inc/pch/precompiled_starmath.cxx
index c25af02d9f18..1af681bd3ea4 100644
--- a/starmath/inc/pch/precompiled_starmath.cxx
+++ b/starmath/inc/pch/precompiled_starmath.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/starmath/inc/pch/precompiled_starmath.hxx b/starmath/inc/pch/precompiled_starmath.hxx
index 7d2363e50a94..d258e8125c6e 100644
--- a/starmath/inc/pch/precompiled_starmath.hxx
+++ b/starmath/inc/pch/precompiled_starmath.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx
index fdd12dd86669..16a61eae888f 100644
--- a/starmath/inc/rect.hxx
+++ b/starmath/inc/rect.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -60,41 +60,41 @@ inline long SmFromTo(long nFrom, long nTo, double fRelDist)
//
// possible flags for the 'Draw' function below (just for debugging)
-#define SM_RECT_CORE 0x0001
-#define SM_RECT_ITALIC 0x0002
-#define SM_RECT_LINES 0x0004
-#define SM_RECT_MID 0x0008
+#define SM_RECT_CORE 0x0001
+#define SM_RECT_ITALIC 0x0002
+#define SM_RECT_LINES 0x0004
+#define SM_RECT_MID 0x0008
// possible positions and alignments for the 'AlignTo' function
enum RectPos
// (RP_LEFT : align the current object to the left of the argument, ...)
-{ RP_LEFT, RP_RIGHT,
+{ RP_LEFT, RP_RIGHT,
RP_TOP, RP_BOTTOM,
RP_ATTRIBUT
};
enum RectHorAlign
-{ RHA_LEFT, RHA_CENTER, RHA_RIGHT
+{ RHA_LEFT, RHA_CENTER, RHA_RIGHT
};
enum RectVerAlign
-{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY,
+{ RVA_TOP, RVA_MID, RVA_BOTTOM, RVA_BASELINE, RVA_CENTERY,
RVA_ATTRIBUT_HI, RVA_ATTRIBUT_MID, RVA_ATTRIBUT_LO
};
// different methods of copying baselines and mid's in 'ExtendBy' function
enum RectCopyMBL
-{ RCP_THIS, // keep baseline of current object even if it has none
- RCP_ARG, // as above but for the argument
- RCP_NONE, // result will have no baseline
- RCP_XOR // if current object has a baseline keep it else copy
- // the arguments baseline (even if it has none)
+{ RCP_THIS, // keep baseline of current object even if it has none
+ RCP_ARG, // as above but for the argument
+ RCP_NONE, // result will have no baseline
+ RCP_XOR // if current object has a baseline keep it else copy
+ // the arguments baseline (even if it has none)
};
class SmRect
{
- Point aTopLeft;
- Size aSize;
- long nBaseline,
+ Point aTopLeft;
+ Size aSize;
+ long nBaseline,
nAlignT,
nAlignM,
nAlignB,
@@ -105,7 +105,7 @@ class SmRect
nLoAttrFence,
nHiAttrFence;
USHORT nBorderWidth;
- BOOL bHasBaseline,
+ BOOL bHasBaseline,
bHasAlignInfo;
protected:
@@ -114,8 +114,8 @@ protected:
void Init(const OutputDevice &rDev, const SmFormat *pFormat,
const XubString &rText, USHORT nBorderWidth);
- void ClearBaseline() { bHasBaseline = FALSE; };
- inline void CopyMBL(const SmRect& rRect);
+ void ClearBaseline() { bHasBaseline = FALSE; };
+ inline void CopyMBL(const SmRect& rRect);
void CopyAlignInfo(const SmRect& rRect);
SmRect & Union(const SmRect &rRect);
@@ -132,64 +132,64 @@ public:
void SetItalicSpaces(long nLeftSpace, long nRightSpace);
- void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; }
- void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; }
+ void SetWidth(ULONG nWidth) { aSize.Width() = nWidth; }
+ void SetHeight(ULONG nHeight) { aSize.Height() = nHeight; }
void SetLeft(long nLeft);
void SetRight(long nRight);
void SetBottom(long nBottom);
void SetTop(long nTop);
- const Point & GetTopLeft() const { return aTopLeft; }
+ const Point & GetTopLeft() const { return aTopLeft; }
- long GetTop() const { return GetTopLeft().Y(); }
- long GetLeft() const { return GetTopLeft().X(); }
- long GetBottom() const { return GetTop() + GetHeight() - 1; }
- long GetRight() const { return GetLeft() + GetWidth() - 1; }
- long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; }
- long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; }
- long GetWidth() const { return GetSize().Width(); }
- long GetHeight() const { return GetSize().Height(); }
+ long GetTop() const { return GetTopLeft().Y(); }
+ long GetLeft() const { return GetTopLeft().X(); }
+ long GetBottom() const { return GetTop() + GetHeight() - 1; }
+ long GetRight() const { return GetLeft() + GetWidth() - 1; }
+ long GetCenterX() const { return (GetLeft() + GetRight()) / 2L; }
+ long GetCenterY() const { return (GetTop() + GetBottom()) / 2L; }
+ long GetWidth() const { return GetSize().Width(); }
+ long GetHeight() const { return GetSize().Height(); }
long GetItalicLeftSpace() const { return nItalicLeftSpace; }
long GetItalicRightSpace() const { return nItalicRightSpace; }
- void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; }
- void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; }
- long GetHiAttrFence() const { return nHiAttrFence; }
- long GetLoAttrFence() const { return nLoAttrFence; }
+ void SetHiAttrFence(long nVal) { nHiAttrFence = nVal; }
+ void SetLoAttrFence(long nVal) { nLoAttrFence = nVal; }
+ long GetHiAttrFence() const { return nHiAttrFence; }
+ long GetLoAttrFence() const { return nLoAttrFence; }
- long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); }
- long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; }
- long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); }
- long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); }
+ long GetItalicLeft() const { return GetLeft() - GetItalicLeftSpace(); }
+ long GetItalicCenterX() const { return (GetItalicLeft() + GetItalicRight()) / 2; }
+ long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); }
+ long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); }
- BOOL HasBaseline() const { return bHasBaseline; }
- inline long GetBaseline() const;
- long GetBaselineOffset() const { return GetBaseline() - GetTop(); }
+ BOOL HasBaseline() const { return bHasBaseline; }
+ inline long GetBaseline() const;
+ long GetBaselineOffset() const { return GetBaseline() - GetTop(); }
void SetAlignTop(long nVal) { nAlignT = nVal; }
- long GetAlignT() const { return nAlignT; }
- long GetAlignM() const { return nAlignM; }
- long GetAlignB() const { return nAlignB; }
+ long GetAlignT() const { return nAlignT; }
+ long GetAlignM() const { return nAlignM; }
+ long GetAlignB() const { return nAlignB; }
void SetAlignT(long nVal) { nAlignT = nVal; }
- const Point GetCenter() const
- { return Point(GetCenterX(), GetCenterY()); }
+ const Point GetCenter() const
+ { return Point(GetCenterX(), GetCenterY()); }
- const Size & GetSize() const { return aSize; }
+ const Size & GetSize() const { return aSize; }
- const Size GetItalicSize() const
- { return Size(GetItalicWidth(), GetHeight()); }
+ const Size GetItalicSize() const
+ { return Size(GetItalicWidth(), GetHeight()); }
void Move (const Point &rPosition);
void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); }
BOOL IsEmpty() const
{
- return GetWidth() == 0 || GetHeight() == 0;
+ return GetWidth() == 0 || GetHeight() == 0;
}
BOOL HasAlignInfo() const { return bHasAlignInfo; }
@@ -203,17 +203,17 @@ public:
SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode,
BOOL bKeepVerAlignParams);
- long OrientedDist(const Point &rPoint) const;
- BOOL IsInsideRect(const Point &rPoint) const;
- BOOL IsInsideItalicRect(const Point &rPoint) const;
+ long OrientedDist(const Point &rPoint) const;
+ BOOL IsInsideRect(const Point &rPoint) const;
+ BOOL IsInsideItalicRect(const Point &rPoint) const;
- inline SmRect & operator = (const SmRect &rRect);
+ inline SmRect & operator = (const SmRect &rRect);
- inline Rectangle AsRectangle() const;
- SmRect AsGlyphRect() const;
+ inline Rectangle AsRectangle() const;
+ SmRect AsGlyphRect() const;
#ifdef SM_RECT_DEBUG
- void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const;
+ void Draw(OutputDevice &rDev, const Point &rPosition, int nFlags) const;
#endif
};
@@ -230,9 +230,9 @@ inline void SmRect::SetItalicSpaces(long nLeftSpace, long nRightSpace)
inline void SmRect::CopyMBL(const SmRect &rRect)
// copy AlignM baseline and value of 'rRect'
{
- nBaseline = rRect.nBaseline;
+ nBaseline = rRect.nBaseline;
bHasBaseline = rRect.bHasBaseline;
- nAlignM = rRect.nAlignM;
+ nAlignM = rRect.nAlignM;
}
@@ -245,7 +245,7 @@ inline long SmRect::GetBaseline() const
inline SmRect & SmRect::operator = (const SmRect &rRect)
{
- new (this) SmRect(rRect); // placement new
+ new (this) SmRect(rRect); // placement new
return *this;
}
diff --git a/starmath/inc/smdll.hxx b/starmath/inc/smdll.hxx
index cc5560764914..25194d47cb63 100644
--- a/starmath/inc/smdll.hxx
+++ b/starmath/inc/smdll.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index f6e1eb205fe1..242b5757d0be 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -91,8 +91,8 @@ public:
class SmLocalizedSymbolData : public Resource
{
- ResStringArray aUiSymbolNamesAry;
- ResStringArray aExportSymbolNamesAry;
+ ResStringArray aUiSymbolNamesAry;
+ ResStringArray aExportSymbolNamesAry;
ResStringArray aUiSymbolSetNamesAry;
ResStringArray aExportSymbolSetNamesAry;
SmNamesArray *p50NamesAry;
@@ -167,9 +167,9 @@ public:
}
//virtuelle Methoden fuer den Optionendialog
- 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( USHORT nId );
+ virtual void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+ virtual SfxTabPage* CreateTabPage( USHORT 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 9be6defc3964..ed670d8d1fba 100644
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -31,110 +31,110 @@
#include <sfx2/sfxsids.hrc>
#include <editeng/memberids.hrc>
-#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_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_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_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_ZOOMOUT (SID_SMA_START + 11)
+#define SID_ZOOMOUT (SID_SMA_START + 11)
#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_TOOLBOX (SID_SMA_START + 14)
+#define SID_FORMULACURSOR (SID_SMA_START + 15)
#define SID_FONT (SID_SMA_START + 50)
-#define SID_FONTSIZE (SID_SMA_START + 51)
-#define SID_DISTANCE (SID_SMA_START + 52)
+#define SID_FONTSIZE (SID_SMA_START + 51)
+#define SID_DISTANCE (SID_SMA_START + 52)
#define SID_ALIGN (SID_SMA_START + 53)
-#define SID_AUTO_REDRAW (SID_SMA_START + 55)
-#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
-#define SID_TEXTMODE (SID_SMA_START + 57)
-#define SID_INSERT_FORMULA (SID_SMA_START + 58)
+#define SID_AUTO_REDRAW (SID_SMA_START + 55)
+#define SID_SYMBOLS (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
+#define SID_TEXTMODE (SID_SMA_START + 57)
+#define SID_INSERT_FORMULA (SID_SMA_START + 58)
#define SID_TEXT (SID_SMA_START + 100)
#define SID_GAPHIC_SM (SID_SMA_START + 101)
-#define SID_FITINWINDOW (SID_SMA_START + 103)
+#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)
+#define SID_INSERTSYMBOL (SID_SMA_START + 104)
/** Command for inserting a math construction specified in commands.src */
-#define SID_INSERTCOMMAND (SID_SMA_START + 105)
-
-#define SID_LOADSYMBOLS (SID_SMA_START + 107)
-#define SID_SAVESYMBOLS (SID_SMA_START + 108)
-#define SID_ZOOMSTATUS (SID_SMA_START + 109)
-#define SID_MODIFYSTATUS (SID_SMA_START + 110)
-#define SID_TEXTSTATUS (SID_SMA_START + 111)
-
-#define SID_PRINTTITLE (SID_SMA_START + 112)
-#define SID_PRINTTEXT (SID_SMA_START + 113)
-#define SID_PRINTFRAME (SID_SMA_START + 114)
-#define SID_PRINTSIZE (SID_SMA_START + 115)
-#define SID_PRINTZOOM (SID_SMA_START + 116)
-
-#define SID_COPYOBJECT (SID_SMA_START + 117)
-#define SID_PASTEOBJECT (SID_SMA_START + 118)
-#define SID_AUTOREDRAW (SID_SMA_START + 119)
-
-#define SID_GETEDITTEXT (SID_SMA_START + 121)
-#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_INSERTCOMMAND (SID_SMA_START + 105)
+
+#define SID_LOADSYMBOLS (SID_SMA_START + 107)
+#define SID_SAVESYMBOLS (SID_SMA_START + 108)
+#define SID_ZOOMSTATUS (SID_SMA_START + 109)
+#define SID_MODIFYSTATUS (SID_SMA_START + 110)
+#define SID_TEXTSTATUS (SID_SMA_START + 111)
+
+#define SID_PRINTTITLE (SID_SMA_START + 112)
+#define SID_PRINTTEXT (SID_SMA_START + 113)
+#define SID_PRINTFRAME (SID_SMA_START + 114)
+#define SID_PRINTSIZE (SID_SMA_START + 115)
+#define SID_PRINTZOOM (SID_SMA_START + 116)
+
+#define SID_COPYOBJECT (SID_SMA_START + 117)
+#define SID_PASTEOBJECT (SID_SMA_START + 118)
+#define SID_AUTOREDRAW (SID_SMA_START + 119)
+
+#define SID_GETEDITTEXT (SID_SMA_START + 121)
+#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 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)
-#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
-#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
-#define RID_DISTANCEDIALOG (RID_APP_START + 5)
-#define RID_ALIGNDIALOG (RID_APP_START + 6)
-#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
-#define RID_SYMBOLDIALOG (RID_APP_START + 8)
-#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
-#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
-#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
-
-#define RID_MATH_TOOLBOX (RID_APP_START + 50)
+//#define RID_OPTIONSDIALOG (RID_APP_START + 1)
+#define RID_FONTDIALOG (RID_APP_START + 2)
+#define RID_FONTSIZEDIALOG (RID_APP_START + 3)
+#define RID_FONTTYPEDIALOG (RID_APP_START + 4)
+#define RID_DISTANCEDIALOG (RID_APP_START + 5)
+#define RID_ALIGNDIALOG (RID_APP_START + 6)
+#define RID_PRINTOPTIONPAGE (RID_APP_START + 7)
+#define RID_SYMBOLDIALOG (RID_APP_START + 8)
+#define RID_SYMDEFINEDIALOG (RID_APP_START + 9)
+#define RID_EXTRAOPTIONPAGE (RID_APP_START + 10)
+#define RID_PRINTUIOPTIONS (RID_APP_START + 11)
+
+#define RID_MATH_TOOLBOX (RID_APP_START + 50)
// wegen #58705# entfernt
-//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
+//#define RID_DRAW_OBJECTBAR (RID_APP_START + 51)
-#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
-#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
-#define RID_READSYMBOLERROR (RID_APP_START + 203)
-#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
-#define RID_OBJECTNAME (RID_APP_START + 501)
+#define RID_DEFAULTSAVEQUERY (RID_APP_START + 102)
+#define RID_WRITESYMBOLERROR (RID_APP_START + 202)
+#define RID_READSYMBOLERROR (RID_APP_START + 203)
+#define RID_NOMATHTYPEFACEWARNING (RID_APP_START + 204)
+#define RID_OBJECTNAME (RID_APP_START + 501)
// free
-#define RID_UNDOEDITNAME (RID_APP_START + 503)
-#define RID_UNDOFORMATNAME (RID_APP_START + 504)
-#define RID_APPICO (RID_APP_START + 601)
-#define RID_TMPICO (RID_APP_START + 603)
-#define RID_COMMANDMENU (RID_APP_START + 701)
-#define RID_VIEWMENU (RID_APP_START + 702)
-#define RID_DISTANCEMENU (RID_APP_START + 703)
-#define RID_FONTMENU (RID_APP_START + 704)
-#define RID_STARTUPWINDOW (RID_APP_START + 800)
-#define RID_TOOLBOXWINDOW (RID_APP_START + 801)
-#define RID_CMDBOXWINDOW (RID_APP_START + 802)
-#define RID_FONTREGULAR (RID_APP_START + 804)
-#define RID_FONTITALIC (RID_APP_START + 805)
-#define RID_FONTBOLD (RID_APP_START + 806)
-//#define RID_PRINTOPTION (RID_APP_START + 807)
-#define RID_DOCUMENTSTR (RID_APP_START + 808)
-#define RID_SYMBOLFILESSTR (RID_APP_START + 809)
-#define RID_ALLFILESSTR (RID_APP_START + 810)
-#define RID_CREATORSTR (RID_APP_START + 811)
-#define RID_FILESMFTYP (RID_APP_START + 812)
-#define RID_FILESYMTYP (RID_APP_START + 813)
-#define RID_SMMENU (RID_APP_START + 814)
-#define RID_SMACCEL (RID_APP_START + 815)
-#define RID_STATUSBAR (RID_APP_START + 816)
-#define RID_APPNAMESTR (RID_APP_START + 817)
+#define RID_UNDOEDITNAME (RID_APP_START + 503)
+#define RID_UNDOFORMATNAME (RID_APP_START + 504)
+#define RID_APPICO (RID_APP_START + 601)
+#define RID_TMPICO (RID_APP_START + 603)
+#define RID_COMMANDMENU (RID_APP_START + 701)
+#define RID_VIEWMENU (RID_APP_START + 702)
+#define RID_DISTANCEMENU (RID_APP_START + 703)
+#define RID_FONTMENU (RID_APP_START + 704)
+#define RID_STARTUPWINDOW (RID_APP_START + 800)
+#define RID_TOOLBOXWINDOW (RID_APP_START + 801)
+#define RID_CMDBOXWINDOW (RID_APP_START + 802)
+#define RID_FONTREGULAR (RID_APP_START + 804)
+#define RID_FONTITALIC (RID_APP_START + 805)
+#define RID_FONTBOLD (RID_APP_START + 806)
+//#define RID_PRINTOPTION (RID_APP_START + 807)
+#define RID_DOCUMENTSTR (RID_APP_START + 808)
+#define RID_SYMBOLFILESSTR (RID_APP_START + 809)
+#define RID_ALLFILESSTR (RID_APP_START + 810)
+#define RID_CREATORSTR (RID_APP_START + 811)
+#define RID_FILESMFTYP (RID_APP_START + 812)
+#define RID_FILESYMTYP (RID_APP_START + 813)
+#define RID_SMMENU (RID_APP_START + 814)
+#define RID_SMACCEL (RID_APP_START + 815)
+#define RID_STATUSBAR (RID_APP_START + 816)
+#define RID_APPNAMESTR (RID_APP_START + 817)
#define STR_MATH_DOCUMENT_FULLTYPE_CURRENT (RID_APP_START + 821)
#define RID_SMPLUGINMENU (RID_APP_START + 822)
@@ -142,24 +142,24 @@
#define STR_STATSTR_WRITING (RID_APP_START + 824)
#define STR_CMDBOXWINDOW (RID_APP_START + 825)
-#define RID_ERR_IDENT (RID_APP_START + 920)
-#define RID_ERR_UNKOWN (RID_APP_START + 921)
-#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
-#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
-#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
-#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
-#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
-#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
-#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
-#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
-#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
-#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
-#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
-#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
-#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
-#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
-#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
-#define RID_ERR_OVERFLOW (RID_APP_START + 937)
+#define RID_ERR_IDENT (RID_APP_START + 920)
+#define RID_ERR_UNKOWN (RID_APP_START + 921)
+#define RID_ERR_UNEXPECTEDCHARACTER (RID_APP_START + 922)
+#define RID_ERR_LGROUPEXPECTED (RID_APP_START + 923)
+#define RID_ERR_RGROUPEXPECTED (RID_APP_START + 924)
+#define RID_ERR_LBRACEEXPECTED (RID_APP_START + 925)
+#define RID_ERR_RBRACEEXPECTED (RID_APP_START + 926)
+#define RID_ERR_FUNCEXPECTED (RID_APP_START + 927)
+#define RID_ERR_UNOPEREXPECTED (RID_APP_START + 928)
+#define RID_ERR_BINOPEREXPECTED (RID_APP_START + 929)
+#define RID_ERR_SYMBOLEXPECTED (RID_APP_START + 930)
+#define RID_ERR_IDENTEXPECTED (RID_APP_START + 931)
+#define RID_ERR_POUNDEXPECTED (RID_APP_START + 932)
+#define RID_ERR_COLOREXPECTED (RID_APP_START + 933)
+#define RID_ERR_LPARENTEXPECTED (RID_APP_START + 934)
+#define RID_ERR_RPARENTEXPECTED (RID_APP_START + 935)
+#define RID_ERR_RIGHTEXPECTED (RID_APP_START + 936)
+#define RID_ERR_OVERFLOW (RID_APP_START + 937)
// toolbox image lists for 'Selection' window
//!! RID_ILH_XYZ = RID_IL_XYZ + 1 !!
@@ -184,266 +184,266 @@
#define RID_IL_MISC (RID_APP_START + 968)
#define RID_ILH_MISC (RID_APP_START + 969)
-#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
-#define RID_RELATIONS_CAT (RID_APP_START + 1102)
-#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103)
-#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
-#define RID_OPERATORS_CAT (RID_APP_START + 1105)
-#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
-#define RID_BRACKETS_CAT (RID_APP_START + 1107)
-#define RID_FORMAT_CAT (RID_APP_START + 1108)
-#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109)
-#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110)
-#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
-#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112)
-#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113)
-#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114)
-#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115)
-#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
-#define RID_MISC_CAT (RID_APP_START + 1117)
-#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
+#define RID_UNBINOPS_CAT (RID_APP_START + 1101)
+#define RID_RELATIONS_CAT (RID_APP_START + 1102)
+#define RID_SETOPERATIONS_CAT (RID_APP_START + 1103)
+#define RID_FUNCTIONS_CAT (RID_APP_START + 1104)
+#define RID_OPERATORS_CAT (RID_APP_START + 1105)
+#define RID_ATTRIBUTES_CAT (RID_APP_START + 1106)
+#define RID_BRACKETS_CAT (RID_APP_START + 1107)
+#define RID_FORMAT_CAT (RID_APP_START + 1108)
+#define RID_UNBINOPS_CAT_HLP (RID_APP_START + 1109)
+#define RID_RELATIONS_CAT_HLP (RID_APP_START + 1110)
+#define RID_SETOPEROPERATIONS_CAT_HLP (RID_APP_START + 1111)
+#define RID_FUNCTIONS_CAT_HLP (RID_APP_START + 1112)
+#define RID_OPERATORS_CAT_HLP (RID_APP_START + 1113)
+#define RID_ATTRIBUTES_CAT_HLP (RID_APP_START + 1114)
+#define RID_BRACKETS_CAT_HLP (RID_APP_START + 1115)
+#define RID_FORMAT_CAT_HLP (RID_APP_START + 1116)
+#define RID_MISC_CAT (RID_APP_START + 1117)
+#define RID_MISC_CAT_HLP (RID_APP_START + 1118)
// new resource ID's
-#define RID_PLUSX