[Libreoffice-commits] core.git: sw/inc sw/qa sw/sdi sw/source
Alexander Wilms
f.alexander.wilms at gmail.com
Thu Feb 27 07:41:28 PST 2014
sw/inc/EnhancedPDFExportHelper.hxx | 1
sw/inc/IDocumentChartDataProviderAccess.hxx | 1
sw/inc/IDocumentExternalData.hxx | 1
sw/inc/IDocumentFieldsAccess.hxx | 1
sw/inc/IDocumentMarkAccess.hxx | 2
sw/inc/IDocumentUndoRedo.hxx | 5
sw/inc/IMark.hxx | 1
sw/inc/IShellCursorSupplier.hxx | 2
sw/inc/PostItMgr.hxx | 2
sw/inc/SidebarWin.hxx | 1
sw/inc/SwAppletImpl.hxx | 1
sw/inc/SwSmartTagMgr.hxx | 1
sw/inc/SwUndoField.hxx | 1
sw/inc/TextCursorHelper.hxx | 1
sw/inc/accmap.hxx | 1
sw/inc/acmplwrd.hxx | 1
sw/inc/anchoredobject.hxx | 4
sw/inc/authratr.hxx | 1
sw/inc/bparr.hxx | 5
sw/inc/breakit.hxx | 1
sw/inc/calbck.hxx | 7
sw/inc/calc.hxx | 2
sw/inc/ccoll.hxx | 8
sw/inc/cellatr.hxx | 6
sw/inc/cellfml.hxx | 4
sw/inc/charatr.hxx | 1
sw/inc/charfmt.hxx | 3
sw/inc/chcmprse.hxx | 1
sw/inc/chpfld.hxx | 2
sw/inc/cmdid.h | 22
sw/inc/colwd.hxx | 3
sw/inc/comcore.hrc | 4
sw/inc/crsskip.hxx | 1
sw/inc/crstate.hxx | 3
sw/inc/cshtyp.hxx | 3
sw/inc/dbfld.hxx | 2
sw/inc/dbmgr.hxx | 7
sw/inc/dcontact.hxx | 4
sw/inc/ddefld.hxx | 1
sw/inc/dlelstnr.hxx | 4
sw/inc/dobjfac.hxx | 4
sw/inc/doc.hxx | 513 ++++------
sw/inc/docary.hxx | 2
sw/inc/docsh.hxx | 5
sw/inc/docstat.hxx | 1
sw/inc/docstyle.hxx | 4
sw/inc/docufld.hxx | 10
sw/inc/dpage.hxx | 2
sw/inc/drawdoc.hxx | 3
sw/inc/edglbldc.hxx | 1
sw/inc/edimp.hxx | 3
sw/inc/editsh.hxx | 5
sw/inc/expfld.hxx | 5
sw/inc/fchrfmt.hxx | 2
sw/inc/fesh.hxx | 6
sw/inc/fldbas.hxx | 3
sw/inc/flddat.hxx | 3
sw/inc/fldupde.hxx | 1
sw/inc/flyenum.hxx | 3
sw/inc/flypos.hxx | 1
sw/inc/fmtanchr.hxx | 1
sw/inc/fmtautofmt.hxx | 2
sw/inc/fmtclbl.hxx | 2
sw/inc/fmtclds.hxx | 2
sw/inc/fmtcnct.hxx | 4
sw/inc/fmtcntnt.hxx | 1
sw/inc/fmtcol.hxx | 2
sw/inc/fmteiro.hxx | 1
sw/inc/fmtflcnt.hxx | 1
sw/inc/fmtfld.hxx | 2
sw/inc/fmtfollowtextflow.hxx | 1
sw/inc/fmtfordr.hxx | 1
sw/inc/fmtfsize.hxx | 2
sw/inc/fmtftn.hxx | 1
sw/inc/fmtftntx.hxx | 2
sw/inc/fmtinfmt.hxx | 2
sw/inc/fmtline.hxx | 1
sw/inc/fmtmeta.hxx | 3
sw/inc/fmtornt.hxx | 2
sw/inc/fmtpdsc.hxx | 2
sw/inc/fmtruby.hxx | 3
sw/inc/fmtsrnd.hxx | 1
sw/inc/fmturl.hxx | 1
sw/inc/format.hxx | 1
sw/inc/frmatr.hxx | 2
sw/inc/frmfmt.hxx | 2
sw/inc/ftnidx.hxx | 4
sw/inc/ftninfo.hxx | 2
sw/inc/globals.hrc | 8
sw/inc/grfatr.hxx | 5
sw/inc/hfspacingitem.hxx | 1
sw/inc/hhcwrp.hxx | 3
sw/inc/hintids.hxx | 4
sw/inc/hints.hxx | 8
sw/inc/htmltbl.hxx | 4
sw/inc/index.hxx | 1
sw/inc/init.hxx | 1
sw/inc/itabenum.hxx | 1
sw/inc/lineinfo.hxx | 2
sw/inc/modcfg.hxx | 3
sw/inc/ndarr.hxx | 2
sw/inc/ndgrf.hxx | 1
sw/inc/ndhints.hxx | 8
sw/inc/ndindex.hxx | 4
sw/inc/ndole.hxx | 3
sw/inc/ndtxt.hxx | 6
sw/inc/ndtyp.hxx | 2
sw/inc/node.hxx | 24
sw/inc/pagedesc.hxx | 1
sw/inc/pagepreviewlayout.hxx | 2
sw/inc/pam.hxx | 3
sw/inc/paratr.hxx | 2
sw/inc/poolfmt.hrc | 16
sw/inc/poolfmt.hxx | 13
sw/inc/printdata.hxx | 15
sw/inc/pvprtdat.hxx | 3
sw/inc/rcid.hrc | 6
sw/inc/redline.hxx | 3
sw/inc/reffld.hxx | 4
sw/inc/ring.hxx | 1
sw/inc/rubylist.hxx | 1
sw/inc/section.hxx | 5
sw/inc/shellio.hxx | 12
sw/inc/sortopt.hxx | 1
sw/inc/splargs.hxx | 1
sw/inc/sw_primitivetypes2d.hxx | 4
sw/inc/swacorr.hxx | 1
sw/inc/swatrset.hxx | 1
sw/inc/swbaslnk.hxx | 1
sw/inc/swcalwrp.hxx | 2
sw/inc/swcrsr.hxx | 6
sw/inc/swddetbl.hxx | 1
sw/inc/swevent.hxx | 1
sw/inc/swhints.hxx | 1
sw/inc/swmodule.hxx | 2
sw/inc/swrect.hxx | 2
sw/inc/swscanner.hxx | 1
sw/inc/swtable.hxx | 3
sw/inc/swtblfmt.hxx | 2
sw/inc/swtypes.hxx | 7
sw/inc/swundo.hxx | 3
sw/inc/swunohelper.hxx | 1
sw/inc/tblenum.hxx | 4
sw/inc/tblsel.hxx | 7
sw/inc/tox.hxx | 20
sw/inc/toxe.hxx | 1
sw/inc/toxwrap.hxx | 1
sw/inc/txatbase.hxx | 5
sw/inc/txatritr.hxx | 4
sw/inc/txtatr.hxx | 4
sw/inc/undobj.hxx | 5
sw/inc/unobaseclass.hxx | 3
sw/inc/unochart.hxx | 21
sw/inc/unocoll.hxx | 16
sw/inc/unocrsr.hxx | 5
sw/inc/unocrsrhelper.hxx | 2
sw/inc/unodraw.hxx | 4
sw/inc/unoframe.hxx | 7
sw/inc/unomap.hxx | 2
sw/inc/unoparagraph.hxx | 3
sw/inc/unoredline.hxx | 1
sw/inc/unoredlines.hxx | 3
sw/inc/unosett.hxx | 9
sw/inc/unosrch.hxx | 4
sw/inc/unostyle.hxx | 1
sw/inc/unotbl.hxx | 14
sw/inc/unotext.hxx | 4
sw/inc/unotextbodyhf.hxx | 3
sw/inc/unotextcursor.hxx | 1
sw/inc/unotextrange.hxx | 3
sw/inc/unotxdoc.hxx | 6
sw/inc/usrfld.hxx | 2
sw/inc/viewopt.hxx | 6
sw/inc/viewsh.hxx | 6
sw/inc/viscrs.hxx | 4
sw/inc/wdocsh.hxx | 1
sw/qa/complex/writer/CheckTable.java | 1
sw/qa/complex/writer/TextPortionEnumerationTest.java | 14
sw/qa/core/Test-BigPtrArray.cxx | 1
sw/qa/core/layout-test.cxx | 1
sw/qa/core/uwriter.cxx | 1
sw/qa/extras/inc/swmodeltestbase.hxx | 1
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 16
sw/sdi/_basesh.sdi | 2
sw/sdi/_docsh.sdi | 2
sw/sdi/_drwbase.sdi | 1
sw/sdi/_formsh.sdi | 1
sw/sdi/_frmsh.sdi | 5
sw/sdi/_listsh.sdi | 1
sw/sdi/_olesh.sdi | 1
sw/sdi/_tabsh.sdi | 1
sw/sdi/_textsh.sdi | 16
sw/sdi/_viewsh.sdi | 11
sw/sdi/basesh.sdi | 1
sw/sdi/beziersh.sdi | 1
sw/sdi/drawsh.sdi | 5
sw/sdi/drwtxtsh.sdi | 5
sw/sdi/formsh.sdi | 1
sw/sdi/frmsh.sdi | 2
sw/sdi/grfsh.sdi | 4
sw/sdi/listsh.sdi | 3
sw/sdi/mediash.sdi | 3
sw/sdi/olesh.sdi | 1
sw/sdi/swriter.sdi | 421 --------
sw/sdi/swslots.sdi | 1
sw/sdi/tabsh.sdi | 2
sw/sdi/viewsh.sdi | 8
sw/sdi/wbeziers.sdi | 1
sw/sdi/wdrwbase.sdi | 2
sw/sdi/wformsh.sdi | 1
sw/sdi/wfrmsh.sdi | 4
sw/sdi/wgrfsh.sdi | 4
sw/sdi/wlistsh.sdi | 2
sw/sdi/wolesh.sdi | 4
sw/sdi/wrtapp.sdi | 1
sw/sdi/wtabsh.sdi | 2
sw/sdi/wviewsh.sdi | 3
sw/source/core/SwNumberTree/SwNodeNum.cxx | 3
sw/source/core/SwNumberTree/SwNumberTree.cxx | 4
sw/source/core/access/accdoc.cxx | 5
sw/source/core/access/accfield.cxx | 4
sw/source/core/access/accfield.hxx | 2
sw/source/core/access/accmap.cxx | 3
sw/source/core/access/accnotextframe.cxx | 4
sw/source/core/access/accnotextframe.hxx | 1
sw/source/core/access/accnotexthyperlink.hxx | 1
sw/source/core/access/accpara.cxx | 8
sw/source/core/access/accpara.hxx | 2
sw/source/core/access/accselectionhelper.cxx | 1
sw/source/core/access/acctable.cxx | 3
sw/source/core/access/acctextframe.cxx | 13
sw/source/core/attr/calbck.cxx | 8
sw/source/core/attr/cellatr.cxx | 6
sw/source/core/attr/hints.cxx | 1
sw/source/core/attr/swatrset.cxx | 5
sw/source/core/bastyp/index.cxx | 6
sw/source/core/bastyp/init.cxx | 2
sw/source/core/crsr/annotationmark.cxx | 3
sw/source/core/crsr/crsrsh.cxx | 3
sw/source/core/crsr/crstrvl.cxx | 12
sw/source/core/crsr/findattr.cxx | 1
sw/source/core/crsr/overlayrangesoutline.cxx | 3
sw/source/core/crsr/overlayrangesoutline.hxx | 4
sw/source/core/crsr/viscrs.cxx | 1
sw/source/core/doc/docbm.cxx | 10
sw/source/core/doc/doccomp.cxx | 1
sw/source/core/doc/docdde.cxx | 1
sw/source/core/doc/docedt.cxx | 3
sw/source/core/doc/docfld.cxx | 1
sw/source/core/doc/docfmt.cxx | 1
sw/source/core/doc/docftn.cxx | 2
sw/source/core/doc/doclay.cxx | 4
sw/source/core/doc/docnew.cxx | 2
sw/source/core/doc/docnum.cxx | 3
sw/source/core/doc/docredln.cxx | 5
sw/source/core/doc/docruby.cxx | 1
sw/source/core/doc/docsort.cxx | 1
sw/source/core/doc/doctxm.cxx | 2
sw/source/core/doc/gctable.cxx | 1
sw/source/core/doc/htmltbl.cxx | 22
sw/source/core/doc/notxtfrm.cxx | 1
sw/source/core/doc/number.cxx | 2
sw/source/core/doc/tblafmt.cxx | 1
sw/source/core/doc/tblrwcl.cxx | 1
sw/source/core/docnode/ndtbl.cxx | 3
sw/source/core/docnode/ndtbl1.cxx | 5
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/nodedump.cxx | 1
sw/source/core/docnode/section.cxx | 2
sw/source/core/draw/dcontact.cxx | 3
sw/source/core/draw/dflyobj.cxx | 2
sw/source/core/draw/dpage.cxx | 1
sw/source/core/edit/acorrect.cxx | 1
sw/source/core/edit/autofmt.cxx | 4
sw/source/core/edit/eddel.cxx | 1
sw/source/core/edit/edfld.cxx | 1
sw/source/core/edit/editsh.cxx | 1
sw/source/core/edit/edlingu.cxx | 2
sw/source/core/edit/ednumber.cxx | 1
sw/source/core/edit/edsect.cxx | 2
sw/source/core/edit/edtox.cxx | 8
sw/source/core/edit/edws.cxx | 4
sw/source/core/fields/cellfml.cxx | 2
sw/source/core/fields/ddefld.cxx | 1
sw/source/core/fields/docufld.cxx | 1
sw/source/core/fields/expfld.cxx | 13
sw/source/core/fields/macrofld.cxx | 1
sw/source/core/fields/tblcalc.cxx | 1
sw/source/core/frmedt/fedesc.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 15
sw/source/core/frmedt/feflyole.cxx | 6
sw/source/core/frmedt/feshview.cxx | 12
sw/source/core/frmedt/fetab.cxx | 13
sw/source/core/frmedt/fews.cxx | 8
sw/source/core/frmedt/tblsel.cxx | 21
sw/source/core/inc/MarkManager.hxx | 1
sw/source/core/inc/UndoBookmark.hxx | 1
sw/source/core/inc/blink.hxx | 1
sw/source/core/inc/flyfrm.hxx | 2
sw/source/core/inc/frame.hxx | 1
sw/source/core/inc/frmtool.hxx | 3
sw/source/core/inc/layact.hxx | 5
sw/source/core/inc/layfrm.hxx | 1
sw/source/core/inc/layouter.hxx | 2
sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 1
sw/source/core/inc/mvsave.hxx | 7
sw/source/core/inc/noteurl.hxx | 1
sw/source/core/inc/objectformatter.hxx | 3
sw/source/core/inc/pagefrm.hxx | 2
sw/source/core/inc/pamtyp.hxx | 4
sw/source/core/inc/rootfrm.hxx | 1
sw/source/core/inc/rowfrm.hxx | 2
sw/source/core/inc/scriptinfo.hxx | 6
sw/source/core/inc/sectfrm.hxx | 1
sw/source/core/inc/setmapvirtdev.hxx | 1
sw/source/core/inc/swblocks.hxx | 2
sw/source/core/inc/swcache.hxx | 2
sw/source/core/inc/swfntcch.hxx | 1
sw/source/core/inc/swfont.hxx | 4
sw/source/core/inc/swthreadmanager.hxx | 1
sw/source/core/inc/tabfrm.hxx | 6
sw/source/core/inc/tblrwcl.hxx | 5
sw/source/core/inc/threadmanager.hxx | 1
sw/source/core/inc/txmsrt.hxx | 5
sw/source/core/inc/txtfrm.hxx | 3
sw/source/core/inc/unobookmark.hxx | 2
sw/source/core/inc/unoevent.hxx | 8
sw/source/core/inc/unofield.hxx | 2
sw/source/core/inc/unofootnote.hxx | 2
sw/source/core/inc/unoidx.hxx | 2
sw/source/core/inc/unometa.hxx | 2
sw/source/core/inc/unoparaframeenum.hxx | 3
sw/source/core/inc/unoport.hxx | 4
sw/source/core/inc/unorefmark.hxx | 1
sw/source/core/inc/unosection.hxx | 3
sw/source/core/inc/unotextmarkup.hxx | 3
sw/source/core/inc/wrong.hxx | 1
sw/source/core/layout/atrfrm.cxx | 5
sw/source/core/layout/calcmove.cxx | 8
sw/source/core/layout/findfrm.cxx | 2
sw/source/core/layout/flowfrm.cxx | 7
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/laycache.cxx | 7
sw/source/core/layout/objectformatterlayfrm.cxx | 1
sw/source/core/layout/pagechg.cxx | 1
sw/source/core/layout/paintfrm.cxx | 13
sw/source/core/layout/tabfrm.cxx | 14
sw/source/core/layout/trvlfrm.cxx | 2
sw/source/core/layout/wsfrm.cxx | 5
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 1
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2
sw/source/core/ole/ndole.cxx | 19
sw/source/core/para/paratr.cxx | 9
sw/source/core/sw3io/swacorr.cxx | 3
sw/source/core/swg/SwXMLBlockListContext.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 6
sw/source/core/swg/SwXMLTextBlocks1.cxx | 2
sw/source/core/swg/swblocks.cxx | 33
sw/source/core/table/swnewtable.cxx | 6
sw/source/core/table/swtable.cxx | 7
sw/source/core/text/EnhancedPDFExportHelper.cxx | 105 --
sw/source/core/text/SwGrammarMarkUp.cxx | 2
sw/source/core/text/atrstck.cxx | 5
sw/source/core/text/blink.cxx | 2
sw/source/core/text/frmcrsr.cxx | 6
sw/source/core/text/frmform.cxx | 2
sw/source/core/text/frminf.cxx | 1
sw/source/core/text/frmpaint.cxx | 4
sw/source/core/text/inftxt.cxx | 15
sw/source/core/text/inftxt.hxx | 14
sw/source/core/text/itradj.cxx | 2
sw/source/core/text/itratr.hxx | 1
sw/source/core/text/itrcrsr.cxx | 6
sw/source/core/text/itrform2.cxx | 13
sw/source/core/text/itrform2.hxx | 3
sw/source/core/text/itrpaint.cxx | 1
sw/source/core/text/itrtxt.cxx | 3
sw/source/core/text/itrtxt.hxx | 3
sw/source/core/text/noteurl.cxx | 2
sw/source/core/text/pordrop.hxx | 1
sw/source/core/text/porexp.hxx | 1
sw/source/core/text/porfld.cxx | 8
sw/source/core/text/porglue.cxx | 2
sw/source/core/text/porlay.cxx | 36
sw/source/core/text/porlay.hxx | 1
sw/source/core/text/porlin.cxx | 1
sw/source/core/text/porlin.hxx | 1
sw/source/core/text/pormulti.cxx | 5
sw/source/core/text/porref.cxx | 2
sw/source/core/text/porrst.cxx | 3
sw/source/core/text/portab.hxx | 1
sw/source/core/text/portxt.cxx | 19
sw/source/core/text/portxt.hxx | 1
sw/source/core/text/possiz.hxx | 2
sw/source/core/text/redlnitr.hxx | 1
sw/source/core/text/txtcache.cxx | 3
sw/source/core/text/txtcache.hxx | 2
sw/source/core/text/txtdrop.cxx | 1
sw/source/core/text/txtfld.cxx | 17
sw/source/core/text/txtfly.cxx | 9
sw/source/core/text/txtfly.hxx | 2
sw/source/core/text/txtfrm.cxx | 4
sw/source/core/text/txtftn.cxx | 3
sw/source/core/text/txthyph.cxx | 3
sw/source/core/text/txtinit.cxx | 3
sw/source/core/text/txtio.cxx | 1
sw/source/core/text/txtpaint.cxx | 2
sw/source/core/text/txtpaint.hxx | 3
sw/source/core/text/txttab.cxx | 26
sw/source/core/text/widorp.cxx | 2
sw/source/core/text/widorp.hxx | 1
sw/source/core/tox/tox.cxx | 14
sw/source/core/tox/toxhlp.cxx | 1
sw/source/core/tox/txmsrt.cxx | 29
sw/source/core/txtnode/SwGrammarContact.cxx | 1
sw/source/core/txtnode/atrfld.cxx | 14
sw/source/core/txtnode/atrflyin.cxx | 4
sw/source/core/txtnode/atrftn.cxx | 13
sw/source/core/txtnode/atrref.cxx | 1
sw/source/core/txtnode/atrtox.cxx | 4
sw/source/core/txtnode/chrfmt.cxx | 3
sw/source/core/txtnode/fmtatr2.cxx | 32
sw/source/core/txtnode/fntcache.cxx | 30
sw/source/core/txtnode/fntcap.cxx | 1
sw/source/core/txtnode/modeltoviewhelper.cxx | 1
sw/source/core/txtnode/ndhints.cxx | 4
sw/source/core/txtnode/ndtxt.cxx | 14
sw/source/core/txtnode/swfntcch.cxx | 1
sw/source/core/txtnode/swfont.cxx | 1
sw/source/core/txtnode/thints.cxx | 30
sw/source/core/txtnode/txatritr.cxx | 4
sw/source/core/txtnode/txtatr2.cxx | 6
sw/source/core/txtnode/txtedt.cxx | 12
sw/source/core/undo/SwRewriter.cxx | 1
sw/source/core/undo/SwUndoField.cxx | 1
sw/source/core/undo/SwUndoFmt.cxx | 2
sw/source/core/undo/SwUndoPageDesc.cxx | 4
sw/source/core/undo/SwUndoTOXChange.cxx | 1
sw/source/core/undo/docundo.cxx | 13
sw/source/core/undo/rolbck.cxx | 2
sw/source/core/undo/unattr.cxx | 2
sw/source/core/undo/unbkmk.cxx | 7
sw/source/core/undo/undel.cxx | 1
sw/source/core/undo/undobj.cxx | 7
sw/source/core/undo/undobj1.cxx | 1
sw/source/core/undo/undoflystrattr.cxx | 1
sw/source/core/undo/undraw.cxx | 10
sw/source/core/undo/unfmco.cxx | 2
sw/source/core/undo/unins.cxx | 21
sw/source/core/undo/unnum.cxx | 1
sw/source/core/undo/unoutl.cxx | 3
sw/source/core/undo/unsect.cxx | 13
sw/source/core/undo/unspnd.cxx | 1
sw/source/core/undo/untbl.cxx | 1
sw/source/core/undo/untblk.cxx | 1
sw/source/core/unocore/SwXTextDefaults.cxx | 15
sw/source/core/unocore/TextCursorHelper.cxx | 1
sw/source/core/unocore/XMLRangeHelper.cxx | 10
sw/source/core/unocore/XMLRangeHelper.hxx | 1
sw/source/core/unocore/swunohelper.cxx | 1
sw/source/core/unocore/unobkm.cxx | 6
sw/source/core/unocore/unochart.cxx | 64 -
sw/source/core/unocore/unocoll.cxx | 3
sw/source/core/unocore/unocrsrhelper.cxx | 3
sw/source/core/unocore/unodraw.cxx | 1
sw/source/core/unocore/unoevent.cxx | 13
sw/source/core/unocore/unofield.cxx | 5
sw/source/core/unocore/unoflatpara.cxx | 4
sw/source/core/unocore/unoframe.cxx | 9
sw/source/core/unocore/unoftn.cxx | 2
sw/source/core/unocore/unoidx.cxx | 1
sw/source/core/unocore/unomap.cxx | 10
sw/source/core/unocore/unoobj.cxx | 1
sw/source/core/unocore/unoparagraph.cxx | 1
sw/source/core/unocore/unoport.cxx | 1
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unoredline.cxx | 2
sw/source/core/unocore/unoredlines.cxx | 1
sw/source/core/unocore/unorefmk.cxx | 2
sw/source/core/unocore/unosect.cxx | 1
sw/source/core/unocore/unosrch.cxx | 3
sw/source/core/unocore/unostyle.cxx | 4
sw/source/core/unocore/unotbl.cxx | 7
sw/source/core/unocore/unotext.cxx | 4
sw/source/core/unocore/unotextmarkup.cxx | 6
sw/source/core/view/viewsh.cxx | 10
sw/source/filter/ascii/ascatr.cxx | 6
sw/source/filter/ascii/parasc.cxx | 2
sw/source/filter/ascii/wrtasc.cxx | 4
sw/source/filter/ascii/wrtasc.hxx | 2
sw/source/filter/basflt/docfact.cxx | 2
sw/source/filter/basflt/fltini.cxx | 14
sw/source/filter/basflt/iodetect.cxx | 2
sw/source/filter/basflt/shellio.cxx | 20
sw/source/filter/html/css1atr.cxx | 20
sw/source/filter/html/css1kywd.cxx | 20
sw/source/filter/html/css1kywd.hxx | 22
sw/source/filter/html/htmlatr.cxx | 32
sw/source/filter/html/htmlbas.cxx | 4
sw/source/filter/html/htmlcss1.cxx | 19
sw/source/filter/html/htmlctxt.cxx | 10
sw/source/filter/html/htmldraw.cxx | 7
sw/source/filter/html/htmlfld.cxx | 3
sw/source/filter/html/htmlfld.hxx | 1
sw/source/filter/html/htmlfldw.cxx | 2
sw/source/filter/html/htmlfly.cxx | 23
sw/source/filter/html/htmlfly.hxx | 1
sw/source/filter/html/htmlflyt.cxx | 2
sw/source/filter/html/htmlform.cxx | 1
sw/source/filter/html/htmlform.hxx | 5
sw/source/filter/html/htmlforw.cxx | 8
sw/source/filter/html/htmlftn.cxx | 1
sw/source/filter/html/htmlgrin.cxx | 6
sw/source/filter/html/htmlnum.cxx | 8
sw/source/filter/html/htmlnum.hxx | 2
sw/source/filter/html/htmlplug.cxx | 7
sw/source/filter/html/htmlsect.cxx | 5
sw/source/filter/html/htmltab.cxx | 46
sw/source/filter/html/htmltabw.cxx | 9
sw/source/filter/html/htmlvsh.hxx | 4
sw/source/filter/html/parcss1.cxx | 53 -
sw/source/filter/html/svxcss1.cxx | 44
sw/source/filter/html/svxcss1.hxx | 4
sw/source/filter/html/swcss1.hxx | 6
sw/source/filter/html/swhtml.cxx | 40
sw/source/filter/html/swhtml.hxx | 18
sw/source/filter/html/wrthtml.cxx | 7
sw/source/filter/html/wrthtml.hxx | 4
sw/source/filter/inc/fltini.hxx | 1
sw/source/filter/inc/fltshell.hxx | 15
sw/source/filter/inc/rtf.hxx | 1
sw/source/filter/inc/wrt_fn.hxx | 4
sw/source/filter/inc/wrtswtbl.hxx | 18
sw/source/filter/writer/writer.cxx | 3
sw/source/filter/writer/wrt_fn.cxx | 5
sw/source/filter/writer/wrtswtbl.cxx | 6
sw/source/filter/ww1/fltshell.cxx | 14
sw/source/filter/ww1/w1class.cxx | 6
sw/source/filter/ww1/w1filter.cxx | 4
sw/source/filter/ww1/w1par.hxx | 1
sw/source/filter/ww1/w1sprm.cxx | 2
sw/source/filter/ww1/w1struct.hxx | 5
sw/source/filter/ww8/WW8FFData.cxx | 1
sw/source/filter/ww8/WW8TableInfo.cxx | 7
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/docxattributeoutput.hxx | 1
sw/source/filter/ww8/docxexport.cxx | 3
sw/source/filter/ww8/docxexportfilter.cxx | 1
sw/source/filter/ww8/docxsdrexport.cxx | 1
sw/source/filter/ww8/fields.cxx | 1
sw/source/filter/ww8/hash_wrap.hxx | 1
sw/source/filter/ww8/rtfattributeoutput.cxx | 1
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/rtfexportfilter.cxx | 3
sw/source/filter/ww8/styles.cxx | 1
sw/source/filter/ww8/writerhelper.cxx | 6
sw/source/filter/ww8/writerhelper.hxx | 8
sw/source/filter/ww8/wrtw8esh.cxx | 8
sw/source/filter/ww8/wrtw8nds.cxx | 10
sw/source/filter/ww8/wrtw8num.cxx | 4
sw/source/filter/ww8/wrtw8sty.cxx | 21
sw/source/filter/ww8/wrtww8.cxx | 31
sw/source/filter/ww8/wrtww8.hxx | 3
sw/source/filter/ww8/wrtww8gr.cxx | 1
sw/source/filter/ww8/ww8atr.cxx | 10
sw/source/filter/ww8/ww8glsy.cxx | 4
sw/source/filter/ww8/ww8graf.cxx | 12
sw/source/filter/ww8/ww8graf2.cxx | 4
sw/source/filter/ww8/ww8par.cxx | 29
sw/source/filter/ww8/ww8par.hxx | 29
sw/source/filter/ww8/ww8par2.cxx | 31
sw/source/filter/ww8/ww8par2.hxx | 1
sw/source/filter/ww8/ww8par3.cxx | 121 --
sw/source/filter/ww8/ww8par4.cxx | 3
sw/source/filter/ww8/ww8par5.cxx | 16
sw/source/filter/ww8/ww8par6.cxx | 27
sw/source/filter/ww8/ww8scan.cxx | 32
sw/source/filter/ww8/ww8scan.hxx | 12
sw/source/filter/ww8/ww8struc.hxx | 15
sw/source/filter/ww8/ww8toolbar.hxx | 2
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 3
sw/source/filter/xml/swxml.cxx | 1
sw/source/filter/xml/wrtxml.cxx | 2
sw/source/filter/xml/wrtxml.hxx | 2
sw/source/filter/xml/xmlbrsh.cxx | 1
sw/source/filter/xml/xmlexp.cxx | 8
sw/source/filter/xml/xmlexp.hxx | 1
sw/source/filter/xml/xmlexpit.cxx | 1
sw/source/filter/xml/xmlexpit.hxx | 3
sw/source/filter/xml/xmlfmt.cxx | 2
sw/source/filter/xml/xmlfmte.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 4
sw/source/filter/xml/xmlimp.hxx | 1
sw/source/filter/xml/xmlimpit.cxx | 2
sw/source/filter/xml/xmlimpit.hxx | 4
sw/source/filter/xml/xmlitem.hxx | 2
sw/source/filter/xml/xmlitemi.cxx | 1
sw/source/filter/xml/xmlithlp.cxx | 3
sw/source/filter/xml/xmlmeta.cxx | 2
sw/source/filter/xml/xmltble.cxx | 7
sw/source/filter/xml/xmltbli.cxx | 4
sw/source/filter/xml/xmltexte.hxx | 1
sw/source/ui/app/app.src | 4
sw/source/ui/app/appenv.cxx | 2
sw/source/ui/app/apphdl.cxx | 4
sw/source/ui/app/applab.cxx | 2
sw/source/ui/app/appopt.cxx | 3
sw/source/ui/app/docsh.cxx | 14
sw/source/ui/app/docshdrw.cxx | 1
sw/source/ui/app/docshini.cxx | 3
sw/source/ui/app/docstyle.cxx | 12
sw/source/ui/app/mainwn.cxx | 5
sw/source/ui/app/swmodul1.cxx | 2
sw/source/ui/app/swmodule.cxx | 4
sw/source/ui/app/swwait.cxx | 1
sw/source/ui/cctrl/actctrl.cxx | 2
sw/source/ui/cctrl/popbox.cxx | 1
sw/source/ui/cctrl/swlbox.cxx | 1
sw/source/ui/chrdlg/break.cxx | 1
sw/source/ui/chrdlg/ccoll.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 1
sw/source/ui/chrdlg/drpcps.cxx | 9
sw/source/ui/chrdlg/numpara.cxx | 2
sw/source/ui/chrdlg/pardlg.cxx | 4
sw/source/ui/chrdlg/swuiccoll.cxx | 5
sw/source/ui/config/caption.cxx | 3
sw/source/ui/config/cfgitems.cxx | 4
sw/source/ui/config/dbconfig.cxx | 1
sw/source/ui/config/fontcfg.cxx | 1
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/config/optload.cxx | 1
sw/source/ui/config/optpage.cxx | 11
sw/source/ui/config/prtopt.cxx | 6
sw/source/ui/config/uinums.cxx | 3
sw/source/ui/config/usrpref.cxx | 4
sw/source/ui/config/viewopt.cxx | 2
sw/source/ui/dbui/addresslistdialog.cxx | 1
sw/source/ui/dbui/addresslistdialog.hxx | 1
sw/source/ui/dbui/createaddresslistdialog.cxx | 1
sw/source/ui/dbui/dbinsdlg.cxx | 5
sw/source/ui/dbui/dbmgr.cxx | 6
sw/source/ui/dbui/dbtree.cxx | 1
sw/source/ui/dbui/dbui.cxx | 1
sw/source/ui/dbui/mailmergechildwindow.cxx | 3
sw/source/ui/dbui/mailmergehelper.cxx | 2
sw/source/ui/dbui/mmaddressblockpage.cxx | 1
sw/source/ui/dbui/mmaddressblockpage.hxx | 1
sw/source/ui/dbui/mmconfigitem.cxx | 4
sw/source/ui/dbui/mmdocselectpage.cxx | 1
sw/source/ui/dbui/mmdocselectpage.hxx | 1
sw/source/ui/dbui/mmgreetingspage.cxx | 1
sw/source/ui/dbui/mmgreetingspage.hxx | 1
sw/source/ui/dbui/mmlayoutpage.cxx | 2
sw/source/ui/dbui/mmlayoutpage.hxx | 1
sw/source/ui/dbui/mmmergepage.hxx | 2
sw/source/ui/dbui/mmoutputpage.hxx | 3
sw/source/ui/dbui/mmoutputtypepage.cxx | 1
sw/source/ui/dbui/mmpreparemergepage.cxx | 1
sw/source/ui/dbui/mmpreparemergepage.hxx | 2
sw/source/ui/dbui/swdbtoolsclient.cxx | 3
sw/source/ui/dialog/SwSpellDialogChildWindow.cxx | 5
sw/source/ui/dialog/ascfldlg.cxx | 5
sw/source/ui/dialog/docstdlg.cxx | 1
sw/source/ui/dialog/macassgn.cxx | 1
sw/source/ui/dialog/regionsw.cxx | 1
sw/source/ui/dialog/swdlgfact.cxx | 1
sw/source/ui/dialog/swdlgfact.hxx | 1
sw/source/ui/dialog/uiregionsw.cxx | 6
sw/source/ui/dochdl/gloshdl.cxx | 5
sw/source/ui/dochdl/swdtflvr.cxx | 5
sw/source/ui/docvw/AnnotationWin.cxx | 2
sw/source/ui/docvw/HeaderFooterWin.cxx | 2
sw/source/ui/docvw/OverlayRanges.cxx | 3
sw/source/ui/docvw/OverlayRanges.hxx | 4
sw/source/ui/docvw/PostItMgr.cxx | 6
sw/source/ui/docvw/ShadowOverlayObject.cxx | 2
sw/source/ui/docvw/SidebarTxtControlAcc.cxx | 1
sw/source/ui/docvw/SidebarWin.cxx | 4
sw/source/ui/docvw/edtdd.cxx | 7
sw/source/ui/docvw/edtwin.cxx | 16
sw/source/ui/docvw/edtwin2.cxx | 1
sw/source/ui/docvw/edtwin3.cxx | 2
sw/source/ui/docvw/frmsidebarwincontainer.cxx | 1
sw/source/ui/docvw/romenu.cxx | 1
sw/source/ui/docvw/srcedtw.cxx | 5
sw/source/ui/envelp/envfmt.cxx | 2
sw/source/ui/envelp/envfmt.hxx | 1
sw/source/ui/envelp/envimg.cxx | 2
sw/source/ui/envelp/envlop1.cxx | 2
sw/source/ui/envelp/envprt.hxx | 3
sw/source/ui/envelp/label1.cxx | 3
sw/source/ui/envelp/labelcfg.cxx | 1
sw/source/ui/envelp/labelexp.cxx | 3
sw/source/ui/envelp/labfmt.cxx | 1
sw/source/ui/envelp/labimg.cxx | 1
sw/source/ui/envelp/labimp.hxx | 2
sw/source/ui/envelp/labprt.hxx | 2
sw/source/ui/envelp/mailmrge.cxx | 1
sw/source/ui/envelp/swuilabimp.hxx | 1
sw/source/ui/envelp/syncbtn.cxx | 1
sw/source/ui/fldui/DropDownFieldDialog.cxx | 3
sw/source/ui/fldui/FldRefTreeListBox.cxx | 1
sw/source/ui/fldui/changedb.cxx | 1
sw/source/ui/fldui/flddb.hxx | 1
sw/source/ui/fldui/flddinf.cxx | 2
sw/source/ui/fldui/flddinf.hxx | 1
sw/source/ui/fldui/flddok.hxx | 1
sw/source/ui/fldui/fldedt.cxx | 1
sw/source/ui/fldui/fldfunc.cxx | 1
sw/source/ui/fldui/fldfunc.hxx | 1
sw/source/ui/fldui/fldmgr.cxx | 17
sw/source/ui/fldui/fldpage.hxx | 1
sw/source/ui/fldui/fldref.cxx | 1
sw/source/ui/fldui/fldref.hxx | 1
sw/source/ui/fldui/fldtdlg.cxx | 4
sw/source/ui/fldui/fldui.src | 30
sw/source/ui/fldui/fldvar.cxx | 1
sw/source/ui/fldui/fldvar.hxx | 1
sw/source/ui/fldui/inpdlg.cxx | 4
sw/source/ui/fldui/javaedit.cxx | 3
sw/source/ui/fldui/xfldui.cxx | 5
sw/source/ui/frmdlg/colex.cxx | 2
sw/source/ui/frmdlg/colmgr.cxx | 1
sw/source/ui/frmdlg/column.cxx | 3
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/frmdlg/frmmgr.cxx | 1
sw/source/ui/frmdlg/frmpage.cxx | 3
sw/source/ui/frmdlg/wrap.cxx | 2
sw/source/ui/globdoc/globdoc.cxx | 4
sw/source/ui/inc/SwXFilterOptions.hxx | 1
sw/source/ui/inc/actctrl.hxx | 1
sw/source/ui/inc/annotsh.hxx | 1
sw/source/ui/inc/ascfldlg.hxx | 2
sw/source/ui/inc/autoedit.hxx | 4
sw/source/ui/inc/basesh.hxx | 1
sw/source/ui/inc/bookctrl.hxx | 1
sw/source/ui/inc/caption.hxx | 1
sw/source/ui/inc/cfgitems.hxx | 5
sw/source/ui/inc/changedb.hxx | 1
sw/source/ui/inc/chartins.hxx | 1
sw/source/ui/inc/chldwrap.hxx | 1
sw/source/ui/inc/colmgr.hxx | 2
sw/source/ui/inc/column.hxx | 2
sw/source/ui/inc/conarc.hxx | 2
sw/source/ui/inc/conform.hxx | 2
sw/source/ui/inc/conpoly.hxx | 1
sw/source/ui/inc/conrect.hxx | 2
sw/source/ui/inc/content.hxx | 13
sw/source/ui/inc/conttree.hxx | 8
sw/source/ui/inc/convert.hxx | 1
sw/source/ui/inc/cption.hxx | 3
sw/source/ui/inc/dbinsdlg.hxx | 2
sw/source/ui/inc/dbui.hxx | 1
sw/source/ui/inc/drawbase.hxx | 2
sw/source/ui/inc/drwbassh.hxx | 1
sw/source/ui/inc/dselect.hxx | 2
sw/source/ui/inc/edtwin.hxx | 7
sw/source/ui/inc/fldmgr.hxx | 3
sw/source/ui/inc/fontcfg.hxx | 2
sw/source/ui/inc/formatclipboard.hxx | 1
sw/source/ui/inc/frmpage.hxx | 2
sw/source/ui/inc/globdoc.hrc | 2
sw/source/ui/inc/glosdoc.hxx | 1
sw/source/ui/inc/gloslst.hxx | 6
sw/source/ui/inc/glossary.hxx | 5
sw/source/ui/inc/glshell.hxx | 1
sw/source/ui/inc/imaildsplistener.hxx | 1
sw/source/ui/inc/initui.hxx | 1
sw/source/ui/inc/inpdlg.hxx | 1
sw/source/ui/inc/inputwin.hxx | 5
sw/source/ui/inc/instable.hxx | 1
sw/source/ui/inc/mailconfigpage.hxx | 1
sw/source/ui/inc/mailmrge.hxx | 1
sw/source/ui/inc/mergetbl.hxx | 2
sw/source/ui/inc/mmconfigitem.hxx | 1
sw/source/ui/inc/multmrk.hxx | 2
sw/source/ui/inc/navicfg.hxx | 2
sw/source/ui/inc/navipi.hxx | 1
sw/source/ui/inc/navmgr.hxx | 1
sw/source/ui/inc/num.hxx | 1
sw/source/ui/inc/numberingtypelistbox.hxx | 1
sw/source/ui/inc/numfmtlb.hxx | 1
sw/source/ui/inc/numpara.hxx | 3
sw/source/ui/inc/numprevw.hxx | 2
sw/source/ui/inc/olesh.hxx | 6
sw/source/ui/inc/olmenu.hxx | 1
sw/source/ui/inc/optpage.hxx | 3
sw/source/ui/inc/outline.hxx | 1
sw/source/ui/inc/popbox.hxx | 2
sw/source/ui/inc/pview.hxx | 1
sw/source/ui/inc/redlndlg.hxx | 4
sw/source/ui/inc/regionsw.hxx | 2
sw/source/ui/inc/scroll.hxx | 2
sw/source/ui/inc/shdwcrsr.hxx | 3
sw/source/ui/inc/splittbl.hxx | 1
sw/source/ui/inc/srcedtw.hxx | 1
sw/source/ui/inc/srcview.hxx | 5
sw/source/ui/inc/swcont.hxx | 4
sw/source/ui/inc/swdtflvr.hxx | 2
sw/source/ui/inc/swrenamexnameddlg.hxx | 1
sw/source/ui/inc/swtablerep.hxx | 1
sw/source/ui/inc/swuiccoll.hxx | 3
sw/source/ui/inc/swuicnttab.hxx | 4
sw/source/ui/inc/swuiidxmrk.hxx | 2
sw/source/ui/inc/swwrtshitem.hxx | 1
sw/source/ui/inc/syncbtn.hxx | 1
sw/source/ui/inc/tabledlg.hxx | 2
sw/source/ui/inc/tautofmt.hxx | 9
sw/source/ui/inc/tblctrl.hxx | 10
sw/source/ui/inc/toxmgr.hxx | 8
sw/source/ui/inc/uivwimp.hxx | 1
sw/source/ui/inc/unoatxt.hxx | 4
sw/source/ui/inc/unodispatch.hxx | 2
sw/source/ui/inc/unomailmerge.hxx | 11
sw/source/ui/inc/unomod.hxx | 3
sw/source/ui/inc/unotools.hxx | 1
sw/source/ui/inc/unotxvw.hxx | 2
sw/source/ui/inc/usrpref.hxx | 2
sw/source/ui/inc/utlui.hrc | 2
sw/source/ui/inc/view.hxx | 3
sw/source/ui/inc/web.hrc | 2
sw/source/ui/inc/wformsh.hxx | 2
sw/source/ui/inc/wfrmsh.hxx | 3
sw/source/ui/inc/wgrfsh.hxx | 2
sw/source/ui/inc/wolesh.hxx | 6
sw/source/ui/inc/workctrl.hxx | 22
sw/source/ui/inc/wrap.hxx | 2
sw/source/ui/inc/wrtsh.hxx | 3
sw/source/ui/inc/wtextsh.hxx | 3
sw/source/ui/inc/zoomctrl.hxx | 2
sw/source/ui/index/cntex.cxx | 2
sw/source/ui/index/cnttab.cxx | 7
sw/source/ui/index/multmrk.cxx | 5
sw/source/ui/index/swuiidxmrk.cxx | 3
sw/source/ui/index/toxmgr.cxx | 13
sw/source/ui/lingu/hhcwrp.cxx | 25
sw/source/ui/lingu/hyp.cxx | 9
sw/source/ui/lingu/olmenu.cxx | 14
sw/source/ui/lingu/sdrhhcwrap.cxx | 7
sw/source/ui/lingu/sdrhhcwrap.hxx | 4
sw/source/ui/misc/bookmark.cxx | 2
sw/source/ui/misc/docfnote.cxx | 14
sw/source/ui/misc/glosdoc.cxx | 2
sw/source/ui/misc/glshell.cxx | 1
sw/source/ui/misc/impfnote.hxx | 3
sw/source/ui/misc/num.cxx | 1
sw/source/ui/misc/numberingtypelistbox.cxx | 1
sw/source/ui/misc/pgfnote.cxx | 3
sw/source/ui/misc/redlndlg.cxx | 2
sw/source/ui/misc/swruler.cxx | 1
sw/source/ui/ribbar/drawbase.cxx | 4
sw/source/ui/ribbar/dselect.cxx | 2
sw/source/ui/ribbar/inputwin.cxx | 3
sw/source/ui/ribbar/tblctrl.cxx | 1
sw/source/ui/ribbar/tbxanchr.cxx | 4
sw/source/ui/ribbar/workctrl.cxx | 2
sw/source/ui/shells/annotsh.cxx | 4
sw/source/ui/shells/basesh.cxx | 7
sw/source/ui/shells/drawdlg.cxx | 1
sw/source/ui/shells/drformsh.cxx | 4
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 1
sw/source/ui/shells/langhelper.cxx | 4
sw/source/ui/shells/listsh.cxx | 1
sw/source/ui/shells/navsh.cxx | 1
sw/source/ui/shells/olesh.cxx | 3
sw/source/ui/shells/slotadd.cxx | 3
sw/source/ui/shells/tabsh.cxx | 3
sw/source/ui/shells/textdrw.cxx | 2
sw/source/ui/shells/textfld.cxx | 1
sw/source/ui/shells/textidx.cxx | 2
sw/source/ui/shells/textsh1.cxx | 2
sw/source/ui/shells/txtattr.cxx | 7
sw/source/ui/shells/txtnum.cxx | 1
sw/source/ui/sidebar/PageColumnControl.cxx | 3
sw/source/ui/sidebar/PageColumnControl.hxx | 1
sw/source/ui/sidebar/PageMarginControl.cxx | 9
sw/source/ui/sidebar/PageMarginControl.hxx | 2
sw/source/ui/sidebar/PageOrientationControl.cxx | 3
sw/source/ui/sidebar/PageOrientationControl.hxx | 1
sw/source/ui/sidebar/PagePropertyPanel.cxx | 35
sw/source/ui/sidebar/PagePropertyPanel.hrc | 2
sw/source/ui/sidebar/PagePropertyPanel.hxx | 1
sw/source/ui/sidebar/PageSizeControl.cxx | 3
sw/source/ui/sidebar/PageSizeControl.hxx | 1
sw/source/ui/sidebar/SwPanelFactory.cxx | 2
sw/source/ui/sidebar/WrapPropertyPanel.cxx | 5
sw/source/ui/table/tabledlg.cxx | 7
sw/source/ui/table/tablepg.hxx | 2
sw/source/ui/table/tautofmt.cxx | 3
sw/source/ui/uiview/formatclipboard.cxx | 2
sw/source/ui/uiview/pview.cxx | 2
sw/source/ui/uiview/scroll.cxx | 3
sw/source/ui/uiview/srcview.cxx | 7
sw/source/ui/uiview/uivwimp.cxx | 2
sw/source/ui/uiview/view.cxx | 2
sw/source/ui/uiview/view0.cxx | 2
sw/source/ui/uiview/view1.cxx | 1
sw/source/ui/uiview/view2.cxx | 7
sw/source/ui/uiview/viewcoll.cxx | 3
sw/source/ui/uiview/viewdlg2.cxx | 1
sw/source/ui/uiview/viewdraw.cxx | 1
sw/source/ui/uiview/viewfunc.hxx | 1
sw/source/ui/uiview/viewling.cxx | 3
sw/source/ui/uiview/viewmdi.cxx | 1
sw/source/ui/uiview/viewport.cxx | 5
sw/source/ui/uiview/viewsrch.cxx | 7
sw/source/ui/uiview/viewstat.cxx | 1
sw/source/ui/uiview/viewtab.cxx | 1
sw/source/ui/uno/SwXDocumentSettings.cxx | 6
sw/source/ui/uno/SwXDocumentSettings.hxx | 2
sw/source/ui/uno/detreg.cxx | 2
sw/source/ui/uno/dlelstnr.cxx | 1
sw/source/ui/uno/swdetect.cxx | 1
sw/source/ui/uno/swdetect.hxx | 2
sw/source/ui/uno/unoatxt.cxx | 1
sw/source/ui/uno/unodefaults.hxx | 1
sw/source/ui/uno/unodispatch.cxx | 4
sw/source/ui/uno/unodoc.cxx | 3
sw/source/ui/uno/unofreg.cxx | 1
sw/source/ui/uno/unomailmerge.cxx | 5
sw/source/ui/uno/unomod.cxx | 2
sw/source/ui/uno/unotxdoc.cxx | 15
sw/source/ui/uno/unotxvw.cxx | 2
sw/source/ui/utlui/attrdesc.cxx | 1
sw/source/ui/utlui/condedit.cxx | 2
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/utlui/glbltree.cxx | 24
sw/source/ui/utlui/gloslst.cxx | 2
sw/source/ui/utlui/initui.cxx | 1
sw/source/ui/utlui/initui.src | 2
sw/source/ui/utlui/navicfg.cxx | 1
sw/source/ui/utlui/navipi.cxx | 3
sw/source/ui/utlui/numfmtlb.cxx | 1
sw/source/ui/utlui/prcntfld.cxx | 1
sw/source/ui/utlui/swrenamexnameddlg.cxx | 1
sw/source/ui/utlui/tmplctrl.cxx | 1
sw/source/ui/utlui/uitool.cxx | 7
sw/source/ui/utlui/unotools.cxx | 3
sw/source/ui/utlui/zoomctrl.cxx | 1
sw/source/ui/vba/service.cxx | 3
sw/source/ui/vba/vbaautotextentry.cxx | 1
sw/source/ui/vba/vbaautotextentry.hxx | 1
sw/source/ui/vba/vbaborders.cxx | 1
sw/source/ui/vba/vbadocumentproperties.cxx | 4
sw/source/ui/vba/vbadocuments.hxx | 2
sw/source/ui/vba/vbaeventshelper.cxx | 6
sw/source/ui/vba/vbaeventshelper.hxx | 4
sw/source/ui/vba/vbafield.cxx | 5
sw/source/ui/vba/vbafont.cxx | 1
sw/source/ui/vba/vbaglobals.cxx | 6
sw/source/ui/vba/vbaglobals.hxx | 3
sw/source/ui/vba/vbalistformat.hxx | 1
sw/source/ui/vba/vbalistgallery.hxx | 1
sw/source/ui/vba/vbalisthelper.hxx | 1
sw/source/ui/vba/vbalistlevel.hxx | 1
sw/source/ui/vba/vbalistlevels.hxx | 1
sw/source/ui/vba/vbalisttemplate.hxx | 1
sw/source/ui/vba/vbaparagraph.hxx | 2
sw/source/ui/vba/vbaparagraphformat.cxx | 1
sw/source/ui/vba/vbarangehelper.cxx | 1
sw/source/ui/vba/vbarevisions.hxx | 1
sw/source/ui/vba/vbastyle.cxx | 1
sw/source/ui/vba/vbastyle.hxx | 1
sw/source/ui/vba/vbatableofcontents.cxx | 1
sw/source/ui/vba/vbatables.cxx | 1
sw/source/ui/vba/vbatables.hxx | 1
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/vba/vbawrapformat.cxx | 1
sw/source/ui/vba/wordvbahelper.cxx | 4
sw/source/ui/web/wdocsh.cxx | 5
sw/source/ui/web/wformsh.cxx | 1
sw/source/ui/web/wfrmsh.cxx | 9
sw/source/ui/web/wgrfsh.cxx | 2
sw/source/ui/web/wlistsh.cxx | 1
sw/source/ui/web/wolesh.cxx | 1
sw/source/ui/web/wtabsh.cxx | 3
sw/source/ui/web/wtextsh.cxx | 2
sw/source/ui/web/wview.cxx | 5
sw/source/ui/wrtsh/delete.cxx | 7
sw/source/ui/wrtsh/move.cxx | 5
sw/source/ui/wrtsh/select.cxx | 6
sw/source/ui/wrtsh/wrtsh2.cxx | 4
sw/source/ui/wrtsh/wrtsh3.cxx | 2
sw/source/ui/wrtsh/wrtundo.cxx | 1
986 files changed, 763 insertions(+), 4695 deletions(-)
New commits:
commit a27462189d1d6a3d22be23a5eee603edca5d8ea3
Author: Alexander Wilms <f.alexander.wilms at gmail.com>
Date: Tue Feb 25 21:01:20 2014 +0100
Remove visual noise from sw
Conflicts:
sw/inc/unodraw.hxx
sw/inc/unoframe.hxx
sw/sdi/swriter.sdi
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unoparagraph.cxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/ui/inc/unotxvw.hxx
sw/source/ui/lingu/hyp.cxx
sw/source/ui/lingu/sdrhhcwrap.cxx
sw/source/ui/uno/swdetect.hxx
Change-Id: Ic0a3fb2392187c277c9b36915ffb10dcf0317908
Reviewed-on: https://gerrit.libreoffice.org/8322
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 6140be9..3802810 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -45,7 +45,6 @@ class SwTable;
class SwNumberTreeNode;
class SvxLanguageItem;
-
/*
* Mapping of OOo elements to tagged pdf elements:
*
diff --git a/sw/inc/IDocumentChartDataProviderAccess.hxx b/sw/inc/IDocumentChartDataProviderAccess.hxx
index 8e217cc..8a53ae4 100644
--- a/sw/inc/IDocumentChartDataProviderAccess.hxx
+++ b/sw/inc/IDocumentChartDataProviderAccess.hxx
@@ -30,7 +30,6 @@ class SwTable;
class SwChartDataProvider;
class SwChartLockController_Helper;
-
/** Give access to the data-provider for chart
*/
class IDocumentChartDataProviderAccess
diff --git a/sw/inc/IDocumentExternalData.hxx b/sw/inc/IDocumentExternalData.hxx
index 3a9313d..b9a8e10 100644
--- a/sw/inc/IDocumentExternalData.hxx
+++ b/sw/inc/IDocumentExternalData.hxx
@@ -41,7 +41,6 @@ public:
typedef ::boost::shared_ptr<ExternalData> tExternalDataPointer;
}
-
class IDocumentExternalData
{
protected:
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 7d263ef..0b8c38b 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -112,7 +112,6 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0;
-
// 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
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 4256155..784b45f 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -218,7 +218,6 @@ class IDocumentMarkAccess
*/
virtual const_iterator_t findMark(const OUString& rMark) const =0;
-
// interface IBookmarks (BOOKMARK, CROSSREF_NUMITEM_BOOKMARK, CROSSREF_HEADING_BOOKMARK )
/** returns a STL-like random access iterator to the begin of the sequence the IBookmarks.
@@ -243,7 +242,6 @@ class IDocumentMarkAccess
*/
virtual const_iterator_t findBookmark(const OUString& rMark) const =0;
-
// Fieldmarks
virtual ::sw::mark::IFieldmark* getFieldmarkFor(const SwPosition& pos) const =0;
virtual ::sw::mark::IFieldmark* getFieldmarkBefore(const SwPosition& pos) const =0;
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 02d6504..86e70a0 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -24,7 +24,6 @@
#include <swundo.hxx>
-
class SwRewriter;
class SwNodes;
class SwUndo;
@@ -33,8 +32,6 @@ namespace sw {
class RepeatContext;
}
-
-
/** IDocumentUndoRedo
*/
class IDocumentUndoRedo
@@ -202,7 +199,6 @@ protected:
virtual ~IDocumentUndoRedo() {};
};
-
namespace sw {
class UndoGuard
@@ -270,7 +266,6 @@ private:
bool const m_bDrawUndoWasEnabled;
};
-
} // namespace sw
#endif
diff --git a/sw/inc/IMark.hxx b/sw/inc/IMark.hxx
index 8359e2e..d073085 100644
--- a/sw/inc/IMark.hxx
+++ b/sw/inc/IMark.hxx
@@ -32,7 +32,6 @@
SV_DECL_REF( SwServerObject )
#endif
-
struct SwPosition;
namespace sw { namespace mark
diff --git a/sw/inc/IShellCursorSupplier.hxx b/sw/inc/IShellCursorSupplier.hxx
index fe7c690..e1c8085 100644
--- a/sw/inc/IShellCursorSupplier.hxx
+++ b/sw/inc/IShellCursorSupplier.hxx
@@ -20,10 +20,8 @@
#ifndef INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
#define INCLUDED_SW_INC_ISHELLCURSORSUPPLIER_HXX
-
class SwPaM;
-
namespace sw {
/** The Undo actions need to create new Shell cursors.
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index faf1014..1467bed 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -66,7 +66,6 @@ class Window;
typedef std::list<SwSidebarItem*> SwSidebarItem_list;
typedef std::list<SwSidebarItem*>::iterator SwSidebarItem_iterator;
-
struct SwPostItPageItem
{
bool bScrollbar;
@@ -257,7 +256,6 @@ class SwPostItMgr: public SfxListener
static Color GetColorLight(sal_uInt16 aAuthorIndex);
static Color GetColorAnchor(sal_uInt16 aAuthorIndex);
-
void RegisterAnswer(OutlinerParaObject* pAnswer) { mpAnswer = pAnswer;}
OutlinerParaObject* IsAnswer() {return mpAnswer;}
void CheckMetaText();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index ee34d83..f98a2ef 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -57,7 +57,6 @@ typedef sal_Int64 SwPostItBits;
#define PB_Preview ((SwPostItBits)0x00000001)
-
class SwSidebarWin : public Window
{
public:
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index c41fd2c..2445cdf 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -29,7 +29,6 @@
#include <com/sun/star/embed/XEmbeddedObject.hpp>
-
#include <sfx2/frmhtml.hxx>
#include <sfx2/frmhtmlw.hxx>
#include <vcl/wrkwin.hxx>
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx
index 0f1d012..485d2f4 100644
--- a/sw/inc/SwSmartTagMgr.hxx
+++ b/sw/inc/SwSmartTagMgr.hxx
@@ -22,7 +22,6 @@
#include <svx/SmartTagMgr.hxx>
-
/*************************************************************************
* class SwSmartTagMgr
*
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 91e56ce..923889f 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/uno/Any.h>
-
class SwDoc;
class SwField;
class SwMsgPoolItem;
diff --git a/sw/inc/TextCursorHelper.hxx b/sw/inc/TextCursorHelper.hxx
index 950fee7..aba4e3d 100644
--- a/sw/inc/TextCursorHelper.hxx
+++ b/sw/inc/TextCursorHelper.hxx
@@ -46,5 +46,4 @@ protected:
#endif // INCLUDED_SW_INC_TEXTCURSORHELPER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 13a609a..3a16822 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -261,7 +261,6 @@ public:
void FireEvents();
-
// IAccessibleViewForwarder
virtual bool IsValid() const;
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 2a9f3d2..dde4853 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -73,7 +73,6 @@ public:
bool GetWordsMatching(OUString aMatch, std::vector<OUString>& aWords) const;
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 7ed66ca..5b360af 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -126,7 +126,6 @@ class SW_DLLPUBLIC SwAnchoredObject
mbPositioningInProgress = _bPosInProgress;
}
-
/** check anchor character rectangle
helper method for method <CheckCharRectAndTopOfLine()>
@@ -550,9 +549,8 @@ class SW_DLLPUBLIC SwAnchoredObject
virtual const char* getElementName( ) { return "SwAnchoredObject"; }
};
-// ============================================================================
// helper class for notify that positioning of an anchored object is in progress
-// ============================================================================
+
class SwObjPositioningInProgress
{
private:
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 865092a..463e483 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -42,7 +42,6 @@ public:
}
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 0d517e0..541be14 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -43,13 +43,11 @@ protected:
};
typedef BigPtrEntry* ElementPtr;
-
typedef bool (*FnForEach)( const ElementPtr&, void* pArgs );
// 1000 entries per Block = a bit less then 4K
#define MAXENTRY 1000
-
// number of entries that may remain free during compression
// this value is for the worst case; because we defined MAXBLOCK with ca 25%
// overhead, 80% = 800 entries are enough
@@ -102,8 +100,6 @@ public:
void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs = NULL );
};
-
-
inline sal_uLong BigPtrEntry::GetPos() const
{
assert(this == pBlock->pData[ nOffset ]); // element not in the block
@@ -115,7 +111,6 @@ inline BigPtrArray& BigPtrEntry::GetArray() const
return *pBlock->pBigArr;
}
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 497dcf0..89ea5d1 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -33,7 +33,6 @@
* class SwBreakIt
*************************************************************************/
-
class SW_DLLPUBLIC SwBreakIt : private ::boost::noncopyable
{
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 8636085..26320f9 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -56,9 +56,7 @@ class SfxHint;
code gets polluted by pointer casts (see switerator.hxx).
*/
-// ----------
// SwClient
-// ----------
class SW_DLLPUBLIC SwClient : ::boost::noncopyable
{
@@ -116,9 +114,7 @@ inline SwClient::SwClient() :
pLeft(0), pRight(0), pRegisteredIn(0), mbIsAllowedToBeRemovedInModifyCall(false)
{}
-// ----------
// SwModify
-// ----------
// class has a doubly linked list for dependencies
class SW_DLLPUBLIC SwModify: public SwClient
@@ -172,9 +168,7 @@ public:
bool IsLastDepend() { return pRoot && pRoot->IsLast(); }
};
-// ----------
// SwDepend
-// ----------
/*
* Helper class for objects that need to depend on more than one SwClient
@@ -196,7 +190,6 @@ protected:
virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint );
};
-
class SwClientIter
{
friend SwClient* SwModify::Remove(SwClient *); ///< for pointer adjustments
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 9b83a5c..2d00ab5 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -120,7 +120,6 @@ public:
{}
virtual ~SwSbxValue();
-
sal_Bool GetBool() const;
double GetDouble() const;
SwSbxValue& MakeDouble();
@@ -182,7 +181,6 @@ class SwCalc
SwCalcOper eCurrListOper;
SwCalcError eError;
-
SwCalcOper GetToken();
SwSbxValue Expr();
SwSbxValue Term();
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 8889873..10bc398 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -30,15 +30,11 @@
#include "swdllapi.h"
#include "cmdid.h"
-//***********************************************************
-
struct CollName {
sal_uLong nCnd;
sal_uLong nSubCond;
};
-//***********************************************************
-
#define COND_COMMAND_COUNT 28
struct CommandStruct
@@ -47,13 +43,9 @@ struct CommandStruct
sal_uLong nSubCond;
};
-//***********************************************************
-
sal_Int16 GetCommandContextIndex( const OUString &rContextName );
OUString GetCommandContextByIndex( sal_Int16 nIndex );
-//***********************************************************
-
class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem
{
static const CommandStruct aCmds[COND_COMMAND_COUNT];
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index 9407a94..2ba21cf 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -97,10 +97,6 @@ public:
double GetValue() const { return nValue; }
};
-
-
-//***************************************************************************
-
inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const
@@ -108,8 +104,6 @@ inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP)
inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
-//***************************************************************************
-
inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); }
inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index abece1e..0b5c6b9 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -51,8 +51,6 @@ public:
void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
};
-
-
class SwTableFormula
{
typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
@@ -147,8 +145,6 @@ public:
bool HasValidBoxes() const;
};
-
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 40d4304..402a2db 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -22,7 +22,6 @@
#include <format.hxx>
#include <hintids.hxx>
-
// implementation of the character attribute methods of SwAttrSet
inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 3876be6..6eb9e80 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -35,7 +35,6 @@ class SW_DLLPUBLIC SwCharFmt : public SwFmt
: SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
{}
-
public:
TYPEINFO(); // already in base class Client
};
@@ -49,6 +48,4 @@ namespace CharFmt
#endif
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/chcmprse.hxx b/sw/inc/chcmprse.hxx
index 963aaee..37574b3 100644
--- a/sw/inc/chcmprse.hxx
+++ b/sw/inc/chcmprse.hxx
@@ -24,6 +24,5 @@ enum SwCharCompressType{ CHARCOMPRESS_NONE,
CHARCOMPRESS_PUNCTUATION,
CHARCOMPRESS_PUNCTUATION_KANA };
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index ef9d86e..891e43e 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -21,12 +21,10 @@
#include "fldbas.hxx"
-
class SwFrm;
class SwCntntNode;
class SwTxtNode;
-
enum SwChapterFormat
{
CF_BEGIN,
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 303642a..2e78df9 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -935,17 +935,17 @@ included in c-context files, so c++ style stuff will cause problems.
#define MID_13 0xfa
// defines for Event-assignments per Macro
-#define MAC_EVENT_MOUSEOVER 0x01 //
-#define MAC_EVENT_MOUSECLICK 0x02 //
-#define MAC_EVENT_MOUSEOUT 0x03 //
-#define MAC_EVENT_OBJECT_SELECT 0x04 //
-#define MAC_EVENT_KEYINPUT_ALPHA 0x05 //
-#define MAC_EVENT_KEYINPUT_NOALPHA 0x06 //
-#define MAC_EVENT_FRM_RESIZE 0x07 //
-#define MAC_EVENT_FRM_MOVE 0x08 //
-#define MAC_EVENT_IMAGE_LOAD 0x09 //
-#define MAC_EVENT_IMAGE_ABORT 0x0a //
-#define MAC_EVENT_IMAGE_ERROR 0x0b //
+#define MAC_EVENT_MOUSEOVER 0x01
+#define MAC_EVENT_MOUSECLICK 0x02
+#define MAC_EVENT_MOUSEOUT 0x03
+#define MAC_EVENT_OBJECT_SELECT 0x04
+#define MAC_EVENT_KEYINPUT_ALPHA 0x05
+#define MAC_EVENT_KEYINPUT_NOALPHA 0x06
+#define MAC_EVENT_FRM_RESIZE 0x07
+#define MAC_EVENT_FRM_MOVE 0x08
+#define MAC_EVENT_IMAGE_LOAD 0x09
+#define MAC_EVENT_IMAGE_ABORT 0x0a
+#define MAC_EVENT_IMAGE_ERROR 0x0b
#endif // INCLUDED_SW_INC_CMDID_H
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index eb34953..30559a4 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -19,14 +19,11 @@
#ifndef INCLUDED_SW_INC_COLWD_HXX
#define INCLUDED_SW_INC_COLWD_HXX
-
#include <svx/stddlg.hxx>
#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
#include <vcl/button.hxx>
-
-
class SwTableFUNC;
class SwTableWidthDlg : public SvxStandardDialog
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index eb1b3e2..67a0187 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -21,9 +21,9 @@
#include "rcid.hrc"
-// ---------------
+
// Strings
-// ---------------
+
#define STR_COMCORE_READERROR (RC_COMCORE_BEGIN + 0)
#define MSG_COMCORE_ASKSEARCH (RC_COMCORE_BEGIN + 1)
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 6dae1e2..a1ed102 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -22,7 +22,6 @@
#include <tools/solar.h>
-
// define for cursor travelling normally in western text cells and chars do
// the same, but in complex text cell skip over legatures and char skip
// into it.
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 7ad58f5..9ab7ae2 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -24,7 +24,6 @@
#include <swtypes.hxx>
#include <swrect.hxx>
-
enum SwFillMode
{
FILL_TAB, ///< default, fill with tabs
@@ -202,8 +201,6 @@ struct SwCrsrMoveState
{}
};
-
#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index c5a1882..b28484c 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -30,7 +30,6 @@ class SwLayoutFrm;
struct SwMoveFnCollection;
typedef SwMoveFnCollection* SwMoveFn;
-
// Type definition for CrsrShell.
// Direction-parameter for MovePage (initialized in SwCntntFrm).
typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
@@ -68,7 +67,6 @@ typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
extern SwPosRegion fnRegionStart, fnRegionEnd;
-
/*
* The following combinations are allowed:
* - find one in body -> FND_IN_BODY
@@ -86,7 +84,6 @@ enum FindRanges
FND_IN_SELALL = 0x01 ///< All (only in non-body and selections).
};
-
enum SwDocPositions
{
DOCPOS_START,
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 83da26a..31314d2 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -33,7 +33,7 @@ class SwFrm;
class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
{
- SwDBData aDBData; //
+ SwDBData aDBData;
OUString sName; ///< only used in ::GetName() !
OUString sColumn;
long nRefCnt;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index e5ab96e..3c1588c 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -72,8 +72,6 @@ class SwDbtoolsClient;
class SwXMailMerge;
class SwMailMergeConfigItem;
-// -----------------------------------------------------------------------
-
enum DBMgrOptions
{
DBMGR_MERGE, ///< Data records in fields.
@@ -85,8 +83,6 @@ enum DBMgrOptions
DBMGR_MERGE_SINGLE_FILE ///< Save merge as single file.
};
-// -----------------------------------------------------------------------
-
/*--------------------------------------------------------------------
Administration of (new) logical databases.
--------------------------------------------------------------------*/
@@ -204,7 +200,6 @@ friend class SwConnectionDisposedListener_Impl;
SAL_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
SAL_DLLPRIVATE SwDSParam* FindDSConnection(const OUString& rSource, sal_Bool bCreate);
-
SAL_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
/// Insert data record as text into document.
@@ -247,7 +242,6 @@ public:
inline void SetSubject(const OUString& sSbj) { sSubject = sSbj; }
inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; }
-
/// Fill listbox with all table names of a database.
sal_Bool GetTableNames(ListBox* pListBox, const OUString& rDBName );
@@ -303,7 +297,6 @@ public:
{return FindDSData(rData, sal_True);}
const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;}
-
/// close all data sources - after fields were updated
void CloseAll(sal_Bool bIncludingMerge = sal_True);
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 739fc74..84cea92 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -147,7 +147,6 @@ public:
*/
virtual void MoveObjToInvisibleLayer( SdrObject* _pDrawObj );
- // -------------------------------------------------------------------------
/** some virtual helper methods for information
about the object (Writer fly frame resp. drawing object) */
const SwFmtAnchor& GetAnchorFmt() const
@@ -172,8 +171,6 @@ public:
const SwIndex& GetCntntAnchorIndex() const;
- // -------------------------------------------------------------------------
-
/** get data collection of anchored objects, handled by with contact
*/
@@ -323,7 +320,6 @@ class SwDrawVirtObj : public SdrVirtObj
bool CheckControlLayer( const SdrObject *pObj );
-
/** ContactObject for connection of formats as representatives of draw objects
in SwClient and the objects themselves in Drawing (SDrObjUserCall). */
class NestedUserCallHdl;
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 97dfe92..3fa8df5 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -106,7 +106,6 @@ public:
virtual void SetPar2(const OUString& rStr);
};
-
#endif // INCLUDED_SW_INC_DDEFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index e98a41c..e1d19a8 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/frame/XDesktop2.hpp>
#include <cppuhelper/implbase2.hxx>
-
namespace com { namespace sun { namespace star {
namespace linguistic2 {
class XDictionaryList;
@@ -39,12 +38,10 @@ namespace com { namespace sun { namespace star {
}
} } }
-///////////////////////////////////////////////////////////////////////////
// SwLinguServiceEventListener
// is a EventListener that triggers spellchecking
// and hyphenation when relevant changes (to the
// dictionaries of the dictionary list, or properties) were made.
-//
class SwLinguServiceEventListener :
public cppu::WeakImplHelper2
@@ -82,7 +79,6 @@ public:
virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& rEventObj ) throw(::com::sun::star::uno::RuntimeException, std::exception);
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dobjfac.hxx b/sw/inc/dobjfac.hxx
index 1b2e9cf..b76fb54 100644
--- a/sw/inc/dobjfac.hxx
+++ b/sw/inc/dobjfac.hxx
@@ -21,9 +21,8 @@
#include <tools/link.hxx>
-//-----------------------
// class SwObjectFactory
-//-----------------------
+
class SdrObjFactory;
class SwObjectFactory
@@ -34,7 +33,6 @@ public:
extern SwObjectFactory aSwObjectFactory;
-
#endif // INCLUDED_SW_INC_DOBJFAC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index d15b353..2f030ba 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -19,8 +19,7 @@
#ifndef INCLUDED_SW_INC_DOC_HXX
#define INCLUDED_SW_INC_DOC_HXX
-/** SwDoc interfaces */
-
+// SwDoc interfaces
#include <IInterface.hxx>
#include <IDocumentSettingAccess.hxx>
#include <IDocumentDeviceAccess.hxx>
@@ -212,13 +211,13 @@ namespace sw {
namespace com { namespace sun { namespace star {
namespace i18n {
- struct ForbiddenCharacters; ///< comes from the I18N UNO interface
+ struct ForbiddenCharacters; //< comes from the I18N UNO interface
}
namespace uno {
template < class > class Sequence;
}
namespace container {
- class XNameContainer; ///< for getXForms()/isXForms()/initXForms() methods
+ class XNameContainer; //< for getXForms()/isXForms()/initXForms() methods
}
}}}
@@ -228,21 +227,21 @@ namespace sfx2 {
class LinkManager;
}
-/// PageDescriptor-interface, Array because of inlines.
+// PageDescriptor-interface, Array because of inlines.
class SwPageDescs : public std::vector<SwPageDesc*>
{
public:
- /// the destructor will free all objects still in the vector
+ // the destructor will free all objects still in the vector
~SwPageDescs();
};
-/// forward declaration
+// forward declaration
void SetAllScriptItem( SfxItemSet& rSet, const SfxPoolItem& rItem );
-/// global function to start grammar checking in the document
+// global function to start grammar checking in the document
void StartGrammarChecking( SwDoc &rDoc );
-/// Represents the model of a Writer document.
+// Represents the model of a Writer document.
class SW_DLLPUBLIC SwDoc :
public IInterface,
public IDocumentSettingAccess,
@@ -268,119 +267,114 @@ class SW_DLLPUBLIC SwDoc :
friend void _InitCore();
friend void _FinitCore();
- //---------------- private Member --------------------------------
-
- // -------------------------------------------------------------------
- ::boost::scoped_ptr<SwNodes> m_pNodes; ///< document content (Nodes Array)
- SwAttrPool* mpAttrPool; ///< the attribute pool
- SwPageDescs maPageDescs; ///< PageDescriptors
- Link maOle2Link; ///< OLE 2.0-notification
+ // private Member
+ ::boost::scoped_ptr<SwNodes> m_pNodes; //< document content (Nodes Array)
+ SwAttrPool* mpAttrPool; //< the attribute pool
+ SwPageDescs maPageDescs; //< PageDescriptors
+ Link maOle2Link; //< OLE 2.0-notification
/* @@@MAINTAINABILITY-HORROR@@@
Timer should not be members of the model
*/
- Timer maIdleTimer; ///< Own IdleTimer
- Timer maOLEModifiedTimer; ///< Timer for update modified OLE-Objecs
- Timer maStatsUpdateTimer; ///< Timer for asynchronous stats calculation
- SwDBData maDBData; ///< database descriptor
+ Timer maIdleTimer; //< Own IdleTimer
+ Timer maOLEModifiedTimer; //< Timer for update modified OLE-Objecs
+ Timer maStatsUpdateTimer; //< Timer for asynchronous stats calculation
+ SwDBData maDBData; //< database descriptor
::com::sun::star::uno::Sequence <sal_Int8 > maRedlinePasswd;
- OUString msTOIAutoMarkURL; ///< ::com::sun::star::util::URL of table of index AutoMark file
+ OUString msTOIAutoMarkURL; //< ::com::sun::star::util::URL of table of index AutoMark file
boost::ptr_vector< boost::nullable<OUString> > maPatternNms; // Array for names of document-templates
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
- mxXForms; ///< container with XForms models
+ mxXForms; //< container with XForms models
mutable com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > m_xGCIterator;
const ::boost::scoped_ptr< ::sw::mark::MarkManager> mpMarkManager;
const ::boost::scoped_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager;
const ::boost::scoped_ptr< ::sw::UndoManager > m_pUndoManager;
- // -------------------------------------------------------------------
// Pointer
-
- SwFrmFmt *mpDfltFrmFmt; ///< Default formats.
- SwFrmFmt *mpEmptyPageFmt; ///< Format for the default empty page
- SwFrmFmt *mpColumnContFmt; ///< Format for column container
+ SwFrmFmt *mpDfltFrmFmt; //< Default formats.
+ SwFrmFmt *mpEmptyPageFmt; //< Format for the default empty page
+ SwFrmFmt *mpColumnContFmt; //< Format for column container
SwCharFmt *mpDfltCharFmt;
- SwTxtFmtColl *mpDfltTxtFmtColl; ///< Defaultformatcollections
+ SwTxtFmtColl *mpDfltTxtFmtColl; //< Defaultformatcollections
SwGrfFmtColl *mpDfltGrfFmtColl;
- SwFrmFmts *mpFrmFmtTbl; ///< Format table
+ SwFrmFmts *mpFrmFmtTbl; //< Format table
SwCharFmts *mpCharFmtTbl;
SwFrmFmts *mpSpzFrmFmtTbl;
SwSectionFmts *mpSectionFmtTbl;
- SwFrmFmts *mpTblFrmFmtTbl; ///< For tables
- SwTxtFmtColls *mpTxtFmtCollTbl; ///< FormatCollections
+ SwFrmFmts *mpTblFrmFmtTbl; //< For tables
+ SwTxtFmtColls *mpTxtFmtCollTbl; //< FormatCollections
SwGrfFmtColls *mpGrfFmtCollTbl;
- SwTOXTypes *mpTOXTypes; ///< Tables/indices
- SwDefTOXBase_Impl * mpDefTOXBases; ///< defaults of SwTOXBase's
+ SwTOXTypes *mpTOXTypes; //< Tables/indices
+ SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's
- SwViewShell *mpCurrentView; ///< SwDoc should get a new member mpCurrentView
- SdrModel *mpDrawModel; ///< StarView Drawing
+ SwViewShell *mpCurrentView; //< SwDoc should get a new member mpCurrentView
+ SdrModel *mpDrawModel; //< StarView Drawing
- SwDocUpdtFld *mpUpdtFlds; ///< Struct for updating fields
+ SwDocUpdtFld *mpUpdtFlds; //< Struct for updating fields
SwFldTypes *mpFldTypes;
SwNewDBMgr *mpNewDBMgr; /**< Pointer to the new DBMgr for
evaluation of DB-fields. */
- VirtualDevice *mpVirDev; ///< can be used for formatting
- SfxPrinter *mpPrt; ///< can be used for formatting
- SwPrintData *mpPrtData; ///< Print configuration
+ VirtualDevice *mpVirDev; //< can be used for formatting
+ SfxPrinter *mpPrt; //< can be used for formatting
+ SwPrintData *mpPrtData; //< Print configuration
- SwDoc *mpGlossaryDoc; ///< Pointer to glossary-document.
+ SwDoc *mpGlossaryDoc; //< Pointer to glossary-document.
SwNumRule *mpOutlineRule;
SwFtnInfo *mpFtnInfo;
SwEndNoteInfo *mpEndNoteInfo;
SwLineNumberInfo*mpLineNumberInfo;
SwFtnIdxs *mpFtnIdxs;
- SwDocStat *mpDocStat; ///< Statistics information.
+ SwDocStat *mpDocStat; //< Statistics information.
- SwDocShell *mpDocShell; ///< Ptr to SfxDocShell of Doc.
- SfxObjectShellLock mxTmpDocShell; ///< A temporary shell that is used to copy OLE-Nodes
+ SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc.
+ SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes
-
- sfx2::LinkManager *mpLinkMgr; ///< List of linked stuff (graphics/DDE/OLE).
+ sfx2::LinkManager *mpLinkMgr; //< List of linked stuff (graphics/DDE/OLE).
SwAutoCorrExceptWord *mpACEWord; /**< For the automated takeover of
auto-corrected words that are "re-corrected". */
- SwURLStateChanged *mpURLStateChgd; ///< SfxClient for changes in INetHistory
- SvNumberFormatter *mpNumberFormatter;///< NumFormatter for tables / fields
+ SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory
+ SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields
- mutable SwNumRuleTbl *mpNumRuleTbl; ///< List of all named NumRules.
+ mutable SwNumRuleTbl *mpNumRuleTbl; //< List of all named NumRules.
- /// Hash map to find numrules by name
+ // Hash map to find numrules by name
mutable boost::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap;
typedef boost::unordered_map<OUString, SwList*, OUStringHash> tHashMapForLists;
- /// container to hold the lists of the text document
+ // container to hold the lists of the text document
tHashMapForLists maLists;
- /// relation between list style and its default list
+ // relation between list style and its default list
tHashMapForLists maListStyleLists;
- SwRedlineTbl *mpRedlineTbl; ///< List of all Ranged Redlines.
- SwExtraRedlineTbl *mpExtraRedlineTbl; ///< List of all Extra Redlines.
- OUString *mpAutoFmtRedlnComment; ///< Comment for Redlines inserted via AutoFormat.
+ SwRedlineTbl *mpRedlineTbl; //< List of all Ranged Redlines.
+ SwExtraRedlineTbl *mpExtraRedlineTbl; //< List of all Extra Redlines.
+ OUString *mpAutoFmtRedlnComment; //< Comment for Redlines inserted via AutoFormat.
SwUnoCrsrTbl *mpUnoCrsrTbl;
- SwPagePreviewPrtData *mpPgPViewPrtData; ///< Indenting / spacing for printing of page view.
+ SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view.
SwPaM *mpExtInputRing;
SwLayouter *mpLayouter; /**< ::com::sun::star::frame::Controller for complex layout formatting
like footnote/endnote in sections */
- IStyleAccess *mpStyleAccess; ///< handling of automatic styles
+ IStyleAccess *mpStyleAccess; //< handling of automatic styles
SwLayoutCache *mpLayoutCache; /**< Layout cache to read and save with the
document for a faster formatting */
SwModify *mpUnoCallBack;
- IGrammarContact *mpGrammarContact; ///< for grammar checking in paragraphs during editing
+ IGrammarContact *mpGrammarContact; //< for grammar checking in paragraphs during editing
mutable comphelper::ImplementationReference< SwChartDataProvider
, ::com::sun::star::chart2::data::XDataProvider >
maChartDataProviderImplRef;
SwChartLockController_Helper *mpChartControllerHelper;
- /// table of forbidden characters of this document
+ // table of forbidden characters of this document
rtl::Reference<SvxForbiddenCharactersTable> mxForbiddenCharsTable;
com::sun::star::uno::Reference< com::sun::star::script::vba::XVBAEventProcessor > mxVbaEvents;
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer> m_xTemplateToProjectCache;
@@ -397,26 +391,25 @@ private:
::std::auto_ptr< ::sfx2::IXmlIdRegistry > m_pXmlIdRegistry;
- // -------------------------------------------------------------------
// other
- sal_uInt16 mnUndoCnt; ///< Count of Undo Actions.
- sal_uInt16 mnUndoSttEnd; ///< != 0 -> within parentheses.
+ sal_uInt16 mnUndoCnt; //< Count of Undo Actions.
+ sal_uInt16 mnUndoSttEnd; //< != 0 -> within parentheses.
sal_uInt16 mnAutoFmtRedlnCommentNo; /**< SeqNo for conjoining of AutoFmt-Redlines.
by the UI. Managed by SwAutoFmt! */
- sal_uInt16 mnLinkUpdMode; ///< UpdateMode for links.
- SwFldUpdateFlags meFldUpdMode;///< Automatically Update Mode for fields/charts.
- RedlineMode_t meRedlineMode; ///< Current Redline Mode.
- SwCharCompressType meChrCmprType;///< for ASIAN: compress punctuation/kana
+ sal_uInt16 mnLinkUpdMode; //< UpdateMode for links.
+ SwFldUpdateFlags meFldUpdMode;//< Automatically Update Mode for fields/charts.
+ RedlineMode_t meRedlineMode; //< Current Redline Mode.
+ SwCharCompressType meChrCmprType;//< for ASIAN: compress punctuation/kana
- sal_uInt32 mnRsid; ///< current session ID of the document
- sal_uInt32 mnRsidRoot; ///< session ID when the document was created
+ sal_uInt32 mnRsid; //< current session ID of the document
+ sal_uInt32 mnRsidRoot; //< session ID when the document was created
sal_Int32 mReferenceCount;
sal_Int32 mIdleBlockCount;
- sal_Int8 mnLockExpFld; ///< If != 0 UpdateExpFlds() has no effect!
+ sal_Int8 mnLockExpFld; //< If != 0 UpdateExpFlds() has no effect!
/** Draw Model Layer IDs
* LayerIds, Heaven == above document
@@ -430,55 +423,54 @@ private:
SdrLayerID mnInvisibleHell;
SdrLayerID mnInvisibleControls;
- bool mbGlossDoc : 1; ///< TRUE: glossary document.
- bool mbModified : 1; ///< TRUE: document has changed.
+ bool mbGlossDoc : 1; //< TRUE: glossary document.
+ bool mbModified : 1; //< TRUE: document has changed.
bool mbDtor : 1; /**< TRUE: is in SwDoc DTOR.
and unfortunately temorarily also in
SwSwgReader::InLayout() when flawed
frames need deletion. */
- bool mbPageNums : 1; ///< TRUE: There are virtual page numbers.
- bool mbLoaded : 1; ///< TRUE: Doc loaded.
- bool mbUpdateExpFld : 1; ///< TRUE: Update expression fields.
- bool mbNewDoc : 1; ///< TRUE: new Doc.
- bool mbNewFldLst : 1; ///< TRUE: Rebuild field-list.
- bool mbCopyIsMove : 1; ///< TRUE: Copy is a hidden Move.
- bool mbVisibleLinks : 1; ///< TRUE: Links are inserted visibly.
- bool mbInReading : 1; ///< TRUE: Document is in the process of being read.
- bool mbInXMLImport : 1; ///< TRUE: During xml import, attribute portion building is not necessary.
- bool mbUpdateTOX : 1; ///< TRUE: After loading document, update TOX.
- bool mbInLoadAsynchron : 1; ///< TRUE: Document is in the process of being loaded asynchronously.
- bool mbHTMLMode : 1; ///< TRUE: Document is in HTMLMode.
- bool mbInCallModified : 1; ///< TRUE: in Set/Reset-Modified link.
- bool mbIsGlobalDoc : 1; ///< TRUE: It's a global document.
- bool mbGlblDocSaveLinks : 1; ///< TRUE: Save sections linked in global document.
- bool mbIsLabelDoc : 1; ///< TRUE: It's a label document.
- bool mbIsAutoFmtRedline : 1; ///< TRUE: Redlines are recorded by Autoformat.
+ bool mbPageNums : 1; //< TRUE: There are virtual page numbers.
+ bool mbLoaded : 1; //< TRUE: Doc loaded.
+ bool mbUpdateExpFld : 1; //< TRUE: Update expression fields.
+ bool mbNewDoc : 1; //< TRUE: new Doc.
+ bool mbNewFldLst : 1; //< TRUE: Rebuild field-list.
+ bool mbCopyIsMove : 1; //< TRUE: Copy is a hidden Move.
+ bool mbVisibleLinks : 1; //< TRUE: Links are inserted visibly.
+ bool mbInReading : 1; //< TRUE: Document is in the process of being read.
+ bool mbInXMLImport : 1; //< TRUE: During xml import, attribute portion building is not necessary.
+ bool mbUpdateTOX : 1; //< TRUE: After loading document, update TOX.
+ bool mbInLoadAsynchron : 1; //< TRUE: Document is in the process of being loaded asynchronously.
+ bool mbHTMLMode : 1; //< TRUE: Document is in HTMLMode.
+ bool mbInCallModified : 1; //< TRUE: in Set/Reset-Modified link.
+ bool mbIsGlobalDoc : 1; //< TRUE: It's a global document.
+ bool mbGlblDocSaveLinks : 1; //< TRUE: Save sections linked in global document.
+ bool mbIsLabelDoc : 1; //< TRUE: It's a label document.
+ bool mbIsAutoFmtRedline : 1; //< TRUE: Redlines are recorded by Autoformat.
bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of
::com::sun::star::sdbcx::View
notification of OLE-Objects PrtOLENotify() is required. */
- bool mbAllOLENotify : 1; ///< True: Notification of all objects is required.
- bool mbIsRedlineMove : 1; ///< True: Redlines are moved into to / out of the section.
- bool mbInsOnlyTxtGlssry : 1; ///< True: insert 'only text' glossary into doc
- bool mbContains_MSVBasic : 1; ///< True: MS-VBasic exist is in our storage
- bool mbPurgeOLE : 1; ///< sal_True: Purge OLE-Objects
- bool mbKernAsianPunctuation : 1; ///< sal_True: kerning also for ASIAN punctuation
- bool mbReadlineChecked : 1; ///< sal_True: if the query was already shown
+ bool mbAllOLENotify : 1; //< True: Notification of all objects is required.
+ bool mbIsRedlineMove : 1; //< True: Redlines are moved into to / out of the section.
+ bool mbInsOnlyTxtGlssry : 1; //< True: insert 'only text' glossary into doc
+ bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage
+ bool mbPurgeOLE : 1; //< sal_True: Purge OLE-Objects
+ bool mbKernAsianPunctuation : 1; //< sal_True: kerning also for ASIAN punctuation
+ bool mbReadlineChecked : 1; //< sal_True: if the query was already shown
bool mbLinksUpdated : 1; /**< #i38810#
flag indicating, that the links have been updated. */
- bool mbClipBoard : 1; ///< TRUE: this document represents the clipboard
+ bool mbClipBoard : 1; //< TRUE: this document represents the clipboard
bool mbColumnSelection : 1; /**< TRUE: this content has bee created by a column selection
(clipboard docs only) */
bool mbIsPrepareSelAll : 1;
#ifdef DBG_UTIL
- bool mbXMLExport : 1; ///< sal_True: during XML export
+ bool mbXMLExport : 1; //< sal_True: during XML export
#endif
// true: Document contains at least one anchored object, which is anchored AT_PAGE with a content position.
// Thus, certain adjustment needed during formatting for these kind of anchored objects.
bool mbContainsAtPageObjWithContentAnchor : 1;
- //
// COMPATIBILITY FLAGS START
//
//
@@ -556,9 +548,9 @@ private:
// attribute 'WrapInfluenceOnObjPos'.
bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972#
bool mbStylesNoDefault : 1;
- bool mbFloattableNomargins : 1; ///< If paragraph margins next to a floating table should be ignored.
- bool mEmbedFonts : 1; ///< Whether to embed fonts used by the document when saving.
- bool mEmbedSystemFonts : 1; ///< Whether to embed also system fonts.
+ bool mbFloattableNomargins : 1; //< If paragraph margins next to a floating table should be ignored.
+ bool mEmbedFonts : 1; //< Whether to embed fonts used by the document when saving.
+ bool mEmbedSystemFonts : 1; //< Whether to embed also system fonts.
// non-ui-compatibility flags:
bool mbOldNumbering : 1;
@@ -589,18 +581,15 @@ private:
sal_uInt32 mn32DummyCompatabilityOptions1;
sal_uInt32 mn32DummyCompatabilityOptions2;
- //
// COMPATIBILITY FLAGS END
- //
- bool mbStartIdleTimer; ///< idle timer mode start/stop
+ bool mbStartIdleTimer; //< idle timer mode start/stop
- static SwAutoCompleteWord *mpACmpltWords; ///< List of all words for AutoComplete
+ static SwAutoCompleteWord *mpACmpltWords; //< List of all words for AutoComplete
- //---------------- private methods ------------------------------
+ // private methods
void checkRedlining(RedlineMode_t& _rReadlineMode);
-
DECL_LINK( AddDrawUndo, SdrUndoAction * );
// DrawModel
void DrawNotifyUndoHdl();
@@ -642,14 +631,14 @@ private:
Care has to be taken of the necessary
invalidations and notifications. */
- /// gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves.
+ // gcc: aFtnInfo::CopyCtor is private, therefore we too have to protect ourselves.
SwDoc( const SwDoc &);
// For fields:
- void _InitFieldTypes(); ///< Called by CTOR!!
+ void _InitFieldTypes(); //< Called by CTOR!!
void _MakeFldList( int eMode );
- /// Database fields:
+ // Database fields:
void UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc );
void AddUsedDBToList( std::vector<OUString>& rDBNameList,
const std::vector<OUString>& rUsedDBNames );
@@ -674,15 +663,15 @@ private:
bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
- /// Update charts of given table.
+ // Update charts of given table.
void _UpdateCharts( const SwTable& rTbl, SwViewShell& rVSh ) const;
sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
sal_uInt16 nMode );
- /// Our own 'IdleTimer' calls the following method
+ // Our own 'IdleTimer' calls the following method
DECL_LINK( DoIdleJobs, Timer * );
- /// CharTimer calls this method.
+ // CharTimer calls this method.
void DoUpdateAllCharts();
DECL_LINK( DoUpdateModifiedOLE, Timer * );
@@ -711,8 +700,7 @@ public:
DocumentType GetDocumentType(){ return meDocType; }
void SetDocumentType( DocumentType eDocType ) { meDocType = eDocType; }
- /** Life cycle
- */
+ // Life cycle
SwDoc();
~SwDoc();
@@ -724,14 +712,12 @@ public:
SwNodes & GetNodes() { return *m_pNodes; }
SwNodes const& GetNodes() const { return *m_pNodes; }
- /** IInterface
- */
+ // IInterface
virtual sal_Int32 acquire();
virtual sal_Int32 release();
virtual sal_Int32 getReferenceCount() const;
- /** IDocumentSettingAccess
- */
+ // IDocumentSettingAccess
virtual bool get(/*[in]*/ DocumentSettingId id) const;
virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value);
virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const;
@@ -749,8 +735,7 @@ public:
virtual sal_uInt32 getRsidRoot() const;
virtual void setRsidRoot( sal_uInt32 nVal );
- /** IDocumentDeviceAccess
- */
+ // IDocumentDeviceAccess
virtual SfxPrinter* getPrinter(/*[in]*/ bool bCreate ) const;
virtual void setPrinter(/*[in]*/ SfxPrinter* pP,/*[in]*/ bool bDeleteOld,/*[in]*/ bool bCallPrtDataChanged );
virtual VirtualDevice* getVirtualDevice(/*[in]*/ bool bCreate ) const;
@@ -762,13 +747,11 @@ public:
virtual const SwPrintData & getPrintData() const;
virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData);
- /** IDocumentMarkAccess
- */
+ // IDocumentMarkAccess
IDocumentMarkAccess* getIDocumentMarkAccess();
const IDocumentMarkAccess* getIDocumentMarkAccess() const;
- /** IDocumentRedlineAccess
- */
+ // IDocumentRedlineAccess
virtual RedlineMode_t GetRedlineMode() const;
virtual void SetRedlineMode_intern(/*[in]*/RedlineMode_t eMode);
virtual void SetRedlineMode(/*[in]*/RedlineMode_t eMode);
@@ -801,13 +784,11 @@ public:
virtual const ::com::sun::star::uno::Sequence <sal_Int8>& GetRedlinePassword() const;
virtual void SetRedlinePassword(/*[in]*/const ::com::sun::star::uno::Sequence <sal_Int8>& rNewPassword);
- /** IDocumentUndoRedo
- */
+ // IDocumentUndoRedo
IDocumentUndoRedo & GetIDocumentUndoRedo();
IDocumentUndoRedo const& GetIDocumentUndoRedo() const;
- /** IDocumentLinksAdministration
- */
+ // IDocumentLinksAdministration
virtual bool IsVisibleLinks() const;
virtual void SetVisibleLinks(bool bFlag);
virtual sfx2::LinkManager& GetLinkManager();
@@ -820,8 +801,7 @@ public:
virtual void SetLinksUpdated(const bool bNewLinksUpdated);
virtual bool LinksUpdated() const;
- /** IDocumentFieldsAccess
- */
+ // IDocumentFieldsAccess
virtual const SwFldTypes *GetFldTypes() const;
virtual SwFieldType *InsertFldType(const SwFieldType &);
virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const;
@@ -862,8 +842,7 @@ public:
static SwTxtFld* GetTxtFldAtPos(const SwPosition& rPos);
bool containsUpdatableFields();
- /** IDocumentContentOperations
- */
+ // IDocumentContentOperations
virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll) const;
virtual void DeleteSection(SwNode* pNode);
virtual bool DeleteRange(SwPaM&);
@@ -891,7 +870,7 @@ public:
virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet, SwFrmFmt*);
- /// Add a para for the char attribute exp...
+ // Add a para for the char attribute exp...
virtual bool InsertPoolItem(
const SwPaM &rRg,
const SfxPoolItem&,
@@ -911,8 +890,7 @@ public:
const bool bRegExReplace);
virtual void RemoveLeadingWhiteSpace(const SwPosition & rPos );
- /** IDocumentStylePoolAccess
- */
+ // IDocumentStylePoolAccess
virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true );
virtual SwFmt* GetFmtFromPool( sal_uInt16 nId );
virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId );
@@ -923,21 +901,18 @@ public:
virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const;
virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const;
- /** IDocumentLineNumberAccess
- */
+ // IDocumentLineNumberAccess
virtual const SwLineNumberInfo& GetLineNumberInfo() const;
virtual void SetLineNumberInfo(const SwLineNumberInfo& rInfo);
- /** IDocumentStatistics
- */
+ // IDocumentStatistics
virtual void DocInfoChgd();
virtual const SwDocStat &GetDocStat() const;
virtual const SwDocStat &GetUpdatedDocStat(bool bCompleteAsync = false, bool bFields = true);
virtual void SetDocStat(const SwDocStat& rStat);
virtual void UpdateDocStat(bool bCompleteAsync = false, bool bFields = true);
- /** IDocumentState
- */
+ // IDocumentState
virtual void SetModified();
virtual void ResetModified();
virtual bool IsModified() const;
@@ -950,8 +925,7 @@ public:
virtual void SetUpdateExpFldStat(bool b);
virtual void SetLoaded(bool b);
- /** IDocumentDrawModelAccess
- */
+ // IDocumentDrawModelAccess
virtual const SdrModel* GetDrawModel() const;
virtual SdrModel* GetDrawModel();
virtual SdrLayerID GetHeavenId() const;
@@ -967,8 +941,7 @@ public:
virtual SdrModel* _MakeDrawModel();
virtual SdrModel* GetOrCreateDrawModel();
- /** IDocumentLayoutAccess
- */
+ // IDocumentLayoutAccess
virtual void SetCurrentViewShell( SwViewShell* pNew );
virtual SwLayouter* GetLayouter();
virtual const SwLayouter* GetLayouter() const;
@@ -977,28 +950,25 @@ public:
virtual void DelLayoutFmt( SwFrmFmt *pFmt );
virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor, bool bSetTxtFlyAtt, bool bMakeFrms );
virtual const SwViewShell *GetCurrentViewShell() const;
- virtual SwViewShell *GetCurrentViewShell(); ///< It must be able to communicate to a SwViewShell.This is going to be removerd later.
+ virtual SwViewShell *GetCurrentViewShell(); //< It must be able to communicate to a SwViewShell.This is going to be removerd later.
virtual const SwRootFrm *GetCurrentLayout() const;
virtual SwRootFrm *GetCurrentLayout();
virtual bool HasLayout() const;
void ClearSwLayouterEntries();
- /** IDocumentTimerAccess
- */
+ // IDocumentTimerAccess
virtual void StartIdling();
virtual void StopIdling();
virtual void BlockIdling();
virtual void UnblockIdling();
virtual void StartBackgroundJobs();
- /** IDocumentChartDataProviderAccess
- */
+ // IDocumentChartDataProviderAccess
virtual SwChartDataProvider * GetChartDataProvider( bool bCreate = false ) const;
virtual void CreateChartInternalDataProviders( const SwTable *pTable );
virtual SwChartLockController_Helper & GetChartControllerHelper();
- /** IDocumentListItems
- */
+ // IDocumentListItems
virtual void addListItem( const SwNodeNum& rNodeNum );
virtual void removeListItem( const SwNodeNum& rNodeNum );
virtual OUString getListItemText( const SwNodeNum& rNodeNum,
@@ -1007,8 +977,7 @@ public:
virtual void getListItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
virtual void getNumItems( IDocumentListItems::tSortedNodeNumList& orNodeNumList ) const;
- /** IDocumentOutlineNodes
- */
+ // IDocumentOutlineNodes
virtual sal_Int32 getOutlineNodesCount() const;
virtual int getOutlineLevel( const sal_Int32 nIdx ) const;
virtual OUString getOutlineText( const sal_Int32 nIdx,
@@ -1018,8 +987,7 @@ public:
virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const;
virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const;
- /** IDocumentListsAccess
- */
+ // IDocumentListsAccess
virtual SwList* createList( const OUString& rListId,
const OUString& rDefaultListStyleName );
virtual void deleteList( const OUString& rListId );
@@ -1030,7 +998,7 @@ public:
virtual void trackChangeOfListStyleName( const OUString& rListStyleName,
const OUString& rNewListStyleName );
- /** IDocumentExternalData */
+ // IDocumentExternalData
virtual void setExternalData(::sw::tExternalDataType eType,
::sw::tExternalDataPointer pPayload);
virtual ::sw::tExternalDataPointer getExternalData(::sw::tExternalDataType eType);
@@ -1040,14 +1008,11 @@ public:
virtual void setDocAccTitle( const OUString& rTitle ) { msDocAccTitle = rTitle; }
virtual const OUString getDocAccTitle() const { return msDocAccTitle; }
- /** INextInterface here
- */
-
+ // INextInterface here
DECL_STATIC_LINK( SwDoc, BackgroundDone, SvxBrushItem *);
DECL_LINK(CalcFieldValueHdl, EditFieldInfo*);
- /** OLE ???
- */
+ // OLE ???
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
inline void SetOLEPrtNotifyPending( bool bSet = true );
void PrtOLENotify( sal_Bool bAll ); //All or only marked
@@ -1081,7 +1046,7 @@ public:
bool bDrawAlso = false,
bool bAsCharAlso = false ) const;
- /// Because swrtf.cxx and define private public here now.
+ // Because swrtf.cxx and define private public here now.
SwFlyFrmFmt *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
@@ -1124,8 +1089,7 @@ public:
void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
const OUString& sNewDescription );
- /** Footnotes
- */
+ // Footnotes
// Footnote information
const SwFtnInfo& GetFtnInfo() const { return *mpFtnInfo; }
void SetFtnInfo(const SwFtnInfo& rInfo);
@@ -1133,7 +1097,7 @@ public:
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
SwFtnIdxs& GetFtnIdxs() { return *mpFtnIdxs; }
const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; }
- /// change footnotes in area
+ // change footnotes in area
bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
sal_uInt16 nNumber, bool bIsEndNote );
@@ -1151,10 +1115,10 @@ public:
Hyphenate( SwPaM *pPam, const Point &rCrsrPos,
sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
- /// count words in pam
+ // count words in pam
void CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const;
- /// Glossary Document
+ // Glossary Document
void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; }
@@ -1169,15 +1133,14 @@ public:
bool IsInVerticalText( const SwPosition& rPos,
const Point* pPt = 0 ) const;
- /** Database and DB-Manager
- */
+ // Database and DB-Manager
void SetNewDBMgr( SwNewDBMgr* pNewMgr ) { mpNewDBMgr = pNewMgr; }
SwNewDBMgr* GetNewDBMgr() const { return mpNewDBMgr; }
void ChangeDBFields( const std::vector<OUString>& rOldNames,
const OUString& rNewName );
void SetInitDBFields(sal_Bool b);
- /// Find out which databases are used by fields.
+ // Find out which databases are used by fields.
void GetAllUsedDB( std::vector<OUString>& rDBNameList,
const std::vector<OUString>* pAllDBNames = 0 );
@@ -1186,8 +1149,7 @@ public:
const SwDBData& GetDBDesc();
const SwDBData& _GetDBDesc() const { return maDBData; }
- /** Some helper functions
- */
+ // Some helper functions
OUString GetUniqueGrfName() const;
OUString GetUniqueOLEName() const;
OUString GetUniqueFrameName() const;
@@ -1199,7 +1161,7 @@ public:
void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName ) const;
- /// Set a valid name for all Flys that have none (Called by Readers after reading).
+ // Set a valid name for all Flys that have none (Called by Readers after reading).
void SetAllUniqueFlyNames();
/** Reset attributes. All TxtHints and (if completely selected) all hard-
@@ -1219,7 +1181,7 @@ public:
* If Undo is enabled, the old values is added to the Undo history. */
void SetAttr( const SfxItemSet&, SwFmt& );
- /// method to reset a certain attribute at the given format
+ // method to reset a certain attribute at the given format
void ResetAttrAtFormat( const sal_uInt16 nWhichId,
SwFmt& rChangedFormat );
@@ -1228,18 +1190,18 @@ public:
void SetDefault( const SfxPoolItem& );
void SetDefault( const SfxItemSet& );
- /// Query default attribute in this document.
+ // Query default attribute in this document.
const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
- /// Do not expand text attributes.
+ // Do not expand text attributes.
bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
- /* Formats */
+ // Formats
const SwFrmFmts* GetFrmFmts() const { return mpFrmFmtTbl; }
SwFrmFmts* GetFrmFmts() { return mpFrmFmtTbl; }
const SwCharFmts* GetCharFmts() const { return mpCharFmtTbl;}
- /** LayoutFormats (frames, DrawObjects), sometimes const sometimes not */
+ // LayoutFormats (frames, DrawObjects), sometimes const sometimes not
const SwFrmFmts* GetSpzFrmFmts() const { return mpSpzFrmFmtTbl; }
SwFrmFmts* GetSpzFrmFmts() { return mpSpzFrmFmtTbl; }
@@ -1252,10 +1214,10 @@ public:
const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;}
SwCharFmt *GetDfltCharFmt() { return mpDfltCharFmt;}
- /// @return the interface of the management of (auto)styles
+ // @return the interface of the management of (auto)styles
IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; }
- /// Remove all language dependencies from all existing formats
+ // Remove all language dependencies from all existing formats
void RemoveAllFmtLanguageDependencies();
SwFrmFmt *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom,
@@ -1272,7 +1234,7 @@ public:
SwCharFmt* FindCharFmtByName( const OUString& rName ) const
{ return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName ); }
- /* Formatcollections (styles) */
+ // Formatcollections (styles)
// TXT
const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
@@ -1307,7 +1269,7 @@ public:
SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
{ return (SwGrfFmtColl*)FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName ); }
- /// Table formatting
+ // Table formatting
const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; }
SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; }
sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const;
@@ -1321,29 +1283,29 @@ public:
sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL) const;
SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL);
- /// Copy formats in own arrays and return them.
+ // Copy formats in own arrays and return them.
SwFrmFmt *CopyFrmFmt ( const SwFrmFmt& );
SwCharFmt *CopyCharFmt( const SwCharFmt& );
SwTxtFmtColl* CopyTxtColl( const SwTxtFmtColl& rColl );
SwGrfFmtColl* CopyGrfColl( const SwGrfFmtColl& rColl );
- /// Replace all styles with those from rSource.
+ // Replace all styles with those from rSource.
void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true );
- /// Replace all property defaults with those from rSource.
+ // Replace all property defaults with those from rSource.
void ReplaceDefaults( const SwDoc& rSource );
- /// Replace all compatability options with those from rSource.
+ // Replace all compatability options with those from rSource.
void ReplaceCompatabilityOptions(const SwDoc& rSource);
- /// Query if style (paragraph- / character- / frame- / page-) is used.
+ // Query if style (paragraph- / character- / frame- / page-) is used.
bool IsUsed( const SwModify& ) const;
bool IsUsed( const SwNumRule& ) const;
- /// Set name of newly loaded document template.
+ // Set name of newly loaded document template.
sal_uInt16 SetDocPattern( const OUString& rPatternName );
- /// @return name of document template. Can be 0!
+ // @return name of document template. Can be 0!
const OUString* GetDocPattern( sal_uInt16 nPos ) const
{
if(nPos >= maPatternNms.size())
@@ -1353,13 +1315,13 @@ public:
return &(maPatternNms[nPos]);
}
- /// Delete all unreferenced field types.
- void GCFieldTypes(); ///< impl. in docfld.cxx
+ // Delete all unreferenced field types.
+ void GCFieldTypes(); //< impl. in docfld.cxx
- /// Query / connect current document with glossary document.
+ // Query / connect current document with glossary document.
void SetGlossaryDoc( SwDoc* pDoc ) { mpGlossaryDoc = pDoc; }
- /// travel over PaM Ring
+ // travel over PaM Ring
bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
SwPaM& rPaM, SwCrsrShell* pShell = 0);
@@ -1372,7 +1334,7 @@ public:
void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount );
- /// PageDescriptor interface.
+ // PageDescriptor interface.
sal_uInt16 GetPageDescCnt() const { return maPageDescs.size(); }
const SwPageDesc& GetPageDesc( const sal_uInt16 i ) const { return *maPageDescs[i]; }
SwPageDesc& GetPageDesc( sal_uInt16 i ) { return *maPageDescs[i]; }
@@ -1394,8 +1356,7 @@ public:
void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
{ CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); }
- //For Reader.
-
+ // For Reader
SwPageDesc * GetPageDesc( const OUString & rName );
void ChgPageDesc( const OUString & rName, const SwPageDesc& );
void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
@@ -1414,14 +1375,13 @@ public:
correct this. */
void CheckDefaultPageFmt();
- /// Methods for tables/indices.
-
+ // Methods for tables/indices
sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& ) const;
void DeleteTOXMark( const SwTOXMark* pTOXMark );
const SwTOXMark& GotoTOXMark( const SwTOXMark& rCurTOXMark,
SwTOXSearch eDir, sal_Bool bInReadOnly );
- /// Insert/Renew table/indes.
+ // Insert/Renew table/indes
const SwTOXBaseSection* InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0,
@@ -1439,7 +1399,7 @@ public:
bool SetTOXBaseName(const SwTOXBase& rTOXBase, const OUString& rName);
void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect);
- /// After reading file update all tables/indices.
+ // After reading file update all tables/indices
void SetUpdateTOX( bool bFlag = true ) { mbUpdateTOX = bFlag; }
bool IsUpdateTOX() const { return mbUpdateTOX; }
@@ -1451,7 +1411,7 @@ public:
void SetInReading( bool bNew ) { mbInReading = bNew; }
bool IsClipBoard() const { return mbClipBoard; }
- /// N.B.: must be called right after constructor! (@see GetXmlIdRegistry)
+ // N.B.: must be called right after constructor! (@see GetXmlIdRegistry)
void SetClipBoard( bool bNew ) { mbClipBoard = bNew; }
bool IsColumnSelection() const { return mbColumnSelection; }
@@ -1460,7 +1420,7 @@ public:
bool IsInXMLImport() const { return mbInXMLImport; }
void SetInXMLImport( bool bNew ) { mbInXMLImport = bNew; }
- /// Manage types of tables/indices.
+ // Manage types of tables/indices
sal_uInt16 GetTOXTypeCount( TOXTypes eTyp ) const;
const SwTOXType* GetTOXType( TOXTypes eTyp, sal_uInt16 nId ) const;
sal_Bool DeleteTOXType( TOXTypes eTyp, sal_uInt16 nId );
@@ -1470,10 +1430,10 @@ public:
const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false );
void SetDefaultTOXBase(const SwTOXBase& rBase);
- /// Key for management of index.
+ // Key for management of index.
sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
- /// Sort table text.
+ // Sort table text.
bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
bool SortText(const SwPaM&, const SwSortOptions&);
@@ -1481,34 +1441,34 @@ public:
// e. g. ::com::sun::star::text::Bookmarks or tables/indices.
// If bMoveCrsr is set move Crsr too.
- /// Set everything in rOldNode on rNewPos + Offset.
+ // Set everything in rOldNode on rNewPos + Offset.
void CorrAbs(
const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset = 0,
sal_Bool bMoveCrsr = sal_False );
- /// Set everything in the range of [rStartNode, rEndNode] to rNewPos.
+ // Set everything in the range of [rStartNode, rEndNode] to rNewPos.
void CorrAbs(
const SwNodeIndex& rStartNode,
const SwNodeIndex& rEndNode,
const SwPosition& rNewPos,
sal_Bool bMoveCrsr = sal_False );
- /// Set everything in this range from rRange to rNewPos.
+ // Set everything in this range from rRange to rNewPos.
void CorrAbs(
const SwPaM& rRange,
const SwPosition& rNewPos,
sal_Bool bMoveCrsr = sal_False );
- /// Set everything in rOldNode to relative Pos.
+ // Set everything in rOldNode to relative Pos.
void CorrRel(
const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset = 0,
sal_Bool bMoveCrsr = sal_False );
- /// Query / set rules for Outline.
+ // Query / set rules for Outline.
inline SwNumRule* GetOutlineNumRule() const
{
return mpOutlineRule;
@@ -1516,10 +1476,10 @@ public:
void SetOutlineNumRule( const SwNumRule& rRule );
void PropagateOutlineRule();
- /// Outline - promote / demote.
+ // Outline - promote / demote.
bool OutlineUpDown( const SwPaM& rPam, short nOffset = 1 );
- /// Ountline - move up / move down.
+ // Ountline - move up / move down.
bool MoveOutlinePara( const SwPaM& rPam, short nOffset = 1);
bool GotoOutline( SwPosition& rPos, const OUString& rName ) const;
@@ -1557,7 +1517,7 @@ public:
*/
void AddNumRule(SwNumRule * pRule);
- /// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
+ // add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
sal_uInt16 MakeNumRule( const OUString &rName,
const SwNumRule* pCpy = 0,
bool bBroadcast = false,
@@ -1566,18 +1526,18 @@ public:
sal_uInt16 FindNumRule( const OUString& rName ) const;
SwNumRule* FindNumRulePtr( const OUString& rName ) const;
- /// Deletion only possible if ::com::sun::star::chaos::Rule is not used!
+ // Deletion only possible if ::com::sun::star::chaos::Rule is not used!
bool RenameNumRule(const OUString & aOldName, const OUString & aNewName,
bool bBroadcast = false);
bool DelNumRule( const OUString& rName, bool bBroadCast = false );
OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
- void UpdateNumRule(); /// Update all invalids.
+ void UpdateNumRule(); // Update all invalids.
void ChgNumRuleFmts( const SwNumRule& rRule );
bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule,
const OUString& rNewRule );
- /// Goto next/previous on same level.
+ // Goto next/previous on same level.
bool GotoNextNum( SwPosition&, bool bOverUpper = true,
sal_uInt8* pUpper = 0, sal_uInt8* pLower = 0 );
bool GotoPrevNum( SwPosition&, bool bOverUpper = true,
@@ -1614,13 +1574,13 @@ public:
OUString& sListId,
const bool bInvestigateStartNode = false );
- /// Paragraphs without numbering but with indents.
+ // Paragraphs without numbering but with indents.
bool NoNum( const SwPaM& );
- /// Delete, splitting of numbering list.
+ // Delete, splitting of numbering list.
void DelNumRules( const SwPaM& );
- /// Invalidates all numrules
+ // Invalidates all numrules
void InvalidateNumRules();
bool NumUpDown( const SwPaM&, bool bDown = true );
@@ -1651,22 +1611,22 @@ public:
sal_Bool bCalledFromShell = sal_False,
sal_Bool bNewModel = sal_True );
- /// If index is in a table, return TableNode, else 0.
+ // If index is in a table, return TableNode, else 0.
SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const;
- /// Create a balanced table out of the selected range.
+ // Create a balanced table out of the selected range.
const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER,
const SwPaM& rRange, sal_Unicode cCh,
short eAdjust,
const SwTableAutoFmt* = 0 );
- /// text to table conversion - API support
+ // text to table conversion - API support
const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes );
sal_Bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh );
- /// Create columns / rows in table.
+ // Create columns / rows in table.
bool InsertCol( const SwCursor& rCursor,
sal_uInt16 nCnt = 1, bool bBehind = true );
bool InsertCol( const SwSelBoxes& rBoxes,
@@ -1676,23 +1636,23 @@ public:
bool InsertRow( const SwSelBoxes& rBoxes,
sal_uInt16 nCnt = 1, bool bBehind = true );
- /// Delete Columns/Rows in table.
+ // Delete Columns/Rows in table.
sal_Bool DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn = false );
sal_Bool DeleteRow( const SwCursor& rCursor );
sal_Bool DeleteCol( const SwCursor& rCursor );
- /// Split / concatenate boxes in table.
+ // Split / concatenate boxes in table.
sal_Bool SplitTbl( const SwSelBoxes& rBoxes, sal_Bool bVert = sal_True,
sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False );
- /// @return enum TableMergeErr.
+ // @return enum TableMergeErr.
sal_uInt16 MergeTbl( SwPaM& rPam );
OUString GetUniqueTblName() const;
sal_Bool IsInsTblFormatNum() const;
sal_Bool IsInsTblChangeNumFormat() const;
sal_Bool IsInsTblAlignNum() const;
- /// From FEShell (for Undo and BModified).
+ // From FEShell (for Undo and BModified).
void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
const SwCellFrm* pBoxFrm = 0 ) const;
void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
@@ -1702,16 +1662,16 @@ public:
void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor* pCrsr,
const SwCellFrm* pBoxFrm = 0 );
- /// Direct access for UNO.
+ // Direct access for UNO.
void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
const SwTableBox *pStart, sal_Bool bCurRowOnly);
void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet );
- /// AutoFormat for table/table selection.
+ // AutoFormat for table/table selection.
sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
- /// Query attributes.
+ // Query attributes.
sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet );
void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable );
@@ -1721,7 +1681,7 @@ public:
SwTableBoxFmt* MakeTableBoxFmt();
SwTableLineFmt* MakeTableLineFmt();
- /// Check if box has numerical valule. Change format of box if required.
+ // Check if box has numerical valule. Change format of box if required.
void ChkBoxNumFmt( SwTableBox& rAktBox, sal_Bool bCallUpdate );
void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
void ClearBoxNumAttrs( const SwNodeIndex& rNode );
@@ -1738,7 +1698,7 @@ public:
const OUString* pTblName = 0,
sal_Bool* pFullTblProtection = 0 );
- /// Split table at baseline position, i.e. create a new table.
+ // Split table at baseline position, i.e. create a new table.
sal_Bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0,
sal_Bool bCalcNewSize = sal_False );
@@ -1747,26 +1707,26 @@ public:
sal_Bool MergeTable( const SwPosition& rPos, sal_Bool bWithPrev = sal_True,
sal_uInt16 nMode = 0 );
- /// Make charts of given table update.
+ // Make charts of given table update.
void UpdateCharts( const OUString &rName ) const;
- /// Update all charts, for that exists any table.
+ // Update all charts, for that exists any table.
void UpdateAllCharts() { DoUpdateAllCharts(); }
- /// Table is renamed and refreshes charts.
+ // Table is renamed and refreshes charts.
void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
- /// @return the reference in document that is set for name.
+ // @return the reference in document that is set for name.
const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
- /// @return RefMark via index - for UNO.
+ // @return RefMark via index - for UNO.
const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
/** @return names of all references that are set in document.
If array pointer is 0 return only whether a RefMark is set in document. */
sal_uInt16 GetRefMarks( std::vector<OUString>* = 0 ) const;
- /// Insert label. If a FlyFormat is created, return it.
+ // Insert label. If a FlyFormat is created, return it.
SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
const OUString& rNumberingSeparator,
const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
@@ -1776,19 +1736,19 @@ public:
const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator,
const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj );
- /// Query attribute pool.
+ // Query attribute pool.
const SwAttrPool& GetAttrPool() const { return *mpAttrPool; }
SwAttrPool& GetAttrPool() { return *mpAttrPool; }
- /// Search an EditShell or, if appropriate, a SwViewShell via layout.
+ // Search an EditShell or, if appropriate, a SwViewShell via layout.
SwEditShell* GetEditShell( SwViewShell** ppSh = 0 ) const;
::sw::IShellCursorSupplier * GetIShellCursorSupplier();
- /// OLE 2.0-notification.
+ // OLE 2.0-notification.
inline void SetOle2Link(const Link& rLink) {maOle2Link = rLink;}
inline const Link& GetOle2Link() const {return maOle2Link;}
- /// insert section (the ODF kind of section, not the nodesarray kind)
+ // insert section (the ODF kind of section, not the nodesarray kind)
SwSection * InsertSwSection(SwPaM const& rRange, SwSectionData &,
SwTOXBase const*const pTOXBase = 0,
SfxItemSet const*const pAttr = 0, bool const bUpdate = true);
@@ -1818,20 +1778,20 @@ public:
void SetTmpDocShell( SfxObjectShellLock rLock ) { mxTmpDocShell = rLock; }
SfxObjectShellLock GetTmpDocShell() { return mxTmpDocShell; }
- /// For Autotexts? (text modules) They have only one SVPersist at their disposal.
+ // For Autotexts? (text modules) They have only one SVPersist at their disposal.
SfxObjectShell* GetPersist() const;
- /// Pointer to storage of SfxDocShells. Can be 0!!!
+ // Pointer to storage of SfxDocShells. Can be 0!!!
::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > GetDocStorage();
- /// Query / set flag indicating if document is loaded asynchronously at this moment.
+ // Query / set flag indicating if document is loaded asynchronously at this moment.
bool IsInLoadAsynchron() const { return mbInLoadAsynchron; }
void SetInLoadAsynchron( bool bFlag ) { mbInLoadAsynchron = bFlag; }
bool SelectServerObj( const OUString& rStr, SwPaM*& rpPam,
SwNodeRange*& rpRange ) const;
- /// For Drag&Move: (e.g. allow "moving" of RefMarks)
+ // For Drag&Move: (e.g. allow "moving" of RefMarks)
bool IsCopyIsMove() const { return mbCopyIsMove; }
void SetCopyIsMove( bool bFlag ) { mbCopyIsMove = bFlag; }
@@ -1839,7 +1799,7 @@ public:
void UnGroupSelection( SdrView& );
bool DeleteSelection( SwDrawView& );
- /// Invalidates OnlineSpell-WrongLists.
+ // Invalidates OnlineSpell-WrongLists.
void SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags );
void InvalidateAutoCompleteFlag();
@@ -1850,16 +1810,16 @@ public:
// In this case the document name has to be set in front.
bool IsVisitedURL( const OUString& rURL ) const;
- /// Save current values for automatic registration of exceptions in Autocorrection.
+ // Save current values for automatic registration of exceptions in Autocorrection.
void SetAutoCorrExceptWord( SwAutoCorrExceptWord* pNew );
SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return mpACEWord; }
const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
- /// Call into intransparent Basic; expect possible Return String.
+ // Call into intransparent Basic; expect possible Return String.
bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
- /// Call into intransparent Basic / JavaScript.
+ // Call into intransparent Basic / JavaScript.
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEvent,
bool bChkPtr = false, SbxArray* pArgs = 0,
const Link* pCallBack = 0 );
@@ -1870,20 +1830,20 @@ public:
void MoveLeftMargin( const SwPaM& rPam, bool bRight = true,
bool bModulus = true );
- /// Query NumberFormatter.
+ // Query NumberFormatter.
inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True );
inline const SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ) const;
bool HasInvisibleContent() const;
- /// delete invisible content, like hidden sections and paragraphs
+ // delete invisible content, like hidden sections and paragraphs
bool RemoveInvisibleContent();
- /// restore the invisible content if it's available on the undo stack
+ // restore the invisible content if it's available on the undo stack
bool RestoreInvisibleContent();
bool ConvertFieldsToText();
- /// Create sub-documents according to given collection.
- /// If no collection is given, use chapter styles for 1st level.
+ // Create sub-documents according to given collection.
+ // If no collection is given, use chapter styles for 1st level.
sal_Bool GenerateGlobalDoc( const OUString& rPath,
const SwTxtFmtColl* pSplitColl = 0 );
sal_Bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 );
@@ -1891,10 +1851,10 @@ public:
const SwTxtFmtColl* pSplitColl = 0 );
sal_Bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 );
- /// Compare two documents.
+ // Compare two documents.
long CompareDoc( const SwDoc& rDoc );
- /// Merge two documents.
+ // Merge two documents.
long MergeDoc( const SwDoc& rDoc );
/** Set comment-text for Redline. It then comes in via AppendRedLine.
@@ -1905,15 +1865,15 @@ public:
bool IsAutoFmtRedline() const { return mbIsAutoFmtRedline; }
void SetAutoFmtRedline( bool bFlag ) { mbIsAutoFmtRedline = bFlag; }
- /// For AutoFormat: with Undo/Redlining.
+ // For AutoFormat: with Undo/Redlining.
void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
const SfxItemSet* pSet = 0 );
void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& );
- /// Only for SW-textbloxks! Does not pay any attention to layout!
+ // Only for SW-textbloxks! Does not pay any attention to layout!
void ClearDoc(); // Deletes all content!
- /// Query /set data for PagePreview.
+ // Query /set data for PagePreview.
const SwPagePreviewPrtData* GetPreviewPrtData() const { return mpPgPViewPrtData; }
// If pointer == 0 destroy pointer in document.
@@ -1926,11 +1886,11 @@ public:
void SetOLEObjModified()
{ if( GetCurrentViewShell() ) maOLEModifiedTimer.Start(); }
- // -------------------- Uno - Interfaces ---------------------------
+ // Uno - Interfaces
const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; }
SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
- // -------------------- FeShell - Interfaces -----------------------
+ // FeShell - Interfaces
// !!! These assume always an existing layout !!!
bool ChgAnchor( const SdrMarkList& _rMrkList,
RndStdIds _eAnchorType,
@@ -1973,23 +1933,22 @@ public:
SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
bool bInsInPage = true );
- //
- // -------------------- FeShell - Interface end ------------------
+ // FeShell - Interface end
- /// Interface for TextInputData - for text input of Chinese and Japanese.
+ // Interface for TextInputData - for text input of Chinese and Japanese.
SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
void DeleteExtTextInput( SwExtTextInput* pDel );
SwExtTextInput* GetExtTextInput( const SwNode& rNd,
sal_Int32 nCntntPos = -1) const;
SwExtTextInput* GetExtTextInput() const;
- /// Interface for access to AutoComplete-List.
+ // Interface for access to AutoComplete-List.
static SwAutoCompleteWord& GetAutoCompleteWords() { return *mpACmpltWords; }
bool ContainsMSVBasic() const { return mbContains_MSVBasic; }
void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; }
- /// Interface for the list of Ruby - texts/attributes
+ // Interface for the list of Ruby - texts/attributes
sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
sal_uInt16 nMode );
sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
@@ -2005,7 +1964,7 @@ public:
*/
bool ContainsHiddenChars() const;
- /// call back for API wrapper
+ // call back for API wrapper
SwModify* GetUnoCallBack() const;
IGrammarContact* getGrammarContact() const { return mpGrammarContact; }
@@ -2036,13 +1995,13 @@ public:
const int nListLevel,
const bool bValue );
- /// Change a format undoable.
+ // Change a format undoable.
void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
void RenameFmt(SwFmt & rFmt, const OUString & sNewName,
bool bBroadcast = false);
- /// Change a TOX undoable.
+ // Change a TOX undoable.
void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
/**
@@ -2068,19 +2027,19 @@ public:
// access methods for XForms model(s)
- /// access container for XForms model; will be NULL if !isXForms()
+ // access container for XForms model; will be NULL if !isXForms()
com::sun::star::uno::Reference<com::sun::star::container::XNameContainer>
getXForms() const;
com::sun::star::uno::Reference< com::sun::star::linguistic2::XProofreadingIterator > GetGCIterator() const;
- /// #i31958# is this an XForms document?
+ // #i31958# is this an XForms document?
bool isXForms() const;
- /// #i31958# initialize XForms models; turn this into an XForms document
+ // #i31958# initialize XForms models; turn this into an XForms document
void initXForms( bool bCreateDefaultModel );
- /// #i113606# for disposing XForms
+ // #i113606# for disposing XForms
void disposeXForms( );
//Update all the page masters
@@ -2119,9 +2078,9 @@ public:
void dumpAsXml( xmlTextWriterPtr writer = NULL );
private:
- /// Copies master header to left / first one, if necessary - used by ChgPageDesc().
+ // Copies master header to left / first one, if necessary - used by ChgPageDesc().
void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead, SwPageDesc *pDesc, bool bLeft, bool bFirst);
- /// Copies master footer to left / first one, if necessary - used by ChgPageDesc().
+ // Copies master footer to left / first one, if necessary - used by ChgPageDesc().
void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot, SwPageDesc *pDesc, bool bLeft, bool bFirst);
/** continue computing a chunk of document statistics
@@ -2132,7 +2091,7 @@ private:
*/
bool IncrementalDocStatCalculate(long nChars, bool bFields = true);
- /// Our own 'StatsUpdateTimer' calls the following method
+ // Our own 'StatsUpdateTimer' calls the following method
DECL_LINK( DoIdleStatsUpdate, Timer * );
};
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 01cf946..33fa525 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -207,7 +207,6 @@ public:
bool IsEmpty() const { return m_aExtraRedlines.empty(); }
};
-
class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> {
public:
/// the destructor will free all objects still in the set
@@ -216,7 +215,6 @@ public:
class SwOLENodes : public std::vector<SwOLENode*> {};
-
#endif // INCLUDED_SW_INC_DOCARY_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 04471ea..6a25418 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -52,7 +52,6 @@ class IDocumentSettingAccess;
class IDocumentTimerAccess;
class IDocumentChartDataProviderAccess;
-
class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
{
SwDoc* pDoc; ///< Document.
@@ -136,7 +135,6 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SAL_DLLPRIVATE void Init_Impl();
SAL_DLLPRIVATE DECL_STATIC_LINK( SwDocShell, IsLoadFinished, void* );
-
using SfxObjectShell::GetVisArea;
protected:
@@ -191,7 +189,6 @@ public:
const IDocumentSettingAccess* getIDocumentSettingAccess() const;
IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
-
void UpdateFontList();
void UpdateChildWindows();
@@ -215,7 +212,6 @@ public:
const SwFEShell *GetFEShell() const
{ return ((SwDocShell*)this)->GetFEShell(); }
-
/// For inserting document.
Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
SwCrsrShell* pCrsrSh = 0, SwPaM* pPaM = 0);
@@ -274,7 +270,6 @@ public:
/// #i20883# Digital Signatures and Encryption
virtual sal_uInt16 GetHiddenInformationState( sal_uInt16 nStates );
-
/** #i42634# Overwrites SfxObjectShell::UpdateLinks
This new function is necessary to trigger update of links in docs
read by the binary filter: */
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index 704c739..98b917c 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -22,7 +22,6 @@
#include <tools/solar.h>
#include "swdllapi.h"
-
struct SW_DLLPUBLIC SwDocStat
{
sal_uInt16 nTbl;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index c0dbc80..2e2654b 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -66,7 +66,6 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
sal_Bool bPhysical;
-
/// Make empty shell a real StyleSheet (Core).
SAL_DLLPRIVATE void Create();
@@ -183,14 +182,12 @@ public:
void InvalidateIterator();
};
-
class SwDocStyleSheetPool : public SfxStyleSheetBasePool
{
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
SwDoc& rDoc;
sal_Bool bOrganizer : 1; ///< Organizer
-
virtual SfxStyleSheetBase* Create( const OUString&, SfxStyleFamily, sal_uInt16 nMask);
virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& );
@@ -234,7 +231,6 @@ private:
SwDocStyleSheetPool( const SwDocStyleSheetPool& );
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5d655b0..017d4bc 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -19,11 +19,9 @@
#ifndef INCLUDED_SW_INC_DOCUFLD_HXX
#define INCLUDED_SW_INC_DOCUFLD_HXX
-
#include <tools/date.hxx>
#include <tools/datetime.hxx>
-
#include <svl/macitem.hxx>
#include "fldbas.hxx"
@@ -82,7 +80,6 @@ namespace nsSwDocInfoSubType
const SwDocInfoSubType DI_CUSTOM = 9;
const SwDocInfoSubType DI_SUBTYPE_END = 10;
-
const SwDocInfoSubType DI_SUB_AUTHOR = 0x0100;
const SwDocInfoSubType DI_SUB_TIME = 0x0200;
const SwDocInfoSubType DI_SUB_DATE = 0x0300;
@@ -90,7 +87,6 @@ namespace nsSwDocInfoSubType
const SwDocInfoSubType DI_SUB_MASK = 0xff00;
}
-
enum RegInfoFormat ///< Only for loading of old documents!!!
{
RF_AUTHOR,
@@ -289,7 +285,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-
/*--------------------------------------------------------------------
Document statistics
--------------------------------------------------------------------*/
@@ -396,7 +391,6 @@ public:
virtual void SetPar2(const OUString& rStr);
virtual OUString GetPar2() const;
-
virtual sal_uInt16 GetSubType() const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
@@ -496,7 +490,6 @@ public:
static sal_Bool isScriptURL( const OUString& str );
};
-
/*--------------------------------------------------------------------
PostIts
--------------------------------------------------------------------*/
@@ -612,7 +605,6 @@ public:
Extended User settings.
--------------------------------------------------------------------*/
-
class SwExtUserFieldType : public SwFieldType
{
OUString aData;
@@ -645,7 +637,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-
/*--------------------------------------------------------------------
Relative page numbers - field.
--------------------------------------------------------------------*/
@@ -852,7 +843,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-
#endif // INCLUDED_SW_INC_DOCUFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index b86460a..e9f4148 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -50,6 +50,4 @@ public:
#endif // INCLUDED_SW_INC_DPAGE_HXX
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
index 3cc5d3c..e5eaad6 100644
--- a/sw/inc/drawdoc.hxx
+++ b/sw/inc/drawdoc.hxx
@@ -24,8 +24,6 @@
class SwDoc;
class SwDocShell;
-//==================================================================
-
class SwDrawDocument : public FmFormModel
{
SwDoc* pDoc;
@@ -49,7 +47,6 @@ protected:
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoModel();
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index 56ecb9b..42b3f0b 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -60,7 +60,6 @@ public:
{ return GetDocPos() < rCmp.GetDocPos(); }
};
-
class SwGlblDocContents : public o3tl::sorted_vector<SwGlblDocContent*, o3tl::less_ptr_to<SwGlblDocContent> > {
public:
~SwGlblDocContents() { DeleteAndDestroyAll(); }
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 1434f3e..d3f73f2 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -38,8 +38,6 @@ class SwNodeIndex;
} while( (_pStartCrsr=(SwPaM *)_pStartCrsr->GetNext()) != __pStartCrsr ); \
}
-
-
struct SwPamRange
{
sal_uLong nStart, nEnd;
@@ -69,7 +67,6 @@ public:
{ return _SwPamRanges::operator[](nPos); }
};
-
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b90c626..3bf465c 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -509,7 +509,6 @@ public:
/// Detect highest and lowest level to check moving of outline levels.
void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower );
-
/// Get Outline level of current paragraph.
int GetCurrentParaOutlineLevel( ) const;
@@ -571,7 +570,6 @@ public:
bool Redo(sal_uInt16 const nCount = 1);
bool Repeat(sal_uInt16 const nCount);
-
/// For all views of this document.
void StartAllAction();
void EndAllAction();
@@ -759,7 +757,6 @@ public:
::com::sun::star::linguistic2::XSpellAlternatives >
GetCorrection( const Point* pPt, SwRect& rSelectRect );
-
bool GetGrammarCorrection( ::com::sun::star::linguistic2::ProofreadingResult /*out*/ &rResult,
sal_Int32 /*out*/ &rErrorPosInText,
sal_Int32 /*out*/ &rErrorIndexInResult,
@@ -895,12 +892,10 @@ public:
sal_Bool AcceptRedline( sal_uInt16 nPos );
sal_Bool RejectRedline( sal_uInt16 nPos );
-
/** Search Redline for this Data and @return position in array.
If not found, return USHRT_MAX. */
sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const;
-
/// Set comment to Redline at position.
sal_Bool SetRedlineComment( const OUString& rS );
const SwRangeRedline* GetCurrRedline() const;
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index f2e3eba..6a47e06 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -208,7 +208,6 @@ inline sal_uInt16 SwSetExpFieldType::GetType() const
inline OUString SwSetExpFieldType::GetSetRefName() const
{ return sName; }
-
class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
{
OUString sExpand;
@@ -278,7 +277,6 @@ inline sal_Bool SwSetExpField::GetInputFlag() const
inline sal_Bool SwSetExpField::IsSequenceFld() const
{ return 0 != (nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)GetTyp())->GetType()); }
-
class SwInputFieldType : public SwFieldType
{
SwDoc* pDoc;
@@ -290,7 +288,6 @@ public:
SwDoc* GetDoc() const { return pDoc; }
};
-
class SW_DLLPUBLIC SwInputField : public SwField
{
mutable OUString aContent;
@@ -389,7 +386,6 @@ public:
virtual SwFieldType* Copy() const;
};
-
class SwTblField : public SwValueField, public SwTableFormula
{
OUString sExpand;
@@ -425,7 +421,6 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-
#endif // INCLUDED_SW_INC_EXPFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index ac3a264..ae3c291 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_FCHRFMT_HXX
#define INCLUDED_SW_INC_FCHRFMT_HXX
-
#include <svl/poolitem.hxx>
#include <calbck.hxx>
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list