summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-20 09:48:41 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-06-20 09:48:41 +0200
commit2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch)
tree549908e5c5b1d28ba2a6a37369201079c1209a5b /sw
parent457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff)
parent5f03f0c86933b1372a96d05018610205bbd43db9 (diff)
Merge branch 'master' into feature/gnumake4
Conflicts: starmath/JunitTest_sm_unoapi.mk starmath/Library_sm.mk starmath/Library_smd.mk starmath/Makefile starmath/prj/build.lst starmath/prj/makefile.mk starmath/qa/unoapi/Test.java starmath/source/detreg.cxx starmath/source/register.cxx starmath/source/smdetect.cxx sw/Library_sw.mk sw/Library_swd.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/inc/iodetect.hxx sw/inc/swddllapi.h sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'sw')
-rw-r--r--sw/AllLangResTarget_sw.mk53
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk117
-rw-r--r--sw/CppunitTest_sw_test_filters.mk97
-rwxr-xr-xsw/JunitTest_sw_complex.mk13
-rwxr-xr-xsw/JunitTest_sw_unoapi.mk6
-rw-r--r--sw/Library_msword.mk27
-rw-r--r--sw/Library_sw.mk25
-rw-r--r--sw/Library_swd.mk11
-rw-r--r--sw/Library_swui.mk15
-rw-r--r--sw/Library_vbaswobj.mk39
-rw-r--r--sw/Module_sw.mk5
-rw-r--r--sw/Package_uiconfig.mk1
-rw-r--r--sw/inc/AnnotationWin.hxx7
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx3
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx4
-rw-r--r--sw/inc/IDocumentChartDataProviderAccess.hxx2
-rw-r--r--sw/inc/IDocumentContentOperations.hxx85
-rw-r--r--[-rwxr-xr-x]sw/inc/IDocumentDeviceAccess.hxx3
-rw-r--r--sw/inc/IDocumentDrawModelAccess.hxx7
-rw-r--r--sw/inc/IDocumentExternalData.hxx7
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx61
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx3
-rw-r--r--sw/inc/IDocumentLineNumberAccess.hxx2
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx25
-rw-r--r--sw/inc/IDocumentListItems.hxx3
-rw-r--r--sw/inc/IDocumentListsAccess.hxx7
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx3
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx3
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx80
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx17
-rw-r--r--sw/inc/IDocumentState.hxx27
-rw-r--r--sw/inc/IDocumentStatistics.hxx13
-rw-r--r--sw/inc/IDocumentStylePoolAccess.hxx22
-rw-r--r--sw/inc/IDocumentTimerAccess.hxx3
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx4
-rw-r--r--sw/inc/IGrammarContact.hxx2
-rw-r--r--sw/inc/IInterface.hxx3
-rw-r--r--sw/inc/IMark.hxx12
-rw-r--r--sw/inc/PostItMgr.hxx35
-rw-r--r--sw/inc/RefreshListenerContainer.hxx3
-rw-r--r--sw/inc/SidebarWin.hxx37
-rw-r--r--sw/inc/SidebarWindowsTypes.hxx7
-rw-r--r--sw/inc/SwAppletImpl.hxx7
-rw-r--r--sw/inc/SwCapObjType.hxx3
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx3
-rw-r--r--sw/inc/SwNodeNum.hxx19
-rw-r--r--sw/inc/SwNumberTree.hxx78
-rw-r--r--sw/inc/SwNumberTreeTypes.hxx3
-rw-r--r--sw/inc/SwRewriter.hxx14
-rw-r--r--sw/inc/SwSmartTagMgr.hxx10
-rw-r--r--sw/inc/SwStyleNameMapper.hxx11
-rw-r--r--sw/inc/SwUndoField.hxx3
-rw-r--r--sw/inc/SwXMLSectionList.hxx4
-rw-r--r--sw/inc/TextCursorHelper.hxx2
-rw-r--r--sw/inc/accessibilityoptions.hxx2
-rw-r--r--sw/inc/accmap.hxx46
-rw-r--r--sw/inc/acmplwrd.hxx9
-rw-r--r--sw/inc/anchoreddrawobject.hxx45
-rw-r--r--sw/inc/anchoredobject.hxx123
-rw-r--r--sw/inc/authfld.hxx31
-rw-r--r--sw/inc/authratr.hxx3
-rw-r--r--sw/inc/bparr.hxx52
-rw-r--r--sw/inc/breakit.hxx2
-rw-r--r--sw/inc/calbck.hxx7
-rw-r--r--sw/inc/calc.hxx89
-rw-r--r--sw/inc/ccoll.hxx9
-rw-r--r--sw/inc/cellatr.hxx19
-rw-r--r--sw/inc/cellfml.hxx42
-rw-r--r--sw/inc/charatr.hxx15
-rw-r--r--sw/inc/charfmt.hxx6
-rw-r--r--sw/inc/chcmprse.hxx6
-rw-r--r--sw/inc/checkit.hxx4
-rw-r--r--sw/inc/chpfld.hxx32
-rw-r--r--sw/inc/chrdlg.hrc5
-rw-r--r--sw/inc/cmdid.h1022
-rw-r--r--sw/inc/colwd.hxx5
-rw-r--r--sw/inc/comcore.hrc16
-rw-r--r--sw/inc/crsrsh.hxx436
-rw-r--r--sw/inc/crsskip.hxx3
-rw-r--r--sw/inc/crstate.hxx63
-rw-r--r--sw/inc/cshtyp.hxx44
-rw-r--r--sw/inc/dbfld.hxx81
-rw-r--r--sw/inc/dbgoutsw.hxx17
-rw-r--r--sw/inc/dbmgr.hxx51
-rw-r--r--sw/inc/dbui.hrc4
-rw-r--r--sw/inc/dcontact.hxx152
-rw-r--r--sw/inc/ddefld.hxx17
-rw-r--r--sw/inc/dialog.hrc2
-rw-r--r--sw/inc/dlelstnr.hxx2
-rw-r--r--sw/inc/dobjfac.hxx2
-rw-r--r--sw/inc/doc.hxx741
-rw-r--r--sw/inc/docary.hxx19
-rw-r--r--sw/inc/docfac.hxx4
-rw-r--r--sw/inc/docsh.hxx95
-rw-r--r--sw/inc/docstat.hxx4
-rw-r--r--sw/inc/docstyle.hxx29
-rw-r--r--sw/inc/docufld.hxx198
-rw-r--r--sw/inc/dpage.hxx4
-rw-r--r--sw/inc/drawdoc.hxx14
-rw-r--r--sw/inc/edglbldc.hxx7
-rw-r--r--sw/inc/edimp.hxx7
-rw-r--r--sw/inc/editsh.hxx510
-rw-r--r--sw/inc/envelp.hrc7
-rw-r--r--sw/inc/errhdl.hxx76
-rw-r--r--sw/inc/error.h50
-rw-r--r--sw/inc/expfld.hxx115
-rw-r--r--sw/inc/extinput.hxx2
-rw-r--r--sw/inc/fchrfmt.hxx10
-rw-r--r--sw/inc/fesh.hxx377
-rw-r--r--sw/inc/fldbas.hxx139
-rw-r--r--sw/inc/flddat.hxx22
-rw-r--r--sw/inc/flddropdown.hxx7
-rw-r--r--sw/inc/fldinit.hxx7
-rw-r--r--sw/inc/fldui.hrc28
-rw-r--r--sw/inc/fldupde.hxx3
-rw-r--r--sw/inc/flyenum.hxx19
-rw-r--r--sw/inc/flypos.hxx15
-rw-r--r--sw/inc/fmtanchr.hxx24
-rw-r--r--sw/inc/fmtautofmt.hxx6
-rw-r--r--sw/inc/fmtclbl.hxx4
-rw-r--r--sw/inc/fmtclds.hxx99
-rw-r--r--sw/inc/fmtcnct.hxx13
-rw-r--r--sw/inc/fmtcntnt.hxx9
-rw-r--r--sw/inc/fmtcol.hxx103
-rw-r--r--sw/inc/fmtcolfunc.hxx9
-rw-r--r--sw/inc/fmteiro.hxx4
-rw-r--r--sw/inc/fmtflcnt.hxx16
-rw-r--r--sw/inc/fmtfld.hxx16
-rw-r--r--sw/inc/fmtfollowtextflow.hxx4
-rw-r--r--sw/inc/fmtfordr.hxx5
-rw-r--r--sw/inc/fmtfsize.hxx50
-rw-r--r--sw/inc/fmtftn.hxx16
-rw-r--r--sw/inc/fmtftntx.hxx15
-rw-r--r--sw/inc/fmthdft.hxx19
-rw-r--r--sw/inc/fmtinfmt.hxx24
-rw-r--r--sw/inc/fmtline.hxx12
-rw-r--r--sw/inc/fmtlsplt.hxx4
-rw-r--r--[-rwxr-xr-x]sw/inc/fmtmeta.hxx2
-rw-r--r--sw/inc/fmtornt.hxx23
-rw-r--r--sw/inc/fmtpdsc.hxx26
-rw-r--r--sw/inc/fmtrfmrk.hxx10
-rw-r--r--sw/inc/fmtrowsplt.hxx4
-rw-r--r--sw/inc/fmtruby.hxx20
-rw-r--r--sw/inc/fmtsrnd.hxx15
-rw-r--r--sw/inc/fmtsrndenum.hxx3
-rw-r--r--sw/inc/fmtui.hrc2
-rw-r--r--sw/inc/fmturl.hxx20
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx13
-rw-r--r--sw/inc/format.hxx124
-rw-r--r--sw/inc/frmatr.hxx19
-rw-r--r--sw/inc/frmfmt.hxx102
-rw-r--r--sw/inc/ftnidx.hxx12
-rw-r--r--sw/inc/ftninfo.hxx7
-rw-r--r--sw/inc/globals.hrc15
-rw-r--r--sw/inc/globdoc.hxx2
-rw-r--r--sw/inc/grfatr.hxx59
-rw-r--r--sw/inc/helpid.h19
-rw-r--r--sw/inc/hfspacingitem.hxx4
-rw-r--r--sw/inc/hhcwrp.hxx3
-rw-r--r--sw/inc/hintids.hxx121
-rw-r--r--sw/inc/hints.hxx105
-rw-r--r--sw/inc/htmltbl.hxx186
-rw-r--r--sw/inc/index.hrc2
-rw-r--r--sw/inc/index.hxx33
-rw-r--r--sw/inc/inetfld.hxx22
-rw-r--r--sw/inc/init.hxx3
-rw-r--r--sw/inc/io.hxx52
-rw-r--r--sw/inc/iodetect.hxx33
-rw-r--r--sw/inc/istyleaccess.hxx3
-rw-r--r--sw/inc/itabenum.hxx4
-rw-r--r--sw/inc/lineinfo.hxx2
-rw-r--r--sw/inc/linkenum.hxx2
-rw-r--r--sw/inc/list.hxx7
-rw-r--r--sw/inc/listfunc.hxx3
-rw-r--r--sw/inc/mdiexp.hxx9
-rw-r--r--sw/inc/modcfg.hxx28
-rw-r--r--sw/inc/modeltoviewhelper.hxx3
-rw-r--r--sw/inc/ndarr.hxx129
-rw-r--r--sw/inc/ndgrf.hxx67
-rw-r--r--sw/inc/ndhints.hxx47
-rw-r--r--sw/inc/ndindex.hxx29
-rw-r--r--sw/inc/ndnotxt.hxx25
-rw-r--r--sw/inc/ndole.hxx35
-rw-r--r--sw/inc/ndtxt.hxx152
-rw-r--r--sw/inc/ndtyp.hxx17
-rw-r--r--sw/inc/newhdl.hxx4
-rw-r--r--sw/inc/node.hxx175
-rw-r--r--sw/inc/numrule.hxx100
-rw-r--r--sw/inc/pagedesc.hxx104
-rw-r--r--sw/inc/pageiter.hxx2
-rw-r--r--sw/inc/pagepreviewlayout.hxx65
-rw-r--r--sw/inc/pam.hxx50
-rw-r--r--sw/inc/paratr.hxx59
-rw-r--r--sw/inc/pausethreadstarting.hxx5
-rw-r--r--sw/inc/pch/precompiled_sw.cxx2
-rw-r--r--[-rwxr-xr-x]sw/inc/pch/precompiled_sw.hxx12
-rw-r--r--sw/inc/poolfmt.awk10
-rw-r--r--sw/inc/poolfmt.hxx498
-rw-r--r--sw/inc/postithelper.hxx24
-rw-r--r--sw/inc/printdata.hxx12
-rw-r--r--sw/inc/prtopt.hxx2
-rw-r--r--sw/inc/pvprtdat.hxx2
-rw-r--r--sw/inc/rcid.hrc9
-rw-r--r--sw/inc/redline.hxx50
-rw-r--r--sw/inc/redlnaut.hxx3
-rw-r--r--sw/inc/reffld.hxx39
-rw-r--r--sw/inc/ring.hxx5
-rw-r--r--sw/inc/rubylist.hxx3
-rw-r--r--sw/inc/section.hxx116
-rw-r--r--sw/inc/shellid.hxx8
-rw-r--r--sw/inc/shellio.hxx208
-rw-r--r--sw/inc/shellres.hxx42
-rw-r--r--sw/inc/sortopt.hxx7
-rw-r--r--sw/inc/splargs.hxx5
-rw-r--r--sw/inc/stringhash.hxx3
-rw-r--r--sw/inc/sw_primitivetypes2d.hxx5
-rw-r--r--sw/inc/swabstdlg.hxx17
-rw-r--r--sw/inc/swacorr.hxx11
-rw-r--r--sw/inc/swatrset.hxx53
-rw-r--r--sw/inc/swbaslnk.hxx10
-rw-r--r--sw/inc/swcalwrp.hxx2
-rw-r--r--sw/inc/swcli.hxx5
-rw-r--r--sw/inc/swcommands.h3
-rw-r--r--sw/inc/swcrsr.hxx39
-rw-r--r--sw/inc/swdbdata.hxx2
-rw-r--r--sw/inc/swdbtoolsclient.hxx6
-rw-r--r--sw/inc/swddetbl.hxx8
-rw-r--r--sw/inc/swddllapi.h3
-rw-r--r--sw/inc/swdll.hxx39
-rw-r--r--sw/inc/swdllapi.h3
-rw-r--r--sw/inc/swerror.h14
-rw-r--r--sw/inc/swevent.hxx10
-rw-r--r--sw/inc/swfltopt.hxx3
-rw-r--r--sw/inc/swgstr.hxx68
-rw-r--r--sw/inc/swhints.hxx3
-rw-r--r--[-rwxr-xr-x]sw/inc/switerator.hxx4
-rw-r--r--sw/inc/swmodule.hxx67
-rw-r--r--sw/inc/swrect.hxx39
-rw-r--r--sw/inc/swregion.hxx13
-rw-r--r--sw/inc/swserv.hxx2
-rw-r--r--sw/inc/swstyle.h2
-rw-r--r--sw/inc/swtable.hxx137
-rw-r--r--sw/inc/swtblfmt.hxx11
-rw-r--r--sw/inc/swtypes.hxx259
-rw-r--r--sw/inc/swundo.hxx20
-rw-r--r--sw/inc/swunodef.hxx3
-rw-r--r--sw/inc/swunohelper.hxx3
-rw-r--r--sw/inc/swurl.hxx3
-rw-r--r--sw/inc/swwait.hxx3
-rw-r--r--sw/inc/tabcol.hxx38
-rw-r--r--sw/inc/tblafmt.hxx32
-rw-r--r--sw/inc/tblenum.hxx33
-rw-r--r--sw/inc/tblsel.hxx78
-rw-r--r--sw/inc/tgrditem.hxx8
-rw-r--r--sw/inc/tox.hxx69
-rw-r--r--sw/inc/toxe.hxx4
-rw-r--r--sw/inc/toxinit.hxx3
-rw-r--r--sw/inc/toxwrap.hxx3
-rw-r--r--sw/inc/txatbase.hxx28
-rw-r--r--sw/inc/txatritr.hxx3
-rw-r--r--sw/inc/txtatr.hxx12
-rw-r--r--sw/inc/txtflcnt.hxx8
-rw-r--r--sw/inc/txtfld.hxx6
-rw-r--r--sw/inc/txtftn.hxx17
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/txtrfmrk.hxx6
-rw-r--r--sw/inc/txttxmrk.hxx6
-rw-r--r--sw/inc/undobj.hxx65
-rw-r--r--sw/inc/unoatxt.hxx11
-rw-r--r--sw/inc/unobaseclass.hxx21
-rw-r--r--sw/inc/unobookmark.hxx30
-rw-r--r--sw/inc/unochart.hxx2
-rw-r--r--sw/inc/unocoll.hxx45
-rw-r--r--sw/inc/unocrsr.hxx21
-rw-r--r--sw/inc/unocrsrhelper.hxx9
-rw-r--r--sw/inc/unodraw.hxx53
-rw-r--r--sw/inc/unoevent.hxx3
-rw-r--r--sw/inc/unoevtlstnr.hxx9
-rw-r--r--sw/inc/unofield.hxx9
-rw-r--r--sw/inc/unoflatpara.hxx3
-rw-r--r--sw/inc/unofootnote.hxx6
-rw-r--r--sw/inc/unoframe.hxx13
-rw-r--r--sw/inc/unoidx.hxx12
-rw-r--r--sw/inc/unomailmerge.hxx5
-rw-r--r--sw/inc/unomap.hxx25
-rw-r--r--sw/inc/unomid.h9
-rw-r--r--sw/inc/unomod.hxx37
-rw-r--r--sw/inc/unoparaframeenum.hxx9
-rw-r--r--sw/inc/unoparagraph.hxx8
-rw-r--r--sw/inc/unoport.hxx12
-rw-r--r--sw/inc/unoprnms.hxx74
-rw-r--r--sw/inc/unoredline.hxx11
-rw-r--r--sw/inc/unoredlines.hxx6
-rw-r--r--sw/inc/unorefmark.hxx6
-rw-r--r--sw/inc/unosection.hxx6
-rw-r--r--sw/inc/unosett.hxx31
-rw-r--r--sw/inc/unosrch.hxx6
-rw-r--r--sw/inc/unostyle.hxx51
-rw-r--r--sw/inc/unotbl.hxx49
-rw-r--r--sw/inc/unotext.hxx5
-rw-r--r--sw/inc/unotextbodyhf.hxx5
-rw-r--r--sw/inc/unotextcursor.hxx2
-rw-r--r--sw/inc/unotextmarkup.hxx2
-rw-r--r--sw/inc/unotextrange.hxx9
-rw-r--r--sw/inc/unotxdoc.hxx16
-rw-r--r--sw/inc/usrfld.hxx23
-rw-r--r--sw/inc/viewopt.hxx119
-rw-r--r--sw/inc/viewsh.hxx236
-rw-r--r--sw/inc/viscrs.hxx51
-rw-r--r--sw/inc/wdocsh.hxx6
-rw-r--r--sw/prj/build.lst2
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/checkColor/CheckChangeColor.java0
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/indeterminateState/CheckIndeterminateState.java0
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/writer/CheckIndexedPropertyValues.java0
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/writer/CheckNamedPropertyValues.java0
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/writer/TextPortionEnumerationTest.java0
-rw-r--r--[-rwxr-xr-x]sw/qa/complex/writer/testdocuments/TESTMETA.odtbin8678 -> 8678 bytes
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx207
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx15
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx5
-rw-r--r--sw/qa/core/data/rtf/fail/.gitignore0
-rw-r--r--sw/qa/core/data/rtf/fail/CVE-2010-3451-1.rtf2072
-rw-r--r--sw/qa/core/data/rtf/pass/.gitignore0
-rw-r--r--sw/qa/core/data/rtf/pass/CVE-2007-0245-1.rtf21
-rw-r--r--sw/qa/core/data/rtf/pass/CVE-2010-3452-1.rtf1
-rw-r--r--sw/qa/core/data/ww8/fail/.gitignore0
-rw-r--r--sw/qa/core/data/ww8/pass/.gitignore0
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-0200-1.docbin0 -> 8192 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-0201-1.docbin0 -> 8192 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3301-1.docbin0 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3302-1.docbin0 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2009-3302-2.docbin0 -> 27648 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2010-3453-1.docbin0 -> 126464 bytes
-rw-r--r--sw/qa/core/data/ww8/pass/CVE-2010-3454-1.docbin0 -> 126464 bytes
-rw-r--r--sw/qa/core/data/xml/fail/.gitignore0
-rw-r--r--sw/qa/core/data/xml/fail/CVE-2006-3117-1.sxwbin0 -> 441416 bytes
-rw-r--r--sw/qa/core/data/xml/pass/.gitignore0
-rw-r--r--sw/qa/core/export.exp1
-rw-r--r--sw/qa/core/export.map34
-rw-r--r--sw/qa/core/filters-test.cxx256
-rw-r--r--sw/qa/core/swdoc-test.cxx230
-rw-r--r--sw/qa/unoapi/Test.java52
-rw-r--r--sw/qa/unoapi/knownissues.xcl3
-rw-r--r--[-rwxr-xr-x]sw/sdi/_annotsh.sdi0
-rw-r--r--sw/sdi/_basesh.sdi10
-rw-r--r--sw/sdi/_frmsh.sdi17
-rw-r--r--sw/sdi/_grfsh.sdi5
-rw-r--r--sw/sdi/_navsh.sdi49
-rw-r--r--sw/sdi/_textsh.sdi13
-rw-r--r--[-rwxr-xr-x]sw/sdi/annotsh.sdi7
-rw-r--r--sw/sdi/drwtxtsh.sdi6
-rw-r--r--sw/sdi/navsh.sdi35
-rw-r--r--sw/sdi/swinterf.c2
-rw-r--r--sw/sdi/swriter.sdi151
-rw-r--r--sw/sdi/swslots.sdi2
-rw-r--r--sw/sdi/textsh.sdi30
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx194
-rw-r--r--sw/source/core/SwNumberTree/SwNumberTree.cxx274
-rw-r--r--sw/source/core/access/acccell.cxx75
-rw-r--r--sw/source/core/access/acccell.hxx2
-rw-r--r--sw/source/core/access/acccontext.cxx334
-rw-r--r--sw/source/core/access/acccontext.hxx51
-rw-r--r--sw/source/core/access/accdoc.cxx63
-rw-r--r--sw/source/core/access/accdoc.hxx6
-rw-r--r--sw/source/core/access/accembedded.cxx19
-rw-r--r--sw/source/core/access/accembedded.hxx3
-rw-r--r--sw/source/core/access/accfootnote.cxx28
-rw-r--r--sw/source/core/access/accfootnote.hxx2
-rw-r--r--sw/source/core/access/accframe.cxx15
-rw-r--r--sw/source/core/access/accframe.hxx5
-rw-r--r--sw/source/core/access/accframebase.cxx35
-rw-r--r--sw/source/core/access/accframebase.hxx3
-rw-r--r--sw/source/core/access/accfrmobj.cxx12
-rw-r--r--sw/source/core/access/accfrmobj.hxx8
-rw-r--r--sw/source/core/access/accfrmobjmap.cxx11
-rw-r--r--sw/source/core/access/accfrmobjmap.hxx2
-rw-r--r--sw/source/core/access/accfrmobjslist.cxx14
-rw-r--r--sw/source/core/access/accfrmobjslist.hxx3
-rw-r--r--sw/source/core/access/accgraphic.cxx20
-rw-r--r--sw/source/core/access/accgraphic.hxx3
-rw-r--r--sw/source/core/access/accheaderfooter.cxx30
-rw-r--r--sw/source/core/access/accheaderfooter.hxx4
-rw-r--r--sw/source/core/access/acchyperlink.cxx16
-rw-r--r--sw/source/core/access/acchyperlink.hxx6
-rw-r--r--sw/source/core/access/acchypertextdata.cxx3
-rw-r--r--sw/source/core/access/acchypertextdata.hxx2
-rw-r--r--sw/source/core/access/accmap.cxx355
-rw-r--r--sw/source/core/access/accnotextframe.cxx41
-rw-r--r--sw/source/core/access/accnotextframe.hxx11
-rw-r--r--sw/source/core/access/accpage.cxx44
-rw-r--r--sw/source/core/access/accpage.hxx4
-rw-r--r--sw/source/core/access/accpara.cxx338
-rw-r--r--sw/source/core/access/accpara.hxx51
-rw-r--r--sw/source/core/access/accportions.cxx117
-rw-r--r--sw/source/core/access/accportions.hxx5
-rw-r--r--sw/source/core/access/accpreview.cxx30
-rw-r--r--sw/source/core/access/accpreview.hxx2
-rw-r--r--sw/source/core/access/accselectionhelper.cxx41
-rw-r--r--sw/source/core/access/accselectionhelper.hxx4
-rw-r--r--sw/source/core/access/acctable.cxx244
-rw-r--r--sw/source/core/access/acctable.hxx15
-rw-r--r--sw/source/core/access/acctextframe.cxx47
-rw-r--r--sw/source/core/access/acctextframe.hxx10
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx20
-rw-r--r--sw/source/core/access/parachangetrackinginfo.hxx5
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx24
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx14
-rw-r--r--sw/source/core/attr/calbck.cxx21
-rw-r--r--sw/source/core/attr/cellatr.cxx11
-rw-r--r--sw/source/core/attr/fmtfollowtextflow.cxx3
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx38
-rw-r--r--sw/source/core/attr/format.cxx43
-rw-r--r--sw/source/core/attr/hints.cxx44
-rw-r--r--sw/source/core/attr/swatrset.cxx35
-rw-r--r--sw/source/core/bastyp/SwSmartTagMgr.cxx22
-rw-r--r--sw/source/core/bastyp/bparr.cxx24
-rw-r--r--sw/source/core/bastyp/breakit.cxx20
-rw-r--r--sw/source/core/bastyp/calc.cxx190
-rw-r--r--sw/source/core/bastyp/checkit.cxx4
-rw-r--r--sw/source/core/bastyp/index.cxx174
-rw-r--r--sw/source/core/bastyp/init.cxx134
-rw-r--r--sw/source/core/bastyp/ring.cxx17
-rw-r--r--sw/source/core/bastyp/swcache.cxx183
-rw-r--r--sw/source/core/bastyp/swrect.cxx38
-rw-r--r--sw/source/core/bastyp/swregion.cxx15
-rw-r--r--sw/source/core/bastyp/swtypes.cxx2
-rw-r--r--sw/source/core/bastyp/tabcol.cxx11
-rw-r--r--sw/source/core/crsr/BlockCursor.cxx2
-rw-r--r--sw/source/core/crsr/BlockCursor.hxx3
-rw-r--r--sw/source/core/crsr/IBlockCursor.hxx2
-rw-r--r--sw/source/core/crsr/bookmrk.cxx52
-rw-r--r--sw/source/core/crsr/callnk.cxx100
-rw-r--r--sw/source/core/crsr/callnk.hxx3
-rw-r--r--sw/source/core/crsr/crbm.cxx7
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx10
-rw-r--r--sw/source/core/crsr/crsrsh.cxx187
-rw-r--r--sw/source/core/crsr/crstrvl.cxx43
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx2
-rw-r--r--sw/source/core/crsr/findattr.cxx55
-rw-r--r--sw/source/core/crsr/findcoll.cxx2
-rw-r--r--sw/source/core/crsr/findfmt.cxx2
-rw-r--r--sw/source/core/crsr/findtxt.cxx10
-rw-r--r--sw/source/core/crsr/pam.cxx129
-rw-r--r--sw/source/core/crsr/paminit.cxx3
-rw-r--r--[-rwxr-xr-x]sw/source/core/crsr/swcrsr.cxx105
-rw-r--r--sw/source/core/crsr/trvlcol.cxx2
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx2
-rw-r--r--sw/source/core/crsr/trvlreg.cxx2
-rw-r--r--sw/source/core/crsr/trvltbl.cxx24
-rw-r--r--sw/source/core/crsr/unocrsr.cxx12
-rw-r--r--sw/source/core/crsr/viscrs.cxx344
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx29
-rw-r--r--sw/source/core/doc/acmplwrd.cxx81
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx14
-rw-r--r--sw/source/core/doc/doc.cxx238
-rw-r--r--sw/source/core/doc/docbasic.cxx18
-rw-r--r--sw/source/core/doc/docbm.cxx70
-rw-r--r--sw/source/core/doc/docchart.cxx9
-rw-r--r--sw/source/core/doc/doccomp.cxx121
-rw-r--r--sw/source/core/doc/doccorr.cxx2
-rw-r--r--sw/source/core/doc/docdde.cxx4
-rw-r--r--sw/source/core/doc/docdesc.cxx107
-rw-r--r--sw/source/core/doc/docdraw.cxx168
-rw-r--r--sw/source/core/doc/docedt.cxx98
-rw-r--r--sw/source/core/doc/docfld.cxx191
-rw-r--r--sw/source/core/doc/docfly.cxx76
-rw-r--r--sw/source/core/doc/docfmt.cxx171
-rw-r--r--sw/source/core/doc/docftn.cxx18
-rw-r--r--sw/source/core/doc/docglbl.cxx542
-rw-r--r--sw/source/core/doc/docglos.cxx14
-rw-r--r--sw/source/core/doc/doclay.cxx214
-rw-r--r--sw/source/core/doc/doclay.cxx.rej7
-rw-r--r--sw/source/core/doc/docnew.cxx189
-rw-r--r--sw/source/core/doc/docnum.cxx522
-rw-r--r--sw/source/core/doc/docredln.cxx180
-rw-r--r--sw/source/core/doc/docruby.cxx32
-rw-r--r--sw/source/core/doc/docsort.cxx74
-rw-r--r--sw/source/core/doc/docstat.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx147
-rw-r--r--sw/source/core/doc/docxforms.cxx17
-rw-r--r--sw/source/core/doc/extinput.cxx7
-rw-r--r--sw/source/core/doc/fmtcol.cxx62
-rw-r--r--sw/source/core/doc/ftnidx.cxx2
-rw-r--r--sw/source/core/doc/gctable.cxx5
-rw-r--r--sw/source/core/doc/htmltbl.cxx138
-rw-r--r--sw/source/core/doc/lineinfo.cxx6
-rw-r--r--sw/source/core/doc/list.cxx14
-rw-r--r--sw/source/core/doc/notxtfrm.cxx115
-rw-r--r--sw/source/core/doc/number.cxx452
-rw-r--r--sw/source/core/doc/poolfmt.cxx247
-rw-r--r--sw/source/core/doc/sortopt.cxx13
-rw-r--r--sw/source/core/doc/swserv.cxx20
-rw-r--r--sw/source/core/doc/swstylemanager.cxx13
-rw-r--r--sw/source/core/doc/swstylemanager.hxx7
-rw-r--r--[-rwxr-xr-x]sw/source/core/doc/tblafmt.cxx34
-rw-r--r--sw/source/core/doc/tblcpy.cxx38
-rw-r--r--sw/source/core/doc/tblrwcl.cxx155
-rw-r--r--sw/source/core/doc/visiturl.cxx2
-rw-r--r--sw/source/core/docnode/cancellablejob.cxx3
-rw-r--r--sw/source/core/docnode/cancellablejob.hxx3
-rw-r--r--sw/source/core/docnode/finalthreadmanager.cxx62
-rw-r--r--sw/source/core/docnode/ndcopy.cxx119
-rw-r--r--sw/source/core/docnode/ndindex.cxx14
-rwxr-xr-xsw/source/core/docnode/ndnotxt.cxx38
-rw-r--r--sw/source/core/docnode/ndnum.cxx89
-rw-r--r--sw/source/core/docnode/ndsect.cxx74
-rw-r--r--sw/source/core/docnode/ndtbl.cxx355
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx43
-rw-r--r--sw/source/core/docnode/node.cxx115
-rw-r--r--sw/source/core/docnode/node2lay.cxx34
-rw-r--r--sw/source/core/docnode/nodes.cxx200
-rw-r--r--sw/source/core/docnode/observablethread.cxx5
-rw-r--r--sw/source/core/docnode/pausethreadstarting.cxx5
-rw-r--r--sw/source/core/docnode/retrievedinputstreamdata.cxx6
-rw-r--r--sw/source/core/docnode/retrieveinputstream.cxx9
-rw-r--r--sw/source/core/docnode/retrieveinputstreamconsumer.cxx4
-rw-r--r--sw/source/core/docnode/section.cxx146
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx31
-rw-r--r--sw/source/core/docnode/swthreadjoiner.cxx15
-rw-r--r--sw/source/core/docnode/swthreadmanager.cxx5
-rw-r--r--sw/source/core/docnode/threadlistener.cxx4
-rw-r--r--sw/source/core/docnode/threadmanager.cxx10
-rw-r--r--sw/source/core/draw/dcontact.cxx443
-rw-r--r--sw/source/core/draw/dflyobj.cxx79
-rw-r--r--sw/source/core/draw/dobjfac.cxx5
-rw-r--r--sw/source/core/draw/dpage.cxx20
-rw-r--r--sw/source/core/draw/drawdoc.cxx22
-rw-r--r--sw/source/core/draw/dview.cxx98
-rw-r--r--[-rwxr-xr-x]sw/source/core/edit/acorrect.cxx13
-rw-r--r--sw/source/core/edit/autofmt.cxx162
-rw-r--r--sw/source/core/edit/edatmisc.cxx24
-rw-r--r--sw/source/core/edit/edattr.cxx32
-rw-r--r--sw/source/core/edit/eddel.cxx6
-rw-r--r--sw/source/core/edit/edfcol.cxx17
-rw-r--r--sw/source/core/edit/edfld.cxx25
-rw-r--r--sw/source/core/edit/edfldexp.cxx4
-rw-r--r--sw/source/core/edit/edfmt.cxx14
-rw-r--r--sw/source/core/edit/edglbldc.cxx4
-rw-r--r--sw/source/core/edit/edglss.cxx6
-rw-r--r--sw/source/core/edit/editsh.cxx85
-rw-r--r--sw/source/core/edit/edlingu.cxx145
-rw-r--r--sw/source/core/edit/ednumber.cxx80
-rw-r--r--sw/source/core/edit/edredln.cxx2
-rw-r--r--sw/source/core/edit/edsect.cxx18
-rw-r--r--sw/source/core/edit/edtab.cxx10
-rw-r--r--sw/source/core/edit/edtox.cxx38
-rw-r--r--sw/source/core/edit/edundo.cxx16
-rw-r--r--sw/source/core/edit/edws.cxx6
-rw-r--r--sw/source/core/except/dbgloop.cxx168
-rw-r--r--sw/source/core/except/errhdl.cxx136
-rw-r--r--sw/source/core/fields/authfld.cxx82
-rw-r--r--sw/source/core/fields/cellfml.cxx33
-rw-r--r--sw/source/core/fields/chpfld.cxx59
-rw-r--r--sw/source/core/fields/dbfld.cxx92
-rw-r--r--sw/source/core/fields/ddefld.cxx35
-rw-r--r--sw/source/core/fields/ddetbl.cxx18
-rw-r--r--sw/source/core/fields/docufld.cxx333
-rw-r--r--sw/source/core/fields/expfld.cxx63
-rw-r--r--sw/source/core/fields/fldbas.cxx85
-rw-r--r--sw/source/core/fields/flddat.cxx63
-rw-r--r--sw/source/core/fields/flddropdown.cxx19
-rw-r--r--sw/source/core/fields/fldlst.cxx4
-rw-r--r--sw/source/core/fields/macrofld.cxx28
-rw-r--r--sw/source/core/fields/postithelper.cxx22
-rw-r--r--sw/source/core/fields/reffld.cxx221
-rw-r--r--sw/source/core/fields/scrptfld.cxx22
-rw-r--r--sw/source/core/fields/tblcalc.cxx18
-rw-r--r--[-rwxr-xr-x]sw/source/core/fields/textapi.cxx3
-rw-r--r--sw/source/core/fields/usrfld.cxx32
-rw-r--r--sw/source/core/frmedt/fecopy.cxx64
-rw-r--r--sw/source/core/frmedt/fedesc.cxx22
-rw-r--r--sw/source/core/frmedt/fefly1.cxx177
-rw-r--r--sw/source/core/frmedt/feflyole.cxx7
-rw-r--r--sw/source/core/frmedt/feshview.cxx199
-rw-r--r--sw/source/core/frmedt/fetab.cxx131
-rw-r--r--sw/source/core/frmedt/fews.cxx143
-rw-r--r--sw/source/core/frmedt/tblsel.cxx119
-rw-r--r--sw/source/core/graphic/grfatr.cxx77
-rwxr-xr-xsw/source/core/graphic/ndgrf.cxx155
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx3
-rw-r--r--sw/source/core/inc/MarkManager.hxx3
-rw-r--r--sw/source/core/inc/SwGrammarMarkUp.hxx3
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx3
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx4
-rw-r--r--sw/source/core/inc/SwUndoPageDesc.hxx7
-rw-r--r--sw/source/core/inc/SwUndoTOXChange.hxx3
-rw-r--r--sw/source/core/inc/SwXMLBlockExport.hxx5
-rw-r--r--sw/source/core/inc/SwXMLBlockImport.hxx6
-rw-r--r--sw/source/core/inc/SwXMLBlockListContext.hxx3
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx3
-rw-r--r--sw/source/core/inc/SwXTextDefaults.hxx5
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx15
-rw-r--r--sw/source/core/inc/UndoBookmark.hxx1
-rw-r--r--sw/source/core/inc/UndoCore.hxx13
-rw-r--r--sw/source/core/inc/UndoDelete.hxx2
-rw-r--r--sw/source/core/inc/UndoDraw.hxx6
-rw-r--r--sw/source/core/inc/UndoInsert.hxx11
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx22
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx1
-rw-r--r--sw/source/core/inc/UndoTable.hxx7
-rw-r--r--[-rwxr-xr-x]sw/source/core/inc/acorrect.hxx3
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx58
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx27
-rw-r--r--sw/source/core/inc/blink.hxx2
-rw-r--r--sw/source/core/inc/bodyfrm.hxx5
-rw-r--r--sw/source/core/inc/bookmrk.hxx8
-rw-r--r--sw/source/core/inc/cellfrm.hxx6
-rw-r--r--sw/source/core/inc/cntfrm.hxx16
-rw-r--r--sw/source/core/inc/colfrm.hxx3
-rw-r--r--sw/source/core/inc/crossrefbookmark.hxx3
-rw-r--r--sw/source/core/inc/dbg_lay.hxx5
-rw-r--r--sw/source/core/inc/dbgloop.hxx77
-rw-r--r--sw/source/core/inc/dflyobj.hxx5
-rw-r--r--sw/source/core/inc/docfld.hxx2
-rw-r--r--sw/source/core/inc/docsort.hxx4
-rw-r--r--sw/source/core/inc/doctxm.hxx9
-rw-r--r--sw/source/core/inc/drawdev.hxx5
-rw-r--r--sw/source/core/inc/drawfont.hxx102
-rw-r--r--sw/source/core/inc/dumpfilter.hxx87
-rw-r--r--sw/source/core/inc/dview.hxx15
-rw-r--r--sw/source/core/inc/environmentofanchoredobject.hxx21
-rw-r--r--sw/source/core/inc/finalthreadmanager.hxx3
-rw-r--r--sw/source/core/inc/flowfrm.hxx55
-rw-r--r--sw/source/core/inc/flyfrm.hxx43
-rw-r--r--sw/source/core/inc/flyfrms.hxx52
-rw-r--r--sw/source/core/inc/fntcache.hxx5
-rw-r--r--sw/source/core/inc/frame.hxx154
-rw-r--r--sw/source/core/inc/frminf.hxx2
-rw-r--r--sw/source/core/inc/frmtool.hxx66
-rw-r--r--sw/source/core/inc/ftnboss.hxx3
-rw-r--r--sw/source/core/inc/ftnfrm.hxx23
-rw-r--r--sw/source/core/inc/hffrm.hxx3
-rw-r--r--sw/source/core/inc/ifinishedthreadlistener.hxx3
-rw-r--r--sw/source/core/inc/ithreadlistenerowner.hxx3
-rw-r--r--sw/source/core/inc/layact.hxx13
-rw-r--r--sw/source/core/inc/laycache.hxx5
-rw-r--r--sw/source/core/inc/layfrm.hxx16
-rw-r--r--sw/source/core/inc/layouter.hxx51
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx12
-rw-r--r--sw/source/core/inc/mvsave.hxx2
-rw-r--r--sw/source/core/inc/node2lay.hxx5
-rw-r--r--sw/source/core/inc/noteurl.hxx2
-rw-r--r--sw/source/core/inc/notxtfrm.hxx7
-rw-r--r--sw/source/core/inc/objectformatter.hxx60
-rw-r--r--sw/source/core/inc/observablethread.hxx5
-rw-r--r--sw/source/core/inc/pagefrm.hrc45
-rw-r--r--sw/source/core/inc/pagefrm.hxx136
-rw-r--r--sw/source/core/inc/pamtyp.hxx3
-rw-r--r--sw/source/core/inc/prevwpage.hxx7
-rw-r--r--sw/source/core/inc/ptqueue.hxx3
-rw-r--r--sw/source/core/inc/retrievedinputstreamdata.hxx9
-rw-r--r--sw/source/core/inc/retrieveinputstream.hxx8
-rw-r--r--sw/source/core/inc/retrieveinputstreamconsumer.hxx13
-rw-r--r--sw/source/core/inc/rolbck.hxx31
-rw-r--r--sw/source/core/inc/rootfrm.hxx14
-rw-r--r--sw/source/core/inc/rowfrm.hxx14
-rw-r--r--sw/source/core/inc/scriptinfo.hxx78
-rw-r--r--sw/source/core/inc/sectfrm.hxx5
-rw-r--r--sw/source/core/inc/setmapvirtdev.hxx2
-rw-r--r--sw/source/core/inc/sortedobjs.hxx14
-rw-r--r--sw/source/core/inc/sortedobjsimpl.hxx3
-rw-r--r--sw/source/core/inc/swblocks.hxx100
-rw-r--r--sw/source/core/inc/swcache.hxx23
-rw-r--r--sw/source/core/inc/swfntcch.hxx5
-rw-r--r--sw/source/core/inc/swfont.hxx17
-rw-r--r--sw/source/core/inc/swselectionlist.hxx3
-rw-r--r--sw/source/core/inc/swthreadjoiner.hxx5
-rw-r--r--sw/source/core/inc/swthreadmanager.hxx11
-rw-r--r--sw/source/core/inc/tabfrm.hxx19
-rw-r--r--sw/source/core/inc/tblrwcl.hxx12
-rw-r--r--[-rwxr-xr-x]sw/source/core/inc/textapi.hxx3
-rw-r--r--sw/source/core/inc/threadlistener.hxx3
-rw-r--r--sw/source/core/inc/threadmanager.hxx4
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx14
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx11
-rw-r--r--sw/source/core/inc/toxhlp.hxx3
-rw-r--r--sw/source/core/inc/txmsrt.hxx3
-rw-r--r--sw/source/core/inc/txtfrm.hxx61
-rw-r--r--sw/source/core/inc/txttypes.hxx3
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx3
-rw-r--r--sw/source/core/inc/unofldmid.h3
-rw-r--r--[-rwxr-xr-x]sw/source/core/inc/unometa.hxx2
-rwxr-xr-xsw/source/core/inc/viewimp.hxx35
-rw-r--r--sw/source/core/inc/visiturl.hxx9
-rw-r--r--sw/source/core/inc/wrong.hxx9
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx212
-rw-r--r--sw/source/core/layout/anchoredobject.cxx176
-rw-r--r--sw/source/core/layout/atrfrm.cxx345
-rw-r--r--sw/source/core/layout/calcmove.cxx241
-rw-r--r--sw/source/core/layout/colfrm.cxx27
-rw-r--r--sw/source/core/layout/dbg_lay.cxx76
-rw-r--r--sw/source/core/layout/dumpfilter.cxx210
-rw-r--r--sw/source/core/layout/findfrm.cxx125
-rw-r--r--sw/source/core/layout/flowfrm.cxx273
-rwxr-xr-xsw/source/core/layout/fly.cxx333
-rw-r--r--sw/source/core/layout/flycnt.cxx241
-rw-r--r--sw/source/core/layout/flyincnt.cxx43
-rw-r--r--sw/source/core/layout/flylay.cxx235
-rw-r--r--sw/source/core/layout/flypos.cxx2
-rw-r--r--sw/source/core/layout/frmtool.cxx223
-rw-r--r--sw/source/core/layout/ftnfrm.cxx265
-rw-r--r--sw/source/core/layout/hffrm.cxx39
-rw-r--r--sw/source/core/layout/layact.cxx265
-rw-r--r--sw/source/core/layout/laycache.cxx194
-rw-r--r--sw/source/core/layout/layhelp.hxx14
-rw-r--r--sw/source/core/layout/layouter.cxx72
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx8
-rw-r--r--sw/source/core/layout/newfrm.cxx34
-rw-r--r--sw/source/core/layout/objectformatter.cxx85
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.cxx36
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx6
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx186
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx44
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.cxx3
-rw-r--r--sw/source/core/layout/objstmpconsiderwrapinfl.hxx3
-rw-r--r--sw/source/core/layout/pagechg.cxx216
-rw-r--r--sw/source/core/layout/pagedesc.cxx51
-rw-r--r--sw/source/core/layout/pagefrm.src7
-rwxr-xr-xsw/source/core/layout/paintfrm.cxx1056
-rw-r--r--sw/source/core/layout/sectfrm.cxx178
-rw-r--r--sw/source/core/layout/softpagebreak.cxx2
-rw-r--r--sw/source/core/layout/sortedobjs.cxx3
-rw-r--r--sw/source/core/layout/sortedobjsimpl.cxx25
-rw-r--r--sw/source/core/layout/ssfrm.cxx36
-rw-r--r--sw/source/core/layout/swselectionlist.cxx2
-rw-r--r--sw/source/core/layout/tabfrm.cxx606
-rw-r--r--sw/source/core/layout/trvlfrm.cxx138
-rw-r--r--sw/source/core/layout/unusedf.cxx23
-rw-r--r--sw/source/core/layout/virtoutp.cxx10
-rw-r--r--sw/source/core/layout/virtoutp.hxx5
-rw-r--r--sw/source/core/layout/wsfrm.cxx266
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx141
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx15
-rw-r--r--sw/source/core/objectpositioning/environmentofanchoredobject.cxx23
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx156
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx13
-rw-r--r--sw/source/core/ole/ndole.cxx70
-rw-r--r--sw/source/core/para/paratr.cxx40
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx28
-rw-r--r--sw/source/core/sw3io/swacorr.cxx9
-rw-r--r--sw/source/core/swg/SwXMLBlockExport.cxx3
-rw-r--r--sw/source/core/swg/SwXMLBlockImport.cxx11
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx3
-rw-r--r--sw/source/core/swg/SwXMLSectionList.cxx7
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx51
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx74
-rw-r--r--sw/source/core/swg/swblocks.cxx169
-rw-r--r--sw/source/core/table/swnewtable.cxx287
-rw-r--r--sw/source/core/table/swtable.cxx121
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx83
-rw-r--r--sw/source/core/text/SwGrammarMarkUp.cxx2
-rw-r--r--sw/source/core/text/atrhndl.hxx9
-rw-r--r--sw/source/core/text/atrstck.cxx18
-rw-r--r--sw/source/core/text/blink.cxx4
-rw-r--r--sw/source/core/text/frmcrsr.cxx31
-rwxr-xr-xsw/source/core/text/frmform.cxx203
-rw-r--r--sw/source/core/text/frminf.cxx3
-rw-r--r--sw/source/core/text/frmpaint.cxx78
-rw-r--r--sw/source/core/text/guess.cxx89
-rw-r--r--sw/source/core/text/guess.hxx3
-rw-r--r--sw/source/core/text/inftxt.cxx126
-rw-r--r--sw/source/core/text/inftxt.hxx34
-rw-r--r--sw/source/core/text/itradj.cxx41
-rw-r--r--sw/source/core/text/itratr.cxx15
-rw-r--r--sw/source/core/text/itratr.hxx7
-rw-r--r--sw/source/core/text/itrcrsr.cxx83
-rw-r--r--sw/source/core/text/itrform2.cxx369
-rw-r--r--sw/source/core/text/itrform2.hxx7
-rw-r--r--sw/source/core/text/itrpaint.cxx33
-rw-r--r--sw/source/core/text/itrpaint.hxx3
-rw-r--r--sw/source/core/text/itrtxt.cxx30
-rw-r--r--sw/source/core/text/itrtxt.hxx18
-rw-r--r--sw/source/core/text/noteurl.cxx4
-rw-r--r--sw/source/core/text/pordrop.hxx3
-rw-r--r--sw/source/core/text/porexp.cxx2
-rw-r--r--sw/source/core/text/porexp.hxx3
-rw-r--r--sw/source/core/text/porfld.cxx69
-rw-r--r--sw/source/core/text/porfld.hxx14
-rw-r--r--sw/source/core/text/porfly.cxx31
-rw-r--r--sw/source/core/text/porfly.hxx3
-rw-r--r--sw/source/core/text/porftn.hxx11
-rw-r--r--sw/source/core/text/porglue.cxx11
-rw-r--r--sw/source/core/text/porglue.hxx4
-rw-r--r--sw/source/core/text/porhyph.hxx3
-rw-r--r--sw/source/core/text/porlay.cxx170
-rw-r--r--sw/source/core/text/porlay.hxx11
-rw-r--r--sw/source/core/text/porlin.cxx34
-rw-r--r--sw/source/core/text/porlin.hxx18
-rw-r--r--sw/source/core/text/pormulti.cxx99
-rw-r--r--sw/source/core/text/pormulti.hxx9
-rw-r--r--sw/source/core/text/porref.cxx3
-rw-r--r--sw/source/core/text/porref.hxx3
-rw-r--r--sw/source/core/text/porrst.cxx38
-rw-r--r--sw/source/core/text/porrst.hxx3
-rw-r--r--sw/source/core/text/portab.hxx3
-rw-r--r--sw/source/core/text/portox.cxx3
-rw-r--r--sw/source/core/text/portox.hxx4
-rw-r--r--sw/source/core/text/portxt.cxx43
-rw-r--r--sw/source/core/text/portxt.hxx3
-rw-r--r--sw/source/core/text/possiz.hxx2
-rw-r--r--sw/source/core/text/redlnitr.cxx21
-rw-r--r--sw/source/core/text/redlnitr.hxx6
-rw-r--r--sw/source/core/text/txtcache.cxx36
-rw-r--r--sw/source/core/text/txtcache.hxx3
-rw-r--r--sw/source/core/text/txtcfg.hxx54
-rw-r--r--sw/source/core/text/txtdrop.cxx27
-rw-r--r--sw/source/core/text/txtfld.cxx36
-rw-r--r--sw/source/core/text/txtfly.cxx329
-rw-r--r--sw/source/core/text/txtfly.hxx60
-rw-r--r--sw/source/core/text/txtfrm.cxx120
-rw-r--r--sw/source/core/text/txtftn.cxx84
-rw-r--r--sw/source/core/text/txthyph.cxx58
-rw-r--r--sw/source/core/text/txtinit.cxx8
-rw-r--r--sw/source/core/text/txtio.cxx249
-rw-r--r--sw/source/core/text/txtpaint.cxx6
-rw-r--r--sw/source/core/text/txtpaint.hxx5
-rw-r--r--sw/source/core/text/txttab.cxx52
-rwxr-xr-xsw/source/core/text/widorp.cxx18
-rw-r--r--sw/source/core/text/widorp.hxx3
-rw-r--r--sw/source/core/text/wrong.cxx13
-rw-r--r--sw/source/core/text/xmldump.cxx394
-rw-r--r--sw/source/core/tox/tox.cxx54
-rw-r--r--sw/source/core/tox/toxhlp.cxx46
-rw-r--r--sw/source/core/tox/txmsrt.cxx92
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx2
-rw-r--r--sw/source/core/txtnode/atrfld.cxx27
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx19
-rw-r--r--sw/source/core/txtnode/atrftn.cxx198
-rw-r--r--sw/source/core/txtnode/atrref.cxx4
-rw-r--r--sw/source/core/txtnode/atrtox.cxx3
-rw-r--r--sw/source/core/txtnode/chrfmt.cxx2
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx75
-rw-r--r--sw/source/core/txtnode/fntcache.cxx167
-rw-r--r--sw/source/core/txtnode/fntcap.cxx44
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx3
-rw-r--r--sw/source/core/txtnode/ndhints.cxx86
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx564
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx40
-rw-r--r--sw/source/core/txtnode/thints.cxx147
-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.cxx8
-rw-r--r--[-rwxr-xr-x]sw/source/core/txtnode/txtedt.cxx345
-rw-r--r--sw/source/core/undo/SwRewriter.cxx4
-rw-r--r--sw/source/core/undo/SwUndoField.cxx13
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx3
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx39
-rw-r--r--sw/source/core/undo/SwUndoTOXChange.cxx2
-rw-r--r--sw/source/core/undo/docundo.cxx4
-rw-r--r--sw/source/core/undo/rolbck.cxx70
-rw-r--r--sw/source/core/undo/unattr.cxx58
-rw-r--r--sw/source/core/undo/unbkmk.cxx3
-rw-r--r--sw/source/core/undo/undel.cxx17
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/core/undo/undobj.cxx44
-rw-r--r--sw/source/core/undo/undobj1.cxx23
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx5
-rw-r--r--sw/source/core/undo/undraw.cxx19
-rw-r--r--sw/source/core/undo/unfmco.cxx12
-rw-r--r--sw/source/core/undo/unins.cxx19
-rw-r--r--sw/source/core/undo/unmove.cxx2
-rw-r--r--sw/source/core/undo/unnum.cxx39
-rw-r--r--sw/source/core/undo/unoutl.cxx3
-rw-r--r--sw/source/core/undo/unovwr.cxx8
-rw-r--r--sw/source/core/undo/unredln.cxx5
-rw-r--r--sw/source/core/undo/unsect.cxx10
-rw-r--r--sw/source/core/undo/unsort.cxx15
-rw-r--r--sw/source/core/undo/unspnd.cxx4
-rw-r--r--sw/source/core/undo/untbl.cxx129
-rw-r--r--sw/source/core/undo/untblk.cxx7
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx23
-rw-r--r--sw/source/core/unocore/TextCursorHelper.cxx17
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.cxx5
-rw-r--r--sw/source/core/unocore/XMLRangeHelper.hxx3
-rw-r--r--sw/source/core/unocore/swunohelper.cxx31
-rw-r--r--sw/source/core/unocore/unobkm.cxx162
-rw-r--r--sw/source/core/unocore/unochart.cxx362
-rw-r--r--sw/source/core/unocore/unocoll.cxx404
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx153
-rw-r--r--sw/source/core/unocore/unodraw.cxx426
-rw-r--r--sw/source/core/unocore/unoevent.cxx6
-rw-r--r--sw/source/core/unocore/unoevtlstnr.cxx18
-rw-r--r--sw/source/core/unocore/unofield.cxx151
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx56
-rwxr-xr-xsw/source/core/unocore/unoframe.cxx319
-rw-r--r--sw/source/core/unocore/unoftn.cxx156
-rw-r--r--sw/source/core/unocore/unoidx.cxx404
-rw-r--r--sw/source/core/unocore/unomap.cxx109
-rw-r--r--sw/source/core/unocore/unoobj.cxx460
-rw-r--r--sw/source/core/unocore/unoobj2.cxx139
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx241
-rw-r--r--sw/source/core/unocore/unoport.cxx186
-rw-r--r--sw/source/core/unocore/unoportenum.cxx117
-rw-r--r--sw/source/core/unocore/unoprnms.cxx14
-rw-r--r--sw/source/core/unocore/unoredline.cxx155
-rw-r--r--sw/source/core/unocore/unoredlines.cxx18
-rw-r--r--sw/source/core/unocore/unorefmk.cxx218
-rw-r--r--sw/source/core/unocore/unosect.cxx201
-rw-r--r--sw/source/core/unocore/unosett.cxx372
-rw-r--r--sw/source/core/unocore/unosrch.cxx117
-rw-r--r--sw/source/core/unocore/unostyle.cxx625
-rw-r--r--sw/source/core/unocore/unotbl.cxx439
-rw-r--r--sw/source/core/unocore/unotext.cxx322
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx21
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx254
-rw-r--r--sw/source/core/view/printdata.cxx26
-rwxr-xr-xsw/source/core/view/vdraw.cxx124
-rw-r--r--sw/source/core/view/viewimp.cxx192
-rw-r--r--sw/source/core/view/viewpg.cxx34
-rw-r--r--sw/source/core/view/viewsh.cxx667
-rw-r--r--sw/source/core/view/vnew.cxx109
-rw-r--r--sw/source/core/view/vprint.cxx155
-rw-r--r--sw/source/filter/ascii/ascatr.cxx2
-rw-r--r--sw/source/filter/ascii/parasc.cxx38
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx7
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx3
-rw-r--r--sw/source/filter/basflt/docfact.cxx15
-rw-r--r--sw/source/filter/basflt/fltini.cxx189
-rw-r--r--sw/source/filter/basflt/iodetect.cxx37
-rw-r--r--sw/source/filter/basflt/shellio.cxx80
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx22
-rw-r--r--sw/source/filter/html/css1atr.cxx177
-rw-r--r--sw/source/filter/html/css1kywd.cxx312
-rw-r--r--sw/source/filter/html/css1kywd.hxx311
-rw-r--r--sw/source/filter/html/htmlatr.cxx104
-rw-r--r--sw/source/filter/html/htmlbas.cxx20
-rw-r--r--sw/source/filter/html/htmlcss1.cxx81
-rw-r--r--sw/source/filter/html/htmlctxt.cxx17
-rw-r--r--sw/source/filter/html/htmldraw.cxx32
-rw-r--r--sw/source/filter/html/htmlfld.cxx36
-rw-r--r--sw/source/filter/html/htmlfld.hxx2
-rw-r--r--sw/source/filter/html/htmlfldw.cxx16
-rw-r--r--sw/source/filter/html/htmlfly.cxx50
-rw-r--r--sw/source/filter/html/htmlfly.hxx5
-rw-r--r--sw/source/filter/html/htmlflyt.cxx2
-rw-r--r--sw/source/filter/html/htmlform.cxx283
-rw-r--r--sw/source/filter/html/htmlform.hxx12
-rw-r--r--sw/source/filter/html/htmlforw.cxx126
-rw-r--r--sw/source/filter/html/htmlftn.cxx21
-rw-r--r--sw/source/filter/html/htmlgrin.cxx46
-rw-r--r--sw/source/filter/html/htmlnum.cxx90
-rw-r--r--sw/source/filter/html/htmlnum.hxx2
-rw-r--r--sw/source/filter/html/htmlplug.cxx152
-rw-r--r--sw/source/filter/html/htmlsect.cxx9
-rw-r--r--sw/source/filter/html/htmltab.cxx374
-rw-r--r--sw/source/filter/html/htmltabw.cxx47
-rw-r--r--sw/source/filter/html/htmlvsh.hxx2
-rw-r--r--sw/source/filter/html/parcss1.cxx51
-rw-r--r--sw/source/filter/html/parcss1.hxx2
-rw-r--r--sw/source/filter/html/svxcss1.cxx278
-rw-r--r--sw/source/filter/html/svxcss1.hxx10
-rw-r--r--sw/source/filter/html/swcss1.hxx2
-rw-r--r--sw/source/filter/html/swhtml.cxx424
-rw-r--r--sw/source/filter/html/swhtml.hxx66
-rw-r--r--sw/source/filter/html/wrthtml.cxx76
-rw-r--r--sw/source/filter/html/wrthtml.hxx8
-rw-r--r--sw/source/filter/inc/fltbase.hxx2
-rw-r--r--sw/source/filter/inc/fltglbls.hxx3
-rw-r--r--sw/source/filter/inc/fltini.hxx4
-rw-r--r--sw/source/filter/inc/fltshell.hxx20
-rw-r--r--sw/source/filter/inc/msfilter.hxx18
-rw-r--r--sw/source/filter/inc/rtf.hxx2
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx3
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx15
-rw-r--r--sw/source/filter/inc/wwstyles.hxx6
-rw-r--r--sw/source/filter/rtf/rtffld.cxx81
-rw-r--r--sw/source/filter/rtf/rtffly.cxx114
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx146
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx141
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx406
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx27
-rw-r--r--sw/source/filter/writer/writer.cxx28
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx11
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx79
-rw-r--r--sw/source/filter/ww1/fltshell.cxx202
-rw-r--r--sw/source/filter/ww1/w1class.cxx112
-rw-r--r--sw/source/filter/ww1/w1class.hxx108
-rw-r--r--sw/source/filter/ww1/w1filter.cxx127
-rw-r--r--sw/source/filter/ww1/w1par.cxx8
-rw-r--r--sw/source/filter/ww1/w1par.hxx4
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx109
-rw-r--r--sw/source/filter/ww1/w1struct.hxx79
-rw-r--r--sw/source/filter/ww8/README-rtf.txt30
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8FFData.hxx3
-rw-r--r--sw/source/filter/ww8/WW8FibData.cxx4
-rw-r--r--sw/source/filter/ww8/WW8FibData.hxx5
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx12
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx4
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx77
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx13
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx17
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx1566
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx70
-rw-r--r--sw/source/filter/ww8/docxexport.cxx158
-rw-r--r--sw/source/filter/ww8/docxexport.hxx50
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx80
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx15
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx3
-rw-r--r--sw/source/filter/ww8/dump/dump8.cxx171
-rw-r--r--sw/source/filter/ww8/dump/dump8a.cxx2746
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.cxx536
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.hxx102
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.cxx546
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.hxx43
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.cxx419
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.hxx86
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.cxx6667
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.hxx1488
-rw-r--r--sw/source/filter/ww8/dump/ww8struc.hxx815
-rw-r--r--sw/source/filter/ww8/escher.hxx14
-rw-r--r--sw/source/filter/ww8/fields.cxx15
-rw-r--r--sw/source/filter/ww8/fields.hxx5
-rw-r--r--sw/source/filter/ww8/hash_wrap.hxx27
-rw-r--r--sw/source/filter/ww8/needed_cast.hxx10
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx248
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx34
-rw-r--r--[-rwxr-xr-x]sw/source/filter/ww8/rtfexport.cxx70
-rw-r--r--[-rwxr-xr-x]sw/source/filter/ww8/rtfexport.hxx21
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx62
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx12
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.cxx12
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.hxx10
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx6
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx5
-rw-r--r--sw/source/filter/ww8/sortedarray.hxx15
-rw-r--r--sw/source/filter/ww8/staticassert.hxx5
-rw-r--r--sw/source/filter/ww8/styles.cxx9
-rw-r--r--sw/source/filter/ww8/tracer.cxx4
-rw-r--r--sw/source/filter/ww8/tracer.hxx6
-rw-r--r--sw/source/filter/ww8/types.hxx12
-rw-r--r--sw/source/filter/ww8/typessw.hxx46
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx181
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx80
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx405
-rw-r--r--sw/source/filter/ww8/writerwordglue.hxx10
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx216
-rw-r--r--[-rwxr-xr-x]sw/source/filter/ww8/wrtw8nds.cxx499
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx104
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx180
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx455
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx152
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx127
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx372
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx24
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx6
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx4
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx493
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx18
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx78
-rw-r--r--sw/source/filter/ww8/ww8par.cxx1056
-rw-r--r--sw/source/filter/ww8/ww8par.hxx67
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx402
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx11
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx198
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx37
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx319
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx616
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx427
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx25
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx84
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx1332
-rw-r--r--sw/source/filter/ww8/ww8toolbar.hxx379
-rw-r--r--sw/source/filter/xml/DocSettingNames.hxx3
-rw-r--r--sw/source/filter/xml/ForbiddenCharactersEnum.hxx3
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx39
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.hxx2
-rw-r--r--sw/source/filter/xml/swxml.cxx122
-rw-r--r--sw/source/filter/xml/wrtxml.cxx72
-rw-r--r--sw/source/filter/xml/wrtxml.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrsh.cxx6
-rw-r--r--sw/source/filter/xml/xmlbrshe.hxx2
-rw-r--r--sw/source/filter/xml/xmlbrshi.hxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx68
-rw-r--r--sw/source/filter/xml/xmlexp.hxx20
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx148
-rw-r--r--sw/source/filter/xml/xmlexpit.hxx3
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx22
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx27
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx7
-rw-r--r--sw/source/filter/xml/xmlimp.cxx195
-rw-r--r--sw/source/filter/xml/xmlimp.hxx6
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx62
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx3
-rw-r--r--sw/source/filter/xml/xmlitem.cxx3
-rw-r--r--sw/source/filter/xml/xmlitem.hxx2
-rw-r--r--sw/source/filter/xml/xmliteme.cxx4
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx5
-rw-r--r--sw/source/filter/xml/xmlitemm.cxx13
-rw-r--r--sw/source/filter/xml/xmlithlp.cxx152
-rw-r--r--sw/source/filter/xml/xmlithlp.hxx14
-rw-r--r--sw/source/filter/xml/xmlitmap.hxx3
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx2
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx26
-rw-r--r--sw/source/filter/xml/xmlscript.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx144
-rw-r--r--sw/source/filter/xml/xmltbli.cxx246
-rw-r--r--sw/source/filter/xml/xmltbli.hxx22
-rw-r--r--sw/source/filter/xml/xmltext.cxx5
-rw-r--r--sw/source/filter/xml/xmltexte.cxx74
-rw-r--r--sw/source/filter/xml/xmltexte.hxx3
-rw-r--r--sw/source/filter/xml/xmltexti.cxx96
-rw-r--r--sw/source/filter/xml/xmltexti.hxx4
-rw-r--r--sw/source/ui/app/app.src142
-rw-r--r--sw/source/ui/app/appenv.cxx126
-rw-r--r--sw/source/ui/app/apphdl.cxx80
-rw-r--r--sw/source/ui/app/applab.cxx108
-rw-r--r--sw/source/ui/app/appopt.cxx142
-rw-r--r--sw/source/ui/app/docsh.cxx204
-rwxr-xr-xsw/source/ui/app/docsh2.cxx429
-rw-r--r--sw/source/ui/app/docshdrw.cxx22
-rw-r--r--sw/source/ui/app/docshini.cxx150
-rw-r--r--sw/source/ui/app/docst.cxx225
-rw-r--r--sw/source/ui/app/docstyle.cxx341
-rw-r--r--sw/source/ui/app/error.src20
-rw-r--r--sw/source/ui/app/mainwn.cxx6
-rw-r--r--sw/source/ui/app/mn.src83
-rw-r--r--sw/source/ui/app/swdll.cxx73
-rw-r--r--sw/source/ui/app/swdllimpl.hxx42
-rw-r--r--sw/source/ui/app/swmodul1.cxx231
-rw-r--r--sw/source/ui/app/swmodule.cxx101
-rw-r--r--sw/source/ui/app/swwait.cxx2
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx19
-rw-r--r--sw/source/ui/cctrl/popbox.cxx21
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx78
-rw-r--r--sw/source/ui/chrdlg/break.cxx39
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx45
-rw-r--r--sw/source/ui/chrdlg/ccoll.src1
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx84
-rw-r--r--sw/source/ui/chrdlg/chrdlg.src1
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx233
-rw-r--r--sw/source/ui/chrdlg/drpcps.src1
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx55
-rw-r--r--sw/source/ui/chrdlg/numpara.src1
-rw-r--r--sw/source/ui/chrdlg/paradlg.src3
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx50
-rw-r--r--sw/source/ui/chrdlg/swbreak.src2
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx74
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx15
-rw-r--r--sw/source/ui/config/barcfg.cxx19
-rw-r--r--sw/source/ui/config/caption.cxx100
-rw-r--r--sw/source/ui/config/cfgitems.cxx109
-rw-r--r--sw/source/ui/config/config.hrc4
-rw-r--r--sw/source/ui/config/dbconfig.cxx20
-rw-r--r--sw/source/ui/config/fontcfg.cxx47
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx61
-rw-r--r--sw/source/ui/config/mailconfigpage.hrc1
-rw-r--r--sw/source/ui/config/mailconfigpage.src7
-rw-r--r--sw/source/ui/config/modcfg.cxx93
-rw-r--r--sw/source/ui/config/optcomp.cxx39
-rw-r--r--sw/source/ui/config/optdlg.hrc8
-rw-r--r--sw/source/ui/config/optdlg.src6
-rw-r--r--sw/source/ui/config/optload.cxx149
-rw-r--r--sw/source/ui/config/optload.hrc1
-rw-r--r--sw/source/ui/config/optload.src11
-rw-r--r--sw/source/ui/config/optpage.cxx294
-rw-r--r--sw/source/ui/config/prtopt.cxx14
-rw-r--r--sw/source/ui/config/uinums.cxx144
-rw-r--r--sw/source/ui/config/usrpref.cxx107
-rw-r--r--sw/source/ui/config/viewopt.cxx148
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx68
-rw-r--r--sw/source/ui/dbui/addresslistdialog.hxx10
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx85
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.hxx13
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src6
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx30
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.hxx8
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src5
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx174
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx342
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.cxx28
-rw-r--r--sw/source/ui/dbui/dbtablepreviewdialog.hxx8
-rw-r--r--sw/source/ui/dbui/dbtree.cxx125
-rw-r--r--sw/source/ui/dbui/dbui.cxx18
-rw-r--r--sw/source/ui/dbui/dbui.src2
-rw-r--r--sw/source/ui/dbui/maildispatcher.cxx6
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx116
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.hrc2
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src14
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx173
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx34
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx170
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx24
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src9
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx287
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx22
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx6
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx47
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx10
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx49
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx6
-rw-r--r--sw/source/ui/dbui/mmmergepage.cxx17
-rw-r--r--sw/source/ui/dbui/mmmergepage.hxx6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx183
-rw-r--r--sw/source/ui/dbui/mmoutputpage.hxx9
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx12
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx6
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.cxx26
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.hxx6
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx16
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.hxx7
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx30
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx60
-rw-r--r--sw/source/ui/dialog/abstract.cxx17
-rw-r--r--sw/source/ui/dialog/abstract.src5
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx17
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx30
-rw-r--r--sw/source/ui/dialog/dialog.src2
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx47
-rw-r--r--sw/source/ui/dialog/docstdlg.hrc2
-rw-r--r--sw/source/ui/dialog/docstdlg.src33
-rw-r--r--sw/source/ui/dialog/macassgn.cxx24
-rw-r--r--sw/source/ui/dialog/regionsw.cxx36
-rw-r--r--sw/source/ui/dialog/regionsw.hrc6
-rw-r--r--sw/source/ui/dialog/regionsw.src10
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx8
-rw-r--r--sw/source/ui/dialog/swdialmgr.cxx5
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx224
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx17
-rw-r--r--sw/source/ui/dialog/swuiexp.cxx3
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx3
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx361
-rw-r--r--sw/source/ui/dialog/wordcountdialog.cxx17
-rw-r--r--sw/source/ui/dialog/wordcountdialog.hrc30
-rw-r--r--sw/source/ui/dialog/wordcountdialog.src42
-rw-r--r--[-rwxr-xr-x]sw/source/ui/dochdl/gloshdl.cxx226
-rw-r--r--sw/source/ui/dochdl/selglos.cxx9
-rw-r--r--sw/source/ui/dochdl/selglos.src2
-rwxr-xr-xsw/source/ui/dochdl/swdtflvr.cxx523
-rw-r--r--sw/source/ui/docvw/AnchorOverlayObject.cxx5
-rw-r--r--sw/source/ui/docvw/AnchorOverlayObject.hxx7
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx7
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.hxx7
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx20
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx223
-rw-r--r--sw/source/ui/docvw/ShadowOverlayObject.cxx5
-rw-r--r--sw/source/ui/docvw/ShadowOverlayObject.hxx7
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx6
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.hxx9
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.cxx15
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.hxx7
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx151
-rw-r--r--sw/source/ui/docvw/SidebarWinAcc.cxx13
-rw-r--r--sw/source/ui/docvw/SidebarWinAcc.hxx7
-rw-r--r--sw/source/ui/docvw/annotation.hrc3
-rw-r--r--sw/source/ui/docvw/annotation.src3
-rw-r--r--sw/source/ui/docvw/docvw.hrc2
-rw-r--r--sw/source/ui/docvw/docvw.src3
-rw-r--r--sw/source/ui/docvw/edtdd.cxx51
-rw-r--r--sw/source/ui/docvw/edtwin.cxx960
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx92
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx37
-rw-r--r--sw/source/ui/docvw/extedit.cxx150
-rw-r--r--sw/source/ui/docvw/frmsidebarwincontainer.cxx6
-rw-r--r--sw/source/ui/docvw/frmsidebarwincontainer.hxx5
-rwxr-xr-xsw/source/ui/docvw/romenu.cxx96
-rw-r--r--sw/source/ui/docvw/romenu.hxx12
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx232
-rw-r--r--sw/source/ui/envelp/envelp.src1
-rw-r--r--sw/source/ui/envelp/envfmt.cxx245
-rw-r--r--sw/source/ui/envelp/envfmt.hrc10
-rw-r--r--sw/source/ui/envelp/envfmt.hxx8
-rw-r--r--sw/source/ui/envelp/envfmt.src1
-rw-r--r--sw/source/ui/envelp/envimg.cxx50
-rw-r--r--sw/source/ui/envelp/envlop.hrc8
-rw-r--r--sw/source/ui/envelp/envlop.src1
-rw-r--r--sw/source/ui/envelp/envlop1.cxx95
-rw-r--r--sw/source/ui/envelp/envprt.cxx90
-rw-r--r--sw/source/ui/envelp/envprt.hrc27
-rw-r--r--sw/source/ui/envelp/envprt.hxx4
-rw-r--r--sw/source/ui/envelp/envprt.src79
-rw-r--r--sw/source/ui/envelp/label.hrc8
-rw-r--r--sw/source/ui/envelp/label.src1
-rw-r--r--sw/source/ui/envelp/label1.cxx162
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx31
-rw-r--r--sw/source/ui/envelp/labelexp.cxx18
-rw-r--r--sw/source/ui/envelp/labfmt.cxx133
-rw-r--r--sw/source/ui/envelp/labfmt.hrc8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx4
-rw-r--r--sw/source/ui/envelp/labfmt.src1
-rw-r--r--sw/source/ui/envelp/labimg.cxx26
-rw-r--r--sw/source/ui/envelp/labimp.hxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx55
-rw-r--r--sw/source/ui/envelp/labprt.hrc6
-rw-r--r--sw/source/ui/envelp/labprt.hxx6
-rw-r--r--sw/source/ui/envelp/labprt.src1
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx99
-rw-r--r--sw/source/ui/envelp/mailmrge.hrc4
-rw-r--r--sw/source/ui/envelp/mailmrge.src2
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx9
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx20
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx11
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx3
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx2
-rw-r--r--sw/source/ui/fldui/changedb.cxx77
-rw-r--r--sw/source/ui/fldui/changedb.hrc6
-rw-r--r--sw/source/ui/fldui/flddb.cxx93
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx80
-rw-r--r--sw/source/ui/fldui/flddinf.hxx5
-rw-r--r--sw/source/ui/fldui/flddok.cxx102
-rw-r--r--sw/source/ui/fldui/flddok.hxx8
-rw-r--r--sw/source/ui/fldui/fldedt.cxx87
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx95
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx9
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx255
-rw-r--r--sw/source/ui/fldui/fldpage.cxx54
-rw-r--r--sw/source/ui/fldui/fldpage.hxx8
-rw-r--r--sw/source/ui/fldui/fldref.cxx190
-rw-r--r--sw/source/ui/fldui/fldref.hxx20
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx60
-rw-r--r--sw/source/ui/fldui/fldtdlg.hrc16
-rw-r--r--sw/source/ui/fldui/fldui.src52
-rw-r--r--sw/source/ui/fldui/fldvar.cxx200
-rw-r--r--sw/source/ui/fldui/fldvar.hxx14
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx70
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx18
-rw-r--r--sw/source/ui/fldui/javaedit.cxx68
-rw-r--r--sw/source/ui/fldui/javaedit.src1
-rw-r--r--sw/source/ui/fldui/xfldui.cxx20
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx213
-rw-r--r--sw/source/ui/fmtui/tmpdlg.src5
-rw-r--r--sw/source/ui/frmdlg/colex.cxx45
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx76
-rw-r--r--sw/source/ui/frmdlg/column.cxx378
-rw-r--r--sw/source/ui/frmdlg/column.hrc8
-rw-r--r--sw/source/ui/frmdlg/column.src123
-rw-r--r--sw/source/ui/frmdlg/cption.cxx38
-rw-r--r--sw/source/ui/frmdlg/cption.src2
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx25
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx63
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx543
-rw-r--r--sw/source/ui/frmdlg/frmpage.hrc1
-rw-r--r--sw/source/ui/frmdlg/frmpage.src4
-rw-r--r--sw/source/ui/frmdlg/frmui.src12
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx4
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx6
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx133
-rw-r--r--sw/source/ui/frmdlg/wrap.hrc49
-rw-r--r--sw/source/ui/frmdlg/wrap.src8
-rw-r--r--sw/source/ui/globdoc/globdoc.cxx10
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx6
-rw-r--r--sw/source/ui/inc/SidebarWindowsConsts.hxx7
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx4
-rw-r--r--sw/source/ui/inc/SwXFilterOptions.hxx6
-rw-r--r--sw/source/ui/inc/abstract.hxx12
-rw-r--r--sw/source/ui/inc/actctrl.hxx19
-rw-r--r--sw/source/ui/inc/addrdlg.hxx2
-rw-r--r--[-rwxr-xr-x]sw/source/ui/inc/annotsh.hxx6
-rw-r--r--sw/source/ui/inc/app.hrc211
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx4
-rw-r--r--sw/source/ui/inc/autoedit.hxx6
-rw-r--r--sw/source/ui/inc/barcfg.hxx3
-rw-r--r--sw/source/ui/inc/basesh.hxx15
-rw-r--r--sw/source/ui/inc/beziersh.hxx3
-rw-r--r--sw/source/ui/inc/bmpwin.hxx13
-rw-r--r--sw/source/ui/inc/bookctrl.hxx2
-rw-r--r--sw/source/ui/inc/bookmark.hxx13
-rw-r--r--sw/source/ui/inc/break.hxx10
-rw-r--r--sw/source/ui/inc/caption.hxx11
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx4
-rw-r--r--sw/source/ui/inc/cfgid.h3
-rw-r--r--sw/source/ui/inc/cfgitems.hxx24
-rw-r--r--sw/source/ui/inc/changedb.hxx15
-rw-r--r--sw/source/ui/inc/chartins.hxx2
-rw-r--r--sw/source/ui/inc/chldwrap.hxx2
-rw-r--r--sw/source/ui/inc/chrdlg.hxx22
-rw-r--r--sw/source/ui/inc/cnttab.hxx13
-rw-r--r--sw/source/ui/inc/colex.hxx15
-rw-r--r--sw/source/ui/inc/colmgr.hxx23
-rw-r--r--sw/source/ui/inc/column.hxx30
-rw-r--r--sw/source/ui/inc/conarc.hxx6
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx23
-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.hxx6
-rw-r--r--sw/source/ui/inc/content.hxx37
-rw-r--r--sw/source/ui/inc/conttree.hxx20
-rw-r--r--sw/source/ui/inc/convert.hxx5
-rw-r--r--sw/source/ui/inc/cption.hxx17
-rw-r--r--sw/source/ui/inc/dbconfig.hxx2
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx13
-rw-r--r--sw/source/ui/inc/dbtree.hxx3
-rw-r--r--sw/source/ui/inc/dbui.hxx4
-rw-r--r--sw/source/ui/inc/dialmgr.hxx3
-rw-r--r--sw/source/ui/inc/docfnote.hxx3
-rw-r--r--sw/source/ui/inc/docstdlg.hxx10
-rw-r--r--sw/source/ui/inc/drawbase.hxx14
-rw-r--r--sw/source/ui/inc/drawsh.hxx3
-rw-r--r--sw/source/ui/inc/drformsh.hxx3
-rw-r--r--sw/source/ui/inc/drpcps.hxx12
-rw-r--r--sw/source/ui/inc/drwbassh.hxx3
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx6
-rw-r--r--sw/source/ui/inc/dselect.hxx8
-rw-r--r--sw/source/ui/inc/edtwin.hxx69
-rw-r--r--sw/source/ui/inc/envimg.hxx36
-rw-r--r--sw/source/ui/inc/envlop.hxx16
-rw-r--r--sw/source/ui/inc/extedit.hxx50
-rw-r--r--sw/source/ui/inc/fldedt.hxx8
-rw-r--r--sw/source/ui/inc/fldmgr.hxx47
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx7
-rw-r--r--sw/source/ui/inc/fldwrap.hxx6
-rw-r--r--sw/source/ui/inc/fontcfg.hxx5
-rw-r--r--sw/source/ui/inc/formatclipboard.hxx3
-rw-r--r--sw/source/ui/inc/formedt.hxx14
-rw-r--r--sw/source/ui/inc/frmdlg.hxx7
-rw-r--r--sw/source/ui/inc/frmmgr.hxx26
-rw-r--r--sw/source/ui/inc/frmpage.hxx33
-rw-r--r--sw/source/ui/inc/frmsh.hxx3
-rw-r--r--sw/source/ui/inc/globals.h3
-rw-r--r--sw/source/ui/inc/glosbib.hxx12
-rw-r--r--sw/source/ui/inc/glosdoc.hxx3
-rw-r--r--sw/source/ui/inc/gloshdl.hxx9
-rw-r--r--sw/source/ui/inc/gloslst.hxx6
-rw-r--r--sw/source/ui/inc/glossary.hxx18
-rw-r--r--sw/source/ui/inc/glshell.hxx2
-rw-r--r--sw/source/ui/inc/grfsh.hxx3
-rw-r--r--sw/source/ui/inc/hidfunc.h350
-rw-r--r--sw/source/ui/inc/hyp.hxx17
-rw-r--r--sw/source/ui/inc/idxmrk.hxx8
-rw-r--r--sw/source/ui/inc/imaildsplistener.hxx3
-rw-r--r--sw/source/ui/inc/initui.hxx5
-rw-r--r--sw/source/ui/inc/inpdlg.hxx9
-rw-r--r--sw/source/ui/inc/inputwin.hxx6
-rw-r--r--sw/source/ui/inc/insfnote.hxx11
-rw-r--r--sw/source/ui/inc/insrule.hxx11
-rw-r--r--sw/source/ui/inc/instable.hxx11
-rw-r--r--sw/source/ui/inc/javaedit.hxx10
-rw-r--r--sw/source/ui/inc/label.hxx2
-rw-r--r--sw/source/ui/inc/labelcfg.hxx2
-rw-r--r--sw/source/ui/inc/labimg.hxx47
-rw-r--r--[-rwxr-xr-x]sw/source/ui/inc/langhelper.hxx3
-rw-r--r--sw/source/ui/inc/linenum.hxx11
-rw-r--r--sw/source/ui/inc/listsh.hxx3
-rw-r--r--sw/source/ui/inc/macassgn.hxx4
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx15
-rw-r--r--sw/source/ui/inc/maildispatcher.hxx6
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx9
-rw-r--r--sw/source/ui/inc/mailmergehelper.hxx34
-rw-r--r--sw/source/ui/inc/mailmergewizard.hxx2
-rw-r--r--sw/source/ui/inc/mailmrge.hxx20
-rw-r--r--sw/source/ui/inc/mediash.hxx3
-rw-r--r--sw/source/ui/inc/mergetbl.hxx6
-rw-r--r--sw/source/ui/inc/misc.hrc1
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx8
-rw-r--r--sw/source/ui/inc/multmrk.hxx14
-rw-r--r--sw/source/ui/inc/navicfg.hxx7
-rw-r--r--sw/source/ui/inc/navicont.hxx15
-rw-r--r--sw/source/ui/inc/navipi.hxx18
-rw-r--r--sw/source/ui/inc/navmgr.hxx74
-rw-r--r--sw/source/ui/inc/navsh.hxx51
-rw-r--r--sw/source/ui/inc/num.hxx36
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx2
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx2
-rw-r--r--sw/source/ui/inc/numpara.hxx9
-rw-r--r--sw/source/ui/inc/numprevw.hxx5
-rw-r--r--sw/source/ui/inc/olesh.hxx2
-rw-r--r--sw/source/ui/inc/olmenu.hxx2
-rw-r--r--sw/source/ui/inc/optcomp.hxx3
-rw-r--r--sw/source/ui/inc/optload.hxx20
-rw-r--r--sw/source/ui/inc/optpage.hxx50
-rw-r--r--sw/source/ui/inc/outline.hxx23
-rw-r--r--sw/source/ui/inc/pardlg.hxx3
-rw-r--r--sw/source/ui/inc/pattern.hxx2
-rw-r--r--sw/source/ui/inc/pgfnote.hxx18
-rw-r--r--sw/source/ui/inc/pggrid.hxx16
-rw-r--r--sw/source/ui/inc/popbox.hxx7
-rw-r--r--sw/source/ui/inc/prcntfld.hxx6
-rw-r--r--sw/source/ui/inc/pview.hxx26
-rw-r--r--sw/source/ui/inc/redlndlg.hxx25
-rw-r--r--sw/source/ui/inc/regionsw.hxx37
-rw-r--r--sw/source/ui/inc/rowht.hxx16
-rw-r--r--sw/source/ui/inc/scroll.hxx19
-rw-r--r--sw/source/ui/inc/selglos.hxx9
-rw-r--r--sw/source/ui/inc/sharedconnection.hxx3
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx2
-rw-r--r--sw/source/ui/inc/shells.hrc4
-rw-r--r--sw/source/ui/inc/split.hxx11
-rw-r--r--sw/source/ui/inc/splittbl.hxx2
-rw-r--r--sw/source/ui/inc/srcedtw.hxx5
-rw-r--r--sw/source/ui/inc/srcview.hxx29
-rw-r--r--sw/source/ui/inc/srtdlg.hxx10
-rw-r--r--sw/source/ui/inc/stmenu.hxx6
-rw-r--r--sw/source/ui/inc/swcont.hxx15
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx7
-rw-r--r--sw/source/ui/inc/swlbox.hxx14
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx3
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx10
-rw-r--r--sw/source/ui/inc/swtablerep.hxx2
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx2
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx41
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx30
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx3
-rw-r--r--sw/source/ui/inc/swvset.hxx3
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx3
-rw-r--r--sw/source/ui/inc/syncbtn.hxx12
-rw-r--r--sw/source/ui/inc/tabledlg.hxx5
-rw-r--r--sw/source/ui/inc/tablemgr.hxx3
-rw-r--r--sw/source/ui/inc/tabsh.hxx5
-rw-r--r--sw/source/ui/inc/tautofmt.hxx12
-rw-r--r--sw/source/ui/inc/tblctrl.hxx2
-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.hxx5
-rw-r--r--sw/source/ui/inc/textsh.hxx10
-rw-r--r--sw/source/ui/inc/titlepage.hxx102
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx7
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx6
-rw-r--r--sw/source/ui/inc/toxmgr.hxx19
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx20
-rw-r--r--sw/source/ui/inc/uinums.hxx17
-rw-r--r--sw/source/ui/inc/uitool.hxx22
-rw-r--r--sw/source/ui/inc/uivwimp.hxx11
-rw-r--r--sw/source/ui/inc/unodispatch.hxx12
-rw-r--r--sw/source/ui/inc/unotools.hxx13
-rw-r--r--sw/source/ui/inc/unotxvw.hxx11
-rw-r--r--sw/source/ui/inc/usrpref.hxx28
-rw-r--r--sw/source/ui/inc/utlui.hrc16
-rwxr-xr-xsw/source/ui/inc/view.hxx100
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx4
-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.hxx3
-rw-r--r--sw/source/ui/inc/wolesh.hxx2
-rw-r--r--sw/source/ui/inc/wordcountdialog.hxx9
-rw-r--r--sw/source/ui/inc/workctrl.hxx16
-rw-r--r--sw/source/ui/inc/wrap.hxx12
-rw-r--r--sw/source/ui/inc/wrtsh.hxx184
-rw-r--r--sw/source/ui/inc/wtabsh.hxx3
-rw-r--r--sw/source/ui/inc/wtextsh.hxx2
-rw-r--r--sw/source/ui/inc/wview.hxx7
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx2
-rw-r--r--sw/source/ui/index/cntex.cxx77
-rw-r--r--sw/source/ui/index/cnttab.cxx975
-rw-r--r--sw/source/ui/index/cnttab.hrc2
-rw-r--r--[-rwxr-xr-x]sw/source/ui/index/cnttab.src10
-rw-r--r--sw/source/ui/index/idxmrk.cxx38
-rw-r--r--sw/source/ui/index/idxmrk.src1
-rw-r--r--sw/source/ui/index/multmrk.cxx6
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx237
-rw-r--r--sw/source/ui/index/toxmgr.cxx54
-rw-r--r--[-rwxr-xr-x]sw/source/ui/lingu/hhcwrp.cxx97
-rw-r--r--sw/source/ui/lingu/hyp.cxx10
-rw-r--r--sw/source/ui/lingu/olmenu.cxx96
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.cxx20
-rw-r--r--sw/source/ui/lingu/sdrhhcwrap.hxx2
-rw-r--r--sw/source/ui/misc/bookmark.cxx66
-rw-r--r--sw/source/ui/misc/bookmark.src2
-rw-r--r--sw/source/ui/misc/docfnote.cxx75
-rw-r--r--sw/source/ui/misc/docfnote.src1
-rw-r--r--sw/source/ui/misc/glosbib.cxx79
-rw-r--r--sw/source/ui/misc/glosbib.src1
-rw-r--r--sw/source/ui/misc/glosdoc.cxx129
-rw-r--r--sw/source/ui/misc/glossary.cxx217
-rw-r--r--sw/source/ui/misc/glossary.hrc8
-rw-r--r--sw/source/ui/misc/glossary.src100
-rw-r--r--sw/source/ui/misc/glshell.cxx83
-rw-r--r--sw/source/ui/misc/impfnote.hxx11
-rw-r--r--sw/source/ui/misc/insfnote.cxx62
-rw-r--r--sw/source/ui/misc/insfnote.src1
-rw-r--r--sw/source/ui/misc/insrule.cxx47
-rw-r--r--sw/source/ui/misc/linenum.cxx105
-rw-r--r--sw/source/ui/misc/num.cxx169
-rw-r--r--sw/source/ui/misc/num.src5
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx26
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.src2
-rw-r--r--sw/source/ui/misc/outline.cxx283
-rw-r--r--sw/source/ui/misc/outline.src1
-rw-r--r--sw/source/ui/misc/pgfnote.cxx201
-rw-r--r--sw/source/ui/misc/pgfnote.hrc9
-rw-r--r--sw/source/ui/misc/pgfnote.src54
-rw-r--r--sw/source/ui/misc/pggrid.cxx107
-rw-r--r--sw/source/ui/misc/pggrid.hrc2
-rw-r--r--sw/source/ui/misc/pggrid.src12
-rw-r--r--sw/source/ui/misc/redlndlg.cxx265
-rw-r--r--sw/source/ui/misc/redlndlg.src1
-rw-r--r--sw/source/ui/misc/srtdlg.cxx31
-rw-r--r--sw/source/ui/misc/srtdlg.src4
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx41
-rw-r--r--sw/source/ui/misc/titlepage.cxx367
-rw-r--r--sw/source/ui/misc/titlepage.hrc50
-rw-r--r--sw/source/ui/misc/titlepage.src244
-rw-r--r--sw/source/ui/ribbar/conarc.cxx7
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx15
-rw-r--r--sw/source/ui/ribbar/conform.cxx4
-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.cxx26
-rw-r--r--sw/source/ui/ribbar/dselect.cxx2
-rw-r--r--[-rwxr-xr-x]sw/source/ui/ribbar/inputwin.cxx52
-rw-r--r--sw/source/ui/ribbar/inputwin.src10
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx3
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx32
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx184
-rw-r--r--sw/source/ui/ribbar/workctrl.hrc3
-rw-r--r--sw/source/ui/ribbar/workctrl.src58
-rw-r--r--[-rwxr-xr-x]sw/source/ui/shells/annotsh.cxx140
-rw-r--r--sw/source/ui/shells/basesh.cxx217
-rw-r--r--sw/source/ui/shells/beziersh.cxx24
-rw-r--r--sw/source/ui/shells/drawdlg.cxx40
-rw-r--r--sw/source/ui/shells/drawsh.cxx46
-rw-r--r--sw/source/ui/shells/drformsh.cxx8
-rw-r--r--sw/source/ui/shells/drwbassh.cxx67
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx76
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx204
-rw-r--r--sw/source/ui/shells/frmsh.cxx239
-rw-r--r--sw/source/ui/shells/grfsh.cxx68
-rw-r--r--sw/source/ui/shells/grfshex.cxx4
-rw-r--r--[-rwxr-xr-x]sw/source/ui/shells/langhelper.cxx51
-rw-r--r--sw/source/ui/shells/listsh.cxx14
-rw-r--r--sw/source/ui/shells/mediash.cxx17
-rw-r--r--sw/source/ui/shells/navsh.cxx139
-rw-r--r--sw/source/ui/shells/olesh.cxx14
-rw-r--r--sw/source/ui/shells/shells.src1
-rw-r--r--sw/source/ui/shells/slotadd.cxx6
-rw-r--r--sw/source/ui/shells/tabsh.cxx159
-rw-r--r--sw/source/ui/shells/textdrw.cxx11
-rw-r--r--sw/source/ui/shells/textfld.cxx40
-rw-r--r--sw/source/ui/shells/textglos.cxx14
-rw-r--r--sw/source/ui/shells/textidx.cxx29
-rw-r--r--[-rwxr-xr-x]sw/source/ui/shells/textsh.cxx186
-rw-r--r--sw/source/ui/shells/textsh1.cxx193
-rw-r--r--sw/source/ui/shells/textsh2.cxx22
-rw-r--r--sw/source/ui/shells/txtattr.cxx108
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx41
-rw-r--r--sw/source/ui/shells/txtnum.cxx40
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx9
-rw-r--r--sw/source/ui/table/chartins.cxx28
-rw-r--r--sw/source/ui/table/chartins.src2
-rw-r--r--sw/source/ui/table/colwd.cxx14
-rw-r--r--sw/source/ui/table/convert.cxx7
-rw-r--r--sw/source/ui/table/instable.cxx9
-rw-r--r--sw/source/ui/table/mergetbl.cxx6
-rw-r--r--sw/source/ui/table/rowht.cxx12
-rw-r--r--sw/source/ui/table/rowht.src2
-rw-r--r--sw/source/ui/table/splittbl.cxx7
-rw-r--r--sw/source/ui/table/swtablerep.cxx46
-rw-r--r--sw/source/ui/table/tabledlg.cxx222
-rw-r--r--sw/source/ui/table/tabledlg.src1
-rw-r--r--sw/source/ui/table/tablemgr.cxx26
-rw-r--r--sw/source/ui/table/tablepg.hxx12
-rw-r--r--sw/source/ui/table/tautofmt.cxx50
-rw-r--r--sw/source/ui/table/tautofmt.src2
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx45
-rw-r--r--sw/source/ui/uiview/pview.cxx424
-rw-r--r--sw/source/ui/uiview/pview.src1
-rw-r--r--sw/source/ui/uiview/scroll.cxx20
-rw-r--r--sw/source/ui/uiview/srcview.cxx112
-rw-r--r--sw/source/ui/uiview/swcli.cxx11
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx41
-rwxr-xr-xsw/source/ui/uiview/view.cxx217
-rw-r--r--sw/source/ui/uiview/view.src1
-rw-r--r--sw/source/ui/uiview/view0.cxx31
-rw-r--r--sw/source/ui/uiview/view1.cxx34
-rw-r--r--sw/source/ui/uiview/view2.cxx213
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx12
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx7
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx24
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx93
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uiview/viewling.cxx208
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx160
-rw-r--r--sw/source/ui/uiview/viewport.cxx82
-rw-r--r--sw/source/ui/uiview/viewprt.cxx56
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx71
-rw-r--r--sw/source/ui/uiview/viewstat.cxx21
-rw-r--r--sw/source/ui/uiview/viewtab.cxx142
-rw-r--r--sw/source/ui/uno/RefreshListenerContainer.cxx3
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx89
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.hxx7
-rw-r--r--sw/source/ui/uno/SwXFilterOptions.cxx41
-rw-r--r--sw/source/ui/uno/detreg.cxx2
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx44
-rw-r--r--sw/source/ui/uno/swdet2.cxx31
-rw-r--r--sw/source/ui/uno/swdetect.cxx41
-rw-r--r--sw/source/ui/uno/swdetect.hxx5
-rw-r--r--sw/source/ui/uno/unoatxt.cxx293
-rw-r--r--sw/source/ui/uno/unodefaults.cxx14
-rw-r--r--sw/source/ui/uno/unodefaults.hxx2
-rw-r--r--sw/source/ui/uno/unodispatch.cxx64
-rw-r--r--sw/source/ui/uno/unodoc.cxx16
-rw-r--r--sw/source/ui/uno/unofreg.cxx25
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx82
-rw-r--r--sw/source/ui/uno/unomod.cxx75
-rw-r--r--sw/source/ui/uno/unomodule.cxx14
-rw-r--r--sw/source/ui/uno/unomodule.hxx3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uno/unotxdoc.cxx635
-rw-r--r--[-rwxr-xr-x]sw/source/ui/uno/unotxvw.cxx381
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx30
-rw-r--r--sw/source/ui/utlui/attrdesc.src14
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx22
-rw-r--r--sw/source/ui/utlui/condedit.cxx12
-rw-r--r--sw/source/ui/utlui/content.cxx512
-rw-r--r--sw/source/ui/utlui/glbltree.cxx153
-rw-r--r--sw/source/ui/utlui/gloslst.cxx29
-rw-r--r--sw/source/ui/utlui/initui.cxx38
-rw-r--r--sw/source/ui/utlui/initui.src3
-rw-r--r--sw/source/ui/utlui/navicfg.cxx20
-rw-r--r--sw/source/ui/utlui/navipi.cxx155
-rw-r--r--sw/source/ui/utlui/navipi.hrc1
-rw-r--r--sw/source/ui/utlui/navipi.src31
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx58
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx76
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx2
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx15
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx4
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx22
-rw-r--r--sw/source/ui/utlui/uiitems.cxx85
-rw-r--r--sw/source/ui/utlui/uitool.cxx60
-rw-r--r--sw/source/ui/utlui/unotools.cxx97
-rw-r--r--sw/source/ui/utlui/utlui.src99
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx48
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx16
-rw-r--r--sw/source/ui/vba/service.cxx7
-rw-r--r--sw/source/ui/vba/vbaaddin.cxx2
-rw-r--r--sw/source/ui/vba/vbaaddin.hxx3
-rw-r--r--sw/source/ui/vba/vbaaddins.cxx5
-rw-r--r--sw/source/ui/vba/vbaaddins.hxx3
-rw-r--r--sw/source/ui/vba/vbaapplication.cxx20
-rw-r--r--sw/source/ui/vba/vbaapplication.hxx4
-rw-r--r--sw/source/ui/vba/vbaautotextentry.cxx31
-rw-r--r--sw/source/ui/vba/vbaautotextentry.hxx3
-rw-r--r--sw/source/ui/vba/vbabookmark.cxx9
-rw-r--r--sw/source/ui/vba/vbabookmark.hxx3
-rw-r--r--sw/source/ui/vba/vbabookmarks.cxx17
-rw-r--r--sw/source/ui/vba/vbabookmarks.hxx5
-rw-r--r--sw/source/ui/vba/vbaborders.cxx14
-rw-r--r--sw/source/ui/vba/vbaborders.hxx2
-rw-r--r--sw/source/ui/vba/vbacell.cxx119
-rw-r--r--sw/source/ui/vba/vbacell.hxx67
-rw-r--r--sw/source/ui/vba/vbacells.cxx223
-rw-r--r--sw/source/ui/vba/vbacells.hxx75
-rw-r--r--sw/source/ui/vba/vbacheckbox.cxx97
-rw-r--r--sw/source/ui/vba/vbacheckbox.hxx58
-rw-r--r--sw/source/ui/vba/vbacolumn.cxx165
-rw-r--r--sw/source/ui/vba/vbacolumn.hxx68
-rw-r--r--sw/source/ui/vba/vbacolumns.cxx160
-rw-r--r--sw/source/ui/vba/vbacolumns.hxx75
-rw-r--r--sw/source/ui/vba/vbadialog.cxx3
-rw-r--r--sw/source/ui/vba/vbadialog.hxx3
-rw-r--r--sw/source/ui/vba/vbadialogs.cxx2
-rw-r--r--sw/source/ui/vba/vbadialogs.hxx3
-rw-r--r--sw/source/ui/vba/vbadocument.cxx165
-rw-r--r--sw/source/ui/vba/vbadocument.hxx23
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx24
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.hxx5
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx5
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/vba/vbaeventshelper.cxx3
-rw-r--r--[-rwxr-xr-x]sw/source/ui/vba/vbaeventshelper.hxx2
-rw-r--r--sw/source/ui/vba/vbafield.cxx121
-rw-r--r--sw/source/ui/vba/vbafield.hxx5
-rw-r--r--sw/source/ui/vba/vbafind.cxx9
-rw-r--r--sw/source/ui/vba/vbafind.hxx6
-rw-r--r--sw/source/ui/vba/vbafont.cxx9
-rw-r--r--sw/source/ui/vba/vbafont.hxx3
-rw-r--r--sw/source/ui/vba/vbaformfield.cxx138
-rw-r--r--sw/source/ui/vba/vbaformfield.hxx61
-rw-r--r--sw/source/ui/vba/vbaformfields.cxx205
-rw-r--r--sw/source/ui/vba/vbaformfields.hxx60
-rw-r--r--sw/source/ui/vba/vbaframe.cxx74
-rw-r--r--sw/source/ui/vba/vbaframe.hxx57
-rw-r--r--sw/source/ui/vba/vbaframes.cxx109
-rw-r--r--sw/source/ui/vba/vbaframes.hxx61
-rw-r--r--sw/source/ui/vba/vbaglobals.cxx14
-rw-r--r--sw/source/ui/vba/vbaglobals.hxx4
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.cxx3
-rw-r--r--sw/source/ui/vba/vbaheaderfooter.hxx3
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.cxx131
-rw-r--r--sw/source/ui/vba/vbaheaderfooterhelper.hxx23
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.cxx150
-rw-r--r--sw/source/ui/vba/vbaheadersfooters.hxx62
-rw-r--r--sw/source/ui/vba/vbainformationhelper.cxx3
-rw-r--r--sw/source/ui/vba/vbainformationhelper.hxx3
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx120
-rw-r--r--sw/source/ui/vba/vbalistformat.hxx60
-rw-r--r--sw/source/ui/vba/vbalistgalleries.cxx115
-rw-r--r--sw/source/ui/vba/vbalistgalleries.hxx61
-rw-r--r--sw/source/ui/vba/vbalistgallery.cxx72
-rw-r--r--sw/source/ui/vba/vbalistgallery.hxx58
-rw-r--r--sw/source/ui/vba/vbalisthelper.cxx705
-rw-r--r--sw/source/ui/vba/vbalisthelper.hxx77
-rw-r--r--sw/source/ui/vba/vbalistlevel.cxx400
-rw-r--r--sw/source/ui/vba/vbalistlevel.hxx81
-rw-r--r--sw/source/ui/vba/vbalistlevels.cxx118
-rw-r--r--sw/source/ui/vba/vbalistlevels.hxx62
-rw-r--r--sw/source/ui/vba/vbalisttemplate.cxx79
-rw-r--r--sw/source/ui/vba/vbalisttemplate.hxx60
-rw-r--r--sw/source/ui/vba/vbalisttemplates.cxx112
-rw-r--r--sw/source/ui/vba/vbalisttemplates.hxx62
-rw-r--r--sw/source/ui/vba/vbaoptions.cxx7
-rw-r--r--sw/source/ui/vba/vbaoptions.hxx3
-rw-r--r--sw/source/ui/vba/vbapagesetup.cxx10
-rw-r--r--sw/source/ui/vba/vbapagesetup.hxx3
-rw-r--r--sw/source/ui/vba/vbapalette.cxx5
-rw-r--r--sw/source/ui/vba/vbapalette.hxx3
-rw-r--r--sw/source/ui/vba/vbapane.cxx2
-rw-r--r--sw/source/ui/vba/vbapane.hxx3
-rw-r--r--sw/source/ui/vba/vbapanes.cxx3
-rw-r--r--sw/source/ui/vba/vbapanes.hxx3
-rw-r--r--sw/source/ui/vba/vbaparagraph.cxx19
-rw-r--r--sw/source/ui/vba/vbaparagraph.hxx5
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.cxx12
-rw-r--r--sw/source/ui/vba/vbaparagraphformat.hxx3
-rw-r--r--sw/source/ui/vba/vbarange.cxx122
-rw-r--r--sw/source/ui/vba/vbarange.hxx23
-rw-r--r--sw/source/ui/vba/vbarangehelper.cxx33
-rw-r--r--sw/source/ui/vba/vbarangehelper.hxx6
-rw-r--r--sw/source/ui/vba/vbareplacement.cxx8
-rw-r--r--sw/source/ui/vba/vbareplacement.hxx6
-rw-r--r--sw/source/ui/vba/vbarevision.cxx104
-rw-r--r--sw/source/ui/vba/vbarevision.hxx60
-rw-r--r--sw/source/ui/vba/vbarevisions.cxx188
-rw-r--r--sw/source/ui/vba/vbarevisions.hxx66
-rw-r--r--sw/source/ui/vba/vbarow.cxx135
-rw-r--r--sw/source/ui/vba/vbarow.hxx69
-rw-r--r--sw/source/ui/vba/vbarows.cxx368
-rw-r--r--sw/source/ui/vba/vbarows.hxx87
-rw-r--r--sw/source/ui/vba/vbasection.cxx17
-rw-r--r--sw/source/ui/vba/vbasection.hxx7
-rw-r--r--sw/source/ui/vba/vbasections.cxx16
-rw-r--r--sw/source/ui/vba/vbasections.hxx5
-rw-r--r--sw/source/ui/vba/vbaselection.cxx804
-rw-r--r--sw/source/ui/vba/vbaselection.hxx38
-rw-r--r--sw/source/ui/vba/vbastyle.cxx146
-rw-r--r--sw/source/ui/vba/vbastyle.hxx23
-rw-r--r--sw/source/ui/vba/vbastyles.cxx163
-rw-r--r--sw/source/ui/vba/vbastyles.hxx3
-rw-r--r--sw/source/ui/vba/vbasystem.cxx141
-rw-r--r--sw/source/ui/vba/vbasystem.hxx3
-rw-r--r--sw/source/ui/vba/vbatable.cxx26
-rw-r--r--sw/source/ui/vba/vbatable.hxx8
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx295
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx70
-rw-r--r--sw/source/ui/vba/vbatableofcontents.cxx124
-rw-r--r--sw/source/ui/vba/vbatableofcontents.hxx70
-rw-r--r--sw/source/ui/vba/vbatables.cxx103
-rw-r--r--sw/source/ui/vba/vbatables.hxx3
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.cxx195
-rw-r--r--sw/source/ui/vba/vbatablesofcontents.hxx64
-rw-r--r--sw/source/ui/vba/vbatabstop.cxx62
-rw-r--r--sw/source/ui/vba/vbatabstop.hxx54
-rw-r--r--sw/source/ui/vba/vbatabstops.cxx280
-rw-r--r--sw/source/ui/vba/vbatabstops.hxx65
-rw-r--r--sw/source/ui/vba/vbatemplate.cxx63
-rw-r--r--sw/source/ui/vba/vbatemplate.hxx6
-rw-r--r--sw/source/ui/vba/vbavariable.cxx2
-rw-r--r--sw/source/ui/vba/vbavariable.hxx3
-rw-r--r--sw/source/ui/vba/vbavariables.cxx3
-rw-r--r--sw/source/ui/vba/vbavariables.hxx3
-rw-r--r--sw/source/ui/vba/vbaview.cxx49
-rw-r--r--sw/source/ui/vba/vbaview.hxx3
-rw-r--r--sw/source/ui/vba/vbawindow.cxx46
-rw-r--r--sw/source/ui/vba/vbawindow.hxx5
-rw-r--r--sw/source/ui/vba/vbawrapformat.cxx2
-rw-r--r--sw/source/ui/vba/vbawrapformat.hxx3
-rw-r--r--sw/source/ui/vba/wordvbahelper.cxx101
-rw-r--r--sw/source/ui/vba/wordvbahelper.hxx18
-rw-r--r--sw/source/ui/web/wdocsh.cxx14
-rw-r--r--sw/source/ui/web/wformsh.cxx6
-rw-r--r--sw/source/ui/web/wfrmsh.cxx19
-rw-r--r--sw/source/ui/web/wgrfsh.cxx2
-rw-r--r--sw/source/ui/web/wlistsh.cxx4
-rw-r--r--sw/source/ui/web/wolesh.cxx4
-rw-r--r--sw/source/ui/web/wtabsh.cxx4
-rw-r--r--sw/source/ui/web/wtextsh.cxx18
-rw-r--r--sw/source/ui/web/wview.cxx21
-rw-r--r--sw/source/ui/wrtsh/delete.cxx45
-rw-r--r--sw/source/ui/wrtsh/move.cxx97
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx224
-rw-r--r--sw/source/ui/wrtsh/select.cxx8
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx206
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx26
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx12
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx44
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx3
-rwxr-xr-xsw/uiconfig/sglobal/menubar/menubar.xml10
-rw-r--r--sw/uiconfig/sglobal/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/sglobal/toolbar/standardbar.xml2
-rwxr-xr-xsw/uiconfig/sweb/menubar/menubar.xml11
-rw-r--r--sw/uiconfig/sweb/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/sweb/toolbar/standardbar.xml2
-rwxr-xr-xsw/uiconfig/swform/menubar/menubar.xml10
-rw-r--r--sw/uiconfig/swform/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/swform/toolbar/standardbar.xml2
-rwxr-xr-xsw/uiconfig/swreport/menubar/menubar.xml10
-rw-r--r--sw/uiconfig/swreport/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/swreport/toolbar/standardbar.xml2
-rwxr-xr-xsw/uiconfig/swriter/menubar/menubar.xml11
-rw-r--r--sw/uiconfig/swriter/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/swriter/toolbar/navigationobjectbar.xml6
-rw-r--r--sw/uiconfig/swriter/toolbar/standardbar.xml2
-rwxr-xr-xsw/uiconfig/swxform/menubar/menubar.xml10
-rw-r--r--sw/uiconfig/swxform/statusbar/statusbar.xml2
-rw-r--r--sw/uiconfig/swxform/toolbar/standardbar.xml2
-rw-r--r--sw/util/msword.component7
-rw-r--r--sw/util/sw.component7
-rw-r--r--sw/xml/writer.xml2
1903 files changed, 52124 insertions, 75590 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index 271e7577e6c7..aac0fbc8d496 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -37,34 +37,36 @@ $(eval $(call gb_SrsTarget_set_include,sw/res,\
$$(INCLUDE) \
-I$(OUTDIR)/inc \
-I$(WORKDIR)/inc/sw \
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/source/core/undo \
- -I$(SRCDIR)/sw/source/core/unocore \
- -I$(SRCDIR)/sw/source/ui/chrdlg \
- -I$(SRCDIR)/sw/source/ui/config \
- -I$(SRCDIR)/sw/source/ui/dbui \
- -I$(SRCDIR)/sw/source/ui/dialog \
- -I$(SRCDIR)/sw/source/ui/docvw \
- -I$(SRCDIR)/sw/source/ui/envelp \
- -I$(SRCDIR)/sw/source/ui/fldui \
- -I$(SRCDIR)/sw/source/ui/fmtui \
- -I$(SRCDIR)/sw/source/ui/frmdlg \
- -I$(SRCDIR)/sw/source/ui/globdoc \
- -I$(SRCDIR)/sw/source/ui/inc \
- -I$(SRCDIR)/sw/source/ui/index \
- -I$(SRCDIR)/sw/source/ui/lingu \
- -I$(SRCDIR)/sw/source/ui/misc \
- -I$(SRCDIR)/sw/source/ui/ribbar \
- -I$(SRCDIR)/sw/source/ui/shells \
- -I$(SRCDIR)/sw/source/ui/smartmenu \
- -I$(SRCDIR)/sw/source/ui/table \
- -I$(SRCDIR)/sw/source/ui/uiview \
- -I$(SRCDIR)/sw/source/ui/utlui \
- -I$(SRCDIR)/sw/source/ui/web \
- -I$(SRCDIR)/sw/source/ui/wrtsh \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/core/undo) \
+ -I$(realpath $(SRCDIR)/sw/source/core/unocore) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/chrdlg) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/config) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/dbui) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/dialog) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/docvw) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/envelp) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/fldui) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/fmtui) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/frmdlg) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/globdoc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/index) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/lingu) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/misc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/ribbar) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/shells) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/smartmenu) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/table) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/uiview) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/utlui) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/web) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/wrtsh) \
))
$(eval $(call gb_SrsTarget_add_files,sw/res,\
+ sw/source/core/layout/pagefrm.src \
sw/source/core/undo/undo.src \
sw/source/core/unocore/unocore.src \
sw/source/ui/app/app.src \
@@ -156,6 +158,7 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
sw/source/ui/misc/pggrid.src \
sw/source/ui/misc/redlndlg.src \
sw/source/ui/misc/srtdlg.src \
+ sw/source/ui/misc/titlepage.src \
sw/source/ui/ribbar/inputwin.src \
sw/source/ui/ribbar/tbxanchr.src \
sw/source/ui/ribbar/workctrl.src \
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
new file mode 100644
index 000000000000..9953cea2f5b1
--- /dev/null
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -0,0 +1,117 @@
+#*************************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_swdoc_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_swdoc_test, \
+ sw/qa/core/swdoc-test \
+ sw/qa/core/Test-BigPtrArray \
+))
+
+$(call gb_CxxObject_get_target,sw/qa/core/swdoc-test): $(WORKDIR)/AllLangRes/sw
+
+$(eval $(call gb_CppunitTest_add_library_objects,sw_swdoc_test,sw))
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_swdoc_test, \
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ i18nisolang1 \
+ i18nutil \
+ icuuc \
+ lng \
+ sal \
+ salhelper \
+ sb \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ swd \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ xml2 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_swdoc_test,\
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_swdoc_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_swdoc_test,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sw_swdoc_test,\
+ sw_swdoc_test \
+))
+
+$(call gb_CppunitTest_get_target,sw_swdoc_test) : \
+ $(call gb_AllLangResTarget_get_target,sw)
+
+$(eval $(call gb_CppunitTest_set_args,sw_swdoc_test,\
+ --headless \
+ --invisible \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,sw_swdoc_test))
+
+$(eval $(call gb_RdbTarget_add_components,sw_swdoc_test,\
+ sfx2/util/sfx \
+ framework/util/fwk \
+ unoxml/source/service/unoxml \
+ fileaccess/source/fileacc \
+ comphelper/util/comphelp \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sw_swdoc_test,\
+ i18npool \
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4:
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
new file mode 100644
index 000000000000..15b3f7a5e9eb
--- /dev/null
+++ b/sw/CppunitTest_sw_test_filters.mk
@@ -0,0 +1,97 @@
+#*************************************************************************
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Caolán McNamara, Red Hat, Inc. <caolanm@redhat.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#*************************************************************************
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_filters_test))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_filters_test, \
+ sw/qa/core/filters-test \
+))
+
+$(call gb_CxxObject_get_target,sw/qa/core/filters-test): $(WORKDIR)/AllLangRes/sw
+
+$(eval $(call gb_CppunitTest_add_linked_libs,sw_filters_test, \
+ sw \
+ sfx \
+ svl \
+ svt \
+ vcl \
+ tl \
+ ucbhelper \
+ utl \
+ i18nisolang1 \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_filters_test,\
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_CppunitTest_uses_ure,sw_filters_test))
+
+$(eval $(call gb_CppunitTest_add_type_rdbs,sw_filters_test,\
+ types \
+))
+
+$(eval $(call gb_CppunitTest_add_service_rdbs,sw_filters_test,\
+ sw_filters_test \
+))
+
+$(eval $(call gb_CppunitTest_set_args,sw_filters_test,\
+ --headless \
+ --invisible \
+))
+
+$(eval $(call gb_RdbTarget_RdbTarget,sw_filters_test))
+
+$(eval $(call gb_RdbTarget_add_components,sw_filters_test,\
+ sw/util/sw \
+ sw/util/msword \
+ sfx2/util/sfx \
+ framework/util/fwk \
+ unoxml/source/service/unoxml \
+ fileaccess/source/fileacc \
+ comphelper/util/comphelp \
+))
+
+$(eval $(call gb_RdbTarget_add_old_components,sw_filters_test,\
+ i18npool \
+ ucb1 \
+ ucpfile1 \
+))
+
+# vim: set noet sw=4:
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 1a8efd6d6a16..f740014ef6cb 100755
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -33,17 +33,17 @@ $(eval $(call gb_JunitTest_set_defs,sw_complex,\
))
$(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
+ sw/qa/complex/accessibility/AccessibleRelationSet \
sw/qa/complex/checkColor/CheckChangeColor \
sw/qa/complex/indeterminateState/CheckIndeterminateState \
+ sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
- sw/qa/complex/writer/LoadSaveTest \
- sw/qa/complex/writer/CheckNamedPropertyValues \
+ sw/qa/complex/writer/CheckFlies \
sw/qa/complex/writer/CheckIndexedPropertyValues \
+ sw/qa/complex/writer/CheckNamedPropertyValues \
+ sw/qa/complex/writer/LoadSaveTest \
sw/qa/complex/writer/TestDocument \
- sw/qa/complex/writer/CheckBookmarks \
- sw/qa/complex/writer/CheckFlies \
sw/qa/complex/writer/TextPortionEnumerationTest \
- sw/qa/complex/accessibility/AccessibleRelationSet \
))
$(eval $(call gb_JunitTest_add_jars,sw_complex,\
@@ -61,8 +61,9 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.writer.CheckFlies \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
- complex.writer.TextPortionEnumerationTest \
))
+# fd#35657 test disabled - reenable if fixed
+# complex.writer.TextPortionEnumerationTest \
# CheckBookmarks currently fails on windows because the hashes are different
ifneq ($(OS),WNT)
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index 5e18565e17f0..d148319a589d 100755
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -42,12 +42,8 @@ $(eval $(call gb_JunitTest_add_jars,sw_unoapi,\
$(OUTDIR)/bin/jurt.jar \
))
-$(eval $(call gb_JunitTest_add_sourcefiles,sw_unoapi,\
- sw/qa/unoapi/Test \
-))
-
$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
- org.openoffice.sw.qa.unoapi.Test \
+ org.openoffice.test.UnoApiTest \
))
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index b59967db2930..e90639e18104 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -30,14 +30,15 @@ $(eval $(call gb_Library_Library,msword))
$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
$(eval $(call gb_Library_set_include,msword,\
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/inc/pch \
- -I$(SRCDIR)/sw/inc \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc/sw \
))
@@ -52,13 +53,14 @@ $(eval $(call gb_Library_add_linked_libs,msword,\
i18nutil \
msfilter \
sal \
+ sax \
+ sb \
+ oox \
sfx \
sot \
- stl \
svl \
svt \
svx \
- svx \
svxcore \
sw \
tk \
@@ -77,6 +79,9 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/rtf/rtfnum \
sw/source/filter/rtf/rtftbl \
sw/source/filter/rtf/swparrtf \
+ sw/source/filter/ww8/docxattributeoutput \
+ sw/source/filter/ww8/docxexport \
+ sw/source/filter/ww8/docxexportfilter \
sw/source/filter/ww8/rtfattributeoutput \
sw/source/filter/ww8/rtfexport \
sw/source/filter/ww8/rtfexportfilter \
@@ -108,6 +113,14 @@ $(eval $(call gb_Library_add_exception_objects,msword,\
sw/source/filter/ww8/ww8par5 \
sw/source/filter/ww8/ww8par6 \
sw/source/filter/ww8/ww8scan \
+ sw/source/filter/ww8/ww8toolbar \
))
+# TODO: This should be really fixed in writerfilter so the header is
+# delivered before compilation starts.
+$(call gb_CxxObject_get_target,sw/source/filter/ww8/wrtw8nds) \
+$(call gb_CxxObject_get_target,sw/source/filter/ww8/wrtww8gr) \
+$(call gb_CxxObject_get_target,sw/source/filter/ww8/ww8atr) \
+ : $(OUTDIR)/inc/writerfilter/doctok/sprmids.hxx
+
# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 0b1ff66ca2e7..a2a555af9d01 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -34,14 +34,15 @@ $(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompi
$(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
$(eval $(call gb_Library_set_include,sw,\
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
- -I$(SRCDIR)/sw/inc/pch \
- -I$(SRCDIR)/sw/inc \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
+ $(if $(filter YES,$(SYSTEM_LIBXML)),$(LIBXML_CFLAGS)) \
-I$(OUTDIR)/inc/offuh \
-I$(OUTDIR)/inc \
))
@@ -66,7 +67,6 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
sb \
sfx \
sot \
- stl \
svl \
svt \
svx \
@@ -78,8 +78,8 @@ $(eval $(call gb_Library_add_linked_libs,sw,\
utl \
vbahelper \
vcl \
- vos3 \
xo \
+ xml2 \
$(gb_STDLIBS) \
))
@@ -248,8 +248,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/edit/edtox \
sw/source/core/edit/edundo \
sw/source/core/edit/edws \
- sw/source/core/except/dbgloop \
- sw/source/core/except/errhdl \
sw/source/core/fields/authfld \
sw/source/core/fields/cellfml \
sw/source/core/fields/chpfld \
@@ -285,6 +283,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/layout/calcmove \
sw/source/core/layout/colfrm \
sw/source/core/layout/dbg_lay \
+ sw/source/core/layout/dumpfilter \
sw/source/core/layout/findfrm \
sw/source/core/layout/flowfrm \
sw/source/core/layout/fly \
@@ -378,6 +377,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/text/txttab \
sw/source/core/text/widorp \
sw/source/core/text/wrong \
+ sw/source/core/text/xmldump \
sw/source/core/tox/tox \
sw/source/core/tox/toxhlp \
sw/source/core/tox/txmsrt \
@@ -587,6 +587,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/docvw/edtwin \
sw/source/ui/docvw/edtwin2 \
sw/source/ui/docvw/edtwin3 \
+ sw/source/ui/docvw/extedit \
sw/source/ui/docvw/frmsidebarwincontainer \
sw/source/ui/docvw/romenu \
sw/source/ui/docvw/srcedtw \
@@ -637,6 +638,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/shells/langhelper \
sw/source/ui/shells/listsh \
sw/source/ui/shells/mediash \
+ sw/source/ui/shells/navsh \
sw/source/ui/shells/olesh \
sw/source/ui/shells/slotadd \
sw/source/ui/shells/tabsh \
@@ -719,6 +721,7 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/ui/web/wview \
sw/source/ui/wrtsh/delete \
sw/source/ui/wrtsh/move \
+ sw/source/ui/wrtsh/navmgr \
sw/source/ui/wrtsh/select \
sw/source/ui/wrtsh/wrtsh1 \
sw/source/ui/wrtsh/wrtsh2 \
@@ -730,8 +733,8 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/sdi \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ -I$(realpath $(SRCDIR)/sw/sdi) \
$$(INCLUDE) \
))
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 1979b04cbcf3..067adb7e2757 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -33,16 +33,17 @@ $(eval $(call gb_Library_set_include,swd,\
$$(INCLUDE) \
-I$(WORKDIR)/inc/sw/sdi \
-I$(WORKDIR)/inc/sw \
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/inc/pch \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(OUTDIR)/inc/offuh \
))
$(eval $(call gb_Library_add_defs,swd,\
-DSWD_DLLIMPLEMENTATION \
+ -DSWD_DLLIMPLEMENTATION \
))
$(eval $(call gb_Library_add_linked_libs,swd,\
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index 386a10cf5d4d..c46b6035347a 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -28,11 +28,11 @@
$(eval $(call gb_Library_Library,swui))
$(eval $(call gb_Library_set_include,swui,\
- -I$(SRCDIR)/sw/inc \
- -I$(SRCDIR)/sw/inc/pch \
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(realpath $(SRCDIR)/sw/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
-I$(WORKDIR)/SdiTarget/sw/sdi \
-I$(WORKDIR)/Misc/sw \
$$(INCLUDE) \
@@ -49,14 +49,13 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
sal \
sfx \
sot \
- stl \
svl \
svt \
svx \
svx \
svxcore \
sw \
- swd \
+ swd \
tk \
tl \
ucbhelper \
@@ -66,7 +65,6 @@ $(eval $(call gb_Library_add_linked_libs,swui,\
))
$(eval $(call gb_Library_add_exception_objects,swui,\
- sw/source/core/undo/SwRewriter \
sw/source/ui/chrdlg/break \
sw/source/ui/chrdlg/chardlg \
sw/source/ui/chrdlg/drpcps \
@@ -151,6 +149,7 @@ $(eval $(call gb_Library_add_exception_objects,swui,\
sw/source/ui/misc/pggrid \
sw/source/ui/misc/srtdlg \
sw/source/ui/misc/swmodalredlineacceptdlg \
+ sw/source/ui/misc/titlepage \
sw/source/ui/table/colwd \
sw/source/ui/table/convert \
sw/source/ui/table/instable \
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 718cbeb515e1..42a1c9115b5d 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Library_Library,vbaswobj))
$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
$(eval $(call gb_Library_set_include,vbaswobj,\
- -I$(SRCDIR)/sw/source/core/inc \
- -I$(SRCDIR)/sw/source/filter/inc \
- -I$(SRCDIR)/sw/source/ui/inc \
- -I$(SRCDIR)/sw/inc/pch \
- -I$(SRCDIR)/sw/inc \
+ -I$(realpath $(SRCDIR)/sw/source/core/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/filter/inc) \
+ -I$(realpath $(SRCDIR)/sw/source/ui/inc) \
+ -I$(realpath $(SRCDIR)/sw/inc/pch) \
+ -I$(realpath $(SRCDIR)/sw/inc) \
-I$(WORKDIR)/Misc/sw/ \
$$(INCLUDE) \
-I$(OUTDIR)/inc/offuh \
@@ -50,7 +50,6 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
sal \
sb \
sfx \
- stl \
svl \
svt \
svx \
@@ -66,16 +65,33 @@ $(eval $(call gb_Library_add_linked_libs,vbaswobj,\
$(eval $(call gb_Library_add_exception_objects,vbaswobj,\
sw/source/ui/vba/service \
+ sw/source/ui/vba/vbarange \
+ sw/source/ui/vba/vbacell \
+ sw/source/ui/vba/vbacells \
+ sw/source/ui/vba/vbacolumn \
+ sw/source/ui/vba/vbacolumns \
+ sw/source/ui/vba/vbaframe \
+ sw/source/ui/vba/vbaframes \
+ sw/source/ui/vba/vbalistformat \
+ sw/source/ui/vba/vbalistgallery \
+ sw/source/ui/vba/vbalistgalleries \
+ sw/source/ui/vba/vbalisthelper \
+ sw/source/ui/vba/vbalistlevel \
+ sw/source/ui/vba/vbalistlevels \
+ sw/source/ui/vba/vbalisttemplate \
+ sw/source/ui/vba/vbalisttemplates \
+ sw/source/ui/vba/vbarevision \
+ sw/source/ui/vba/vbarevisions \
+ sw/source/ui/vba/vbarow \
+ sw/source/ui/vba/vbarows \
sw/source/ui/vba/vbadocument \
sw/source/ui/vba/vbasections \
sw/source/ui/vba/vbadialog \
sw/source/ui/vba/vbawrapformat \
sw/source/ui/vba/vbafont \
- sw/source/ui/vba/vbaheaderfooterhelper \
sw/source/ui/vba/vbarangehelper \
sw/source/ui/vba/vbaaddin \
sw/source/ui/vba/vbaautotextentry \
- sw/source/ui/vba/vbarange \
sw/source/ui/vba/vbadocumentproperties \
sw/source/ui/vba/vbaeventshelper \
sw/source/ui/vba/vbastyle \
@@ -85,6 +101,8 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
sw/source/ui/vba/vbaaddins \
sw/source/ui/vba/vbaview \
sw/source/ui/vba/vbaheaderfooter \
+ sw/source/ui/vba/vbaheadersfooters \
+ sw/source/ui/vba/vbaheaderfooterhelper \
sw/source/ui/vba/vbabookmarks \
sw/source/ui/vba/vbaoptions \
sw/source/ui/vba/vbadialogs \
@@ -97,12 +115,17 @@ $(eval $(call gb_Library_add_exception_objects,vbaswobj,\
sw/source/ui/vba/vbawindow \
sw/source/ui/vba/vbareplacement \
sw/source/ui/vba/vbatable \
+ sw/source/ui/vba/vbatablehelper \
+ sw/source/ui/vba/vbatabstop \
+ sw/source/ui/vba/vbatabstops \
sw/source/ui/vba/vbaselection \
sw/source/ui/vba/vbasystem \
sw/source/ui/vba/vbainformationhelper \
sw/source/ui/vba/vbapagesetup \
sw/source/ui/vba/vbafield \
sw/source/ui/vba/vbatables \
+ sw/source/ui/vba/vbatableofcontents \
+ sw/source/ui/vba/vbatablesofcontents \
sw/source/ui/vba/vbavariable \
sw/source/ui/vba/vbadocuments \
sw/source/ui/vba/vbaparagraphformat \
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index c6257e22fc93..527c8ea1c1df 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -39,6 +39,11 @@ $(eval $(call gb_Module_add_targets,sw,\
Package_xml \
))
+$(eval $(call gb_Module_add_check_targets,sw,\
+ CppunitTest_sw_test_filters \
+ CppunitTest_sw_swdoc_test \
+))
+
$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
JunitTest_sw_complex \
JunitTest_sw_unoapi \
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 2cad9784eb92..c5ee34505af0 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -208,6 +208,7 @@ $(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolb
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/navigationobjectbar.xml,swriter/toolbar/navigationobjectbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml))
$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml))
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index ef39ad6e4c8f..1a0a05bb8db6 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,10 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: $
- *
- * $Revision: $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -81,3 +78,5 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
} } // end of namespace sw::annotation
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 209fea22da72..e8befb722fc0 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -254,3 +255,5 @@ class SwEnhancedPDFExportHelper
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index 910ae4405f4b..bc76cb0cf859 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,6 @@ class SwFlyFrmFmt;
class SwFmtAnchor;
class SwFlyFrm;
-// OD 2006-02-28 #125892#
// helper class to track change of anchor node of at-paragraph respectively
// at-character anchored fly frames
// if such a change happens, it has to be checked, if the count of the anchor
@@ -79,3 +79,5 @@ private:
void operator=( const SwHandleAnchorNodeChg );
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index 46fa17feaa2e..18c0aba92b2f 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -67,3 +68,4 @@ class SwChartLockController_Helper;
#endif // IDOCUMENTCHARTDATAPROVIDER_HXX_INCLUDED
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 3b2c5deaa556..01091e92e9d6 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -73,77 +74,71 @@
};
public:
- /** Kopieren eines Bereiches im oder in ein anderes Dokument !
- Die Position kann auch im Bereich liegen !!
- */
+ /** Copying of a range within or to another document.
+ The position can also be within the range!
+ */
virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll ) const = 0;
- /** Loesche die Section, in der der Node steht.
+ /** Delete section containing the node.
*/
virtual void DeleteSection(SwNode* pNode) = 0;
- /** loeschen eines BereichesSwFlyFrmFmt
+ /** Delete a range SwFlyFrmFmt.
*/
virtual bool DeleteRange(SwPaM&) = 0;
- /** loeschen gesamter Absaetze
+ /** Delete full paragraphs.
*/
virtual bool DelFullPara(SwPaM&) = 0;
/** complete delete of a given PaM
- OD 2009-08-20 #i100466#
+ #i100466#
Add optional parameter <bForceJoinNext>, default value <false>
Needed for hiding of deletion redlines
*/
virtual bool DeleteAndJoin( SwPaM&,
const bool bForceJoinNext = false ) = 0;
- /** verschieben eines Bereiches
- */
virtual bool MoveRange(SwPaM&, SwPosition&, SwMoveFlags) = 0;
- /** verschieben ganzer Nodes
- */
virtual bool MoveNodeRange(SwNodeRange&, SwNodeIndex&, SwMoveFlags) = 0;
- /** verschieben eines Bereiches
+ /** Move a range.
*/
virtual bool MoveAndJoin(SwPaM&, SwPosition&, SwMoveFlags) = 0;
- /** Ueberschreiben eines Strings in einem bestehenden Textnode.
+ /** Overwrite string in an existing text node.
*/
virtual bool Overwrite(const SwPaM &rRg, const String& rStr) = 0;
/** Insert string into existing text node at position rRg.Point().
- */
+ */
virtual bool InsertString(const SwPaM &rRg, const String&,
const enum InsertFlags nInsertMode = INS_EMPTYEXPAND ) = 0;
/** change text to Upper/Lower/Hiragana/Katagana/...
- */
+ */
virtual void TransliterateText(const SwPaM& rPaM, utl::TransliterationWrapper&) = 0;
- /** Einfuegen einer Grafik, Formel. Die XXXX werden kopiert.
- */
+ /** Insert graphic or formula. The XXXX are copied.
+ */
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const String& rGrfName, const String& rFltName, const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
- /**
- */
virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
- /** austauschen einer Grafik (mit Undo)
- */
+ /** Transpose graphic (with undo)
+ */
virtual void ReRead(SwPaM&, const String& rGrfName, const String& rFltName, const Graphic* pGraphic, const GraphicObject* pGrfObj) = 0;
- /** Einfuegen eines DrawObjectes. Das Object muss bereits im DrawModel
- angemeldet sein.
+ /** Insert a DrawObject. The object must be already registered
+ in DrawModel.
*/
virtual SwDrawFrmFmt* Insert(const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet* pFlyAttrSet, SwFrmFmt*) = 0;
- /** Einfuegen von OLE-Objecten.
+ /** Insert OLE-objects.
*/
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
@@ -151,43 +146,36 @@
virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const String& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
- /** Aufspalten eines Nodes an rPos (nur fuer den TxtNode implementiert)
+ /** Split a node at rPos (implemented only for TxtNode).
*/
virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) = 0;
- /**
- */
virtual bool AppendTxtNode(SwPosition& rPos) = 0;
- /** Ersetz einen selektierten Bereich in einem TextNode mit dem
- String. Ist fuers Suchen&Ersetzen gedacht.
- bRegExpRplc - ersetze Tabs (\\t) und setze den gefundenen String
- ein ( nicht \& )
- z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
- --> "xx\t<Tab>..zzz..&"
+ /** Replace selected range in a TxtNode with string.
+ Intended for search & replace.
+ bRegExpRplc - replace tabs (\\t) and insert the found string
+ ( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&"
+ --> "xx\t<Tab>..zzz..&"
*/
virtual bool ReplaceRange(SwPaM& rPam, const String& rNewStr,
const bool bRegExReplace) = 0;
- /** Einfuegen eines Attributs. Erstreckt sich rRg ueber
- mehrere Nodes, wird das Attribut aufgespaltet, sofern
- dieses Sinn macht. Nodes, in denen dieses Attribut keinen
- Sinn macht, werden ignoriert. In vollstaendig in der
- Selektion eingeschlossenen Nodes wird das Attribut zu
- harter Formatierung, in den anderen (Text-)Nodes wird das
- Attribut in das Attributearray eingefuegt. Bei einem
- Zeichenattribut wird ein "leerer" Hint eingefuegt,
- wenn keine Selektion
- vorliegt; andernfalls wird das Attribut als harte
- Formatierung dem durch rRg.Start() bezeichneten Node
- hinzugefuegt. Wenn das Attribut nicht eingefuegt werden
- konnte, liefert die Methode sal_False.
+ /** Insert an attribute. If rRg spans several nodes the
+ attribute is split, provided it makes sense.
+ Nodes, where this attribute does not make sense are ignored.
+ In nodes completely enclosed in the selection the attribute
+ becomes hard-formated, in all other (text-) nodes the attribute
+ is inserted into the attribute array.
+ For a character attribute, in cases where no selection exists
+ an "empty" hint is inserted. If there is a selection the attribute
+ is hard-formated and added to the node at rRg.Start().
+ If the attribute could not be inserted, the method returns
+ sal_False.
*/
virtual bool InsertPoolItem(const SwPaM &rRg, const SfxPoolItem&,
const sal_uInt16 nFlags) = 0;
- /**
- */
virtual bool InsertItemSet (const SwPaM &rRg, const SfxItemSet&,
const sal_uInt16 nFlags) = 0;
@@ -201,3 +189,4 @@
#endif // IDOCUMENTCONTENTOPERATIONS_HXX_INCLUDED
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 42923a2fadf4..40c680bb597f 100755..100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -143,3 +144,5 @@
};
#endif // IDOCUMENTDEVICEACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentDrawModelAccess.hxx b/sw/inc/IDocumentDrawModelAccess.hxx
index 916554b69770..36e1d354321d 100644
--- a/sw/inc/IDocumentDrawModelAccess.hxx
+++ b/sw/inc/IDocumentDrawModelAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,13 +54,11 @@ public:
virtual SdrLayerID GetInvisibleControlsId() const = 0;
/** method to notify drawing page view about the invisible layers
- OD 26.06.2003 #108784#
@author OD
*/
virtual void NotifyInvisibleLayers( SdrPageView& _rSdrPageView ) = 0;
/** method to determine, if a layer ID belongs to the visible ones.
- OD 25.06.2003 #108784#
Note: If given layer ID is unknown, method asserts and returns <false>.
@author OD
@@ -73,7 +72,6 @@ public:
/** method to determine, if the corresponding visible layer ID for a invisible one.
- OD 25.06.2003 #108784#
Note: If given layer ID is a visible one, method returns given layer ID.
Note: If given layer ID is unknown, method returns given layer ID.
@@ -89,7 +87,6 @@ public:
/** method to determine, if the corresponding invisible layer ID for a visible one.
- OD 25.06.2003 #108784#
Note: If given layer ID is a invisible one, method returns given layer ID.
Note: If given layer ID is unknown, method returns given layer ID.
@@ -109,3 +106,5 @@ protected:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 51051e4fa020..8abdeae369c5 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,7 +28,7 @@
#ifndef INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
#define INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
namespace sw
@@ -53,7 +54,7 @@ typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
class IDocumentExternalData
{
protected:
- typedef ::std::hash_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash>
+ typedef ::boost::unordered_map<sw::tExternalDataType, sw::tExternalDataPointer, sw::ExternalDataTypeHash>
tExternalData;
tExternalData m_externalData;
@@ -67,3 +68,5 @@ public:
};
#endif //INCLUDED_I_DOCUMENT_EXTERNAL_DATA_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index be17fb7636f5..4cc0318cd852 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -53,35 +54,20 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
class IDocumentFieldsAccess
{
public:
- /**
- */
virtual const SwFldTypes *GetFldTypes() const = 0;
- /**
- */
virtual SwFieldType *InsertFldType(const SwFieldType &) = 0;
- /**
- */
virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const = 0;
- /**
- */
virtual SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName, bool bDbFieldMatching) const = 0;
- /**
- */
virtual void RemoveFldType(sal_uInt16 nFld) = 0;
- /**
- */
virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
- /**
- */
virtual void InsDeletedFldType(SwFieldType &) = 0;
- // #111840#
/**
Puts a value into a field at a certain position.
@@ -96,9 +82,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
*/
virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0;
- // rufe das Update der Expression Felder auf; alle Ausdruecke werden
- // neu berechnet.
- // #111840#
+ // Call update of expression fields. All expressions are re-evaluated.
/** Updates a field.
@@ -112,39 +96,22 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
*/
virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
- /**
- */
virtual void UpdateRefFlds(SfxPoolItem* pHt) = 0;
- /**
- */
virtual void UpdateTblFlds(SfxPoolItem* pHt) = 0;
- /**
- */
virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) = 0;
- /**
- */
virtual void UpdateUsrFlds() = 0;
- /**
- */
virtual void UpdatePageFlds(SfxPoolItem*) = 0;
- /**
- */
virtual void LockExpFlds() = 0;
- /**
- */
virtual void UnlockExpFlds() = 0;
- /**
- */
virtual bool IsExpFldsLocked() const = 0;
-
virtual SwDocUpdtFld& GetUpdtFlds() const = 0;
/* @@@MAINTAINABILITY-HORROR@@@
@@ -153,35 +120,23 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
*/
virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) = 0;
- /**
- */
virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0;
- // Setze im Calculator alle SetExpresion Felder, die bis zur
- // angegebenen Position (Node [ + ::com::sun::star::ucb::Content]) gueltig sind. Es kann
- // eine erzeugte Liste aller Felder mit uebergegeben werden.
- // (ist die Adresse != 0, und der Pointer == 0 wird eine neue
- // Liste returnt.)
+
+ // In Calculator set all SetExpression fields that are valid up to the indicated position
+ // (Node [ + ::com::sun::star::ucb::Content]).
+ // A generated list of all fields may be passed along too
+ // (if the addreess != 0 and the pointer == 0 a new list will be returned).
virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
- /**
- */
virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0;
- /**
- */
virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) = 0;
- /**
- */
virtual bool IsNewFldLst() const = 0;
- /**
- */
virtual void SetNewFldLst( bool bFlag) = 0;
- /**
- */
virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) = 0;
protected:
@@ -189,3 +144,5 @@ protected:
};
#endif // IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index ee04ec055f1a..0e995e857650 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -80,3 +81,5 @@ protected:
};
#endif // IDOCUMENTLAYOUTACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLineNumberAccess.hxx b/sw/inc/IDocumentLineNumberAccess.hxx
index 77c4c9e02307..b4a6327dcc33 100644
--- a/sw/inc/IDocumentLineNumberAccess.hxx
+++ b/sw/inc/IDocumentLineNumberAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -49,3 +50,4 @@ class SwLineNumberInfo;
#endif // IDOCUMENTLINENUMBERACCESS_HXX_INCLUDED
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 44fd8c148044..fb3d3c8c89e0 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,49 +40,35 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
class IDocumentLinksAdministration
{
public:
- /** Links un-/sichtbar in LinkManager einfuegen (gelinkte Bereiche)
+ /** Insert links in-/visibly into LinkManager (linked ranges).
*/
virtual bool IsVisibleLinks() const = 0;
- /**
- */
virtual void SetVisibleLinks(bool bFlag) = 0;
- /**
- */
virtual sfx2::LinkManager& GetLinkManager() = 0;
- /**
- */
virtual const sfx2::LinkManager& GetLinkManager() const = 0;
- /** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
+ /** #i42634# Moved common code of SwReader::Read() and
SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
*/
virtual void UpdateLinks(sal_Bool bUI) = 0;
- /** SS fuers Linken von Dokumentteilen
+ /** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents.
*/
virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const = 0;
- /**
- */
virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue) = 0;
- /**
- */
virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem) = 0;
- /** embedded alle lokalen Links (Bereiche/Grafiken)
+ /** Embed all local links (ranges/graphics).
*/
virtual bool EmbedAllLinks() = 0;
- /**
- */
virtual void SetLinksUpdated(const bool bNewLinksUpdated) = 0;
- /**
- */
virtual bool LinksUpdated() const = 0;
protected:
@@ -89,3 +76,5 @@ protected:
};
#endif // IDOCUMENTLINKSADMINISTRATION_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentListItems.hxx b/sw/inc/IDocumentListItems.hxx
index 0232fc86f104..8031993f17e4 100644
--- a/sw/inc/IDocumentListItems.hxx
+++ b/sw/inc/IDocumentListItems.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,3 +60,5 @@ protected:
};
#endif // IDOCUMENTLISTITEMS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentListsAccess.hxx b/sw/inc/IDocumentListsAccess.hxx
index e811496edc56..7685a0bd6568 100644
--- a/sw/inc/IDocumentListsAccess.hxx
+++ b/sw/inc/IDocumentListsAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -45,13 +46,13 @@ class IDocumentListsAccess
virtual SwList* createListForListStyle( const String sListStyleName ) = 0;
virtual SwList* getListForListStyle( const String sListStyleName ) const = 0;
virtual void deleteListForListStyle( const String sListStyleName ) = 0;
- // --> OD 2008-07-08 #i91400#
+ // #i91400#
virtual void trackChangeOfListStyleName( const String sListStyleName,
const String sNewListStyleName ) = 0;
- // <--
-
protected:
virtual ~IDocumentListsAccess() {};
};
#endif // IDOCUMENTLISTSACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 55fc0901a7e0..e3cff0189cf4 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -249,3 +250,5 @@ class IDocumentMarkAccess
};
#endif // IDOCUMENTBOOKMARKACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index 88a8148a2a52..9468fa9c14bb 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,3 +56,5 @@ protected:
};
#endif // IDOCUMENTOUTLINENODES_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 97570f0d0461..ffa24645181b 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,31 +60,31 @@ namespace nsRedlineMode_t
const RedlineMode_t REDLINE_SHOW_DELETE = 0x20;// show all delets
const RedlineMode_t REDLINE_SHOW_MASK = REDLINE_SHOW_INSERT | REDLINE_SHOW_DELETE;
- // fuer die interne Verwaltung:
- // die originalen Redlines inclusive des Contents entfernen
- // (ClipBoard/Textbausteine)
+ // For internal management:
+ // remove the original Redlines together with their content
+ // (Clipboard/text modules).
const RedlineMode_t REDLINE_DELETE_REDLINES = 0x100;
- // beim Loeschen innerhalb ein RedlineObjectes, waehrend des Appends,
- // das DeleteRedline ignorieren
+ // When deleting within a RedlineObject
+ // ignore the DeleteRedline during Append.
const RedlineMode_t REDLINE_IGNOREDELETE_REDLINES = 0x200;
- // don't combine any readlines. This flags is may only used in the Undo.
+ // don't combine any redlines. This flag may be only used in Undo.
const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400;
}
typedef sal_uInt16 RedlineType_t;
namespace nsRedlineType_t
{
- // die RedlineTypen gehen von 0 bis 127
- const RedlineType_t REDLINE_INSERT = 0x0;// Inhalt wurde eingefuegt
- const RedlineType_t REDLINE_DELETE = 0x1;// Inhalt wurde geloescht
- const RedlineType_t REDLINE_FORMAT = 0x2;// Attributierung wurde angewendet
- const RedlineType_t REDLINE_TABLE = 0x3;// TabellenStruktur wurde veraendert
- const RedlineType_t REDLINE_FMTCOLL = 0x4;// FormatVorlage wurde veraendert (Autoformat!)
-
- // ab 128 koennen Flags hineinverodert werden
+ // Range of RedlineTypes is 0 to 127.
+ const RedlineType_t REDLINE_INSERT = 0x0;// Content has been inserted.
+ const RedlineType_t REDLINE_DELETE = 0x1;// Content has been deleted.
+ const RedlineType_t REDLINE_FORMAT = 0x2;// Attributes have been applied.
+ const RedlineType_t REDLINE_TABLE = 0x3;// Table structure has been altered.
+ const RedlineType_t REDLINE_FMTCOLL = 0x4;// Style has been altered (Autoformat!).
+
+ // When larger than 128, flags can be inserted.
const RedlineType_t REDLINE_NO_FLAG_MASK = 0x7F;
//const RedlineType_t REDLINE_FLAG_MASK = 0xFF80;
- const RedlineType_t REDLINE_FORM_AUTOFMT = 0x80;// kann als Flag im RedlineType stehen
+ const RedlineType_t REDLINE_FORM_AUTOFMT = 0x80;// Can be a flag in RedlineType.
}
/** IDocumentRedlineAccess
@@ -138,18 +139,11 @@ public:
*/
virtual bool IsRedlineOn() const = 0;
- /**
- */
virtual bool IsIgnoreRedline() const = 0;
- /**
- */
virtual const SwRedlineTbl& GetRedlineTbl() const = 0;
-
- /*
- */
- virtual bool IsInRedlines(const SwNode& rNode) const = 0;
+ virtual bool IsInRedlines(const SwNode& rNode) const = 0;
/***************************************************
Manipulation
@@ -165,90 +159,60 @@ public:
*/
virtual bool AppendRedline(/*[in]*/SwRedline* pPtr, /*[in]*/bool bCallDelete) = 0;
- /**
- */
virtual bool SplitRedline(/*[in]*/const SwPaM& rPam) = 0;
- /**
- */
virtual bool DeleteRedline(
/*[in]*/const SwPaM& rPam,
/*[in]*/bool bSaveInUndo,
/*[in]*/sal_uInt16 nDelType) = 0;
- /**
- */
virtual bool DeleteRedline(
/*[in]*/const SwStartNode& rSection,
/*[in]*/bool bSaveInUndo,
/*[in]*/sal_uInt16 nDelType) = 0;
- /**
- */
virtual sal_uInt16 GetRedlinePos(
/*[in]*/const SwNode& rNode,
/*[in]*/sal_uInt16 nType) const = 0;
virtual void CompressRedlines() = 0;
- /**
- */
virtual const SwRedline* GetRedline(
/*[in]*/const SwPosition& rPos,
/*[in]*/sal_uInt16* pFndPos) const = 0;
- /**
- */
virtual bool IsRedlineMove() const = 0;
- /**
- */
virtual void SetRedlineMove(/*[in]*/bool bFlag) = 0;
- /**
- */
virtual bool AcceptRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) = 0;
- /**
- */
virtual bool AcceptRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) = 0;
- /**
- */
virtual bool RejectRedline(/*[in]*/sal_uInt16 nPos, /*[in]*/bool bCallDelete) = 0;
- /**
- */
virtual bool RejectRedline(/*[in]*/const SwPaM& rPam, /*[in]*/bool bCallDelete) = 0;
- /**
- */
virtual const SwRedline* SelNextRedline(/*[in]*/SwPaM& rPam) const = 0;
- /**
- */
virtual const SwRedline* SelPrevRedline(/*[in]*/SwPaM& rPam) const = 0;
- // alle Redline invalidieren, die Darstellung hat sich geaendert
+ // Representation has changed, invalidate all Redlines.
virtual void UpdateRedlineAttr() = 0;
- // legt gegebenenfalls einen neuen Author an
+ // Create a new Author if required.
virtual sal_uInt16 GetRedlineAuthor() = 0;
- // fuer die Reader usw. - neuen Author in die Tabelle eintragen
+ // For Readers etc.: register new Author in table.
virtual sal_uInt16 InsertRedlineAuthor(const String& rAuthor) = 0;
- // Kommentar am Redline an der Position setzen
+ // Place a comment at Redline at given position.
virtual bool SetRedlineComment(
/*[in]*/const SwPaM& rPam,
/*[in]*/const String& rComment) = 0;
- /**
- */
virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const = 0;
- /**
- */
virtual void SetRedlinePassword(
/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword) = 0;
@@ -257,3 +221,5 @@ public:
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 214b9769ed32..1dd769912c06 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,7 @@
#define IDOCUMENTSETTINGACCESS_HXX_INCLUDED
#include <tools/solar.h>
-#ifndef _VOS_REF_HXX
-#include <vos/ref.hxx>
-#endif
+#include <rtl/ref.hxx>
#include <chcmprse.hxx>
#include <fldupde.hxx>
@@ -78,9 +77,11 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
USE_OLD_PRINTER_METRICS,
TABS_RELATIVE_TO_INDENT,
PROTECT_FORM,
- // --> OD 2008-06-05 #i89181#
+ // #i89181#
TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST,
- // <--
+ INVERT_BORDER_SPACING,
+ COLLAPSE_EMPTY_CELL_PARA,
+ SMALL_CAPS_PERCENTAGE_66,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
@@ -147,14 +148,14 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
@returns
the forbidden characters table.
*/
- virtual vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() = 0;
+ virtual rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() = 0;
/** Get the forbidden character table.
@returns
the forbidden characters table.
*/
- virtual const vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const = 0;
+ virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const = 0;
/** Get the current link update mode.
@@ -211,3 +212,5 @@ protected:
};
#endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index 6362f6213290..83322b9f9d56 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -35,49 +36,33 @@
class IDocumentState
{
public:
- /** Bei Formataenderungen muss das zu Fuss gerufen werden!
+ /** Must be called manually at changes of format.
*/
virtual void SetModified() = 0;
- /**
- */
virtual void ResetModified() = 0;
- /** Dokumentaenderungen?
+ /** Changes of document?
*/
virtual bool IsModified() const = 0;
- /** Zustaende ueber Ladezustand
- frueher DocInfo
+ /** State of being loaded or not.
+ Formerly DocInfo.
*/
virtual bool IsLoaded() const = 0;
- /**
- */
virtual bool IsUpdateExpFld() const = 0;
- /**
- */
virtual bool IsNewDoc() const = 0;
- /**
- */
virtual bool IsPageNums() const = 0;
- /**
- */
virtual void SetPageNums(bool b) = 0;
- /**
- */
virtual void SetNewDoc(bool b) = 0;
- /**
- */
virtual void SetUpdateExpFldStat(bool b) = 0;
- /**
- */
virtual void SetLoaded(bool b = sal_True) = 0;
protected:
@@ -85,3 +70,5 @@
};
#endif // IDOCUMENTSTATE_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStatistics.hxx b/sw/inc/IDocumentStatistics.hxx
index 25c2d54d71e9..152d382f998e 100644
--- a/sw/inc/IDocumentStatistics.hxx
+++ b/sw/inc/IDocumentStatistics.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,21 +37,17 @@
{
public:
- /** die DocInfo hat siche geaendert (Notify ueber die DocShell)
- stosse die entsp. Felder zum Updaten an.
+ /** DocInfo has changed (notify via DocShell):
+ make required fields update.
*/
virtual void DocInfoChgd() = 0;
- /** Dokument - Statistics
+ /** Document - Statistics
*/
virtual const SwDocStat &GetDocStat() const = 0;
- /**
- */
virtual void SetDocStat(const SwDocStat& rStat) = 0;
- /**
- */
virtual void UpdateDocStat(SwDocStat& rStat) = 0;
protected:
@@ -58,3 +55,5 @@ protected:
};
#endif // IDOCUMENTSTATISTICS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 743b0d3304e4..8848a7daa3d0 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -46,34 +47,30 @@
{
public:
- /** Gebe die "Auto-Collection" mit der Id zurueck. Existiert
- sie noch nicht, dann erzuege sie
- Ist der String-Pointer definiert, dann erfrage nur die
- Beschreibung der Attribute, !! es legt keine Vorlage an !!
+ /** Return "Auto-Collection with ID.
+ Create, if it does not yet exist.
+ If string pointer is defined request only description
+ of attributes, do not create style sheet!
*/
virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
- /** return das geforderte automatische Format - Basis-Klasse !
+ /** Return required automatic format base class.
*/
virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0;
- /** returne das geforderte automatische Format
+ /** Return required automatic format.
*/
virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0;
- /**
- */
virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0;
- /** returne die geforderte automatische Seiten-Vorlage
+ /** Return required automatic page style.
*/
virtual SwPageDesc* GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
- /**
- */
virtual SwNumRule* GetNumRuleFromPool( sal_uInt16 nId ) = 0;
- /** pruefe, ob diese "Auto-Collection" in Dokument schon/noch benutzt wird
+ /** Check whether this "auto-collection" is used in document.
*/
virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const = 0;
virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0;
@@ -85,3 +82,4 @@
#endif // IDOCUMENTSTYLEPOOLACCESS_HXX_INCLUDED
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index f0d69e942af3..c918edc074d4 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -58,3 +59,5 @@
};
#endif // IDOCUMENTTIMERACCESS_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 0d78d3b361c9..33ae7efb8e64 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -139,7 +140,7 @@ public:
virtual SwUndoId EndUndo(SwUndoId const eUndoId,
SwRewriter const*const pRewriter) = 0;
- /** <- #111827#
+ /**
Delete all Undo actions.
Of course Undo will be disabled during deletion.
*/
@@ -281,3 +282,4 @@ private:
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 44c54b55fe9f..dbaf3867d496 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -85,3 +86,4 @@ void finishGrammarCheck( SwTxtNode& );
#endif // IGRAMMARCONTACT_HXX_INCLUDED
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IInterface.hxx b/sw/inc/IInterface.hxx
index 52b691c4aa85..1fbdf7947732 100644
--- a/sw/inc/IInterface.hxx
+++ b/sw/inc/IInterface.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -65,3 +66,5 @@ protected:
};
#endif // IDOCUMENT_HXX_INCLUDED
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 6a46ae01d49e..66d1dc6d19df 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,6 +33,7 @@
#include <pam.hxx>
#include <boost/operators.hpp>
#include <map>
+#include "swdll.hxx"
#ifndef SW_DECL_SWSERVEROBJECT_DEFINED
#define SW_DECL_SWSERVEROBJECT_DEFINED
@@ -43,7 +45,7 @@ struct SwPosition;
namespace sw { namespace mark
{
- class IMark
+ class SAL_DLLPUBLIC_EXPORT IMark
: virtual public SwModify // inherited as interface
, public ::boost::totally_ordered<IMark>
{
@@ -81,7 +83,7 @@ namespace sw { namespace mark
virtual rtl::OUString ToString( ) const =0;
};
- class IBookmark
+ class SAL_DLLPUBLIC_EXPORT IBookmark
: virtual public IMark
{
public:
@@ -91,7 +93,7 @@ namespace sw { namespace mark
virtual void SetKeyCode(const KeyCode&) =0;
};
- class IFieldmark
+ class SAL_DLLPUBLIC_EXPORT IFieldmark
: virtual public IMark
{
public:
@@ -108,7 +110,7 @@ namespace sw { namespace mark
virtual void Invalidate() = 0;
};
- class ICheckboxFieldmark
+ class SAL_DLLPUBLIC_EXPORT ICheckboxFieldmark
: virtual public IFieldmark
{
public:
@@ -117,3 +119,5 @@ namespace sw { namespace mark
};
}}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 17000a4657c7..9a2485abf93b 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
#include <editeng/outlobj.hxx>
#include <tools/string.hxx>
#include <tools/link.hxx>
-#include <tools/debug.hxx>
#include <swrect.hxx>
#include <unotools/configitem.hxx>
#include <unotools/options.hxx>
@@ -111,13 +111,13 @@ class SwNoteProps: public utl::ConfigItem
bool bIsShowAnchor;
public:
SwNoteProps()
- : ConfigItem(::rtl::OUString::createFromAscii("Office.Writer/Notes"))
+ : ConfigItem(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Writer/Notes")))
, bIsShowAnchor(false)
{
const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rNames = GetPropertyNames();
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aValues = GetProperties(rNames);
const ::com::sun::star::uno::Any* pValues = aValues.getConstArray();
- DBG_ASSERT(aValues.getLength() == rNames.getLength(), "GetProperties failed");
+ OSL_ENSURE(aValues.getLength() == rNames.getLength(), "GetProperties failed");
if (aValues.getLength())
pValues[0]>>=bIsShowAnchor;
}
@@ -126,23 +126,17 @@ class SwNoteProps: public utl::ConfigItem
{
return bIsShowAnchor;
}
- ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames()
- {
+ ::com::sun::star::uno::Sequence< ::rtl::OUString >& GetPropertyNames()
+ {
static ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames;
- if(!aNames.getLength())
- {
- static const char* aPropNames[] =
- {
- "ShowAnkor"
- };
- const int nCount = sizeof(aPropNames)/sizeof(const char*);
- aNames.realloc(nCount);
- ::rtl::OUString* pNames = aNames.getArray();
- for(int i = 0; i < nCount; i++)
- pNames[i] = ::rtl::OUString::createFromAscii(aPropNames[i]);
- }
- return aNames;
+ if(!aNames.getLength())
+ {
+ aNames.realloc(1);
+ ::rtl::OUString* pNames = aNames.getArray();
+ pNames[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowAnkor"));
}
+ return aNames;
+ }
virtual void Commit();
virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames );
@@ -174,7 +168,6 @@ class SwPostItMgr: public SfxListener
typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator SwSidebarWin_iterator;
void AddPostIts(bool bCheckExistance = true,bool bFocus = true);
- //void AddRedlineComments(bool bCheckExistance, bool bFocus);
void RemoveSidebarWin();
void PreparePageContainer();
void Scroll(const long lScroll,const unsigned long aPage );
@@ -234,9 +227,6 @@ class SwPostItMgr: public SfxListener
void Delete(String aAuthor);
void Delete();
-#if 0
- void Hide( SwPostItField* pPostItField );
-#endif
void Hide( const String& rAuthor );
void Hide();
void Show();
@@ -305,3 +295,4 @@ class SwPostItMgr: public SfxListener
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/RefreshListenerContainer.hxx b/sw/inc/RefreshListenerContainer.hxx
index 8860787a8abf..cc9506d843b1 100644
--- a/sw/inc/RefreshListenerContainer.hxx
+++ b/sw/inc/RefreshListenerContainer.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -36,3 +37,5 @@ public:
void Refreshed();
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 00649f211f51..24f3fd11cc30 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -50,7 +51,6 @@ class SwEditWin;
class SwView;
class Edit;
class MenuButton;
-//class SwRedline;
class SwFrm;
@@ -146,9 +146,6 @@ class SwSidebarWin : public Window
void SetFollow( bool bIsFollow) { mbIsFollow = bIsFollow; };
virtual bool CalcFollow() = 0;
-#if 0
-#endif
-
sal_Int32 GetMetaHeight();
sal_Int32 GetMinimumSizeWithMeta();
sal_Int32 GetMinimumSizeWithoutMeta();
@@ -241,34 +238,6 @@ class SwSidebarWin : public Window
} } // eof namespace sw::sidebarwindows
-
-// implementation for change tracking comments, fully functional, but not yet used
-/*
-class SwRedComment : public SwSidebarWin
-{
- private:
- SwRedline* pRedline;
-
- protected:
- virtual void MouseButtonDown( const MouseEvent& rMEvt );
- public:
- SwRedComment( Window* pParent, WinBits nBits,SwPostItMgr* aMgr,SwPostItBits aBits,SwRedline* pRed);
- virtual ~SwRedComment() {};
-
- virtual void UpdateData();
- virtual void SetPostItText();
- virtual void Delete();
- virtual void GotoPos();
- virtual void SetPopup();
- virtual void ActivatePostIt();
- virtual void DeactivatePostIt();
-
- virtual String GetAuthor();
- virtual Date GetDate();
- virtual Time GetTime();
-
- virtual bool IsProtected();
-};
-*/
-
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SidebarWindowsTypes.hxx b/sw/inc/SidebarWindowsTypes.hxx
index 8b86f87edf87..8e9ce8a3dadd 100644
--- a/sw/inc/SidebarWindowsTypes.hxx
+++ b/sw/inc/SidebarWindowsTypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -6,10 +7,6 @@
*
* OpenOffice.org - a multi-platform office productivity suite
*
- * $RCSfile: $
- *
- * $Revision: $
- *
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
@@ -51,3 +48,5 @@ enum SidebarPosition
} } // end of namespace sw::sidebarwindows
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index 0ad636adf67f..3c936b3a14f9 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,9 +40,7 @@
#include <tools/string.hxx>
#include <sfx2/frmhtml.hxx>
#include <sfx2/frmhtmlw.hxx>
-#ifndef _WRKWIN_HXX //autogen
#include <vcl/wrkwin.hxx>
-#endif
#include <sot/storage.hxx>
#include <svl/itemset.hxx>
@@ -54,7 +53,7 @@ class SfxItemSet;
class SwApplet_Impl
{
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > xApplet;
- SvCommandList aCommandList; // und die szugehorige Command-List
+ SvCommandList aCommandList;
SfxItemSet aItemSet;
String sAlt;
@@ -77,3 +76,5 @@ public:
void SetAltText( const String& rAlt ) {sAlt = rAlt;}
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwCapObjType.hxx b/sw/inc/SwCapObjType.hxx
index b256b51c6a53..e0f194f5cdbb 100644
--- a/sw/inc/SwCapObjType.hxx
+++ b/sw/inc/SwCapObjType.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,3 +34,5 @@ enum SwCapObjType
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 1bb40de8ba91..f1f91524530e 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,3 +43,5 @@ namespace nsSwGetPoolIdFromName
}
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 56fef5d0a558..e659d65dba2c 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -38,10 +39,9 @@ class SwNumFmt;
class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
{
public:
- // --> OD 2008-02-19 #refactorlists#
+
explicit SwNodeNum( SwTxtNode* pTxtNode );
explicit SwNodeNum( SwNumRule* pNumRule );
- // <--
virtual ~SwNodeNum();
SwNumRule* GetNumRule() const;
@@ -60,11 +60,8 @@ public:
virtual SwNumberTree::tSwNumTreeNumber GetStartValue() const;
-// String ToString() const;
-
SwPosition GetPosition() const;
- // --> OD 2006-03-07 #131436#
// The number tree root node is deleted, when the corresponding numbering
// rule is deleted. In this situation the number tree should be empty -
// still registered text nodes aren't allowed. But it is possible, that
@@ -73,11 +70,10 @@ public:
// Text nodes of the document nodes array aren't allowed to be registered
// in this situation - this will be asserted.
static void HandleNumberTreeRootNodeDelete( SwNodeNum& rNodeNum );
- // <--
/** determines the <SwNodeNum> instance, which is preceding the given text node
- OD 2007-09-06 #i81002#
+ #i81002#
@author OD
*/
@@ -86,24 +82,19 @@ public:
protected:
virtual SwNumberTreeNode * Create() const;
- // --> OD 2006-04-26 #i64010#
+ // --> #i64010#
virtual bool HasCountedChildren() const;
virtual bool IsCountedForNumbering() const;
- // <--
- // --> OD 2008-02-19 #refactorlists#
// method called before this tree node has been added to the list tree
virtual void PreAdd();
// method called at a child after this child has been removed from the list tree
virtual void PostRemove();
- // <--
private:
SwTxtNode * mpTxtNode;
SwNumRule * mpNumRule;
- // --> OD 2006-03-07 #131436#
static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
- // <--
SwNodeNum( const SwNodeNum& ); // no copy constructor
SwNodeNum& operator=( const SwNodeNum& ); // no assignment operator
@@ -116,3 +107,5 @@ private:
};
#endif // _SW_NODE_NUM_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index 58c5f38a5696..c9a8979aea97 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -92,13 +93,13 @@ struct compSwNumberTreeNodeLessThan
Uncounted Phantoms
0.1. dljflskjlasf
- 5. dsfkas
+ 5. abcdagaha
5.1.
+ R (nStart = 5)
+ 0 (phantom, not counted)
| + 1 dljflskjlasf
- + 5 dsfkas
+ + 5 abcdagaha
+ 1
The phantom gets numbered with 0. The first non-phantom node gets
@@ -143,8 +144,6 @@ public:
/**
Remove a child.
- OD 2008-02-19 #refactorlists# - no longer virtual
-
@param pChild child to be removed
*/
void RemoveChild( SwNumberTreeNode* pChild );
@@ -173,9 +172,7 @@ public:
*/
SwNumberTree::tSwNumTreeNumber GetNumber( bool bValidate = true ) const;
- // --> OD 2008-11-26 #158694#
bool IsContinueingPreviousSubTree() const;
- // <--
/**
Returns level numbers of this node.
@@ -240,7 +237,6 @@ public:
/** set level of this node
- OD 2008-03-13 #refactorlists#
precondition: node is already member of a list tree
@author OD
@@ -276,13 +272,13 @@ public:
All iterators holding the last valid node in the according list
of childs are set to the end of this list, thereby stating all
children in the list are invalid.
- OD 2007-10-26 #i83479# - made public
+ #i83479# - made public
*/
void InvalidateTree() const;
/**
Notifies all invalid children of this node.
- OD 2007-10-26 #i83479# - made public
+ #i83479# - made public
*/
void NotifyInvalidChildren();
@@ -312,15 +308,14 @@ public:
*/
void NotifyInvalidSiblings();
- /** notification of all nodes in the list tree on certain list level
-
- OD 2008-04-17 #refactorlists#
+ /**
+ notification of all nodes in the list tree on certain list level
*/
void NotifyNodesOnListLevel( const int nListLevel );
/** Invalidation and notification of complete numbering tree
- OD 2006-04-26 #i64010#
+ #i64010#
Usage: on <IsCounted()> state change its needed to invalidate the
complete numbering tree due to wide influence of this change.
*/
@@ -343,7 +338,7 @@ public:
/** determines the node, which is preceding the node
- OD 2007-09-06 #i81002#
+ #i81002#
The search for the preceding node is performed for the tree below the
<this> node. To search the complete tree, the method has been called for
the root of the tree.
@@ -352,30 +347,7 @@ public:
*/
const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
-// /**
-// Returns a string representation of this node.
-
-// @return the string representation of this node
-// */
-// virtual String ToString() const = 0;
-
-// /**
-// Print this subtree.
-
-// @param o output stream to direct output to
-// @param rIndent additional indent for the children of this node
-// @param rMyIndent indent to use for this node
-// @param nDepth number of levels to print (-1 means all levels)
-
-// @return output stream after output of this subtree
-// */
-// String print(const String & rIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// const String & rMyIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// int nDepth = -1) const;
-
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static unsigned long GetInstances();
unsigned long GetSerial();
#endif
@@ -422,20 +394,16 @@ protected:
*/
tSwNumberTreeChildren::size_type GetChildCount() const;
- // --> OD 2006-04-26 #i64010# - made pure virtual
+ // #i64010# - made pure virtual
virtual bool HasCountedChildren() const = 0;
- // <--
- // --> OD 2006-04-26 #i64010#
+ // #i64010#
virtual bool IsCountedForNumbering() const = 0;
- // <--
- // --> OD 2008-02-19 #refactorlists#
// method called before this tree node has been added to the list tree
virtual void PreAdd() = 0;
// method called after this tree node has been removed from the list tree
virtual void PostRemove() = 0;
- // <--
#ifdef __SW_NUMBER_TREE_SANITY_CHECK
/**
@@ -460,7 +428,6 @@ protected:
*/
mutable SwNumberTree::tSwNumTreeNumber mnNumber;
- // --> OD 2008-11-26 #158694#
// boolean indicating, that a node of a not counted parent node is continueing
// the numbering of parent's previous node sub tree.
// Example:
@@ -469,7 +436,6 @@ protected:
// sdfjlksaf <-- not counted parent node
// 1.2. lfjlaskf <-- <mbContinueingPreviousSubTree = true>
mutable bool mbContinueingPreviousSubTree;
- // <--
/**
true this node is a phantom
@@ -482,9 +448,9 @@ protected:
than or equal to the referenced child are valid. All children
greater than the referenced child are invalid.
*/
- mutable tSwNumberTreeChildren::iterator mItLastValid;
+ mutable tSwNumberTreeChildren::const_iterator mItLastValid;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
/**
Counter for the number of created instances.
*/
@@ -521,7 +487,6 @@ protected:
/** Invalidation of all children
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the children have to be invalidated
*/
inline void InvalidateChildren()
@@ -531,7 +496,6 @@ protected:
/** Invalidation of parent node, if its not counted.
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the parent have to be invalidated
*/
inline void InvalidateNotCountedParent()
@@ -551,7 +515,7 @@ protected:
- false only set if aItLastValid is preceeding
the current last valid node
*/
- void SetLastValid(tSwNumberTreeChildren::iterator aItLastValid,
+ void SetLastValid(tSwNumberTreeChildren::const_iterator aItLastValid,
bool bValidating = false) const;
/**
@@ -586,7 +550,6 @@ protected:
/** Notification of parent node siblings, if its not counted.
- OD 2005-10-19 #126009#
Usage: on <IsCounted()> state change the parent node and its siblings
have to be notified.
*/
@@ -600,8 +563,6 @@ protected:
/** notification of children nodes on certain depth
- OD 2008-04-17 #refactorlists#
-
@author OD
*/
void NotifyChildrenOnDepth( const int nDepth );
@@ -679,8 +640,6 @@ protected:
/**
Return if phantoms are counted.
- OD 2008-02-19 #refactorlists# - pure virtual now
-
@retval true phantoms are counted
@retval false else
*/
@@ -694,9 +653,7 @@ protected:
*/
bool HasOnlyPhantoms() const;
- // --> OD 2005-10-27 #126009#
bool HasPhantomCountedParent() const;
- // <--
/**
HB, OD : return node, if it isn't a phantom, otherwise return first
@@ -715,7 +672,7 @@ protected:
*/
void ClearObsoletePhantoms();
- tSwNumberTreeChildren::iterator GetIterator(const SwNumberTreeNode * pChild) const;
+ tSwNumberTreeChildren::const_iterator GetIterator(const SwNumberTreeNode * pChild) const;
/**
Moves all children to a given destination node.
@@ -727,7 +684,6 @@ protected:
/** Moves all children of this node that are greater than a given node
to the destination node.
- OD 2005-10-14 #125991#
distinguish between node for comparing, whose children are greater,
and the destination node.
@@ -765,3 +721,5 @@ struct SwNumberTreeNodeIsLessThan
{ return SwNumberTreeNodeLessThan(_pNode, pNode); }
};
#endif // _SW_NUMBER_TREE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwNumberTreeTypes.hxx b/sw/inc/SwNumberTreeTypes.hxx
index 39e5acd776cc..a50140d96c27 100644
--- a/sw/inc/SwNumberTreeTypes.hxx
+++ b/sw/inc/SwNumberTreeTypes.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -37,3 +38,5 @@ namespace SwNumberTree
}
#endif // _SW_NUMBER_TREE_TYPES_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 5c98db3807ab..36981e486a42 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,16 +31,15 @@
#include <vector>
#include <tools/string.hxx>
+#include <swdllapi.h>
-
-String const UNDO_ARG1("$1", RTL_TEXTENCODING_ASCII_US);
-String const UNDO_ARG2("$2", RTL_TEXTENCODING_ASCII_US);
-String const UNDO_ARG3("$3", RTL_TEXTENCODING_ASCII_US);
-
+extern SW_DLLPUBLIC String const UNDO_ARG1;
+extern SW_DLLPUBLIC String const UNDO_ARG2;
+extern SW_DLLPUBLIC String const UNDO_ARG3;
typedef std::pair<String, String> SwRewriteRule;
-class SwRewriter
+class SW_DLLPUBLIC SwRewriter
{
std::vector<SwRewriteRule> mRules;
@@ -54,3 +54,5 @@ public:
};
#endif // _SW_REWRITER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 1a2ecb9c9fd6..cd184928726c 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -55,11 +56,6 @@ public:
virtual void SAL_CALL changesOccurred( const ::com::sun::star::util::ChangesEvent& Event ) throw(::com::sun::star::uno::RuntimeException);
};
-/*
-namespace SwSmartTagMgr
-{
- SmartTagMgr& Get();
-}
-*/
-
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 688b066bc75a..3627d0b5dbc4 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,12 +34,12 @@
#include "swdllapi.h"
#ifndef INCLUDED_HASH_MAP
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#define INCLUDED_HASH_MAP
#endif
#include <stringhash.hxx>
-/* This class holds all data about the names of styles used in the user
+/** This class holds all data about the names of styles used in the user
* interface (UI names...these are localised into different languages).
* These UI names are loaded from the resource files on demand.
*
@@ -66,7 +67,7 @@
* 5. Numbering Rule contains the NumRule name array.
*/
-/*
+/**
* There is a further complication that came to light later. If someone enters
* a user-defined style name which is the same as a programmatic name, this
* name clash must be handled.
@@ -87,7 +88,7 @@ class String;
struct SwTableEntry;
-typedef ::std::hash_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash;
+typedef ::boost::unordered_map < const String*, sal_uInt16, StringHash, StringEq > NameToIdHash;
class SwStyleNameMapper
{
@@ -202,3 +203,5 @@ public:
static const SvStringsDtor& GetNumRuleProgNameArray();
};
#endif // _NAME_MAPPER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 2f78cab966de..dceb43a16c69 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -91,3 +92,5 @@ public:
};
#endif // SW_UNDO_FIELD_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/SwXMLSectionList.hxx b/sw/inc/SwXMLSectionList.hxx
index ea3aff8b2ebd..046786473813 100644
--- a/sw/inc/SwXMLSectionList.hxx
+++ b/sw/inc/SwXMLSectionList.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,6 @@ protected:
public:
SvStrings & rSectionList;
- // #110680#
SwXMLSectionList(
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory,
SvStrings & rNewSectionList );
@@ -87,3 +87,5 @@ public:
~SvXMLIgnoreSectionListContext ( void );
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index cd7e185f3c4c..731cccf33c58 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -52,3 +53,4 @@ public:
#endif // _SW_TEXTCURSORHELPER_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 08256b4c5e79..ff5c934a89da 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -51,3 +52,4 @@ struct SwAccessibilityOptions
};
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 01c4593fe636..5fb1d32167b9 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,11 +30,10 @@
#include <cppuhelper/weakref.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
-#include <vos/ref.hxx>
-#include <vos/mutex.hxx>
+#include <rtl/ref.hxx>
+#include <osl/mutex.hxx>
#include <svx/IAccessibleViewForwarder.hxx>
#include <svx/IAccessibleParent.hxx>
-#include <tools/debug.hxx>
#include <tools/fract.hxx>
#include <vector>
@@ -66,12 +66,8 @@ class Window;
#define ACC_STATE_OPAQUE 0x02
// pseudo states for events
-// --> OD 2009-01-07 #i88069# - pseudo state for event TEXT_ATTRIBUTE_CHANGED
#define ACC_STATE_TEXT_ATTRIBUTE_CHANGED 0x0200
-// <--
-// --> OD 2005-12-12 #i27301# - pseudo state for event TEXT_SELECTION_CHANGED
#define ACC_STATE_TEXT_SELECTION_CHANGED 0x0100
-// <--
#define ACC_STATE_CARET 0x80
#define ACC_STATE_RELATION_FROM 0x40
#define ACC_STATE_RELATION_TO 0x20
@@ -80,24 +76,21 @@ class Window;
#define ACC_STATE_MASK 0x1F
-// --> OD 2005-12-12 #i27301# - introduce type definition of states
typedef sal_uInt16 tAccessibleStates;
-// <--
class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
public accessibility::IAccessibleParent
{
- mutable ::vos::OMutex maMutex;
- ::vos::OMutex maEventMutex;
+ mutable ::osl::Mutex maMutex;
+ ::osl::Mutex maEventMutex;
SwAccessibleContextMap_Impl *mpFrmMap;
SwAccessibleShapeMap_Impl *mpShapeMap;
SwShapeList_Impl *mpShapes;
SwAccessibleEventList_Impl *mpEvents;
SwAccessibleEventMap_Impl *mpEventMap;
- // --> OD 2005-12-13 #i27301# - data structure to keep information about
+ // #i27301 data structure to keep information about
// accessible paragraph, which have a selection.
SwAccessibleSelectedParas_Impl* mpSelectedParas;
- // <--
ViewShell *mpVSh;
/// for page preview: store preview data, VisArea, and mapping of
/// preview-to-display coordinates
@@ -132,7 +125,6 @@ class SwAccessibleMap : public accessibility::IAccessibleViewForwarder,
/** method to build up a new data structure of the accessible pararaphs,
which have a selection
- OD 2005-12-13 #i27301#
Important note: method has to used inside a mutual exclusive section
@author OD
@@ -147,8 +139,6 @@ public:
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> GetDocumentView();
- // OD 15.01.2003 #103492# - complete re-factoring of method due to new
- // page/print preview functionality.
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible> GetDocumentPreview(
const std::vector<PrevwPage*>& _rPrevwPages,
@@ -156,7 +146,7 @@ public:
const SwPageFrm* _pSelectedPageFrm,
const Size& _rPrevwWinSize );
- ::vos::ORef < SwAccessibleContext > GetContextImpl(
+ ::rtl::Reference < SwAccessibleContext > GetContextImpl(
const SwFrm *pFrm,
sal_Bool bCreate = sal_True );
::com::sun::star::uno::Reference<
@@ -164,7 +154,7 @@ public:
const SwFrm *pFrm,
sal_Bool bCreate = sal_True );
- ::vos::ORef < ::accessibility::AccessibleShape > GetContextImpl(
+ ::rtl::Reference < ::accessibility::AccessibleShape > GetContextImpl(
const SdrObject *pObj,
SwAccessibleContext *pParentImpl,
sal_Bool bCreate = sal_True );
@@ -183,10 +173,6 @@ public:
/** get size of a dedicated preview page
- OD 15.01.2003 #103492#
- complete re-factoring of previous method due to new page/print preview
- functionality.
-
@author OD
@param _nPrevwPageNum
@@ -212,19 +198,16 @@ public:
void InvalidateContent( const SwFrm *pFrm );
- // --> OD 2009-01-06 #i88069#
void InvalidateAttr( const SwTxtFrm& rTxtFrm );
- // <--
void InvalidateCursorPosition( const SwFrm *pFrm );
void InvalidateFocus();
void SetCursorContext(
- const ::vos::ORef < SwAccessibleContext >& rCursorContext );
+ const ::rtl::Reference < SwAccessibleContext >& rCursorContext );
// Invalidate state of whole tree. If an action is open, this call
// is processed when the last action ends.
- // --> OD 2005-12-12 #i27301# - use new type definition for <_nStates>
void InvalidateStates( tAccessibleStates _nStates,
const SwFrm* _pFrm = 0 );
@@ -232,8 +215,6 @@ public:
/** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph
- OD 2005-12-01 #i27138#
-
@author OD
@param _rTxtFrm
@@ -249,16 +230,12 @@ public:
/** invalidation of text selection of a paragraph
- OD 2005-12-12 #i27301#
-
@author OD
*/
void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
/** invalidation of text selection of all paragraphs
- OD 2005-12-13 #i27301#
-
@author OD
*/
void InvalidateTextSelectionOfAllParas();
@@ -267,8 +244,6 @@ public:
Window& rChild ) const;
// update preview data (and fire events if necessary)
- // OD 15.01.2003 #103492# - complete re-factoring of method due to new
- // page/print preview functionality.
void UpdatePreview( const std::vector<PrevwPage*>& _rPrevwPages,
const Fraction& _rScale,
const SwPageFrm* _pSelectedPageFrm,
@@ -305,7 +280,6 @@ public:
private:
/** get mapping mode for LogicToPixel and PixelToLogic conversions
- OD 15.01.2003 #103492#
Replacement method <PreviewAdjust(..)> by new method <GetMapMode>.
Method returns mapping mode of current output device and adjusts it,
if the shell is in page/print preview.
@@ -327,3 +301,5 @@ private:
MapMode& _orMapMode ) const;
};
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index af0cb98e4e6f..ad7a0de42414 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -44,7 +45,7 @@ class SwAutoCompleteWord
SwAutoCompleteWord_Impl* pImpl;
sal_uInt16 nMaxCount, nMinWrdLen;
- sal_Bool bLockWordLst;
+ bool bLockWordLst;
void DocumentDying(const SwDoc& rDoc);
public:
@@ -57,8 +58,8 @@ public:
const String& operator[]( sal_uInt16 n ) const { return *aWordLst[ n ]; }
- sal_Bool IsLockWordLstLocked() const { return bLockWordLst; }
- void SetLockWordLstLocked( sal_Bool bFlag ) { bLockWordLst = bFlag; }
+ bool IsLockWordLstLocked() const { return bLockWordLst; }
+ void SetLockWordLstLocked( bool bFlag ) { bLockWordLst = bFlag; }
void SetMaxCount( sal_uInt16 n );
@@ -71,3 +72,5 @@ public:
#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 11b637957f8e..85e3911c8c9b 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,8 +33,6 @@
/** class for the positioning of drawing objects
- OD 2004-03-25 #i26791#
-
@author OD
*/
class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
@@ -44,7 +43,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
bool mbValidPos;
// rectangle, keeping the last object rectangle after the postioning
- // --> OD 2004-09-29 #i34748# - change <maLastObjRect> to a pointer
Rectangle* mpLastObjRect;
// boolean, indicating that anchored drawing object hasn't been attached
@@ -52,23 +50,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
// boolean changes its state.
bool mbNotYetAttachedToAnchorFrame;
- // --> OD 2004-08-09 #i28749# - boolean, indicating that anchored
+ // boolean, indicating that anchored
// drawing object hasn't been positioned yet. Once, it's positioned the
// boolean changes its state.
bool mbNotYetPositioned;
- // --> OD 2006-03-17 #i62875#
// boolean, indicating that after change of layout direction the
// anchored drawing object has to be captured on the page, if it exceeds
// the left or right page margin.
// Needed for compatibility option <DoNotCaptureDrawObjsOnPage>
bool mbCaptureAfterLayoutDirChange;
- // <--
/** method for the intrinsic positioning of a at-paragraph|at-character
anchored drawing object
- OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+ helper method for method <MakeObjPos>
@author OD
*/
@@ -77,7 +73,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** method for the intrinsic positioning of a at-page|at-frame anchored
drawing object
- OD 2004-08-12 #i32795# - helper method for method <MakeObjPos>
+ helper method for method <MakeObjPos>
@author OD
*/
@@ -85,7 +81,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** method to set positioning attributes (not for as-character anchored)
- OD 2004-10-20 #i35798#
During load the positioning attributes aren't set.
Thus, the positioning attributes are set by the current object geometry.
This method is also used for the conversion for drawing objects
@@ -103,7 +98,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
instance has to be set.
Note: This adjustment is not be done for as-character anchored
drawing object - the positioning code takes care of this.
- OD 2004-07-29 #i31698# - API for drawing objects in Writer has
+ #i31698# - API for drawing objects in Writer has
been adjusted. Thus, this method will only set the internal anchor
position of the <SdrObject> instance to the anchor position given
by its anchor frame.
@@ -114,8 +109,6 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** method to invalidate the given page frame
- OD 2004-07-02 #i28701#
-
@author OD
*/
void _InvalidatePage( SwPageFrm* _pPageFrm );
@@ -126,20 +119,15 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
/** method to assure that anchored object is registered at the correct
page frame
- OD 2004-07-02 #i28701#
-
@author OD
*/
virtual void RegisterAtCorrectPage();
- // --> OD 2006-08-10 #i68520#
virtual bool _SetObjTop( const SwTwips _nTop);