summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw')
-rw-r--r--sw/README32
-rw-r--r--sw/inc/AnnotationWin.hxx6
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx42
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx16
-rw-r--r--sw/inc/IDocumentContentOperations.hxx34
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx62
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx12
-rw-r--r--sw/inc/IDocumentMarkAccess.hxx6
-rw-r--r--sw/inc/IDocumentOutlineNodes.hxx8
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx14
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx4
-rw-r--r--sw/inc/IDocumentState.hxx4
-rw-r--r--sw/inc/IDocumentStylePoolAccess.hxx20
-rw-r--r--sw/inc/IGrammarContact.hxx14
-rw-r--r--sw/inc/PostItMgr.hxx22
-rw-r--r--sw/inc/SidebarWin.hxx4
-rw-r--r--sw/inc/SwNodeNum.hxx12
-rw-r--r--sw/inc/SwStyleNameMapper.hxx28
-rw-r--r--sw/inc/SwUndoField.hxx4
-rw-r--r--sw/inc/ToxLinkProcessor.hxx8
-rw-r--r--sw/inc/ToxTabStopTokenHandler.hxx10
-rw-r--r--sw/inc/ToxTextGenerator.hxx24
-rw-r--r--sw/inc/accmap.hxx10
-rw-r--r--sw/inc/anchoreddrawobject.hxx4
-rw-r--r--sw/inc/anchoredobject.hxx24
-rw-r--r--sw/inc/breakit.hxx4
-rw-r--r--sw/inc/calc.hxx8
-rw-r--r--sw/inc/cellatr.hxx50
-rw-r--r--sw/inc/cellfml.hxx34
-rw-r--r--sw/inc/charatr.hxx66
-rw-r--r--sw/inc/charfmt.hxx22
-rw-r--r--sw/inc/chpfld.hxx10
-rw-r--r--sw/inc/cmdid.h2
-rw-r--r--sw/inc/crsrsh.hxx172
-rw-r--r--sw/inc/crstate.hxx20
-rw-r--r--sw/inc/cshtyp.hxx10
-rw-r--r--sw/inc/dbfld.hxx24
-rw-r--r--sw/inc/dbgoutsw.hxx28
-rw-r--r--sw/inc/dbmgr.hxx14
-rw-r--r--sw/inc/dcontact.hxx46
-rw-r--r--sw/inc/doc.hxx462
-rw-r--r--sw/inc/docary.hxx80
-rw-r--r--sw/inc/docstat.hxx2
-rw-r--r--sw/inc/docstyle.hxx24
-rw-r--r--sw/inc/docufld.hxx74
-rw-r--r--sw/inc/editsh.hxx196
-rw-r--r--sw/inc/expfld.hxx100
-rw-r--r--sw/inc/fchrfmt.hxx22
-rw-r--r--sw/inc/fesh.hxx112
-rw-r--r--sw/inc/fldbas.hxx34
-rw-r--r--sw/inc/flddat.hxx2
-rw-r--r--sw/inc/fldui.hrc2
-rw-r--r--sw/inc/fldupde.hxx2
-rw-r--r--sw/inc/flypos.hxx8
-rw-r--r--sw/inc/fmtanchr.hxx20
-rw-r--r--sw/inc/fmtautofmt.hxx10
-rw-r--r--sw/inc/fmtclbl.hxx10
-rw-r--r--sw/inc/fmtclds.hxx16
-rw-r--r--sw/inc/fmtcnct.hxx28
-rw-r--r--sw/inc/fmtcntnt.hxx24
-rw-r--r--sw/inc/fmtcol.hxx118
-rw-r--r--sw/inc/fmtcolfunc.hxx24
-rw-r--r--sw/inc/fmteiro.hxx10
-rw-r--r--sw/inc/fmtflcnt.hxx24
-rw-r--r--sw/inc/fmtfld.hxx46
-rw-r--r--sw/inc/fmtfollowtextflow.hxx10
-rw-r--r--sw/inc/fmtfordr.hxx14
-rw-r--r--sw/inc/fmtfsize.hxx12
-rw-r--r--sw/inc/fmtftn.hxx28
-rw-r--r--sw/inc/fmtftntx.hxx48
-rw-r--r--sw/inc/fmthdft.hxx54
-rw-r--r--sw/inc/fmtinfmt.hxx68
-rw-r--r--sw/inc/fmtline.hxx10
-rw-r--r--sw/inc/fmtlsplt.hxx10
-rw-r--r--sw/inc/fmtmeta.hxx60
-rw-r--r--sw/inc/fmtornt.hxx28
-rw-r--r--sw/inc/fmtpdsc.hxx18
-rw-r--r--sw/inc/fmtrfmrk.hxx20
-rw-r--r--sw/inc/fmtrowsplt.hxx10
-rw-r--r--sw/inc/fmtruby.hxx38
-rw-r--r--sw/inc/fmtsrnd.hxx18
-rw-r--r--sw/inc/fmturl.hxx16
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx20
-rw-r--r--sw/inc/format.hxx130
-rw-r--r--sw/inc/frmatr.hxx36
-rw-r--r--sw/inc/frmfmt.hxx98
-rw-r--r--sw/inc/ftnidx.hxx32
-rw-r--r--sw/inc/ftninfo.hxx46
-rw-r--r--sw/inc/grfatr.hxx26
-rw-r--r--sw/inc/hfspacingitem.hxx2
-rw-r--r--sw/inc/hhcwrp.hxx2
-rw-r--r--sw/inc/hintids.hxx38
-rw-r--r--sw/inc/hints.hxx60
-rw-r--r--sw/inc/htmltbl.hxx6
-rw-r--r--sw/inc/lineinfo.hxx6
-rw-r--r--sw/inc/mdiexp.hxx2
-rw-r--r--sw/inc/modcfg.hxx80
-rw-r--r--sw/inc/modeltoviewhelper.hxx6
-rw-r--r--sw/inc/ndarr.hxx84
-rw-r--r--sw/inc/ndgrf.hxx16
-rw-r--r--sw/inc/ndhints.hxx72
-rw-r--r--sw/inc/ndnotxt.hxx32
-rw-r--r--sw/inc/ndole.hxx20
-rw-r--r--sw/inc/ndtxt.hxx176
-rw-r--r--sw/inc/ndtyp.hxx2
-rw-r--r--sw/inc/node.hxx134
-rw-r--r--sw/inc/numrule.hxx74
-rw-r--r--sw/inc/pagedesc.hxx82
-rw-r--r--sw/inc/pam.hxx44
-rw-r--r--sw/inc/paratr.hxx72
-rw-r--r--sw/inc/poolfmt.awk6
-rw-r--r--sw/inc/poolfmt.hxx2
-rw-r--r--sw/inc/postithelper.hxx16
-rw-r--r--sw/inc/printdata.hxx6
-rw-r--r--sw/inc/redline.hxx18
-rw-r--r--sw/inc/reffld.hxx30
-rw-r--r--sw/inc/rubylist.hxx8
-rw-r--r--sw/inc/section.hxx58
-rw-r--r--sw/inc/shellio.hxx50
-rw-r--r--sw/inc/shellres.hxx20
-rw-r--r--sw/inc/splargs.hxx26
-rw-r--r--sw/inc/sw3convert.hxx2
-rw-r--r--sw/inc/swabstdlg.hxx40
-rw-r--r--sw/inc/swatrset.hxx122
-rw-r--r--sw/inc/swbaslnk.hxx10
-rw-r--r--sw/inc/swcrsr.hxx48
-rw-r--r--sw/inc/swddetbl.hxx8
-rw-r--r--sw/inc/swevent.hxx26
-rw-r--r--sw/inc/swmodule.hxx10
-rw-r--r--sw/inc/swscanner.hxx6
-rw-r--r--sw/inc/swserv.hxx4
-rw-r--r--sw/inc/swtable.hxx134
-rw-r--r--sw/inc/swtblfmt.hxx48
-rw-r--r--sw/inc/swtypes.hxx8
-rw-r--r--sw/inc/tblafmt.hxx70
-rw-r--r--sw/inc/tblenum.hxx28
-rw-r--r--sw/inc/tblsel.hxx46
-rw-r--r--sw/inc/textboxhelper.hxx50
-rw-r--r--sw/inc/tgrditem.hxx2
-rw-r--r--sw/inc/tox.hxx16
-rw-r--r--sw/inc/toxwrap.hxx6
-rw-r--r--sw/inc/txatbase.hxx98
-rw-r--r--sw/inc/txatritr.hxx20
-rw-r--r--sw/inc/txtannotationfld.hxx8
-rw-r--r--sw/inc/txtatr.hxx62
-rw-r--r--sw/inc/txtflcnt.hxx18
-rw-r--r--sw/inc/txtfld.hxx58
-rw-r--r--sw/inc/txtftn.hxx26
-rw-r--r--sw/inc/txtinet.hxx40
-rw-r--r--sw/inc/txtrfmrk.hxx22
-rw-r--r--sw/inc/txttxmrk.hxx26
-rw-r--r--sw/inc/undobj.hxx74
-rw-r--r--sw/inc/unochart.hxx10
-rw-r--r--sw/inc/unocoll.hxx16
-rw-r--r--sw/inc/unocrsr.hxx8
-rw-r--r--sw/inc/unocrsrhelper.hxx20
-rw-r--r--sw/inc/unodraw.hxx6
-rw-r--r--sw/inc/unofieldcoll.hxx2
-rw-r--r--sw/inc/unoframe.hxx34
-rw-r--r--sw/inc/unomid.h6
-rw-r--r--sw/inc/unoparagraph.hxx10
-rw-r--r--sw/inc/unosett.hxx14
-rw-r--r--sw/inc/unotbl.hxx60
-rw-r--r--sw/inc/unotextbodyhf.hxx6
-rw-r--r--sw/inc/unotextrange.hxx4
-rw-r--r--sw/inc/unotxdoc.hxx2
-rw-r--r--sw/inc/usrfld.hxx8
-rw-r--r--sw/inc/viewopt.hxx12
-rw-r--r--sw/inc/viewsh.hxx16
-rw-r--r--sw/inc/viscrs.hxx18
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java12
-rw-r--r--sw/qa/complex/writer/CheckCrossReferences.java112
-rw-r--r--sw/qa/complex/writer/CheckTable.java2
-rw-r--r--sw/qa/core/macros-test.cxx38
-rw-r--r--sw/qa/core/test_ToxLinkProcessor.cxx16
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx8
-rw-r--r--sw/qa/core/uwriter.cxx314
-rw-r--r--sw/qa/extras/globalfilter/globalfilter.cxx6
-rw-r--r--sw/qa/extras/htmlimport/htmlimport.cxx12
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx12
-rw-r--r--sw/qa/extras/mailmerge/mailmerge.cxx34
-rw-r--r--sw/qa/extras/odfimport/odfimport.cxx74
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport3.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx2
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx2
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx8
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx134
-rw-r--r--sw/qa/python/check_table.py2
-rw-r--r--sw/sdi/_textsh.sdi124
-rw-r--r--sw/sdi/drwtxtsh.sdi38
-rw-r--r--sw/sdi/switems.sdi8
-rw-r--r--sw/sdi/swriter.sdi6
-rw-r--r--sw/sdi/tabsh.sdi4
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx108
-rw-r--r--sw/source/core/access/acccell.cxx16
-rw-r--r--sw/source/core/access/acccell.hxx4
-rw-r--r--sw/source/core/access/acccontext.cxx28
-rw-r--r--sw/source/core/access/accdoc.cxx76
-rw-r--r--sw/source/core/access/accembedded.cxx6
-rw-r--r--sw/source/core/access/accfootnote.cxx26
-rw-r--r--sw/source/core/access/accfootnote.hxx6
-rw-r--r--sw/source/core/access/accframe.cxx8
-rw-r--r--sw/source/core/access/accframebase.cxx42
-rw-r--r--sw/source/core/access/accfrmobj.cxx12
-rw-r--r--sw/source/core/access/accfrmobjmap.cxx4
-rw-r--r--sw/source/core/access/accfrmobjslist.cxx4
-rw-r--r--sw/source/core/access/accgraphic.cxx2
-rw-r--r--sw/source/core/access/acchyperlink.cxx60
-rw-r--r--sw/source/core/access/acchyperlink.hxx4
-rw-r--r--sw/source/core/access/acchypertextdata.hxx8
-rw-r--r--sw/source/core/access/accmap.cxx106
-rw-r--r--sw/source/core/access/accnotextframe.cxx26
-rw-r--r--sw/source/core/access/accnotextframe.hxx4
-rw-r--r--sw/source/core/access/accnotexthyperlink.cxx12
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx4
-rw-r--r--sw/source/core/access/accpara.cxx278
-rw-r--r--sw/source/core/access/accpara.hxx10
-rw-r--r--sw/source/core/access/accportions.cxx32
-rw-r--r--sw/source/core/access/accportions.hxx10
-rw-r--r--sw/source/core/access/accselectionhelper.cxx6
-rw-r--r--sw/source/core/access/acctable.cxx32
-rw-r--r--sw/source/core/access/acctextframe.cxx20
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx70
-rw-r--r--sw/source/core/access/parachangetrackinginfo.hxx6
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx16
-rw-r--r--sw/source/core/access/textmarkuphelper.hxx6
-rw-r--r--sw/source/core/attr/cellatr.cxx98
-rw-r--r--sw/source/core/attr/fmtfollowtextflow.cxx6
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx38
-rw-r--r--sw/source/core/attr/format.cxx244
-rw-r--r--sw/source/core/attr/hints.cxx30
-rw-r--r--sw/source/core/attr/swatrset.cxx48
-rw-r--r--sw/source/core/bastyp/breakit.cxx32
-rw-r--r--sw/source/core/bastyp/calc.cxx34
-rw-r--r--sw/source/core/bastyp/init.cxx130
-rw-r--r--sw/source/core/bastyp/swtypes.cxx10
-rw-r--r--sw/source/core/crsr/annotationmark.cxx32
-rw-r--r--sw/source/core/crsr/bookmrk.cxx30
-rw-r--r--sw/source/core/crsr/callnk.cxx64
-rw-r--r--sw/source/core/crsr/callnk.hxx8
-rw-r--r--sw/source/core/crsr/crossrefbookmark.cxx2
-rw-r--r--sw/source/core/crsr/crsrsh.cxx474
-rw-r--r--sw/source/core/crsr/crstrvl.cxx848
-rw-r--r--sw/source/core/crsr/findattr.cxx164
-rw-r--r--sw/source/core/crsr/findcoll.cxx36
-rw-r--r--sw/source/core/crsr/findfmt.cxx12
-rw-r--r--sw/source/core/crsr/findtxt.cxx108
-rw-r--r--sw/source/core/crsr/pam.cxx186
-rw-r--r--sw/source/core/crsr/paminit.cxx12
-rw-r--r--sw/source/core/crsr/swcrsr.cxx424
-rw-r--r--sw/source/core/crsr/trvlcol.cxx16
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx172
-rw-r--r--sw/source/core/crsr/trvlreg.cxx32
-rw-r--r--sw/source/core/crsr/trvltbl.cxx304
-rw-r--r--sw/source/core/crsr/viscrs.cxx148
-rw-r--r--sw/source/core/doc/CntntIdxStore.cxx186
-rw-r--r--sw/source/core/doc/DocumentChartDataProviderManager.cxx4
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx1130
-rw-r--r--sw/source/core/doc/DocumentDeviceManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentDrawModelManager.cxx14
-rw-r--r--sw/source/core/doc/DocumentFieldsManager.cxx968
-rw-r--r--sw/source/core/doc/DocumentLayoutManager.cxx174
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx88
-rw-r--r--sw/source/core/doc/DocumentListItemsManager.cxx6
-rw-r--r--sw/source/core/doc/DocumentOutlineNodesManager.cxx14
-rw-r--r--sw/source/core/doc/DocumentRedlineManager.cxx480
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx22
-rw-r--r--sw/source/core/doc/DocumentStateManager.cxx10
-rw-r--r--sw/source/core/doc/DocumentStatisticsManager.cxx26
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx646
-rw-r--r--sw/source/core/doc/DocumentTimerManager.cxx28
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx84
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx110
-rw-r--r--sw/source/core/doc/doc.cxx340
-rw-r--r--sw/source/core/doc/docbasic.cxx24
-rw-r--r--sw/source/core/doc/docbm.cxx66
-rw-r--r--sw/source/core/doc/docchart.cxx64
-rw-r--r--sw/source/core/doc/doccomp.cxx176
-rw-r--r--sw/source/core/doc/doccorr.cxx50
-rw-r--r--sw/source/core/doc/docdesc.cxx242
-rw-r--r--sw/source/core/doc/docdraw.cxx128
-rw-r--r--sw/source/core/doc/docedt.cxx274
-rw-r--r--sw/source/core/doc/docfld.cxx460
-rw-r--r--sw/source/core/doc/docfly.cxx384
-rw-r--r--sw/source/core/doc/docfmt.cxx774
-rw-r--r--sw/source/core/doc/docftn.cxx300
-rw-r--r--sw/source/core/doc/docglbl.cxx62
-rw-r--r--sw/source/core/doc/docglos.cxx26
-rw-r--r--sw/source/core/doc/doclay.cxx682
-rw-r--r--sw/source/core/doc/docnew.cxx272
-rw-r--r--sw/source/core/doc/docnum.cxx436
-rw-r--r--sw/source/core/doc/docredln.cxx282
-rw-r--r--sw/source/core/doc/docruby.cxx20
-rw-r--r--sw/source/core/doc/docsort.cxx148
-rw-r--r--sw/source/core/doc/docstat.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx512
-rw-r--r--sw/source/core/doc/extinput.cxx26
-rw-r--r--sw/source/core/doc/fmtcol.cxx204
-rw-r--r--sw/source/core/doc/ftnidx.cxx178
-rw-r--r--sw/source/core/doc/gctable.cxx72
-rw-r--r--sw/source/core/doc/htmltbl.cxx78
-rw-r--r--sw/source/core/doc/lineinfo.cxx20
-rw-r--r--sw/source/core/doc/notxtfrm.cxx98
-rw-r--r--sw/source/core/doc/number.cxx470
-rw-r--r--sw/source/core/doc/poolfmt.cxx16
-rw-r--r--sw/source/core/doc/swserv.cxx14
-rw-r--r--sw/source/core/doc/tblafmt.cxx302
-rw-r--r--sw/source/core/doc/tblcpy.cxx216
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1126
-rw-r--r--sw/source/core/doc/textboxhelper.cxx192
-rw-r--r--sw/source/core/doc/visiturl.cxx16
-rw-r--r--sw/source/core/docnode/ndcopy.cxx190
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx86
-rw-r--r--sw/source/core/docnode/ndnum.cxx20
-rw-r--r--sw/source/core/docnode/ndsect.cxx346
-rw-r--r--sw/source/core/docnode/ndsect.hxx2
-rw-r--r--sw/source/core/docnode/ndtbl.cxx1834
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx304
-rw-r--r--sw/source/core/docnode/node.cxx482
-rw-r--r--sw/source/core/docnode/node2lay.cxx40
-rw-r--r--sw/source/core/docnode/nodes.cxx322
-rw-r--r--sw/source/core/docnode/section.cxx292
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx76
-rw-r--r--sw/source/core/draw/dcontact.cxx206
-rw-r--r--sw/source/core/draw/dflyobj.cxx66
-rw-r--r--sw/source/core/draw/dpage.cxx28
-rw-r--r--sw/source/core/draw/dview.cxx42
-rw-r--r--sw/source/core/edit/acorrect.cxx118
-rw-r--r--sw/source/core/edit/autofmt.cxx804
-rw-r--r--sw/source/core/edit/edatmisc.cxx28
-rw-r--r--sw/source/core/edit/edattr.cxx206
-rw-r--r--sw/source/core/edit/eddel.cxx22
-rw-r--r--sw/source/core/edit/edfcol.cxx46
-rw-r--r--sw/source/core/edit/edfld.cxx198
-rw-r--r--sw/source/core/edit/edfldexp.cxx20
-rw-r--r--sw/source/core/edit/edfmt.cxx74
-rw-r--r--sw/source/core/edit/edglbldc.cxx40
-rw-r--r--sw/source/core/edit/edglss.cxx80
-rw-r--r--sw/source/core/edit/editsh.cxx222
-rw-r--r--sw/source/core/edit/edlingu.cxx76
-rw-r--r--sw/source/core/edit/ednumber.cxx124
-rw-r--r--sw/source/core/edit/edredln.cxx10
-rw-r--r--sw/source/core/edit/edsect.cxx60
-rw-r--r--sw/source/core/edit/edtab.cxx154
-rw-r--r--sw/source/core/edit/edtox.cxx22
-rw-r--r--sw/source/core/edit/edundo.cxx22
-rw-r--r--sw/source/core/edit/edws.cxx18
-rw-r--r--sw/source/core/fields/authfld.cxx52
-rw-r--r--sw/source/core/fields/cellfml.cxx446
-rw-r--r--sw/source/core/fields/chpfld.cxx52
-rw-r--r--sw/source/core/fields/dbfld.cxx62
-rw-r--r--sw/source/core/fields/ddefld.cxx78
-rw-r--r--sw/source/core/fields/ddetbl.cxx58
-rw-r--r--sw/source/core/fields/docufld.cxx394
-rw-r--r--sw/source/core/fields/expfld.cxx250
-rw-r--r--sw/source/core/fields/fldbas.cxx150
-rw-r--r--sw/source/core/fields/flddat.cxx6
-rw-r--r--sw/source/core/fields/fldlst.cxx68
-rw-r--r--sw/source/core/fields/macrofld.cxx4
-rw-r--r--sw/source/core/fields/postithelper.cxx34
-rw-r--r--sw/source/core/fields/reffld.cxx348
-rw-r--r--sw/source/core/fields/tblcalc.cxx66
-rw-r--r--sw/source/core/fields/usrfld.cxx24
-rw-r--r--sw/source/core/frmedt/fecopy.cxx316
-rw-r--r--sw/source/core/frmedt/fedesc.cxx20
-rw-r--r--sw/source/core/frmedt/fefly1.cxx526
-rw-r--r--sw/source/core/frmedt/feflyole.cxx4
-rw-r--r--sw/source/core/frmedt/feshview.cxx258
-rw-r--r--sw/source/core/frmedt/fetab.cxx286
-rw-r--r--sw/source/core/frmedt/fews.cxx112
-rw-r--r--sw/source/core/frmedt/tblsel.cxx364
-rw-r--r--sw/source/core/graphic/ndgrf.cxx40
-rw-r--r--sw/source/core/inc/DocumentContentOperationsManager.hxx40
-rw-r--r--sw/source/core/inc/DocumentFieldsManager.hxx58
-rw-r--r--sw/source/core/inc/DocumentLayoutManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentOutlineNodesManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentRedlineManager.hxx22
-rw-r--r--sw/source/core/inc/DocumentSettingManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentStateManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentStylePoolManager.hxx12
-rw-r--r--sw/source/core/inc/MarkManager.hxx2
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx6
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx124
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx6
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx58
-rw-r--r--sw/source/core/inc/UndoCore.hxx48
-rw-r--r--sw/source/core/inc/UndoDelete.hxx18
-rw-r--r--sw/source/core/inc/UndoDraw.hxx22
-rw-r--r--sw/source/core/inc/UndoInsert.hxx24
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx2
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx8
-rw-r--r--sw/source/core/inc/UndoRedline.hxx6
-rw-r--r--sw/source/core/inc/UndoSection.hxx14
-rw-r--r--sw/source/core/inc/UndoSort.hxx6
-rw-r--r--sw/source/core/inc/UndoSplitMove.hxx20
-rw-r--r--sw/source/core/inc/UndoTable.hxx184
-rw-r--r--sw/source/core/inc/acorrect.hxx6
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx14
-rw-r--r--sw/source/core/inc/annotationmark.hxx4
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx8
-rw-r--r--sw/source/core/inc/blink.hxx4
-rw-r--r--sw/source/core/inc/bodyfrm.hxx2
-rw-r--r--sw/source/core/inc/cntfrm.hxx76
-rw-r--r--sw/source/core/inc/colfrm.hxx4
-rw-r--r--sw/source/core/inc/dflyobj.hxx6
-rw-r--r--sw/source/core/inc/docedt.hxx2
-rw-r--r--sw/source/core/inc/docfld.hxx128
-rw-r--r--sw/source/core/inc/docsort.hxx6
-rw-r--r--sw/source/core/inc/doctxm.hxx30
-rw-r--r--sw/source/core/inc/drawfont.hxx8
-rw-r--r--sw/source/core/inc/flowfrm.hxx14
-rw-r--r--sw/source/core/inc/flyfrm.hxx36
-rw-r--r--sw/source/core/inc/flyfrms.hxx36
-rw-r--r--sw/source/core/inc/frame.hxx136
-rw-r--r--sw/source/core/inc/frminf.hxx20
-rw-r--r--sw/source/core/inc/frmtool.hxx30
-rw-r--r--sw/source/core/inc/ftnboss.hxx110
-rw-r--r--sw/source/core/inc/ftnfrm.hxx74
-rw-r--r--sw/source/core/inc/hffrm.hxx6
-rw-r--r--sw/source/core/inc/layact.hxx34
-rw-r--r--sw/source/core/inc/layfrm.hxx62
-rw-r--r--sw/source/core/inc/layouter.hxx18
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx14
-rw-r--r--sw/source/core/inc/mvsave.hxx52
-rw-r--r--sw/source/core/inc/notxtfrm.hxx8
-rw-r--r--sw/source/core/inc/objectformatter.hxx8
-rw-r--r--sw/source/core/inc/pagefrm.hxx88
-rw-r--r--sw/source/core/inc/pamtyp.hxx28
-rw-r--r--sw/source/core/inc/rolbck.hxx122
-rw-r--r--sw/source/core/inc/rootfrm.hxx32
-rw-r--r--sw/source/core/inc/scriptinfo.hxx38
-rw-r--r--sw/source/core/inc/sectfrm.hxx62
-rw-r--r--sw/source/core/inc/swblocks.hxx10
-rw-r--r--sw/source/core/inc/swfont.hxx16
-rw-r--r--sw/source/core/inc/swselectionlist.hxx2
-rw-r--r--sw/source/core/inc/tabfrm.hxx16
-rw-r--r--sw/source/core/inc/tblrwcl.hxx78
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx10
-rw-r--r--sw/source/core/inc/txmsrt.hxx54
-rw-r--r--sw/source/core/inc/txtfly.hxx78
-rw-r--r--sw/source/core/inc/txtfrm.hxx238
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx6
-rw-r--r--sw/source/core/inc/unoevent.hxx6
-rw-r--r--sw/source/core/inc/unofield.hxx10
-rw-r--r--sw/source/core/inc/unoflatpara.hxx6
-rw-r--r--sw/source/core/inc/unofootnote.hxx6
-rw-r--r--sw/source/core/inc/unometa.hxx4
-rw-r--r--sw/source/core/inc/unoparaframeenum.hxx4
-rw-r--r--sw/source/core/inc/unoport.hxx14
-rw-r--r--sw/source/core/inc/unorefmark.hxx6
-rw-r--r--sw/source/core/inc/unosection.hxx8
-rw-r--r--sw/source/core/inc/unotextmarkup.hxx8
-rw-r--r--sw/source/core/inc/viewimp.hxx14
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx78
-rw-r--r--sw/source/core/layout/anchoredobject.cxx86
-rw-r--r--sw/source/core/layout/atrfrm.cxx892
-rw-r--r--sw/source/core/layout/calcmove.cxx268
-rw-r--r--sw/source/core/layout/colfrm.cxx78
-rw-r--r--sw/source/core/layout/dbg_lay.cxx24
-rw-r--r--sw/source/core/layout/dumpfilter.cxx2
-rw-r--r--sw/source/core/layout/findfrm.cxx370
-rw-r--r--sw/source/core/layout/flowfrm.cxx366
-rw-r--r--sw/source/core/layout/fly.cxx374
-rw-r--r--sw/source/core/layout/flycnt.cxx256
-rw-r--r--sw/source/core/layout/flyincnt.cxx38
-rw-r--r--sw/source/core/layout/flylay.cxx102
-rw-r--r--sw/source/core/layout/flypos.cxx20
-rw-r--r--sw/source/core/layout/frmtool.cxx590
-rw-r--r--sw/source/core/layout/ftnfrm.cxx1398
-rw-r--r--sw/source/core/layout/hffrm.cxx60
-rw-r--r--sw/source/core/layout/layact.cxx446
-rw-r--r--sw/source/core/layout/laycache.cxx44
-rw-r--r--sw/source/core/layout/layouter.cxx72
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx20
-rw-r--r--sw/source/core/layout/newfrm.cxx62
-rw-r--r--sw/source/core/layout/objectformatter.cxx48
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx238
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx24
-rw-r--r--sw/source/core/layout/pagechg.cxx372
-rw-r--r--sw/source/core/layout/pagedesc.cxx64
-rw-r--r--sw/source/core/layout/paintfrm.cxx224
-rw-r--r--sw/source/core/layout/sectfrm.cxx458
-rw-r--r--sw/source/core/layout/softpagebreak.cxx16
-rw-r--r--sw/source/core/layout/sortedobjs.cxx38
-rw-r--r--sw/source/core/layout/ssfrm.cxx68
-rw-r--r--sw/source/core/layout/swselectionlist.cxx10
-rw-r--r--sw/source/core/layout/tabfrm.cxx308
-rw-r--r--sw/source/core/layout/trvlfrm.cxx522
-rw-r--r--sw/source/core/layout/unusedf.cxx4
-rw-r--r--sw/source/core/layout/wsfrm.cxx410
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx82
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx28
-rw-r--r--sw/source/core/objectpositioning/environmentofanchoredobject.cxx2
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx130
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx26
-rw-r--r--sw/source/core/ole/ndole.cxx32
-rw-r--r--sw/source/core/para/paratr.cxx48
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx56
-rw-r--r--sw/source/core/sw3io/swacorr.cxx2
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx30
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx8
-rw-r--r--sw/source/core/swg/swblocks.cxx38
-rw-r--r--sw/source/core/table/swnewtable.cxx128
-rw-r--r--sw/source/core/table/swtable.cxx810
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx234
-rw-r--r--sw/source/core/text/atrhndl.hxx24
-rw-r--r--sw/source/core/text/atrstck.cxx94
-rw-r--r--sw/source/core/text/blink.cxx6
-rw-r--r--sw/source/core/text/frmcrsr.cxx260
-rw-r--r--sw/source/core/text/frmform.cxx338
-rw-r--r--sw/source/core/text/frminf.cxx90
-rw-r--r--sw/source/core/text/frmpaint.cxx126
-rw-r--r--sw/source/core/text/guess.cxx128
-rw-r--r--sw/source/core/text/guess.hxx12
-rw-r--r--sw/source/core/text/inftxt.cxx406
-rw-r--r--sw/source/core/text/inftxt.hxx240
-rw-r--r--sw/source/core/text/itradj.cxx76
-rw-r--r--sw/source/core/text/itratr.cxx192
-rw-r--r--sw/source/core/text/itratr.hxx26
-rw-r--r--sw/source/core/text/itrcrsr.cxx222
-rw-r--r--sw/source/core/text/itrform2.cxx480
-rw-r--r--sw/source/core/text/itrform2.hxx94
-rw-r--r--sw/source/core/text/itrpaint.cxx60
-rw-r--r--sw/source/core/text/itrpaint.hxx24
-rw-r--r--sw/source/core/text/itrtxt.cxx62
-rw-r--r--sw/source/core/text/itrtxt.hxx110
-rw-r--r--sw/source/core/text/pordrop.hxx14
-rw-r--r--sw/source/core/text/porexp.cxx58
-rw-r--r--sw/source/core/text/porexp.hxx28
-rw-r--r--sw/source/core/text/porfld.cxx282
-rw-r--r--sw/source/core/text/porfld.hxx72
-rw-r--r--sw/source/core/text/porfly.cxx66
-rw-r--r--sw/source/core/text/porfly.hxx16
-rw-r--r--sw/source/core/text/porftn.hxx44
-rw-r--r--sw/source/core/text/porglue.cxx28
-rw-r--r--sw/source/core/text/porglue.hxx6
-rw-r--r--sw/source/core/text/porhyph.hxx18
-rw-r--r--sw/source/core/text/porlay.cxx200
-rw-r--r--sw/source/core/text/porlay.hxx26
-rw-r--r--sw/source/core/text/porlin.cxx34
-rw-r--r--sw/source/core/text/porlin.hxx42
-rw-r--r--sw/source/core/text/pormulti.cxx348
-rw-r--r--sw/source/core/text/pormulti.hxx66
-rw-r--r--sw/source/core/text/porref.cxx12
-rw-r--r--sw/source/core/text/porref.hxx10
-rw-r--r--sw/source/core/text/porrst.cxx126
-rw-r--r--sw/source/core/text/porrst.hxx30
-rw-r--r--sw/source/core/text/portab.hxx12
-rw-r--r--sw/source/core/text/portox.cxx12
-rw-r--r--sw/source/core/text/portox.hxx10
-rw-r--r--sw/source/core/text/portxt.cxx178
-rw-r--r--sw/source/core/text/portxt.hxx68
-rw-r--r--sw/source/core/text/redlnitr.cxx56
-rw-r--r--sw/source/core/text/redlnitr.hxx8
-rw-r--r--sw/source/core/text/txtcache.cxx68
-rw-r--r--sw/source/core/text/txtcache.hxx20
-rw-r--r--sw/source/core/text/txtdrop.cxx164
-rw-r--r--sw/source/core/text/txtfld.cxx280
-rw-r--r--sw/source/core/text/txtfly.cxx204
-rw-r--r--sw/source/core/text/txtfrm.cxx554
-rw-r--r--sw/source/core/text/txtftn.cxx644
-rw-r--r--sw/source/core/text/txthyph.cxx104
-rw-r--r--sw/source/core/text/txtinit.cxx18
-rw-r--r--sw/source/core/text/txtio.cxx206
-rw-r--r--sw/source/core/text/txtpaint.cxx2
-rw-r--r--sw/source/core/text/txtpaint.hxx4
-rw-r--r--sw/source/core/text/txttab.cxx44
-rw-r--r--sw/source/core/text/widorp.cxx66
-rw-r--r--sw/source/core/text/widorp.hxx32
-rw-r--r--sw/source/core/text/xmldump.cxx32
-rw-r--r--sw/source/core/tox/ToxLinkProcessor.cxx8
-rw-r--r--sw/source/core/tox/ToxTabStopTokenHandler.cxx24
-rw-r--r--sw/source/core/tox/ToxTextGenerator.cxx88
-rw-r--r--sw/source/core/tox/tox.cxx24
-rw-r--r--sw/source/core/tox/toxhlp.cxx14
-rw-r--r--sw/source/core/tox/txmsrt.cxx200
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx54
-rw-r--r--sw/source/core/txtnode/atrfld.cxx354
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx150
-rw-r--r--sw/source/core/txtnode/atrftn.cxx224
-rw-r--r--sw/source/core/txtnode/atrref.cxx34
-rw-r--r--sw/source/core/txtnode/atrtox.cxx16
-rw-r--r--sw/source/core/txtnode/chrfmt.cxx12
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx418
-rw-r--r--sw/source/core/txtnode/fntcache.cxx104
-rw-r--r--sw/source/core/txtnode/fntcap.cxx44
-rw-r--r--sw/source/core/txtnode/modeltoviewhelper.cxx14
-rw-r--r--sw/source/core/txtnode/ndhints.cxx76
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx1574
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx10
-rw-r--r--sw/source/core/txtnode/swfont.cxx32
-rw-r--r--sw/source/core/txtnode/thints.cxx824
-rw-r--r--sw/source/core/txtnode/txatbase.cxx32
-rw-r--r--sw/source/core/txtnode/txatritr.cxx24
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx188
-rw-r--r--sw/source/core/txtnode/txtedt.cxx256
-rw-r--r--sw/source/core/undo/SwUndoField.cxx24
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx224
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx196
-rw-r--r--sw/source/core/undo/rolbck.cxx528
-rw-r--r--sw/source/core/undo/unattr.cxx370
-rw-r--r--sw/source/core/undo/undel.cxx304
-rw-r--r--sw/source/core/undo/undobj.cxx266
-rw-r--r--sw/source/core/undo/undobj1.cxx318
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx14
-rw-r--r--sw/source/core/undo/undraw.cxx276
-rw-r--r--sw/source/core/undo/unfmco.cxx32
-rw-r--r--sw/source/core/undo/unins.cxx208
-rw-r--r--sw/source/core/undo/unmove.cxx164
-rw-r--r--sw/source/core/undo/unnum.cxx42
-rw-r--r--sw/source/core/undo/unovwr.cxx116
-rw-r--r--sw/source/core/undo/unredln.cxx60
-rw-r--r--sw/source/core/undo/unsect.cxx94
-rw-r--r--sw/source/core/undo/unsort.cxx56
-rw-r--r--sw/source/core/undo/unspnd.cxx60
-rw-r--r--sw/source/core/undo/untbl.cxx1532
-rw-r--r--sw/source/core/undo/untblk.cxx146
-rw-r--r--sw/source/core/unocore/SwXTextDefaults.cxx16
-rw-r--r--sw/source/core/unocore/unochart.cxx382
-rw-r--r--sw/source/core/unocore/unocoll.cxx216
-rw-r--r--sw/source/core/unocore/unocrsr.cxx40
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx246
-rw-r--r--sw/source/core/unocore/unodraw.cxx352
-rw-r--r--sw/source/core/unocore/unoevent.cxx16
-rw-r--r--sw/source/core/unocore/unofield.cxx612
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx102
-rw-r--r--sw/source/core/unocore/unoframe.cxx646
-rw-r--r--sw/source/core/unocore/unoftn.cxx130
-rw-r--r--sw/source/core/unocore/unoidx.cxx198
-rw-r--r--sw/source/core/unocore/unomap.cxx12
-rw-r--r--sw/source/core/unocore/unoobj.cxx152
-rw-r--r--sw/source/core/unocore/unoobj2.cxx206
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx174
-rw-r--r--sw/source/core/unocore/unoport.cxx30
-rw-r--r--sw/source/core/unocore/unoportenum.cxx118
-rw-r--r--sw/source/core/unocore/unoredline.cxx30
-rw-r--r--sw/source/core/unocore/unoredlines.cxx22
-rw-r--r--sw/source/core/unocore/unorefmk.cxx214
-rw-r--r--sw/source/core/unocore/unosect.cxx234
-rw-r--r--sw/source/core/unocore/unosett.cxx414
-rw-r--r--sw/source/core/unocore/unosrch.cxx10
-rw-r--r--sw/source/core/unocore/unostyle.cxx248
-rw-r--r--sw/source/core/unocore/unotbl.cxx896
-rw-r--r--sw/source/core/unocore/unotext.cxx290
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx62
-rw-r--r--sw/source/core/view/printdata.cxx2
-rw-r--r--sw/source/core/view/vdraw.cxx2
-rw-r--r--sw/source/core/view/viewimp.cxx22
-rw-r--r--sw/source/core/view/viewsh.cxx90
-rw-r--r--sw/source/core/view/vnew.cxx30
-rw-r--r--sw/source/core/view/vprint.cxx64
-rw-r--r--sw/source/filter/ascii/ascatr.cxx54
-rw-r--r--sw/source/filter/ascii/parasc.cxx20
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx10
-rw-r--r--sw/source/filter/basflt/fltini.cxx58
-rw-r--r--sw/source/filter/basflt/fltshell.cxx116
-rw-r--r--sw/source/filter/basflt/iodetect.cxx14
-rw-r--r--sw/source/filter/basflt/shellio.cxx104
-rw-r--r--sw/source/filter/html/css1atr.cxx454
-rw-r--r--sw/source/filter/html/htmlatr.cxx552
-rw-r--r--sw/source/filter/html/htmlbas.cxx12
-rw-r--r--sw/source/filter/html/htmlcss1.cxx330
-rw-r--r--sw/source/filter/html/htmlctxt.cxx28
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx24
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx12
-rw-r--r--sw/source/filter/html/htmlfld.cxx174
-rw-r--r--sw/source/filter/html/htmlfldw.cxx172
-rw-r--r--sw/source/filter/html/htmlfly.cxx24
-rw-r--r--sw/source/filter/html/htmlfly.hxx10
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx346
-rw-r--r--sw/source/filter/html/htmlform.cxx148
-rw-r--r--sw/source/filter/html/htmlforw.cxx28
-rw-r--r--sw/source/filter/html/htmlftn.cxx144
-rw-r--r--sw/source/filter/html/htmlgrin.cxx188
-rw-r--r--sw/source/filter/html/htmlnum.cxx16
-rw-r--r--sw/source/filter/html/htmlnum.hxx6
-rw-r--r--sw/source/filter/html/htmlnumreader.cxx194
-rw-r--r--sw/source/filter/html/htmlnumwriter.cxx28
-rw-r--r--sw/source/filter/html/htmlplug.cxx114
-rw-r--r--sw/source/filter/html/htmlsect.cxx192
-rw-r--r--sw/source/filter/html/htmltab.cxx540
-rw-r--r--sw/source/filter/html/htmltabw.cxx114
-rw-r--r--sw/source/filter/html/svxcss1.cxx20
-rw-r--r--sw/source/filter/html/swcss1.hxx52
-rw-r--r--sw/source/filter/html/swhtml.cxx536
-rw-r--r--sw/source/filter/html/swhtml.hxx60
-rw-r--r--sw/source/filter/html/wrthtml.cxx186
-rw-r--r--sw/source/filter/html/wrthtml.hxx130
-rw-r--r--sw/source/filter/inc/fltini.hxx6
-rw-r--r--sw/source/filter/inc/fltshell.hxx26
-rw-r--r--sw/source/filter/inc/msfilter.hxx34
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx4
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx2
-rw-r--r--sw/source/filter/inc/wwstyles.hxx4
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx32
-rw-r--r--sw/source/filter/writer/writer.cxx34
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx4
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx30
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx54
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx16
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx120
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx412
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx86
-rw-r--r--sw/source/filter/ww8/docxexport.cxx82
-rw-r--r--sw/source/filter/ww8/docxexport.hxx26
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx10
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx136
-rw-r--r--sw/source/filter/ww8/docxsdrexport.hxx18
-rw-r--r--sw/source/filter/ww8/docxtablestyleexport.cxx126
-rw-r--r--sw/source/filter/ww8/escher.hxx46
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx346
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx72
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx176
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx44
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx6
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx24
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx6
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.cxx14
-rw-r--r--sw/source/filter/ww8/rtfstringbuffer.hxx8
-rw-r--r--sw/source/filter/ww8/sprmids.hxx4
-rw-r--r--sw/source/filter/ww8/styles.cxx4
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx134
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx112
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx158
-rw-r--r--sw/source/filter/ww8/writerwordglue.hxx8
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx454
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx488
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx220
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx538
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx490
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx362
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx30
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx958
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx56
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx32
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx258
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx66
-rw-r--r--sw/source/filter/ww8/ww8par.cxx648
-rw-r--r--sw/source/filter/ww8/ww8par.hxx212
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx384
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx300
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx32
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx368
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx432
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx356
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx102
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx4
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx42
-rw-r--r--sw/source/filter/xml/wrtxml.cxx2
-rw-r--r--sw/source/filter/xml/xmlexp.cxx6
-rw-r--r--sw/source/filter/xml/xmlexp.hxx26
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx32
-rw-r--r--sw/source/filter/xml/xmlfmt.cxx34
-rw-r--r--sw/source/filter/xml/xmlfmte.cxx36
-rw-r--r--sw/source/filter/xml/xmlimp.cxx92
-rw-r--r--sw/source/filter/xml/xmlimp.hxx2
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmliteme.cxx6
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx2
-rw-r--r--sw/source/filter/xml/xmltble.cxx260
-rw-r--r--sw/source/filter/xml/xmltbli.cxx238
-rw-r--r--sw/source/filter/xml/xmltbli.hxx18
-rw-r--r--sw/source/filter/xml/xmltexte.cxx30
-rw-r--r--sw/source/filter/xml/xmltexte.hxx4
-rw-r--r--sw/source/filter/xml/xmltexti.cxx126
-rw-r--r--sw/source/filter/xml/xmltexti.hxx4
-rw-r--r--sw/source/ui/chrdlg/break.cxx14
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx30
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx80
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx10
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx2
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx20
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/optload.cxx68
-rw-r--r--sw/source/ui/config/optpage.cxx162
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx4
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx578
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx72
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx8
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx8
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx10
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx2
-rw-r--r--sw/source/ui/dialog/macassgn.cxx4
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx96
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx48
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx376
-rw-r--r--sw/source/ui/envelp/envfmt.cxx100
-rw-r--r--sw/source/ui/envelp/envfmt.hxx10
-rw-r--r--sw/source/ui/envelp/envlop1.cxx10
-rw-r--r--sw/source/ui/envelp/envprt.cxx8
-rw-r--r--sw/source/ui/envelp/label1.cxx2
-rw-r--r--sw/source/ui/envelp/labelexp.cxx20
-rw-r--r--sw/source/ui/envelp/labfmt.cxx40
-rw-r--r--sw/source/ui/envelp/labfmt.hxx12
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx38
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.cxx8
-rw-r--r--sw/source/ui/fldui/FldRefTreeListBox.hxx4
-rw-r--r--sw/source/ui/fldui/changedb.cxx6
-rw-r--r--sw/source/ui/fldui/flddb.cxx94
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx70
-rw-r--r--sw/source/ui/fldui/flddinf.hxx6
-rw-r--r--sw/source/ui/fldui/flddok.cxx132
-rw-r--r--sw/source/ui/fldui/flddok.hxx6
-rw-r--r--sw/source/ui/fldui/fldedt.cxx112
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx120
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx6
-rw-r--r--sw/source/ui/fldui/fldpage.cxx102
-rw-r--r--sw/source/ui/fldui/fldpage.hxx24
-rw-r--r--sw/source/ui/fldui/fldref.cxx300
-rw-r--r--sw/source/ui/fldui/fldref.hxx24
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx52
-rw-r--r--sw/source/ui/fldui/fldvar.cxx244
-rw-r--r--sw/source/ui/fldui/fldvar.hxx8
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx56
-rw-r--r--sw/source/ui/fldui/javaedit.cxx28
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx30
-rw-r--r--sw/source/ui/frmdlg/column.cxx76
-rw-r--r--sw/source/ui/frmdlg/cption.cxx110
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx2
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx154
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx22
-rw-r--r--sw/source/ui/index/cnttab.cxx36
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx44
-rw-r--r--sw/source/ui/misc/docfnote.cxx98
-rw-r--r--sw/source/ui/misc/glossary.cxx6
-rw-r--r--sw/source/ui/misc/impfnote.hxx6
-rw-r--r--sw/source/ui/misc/insfnote.cxx34
-rw-r--r--sw/source/ui/misc/linenum.cxx32
-rw-r--r--sw/source/ui/misc/num.cxx210
-rw-r--r--sw/source/ui/misc/outline.cxx284
-rw-r--r--sw/source/ui/misc/pgfnote.cxx54
-rw-r--r--sw/source/ui/misc/srtdlg.cxx48
-rw-r--r--sw/source/ui/misc/titlepage.cxx48
-rw-r--r--sw/source/ui/table/convert.cxx42
-rw-r--r--sw/source/ui/table/instable.cxx54
-rw-r--r--sw/source/ui/table/mergetbl.cxx8
-rw-r--r--sw/source/ui/table/rowht.cxx4
-rw-r--r--sw/source/ui/table/splittbl.cxx12
-rw-r--r--sw/source/ui/table/tabledlg.cxx346
-rw-r--r--sw/source/ui/table/tautofmt.cxx222
-rw-r--r--sw/source/ui/vba/vbaselection.cxx14
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx12
-rw-r--r--sw/source/uibase/app/appenv.cxx50
-rw-r--r--sw/source/uibase/app/appenv.hxx2
-rw-r--r--sw/source/uibase/app/apphdl.cxx8
-rw-r--r--sw/source/uibase/app/applab.cxx100
-rw-r--r--sw/source/uibase/app/appopt.cxx16
-rw-r--r--sw/source/uibase/app/docsh.cxx38
-rw-r--r--sw/source/uibase/app/docsh2.cxx42
-rw-r--r--sw/source/uibase/app/docshini.cxx20
-rw-r--r--sw/source/uibase/app/docst.cxx128
-rw-r--r--sw/source/uibase/app/docstyle.cxx656
-rw-r--r--sw/source/uibase/app/swmodul1.cxx20
-rw-r--r--sw/source/uibase/app/swmodule.cxx4
-rw-r--r--sw/source/uibase/config/StoredChapterNumbering.cxx20
-rw-r--r--sw/source/uibase/config/cfgitems.cxx14
-rw-r--r--sw/source/uibase/config/modcfg.cxx58
-rw-r--r--sw/source/uibase/config/uinums.cxx124
-rw-r--r--sw/source/uibase/config/usrpref.cxx6
-rw-r--r--sw/source/uibase/config/viewopt.cxx8
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx82
-rw-r--r--sw/source/uibase/dbui/dbtree.cxx16
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx2
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx6
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx42
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx200
-rw-r--r--sw/source/uibase/docvw/AnnotationWin.cxx94
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx30
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx16
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx276
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.cxx64
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControl.hxx6
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.cxx72
-rw-r--r--sw/source/uibase/docvw/SidebarTxtControlAcc.hxx10
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx62
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx4
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx496
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx162
-rw-r--r--sw/source/uibase/docvw/edtwin3.cxx4
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.cxx4
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.hxx4
-rw-r--r--sw/source/uibase/docvw/romenu.cxx14
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx484
-rw-r--r--sw/source/uibase/fldui/fldwrap.cxx22
-rw-r--r--sw/source/uibase/fldui/xfldui.cxx18
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx2
-rw-r--r--sw/source/uibase/frmdlg/colmgr.cxx38
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx40
-rw-r--r--sw/source/uibase/inc/basesh.hxx8
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx2
-rw-r--r--sw/source/uibase/inc/changedb.hxx6
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx2
-rw-r--r--sw/source/uibase/inc/colex.hxx4
-rw-r--r--sw/source/uibase/inc/colmgr.hxx24
-rw-r--r--sw/source/uibase/inc/content.hxx20
-rw-r--r--sw/source/uibase/inc/conttree.hxx2
-rw-r--r--sw/source/uibase/inc/convert.hxx12
-rw-r--r--sw/source/uibase/inc/cption.hxx4
-rw-r--r--sw/source/uibase/inc/dbinsdlg.hxx54
-rw-r--r--sw/source/uibase/inc/drwtxtsh.hxx2
-rw-r--r--sw/source/uibase/inc/edtwin.hxx6
-rw-r--r--sw/source/uibase/inc/envlop.hxx8
-rw-r--r--sw/source/uibase/inc/fldedt.hxx10
-rw-r--r--sw/source/uibase/inc/fldmgr.hxx64
-rw-r--r--sw/source/uibase/inc/fldtdlg.hxx6
-rw-r--r--sw/source/uibase/inc/fldwrap.hxx18
-rw-r--r--sw/source/uibase/inc/formatclipboard.hxx2
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx4
-rw-r--r--sw/source/uibase/inc/frmmgr.hxx34
-rw-r--r--sw/source/uibase/inc/frmpage.hxx6
-rw-r--r--sw/source/uibase/inc/inpdlg.hxx10
-rw-r--r--sw/source/uibase/inc/inputwin.hxx12
-rw-r--r--sw/source/uibase/inc/insfnote.hxx2
-rw-r--r--sw/source/uibase/inc/instable.hxx12
-rw-r--r--sw/source/uibase/inc/javaedit.hxx8
-rw-r--r--sw/source/uibase/inc/macassgn.hxx2
-rw-r--r--sw/source/uibase/inc/mailmrge.hxx4
-rw-r--r--sw/source/uibase/inc/mergetbl.hxx6
-rw-r--r--sw/source/uibase/inc/numfmtlb.hxx4
-rw-r--r--sw/source/uibase/inc/optload.hxx4
-rw-r--r--sw/source/uibase/inc/optpage.hxx14
-rw-r--r--sw/source/uibase/inc/outline.hxx8
-rw-r--r--sw/source/uibase/inc/redlndlg.hxx10
-rw-r--r--sw/source/uibase/inc/regionsw.hxx36
-rw-r--r--sw/source/uibase/inc/splittbl.hxx8
-rw-r--r--sw/source/uibase/inc/srtdlg.hxx6
-rw-r--r--sw/source/uibase/inc/swdtflvr.hxx20
-rw-r--r--sw/source/uibase/inc/swtablerep.hxx6
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx6
-rw-r--r--sw/source/uibase/inc/tablemgr.hxx20
-rw-r--r--sw/source/uibase/inc/tautofmt.hxx28
-rw-r--r--sw/source/uibase/inc/tblnumfm.hxx4
-rw-r--r--sw/source/uibase/inc/textsh.hxx4
-rw-r--r--sw/source/uibase/inc/titlepage.hxx2
-rw-r--r--sw/source/uibase/inc/uiitems.hxx16
-rw-r--r--sw/source/uibase/inc/uinums.hxx26
-rw-r--r--sw/source/uibase/inc/uitool.hxx4
-rw-r--r--sw/source/uibase/inc/usrpref.hxx24
-rw-r--r--sw/source/uibase/inc/view.hxx30
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx52
-rw-r--r--sw/source/uibase/index/toxmgr.cxx6
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx68
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx24
-rw-r--r--sw/source/uibase/lingu/sdrhhcwrap.cxx2
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx38
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx8
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx50
-rw-r--r--sw/source/uibase/shells/annotsh.cxx12
-rw-r--r--sw/source/uibase/shells/basesh.cxx238
-rw-r--r--sw/source/uibase/shells/drawsh.cxx20
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx24
-rw-r--r--sw/source/uibase/shells/drwtxtex.cxx12
-rw-r--r--sw/source/uibase/shells/frmsh.cxx122
-rw-r--r--sw/source/uibase/shells/grfsh.cxx24
-rw-r--r--sw/source/uibase/shells/langhelper.cxx50
-rw-r--r--sw/source/uibase/shells/listsh.cxx2
-rw-r--r--sw/source/uibase/shells/tabsh.cxx140
-rw-r--r--sw/source/uibase/shells/textdrw.cxx4
-rw-r--r--sw/source/uibase/shells/textfld.cxx138
-rw-r--r--sw/source/uibase/shells/textidx.cxx6
-rw-r--r--sw/source/uibase/shells/textsh.cxx58
-rw-r--r--sw/source/uibase/shells/textsh1.cxx134
-rw-r--r--sw/source/uibase/shells/textsh2.cxx6
-rw-r--r--sw/source/uibase/shells/txtattr.cxx64
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx22
-rw-r--r--sw/source/uibase/shells/txtnum.cxx18
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.cxx2
-rw-r--r--sw/source/uibase/sidebar/ThemePanel.cxx18
-rw-r--r--sw/source/uibase/table/chartins.cxx16
-rw-r--r--sw/source/uibase/table/swtablerep.cxx4
-rw-r--r--sw/source/uibase/table/tablemgr.cxx36
-rw-r--r--sw/source/uibase/table/tablepg.hxx8
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx94
-rw-r--r--sw/source/uibase/uiview/pview.cxx2
-rw-r--r--sw/source/uibase/uiview/view.cxx14
-rw-r--r--sw/source/uibase/uiview/view0.cxx6
-rw-r--r--sw/source/uibase/uiview/view1.cxx6
-rw-r--r--sw/source/uibase/uiview/view2.cxx54
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx30
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx6
-rw-r--r--sw/source/uibase/uiview/viewling.cxx18
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx12
-rw-r--r--sw/source/uibase/uiview/viewport.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx12
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx18
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx224
-rw-r--r--sw/source/uibase/uno/SwXDocumentSettings.cxx8
-rw-r--r--sw/source/uibase/uno/unoatxt.cxx22
-rw-r--r--sw/source/uibase/uno/unomod.cxx4
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx152
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx38
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx68
-rw-r--r--sw/source/uibase/utlui/content.cxx136
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx8
-rw-r--r--sw/source/uibase/utlui/initui.cxx28
-rw-r--r--sw/source/uibase/utlui/navipi.cxx38
-rw-r--r--sw/source/uibase/utlui/numfmtlb.cxx48
-rw-r--r--sw/source/uibase/utlui/uiitems.cxx58
-rw-r--r--sw/source/uibase/utlui/uitool.cxx124
-rw-r--r--sw/source/uibase/web/wview.cxx6
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx26
-rw-r--r--sw/source/uibase/wrtsh/move.cxx16
-rw-r--r--sw/source/uibase/wrtsh/select.cxx52
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx214
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx118
-rw-r--r--sw/source/uibase/wrtsh/wrtsh3.cxx4
-rw-r--r--sw/uiconfig/swriter/ui/autoformattable.ui2
-rw-r--r--sw/uiconfig/swriter/ui/flddbpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/flddocinfopage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/flddocumentpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/fldfuncpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/fldrefpage.ui4
-rw-r--r--sw/uiconfig/swriter/ui/fldvarpage.ui2
1018 files changed, 49652 insertions, 49652 deletions
diff --git a/sw/README b/sw/README
index 0fcfd163050f..027e4eb6ffed 100644
--- a/sw/README
+++ b/sw/README
@@ -81,19 +81,19 @@ actions; these are created by the StartUndo/EndUndo wrapper methods.
=== Text Attributes ===
The sub-structure of paragraphs is stored in the SwpHintsArray member
-SwTxtNode::m_pSwpHints. There is a base class SwTxtAttr with numerous
-subclasses; the SwTxtAttr has a start and end index and a SfxPoolItem
+SwTextNode::m_pSwpHints. There is a base class SwTextAttr with numerous
+subclasses; the SwTextAttr has a start and end index and a SfxPoolItem
to store the actual formatting attribute.
-There are several sub-categories of SwTxtAttr:
+There are several sub-categories of SwTextAttr:
-- formatting attributes: Character Styles (SwTxtCharFmt, RES_TXTATR_CHARFMT)
+- formatting attributes: Character Styles (SwTextCharFormat, RES_TXTATR_CHARFMT)
and Automatic Styles (no special class, RES_TXTATR_AUTOFMT):
these are handled by SwpHintsArray::BuildPortions and MergePortions,
which create non-overlapping portions of formatting attributes.
-- nesting attributes: Hyperlinks (SwTxtINetFmt, RES_TXTATR_INETFMT),
- Ruby (SwTxtRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTxtMeta,
+- nesting attributes: Hyperlinks (SwTextINetFormat, RES_TXTATR_INETFMT),
+ Ruby (SwTextRuby, RES_TXTATR_CJK_RUBY) and Meta/MetaField (SwTextMeta,
RES_TXTATR_META/RES_TXTATR_METAFIELD):
these maintain a properly nested tree structure.
The Meta/Metafield are "special" because they have both start/end
@@ -116,26 +116,26 @@ There are multiple model classes involved for fields:
For most types of fields there is one shared instance of this per type,
which is created in DocumentFieldsManager::_InitFieldTypes()
but for some there are more than one, and they are dynamically created, see
- DocumentFieldsManager::InsertFldType(). An example for the latter are
- variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFldType per
+ DocumentFieldsManager::InsertFieldType(). An example for the latter are
+ variable fields (RES_GETEXPFLD/RES_SETEXPFLD), with one SwFieldType per
variable.
- SwXFieldMaster is the UNO wrapper of a field type.
It is a SwClient registered at the SwFieldType.
Its life-cycle is determined by UNO clients outside of sw; it will get
disposed when the SwFieldType dies.
-- SwFmtFld is the SfxPoolItem of a field.
- The SwFmtFld is a SwClient registered at its SwFldType.
- The SwFmtFld owns the SwField of the field.
+- SwFormatField is the SfxPoolItem of a field.
+ The SwFormatField is a SwClient registered at its SwFieldType.
+ The SwFormatField owns the SwField of the field.
- SwField contains the core logic of a field.
- The SwField is owned by the SwFmtFld of the field.
+ The SwField is owned by the SwFormatField of the field.
There are many subclasses of SwField, one for each different type of field.
Note that there are not many places that can Expand the field to its
correct value, since for example page number fields require a View
with an up to date layout; therefore the correct expansion is cached.
-- SwTxtFld is the text attribute of a field.
- It owns the SwFmtFld of the field (like all text attributes).
+- SwTextField is the text attribute of a field.
+ It owns the SwFormatField of the field (like all text attributes).
- SwXTextField is the UNO wrapper object of a field.
- It is a SwClient registered at the SwFmtFld.
+ It is a SwClient registered at the SwFormatField.
Its life-cycle is determined by UNO clients outside of sw; it will get
- disposed when the SwFmtFld dies.
+ disposed when the SwFormatField dies.
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index e18e91e99d94..f72468059736 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -35,7 +35,7 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
SwPostItMgr& aMgr,
SwPostItBits aBits,
SwSidebarItem& rSidebarItem,
- SwFmtFld* aField );
+ SwFormatField* aField );
virtual ~SwAnnotationWin();
virtual void dispose() SAL_OVERRIDE;
@@ -62,8 +62,8 @@ class SwAnnotationWin : public sw::sidebarwindows::SwSidebarWin
virtual SvxLanguageItem GetLanguage() SAL_OVERRIDE;
sal_uInt32 CountFollowing();
- SwFmtFld* mpFmtFld;
- SwPostItField* mpFld;
+ SwFormatField* mpFormatField;
+ SwPostItField* mpField;
PopupMenu* mpButtonPopup;
};
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index d2363177dadb..74da45127883 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -38,10 +38,10 @@ class SwFrm;
class SwLinePortion;
class SwPageFrm;
class SwPrintData;
-class SwTxtPainter;
+class SwTextPainter;
class SwEditShell;
class StringRangeEnumerator;
-class SwTxtNode;
+class SwTextNode;
class SwNumRule;
class SwTable;
class SwNumberTreeNode;
@@ -59,19 +59,19 @@ class SvxLanguageItem;
* Part
* Art
* SwSection Sect
- * SwFtnContFrm and SwFlyFrm Div
- * SwFmt "Quotations" BlockQuote
- * SwFmt "Caption" Caption
+ * SwFootnoteContFrm and SwFlyFrm Div
+ * SwFormat "Quotations" BlockQuote
+ * SwFormat "Caption" Caption
* SwSection (TOC) TOC
- * SwTxtNode in TOC TOCI
+ * SwTextNode in TOC TOCI
* SwSection (Index) Index
*
* Block-Level Structure Elements:
*
- * SwTxtNode P
- * SwFmt "Heading" H
- * SwTxtNode with Outline H1 - H6
- * SwTxtNode with NumRule L, LI, LBody
+ * SwTextNode P
+ * SwFormat "Heading" H
+ * SwTextNode with Outline H1 - H6
+ * SwTextNode with NumRule L, LI, LBody
* SwTable Table
* SwRowFrm TR
* SwCellFrm in Headline row or
@@ -80,18 +80,18 @@ class SvxLanguageItem;
*
* Inline-Level Structure Elements:
*
- * SwTxtPortion Span
- * SwFmt "Quotation" Quote
- * SwFtnFrm Note
+ * SwTextPortion Span
+ * SwFormat "Quotation" Quote
+ * SwFootnoteFrm Note
* Form
* Reference
- * SwFldPortion (AuthorityField) BibEntry
- * SwFmt "Source Text" Code
- * SwFtnPortion, SwFldPortion (RefField) Link
+ * SwFieldPortion (AuthorityField) BibEntry
+ * SwFormat "Source Text" Code
+ * SwFootnotePortion, SwFieldPortion (RefField) Link
*
* Illustration elements:
*
- * SwFlyFrm with SwNoTxtFrm Figure
+ * SwFlyFrm with SwNoTextFrm Figure
* SwFlyFrm with Math OLE Object Formula
*
*/
@@ -111,9 +111,9 @@ struct Frm_Info
struct Por_Info
{
const SwLinePortion& mrPor;
- const SwTxtPainter& mrTxtPainter;
- Por_Info( const SwLinePortion& rPor, const SwTxtPainter& rTxtPainer )
- : mrPor( rPor ), mrTxtPainter( rTxtPainer ) {};
+ const SwTextPainter& mrTextPainter;
+ Por_Info( const SwLinePortion& rPor, const SwTextPainter& rTextPainer )
+ : mrPor( rPor ), mrTextPainter( rTextPainer ) {};
};
struct lt_TableColumn
@@ -224,7 +224,7 @@ class SwEnhancedPDFExportHelper
std::vector< sal_Int32 > CalcOutputPageNums( const SwRect& rRect ) const;
void MakeHeaderFooterLinks( vcl::PDFExtOutDevData& rPDFExtOutDevData,
- const SwTxtNode& rTNd, const SwRect& rLinkRect,
+ const SwTextNode& rTNd, const SwRect& rLinkRect,
sal_Int32 nDestId, const OUString& rURL, bool bIntern ) const;
public:
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index ac9d4b0f13a5..17eb50cb0142 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
#define INCLUDED_SW_INC_HANDLEANCHORNODECHG_HXX
-class SwFlyFrmFmt;
-class SwFmtAnchor;
+class SwFlyFrameFormat;
+class SwFormatAnchor;
class SwFlyFrm;
// helper class to track change of anchor node of at-paragraph respectively
@@ -37,21 +37,21 @@ public:
@author OD
- @param _rFlyFrmFmt
+ @param _rFlyFrameFormat
reference to the fly frame format instance, which is handled.
- @param _rNewAnchorFmt
+ @param _rNewAnchorFormat
new anchor attribute, which will be applied at the given fly frame format
@param _pKeepThisFlyFrm
optional parameter - pointer to a fly frame of the given fly frame format,
which isn't deleted, if re-creation of fly frames is necessary.
*/
- SwHandleAnchorNodeChg( SwFlyFrmFmt& _rFlyFrmFmt,
- const SwFmtAnchor& _rNewAnchorFmt,
+ SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
+ const SwFormatAnchor& _rNewAnchorFormat,
SwFlyFrm* _pKeepThisFlyFrm = 0L );
- /** calls <SwFlyFrmFmt::MakeFrms>, if re-creation of fly frames is necessary.
+ /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary.
@author OD
*/
@@ -59,7 +59,7 @@ public:
private:
// fly frame format, which is tracked for a anchor node change.
- SwFlyFrmFmt& mrFlyFrmFmt;
+ SwFlyFrameFormat& mrFlyFrameFormat;
// internal flag, which indicates that the certain anchor node change occurs
// and that re-creation of fly frames is necessary.
bool mbAnchorNodeChanged;
diff --git a/sw/inc/IDocumentContentOperations.hxx b/sw/inc/IDocumentContentOperations.hxx
index 9a866e600d4a..91ca8ce45d0d 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
class SfxPoolItem;
class GraphicObject;
class SdrObject;
-class SwFrmFmt;
-class SwDrawFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwDrawFrameFormat;
+class SwFlyFrameFormat;
class SwNodeIndex;
-class SwFmtFld;
+class SwFormatField;
namespace utl { class TransliterationWrapper; }
namespace svt { class EmbeddedObjectRef; }
@@ -111,7 +111,7 @@ public:
*/
virtual void DeleteSection(SwNode* pNode) = 0;
- /** Delete a range SwFlyFrmFmt.
+ /** Delete a range SwFlyFrameFormat.
*/
virtual bool DeleteRange(SwPaM&) = 0;
@@ -151,11 +151,11 @@ public:
/** Insert graphic or formula. The XXXX are copied.
*/
- virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
- const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+ virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const OUString& rGrfName, const OUString& rFltName, const Graphic* pGraphic,
+ const SfxItemSet* pFlyAttrSet, const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
- virtual SwFlyFrmFmt* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+ virtual SwFlyFrameFormat* Insert(const SwPaM& rRg, const GraphicObject& rGrfObj, const SfxItemSet* pFlyAttrSet,
+ const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
/** Transpose graphic (with undo)
*/
@@ -164,23 +164,23 @@ public:
/** Insert a DrawObject. The object must be already registered
in DrawModel.
*/
- virtual SwDrawFrmFmt* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
+ virtual SwDrawFrameFormat* InsertDrawObj( const SwPaM &rRg, SdrObject& rDrawObj, const SfxItemSet& rFlyAttrSet ) = 0;
/** Insert OLE-objects.
*/
- virtual SwFlyFrmFmt* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+ virtual SwFlyFrameFormat* Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj, const SfxItemSet* pFlyAttrSet,
+ const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
- virtual SwFlyFrmFmt* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
- const SfxItemSet* pGrfAttrSet, SwFrmFmt*) = 0;
+ virtual SwFlyFrameFormat* InsertOLE(const SwPaM &rRg, const OUString& rObjName, sal_Int64 nAspect, const SfxItemSet* pFlyAttrSet,
+ const SfxItemSet* pGrfAttrSet, SwFrameFormat*) = 0;
- /** Split a node at rPos (implemented only for TxtNode).
+ /** Split a node at rPos (implemented only for TextNode).
*/
virtual bool SplitNode(const SwPosition &rPos, bool bChkTableStart) = 0;
- virtual bool AppendTxtNode(SwPosition& rPos) = 0;
+ virtual bool AppendTextNode(SwPosition& rPos) = 0;
- /** Replace selected range in a TxtNode with string.
+ /** Replace selected range in a TextNode with string.
Intended for search & replace.
bRegExpRplc - replace tabs (\\t) and insert the found string
( not \& ). E.g.: Find: "zzz", Replace: "xx\t\\t..&..\&"
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 36c012924185..3d8f3e5db324 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -23,17 +23,17 @@
#include <sal/types.h>
#include <tools/solar.h>
-class SwFldTypes;
+class SwFieldTypes;
class SwFieldType;
class SfxPoolItem;
struct SwPosition;
-class SwDocUpdtFld;
+class SwDocUpdateField;
class SwCalc;
-class SwTxtFld;
+class SwTextField;
class SwField;
class SwMsgPoolItem;
class DateTime;
-class _SetGetExpFld;
+class _SetGetExpField;
struct SwHash;
class SwNode;
@@ -46,19 +46,19 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
class IDocumentFieldsAccess
{
public:
- virtual const SwFldTypes *GetFldTypes() const = 0;
+ virtual const SwFieldTypes *GetFieldTypes() const = 0;
- virtual SwFieldType *InsertFldType(const SwFieldType &) = 0;
+ virtual SwFieldType *InsertFieldType(const SwFieldType &) = 0;
- virtual SwFieldType *GetSysFldType( const sal_uInt16 eWhich ) const = 0;
+ virtual SwFieldType *GetSysFieldType( const sal_uInt16 eWhich ) const = 0;
- virtual SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
+ virtual SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName, bool bDbFieldMatching) const = 0;
- virtual void RemoveFldType(size_t nFld) = 0;
+ virtual void RemoveFieldType(size_t nField) = 0;
- virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
+ virtual void UpdateFields( SfxPoolItem* pNewHt, bool bCloseDB) = 0;
- virtual void InsDeletedFldType(SwFieldType &) = 0;
+ virtual void InsDeletedFieldType(SwFieldType &) = 0;
/**
Puts a value into a field at a certain position.
@@ -78,33 +78,33 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
/** Updates a field.
- @param rDstFmtFld field to update
- @param rSrcFld field containing the new values
- @param pMsgHnt
- @param bUpdateTblFlds TRUE: update table fields, too.
+ @param rDstFormatField field to update
+ @param rSrcField field containing the new values
+ @param pMsgHint
+ @param bUpdateTableFields TRUE: update table fields, too.
@retval true update was successful
@retval false else
*/
- virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
+ virtual bool UpdateField(SwTextField * rDstFormatField, SwField & rSrcField, SwMsgPoolItem * pMsgHint, bool bUpdateTableFields) = 0;
- virtual void UpdateRefFlds(SfxPoolItem* pHt) = 0;
+ virtual void UpdateRefFields(SfxPoolItem* pHt) = 0;
- virtual void UpdateTblFlds(SfxPoolItem* pHt) = 0;
+ virtual void UpdateTableFields(SfxPoolItem* pHt) = 0;
- virtual void UpdateExpFlds(SwTxtFld* pFld, bool bUpdateRefFlds) = 0;
+ virtual void UpdateExpFields(SwTextField* pField, bool bUpdateRefFields) = 0;
- virtual void UpdateUsrFlds() = 0;
+ virtual void UpdateUsrFields() = 0;
- virtual void UpdatePageFlds(SfxPoolItem*) = 0;
+ virtual void UpdatePageFields(SfxPoolItem*) = 0;
- virtual void LockExpFlds() = 0;
+ virtual void LockExpFields() = 0;
- virtual void UnlockExpFlds() = 0;
+ virtual void UnlockExpFields() = 0;
- virtual bool IsExpFldsLocked() const = 0;
+ virtual bool IsExpFieldsLocked() const = 0;
- virtual SwDocUpdtFld& GetUpdtFlds() const = 0;
+ virtual SwDocUpdateField& GetUpdateFields() const = 0;
/* @@@MAINTAINABILITY-HORROR@@@
SwNode (see parameter pChk) is (?) part of the private
@@ -118,17 +118,17 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
// (Node [ + ::com::sun::star::ucb::Content]).
// A generated list of all fields may be passed along too
// (if the addreess != 0 and the pointer == 0 a new list will be returned).
- virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
+ virtual void FieldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
- virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0;
+ virtual void FieldsToCalc(SwCalc& rCalc, const _SetGetExpField& rToThisField) = 0;
- virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld) = 0;
+ virtual void FieldsToExpand(SwHash**& ppTable, sal_uInt16& rTableSize, const _SetGetExpField& rToThisField) = 0;
- virtual bool IsNewFldLst() const = 0;
+ virtual bool IsNewFieldLst() const = 0;
- virtual void SetNewFldLst( bool bFlag) = 0;
+ virtual void SetNewFieldLst( bool bFlag) = 0;
- virtual void InsDelFldInFldLst(bool bIns, const SwTxtFld& rFld) = 0;
+ virtual void InsDelFieldInFieldLst(bool bIns, const SwTextField& rField) = 0;
protected:
virtual ~IDocumentFieldsAccess() {};
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index 37b51ef7c065..ab02daa108df 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -24,10 +24,10 @@
class SwViewShell;
class SwRootFrm;
-class SwFrmFmt;
+class SwFrameFormat;
class SfxItemSet;
class SwLayouter;
-class SwFmtAnchor;
+class SwFormatAnchor;
/** Provides access to the layout of a document.
*/
@@ -49,7 +49,7 @@ public:
/**
*/
- virtual SwFrmFmt* MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
+ virtual SwFrameFormat* MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet ) = 0;
/**
*/
@@ -59,12 +59,12 @@ public:
/**
*/
- virtual void DelLayoutFmt( SwFrmFmt *pFmt ) = 0;
+ virtual void DelLayoutFormat( SwFrameFormat *pFormat ) = 0;
/**
*/
- virtual SwFrmFmt* CopyLayoutFmt( const SwFrmFmt& rSrc, const SwFmtAnchor& rNewAnchor,
- bool bSetTxtFlyAtt, bool bMakeFrms ) = 0;
+ virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor,
+ bool bSetTextFlyAtt, bool bMakeFrms ) = 0;
protected:
diff --git a/sw/inc/IDocumentMarkAccess.hxx b/sw/inc/IDocumentMarkAccess.hxx
index 3e73066d7ec5..7de0f2ffd5ae 100644
--- a/sw/inc/IDocumentMarkAccess.hxx
+++ b/sw/inc/IDocumentMarkAccess.hxx
@@ -26,7 +26,7 @@
class SwPaM;
struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
namespace sw { namespace mark {
class SaveBookmark; // FIXME: Ugly: SaveBookmark is a core-internal class, and should not be used in the interface
@@ -93,7 +93,7 @@ class IDocumentMarkAccess
/** Returns a mark in the document for a paragraph.
If there is none, a mark will be created.
- @param rTxtNode
+ @param rTextNode
[in] the paragraph being marked (a selection over the paragraph is marked)
@param eMark
@@ -102,7 +102,7 @@ class IDocumentMarkAccess
@returns
a pointer to the new mark (name might have changed).
*/
- virtual ::sw::mark::IMark* getMarkForTxtNode(const SwTxtNode& rTxtNode,
+ virtual ::sw::mark::IMark* getMarkForTextNode(const SwTextNode& rTextNode,
MarkType eMark) =0;
/** Moves an existing mark to a new selection and performs needed updates.
diff --git a/sw/inc/IDocumentOutlineNodes.hxx b/sw/inc/IDocumentOutlineNodes.hxx
index f5ec75fca5e6..5803f7077482 100644
--- a/sw/inc/IDocumentOutlineNodes.hxx
+++ b/sw/inc/IDocumentOutlineNodes.hxx
@@ -23,14 +23,14 @@
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <vector>
-class SwTxtNode;
+class SwTextNode;
/** Provides outline nodes of a document.
*/
class IDocumentOutlineNodes
{
public:
- typedef ::std::vector< const SwTxtNode* > tSortedOutlineNodeList;
+ typedef ::std::vector< const SwTextNode* > tSortedOutlineNodeList;
virtual sal_Int32 getOutlineNodesCount() const = 0;
@@ -38,8 +38,8 @@ public:
virtual OUString getOutlineText( const sal_Int32 nIdx,
const bool bWithNumber = true,
const bool bWithSpacesForLevel = false,
- const bool bWithFtn = true ) const = 0;
- virtual SwTxtNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
+ const bool bWithFootnote = true ) const = 0;
+ virtual SwTextNode* getOutlineNode( const sal_Int32 nIdx ) const = 0;
virtual void getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const = 0;
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 4ff9600139bd..eb37a3ac63d6 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -30,8 +30,8 @@
class SwRangeRedline;
class SwTableRowRedline;
class SwTableCellRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
class SwPaM;
struct SwPosition;
class SwStartNode;
@@ -126,11 +126,11 @@ public:
virtual bool IsIgnoreRedline() const = 0;
- virtual const SwRedlineTbl& GetRedlineTbl() const = 0;
- virtual SwRedlineTbl& GetRedlineTbl() = 0;
- virtual const SwExtraRedlineTbl& GetExtraRedlineTbl() const = 0;
- virtual SwExtraRedlineTbl& GetExtraRedlineTbl() = 0;
- virtual bool HasExtraRedlineTbl() const = 0;
+ virtual const SwRedlineTable& GetRedlineTable() const = 0;
+ virtual SwRedlineTable& GetRedlineTable() = 0;
+ virtual const SwExtraRedlineTable& GetExtraRedlineTable() const = 0;
+ virtual SwExtraRedlineTable& GetExtraRedlineTable() = 0;
+ virtual bool HasExtraRedlineTable() const = 0;
virtual bool IsInRedlines(const SwNode& rNode) const = 0;
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index ab907b2d30fa..73a5d547a993 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -186,14 +186,14 @@ enum class DocumentSettingId
@returns
the current field update mode.
*/
- virtual SwFldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
+ virtual SwFieldUpdateFlags getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const = 0;
/** Set the current field update mode.
@param nMode
[in] the new field update mode.
*/
- virtual void setFieldUpdateFlags( /*[in]*/ SwFldUpdateFlags nMode ) = 0;
+ virtual void setFieldUpdateFlags( /*[in]*/ SwFieldUpdateFlags nMode ) = 0;
/** Get the character compression type for Asian characters.
diff --git a/sw/inc/IDocumentState.hxx b/sw/inc/IDocumentState.hxx
index bc4034cc46e0..a6fc748d16b9 100644
--- a/sw/inc/IDocumentState.hxx
+++ b/sw/inc/IDocumentState.hxx
@@ -44,7 +44,7 @@ public:
*/
virtual bool IsLoaded() const = 0;
- virtual bool IsUpdateExpFld() const = 0;
+ virtual bool IsUpdateExpField() const = 0;
virtual bool IsNewDoc() const = 0;
@@ -54,7 +54,7 @@ public:
virtual void SetNewDoc(bool b) = 0;
- virtual void SetUpdateExpFldStat(bool b) = 0;
+ virtual void SetUpdateExpFieldStat(bool b) = 0;
virtual void SetLoaded(bool b = true) = 0;
diff --git a/sw/inc/IDocumentStylePoolAccess.hxx b/sw/inc/IDocumentStylePoolAccess.hxx
index 81ec03587e27..c56104b32164 100644
--- a/sw/inc/IDocumentStylePoolAccess.hxx
+++ b/sw/inc/IDocumentStylePoolAccess.hxx
@@ -22,10 +22,10 @@
#include <sal/types.h>
-class SwTxtFmtColl;
-class SwCharFmt;
-class SwFmt;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwCharFormat;
+class SwFormat;
+class SwFrameFormat;
class SwNumRule;
class SwPageDesc;
@@ -40,17 +40,17 @@ public:
If string pointer is defined request only description
of attributes, do not create style sheet!
*/
- virtual SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
+ virtual SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage = true ) = 0;
/** Return required automatic format base class.
*/
- virtual SwFmt* GetFmtFromPool( sal_uInt16 nId ) = 0;
+ virtual SwFormat* GetFormatFromPool( sal_uInt16 nId ) = 0;
/** Return required automatic format.
*/
- virtual SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId ) = 0;
+ virtual SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId ) = 0;
- virtual SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId ) = 0;
+ virtual SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId ) = 0;
/** Return required automatic page style.
*/
@@ -60,8 +60,8 @@ public:
/** Check whether this "auto-collection" is used in document.
*/
- virtual bool IsPoolTxtCollUsed( sal_uInt16 nId ) const = 0;
- virtual bool IsPoolFmtUsed( sal_uInt16 nId ) const = 0;
+ virtual bool IsPoolTextCollUsed( sal_uInt16 nId ) const = 0;
+ virtual bool IsPoolFormatUsed( sal_uInt16 nId ) const = 0;
virtual bool IsPoolPageDescUsed( sal_uInt16 nId ) const = 0;
protected:
diff --git a/sw/inc/IGrammarContact.hxx b/sw/inc/IGrammarContact.hxx
index 62c053f90fcb..58dc2ebb1ef5 100644
--- a/sw/inc/IGrammarContact.hxx
+++ b/sw/inc/IGrammarContact.hxx
@@ -21,11 +21,11 @@
#define INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
struct SwPosition;
-class SwTxtNode;
+class SwTextNode;
class SwGrammarMarkUp;
class SwDoc;
-/** Organizer of the contact between SwTxtNodes and grammar checker
+/** Organizer of the contact between SwTextNodes and grammar checker
*/
class IGrammarContact
{
@@ -42,9 +42,9 @@ public:
/** getGrammarCheck checks if the given text node is blocked by the current cursor
if not, the normal markup list is returned
if blocked, it will return a markup list "proxy"
- @returns a markup list (grammar) for the given SwTxtNode
+ @returns a markup list (grammar) for the given SwTextNode
*/
- virtual SwGrammarMarkUp* getGrammarCheck( SwTxtNode& rTxtNode, bool bCreate ) = 0;
+ virtual SwGrammarMarkUp* getGrammarCheck( SwTextNode& rTextNode, bool bCreate ) = 0;
/** finishGrammarCheck() has to be called if a grammar checking has been completed
for a text node. If this text node has not been hided by the current proxy list
@@ -52,7 +52,7 @@ public:
repaint will be triggered by a timer
@returns void
*/
- virtual void finishGrammarCheck( SwTxtNode& rTxtNode ) = 0;
+ virtual void finishGrammarCheck( SwTextNode& rTextNode ) = 0;
public:
virtual ~IGrammarContact() {}
@@ -68,12 +68,12 @@ IGrammarContact* createGrammarContact();
/** getGrammarContact() delivers the grammar contact of the document (for a given textnode)
@returns grammar contact
*/
-IGrammarContact* getGrammarContact( const SwTxtNode& );
+IGrammarContact* getGrammarContact( const SwTextNode& );
/** finishGrammarCheck() calls the same function of the grammar contact of the document (for a given textnode)
@returns void
*/
-void finishGrammarCheck( SwTxtNode& );
+void finishGrammarCheck( SwTextNode& );
#endif // INCLUDED_SW_INC_IGRAMMARCONTACT_HXX
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 859e07434a00..8d1ddd0d65f8 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -40,7 +40,7 @@ class SwWrtShell;
class SwDoc;
class SwView;
class SwPostItField;
-class SwFmtFld;
+class SwFormatField;
class SwField;
class SfxBroadcaster;
class SfxHint;
@@ -89,10 +89,10 @@ struct SwPostItPageItem
struct FieldShadowState
{
- const SwPostItField* mpShadowFld;
+ const SwPostItField* mpShadowField;
bool bCursor;
bool bMouse;
- FieldShadowState(): mpShadowFld(0),bCursor(false),bMouse(false)
+ FieldShadowState(): mpShadowField(0),bCursor(false),bMouse(false)
{
}
};
@@ -142,7 +142,7 @@ class SwPostItMgr: public SfxListener
SwView* mpView;
SwWrtShell* mpWrtShell;
VclPtr<SwEditWin> mpEditWin;
- std::list< SwSidebarItem*> mvPostItFlds;
+ std::list< SwSidebarItem*> mvPostItFields;
std::vector<SwPostItPageItem*> mPages;
ImplSVEvent * mnEventId;
bool mbWaitingForCalcRects;
@@ -194,8 +194,8 @@ class SwPostItMgr: public SfxListener
virtual ~SwPostItMgr();
typedef std::list< SwSidebarItem* >::const_iterator const_iterator;
- const_iterator begin() const { return mvPostItFlds.begin(); }
- const_iterator end() const { return mvPostItFlds.end(); }
+ const_iterator begin() const { return mvPostItFields.begin(); }
+ const_iterator end() const { return mvPostItFields.end(); }
void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE;
@@ -236,7 +236,7 @@ class SwPostItMgr: public SfxListener
bool IsHit(const Point &aPointPixel);
Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const;
- sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const;
+ sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pField) const;
sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection,
sw::sidebarwindows::SwSidebarWin* aPostIt);
@@ -255,7 +255,7 @@ class SwPostItMgr: public SfxListener
sal_Int32 GetMinimumSizeWithMeta() const;
sal_Int32 GetSidebarScrollerHeight() const;
- void SetShadowState(const SwPostItField* pFld,bool bCursor = true);
+ void SetShadowState(const SwPostItField* pField,bool bCursor = true);
void SetSpellChecking();
@@ -269,15 +269,15 @@ class SwPostItMgr: public SfxListener
void StartSpelling();
sal_uInt16 Replace(SvxSearchItem* pItem);
- sal_uInt16 SearchReplace(const SwFmtFld &pFld, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
+ sal_uInt16 SearchReplace(const SwFormatField &pField, const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
sal_uInt16 FinishSearchReplace(const ::com::sun::star::util::SearchOptions& rSearchOptions,bool bSrchForward);
// get the PostIt window by index
- sal_Int32 GetPostItCount() const {return mvPostItFlds.size();}
+ sal_Int32 GetPostItCount() const {return mvPostItFields.size();}
void AssureStdModeAtShell();
void ConnectSidebarWinToFrm( const SwFrm& rFrm,
- const SwFmtFld& rFmtFld,
+ const SwFormatField& rFormatField,
sw::sidebarwindows::SwSidebarWin& rSidebarWin );
void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
sw::sidebarwindows::SwSidebarWin& rSidebarWin );
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 92ec2d49c09a..9514ac0eca90 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -49,7 +49,7 @@ namespace sw { namespace overlay {
namespace sw { namespace sidebarwindows {
-class SidebarTxtControl;
+class SidebarTextControl;
class AnchorOverlayObject;
class ShadowOverlayObject;
@@ -211,7 +211,7 @@ class SwSidebarWin : public vcl::Window
OutlinerView* mpOutlinerView;
Outliner* mpOutliner;
- VclPtr<sw::sidebarwindows::SidebarTxtControl> mpSidebarTxtControl;
+ VclPtr<sw::sidebarwindows::SidebarTextControl> mpSidebarTextControl;
VclPtr<ScrollBar> mpVScrollbar;
VclPtr<Edit> mpMetadataAuthor;
VclPtr<Edit> mpMetadataDate;
diff --git a/sw/inc/SwNodeNum.hxx b/sw/inc/SwNodeNum.hxx
index 81e96800613d..64cf8cea492e 100644
--- a/sw/inc/SwNodeNum.hxx
+++ b/sw/inc/SwNodeNum.hxx
@@ -22,22 +22,22 @@
#include <SwNumberTree.hxx>
-class SwTxtNode;
+class SwTextNode;
struct SwPosition;
class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
class SW_DLLPUBLIC SwNodeNum : public SwNumberTreeNode
{
public:
- explicit SwNodeNum( SwTxtNode* pTxtNode );
+ explicit SwNodeNum( SwTextNode* pTextNode );
explicit SwNodeNum( SwNumRule* pNumRule );
virtual ~SwNodeNum();
SwNumRule* GetNumRule() const { return mpNumRule;}
void ChangeNumRule( SwNumRule& rNumRule );
- SwTxtNode* GetTxtNode() const { return mpTxtNode;}
+ SwTextNode* GetTextNode() const { return mpTextNode;}
virtual bool IsNotificationEnabled() const SAL_OVERRIDE;
@@ -68,7 +68,7 @@ public:
@author OD
*/
- const SwNodeNum* GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const;
+ const SwNodeNum* GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const;
protected:
virtual SwNumberTreeNode * Create() const SAL_OVERRIDE;
@@ -82,7 +82,7 @@ protected:
// method called at a child after this child has been removed from the list tree
virtual void PostRemove() SAL_OVERRIDE;
private:
- SwTxtNode * mpTxtNode;
+ SwTextNode * mpTextNode;
SwNumRule * mpNumRule;
static void _UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum );
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 3a27cbc28479..0f55905dbba2 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -49,9 +49,9 @@
*
* 1. Paragraph contains the Text, Lists, Extra, Register, Doc and HTML
* name arrays.
- * 2. Character contains the ChrFmt and HTMLChrFmt name arrays.
+ * 2. Character contains the ChrFormat and HTMLChrFormat name arrays.
* 3. Page contains the PageDesc name array.
- * 4. Frame contains the FrmFmt name array.
+ * 4. Frame contains the FrameFormat name array.
* 5. Numbering Rule contains the NumRule name array.
*/
@@ -88,9 +88,9 @@ protected:
*pRegisterUINameArray,
*pDocUINameArray,
*pHTMLUINameArray,
- *pFrmFmtUINameArray,
- *pChrFmtUINameArray,
- *pHTMLChrFmtUINameArray,
+ *pFrameFormatUINameArray,
+ *pChrFormatUINameArray,
+ *pHTMLChrFormatUINameArray,
*pPageDescUINameArray,
*pNumRuleUINameArray,
// Programmatic Name tables
@@ -100,9 +100,9 @@ protected:
*pRegisterProgNameArray,
*pDocProgNameArray,
*pHTMLProgNameArray,
- *pFrmFmtProgNameArray,
- *pChrFmtProgNameArray,
- *pHTMLChrFmtProgNameArray,
+ *pFrameFormatProgNameArray,
+ *pChrFormatProgNameArray,
+ *pHTMLChrFormatProgNameArray,
*pPageDescProgNameArray,
*pNumRuleProgNameArray;
@@ -171,9 +171,9 @@ public:
static const ::std::vector<OUString>& GetRegisterUINameArray();
static const ::std::vector<OUString>& GetDocUINameArray();
static const ::std::vector<OUString>& GetHTMLUINameArray();
- static const ::std::vector<OUString>& GetFrmFmtUINameArray();
- static const ::std::vector<OUString>& GetChrFmtUINameArray();
- static const ::std::vector<OUString>& GetHTMLChrFmtUINameArray();
+ static const ::std::vector<OUString>& GetFrameFormatUINameArray();
+ static const ::std::vector<OUString>& GetChrFormatUINameArray();
+ static const ::std::vector<OUString>& GetHTMLChrFormatUINameArray();
static const ::std::vector<OUString>& GetPageDescUINameArray();
static const ::std::vector<OUString>& GetNumRuleUINameArray();
@@ -183,9 +183,9 @@ public:
static const ::std::vector<OUString>& GetRegisterProgNameArray();
static const ::std::vector<OUString>& GetDocProgNameArray();
static const ::std::vector<OUString>& GetHTMLProgNameArray();
- static const ::std::vector<OUString>& GetFrmFmtProgNameArray();
- static const ::std::vector<OUString>& GetChrFmtProgNameArray();
- static const ::std::vector<OUString>& GetHTMLChrFmtProgNameArray();
+ static const ::std::vector<OUString>& GetFrameFormatProgNameArray();
+ static const ::std::vector<OUString>& GetChrFormatProgNameArray();
+ static const ::std::vector<OUString>& GetHTMLChrFormatProgNameArray();
static const ::std::vector<OUString>& GetPageDescProgNameArray();
static const ::std::vector<OUString>& GetNumRuleProgNameArray();
};
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index e34dd2c8cdba..2a8a6b4540d9 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -44,7 +44,7 @@ public:
class SwUndoFieldFromDoc : public SwUndoField
{
SwField * pOldField, * pNewField;
- SwMsgPoolItem * pHnt;
+ SwMsgPoolItem * pHint;
bool bUpdate;
void DoImpl();
@@ -52,7 +52,7 @@ class SwUndoFieldFromDoc : public SwUndoField
public:
SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField,
const SwField & aNewField,
- SwMsgPoolItem * pHnt, bool bUpdate,
+ SwMsgPoolItem * pHint, bool bUpdate,
SwUndoId nId = UNDO_FIELD );
virtual ~SwUndoFieldFromDoc();
diff --git a/sw/inc/ToxLinkProcessor.hxx b/sw/inc/ToxLinkProcessor.hxx
index 2e439c05f2d8..a8b06d0bdf95 100644
--- a/sw/inc/ToxLinkProcessor.hxx
+++ b/sw/inc/ToxLinkProcessor.hxx
@@ -15,7 +15,7 @@
#include <boost/ptr_container/ptr_vector.hpp>
-class SwTxtNode;
+class SwTextNode;
class ToxLinkProcessorTest;
@@ -41,7 +41,7 @@ public:
/** Insert the found links as attributes to a text node */
void
- InsertLinkAttributes(SwTxtNode& node);
+ InsertLinkAttributes(SwTextNode& node);
private:
/** Obtain the pool id which belongs to a character style.
@@ -66,9 +66,9 @@ private:
*/
struct ClosedLink {
ClosedLink(const OUString& url, sal_Int32 startPosition, sal_Int32 endPosition) :
- mINetFmt(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
+ mINetFormat(url, OUString()), mStartTextPos(endPosition), mEndTextPos(startPosition) {
}
- SwFmtINetFmt mINetFmt;
+ SwFormatINetFormat mINetFormat;
sal_Int32 mStartTextPos;
sal_Int32 mEndTextPos;
};
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index a0d9e421c190..7e5be38eac81 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -19,7 +19,7 @@
struct SwFormToken;
class SwPageDesc;
class SwRootFrm;
-class SwTxtNode;
+class SwTextNode;
namespace sw {
@@ -45,7 +45,7 @@ public:
* and to provide the returned SvxTabStop to the attributes of the node.
*/
virtual HandledTabStopToken
- HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+ HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
const SwRootFrm *currentLayout) const = 0;
};
@@ -83,7 +83,7 @@ public:
* method behaves differently when deriving the tab stop position.
*/
ToxTabStopTokenHandler::HandledTabStopToken
- HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+ HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
const SwRootFrm *currentLayout) const SAL_OVERRIDE;
private:
@@ -92,14 +92,14 @@ private:
* Is used to determine how to find tab stop position.
*/
static bool
- CanUseLayoutRectangle(const SwTxtNode& targetNode, const SwRootFrm *currentLayout);
+ CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout);
/** Calculate the page margin from the page description.
*
* This is the fallback method to determine the position of a tab stop.
*/
long
- CalculatePageMarginFromPageDescription(const SwTxtNode& targetNode) const;
+ CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
sal_uInt32 mIndexOfSectionNode;
const SwPageDesc& mDefaultPageDescription;
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 57f908963ed0..94f142c83ff3 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -29,18 +29,18 @@
class SfxItemSet;
class SwAttrPool;
-class SwFmtAutoFmt;
+class SwFormatAutoFormat;
class SwChapterField;
class SwChapterFieldType;
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
class SwDoc;
class SwForm;
struct SwFormToken;
class SwPageDesc;
class SwRootFrm;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
struct SwTOXSortTabBase;
class SvxTabStop;
class ToxTextGeneratorTest;
@@ -80,7 +80,7 @@ private:
*/
struct HandledTextToken {
OUString text;
- std::vector<SwFmtAutoFmt*> autoFormats;
+ std::vector<SwFormatAutoFormat*> autoFormats;
std::vector<sal_Int32> startPositions;
std::vector<sal_Int32> endPositions;
};
@@ -94,7 +94,7 @@ private:
/** Applies the result of a handled text token to a target node. */
static void
- ApplyHandledTextToken(const HandledTextToken& htt, SwTxtNode& targetNode);
+ ApplyHandledTextToken(const HandledTextToken& htt, SwTextNode& targetNode);
/** Handle a page number token.
*
@@ -117,11 +117,11 @@ private:
* @param pool The attribute pool for the new items
*/
static std::shared_ptr<SfxItemSet>
- CollectAttributesForTox(const SwTxtAttr& hint, SwAttrPool& pool);
+ CollectAttributesForTox(const SwTextAttr& hint, SwAttrPool& pool);
/** This method will call GetNumStringOfFirstNode() of the first node in the provided SwTOXSortTabBase.
*
- * The parameters @p bUsePrefix and @p nLevel are passed to SwTxtNode::GetNumString()
+ * The parameters @p bUsePrefix and @p nLevel are passed to SwTextNode::GetNumString()
*
* @internal
* The method is only called if several preconditions for @p rBase are true. Check the implementation
@@ -138,8 +138,8 @@ private:
/** Generate the text for a chapter token.
*/
OUString
- GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwCntntFrm* contentFrame,
- const SwCntntNode *contentNode) const;
+ GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+ const SwContentNode *contentNode) const;
/** Obtain a ChapterField to use for the text generation.
* @internal
@@ -147,7 +147,7 @@ private:
*/
virtual SwChapterField
ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
- const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const;
+ const SwContentFrm* contentFrame, const SwContentNode *contentNode) const;
friend class ::ToxTextGeneratorTest;
};
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2cb5a567319b..bf9dcd1c613a 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -38,7 +38,7 @@ class SwAccessibleParagraph;
class SwViewShell;
class Rectangle;
class SwFrm;
-class SwTxtFrm;
+class SwTextFrm;
class SwPageFrm;
class SwAccessibleContext;
class SwAccessibleContextMap_Impl;
@@ -203,7 +203,7 @@ public:
void InvalidateContent( const SwFrm *pFrm );
- void InvalidateAttr( const SwTxtFrm& rTxtFrm );
+ void InvalidateAttr( const SwTextFrm& rTextFrm );
void InvalidateCursorPosition( const SwFrm *pFrm );
void InvalidateFocus();
@@ -221,7 +221,7 @@ public:
@author OD
- @param _rTxtFrm
+ @param _rTextFrm
input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO
has to be invalidated.
@@ -229,14 +229,14 @@ public:
input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM
(value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated.
*/
- void InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+ void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
const bool _bFrom );
/** invalidation of text selection of a paragraph
@author OD
*/
- void InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm );
+ void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm );
/** invalidation of text selection of all paragraphs
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 55fdb78c0c93..1a869f1fd2bc 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -135,8 +135,8 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
}
// accessors to the format
- virtual SwFrmFmt& GetFrmFmt() SAL_OVERRIDE;
- virtual const SwFrmFmt& GetFrmFmt() const SAL_OVERRIDE;
+ virtual SwFrameFormat& GetFrameFormat() SAL_OVERRIDE;
+ virtual const SwFrameFormat& GetFrameFormat() const SAL_OVERRIDE;
// accessors to the object area and its position
virtual const SwRect GetObjRect() const SAL_OVERRIDE;
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index c31afee52daa..31b596a9ac72 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -27,13 +27,13 @@
class SdrObject;
class SwFrm;
class SwLayoutFrm;
-class SwTxtFrm;
+class SwTextFrm;
class SwPageFrm;
class SwObjPositioningInProgress;
-class SwFrmFmt;
-class SwFmtAnchor;
+class SwFrameFormat;
+class SwFormatAnchor;
/** wrapper class for the positioning of Writer fly frames and drawing objects
@@ -143,8 +143,8 @@ class SW_DLLPUBLIC SwAnchoredObject
input parameter - reference to the text frame containing the anchor
character.
*/
- void _CheckCharRect( const SwFmtAnchor& _rAnch,
- const SwTxtFrm& _rAnchorCharFrm );
+ void _CheckCharRect( const SwFormatAnchor& _rAnch,
+ const SwTextFrm& _rAnchorCharFrm );
/** check top of line
@@ -162,12 +162,12 @@ class SW_DLLPUBLIC SwAnchoredObject
input parameter - reference to the text frame containing the anchor
character.
*/
- void _CheckTopOfLine( const SwFmtAnchor& _rAnch,
- const SwTxtFrm& _rAnchorCharFrm );
+ void _CheckTopOfLine( const SwFormatAnchor& _rAnch,
+ const SwTextFrm& _rAnchorCharFrm );
// method <sw_HideObj(..)> sets needed data structure values for the
// object positioning
- friend bool sw_HideObj( const SwTxtFrm& _rFrm,
+ friend bool sw_HideObj( const SwTextFrm& _rFrm,
const RndStdIds _eAnchorType,
const sal_Int32 _nObjAnchorPos,
SwAnchoredObject* _pAnchoredObj );
@@ -260,11 +260,11 @@ class SW_DLLPUBLIC SwAnchoredObject
@author OD
- @return SwTxtFrm*
+ @return SwTextFrm*
text frame containing the anchor character. It's NULL, if the object
isn't anchored at-character resp. as-character.
*/
- SwTxtFrm* FindAnchorCharFrm();
+ SwTextFrm* FindAnchorCharFrm();
// accessors to data of position calculation:
// frame vertical position is orient at
@@ -357,8 +357,8 @@ class SW_DLLPUBLIC SwAnchoredObject
void SetCurrRelPos( Point _aRelPos );
// accessors to the format
- virtual SwFrmFmt& GetFrmFmt() = 0;
- virtual const SwFrmFmt& GetFrmFmt() const = 0;
+ virtual SwFrameFormat& GetFrameFormat() = 0;
+ virtual const SwFrameFormat& GetFrameFormat() const = 0;
// accessors to the object area and its position
virtual const SwRect GetObjRect() const = 0;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 949d08d3c7f2..4dcba72214bd 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -110,8 +110,8 @@ public:
return *m_pForbidden;
}
- sal_uInt16 GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const;
- SvtScriptType GetAllScriptsOfText( const OUString& rTxt ) const;
+ sal_uInt16 GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const;
+ SvtScriptType GetAllScriptsOfText( const OUString& rText ) const;
sal_Int32 getGraphemeCount(const OUString& rStr,
sal_Int32 nStart, sal_Int32 nEnd) const;
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 55cc98f0a54f..1fcbfa5c0517 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -134,16 +134,16 @@ struct SwHash
struct SwCalcExp : public SwHash
{
SwSbxValue nValue;
- const SwFieldType* pFldType;
+ const SwFieldType* pFieldType;
SwCalcExp( const OUString& rStr, const SwSbxValue& rVal,
- const SwFieldType* pFldType = 0 );
+ const SwFieldType* pFieldType = 0 );
};
SwHash* Find( const OUString& rSrch, SwHash* const * ppTable,
- sal_uInt16 nTblSize, sal_uInt16* pPos = 0 );
+ sal_uInt16 nTableSize, sal_uInt16* pPos = 0 );
-void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize );
+void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTableSize );
// if _CalcOp != 0, this is a valid operator
struct _CalcOp;
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index f11765e58c5e..ce677d9c746c 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -28,18 +28,18 @@
namespace rtl { class OUString; }
-class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
+class SW_DLLPUBLIC SwTableBoxNumFormat : public SfxUInt32Item
{
bool bAuto; ///< automatically given flag
public:
- SwTblBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
+ SwTableBoxNumFormat( sal_uInt32 nFormat = css::util::NumberFormat::TEXT,
bool bAuto = false );
// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- inline SwTblBoxNumFormat& operator=( const SwTblBoxNumFormat& rAttr )
+ inline SwTableBoxNumFormat& operator=( const SwTableBoxNumFormat& rAttr )
{
SetValue( rAttr.GetValue() );
SetAutoFlag( rAttr.GetAutoFlag() );
@@ -50,14 +50,14 @@ public:
void SetAutoFlag( bool bFlag = true ) { bAuto = bFlag; }
};
-class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
+class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula
{
SwModify* pDefinedIn; // Modify object where the formula is located
// can only be TableBoxFormat
public:
- SwTblBoxFormula( const OUString& rFormula );
- virtual ~SwTblBoxFormula() {};
+ SwTableBoxFormula( const OUString& rFormula );
+ virtual ~SwTableBoxFormula() {};
// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -71,24 +71,24 @@ public:
SwTableBox* GetTableBox();
const SwTableBox* GetTableBox() const
- { return const_cast<SwTblBoxFormula*>(this)->GetTableBox(); }
+ { return const_cast<SwTableBoxFormula*>(this)->GetTableBox(); }
void ChangeState( const SfxPoolItem* pItem );
- void Calc( SwTblCalcPara& rCalcPara, double& rValue );
+ void Calc( SwTableCalcPara& rCalcPara, double& rValue );
};
-class SW_DLLPUBLIC SwTblBoxValue : public SfxPoolItem
+class SW_DLLPUBLIC SwTableBoxValue : public SfxPoolItem
{
double nValue;
public:
- SwTblBoxValue();
- SwTblBoxValue( const double aVal );
+ SwTableBoxValue();
+ SwTableBoxValue( const double aVal );
// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- inline SwTblBoxValue& operator=( const SwTblBoxValue& rCmp )
+ inline SwTableBoxValue& operator=( const SwTableBoxValue& rCmp )
{
nValue = rCmp.nValue;
return *this;
@@ -97,19 +97,19 @@ public:
double GetValue() const { return nValue; }
};
-inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(bool bInP) const
- { return static_cast<const SwTblBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
-inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(bool bInP) const
- { return static_cast<const SwTblBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
-inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(bool bInP) const
- { return static_cast<const SwTblBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
-
-inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(bool bInP) const
- { return m_aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(bool bInP) const
- { return m_aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue &SwFmt::GetTblBoxValue(bool bInP) const
- { return m_aSet.GetTblBoxValue(bInP); }
+inline const SwTableBoxNumFormat &SwAttrSet::GetTableBoxNumFormat(bool bInP) const
+ { return static_cast<const SwTableBoxNumFormat&>(Get( RES_BOXATR_FORMAT,bInP)); }
+inline const SwTableBoxFormula &SwAttrSet::GetTableBoxFormula(bool bInP) const
+ { return static_cast<const SwTableBoxFormula&>(Get( RES_BOXATR_FORMULA,bInP)); }
+inline const SwTableBoxValue &SwAttrSet::GetTableBoxValue(bool bInP) const
+ { return static_cast<const SwTableBoxValue&>(Get( RES_BOXATR_VALUE, bInP)); }
+
+inline const SwTableBoxNumFormat &SwFormat::GetTableBoxNumFormat(bool bInP) const
+ { return m_aSet.GetTableBoxNumFormat(bInP); }
+inline const SwTableBoxFormula &SwFormat::GetTableBoxFormula(bool bInP) const
+ { return m_aSet.GetTableBoxFormula(bInP); }
+inline const SwTableBoxValue &SwFormat::GetTableBoxValue(bool bInP) const
+ { return m_aSet.GetTableBoxValue(bInP); }
#endif
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 880e2918b329..11386ef6d48e 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -28,27 +28,27 @@ class SwTableSortBoxes;
class SwSelBoxes;
class SwCalc;
class SwTableBox;
-class SwTableFmlUpdate;
+class SwTableFormulaUpdate;
class SwDoc;
-class SwTblCalcPara
+class SwTableCalcPara
{
- const SwTableBox* pLastTblBox;
+ const SwTableBox* pLastTableBox;
sal_uInt16 nStackCnt, nMaxSize;
public:
SwTableSortBoxes *pBoxStk; ///< stack for recognizing recursion
SwCalc& rCalc; ///< current Calculator
- const SwTable* pTbl; ///< current table
+ const SwTable* pTable; ///< current table
- SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
- ~SwTblCalcPara();
+ SwTableCalcPara( SwCalc& rCalculator, const SwTable& rTable );
+ ~SwTableCalcPara();
bool CalcWithStackOverflow();
bool IsStackOverflow() const { return nMaxSize == nStackCnt; }
bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
- void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
+ void SetLastTableBox( const SwTableBox* pBox ) { pLastTableBox = pBox; }
};
class SwTableFormula
@@ -68,7 +68,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
void* pPara = 0 ) const;
void _MakeFormula( const SwTable&, OUString&, OUString&, OUString* = 0,
void* pPara = 0 ) const;
- void _GetFmlBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
+ void _GetFormulaBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
void* pPara = 0 ) const;
void _HasValidBoxes( const SwTable&, OUString&, OUString&, OUString* = 0,
void* pPara = 0 ) const;
@@ -77,7 +77,7 @@ typedef void (SwTableFormula:: *FnScanFormula)( const SwTable&, OUString&,
static void GetBoxes( const SwTableBox& rStt, const SwTableBox& rEnd,
SwSelBoxes& rBoxes );
- OUString ScanString( FnScanFormula fnFormula, const SwTable& rTbl,
+ OUString ScanString( FnScanFormula fnFormula, const SwTable& rTable,
void* = 0 ) const;
static const SwTable* FindTable( SwDoc& rDoc, const OUString& rNm );
@@ -97,13 +97,13 @@ protected:
SwTableFormula( const OUString& rFormula );
- OUString MakeFormula( SwTblCalcPara& rCalcPara ) const
+ OUString MakeFormula( SwTableCalcPara& rCalcPara ) const
{
return ScanString( &SwTableFormula::_MakeFormula,
- *rCalcPara.pTbl, &rCalcPara );
+ *rCalcPara.pTable, &rCalcPara );
}
- static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
+ static sal_uInt16 GetLnPosInTable( const SwTable& rTable, const SwTableBox* pBox );
public:
@@ -118,13 +118,13 @@ public:
}
/// create from the internal formula (for CORE) the external formula (for UI)
- void PtrToBoxNm( const SwTable* pTbl );
+ void PtrToBoxNm( const SwTable* pTable );
/// create from the external formula the internal
- void BoxNmToPtr( const SwTable* pTbl );
+ void BoxNmToPtr( const SwTable* pTable );
/// create from the external/internal formula the relative formula
- void ToRelBoxNm( const SwTable* pTbl );
+ void ToRelBoxNm( const SwTable* pTable );
/// gets called before/after merging/splitting of tables
- void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
+ void ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd );
bool IsIntrnlName() const { return m_eNmType == INTRNL_NAME; }
NameType GetNameType() const { return m_eNmType; }
@@ -140,7 +140,7 @@ public:
m_bValidValue = false;
}
- void GetBoxesOfFormula(const SwTable& rTbl, SwSelBoxes& rBoxes);
+ void GetBoxesOfFormula(const SwTable& rTable, SwSelBoxes& rBoxes);
// are all boxes valid which this formula relies on?
bool HasValidBoxes() const;
};
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 1fa539091d57..9634ce66f0c8 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -132,71 +132,71 @@ inline const SvxBoxItem &SwAttrSet::GetCharBorder( bool bInP ) const
inline const SvxShadowItem &SwAttrSet::GetCharShadow( bool bInP ) const
{ return static_cast<const SvxShadowItem&>(Get( RES_CHRATR_SHADOW, bInP )); }
-// implementation of the character attribute methods of SwFmt
+// implementation of the character attribute methods of SwFormat
-inline const SvxPostureItem &SwFmt::GetPosture(bool bInP) const
+inline const SvxPostureItem &SwFormat::GetPosture(bool bInP) const
{ return m_aSet.GetPosture(bInP); }
-inline const SvxWeightItem &SwFmt::GetWeight(bool bInP) const
+inline const SvxWeightItem &SwFormat::GetWeight(bool bInP) const
{ return m_aSet.GetWeight(bInP); }
-inline const SvxShadowedItem &SwFmt::GetShadowed(bool bInP) const
+inline const SvxShadowedItem &SwFormat::GetShadowed(bool bInP) const
{ return m_aSet.GetShadowed(bInP); }
-inline const SvxAutoKernItem &SwFmt::GetAutoKern(bool bInP) const
+inline const SvxAutoKernItem &SwFormat::GetAutoKern(bool bInP) const
{ return m_aSet.GetAutoKern(bInP); }
-inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(bool bInP) const
+inline const SvxWordLineModeItem &SwFormat::GetWordLineMode(bool bInP) const
{ return m_aSet.GetWordLineMode(bInP); }
-inline const SvxContourItem &SwFmt::GetContour(bool bInP) const
+inline const SvxContourItem &SwFormat::GetContour(bool bInP) const
{ return m_aSet.GetContour(bInP); }
-inline const SvxKerningItem &SwFmt::GetKerning(bool bInP) const
+inline const SvxKerningItem &SwFormat::GetKerning(bool bInP) const
{ return m_aSet.GetKerning(bInP); }
-inline const SvxUnderlineItem &SwFmt::GetUnderline(bool bInP) const
+inline const SvxUnderlineItem &SwFormat::GetUnderline(bool bInP) const
{ return m_aSet.GetUnderline(bInP); }
-inline const SvxOverlineItem &SwFmt::GetOverline(bool bInP) const
+inline const SvxOverlineItem &SwFormat::GetOverline(bool bInP) const
{ return m_aSet.GetOverline(bInP); }
-inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(bool bInP) const
+inline const SvxCrossedOutItem &SwFormat::GetCrossedOut(bool bInP) const
{ return m_aSet.GetCrossedOut(bInP); }
-inline const SvxFontHeightItem &SwFmt::GetSize(bool bInP) const
+inline const SvxFontHeightItem &SwFormat::GetSize(bool bInP) const
{ return m_aSet.GetSize(bInP); }
-inline const SvxPropSizeItem &SwFmt::GetPropSize(bool bInP) const
+inline const SvxPropSizeItem &SwFormat::GetPropSize(bool bInP) const
{ return m_aSet.GetPropSize(bInP); }
-inline const SvxFontItem &SwFmt::GetFont(bool bInP) const
+inline const SvxFontItem &SwFormat::GetFont(bool bInP) const
{ return m_aSet.GetFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCJKFont(bool bInP) const
+inline const SvxFontItem &SwFormat::GetCJKFont(bool bInP) const
{ return m_aSet.GetCJKFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCTLFont(bool bInP) const
+inline const SvxFontItem &SwFormat::GetCTLFont(bool bInP) const
{ return m_aSet.GetCTLFont(bInP); }
-inline const SvxColorItem &SwFmt::GetColor(bool bInP) const
+inline const SvxColorItem &SwFormat::GetColor(bool bInP) const
{ return m_aSet.GetColor(bInP); }
- inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(bool bInP) const
+ inline const SvxCharSetColorItem &SwFormat::GetCharSetColor(bool bInP) const
{ return m_aSet.GetCharSetColor(bInP); }
-inline const SvxLanguageItem &SwFmt::GetLanguage(bool bInP) const
+inline const SvxLanguageItem &SwFormat::GetLanguage(bool bInP) const
{ return m_aSet.GetLanguage(bInP); }
-inline const SvxEscapementItem &SwFmt::GetEscapement(bool bInP) const
+inline const SvxEscapementItem &SwFormat::GetEscapement(bool bInP) const
{ return m_aSet.GetEscapement(bInP); }
-inline const SvxCaseMapItem &SwFmt::GetCaseMap(bool bInP) const
+inline const SvxCaseMapItem &SwFormat::GetCaseMap(bool bInP) const
{ return m_aSet.GetCaseMap(bInP); }
-inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(bool bInP) const
+inline const SvxNoHyphenItem &SwFormat::GetNoHyphenHere(bool bInP) const
{ return m_aSet.GetNoHyphenHere(bInP); }
-inline const SvxBlinkItem &SwFmt::GetBlink(bool bInP) const
+inline const SvxBlinkItem &SwFormat::GetBlink(bool bInP) const
{ return m_aSet.GetBlink(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrBackground(bool bInP) const
+inline const SvxBrushItem &SwFormat::GetChrBackground(bool bInP) const
{ return m_aSet.GetChrBackground(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrHighlight(bool bInP) const
+inline const SvxBrushItem &SwFormat::GetChrHighlight(bool bInP) const
{ return m_aSet.GetChrHighlight(bInP); }
-inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( bool bInP ) const
+inline const SvxEmphasisMarkItem &SwFormat::GetEmphasisMark( bool bInP ) const
{ return m_aSet.GetEmphasisMark(bInP); }
-inline const SvxTwoLinesItem &SwFmt::Get2Lines( bool bInP ) const
+inline const SvxTwoLinesItem &SwFormat::Get2Lines( bool bInP ) const
{ return m_aSet.Get2Lines(bInP); }
-inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( bool bInP ) const
+inline const SvxCharScaleWidthItem &SwFormat::GetCharScaleW( bool bInP ) const
{ return m_aSet.GetCharScaleW(bInP); }
-inline const SvxCharRotateItem &SwFmt::GetCharRotate( bool bInP ) const
+inline const SvxCharRotateItem &SwFormat::GetCharRotate( bool bInP ) const
{ return m_aSet.GetCharRotate(bInP); }
-inline const SvxCharReliefItem &SwFmt::GetCharRelief( bool bInP ) const
+inline const SvxCharReliefItem &SwFormat::GetCharRelief( bool bInP ) const
{ return m_aSet.GetCharRelief(bInP); }
-inline const SvxCharHiddenItem &SwFmt::GetCharHidden( bool bInP ) const
+inline const SvxCharHiddenItem &SwFormat::GetCharHidden( bool bInP ) const
{ return m_aSet.GetCharHidden(bInP); }
-inline const SvxBoxItem &SwFmt::GetCharBorder( bool bInP ) const
+inline const SvxBoxItem &SwFormat::GetCharBorder( bool bInP ) const
{ return m_aSet.GetCharBorder(bInP); }
-inline const SvxShadowItem &SwFmt::GetCharShadow( bool bInP ) const
+inline const SvxShadowItem &SwFormat::GetCharShadow( bool bInP ) const
{ return m_aSet.GetCharShadow(bInP); }
#endif
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index db67d1def83c..a9d029924a01 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -21,18 +21,18 @@
#include <format.hxx>
-class SW_DLLPUBLIC SwCharFmt : public SwFmt
+class SW_DLLPUBLIC SwCharFormat : public SwFormat
{
friend class SwDoc;
- friend class SwTxtFmtColl;
+ friend class SwTextFormatColl;
- SwCharFmt( SwAttrPool& rPool, const sal_Char* pFmtName,
- SwCharFmt *pDerivedFrom )
- : SwFmt( rPool, pFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+ SwCharFormat( SwAttrPool& rPool, const sal_Char* pFormatName,
+ SwCharFormat *pDerivedFrom )
+ : SwFormat( rPool, pFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
{}
- SwCharFmt( SwAttrPool& rPool, const OUString &rFmtName,
- SwCharFmt *pDerivedFrom )
- : SwFmt( rPool, rFmtName, aCharFmtSetRange, pDerivedFrom, RES_CHRFMT )
+ SwCharFormat( SwAttrPool& rPool, const OUString &rFormatName,
+ SwCharFormat *pDerivedFrom )
+ : SwFormat( rPool, rFormatName, aCharFormatSetRange, pDerivedFrom, RES_CHRFMT )
{}
public:
@@ -41,11 +41,11 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-namespace CharFmt
+namespace CharFormat
{
SW_DLLPUBLIC extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
- extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
- extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
+ extern const SfxPoolItem* GetItem( const SwTextAttr& rAttr, sal_uInt16 nWhich );
+ extern bool IsItemIncluded( const sal_uInt16 nWhich, const SwTextAttr *pAttr );
}
#endif
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index dc59de1e1e61..5f22ceb36ec5 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -22,8 +22,8 @@
#include "fldbas.hxx"
class SwFrm;
-class SwCntntNode;
-class SwTxtNode;
+class SwContentNode;
+class SwTextNode;
class ToxTextGeneratorTest;
enum SwChapterFormat
@@ -60,13 +60,13 @@ class SW_DLLPUBLIC SwChapterField : public SwField
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
+ SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0);
// #i53420#
void ChangeExpansion( const SwFrm*,
- const SwCntntNode*,
+ const SwContentNode*,
bool bSrchNum = false);
- void ChangeExpansion(const SwTxtNode &rNd, bool bSrchNum);
+ void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum);
inline sal_uInt8 GetLevel() const;
inline void SetLevel(sal_uInt8);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index e07ca6fda4e0..7c15b3a88fbf 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -144,7 +144,7 @@
CalcLayout */
#define FN_REDLINE_ACCEPT (FN_EDIT2 + 29) /* Redlining Accept/Reject */
-#define FN_ATTR_COLUMNS (FN_EDIT2 + 31) /* SlotId for SwFmtCol */
+#define FN_ATTR_COLUMNS (FN_EDIT2 + 31) /* SlotId for SwFormatCol */
#define FN_EDIT_CURRENT_TOX (FN_EDIT2 + 32) /* edit current index */
#define FN_EDIT_AUTH_ENTRY_DLG (FN_EDIT2 + 33) /* edit authorities entry*/
#define FN_UPDATE_CHARTS (FN_EDIT2 + 34) /* update all charts */
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 84fbb87245c3..2fdcac8ba2c5 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -41,30 +41,30 @@
class SfxItemSet;
class SfxPoolItem;
-class SwCntntFrm;
+class SwContentFrm;
class SwCrsrShell;
class SwCursor;
class SwField;
class SwFieldType;
-class SwFmt;
-class SwFmtFld;
+class SwFormat;
+class SwFormatField;
class SwNodeIndex;
class SwPaM;
class SwShellCrsr;
class SwShellTableCrsr;
class SwTableNode;
-class SwTxtFmtColl;
+class SwTextFormatColl;
class SwVisCrsr;
-class SwTxtINetFmt;
-class SwFmtINetFmt;
-class SwTxtAttr;
+class SwTextINetFormat;
+class SwFormatINetFormat;
+class SwTextAttr;
class SwTableBox;
class SwTOXMark;
class SwRangeRedline;
class IBlockCursor;
-class SwCntntNode;
+class SwContentNode;
class SwPostItField;
-class SwTxtFld;
+class SwTextField;
struct SwPosition;
namespace com { namespace sun { namespace star { namespace util {
@@ -103,26 +103,26 @@ struct SwContentAtPos
,SW_CURR_ATTRS = 0x4000 ///< only for debugging
,SW_TABLEBOXVALUE = 0x8000 ///< only for debugging
#endif
- } eCntntAtPos;
+ } eContentAtPos;
union {
- const SwField* pFld;
+ const SwField* pField;
const SfxPoolItem* pAttr;
const SwRangeRedline* pRedl;
- SwCntntNode * pNode;
- const sw::mark::IFieldmark* pFldmark;
+ SwContentNode * pNode;
+ const sw::mark::IFieldmark* pFieldmark;
} aFnd;
int nDist;
OUString sStr;
- const SwTxtAttr* pFndTxtAttr;
+ const SwTextAttr* pFndTextAttr;
SwContentAtPos( int eGetAtPos = 0xffff )
- : eCntntAtPos( (IsAttrAtPos)eGetAtPos )
+ : eContentAtPos( (IsAttrAtPos)eGetAtPos )
{
- aFnd.pFld = 0;
- pFndTxtAttr = 0;
+ aFnd.pField = 0;
+ pFndTextAttr = 0;
nDist = 0; // #i23726#
}
@@ -179,7 +179,7 @@ private:
IBlockCursor *m_pBlockCrsr; ///< interface of cursor for block (=rectangular) selection
- SwShellTableCrsr* m_pTblCrsr; /**< table Crsr; only in tables when the
+ SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the
selection lays over 2 columns */
SwNodeIndex* m_pBoxIdx; ///< for recognizing of the changed
@@ -189,7 +189,7 @@ private:
in the same column */
long m_nLeftFrmPos;
sal_uLong m_nAktNode; // save CursorPos at Start-Action
- sal_Int32 m_nAktCntnt;
+ sal_Int32 m_nAktContent;
sal_uInt16 m_nAktNdTyp;
bool m_bAktSelection;
@@ -222,7 +222,7 @@ private:
bool m_bGCAttr : 1; // true -> non expanded attributes exist.
bool m_bIgnoreReadonly : 1; // true -> make the cursor visible on next
// EndAction in spite of Readonly
- bool m_bSelTblCells : 1; // true -> select cells over the InputWin
+ bool m_bSelTableCells : 1; // true -> select cells over the InputWin
bool m_bAutoUpdateCells : 1; // true -> autoformat cells
bool m_bBasicHideCrsr : 1; // true -> HideCrsr from Basic
bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas
@@ -260,7 +260,7 @@ private:
SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
- SAL_DLLPRIVATE bool isInHiddenTxtFrm(SwShellCrsr* pShellCrsr);
+ SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr);
typedef bool (SwCursor:: *FNCrsr)();
SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr );
@@ -290,7 +290,7 @@ protected:
void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
const sal_Int32 nOffset = 0 );
- bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+ bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false );
bool SetInFrontOfLabel( bool bNew );
@@ -318,7 +318,7 @@ public:
///< delete the current cursor and make the following into the current
bool DestroyCrsr();
///< transform TableCursor to normal cursor, nullify Tablemode
- void TblCrsrToCursor();
+ void TableCrsrToCursor();
///< enter block mode, change normal cursor into block cursor
void CrsrToBlockCrsr();
///< leave block mode, change block cursor into normal cursor
@@ -333,8 +333,8 @@ public:
/// If document body starts with a table.
bool StartsWithTable();
- SwPaM* GetCrsr( bool bMakeTblCrsr = true ) const;
- inline SwCursor* GetSwCrsr( bool bMakeTblCrsr = true ) const;
+ SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const;
+ inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const;
// return only the current cursor
SwShellCrsr* _GetCrsr() { return m_pCurCrsr; }
const SwShellCrsr* _GetCrsr() const { return m_pCurCrsr; }
@@ -380,10 +380,10 @@ public:
bool& bCancel,
FindRanges eRng, bool bReplace = false );
- sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+ sal_uLong Find( const SwTextFormatColl& rFormatColl,
SwDocPositions eStart, SwDocPositions eEnd,
bool& bCancel,
- FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );
+ FindRanges eRng, const SwTextFormatColl* pReplFormat = 0 );
sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
SwDocPositions eStart, SwDocPositions eEnd,
@@ -470,7 +470,7 @@ public:
void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; }
// Return current frame in which the cursor is placed.
- SwCntntFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
+ SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
//true if cursor is hidden because of readonly.
//false if it is working despite readonly.
@@ -574,21 +574,21 @@ public:
// get the selected text at the current cursor. it will be filled with
// fields etc.
- OUString GetSelTxt() const;
+ OUString GetSelText() const;
// return only the text starting from the current cursor position (to the
// end of the node)
OUString GetText() const;
// Check of SPoint or Mark of current cursor are placed within a table.
- inline const SwTableNode* IsCrsrInTbl( bool bIsPtInTbl = true ) const;
+ inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const;
inline Point& GetCrsrDocPos( bool bPoint = true ) const;
inline bool IsCrsrPtAtEnd() const;
- inline const SwPaM* GetTblCrs() const;
- inline SwPaM* GetTblCrs();
+ inline const SwPaM* GetTableCrs() const;
+ inline SwPaM* GetTableCrs();
- bool IsTblComplexForChart();
+ bool IsTableComplexForChart();
// get current table selection as text
OUString GetBoxNms() const;
@@ -599,11 +599,11 @@ public:
bool GotoTable( const OUString& rName );
// select a table row, column or box (based on the current cursor)
- bool SelTblRow() { return _SelTblRowOrCol( true ); }
- bool SelTblCol() { return _SelTblRowOrCol( false ); }
- bool SelTblBox();
+ bool SelTableRow() { return _SelTableRowOrCol( true ); }
+ bool SelTableCol() { return _SelTableRowOrCol( false ); }
+ bool SelTableBox();
- bool SelTbl();
+ bool SelTable();
bool GotoNextNum();
bool GotoPrevNum();
@@ -624,14 +624,14 @@ public:
/** Delivers the current shell cursor
Some operations have to run on the current cursor ring,
- some on the m_pTblCrsr (if exist) or the current cursor ring and
- some on the m_pTblCrsr or m_pBlockCrsr or the current cursor ring.
+ some on the m_pTableCrsr (if exist) or the current cursor ring and
+ some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring.
This small function checks the existence and delivers the wished cursor.
@param bBlock [bool]
if the block cursor is of interest or not
- @return m_pTblCrsr if exist,
+ @return m_pTableCrsr if exist,
m_pBlockCrsr if exist and of interest (param bBlock)
otherwise m_pCurCrsr
*/
@@ -644,20 +644,20 @@ public:
IBlockCursor* GetBlockCrsr() { return m_pBlockCrsr; }
// is the Crsr in a table and is the selection over 2 columns
- bool IsTableMode() const { return 0 != m_pTblCrsr; }
+ bool IsTableMode() const { return 0 != m_pTableCrsr; }
- const SwShellTableCrsr* GetTableCrsr() const { return m_pTblCrsr; }
- SwShellTableCrsr* GetTableCrsr() { return m_pTblCrsr; }
- size_t UpdateTblSelBoxes();
+ const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; }
+ SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; }
+ size_t UpdateTableSelBoxes();
- bool GotoFtnTxt(); ///< jump from content to footnote
- bool GotoFtnAnchor(); ///< jump from footnote to anchor
- bool GotoPrevFtnAnchor();
- bool GotoNextFtnAnchor();
+ bool GotoFootnoteText(); ///< jump from content to footnote
+ bool GotoFootnoteAnchor(); ///< jump from footnote to anchor
+ bool GotoPrevFootnoteAnchor();
+ bool GotoNextFootnoteAnchor();
bool GotoFlyAnchor(); ///< jump from the frame to the anchor
- bool GotoHeaderTxt(); ///< jump from the content to the header
- bool GotoFooterTxt(); ///< jump from the content to the footer
+ bool GotoHeaderText(); ///< jump from the content to the header
+ bool GotoFooterText(); ///< jump from the content to the footer
// jump to the header/footer of the given or current PageDesc
bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX,
bool bInHeader = true );
@@ -675,7 +675,7 @@ public:
// jump to the next or previous table formula
// optionally only to broken formulas
- bool GotoNxtPrvTblFormula( bool bNext = true,
+ bool GotoNxtPrvTableFormula( bool bNext = true,
bool bOnlyErrors = false );
// jump to the next / previous hyperlink - inside text and also
// on graphics
@@ -695,26 +695,26 @@ public:
inline void UnSetVisCrsr();
// jump to the next or previous field of the corresponding type
- bool MoveFldType(
- const SwFieldType* pFldType,
+ bool MoveFieldType(
+ const SwFieldType* pFieldType,
const bool bNext,
const sal_uInt16 nResType = USHRT_MAX,
- const bool bAddSetExpressionFldsToInputFlds = true );
+ const bool bAddSetExpressionFieldsToInputFields = true );
- bool GotoFld( const SwFmtFld& rFld );
+ bool GotoFormatField( const SwFormatField& rField );
- static SwTxtFld* GetTxtFldAtPos(
+ static SwTextField* GetTextFieldAtPos(
const SwPosition* pPos,
- const bool bIncludeInputFldAtStart );
+ const bool bIncludeInputFieldAtStart );
static SwField* GetFieldAtCrsr(
const SwPaM* pCrsr,
- const bool bIncludeInputFldAtStart );
- SwField* GetCurFld( const bool bIncludeInputFldAtStart = false ) const;
- bool CrsrInsideInputFld() const;
- static bool PosInsideInputFld( const SwPosition& rPos );
- bool DocPtInsideInputFld( const Point& rDocPt ) const;
- static sal_Int32 StartOfInputFldAtPos( const SwPosition& rPos );
- static sal_Int32 EndOfInputFldAtPos( const SwPosition& rPos );
+ const bool bIncludeInputFieldAtStart );
+ SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
+ bool CrsrInsideInputField() const;
+ static bool PosInsideInputField( const SwPosition& rPos );
+ bool DocPtInsideInputField( const Point& rDocPt ) const;
+ static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos );
+ static sal_Int32 EndOfInputFieldAtPos( const SwPosition& rPos );
// Return number of cursors in ring (The flag indicates whether
// only cursors containing selections are requested).
@@ -750,7 +750,7 @@ public:
// its TextNode (or StartNode?)
// They all get created on the next ::GetCrsr again
// Used for Drag&Drop/Clipboard-Paste in tables
- bool ParkTblCrsr();
+ bool ParkTableCrsr();
// Non expanded attributes?
bool IsGCAttr() const { return m_bGCAttr; }
@@ -768,12 +768,12 @@ public:
virtual void MakeSelVisible();
// set the cursor to a NOT protected/hidden node
- bool FindValidCntntNode( bool bOnlyText = false );
+ bool FindValidContentNode( bool bOnlyText = false );
bool GetContentAtPos( const Point& rPt,
- SwContentAtPos& rCntntAtPos,
+ SwContentAtPos& rContentAtPos,
bool bSetCrsr = false,
- SwRect* pFldRect = 0 );
+ SwRect* pFieldRect = 0 );
const SwPostItField* GetPostItFieldAtCursor() const;
@@ -791,20 +791,20 @@ public:
bool IsPageAtPos( const Point &rPt ) const;
- bool SelectTxtAttr( sal_uInt16 nWhich, bool bExpand, const SwTxtAttr* pAttr = 0 );
- bool GotoINetAttr( const SwTxtINetFmt& rAttr );
- const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+ bool SelectTextAttr( sal_uInt16 nWhich, bool bExpand, const SwTextAttr* pAttr = 0 );
+ bool GotoINetAttr( const SwTextINetFormat& rAttr );
+ const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
- bool SelectTxt( const sal_Int32 nStart,
+ bool SelectText( const sal_Int32 nStart,
const sal_Int32 nEnd );
- bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
- void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
- void ClearTblBoxCntnt();
- bool EndAllTblBoxEdit();
+ bool CheckTableBoxContent( const SwPosition* pPos = 0 );
+ void SaveTableBoxContent( const SwPosition* pPos = 0 );
+ void ClearTableBoxContent();
+ bool EndAllTableBoxEdit();
- void SetSelTblCells( bool bFlag ) { m_bSelTblCells = bFlag; }
- bool IsSelTblCells() const { return m_bSelTblCells; }
+ void SetSelTableCells( bool bFlag ) { m_bSelTableCells = bFlag; }
+ bool IsSelTableCells() const { return m_bSelTableCells; }
bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; }
void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; }
@@ -861,9 +861,9 @@ inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
}
-inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const
{
- return static_cast<SwCursor*>(GetCrsr( bMakeTblCrsr ));
+ return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr ));
}
inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; }
@@ -888,9 +888,9 @@ inline bool SwCrsrShell::IsSelOnePara() const
m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode;
}
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( bool bIsPtInTbl ) const
+inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const
{
- return m_pCurCrsr->GetNode( bIsPtInTbl ).FindTableNode();
+ return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode();
}
inline bool SwCrsrShell::IsCrsrPtAtEnd() const
@@ -903,14 +903,14 @@ inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const
return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos();
}
-inline const SwPaM* SwCrsrShell::GetTblCrs() const
+inline const SwPaM* SwCrsrShell::GetTableCrs() const
{
- return m_pTblCrsr;
+ return m_pTableCrsr;
}
-inline SwPaM* SwCrsrShell::GetTblCrs()
+inline SwPaM* SwCrsrShell::GetTableCrs()
{
- return m_pTblCrsr;
+ return m_pTableCrsr;
}
inline void SwCrsrShell::UnSetVisCrsr()
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 53e3db095bae..fdba24133fd3 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -65,7 +65,7 @@ struct Sw2LinesPos
/**
* SwSpecialPos. This structure is used to pass some additional information
- * during the call of SwTxtFrm::GetCharRect(). An SwSpecialPos defines a position
+ * during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position
* inside a portion which does not have a representation in the core string or
* which is only represented by one position, e.g., field portions,
* number portions, ergo sum and quo vadis portions.
@@ -82,7 +82,7 @@ struct Sw2LinesPos
*
* Get the position of the second character inside a number portion:
* nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE;
- * Call SwTxtFrm:::GetCharRect with core string position 0.
+ * Call SwTextFrm:::GetCharRect with core string position 0.
*
* Example 2)
*
@@ -91,7 +91,7 @@ struct Sw2LinesPos
* Get the position of the third character in follow field B, core position
* of field A is 33.
* nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE;
- * Call SwTxtFrm:::GetCharRect with core string position 33.
+ * Call SwTextFrm:::GetCharRect with core string position 33.
*/
#define SP_EXTEND_RANGE_NONE 0
@@ -134,9 +134,9 @@ struct SwCrsrMoveState
bool bRealHeight; ///< should the real height be calculated?
bool bFieldInfo; ///< should be fields recognized?
bool bPosCorr; ///< Point had to be corrected
- bool bFtnNoInfo; ///< recognized footnote numbering
+ bool bFootnoteNoInfo; ///< recognized footnote numbering
bool bExactOnly; /**< let GetCrsrOfst look for exact matches only,
- i.e. never let it run into GetCntntPos */
+ i.e. never let it run into GetContentPos */
bool bFillRet; ///< only used temporary in FillMode
bool bSetInReadOnly; ///< ReadOnly areas may be entered
bool bRealWidth; ///< Calculation of the width required
@@ -146,7 +146,7 @@ struct SwCrsrMoveState
position if screen position is inside second
have of bound rect */
- bool bCntntCheck; // #i43742# Cursor position over content?
+ bool bContentCheck; // #i43742# Cursor position over content?
// #i27615#
/**
@@ -166,7 +166,7 @@ struct SwCrsrMoveState
bRealHeight( false ),
bFieldInfo( false ),
bPosCorr( false ),
- bFtnNoInfo( false ),
+ bFootnoteNoInfo( false ),
bExactOnly( false ),
bFillRet( false ),
bSetInReadOnly( false ),
@@ -174,7 +174,7 @@ struct SwCrsrMoveState
b2Lines( false ),
bNoScroll( false ),
bPosMatchesBounds( false ),
- bCntntCheck( false ), // #i43742#
+ bContentCheck( false ), // #i43742#
bInFrontOfLabel( false ), // #i27615#
bInNumPortion(false), // #i26726#
nInNumPostionOffset(0) // #i26726#
@@ -189,7 +189,7 @@ struct SwCrsrMoveState
bRealHeight( false ),
bFieldInfo( false ),
bPosCorr( false ),
- bFtnNoInfo( false ),
+ bFootnoteNoInfo( false ),
bExactOnly( false ),
bFillRet( false ),
bSetInReadOnly( false ),
@@ -197,7 +197,7 @@ struct SwCrsrMoveState
b2Lines( false ),
bNoScroll( false ),
bPosMatchesBounds( false ),
- bCntntCheck( false ), // #i43742#
+ bContentCheck( false ), // #i43742#
bInFrontOfLabel( false ), // #i27615#
bInNumPortion(false), // #i23726#
nInNumPostionOffset(0) // #i23726#
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 0509b9116ee2..2ba43ffef947 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -23,7 +23,7 @@
#include "swdllapi.h"
class SwPaM;
-class SwCntntFrm;
+class SwContentFrm;
class SwLayoutFrm;
// Structure for SwPaM. Contains the method-pointers for cursor movement.
@@ -31,13 +31,13 @@ struct SwMoveFnCollection;
typedef SwMoveFnCollection* SwMoveFn;
// Type definition for CrsrShell.
-// Direction-parameter for MovePage (initialized in SwCntntFrm).
+// Direction-parameter for MovePage (initialized in SwContentFrm).
typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
-typedef SwCntntFrm * (*SwPosPage)( const SwLayoutFrm * );
+typedef SwContentFrm * (*SwPosPage)( const SwLayoutFrm * );
extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext;
extern SwPosPage fnPageStart, fnPageEnd;
-// Direction-parameter for MovePara (initialized in SwCntntFrm).
+// Direction-parameter for MovePara (initialized in SwContentFrm).
typedef SwMoveFnCollection* SwPosPara;
typedef bool (*SwWhichPara)( SwPaM&, SwPosPara );
extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
@@ -57,7 +57,7 @@ extern SwPosTable fnTableStart, fnTableEnd;
// Direction-parameter for MoveColumn
typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * );
-typedef SwCntntFrm * (*SwPosColumn)( const SwLayoutFrm * );
+typedef SwContentFrm * (*SwPosColumn)( const SwLayoutFrm * );
extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
extern SwPosColumn fnColumnStart, fnColumnEnd;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 7df97ef6d9b0..7f3d6533ad71 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -24,7 +24,7 @@
#include "swdbdata.hxx"
class SwDoc;
-class SwTxtFld;
+class SwTextField;
class SwFrm;
// Database field.
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
OUString aContent;
OUString sFieldCode; ///< contains Word's field code
sal_uInt16 nSubType;
- bool bIsInBodyTxt : 1;
+ bool bIsInBodyText : 1;
bool bValidValue : 1;
bool bInitialized : 1;
@@ -68,7 +68,7 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
+ SwDBField(SwDBFieldType*, sal_uLong nFormat = 0);
virtual ~SwDBField();
virtual SwFieldType* ChgTyp( SwFieldType* ) SAL_OVERRIDE;
@@ -88,11 +88,11 @@ public:
void Evaluate();
/// Evaluation for header and footer.
- void ChangeExpansion( const SwFrm*, const SwTxtFld* );
+ void ChangeExpansion( const SwFrm*, const SwTextField* );
void InitContent();
void InitContent(const OUString& rExpansion);
- inline void ChgBodyTxtFlag( bool bIsInBody );
+ inline void ChgBodyTextFlag( bool bIsInBody );
inline bool IsInitialized() const { return bInitialized; }
inline void ClearInitialized() { bInitialized = false; }
@@ -110,16 +110,16 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
- static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFmt,
+ static bool FormatValue( SvNumberFormatter* pDocFormatter, OUString &aString, sal_uInt32 nFormat,
double &aNumber, sal_Int32 nColumnType, SwDBField *pField = NULL );
};
inline void SwDBField::SetExpansion(const OUString& rStr)
{ aContent = rStr; }
-/// set from UpdateExpFlds (the Node-Position is known there)
-inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
- { bIsInBodyTxt = bIsInBody; }
+/// set from UpdateExpFields (the Node-Position is known there)
+inline void SwDBField::ChgBodyTextFlag( bool bIsInBody )
+ { bIsInBodyText = bIsInBody; }
// Base class for all other database fields.
class SW_DLLPUBLIC SwDBNameInfField : public SwField
@@ -131,7 +131,7 @@ protected:
const SwDBData& GetDBData() const {return aDBData;}
SwDBData& GetDBData() {return aDBData;}
- SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0);
+ SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFormat = 0);
public:
/// DBName
@@ -249,7 +249,7 @@ public:
class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
{
public:
- SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+ SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
{
long nNumber;
public:
- SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
+ SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFormat = 0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 6b98c528b2a8..5fcf8af7460b 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -26,10 +26,10 @@
#include <cstdio>
#include <unordered_map>
-class SwCntntNode;
+class SwContentNode;
class SwNode;
-class SwTxtAttr;
-class SwTxtNode;
+class SwTextAttr;
+class SwTextNode;
class SwpHints;
class SfxPoolItem;
class SfxItemSet;
@@ -38,14 +38,14 @@ class SwPaM;
class SwNodeNum;
class SwUndo;
class SwRect;
-class SwFrmFmt;
-class SwFrmFmts;
+class SwFrameFormat;
+class SwFrameFormats;
class SwNodes;
class SwRewriter;
-class SwNumRuleTbl;
+class SwNumRuleTable;
class SwNumRule;
class SwOutlineNodes;
-class SwTxtFmtColl;
+class SwTextFormatColl;
class SwNodeRange;
extern bool bDbgOutStdErr;
@@ -54,12 +54,12 @@ extern bool bDbgOutPrintAttrSet;
SW_DLLPUBLIC const char * dbg_out(const void * pVoid);
SW_DLLPUBLIC const char * dbg_out(const OUString & aStr);
SW_DLLPUBLIC const char * dbg_out(const SwRect & rRect);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmt & rFrmFmt);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormat & rFrameFormat);
SW_DLLPUBLIC const char * dbg_out(const SwNode & rNode);
SW_DLLPUBLIC const char * dbg_out(const SwNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwCntntNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtNode * pNode);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtAttr & rAttr);
+SW_DLLPUBLIC const char * dbg_out(const SwContentNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextNode * pNode);
+SW_DLLPUBLIC const char * dbg_out(const SwTextAttr & rAttr);
SW_DLLPUBLIC const char * dbg_out(const SwpHints &rHints);
SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem & rItem);
SW_DLLPUBLIC const char * dbg_out(const SfxPoolItem * pItem);
@@ -72,9 +72,9 @@ SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
SW_DLLPUBLIC const char * dbg_out(SwOutlineNodes & rNodes);
SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
-SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
-SW_DLLPUBLIC const char * dbg_out(const SwFrmFmts & rFrmFmts);
-SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTbl & rTbl);
+SW_DLLPUBLIC const char * dbg_out(const SwTextFormatColl & rFormat);
+SW_DLLPUBLIC const char * dbg_out(const SwFrameFormats & rFrameFormats);
+SW_DLLPUBLIC const char * dbg_out(const SwNumRuleTable & rTable);
SW_DLLPUBLIC const char * dbg_out(const SwNodeRange & rRange);
template<typename tKey, typename tMember, typename fHashFunction>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 47defa8e0c44..5bf5432fdc0e 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -186,7 +186,7 @@ class SW_DLLPUBLIC SwDBManager
{
friend class SwConnectionDisposedListener_Impl;
- OUString sEMailAddrFld; ///< Mailing: Column name of email address.
+ OUString sEMailAddrField; ///< Mailing: Column name of email address.
OUString sSubject; ///< Mailing: Subject
OUString sAttached; ///< Mailing: Attached Files.
bool bCancel; ///< Mail merge canceled.
@@ -251,7 +251,7 @@ public:
void SetSingleJobs(bool b) { bSingleJobs = b; }
/// Mailing: Set email data.
- inline void SetEMailColumn(const OUString& sColName) { sEMailAddrFld = sColName; }
+ inline void SetEMailColumn(const OUString& sColName) { sEMailAddrField = sColName; }
inline void SetSubject(const OUString& sSbj) { sSubject = sSbj; }
inline void SetAttachment(const OUString& sAtt) { sAttached = sAtt; }
@@ -265,16 +265,16 @@ public:
css::uno::Reference< css::sdbc::XConnection> xConnection,
const OUString& rTableName, bool bAppend = false);
- static sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+ static sal_uLong GetColumnFormat( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn,
- SvNumberFormatter* pNFmtr,
+ SvNumberFormatter* pNFormatr,
long nLanguage );
- sal_uLong GetColumnFmt( const OUString& rDBName,
+ sal_uLong GetColumnFormat( const OUString& rDBName,
const OUString& rTableName,
const OUString& rColNm,
- SvNumberFormatter* pNFmtr,
+ SvNumberFormatter* pNFormatr,
long nLanguage );
sal_Int32 GetColumnType( const OUString& rDBName,
const OUString& rTableName,
@@ -301,7 +301,7 @@ public:
const OUString& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
OUString& rResult, double* pNumber);
/** create and store or find an already stored connection to a data source for use
- in SwFldMgr and SwDBTreeList */
+ in SwFieldMgr and SwDBTreeList */
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>
RegisterConnection(OUString& rSource);
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 01298ee7689a..07b5cca5e5ca 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -30,13 +30,13 @@
#include <anchoreddrawobject.hxx>
class SfxPoolItem;
-class SwFrmFmt;
-class SwFlyFrmFmt;
+class SwFrameFormat;
+class SwFlyFrameFormat;
class SwFlyFrm;
class SwFrm;
class SwPageFrm;
class SwVirtFlyDrawObj;
-class SwFmtAnchor;
+class SwFormatAnchor;
class SwFlyDrawObj;
class SwRect;
class SwDrawContact;
@@ -49,9 +49,9 @@ class SdrTextObj;
If not it is a simple DrawObject. It has a UserCall which
is client of the format we are looking for.
Implementation in dcontact.cxx. */
-SW_DLLPUBLIC SwFrmFmt *FindFrmFmt( SdrObject *pObj );
-inline const SwFrmFmt *FindFrmFmt( const SdrObject *pObj )
-{ return ::FindFrmFmt( const_cast<SdrObject*>(pObj) ); }
+SW_DLLPUBLIC SwFrameFormat *FindFrameFormat( SdrObject *pObj );
+inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj )
+{ return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); }
bool HasWrap( const SdrObject* pObj );
void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
@@ -105,7 +105,7 @@ public:
TYPEINFO_OVERRIDE();
/// For reader. Only the connection is created.
- SwContact( SwFrmFmt *pToRegisterIn );
+ SwContact( SwFrameFormat *pToRegisterIn );
virtual ~SwContact();
virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const = 0;
@@ -115,9 +115,9 @@ public:
virtual SdrObject *GetMaster() = 0;
virtual void SetMaster( SdrObject* _pNewMaster ) = 0;
- SwFrmFmt *GetFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
- const SwFrmFmt *GetFmt() const
- { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
+ SwFrameFormat *GetFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+ const SwFrameFormat *GetFormat() const
+ { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
bool IsInDTOR() const { return mbInDTOR;}
@@ -145,27 +145,27 @@ public:
/** some virtual helper methods for information
about the object (Writer fly frame resp. drawing object) */
- const SwFmtAnchor& GetAnchorFmt() const
+ const SwFormatAnchor& GetAnchorFormat() const
{
- assert( GetFmt() );
+ assert( GetFormat() );
- return GetFmt()->GetAnchor();
+ return GetFormat()->GetAnchor();
}
- RndStdIds GetAnchorId() const { return GetAnchorFmt().GetAnchorId(); }
+ RndStdIds GetAnchorId() const { return GetAnchorFormat().GetAnchorId(); }
bool ObjAnchoredAtPage() const { return GetAnchorId() == FLY_AT_PAGE; }
bool ObjAnchoredAtFly() const { return GetAnchorId() == FLY_AT_FLY; }
bool ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_PARA; }
bool ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AT_CHAR; }
bool ObjAnchoredAsChar() const { return GetAnchorId() == FLY_AS_CHAR; }
- const SwPosition& GetCntntAnchor() const
+ const SwPosition& GetContentAnchor() const
{
- assert( GetAnchorFmt().GetCntntAnchor() );
- return *(GetAnchorFmt().GetCntntAnchor());
+ assert( GetAnchorFormat().GetContentAnchor() );
+ return *(GetAnchorFormat().GetContentAnchor());
}
- const SwIndex& GetCntntAnchorIndex() const;
+ const SwIndex& GetContentAnchorIndex() const;
/** get data collection of anchored objects, handled by with contact
@@ -198,7 +198,7 @@ public:
TYPEINFO_OVERRIDE();
/// Creates DrawObject and registers it with the Model.
- SwFlyDrawContact( SwFlyFrmFmt* pToRegisterIn, SdrModel* pMod );
+ SwFlyDrawContact( SwFlyFrameFormat* pToRegisterIn, SdrModel* pMod );
virtual ~SwFlyDrawContact();
virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -390,7 +390,7 @@ class SwDrawContact : public SwContact
public:
TYPEINFO_OVERRIDE();
- SwDrawContact( SwFrmFmt *pToRegisterIn, SdrObject *pObj );
+ SwDrawContact( SwFrameFormat *pToRegisterIn, SdrObject *pObj );
virtual ~SwDrawContact();
virtual const SwAnchoredObject* GetAnchoredObj( const SdrObject* _pSdrObj ) const SAL_OVERRIDE;
@@ -419,9 +419,9 @@ class SwDrawContact : public SwContact
SwPageFrm* FindPage( const SwRect &rRect );
/** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm).
- The anchor is determined according to the attribute SwFmtAnchor.
+ The anchor is determined according to the attribute SwFormatAnchor.
If required the object gets unregistered with the old anchor. */
- void ConnectToLayout( const SwFmtAnchor *pAnch = 0 );
+ void ConnectToLayout( const SwFormatAnchor *pAnch = 0 );
/** method to insert 'master' drawing object
into drawing page */
void InsertMasterIntoDrawPage();
@@ -459,7 +459,7 @@ class SwDrawContact : public SwContact
/** get data collection of anchored objects, handled by with contact
*/
- static void GetTextObjectsFromFmt( std::list<SdrTextObj*>&, SwDoc* );
+ static void GetTextObjectsFromFormat( std::list<SdrTextObj*>&, SwDoc* );
virtual void GetAnchoredObjs( std::list<SwAnchoredObject*>& _roAnchoredObjs ) const SAL_OVERRIDE;
};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 5459308496a9..77a045880e3b 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -82,72 +82,72 @@ class SwAutoCompleteWord;
class SwAutoCorrExceptWord;
class SwCalc;
class SwCellFrm;
-class SwCharFmt;
-class SwCharFmts;
-class SwConditionTxtFmtColl;
+class SwCharFormat;
+class SwCharFormats;
+class SwConditionTextFormatColl;
class SwCrsrShell;
class SwCursor;
class SwDBNameInfField;
class SwDocShell;
-class SwDocUpdtFld;
-class SwDrawFrmFmt;
+class SwDocUpdateField;
+class SwDrawFrameFormat;
class SwDrawView;
class SwEditShell;
class SwFieldType;
class SwField;
-class SwTxtFld;
-class SwFldTypes;
-class SwFlyFrmFmt;
-class SwFmtsBase;
-class SwFmt;
-class SwFmtINetFmt;
-class SwFmtRefMark;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFtnIdxs;
-class SwFtnInfo;
+class SwTextField;
+class SwFieldTypes;
+class SwFlyFrameFormat;
+class SwFormatsBase;
+class SwFormat;
+class SwFormatINetFormat;
+class SwFormatRefMark;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFootnoteIdxs;
+class SwFootnoteInfo;
class SwEndNoteInfo;
class GraphicObject;
-class SwGrfFmtColl;
-class SwGrfFmtColls;
+class SwGrfFormatColl;
+class SwGrfFormatColls;
class SwLineNumberInfo;
class SwDBManager;
-class SwNoTxtNode;
+class SwNoTextNode;
class SwNodeIndex;
class SwNodeRange;
class SwNodes;
class SwNumRule;
-class SwNumRuleTbl;
+class SwNumRuleTable;
class SwPageDesc;
class SwPagePreviewPrtData;
class SwRangeRedline;
-class SwRedlineTbl;
-class SwExtraRedlineTbl;
+class SwRedlineTable;
+class SwExtraRedlineTable;
class SwRootFrm;
class SwRubyList;
class SwRubyListEntry;
-class SwSectionFmt;
-class SwSectionFmts;
+class SwSectionFormat;
+class SwSectionFormats;
class SwSectionData;
class SwSelBoxes;
class SwTOXBaseSection;
class SwTOXTypes;
class SwTabCols;
class SwTable;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
class SwTableBox;
-class SwTableBoxFmt;
-class SwTableFmt;
-class SwTableLineFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
+class SwTableLineFormat;
class SwTableNode;
class SwTextBlocks;
-class SwTxtFmtColl;
-class SwTxtFmtColls;
+class SwTextFormatColl;
+class SwTextFormatColls;
class SwURLStateChanged;
class SwUnoCrsr;
-class SwUnoCrsrTbl;
+class SwUnoCrsrTable;
class SwViewShell;
-class _SetGetExpFld;
+class _SetGetExpField;
class SwDrawContact;
class SwLayouter;
class SdrView;
@@ -191,7 +191,7 @@ class IDocumentState;
class IDocumentLayoutAccess;
class IDocumentStylePoolAccess;
class IDocumentExternalData;
-class _SetGetExpFlds;
+class _SetGetExpFields;
namespace sw { namespace mark {
class MarkManager;
@@ -291,20 +291,20 @@ class SW_DLLPUBLIC SwDoc :
const ::boost::scoped_ptr< ::sw::DocumentExternalDataManager > m_pDocumentExternalDataManager;
// Pointer
- SwFrmFmt *mpDfltFrmFmt; //< Default formats.
- SwFrmFmt *mpEmptyPageFmt; //< Format for the default empty page
- SwFrmFmt *mpColumnContFmt; //< Format for column container
- SwCharFmt *mpDfltCharFmt;
- SwTxtFmtColl *mpDfltTxtFmtColl; //< Defaultformatcollections
- SwGrfFmtColl *mpDfltGrfFmtColl;
-
- SwFrmFmts *mpFrmFmtTbl; //< Format table
- SwCharFmts *mpCharFmtTbl;
- SwFrmFmts *mpSpzFrmFmtTbl;
- SwSectionFmts *mpSectionFmtTbl;
- SwFrmFmts *mpTblFrmFmtTbl; //< For tables
- SwTxtFmtColls *mpTxtFmtCollTbl; //< FormatCollections
- SwGrfFmtColls *mpGrfFmtCollTbl;
+ SwFrameFormat *mpDfltFrameFormat; //< Default formats.
+ SwFrameFormat *mpEmptyPageFormat; //< Format for the default empty page
+ SwFrameFormat *mpColumnContFormat; //< Format for column container
+ SwCharFormat *mpDfltCharFormat;
+ SwTextFormatColl *mpDfltTextFormatColl; //< Defaultformatcollections
+ SwGrfFormatColl *mpDfltGrfFormatColl;
+
+ SwFrameFormats *mpFrameFormatTable; //< Format table
+ SwCharFormats *mpCharFormatTable;
+ SwFrameFormats *mpSpzFrameFormatTable;
+ SwSectionFormats *mpSectionFormatTable;
+ SwFrameFormats *mpTableFrameFormatTable; //< For tables
+ SwTextFormatColls *mpTextFormatCollTable; //< FormatCollections
+ SwGrfFormatColls *mpGrfFormatCollTable;
SwTOXTypes *mpTOXTypes; //< Tables/indices
SwDefTOXBase_Impl * mpDefTOXBases; //< defaults of SwTOXBase's
@@ -315,10 +315,10 @@ class SW_DLLPUBLIC SwDoc :
SwDoc *mpGlossaryDoc; //< Pointer to glossary-document.
SwNumRule *mpOutlineRule;
- SwFtnInfo *mpFtnInfo;
+ SwFootnoteInfo *mpFootnoteInfo;
SwEndNoteInfo *mpEndNoteInfo;
SwLineNumberInfo*mpLineNumberInfo;
- SwFtnIdxs *mpFtnIdxs;
+ SwFootnoteIdxs *mpFootnoteIdxs;
SwDocShell *mpDocShell; //< Ptr to SfxDocShell of Doc.
SfxObjectShellLock mxTmpDocShell; //< A temporary shell that is used to copy OLE-Nodes
@@ -328,12 +328,12 @@ class SW_DLLPUBLIC SwDoc :
SwURLStateChanged *mpURLStateChgd; //< SfxClient for changes in INetHistory
SvNumberFormatter *mpNumberFormatter;//< NumFormatter for tables / fields
- mutable SwNumRuleTbl *mpNumRuleTbl; //< List of all named NumRules.
+ mutable SwNumRuleTable *mpNumRuleTable; //< List of all named NumRules.
// Hash map to find numrules by name
mutable std::unordered_map<OUString, SwNumRule *, OUStringHash> maNumRuleMap;
- SwUnoCrsrTbl *mpUnoCrsrTbl;
+ SwUnoCrsrTable *mpUnoCrsrTable;
SwPagePreviewPrtData *mpPgPViewPrtData; //< Indenting / spacing for printing of page view.
SwPaM *mpExtInputRing;
@@ -373,13 +373,13 @@ private:
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 mbIsAutoFmtRedline : 1; //< TRUE: Redlines are recorded by Autoformat.
+ bool mbIsAutoFormatRedline : 1; //< TRUE: Redlines are recorded by Autoformat.
bool mbOLEPrtNotifyPending : 1; /**< TRUE: Printer has changed. At creation of
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 mbInsOnlyTextGlssry : 1; //< True: insert 'only text' glossary into doc
bool mbContains_MSVBasic : 1; //< True: MS-VBasic exist is in our storage
bool mbClipBoard : 1; //< TRUE: this document represents the clipboard
bool mbColumnSelection : 1; /**< TRUE: this content has bee created by a column selection
@@ -397,20 +397,20 @@ private:
static SwAutoCompleteWord *mpACmpltWords; //< List of all words for AutoComplete
// private methods
- SwFlyFrmFmt* _MakeFlySection( const SwPosition& rAnchPos,
- const SwCntntNode& rNode, RndStdIds eRequestId,
+ SwFlyFrameFormat* _MakeFlySection( const SwPosition& rAnchPos,
+ const SwContentNode& rNode, RndStdIds eRequestId,
const SfxItemSet* pFlyAttrSet,
- SwFrmFmt* = 0 );
- sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool bNewFrms );
-
- typedef SwFmt* (SwDoc:: *FNCopyFmt)( const OUString&, SwFmt*, bool, bool );
- SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
- FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
- void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
- FNCopyFmt fnCopyFmt, SwFmt& rDfltFmt );
+ SwFrameFormat* = 0 );
+ sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms );
+
+ typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
+ SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr,
+ FNCopyFormat fnCopyFormat, const SwFormat& rDfltFormat );
+ void CopyFormatArr( const SwFormatsBase& rSourceArr, SwFormatsBase& rDestArr,
+ FNCopyFormat fnCopyFormat, SwFormat& rDfltFormat );
void CopyPageDescHeaderFooterImpl( bool bCpyHeader,
- const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt );
- static SwFmt* FindFmtByName( const SwFmtsBase& rFmtArr, const OUString& rName );
+ const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat );
+ static SwFormat* FindFormatByName( const SwFormatsBase& rFormatArr, const OUString& rName );
SwDoc( const SwDoc &) SAL_DELETED_FUNCTION;
@@ -428,15 +428,15 @@ private:
void _CreateNumberFormatter();
- bool _UnProtectTblCells( SwTable& rTbl );
+ bool _UnProtectTableCells( SwTable& rTable );
/** Create sub-documents according to the given collection.
If no collection is given, take chapter style of the 1st level. */
bool SplitDoc( sal_uInt16 eDocType, const OUString& rPath, bool bOutline,
- const SwTxtFmtColl* pSplitColl, int nOutlineLevel = 0 );
+ const SwTextFormatColl* pSplitColl, int nOutlineLevel = 0 );
// Update charts of given table.
- void _UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const;
+ void _UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const;
static bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
sal_uInt16 nMode );
@@ -446,11 +446,11 @@ private:
DECL_LINK_TYPED( DoUpdateModifiedOLE, Idle *, void );
public:
- SwFmt *_MakeCharFmt(const OUString &, SwFmt *, bool, bool );
- SwFmt *_MakeFrmFmt(const OUString &, SwFmt *, bool, bool );
+ SwFormat *_MakeCharFormat(const OUString &, SwFormat *, bool, bool );
+ SwFormat *_MakeFrameFormat(const OUString &, SwFormat *, bool, bool );
private:
- SwFmt *_MakeTxtFmtColl(const OUString &, SwFmt *, bool, bool );
+ SwFormat *_MakeTextFormatColl(const OUString &, SwFormat *, bool, bool );
private:
bool mbReadOnly;
@@ -532,7 +532,7 @@ public:
::sw::DocumentContentOperationsManager const & GetDocumentContentOperationsManager() const;
::sw::DocumentContentOperationsManager & GetDocumentContentOperationsManager();
- bool UpdateParRsid( SwTxtNode *pTxtNode, sal_uInt32 nVal = 0 );
+ bool UpdateParRsid( SwTextNode *pTextNode, sal_uInt32 nVal = 0 );
bool UpdateRsid( const SwPaM &rRg, sal_Int32 nLen );
// IDocumentStylePoolAccess
@@ -635,18 +635,18 @@ public:
have to be surrounded completely by ::com::sun::star::awt::Selection.
( Start < Pos < End ) !!!
(Required for Writers.) */
- SwPosFlyFrms GetAllFlyFmts( const SwPaM* = 0,
+ SwPosFlyFrms GetAllFlyFormats( const SwPaM* = 0,
bool bDrawAlso = false,
bool bAsCharAlso = false ) const;
// Because swrtf.cxx and define private public here now.
- SwFlyFrmFmt *MakeFlyFrmFmt (const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
- SwDrawFrmFmt *MakeDrawFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
+ SwFlyFrameFormat *MakeFlyFrameFormat (const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+ SwDrawFrameFormat *MakeDrawFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
// From now on this interface has to be used for Flys.
// pAnchorPos must be set, if they are not attached to pages AND
- // Anchor is not already set at valid CntntPos
- // in FlySet/FrmFmt.
+ // Anchor is not already set at valid ContentPos
+ // in FlySet/FrameFormat.
/* new parameter bCalledFromShell
true: An existing adjust item at pAnchorPos is propagated to
@@ -656,14 +656,14 @@ public:
false: no propagation
*/
- SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType,
+ SwFlyFrameFormat* MakeFlySection( RndStdIds eAnchorType,
const SwPosition* pAnchorPos,
const SfxItemSet* pSet = 0,
- SwFrmFmt *pParent = 0,
+ SwFrameFormat *pParent = 0,
bool bCalledFromShell = false );
- SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
+ SwFlyFrameFormat* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
const SwSelBoxes* pSelBoxes = 0,
- SwFrmFmt *pParent = 0 );
+ SwFrameFormat *pParent = 0 );
//UUUU Helper that checks for unique items for DrawingLayer items of type NameOrIndex
// and evtl. corrects that items to ensure unique names for that type. This call may
@@ -672,25 +672,25 @@ public:
// these items work for the UNO API and thus e.g. for ODF im/export)
void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
- bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
+ bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
- bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
+ bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat,
SfxItemSet* pSet = 0, bool bKeepOrient = false );
- void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
+ void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
const OUString& sNewTitle );
- void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
+ void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
const OUString& sNewDescription );
// Footnotes
// Footnote information
- const SwFtnInfo& GetFtnInfo() const { return *mpFtnInfo; }
- void SetFtnInfo(const SwFtnInfo& rInfo);
+ const SwFootnoteInfo& GetFootnoteInfo() const { return *mpFootnoteInfo; }
+ void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
const SwEndNoteInfo& GetEndNoteInfo() const { return *mpEndNoteInfo; }
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
- SwFtnIdxs& GetFtnIdxs() { return *mpFtnIdxs; }
- const SwFtnIdxs& GetFtnIdxs() const { return *mpFtnIdxs; }
+ SwFootnoteIdxs& GetFootnoteIdxs() { return *mpFootnoteIdxs; }
+ const SwFootnoteIdxs& GetFootnoteIdxs() const { return *mpFootnoteIdxs; }
// change footnotes in area
- bool SetCurFtn( const SwPaM& rPam, const OUString& rNumStr,
+ bool SetCurFootnote( const SwPaM& rPam, const OUString& rNumStr,
sal_uInt16 nNumber, bool bIsEndNote );
/** Operations on the content of the document e.g.
@@ -712,7 +712,7 @@ public:
// Glossary Document
void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
- bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; }
+ bool IsInsOnlyTextGlossary() const { return mbInsOnlyTextGlssry; }
void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bImpress );
@@ -747,34 +747,34 @@ public:
std::set<SwRootFrm*> GetAllLayouts();
- void SetFlyName( SwFlyFrmFmt& rFmt, const OUString& rName );
- const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
+ void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName );
+ const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
- static void GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName, OUString* pFltName );
+ static void GetGrfNms( const SwFlyFrameFormat& rFormat, OUString* pGrfName, OUString* pFltName );
// 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-
+ /** Reset attributes. All TextHints and (if completely selected) all hard-
formatted stuff (auto-formats) are removed.
Introduce new optional parameter <bSendDataChangedEvents> in order to
control, if the side effect "send data changed events" is triggered or not. */
void ResetAttrs( const SwPaM &rRg,
- bool bTxtAttr = true,
+ bool bTextAttr = true,
const std::set<sal_uInt16> &rAttrs = std::set<sal_uInt16>(),
const bool bSendDataChangedEvents = true );
- void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
+ void RstTextAttrs(const SwPaM &rRg, bool bInclRefToxMark = false, bool bExactRange = false );
/** Set attribute in given format.1y
* If Undo is enabled, the old values is added to the Undo history. */
- void SetAttr( const SfxPoolItem&, SwFmt& );
+ void SetAttr( const SfxPoolItem&, SwFormat& );
/** Set attribute in given format.1y
* If Undo is enabled, the old values is added to the Undo history. */
- void SetAttr( const SfxItemSet&, SwFmt& );
+ void SetAttr( const SfxItemSet&, SwFormat& );
// method to reset a certain attribute at the given format
void ResetAttrAtFormat( const sal_uInt16 nWhichId,
- SwFmt& rChangedFormat );
+ SwFormat& rChangedFormat );
/** Set attribute as new default attribute in current document.
If Undo is activated, the old one is listed in Undo-History. */
@@ -782,107 +782,107 @@ public:
void SetDefault( const SfxItemSet& );
// Query default attribute in this document.
- const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+ const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
// Do not expand text attributes.
- bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
+ bool DontExpandFormat( const SwPosition& rPos, bool bFlag = true );
// Formats
- const SwFrmFmts* GetFrmFmts() const { return mpFrmFmtTbl; }
- SwFrmFmts* GetFrmFmts() { return mpFrmFmtTbl; }
- const SwCharFmts* GetCharFmts() const { return mpCharFmtTbl;}
- SwCharFmts* GetCharFmts() { return mpCharFmtTbl;}
+ const SwFrameFormats* GetFrameFormats() const { return mpFrameFormatTable; }
+ SwFrameFormats* GetFrameFormats() { return mpFrameFormatTable; }
+ const SwCharFormats* GetCharFormats() const { return mpCharFormatTable;}
+ SwCharFormats* GetCharFormats() { return mpCharFormatTable;}
// LayoutFormats (frames, DrawObjects), sometimes const sometimes not
- const SwFrmFmts* GetSpzFrmFmts() const { return mpSpzFrmFmtTbl; }
- SwFrmFmts* GetSpzFrmFmts() { return mpSpzFrmFmtTbl; }
-
- const SwFrmFmt *GetDfltFrmFmt() const { return mpDfltFrmFmt; }
- SwFrmFmt *GetDfltFrmFmt() { return mpDfltFrmFmt; }
- const SwFrmFmt *GetEmptyPageFmt() const { return mpEmptyPageFmt; }
- SwFrmFmt *GetEmptyPageFmt() { return mpEmptyPageFmt; }
- const SwFrmFmt *GetColumnContFmt() const{ return mpColumnContFmt; }
- SwFrmFmt *GetColumnContFmt() { return mpColumnContFmt; }
- const SwCharFmt *GetDfltCharFmt() const { return mpDfltCharFmt;}
- SwCharFmt *GetDfltCharFmt() { return mpDfltCharFmt;}
+ const SwFrameFormats* GetSpzFrameFormats() const { return mpSpzFrameFormatTable; }
+ SwFrameFormats* GetSpzFrameFormats() { return mpSpzFrameFormatTable; }
+
+ const SwFrameFormat *GetDfltFrameFormat() const { return mpDfltFrameFormat; }
+ SwFrameFormat *GetDfltFrameFormat() { return mpDfltFrameFormat; }
+ const SwFrameFormat *GetEmptyPageFormat() const { return mpEmptyPageFormat; }
+ SwFrameFormat *GetEmptyPageFormat() { return mpEmptyPageFormat; }
+ const SwFrameFormat *GetColumnContFormat() const{ return mpColumnContFormat; }
+ SwFrameFormat *GetColumnContFormat() { return mpColumnContFormat; }
+ const SwCharFormat *GetDfltCharFormat() const { return mpDfltCharFormat;}
+ SwCharFormat *GetDfltCharFormat() { return mpDfltCharFormat;}
// @return the interface of the management of (auto)styles
IStyleAccess& GetIStyleAccess() { return *mpStyleAccess; }
// Remove all language dependencies from all existing formats
- void RemoveAllFmtLanguageDependencies();
+ void RemoveAllFormatLanguageDependencies();
- SwFrmFmt *MakeFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom,
+ SwFrameFormat *MakeFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom,
bool bBroadcast = false, bool bAuto = true);
- void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
- SwFrmFmt* FindFrmFmtByName( const OUString& rName ) const
- { return static_cast<SwFrmFmt*>(FindFmtByName( static_cast<SwFmtsBase&>(*mpFrmFmtTbl), rName )); }
+ void DelFrameFormat( SwFrameFormat *pFormat, bool bBroadcast = false );
+ SwFrameFormat* FindFrameFormatByName( const OUString& rName ) const
+ { return static_cast<SwFrameFormat*>(FindFormatByName( static_cast<SwFormatsBase&>(*mpFrameFormatTable), rName )); }
- SwCharFmt *MakeCharFmt(const OUString &rFmtName, SwCharFmt *pDerivedFrom,
+ SwCharFormat *MakeCharFormat(const OUString &rFormatName, SwCharFormat *pDerivedFrom,
bool bBroadcast = false,
bool bAuto = true );
- void DelCharFmt(size_t nFmt, bool bBroadcast = false);
- void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
- SwCharFmt* FindCharFmtByName( const OUString& rName ) const
- { return static_cast<SwCharFmt*>(FindFmtByName( (SwFmtsBase&)*mpCharFmtTbl, rName )); }
+ void DelCharFormat(size_t nFormat, bool bBroadcast = false);
+ void DelCharFormat(SwCharFormat* pFormat, bool bBroadcast = false);
+ SwCharFormat* FindCharFormatByName( const OUString& rName ) const
+ { return static_cast<SwCharFormat*>(FindFormatByName( (SwFormatsBase&)*mpCharFormatTable, rName )); }
// Formatcollections (styles)
// TXT
- const SwTxtFmtColl* GetDfltTxtFmtColl() const { return mpDfltTxtFmtColl; }
- SwTxtFmtColl* GetDfltTxtFmtColl() { return mpDfltTxtFmtColl; }
- const SwTxtFmtColls *GetTxtFmtColls() const { return mpTxtFmtCollTbl; }
- SwTxtFmtColls *GetTxtFmtColls() { return mpTxtFmtCollTbl; }
- SwTxtFmtColl *MakeTxtFmtColl( const OUString &rFmtName,
- SwTxtFmtColl *pDerivedFrom,
+ const SwTextFormatColl* GetDfltTextFormatColl() const { return mpDfltTextFormatColl; }
+ SwTextFormatColl* GetDfltTextFormatColl() { return mpDfltTextFormatColl; }
+ const SwTextFormatColls *GetTextFormatColls() const { return mpTextFormatCollTable; }
+ SwTextFormatColls *GetTextFormatColls() { return mpTextFormatCollTable; }
+ SwTextFormatColl *MakeTextFormatColl( const OUString &rFormatName,
+ SwTextFormatColl *pDerivedFrom,
bool bBroadcast = false,
bool bAuto = true );
- SwConditionTxtFmtColl* MakeCondTxtFmtColl( const OUString &rFmtName,
- SwTxtFmtColl *pDerivedFrom,
+ SwConditionTextFormatColl* MakeCondTextFormatColl( const OUString &rFormatName,
+ SwTextFormatColl *pDerivedFrom,
bool bBroadcast = false);
- void DelTxtFmtColl(size_t nFmt, bool bBroadcast = false);
- void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
+ void DelTextFormatColl(size_t nFormat, bool bBroadcast = false);
+ void DelTextFormatColl( SwTextFormatColl* pColl, bool bBroadcast = false );
/** Add 4th optional parameter <bResetListAttrs>.
- 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
+ 'side effect' of <SetTextFormatColl> with <bReset = true> is that the hard
attributes of the affected text nodes are cleared, except the break
attribute, the page description attribute and the list style attribute.
The new parameter <bResetListAttrs> indicates, if the list attributes
(list style, restart at and restart with) are cleared as well in case
that <bReset = true> and the paragraph style has a list style attribute set. */
- bool SetTxtFmtColl(const SwPaM &rRg, SwTxtFmtColl *pFmt,
+ bool SetTextFormatColl(const SwPaM &rRg, SwTextFormatColl *pFormat,
const bool bReset = true,
const bool bResetListAttrs = false);
- SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const
- { return static_cast<SwTxtFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpTxtFmtCollTbl, rName )); }
+ SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const
+ { return static_cast<SwTextFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpTextFormatCollTable, rName )); }
void ChkCondColls();
- const SwGrfFmtColl* GetDfltGrfFmtColl() const { return mpDfltGrfFmtColl; }
- SwGrfFmtColl* GetDfltGrfFmtColl() { return mpDfltGrfFmtColl; }
- const SwGrfFmtColls *GetGrfFmtColls() const { return mpGrfFmtCollTbl; }
- SwGrfFmtColl *MakeGrfFmtColl(const OUString &rFmtName,
- SwGrfFmtColl *pDerivedFrom);
- SwGrfFmtColl* FindGrfFmtCollByName( const OUString& rName ) const
- { return static_cast<SwGrfFmtColl*>(FindFmtByName( (SwFmtsBase&)*mpGrfFmtCollTbl, rName )); }
+ const SwGrfFormatColl* GetDfltGrfFormatColl() const { return mpDfltGrfFormatColl; }
+ SwGrfFormatColl* GetDfltGrfFormatColl() { return mpDfltGrfFormatColl; }
+ const SwGrfFormatColls *GetGrfFormatColls() const { return mpGrfFormatCollTable; }
+ SwGrfFormatColl *MakeGrfFormatColl(const OUString &rFormatName,
+ SwGrfFormatColl *pDerivedFrom);
+ SwGrfFormatColl* FindGrfFormatCollByName( const OUString& rName ) const
+ { return static_cast<SwGrfFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpGrfFormatCollTable, rName )); }
// Table formatting
- const SwFrmFmts* GetTblFrmFmts() const { return mpTblFrmFmtTbl; }
- SwFrmFmts* GetTblFrmFmts() { return mpTblFrmFmtTbl; }
- size_t GetTblFrmFmtCount( bool bUsed ) const;
- SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed ) const;
- SwTableFmt* MakeTblFrmFmt(const OUString &rFmtName, SwFrmFmt *pDerivedFrom);
- void DelTblFrmFmt( SwTableFmt* pFmt );
- SwTableFmt* FindTblFmtByName( const OUString& rName, bool bAll = false ) const;
+ const SwFrameFormats* GetTableFrameFormats() const { return mpTableFrameFormatTable; }
+ SwFrameFormats* GetTableFrameFormats() { return mpTableFrameFormatTable; }
+ size_t GetTableFrameFormatCount( bool bUsed ) const;
+ SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed ) const;
+ SwTableFormat* MakeTableFrameFormat(const OUString &rFormatName, SwFrameFormat *pDerivedFrom);
+ void DelTableFrameFormat( SwTableFormat* pFormat );
+ SwTableFormat* FindTableFormatByName( const OUString& rName, bool bAll = false ) const;
/** Access to frames.
Iterate over Flys - forr Basic-Collections. */
size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
- SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
+ SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false );
// 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 );
+ SwFrameFormat *CopyFrameFormat ( const SwFrameFormat& );
+ SwCharFormat *CopyCharFormat( const SwCharFormat& );
+ SwTextFormatColl* CopyTextColl( const SwTextFormatColl& rColl );
+ SwGrfFormatColl* CopyGrfColl( const SwGrfFormatColl& rColl );
// Replace all styles with those from rSource.
void ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles = true );
@@ -948,19 +948,19 @@ public:
bool ContainsPageDesc(const SwPageDesc *pDesc, size_t* pPos = NULL);
/** Copy the complete PageDesc - beyond document and "deep"!
- Optionally copying of PoolFmtId, -HlpId can be prevented. */
+ Optionally copying of PoolFormatId, -HlpId can be prevented. */
void CopyPageDesc( const SwPageDesc& rSrcDesc, SwPageDesc& rDstDesc,
bool bCopyPoolIds = true );
- /** Copy header (with contents) from SrcFmt to DestFmt
+ /** Copy header (with contents) from SrcFormat to DestFormat
(can also be copied into other document). */
- void CopyHeader( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
- { CopyPageDescHeaderFooterImpl( true, rSrcFmt, rDestFmt ); }
+ void CopyHeader( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+ { CopyPageDescHeaderFooterImpl( true, rSrcFormat, rDestFormat ); }
- /** Copy footer (with contents) from SrcFmt to DestFmt.
+ /** Copy footer (with contents) from SrcFormat to DestFormat.
(can also be copied into other document). */
- void CopyFooter( const SwFrmFmt& rSrcFmt, SwFrmFmt& rDestFmt )
- { CopyPageDescHeaderFooterImpl( false, rSrcFmt, rDestFmt ); }
+ void CopyFooter( const SwFrameFormat& rSrcFormat, SwFrameFormat& rDestFormat )
+ { CopyPageDescHeaderFooterImpl( false, rSrcFormat, rDestFormat ); }
// For Reader
void ChgPageDesc( const OUString & rName, const SwPageDesc& );
@@ -977,7 +977,7 @@ public:
/** The html import sometimes overwrites the
page sizes set in the page descriptions. This function is used to
correct this. */
- void CheckDefaultPageFmt();
+ void CheckDefaultPageFormat();
// Methods for tables/indices
static sal_uInt16 GetCurTOXMark( const SwPosition& rPos, SwTOXMarks& );
@@ -1041,7 +1041,7 @@ public:
sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) const;
// Sort table text.
- bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
+ bool SortTable(const SwSelBoxes& rBoxes, const SwSortOptions&);
bool SortText(const SwPaM&, const SwSortOptions&);
// Correct the SwPosition-Objects that are registered with the document
@@ -1118,7 +1118,7 @@ public:
static SwNumRule* GetNumRuleAtPos( const SwPosition& rPos );
- const SwNumRuleTbl& GetNumRuleTbl() const { return *mpNumRuleTbl; }
+ const SwNumRuleTable& GetNumRuleTable() const { return *mpNumRuleTable; }
/**
Add numbering rule to document.
@@ -1143,7 +1143,7 @@ public:
OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
void UpdateNumRule(); // Update all invalids.
- void ChgNumRuleFmts( const SwNumRule& rRule );
+ void ChgNumRuleFormats( const SwNumRule& rRule );
bool ReplaceNumRule( const SwPosition& rPos, const OUString& rOldRule,
const OUString& rNewRule );
@@ -1213,28 +1213,28 @@ public:
propagation.
false: do not propagate
*/
- const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER
+ const SwTable* InsertTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER
const SwPosition& rPos, sal_uInt16 nRows,
sal_uInt16 nCols, short eAdjust,
- const SwTableAutoFmt* pTAFmt = 0,
+ const SwTableAutoFormat* pTAFormat = 0,
const std::vector<sal_uInt16> *pColArr = 0,
bool bCalledFromShell = false,
bool bNewModel = true );
// If index is in a table, return TableNode, else 0.
- SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
- inline const SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ) const;
+ SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx );
+ inline const SwTableNode* IsIdxInTable( const SwNodeIndex& rIdx ) const;
// Create a balanced table out of the selected range.
- const SwTable* TextToTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER,
+ const SwTable* TextToTable( const SwInsertTableOptions& rInsTableOpts, // HEADLINE_NO_BORDER,
const SwPaM& rRange, sal_Unicode cCh,
short eAdjust,
- const SwTableAutoFmt* = 0 );
+ const SwTableAutoFormat* = 0 );
// text to table conversion - API support
const SwTable* TextToTable( const std::vector< std::vector<SwNodeRange> >& rTableNodes );
- bool TableToText( const SwTableNode* pTblNd, sal_Unicode cCh );
+ bool TableToText( const SwTableNode* pTableNd, sal_Unicode cCh );
// Create columns / rows in table.
bool InsertCol( const SwCursor& rCursor,
@@ -1252,15 +1252,15 @@ public:
bool DeleteCol( const SwCursor& rCursor );
// Split / concatenate boxes in table.
- bool SplitTbl( const SwSelBoxes& rBoxes, bool bVert = true,
+ bool SplitTable( const SwSelBoxes& rBoxes, bool bVert = true,
sal_uInt16 nCnt = 1, bool bSameHeight = false );
// @return enum TableMergeErr.
- sal_uInt16 MergeTbl( SwPaM& rPam );
- OUString GetUniqueTblName() const;
- bool IsInsTblFormatNum() const;
- bool IsInsTblChangeNumFormat() const;
- bool IsInsTblAlignNum() const;
+ sal_uInt16 MergeTable( SwPaM& rPam );
+ OUString GetUniqueTableName() const;
+ bool IsInsTableFormatNum() const;
+ bool IsInsTableChangeNumFormat() const;
+ bool IsInsTableAlignNum() const;
// From FEShell (for Undo and BModified).
static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
@@ -1279,34 +1279,34 @@ public:
void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet );
// AutoFormat for table/table selection.
- bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
+ bool SetTableAutoFormat( const SwSelBoxes& rBoxes, const SwTableAutoFormat& rNew );
// Query attributes.
- bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet );
+ bool GetTableAutoFormat( const SwSelBoxes& rBoxes, SwTableAutoFormat& rGet );
void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
SwTwips nAbsDiff, SwTwips nRelDiff );
- SwTableBoxFmt* MakeTableBoxFmt();
- SwTableLineFmt* MakeTableLineFmt();
+ SwTableBoxFormat* MakeTableBoxFormat();
+ SwTableLineFormat* MakeTableLineFormat();
// Check if box has numerical valule. Change format of box if required.
- void ChkBoxNumFmt( SwTableBox& rAktBox, bool bCallUpdate );
- void SetTblBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
+ void ChkBoxNumFormat( SwTableBox& rAktBox, bool bCallUpdate );
+ void SetTableBoxFormulaAttrs( SwTableBox& rBox, const SfxItemSet& rSet );
void ClearBoxNumAttrs( const SwNodeIndex& rNode );
void ClearLineNumAttrs( SwPosition & rPos );
- bool InsCopyOfTbl( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
- const SwTable* pCpyTbl = 0, bool bCpyName = false,
+ bool InsCopyOfTable( SwPosition& rInsPos, const SwSelBoxes& rBoxes,
+ const SwTable* pCpyTable = 0, bool bCpyName = false,
bool bCorrPos = false );
- bool UnProtectCells( const OUString& rTblName );
+ bool UnProtectCells( const OUString& rTableName );
bool UnProtectCells( const SwSelBoxes& rBoxes );
- bool UnProtectTbls( const SwPaM& rPam );
- bool HasTblAnyProtection( const SwPosition* pPos,
- const OUString* pTblName = 0,
- bool* pFullTblProtection = 0 );
+ bool UnProtectTables( const SwPaM& rPam );
+ bool HasTableAnyProtection( const SwPosition* pPos,
+ const OUString* pTableName = 0,
+ bool* pFullTableProtection = 0 );
// Split table at baseline position, i.e. create a new table.
bool SplitTable( const SwPosition& rPos, sal_uInt16 eMode = 0,
@@ -1324,26 +1324,26 @@ public:
void UpdateAllCharts() { DoUpdateAllCharts(); }
// Table is renamed and refreshes charts.
- void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+ void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
// @return the reference in document that is set for name.
- const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+ const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
// @return RefMark via index - for UNO.
- const SwFmtRefMark* GetRefMark( sal_uInt16 nIndex ) const;
+ const SwFormatRefMark* 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.
- SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+ SwFlyFrameFormat* InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
const OUString& rNumberingSeparator,
const bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
const OUString& rCharacterStyle,
const bool bCpyBrd = true );
- SwFlyFrmFmt* InsertDrawLabel(
- const OUString &rTxt, const OUString& rSeparator, const OUString& rNumberSeparator,
+ SwFlyFrameFormat* InsertDrawLabel(
+ const OUString &rText, const OUString& rSeparator, const OUString& rNumberSeparator,
const sal_uInt16 nId, const OUString& rCharacterStyle, SdrObject& rObj );
// Query attribute pool.
@@ -1366,10 +1366,10 @@ public:
static sal_uInt16 IsInsRegionAvailable( const SwPaM& rRange,
const SwNode** ppSttNd = 0 );
static SwSection* GetCurrSection( const SwPosition& rPos );
- SwSectionFmts& GetSections() { return *mpSectionFmtTbl; }
- const SwSectionFmts& GetSections() const { return *mpSectionFmtTbl; }
- SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
- void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
+ SwSectionFormats& GetSections() { return *mpSectionFormatTable; }
+ const SwSectionFormats& GetSections() const { return *mpSectionFormatTable; }
+ SwSectionFormat *MakeSectionFormat( SwSectionFormat *pDerivedFrom );
+ void DelSectionFormat( SwSectionFormat *pFormat, bool bDelNodes = false );
void UpdateSection(size_t const nSect, SwSectionData &,
SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false);
OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
@@ -1426,7 +1426,7 @@ public:
SwAutoCorrExceptWord* GetAutoCorrExceptWord() { return mpACEWord; }
void DeleteAutoCorrExceptWord();
- const SwFmtINetFmt* FindINetAttr( const OUString& rName ) const;
+ const SwFormatINetFormat* FindINetAttr( const OUString& rName ) const;
// Call into intransparent Basic; expect possible Return String.
bool ExecMacro( const SvxMacro& rMacro, OUString* pRet = 0, SbxArray* pArgs = 0 );
@@ -1457,10 +1457,10 @@ public:
// Create sub-documents according to given collection.
// If no collection is given, use chapter styles for 1st level.
bool GenerateGlobalDoc( const OUString& rPath,
- const SwTxtFmtColl* pSplitColl = 0 );
+ const SwTextFormatColl* pSplitColl = 0 );
bool GenerateGlobalDoc( const OUString& rPath, int nOutlineLevel = 0 );
bool GenerateHTMLDoc( const OUString& rPath,
- const SwTxtFmtColl* pSplitColl = 0 );
+ const SwTextFormatColl* pSplitColl = 0 );
bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel = 0 );
// Compare two documents.
@@ -1469,13 +1469,13 @@ public:
// Merge two documents.
long MergeDoc( const SwDoc& rDoc );
- bool IsAutoFmtRedline() const { return mbIsAutoFmtRedline; }
- void SetAutoFmtRedline( bool bFlag ) { mbIsAutoFmtRedline = bFlag; }
+ bool IsAutoFormatRedline() const { return mbIsAutoFormatRedline; }
+ void SetAutoFormatRedline( bool bFlag ) { mbIsAutoFormatRedline = bFlag; }
// For AutoFormat: with Undo/Redlining.
- void SetTxtFmtCollByAutoFmt( const SwPosition& rPos, sal_uInt16 nPoolId,
+ void SetTextFormatCollByAutoFormat( const SwPosition& rPos, sal_uInt16 nPoolId,
const SfxItemSet* pSet = 0 );
- void SetFmtItemByAutoFmt( const SwPaM& rPam, const SfxItemSet& );
+ void SetFormatItemByAutoFormat( const SwPaM& rPam, const SfxItemSet& );
// Only for SW-textbloxks! Does not pay any attention to layout!
void ClearDoc(); // Deletes all content!
@@ -1493,8 +1493,8 @@ public:
void SetOLEObjModified();
// Uno - Interfaces
- const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *mpUnoCrsrTbl; }
- SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
+ const SwUnoCrsrTable& GetUnoCrsrTable() const { return *mpUnoCrsrTable; }
+ SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false );
// FeShell - Interfaces
// !!! These assume always an existing layout !!!
@@ -1503,10 +1503,10 @@ public:
const bool _bSameOnly,
const bool _bPosCorr );
- void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew );
- static void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz );
- void SetRowSplit( const SwCursor& rCursor, const SwFmtRowSplit &rNew );
- static void GetRowSplit( const SwCursor& rCursor, SwFmtRowSplit *& rpSz );
+ void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew );
+ static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz );
+ void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew );
+ static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz );
bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true );
void SetRowBackground( const SwCursor& rCursor, const SvxBrushItem &rNew );
static bool GetRowBackground( const SwCursor& rCursor, SvxBrushItem &rToFill );
@@ -1531,9 +1531,9 @@ public:
static sal_uInt16 GetBoxAlign( const SwCursor& rCursor );
void AdjustCellWidth( const SwCursor& rCursor, bool bBalance = false );
- SwChainRet Chainable( const SwFrmFmt &rSource, const SwFrmFmt &rDest );
- SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
- void Unchain( SwFrmFmt &rFmt );
+ SwChainRet Chainable( const SwFrameFormat &rSource, const SwFrameFormat &rDest );
+ SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+ void Unchain( SwFrameFormat &rFormat );
// For Copy/Move from FrmShell.
SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
@@ -1545,7 +1545,7 @@ public:
SwExtTextInput* CreateExtTextInput( const SwPaM& rPam );
void DeleteExtTextInput( SwExtTextInput* pDel );
SwExtTextInput* GetExtTextInput( const SwNode& rNd,
- sal_Int32 nCntntPos = -1) const;
+ sal_Int32 nContentPos = -1) const;
SwExtTextInput* GetExtTextInput() const;
// Interface for access to AutoComplete-List.
@@ -1599,9 +1599,9 @@ public:
const bool bValue );
// Change a format undoable.
- void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
+ void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet);
- void RenameFmt(SwFmt & rFmt, const OUString & sNewName,
+ void RenameFormat(SwFormat & rFormat, const OUString & sNewName,
bool bBroadcast = false);
// Change a TOX undoable.
@@ -1671,18 +1671,18 @@ public:
private:
// 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);
+ void CopyMasterHeader(const SwPageDesc &rChged, const SwFormatHeader &rHead, SwPageDesc &pDesc, bool bLeft, bool bFirst);
// 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);
+ void CopyMasterFooter(const SwPageDesc &rChged, const SwFormatFooter &rFoot, SwPageDesc &pDesc, bool bLeft, bool bFirst);
};
// This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
void ClrContourCache();
-inline const SwTableNode* SwDoc::IsIdxInTbl( const SwNodeIndex& rIdx ) const
+inline const SwTableNode* SwDoc::IsIdxInTable( const SwNodeIndex& rIdx ) const
{
- return const_cast<SwDoc*>(this)->IsIdxInTbl( rIdx );
+ return const_cast<SwDoc*>(this)->IsIdxInTable( rIdx );
}
inline SvNumberFormatter* SwDoc::GetNumberFormatter( bool bCreate )
@@ -1704,7 +1704,7 @@ inline void SwDoc::SetOLEPrtNotifyPending( bool bSet )
mbAllOLENotify = false;
}
-bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFlds * pSrtLst );
+bool sw_GetPostIts( IDocumentFieldsAccess* pIDFA, _SetGetExpFields * pSrtLst );
#endif //_DOC_HXX
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index c671a695b921..2d2871f37df5 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -48,13 +48,13 @@ namespace com { namespace sun { namespace star { namespace i18n {
#include <numrule.hxx>
/** provides some methods for generic operations on lists that contain
-SwFmt* subclasses. */
-class SwFmtsBase
+SwFormat* subclasses. */
+class SwFormatsBase
{
public:
- virtual size_t GetFmtCount() const = 0;
- virtual SwFmt* GetFmt(size_t idx) const = 0;
- virtual ~SwFmtsBase() {};
+ virtual size_t GetFormatCount() const = 0;
+ virtual SwFormat* GetFormat(size_t idx) const = 0;
+ virtual ~SwFormatsBase() {};
};
template<typename Value>
@@ -112,86 +112,86 @@ public:
};
template<typename Value>
-class SwFmtsModifyBase : public SwVectorModifyBase<Value>, public SwFmtsBase
+class SwFormatsModifyBase : public SwVectorModifyBase<Value>, public SwFormatsBase
{
protected:
- SwFmtsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
+ SwFormatsModifyBase(typename SwVectorModifyBase<Value>::DestructorPolicy
policy = SwVectorModifyBase<Value>::DestructorPolicy::FreeElements)
: SwVectorModifyBase<Value>(policy) {}
public:
- virtual size_t GetFmtCount() const SAL_OVERRIDE
+ virtual size_t GetFormatCount() const SAL_OVERRIDE
{ return std::vector<Value>::size(); }
- virtual Value GetFmt(size_t idx) const SAL_OVERRIDE
+ virtual Value GetFormat(size_t idx) const SAL_OVERRIDE
{ return std::vector<Value>::operator[](idx); }
- inline size_t GetPos(const SwFmt *p) const
- { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFmt*>( p ) ) ); }
- inline bool Contains(const SwFmt *p) const {
- Value p2 = dynamic_cast<Value>(const_cast<SwFmt*>(p));
+ inline size_t GetPos(const SwFormat *p) const
+ { return SwVectorModifyBase<Value>::GetPos( static_cast<Value>( const_cast<SwFormat*>( p ) ) ); }
+ inline bool Contains(const SwFormat *p) const {
+ Value p2 = dynamic_cast<Value>(const_cast<SwFormat*>(p));
return p2 != nullptr && SwVectorModifyBase<Value>::Contains(p2);
}
};
-class SwGrfFmtColls : public SwFmtsModifyBase<SwGrfFmtColl*>
+class SwGrfFormatColls : public SwFormatsModifyBase<SwGrfFormatColl*>
{
public:
- SwGrfFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+ SwGrfFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
};
/// Specific frame formats (frames, DrawObjects).
-class SW_DLLPUBLIC SwFrmFmts : public SwFmtsModifyBase<SwFrmFmt*>
+class SW_DLLPUBLIC SwFrameFormats : public SwFormatsModifyBase<SwFrameFormat*>
{
public:
void dumpAsXml(struct _xmlTextWriter* pWriter, const char* pName) const;
};
-class SwCharFmts : public SwFmtsModifyBase<SwCharFmt*>
+class SwCharFormats : public SwFormatsModifyBase<SwCharFormat*>
{
public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-class SwTxtFmtColls : public SwFmtsModifyBase<SwTxtFmtColl*>
+class SwTextFormatColls : public SwFormatsModifyBase<SwTextFormatColl*>
{
public:
- SwTxtFmtColls() : SwFmtsModifyBase( DestructorPolicy::KeepElements ) {}
+ SwTextFormatColls() : SwFormatsModifyBase( DestructorPolicy::KeepElements ) {}
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
/// Array of Undo-history.
-class SW_DLLPUBLIC SwSectionFmts : public SwFmtsModifyBase<SwSectionFmt*>
+class SW_DLLPUBLIC SwSectionFormats : public SwFormatsModifyBase<SwSectionFormat*>
{
public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-class SwFldTypes : public SwVectorModifyBase<SwFieldType*> {
+class SwFieldTypes : public SwVectorModifyBase<SwFieldType*> {
public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
class SwTOXTypes : public SwVectorModifyBase<SwTOXType*> {};
-class SW_DLLPUBLIC SwNumRuleTbl : public SwVectorModifyBase<SwNumRule*> {
+class SW_DLLPUBLIC SwNumRuleTable : public SwVectorModifyBase<SwNumRule*> {
public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-struct CompareSwRedlineTbl
+struct CompareSwRedlineTable
{
bool operator()(SwRangeRedline* const &lhs, SwRangeRedline* const &rhs) const;
};
-class _SwRedlineTbl
- : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTbl,
+class _SwRedlineTable
+ : public o3tl::sorted_vector<SwRangeRedline*, CompareSwRedlineTable,
o3tl::find_partialorder_ptrequals>
{
public:
- ~_SwRedlineTbl();
+ ~_SwRedlineTable();
};
-class SwRedlineTbl : private _SwRedlineTbl
+class SwRedlineTable : private _SwRedlineTable
{
public:
bool Contains(const SwRangeRedline* p) const { return find(const_cast<SwRangeRedline* const>(p)) != end(); }
@@ -221,30 +221,30 @@ public:
/**
Find the redline at the given position.
- @param tableIndex position in SwRedlineTbl to start searching at, will be updated with the index of the returned
+ @param tableIndex position in SwRedlineTable to start searching at, will be updated with the index of the returned
redline (or the next redline after the given position if not found)
@param next true: redline starts at position and ends after, false: redline starts before position and ends at or after
*/
const SwRangeRedline* FindAtPosition( const SwPosition& startPosition, sal_uInt16& tableIndex, bool next = true ) const;
- using _SwRedlineTbl::const_iterator;
- using _SwRedlineTbl::begin;
- using _SwRedlineTbl::end;
- using _SwRedlineTbl::size;
- using _SwRedlineTbl::size_type;
- using _SwRedlineTbl::operator[];
- using _SwRedlineTbl::empty;
- using _SwRedlineTbl::Resort;
+ using _SwRedlineTable::const_iterator;
+ using _SwRedlineTable::begin;
+ using _SwRedlineTable::end;
+ using _SwRedlineTable::size;
+ using _SwRedlineTable::size_type;
+ using _SwRedlineTable::operator[];
+ using _SwRedlineTable::empty;
+ using _SwRedlineTable::Resort;
};
/// Table that holds 'extra' redlines, such as 'table row insert\delete', 'paragraph moves' etc...
-class SwExtraRedlineTbl
+class SwExtraRedlineTable
{
private:
std::vector<SwExtraRedline*> m_aExtraRedlines;
public:
- ~SwExtraRedlineTbl();
+ ~SwExtraRedlineTable();
bool Insert( SwExtraRedline* p );
@@ -262,10 +262,10 @@ public:
bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
};
-class SwUnoCrsrTbl : public std::set<SwUnoCrsr*> {
+class SwUnoCrsrTable : public std::set<SwUnoCrsr*> {
public:
/// the destructor will free all objects still in the set
- ~SwUnoCrsrTbl();
+ ~SwUnoCrsrTable();
};
typedef std::vector<SwOLENode*> SwOLENodes;
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index 4a7a88364ca1..fd53d80bfcbf 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -24,7 +24,7 @@
struct SW_DLLPUBLIC SwDocStat
{
- sal_uInt16 nTbl;
+ sal_uInt16 nTable;
sal_uInt16 nGrf;
sal_uInt16 nOLE;
sal_uLong nPage;
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index acf16d94aac3..1298cc618467 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -32,9 +32,9 @@
class SwDoc;
class SwDocStyleSheetPool;
class SwPageDesc;
-class SwCharFmt;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwCharFormat;
+class SwTextFormatColl;
+class SwFrameFormat;
class SwNumRule;
// Temporary StyleSheet.
@@ -43,9 +43,9 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
friend class SwDocStyleSheetPool;
friend class SwStyleSheetIterator;
- SwCharFmt* pCharFmt;
- SwTxtFmtColl* pColl;
- SwFrmFmt* pFrmFmt;
+ SwCharFormat* pCharFormat;
+ SwTextFormatColl* pColl;
+ SwFrameFormat* pFrameFormat;
const SwPageDesc* pDesc;
const SwNumRule* pNumRule;
@@ -125,9 +125,9 @@ public:
virtual OUString GetDescription() SAL_OVERRIDE;
virtual OUString GetDescription(SfxMapUnit eUnit) SAL_OVERRIDE;
- SwCharFmt* GetCharFmt();
- SwTxtFmtColl* GetCollection();
- SwFrmFmt* GetFrmFmt();
+ SwCharFormat* GetCharFormat();
+ SwTextFormatColl* GetCollection();
+ SwFrameFormat* GetFrameFormat();
const SwPageDesc* GetPageDesc();
const SwNumRule* GetNumRule();
void SetNumRule(const SwNumRule& rRule);
@@ -139,14 +139,14 @@ public:
class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
{
// Local helper class.
- class SwPoolFmtList
+ class SwPoolFormatList
{
std::vector<OUString> maImpl;
typedef std::unordered_map<OUString, sal_uInt32, OUStringHash> UniqueHash;
UniqueHash maUnique;
void rehash();
public:
- SwPoolFmtList() {}
+ SwPoolFormatList() {}
void Append( char cChar, const OUString& rStr );
void clear() { maImpl.clear(); maUnique.clear(); }
size_t size() { return maImpl.size(); }
@@ -158,7 +158,7 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
rtl::Reference< SwDocStyleSheet > mxIterSheet;
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
- SwPoolFmtList aLst;
+ SwPoolFormatList aLst;
sal_uInt32 nLastPos;
bool bFirstCalled;
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 5bb92646b171..f7d8cf46dd94 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -27,12 +27,12 @@
#include "fldbas.hxx"
#include "numrule.hxx"
-class _SetGetExpFlds;
-class SwTxtFld;
+class _SetGetExpFields;
+class SwTextField;
class SwFrm;
class OutlinerParaObject;
class SwTextAPIObject;
-class SwFmtFld;
+class SwFormatField;
enum SwAuthorFormat
{
@@ -137,10 +137,10 @@ class SwPageNumberFieldType : public SwFieldType
public:
SwPageNumberFieldType();
- OUString Expand( sal_uInt32 nFmt, short nOff, sal_uInt16 const nPageNumber,
+ OUString Expand( sal_uInt32 nFormat, short nOff, sal_uInt16 const nPageNumber,
sal_uInt16 const nMaxPage, const OUString& ) const;
void ChangeExpansion( SwDoc* pDoc,
- bool bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+ bool bVirtPageNum, const sal_Int16* pNumFormat = 0 );
virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageNumberField : public SwField
public:
SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM,
- sal_uInt32 nFmt = 0, short nOff = 0,
+ sal_uInt32 nFormat = 0, short nOff = 0,
sal_uInt16 const nPageNumber = 0,
sal_uInt16 const nMaxPage = 0);
@@ -191,7 +191,7 @@ class SwAuthorField : public SwField
OUString aContent;
public:
- SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFmt = 0);
+ SwAuthorField(SwAuthorFieldType*, sal_uInt32 nFormat = 0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -218,7 +218,7 @@ class SW_DLLPUBLIC SwFileNameField : public SwField
OUString aContent;
public:
- SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFmt = 0);
+ SwFileNameField(SwFileNameFieldType*, sal_uInt32 nFormat = 0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -243,7 +243,7 @@ public:
class SW_DLLPUBLIC SwTemplNameField : public SwField
{
public:
- SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFmt = 0);
+ SwTemplNameField(SwTemplNameFieldType*, sal_uInt32 nFormat = 0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -259,10 +259,10 @@ class SwDocStatFieldType : public SwFieldType
public:
SwDocStatFieldType(SwDoc*);
- OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const;
+ OUString Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
virtual SwFieldType* Copy() const SAL_OVERRIDE;
- inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; }
+ inline void SetNumFormat( sal_Int16 eFormat ) { nNumberingType = eFormat; }
};
class SW_DLLPUBLIC SwDocStatField : public SwField
@@ -271,7 +271,7 @@ class SW_DLLPUBLIC SwDocStatField : public SwField
public:
SwDocStatField( SwDocStatFieldType*,
- sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0);
+ sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0);
void ChangeExpansion( const SwFrm* pFrm );
@@ -284,11 +284,11 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
-class SwHiddenTxtFieldType : public SwFieldType
+class SwHiddenTextFieldType : public SwFieldType
{
bool bHidden;
public:
- SwHiddenTxtFieldType(bool bSetHidden = true);
+ SwHiddenTextFieldType(bool bSetHidden = true);
virtual SwFieldType* Copy() const SAL_OVERRIDE;
@@ -296,10 +296,10 @@ public:
inline bool GetHiddenFlag() const { return bHidden; }
};
-class SwHiddenTxtField : public SwField
+class SwHiddenTextField : public SwField
{
- OUString aTRUETxt; ///< Text if condition true.
- OUString aFALSETxt; ///< If condition false.
+ OUString aTRUEText; ///< Text if condition true.
+ OUString aFALSEText; ///< If condition false.
OUString aContent; ///< Evaluated DB-text.
OUString aCond; ///< Condition.
@@ -313,14 +313,14 @@ class SwHiddenTxtField : public SwField
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwHiddenTxtField( SwHiddenTxtFieldType*,
+ SwHiddenTextField( SwHiddenTextFieldType*,
bool bConditional,
const OUString& rCond,
- const OUString& rTxt,
+ const OUString& rText,
bool bHidden = false,
sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
- SwHiddenTxtField( SwHiddenTxtFieldType*,
+ SwHiddenTextField( SwHiddenTextFieldType*,
const OUString& rCond,
const OUString& rTrue,
const OUString& rFalse,
@@ -400,7 +400,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField
public:
/// Direct input, delete old value.
SwMacroField( SwMacroFieldType*, const OUString& rLibAndName,
- const OUString& rTxt);
+ const OUString& rText);
inline OUString GetMacro() const { return aMacro; }
OUString GetLibName() const;
@@ -443,7 +443,7 @@ public:
class SW_DLLPUBLIC SwPostItField : public SwField
{
- OUString sTxt;
+ OUString sText;
OUString sAuthor;
OUString sInitials; ///< Initials of the author.
OUString sName; ///< Name of the comment.
@@ -454,7 +454,7 @@ class SW_DLLPUBLIC SwPostItField : public SwField
public:
SwPostItField( SwPostItFieldType*,
const OUString& rAuthor,
- const OUString& rTxt,
+ const OUString& rText,
const OUString& rInitials,
const OUString& rName,
const DateTime& rDate);
@@ -474,7 +474,7 @@ public:
/// Text
virtual OUString GetPar2() const SAL_OVERRIDE;
virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- const OUString& GetTxt() const { return sTxt; }
+ const OUString& GetText() const { return sText; }
const OUString& GetInitials() const { return sInitials;}
void SetName(const OUString& rStr);
const OUString& GetName() const { return sName;}
@@ -508,8 +508,8 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFmt=0);
- SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFmt=0);
+ SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, sal_uInt32 nFormat=0);
+ SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const OUString& rName, const OUString& rValue, sal_uInt32 nFormat=0);
virtual void SetSubType(sal_uInt16) SAL_OVERRIDE;
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
@@ -541,7 +541,7 @@ class SwExtUserField : public SwField
sal_uInt16 nType;
public:
- SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0);
+ SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFormat=0);
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -598,30 +598,30 @@ class SwRefPageGetFieldType : public SwFieldType
SwDoc* pDoc;
sal_Int16 nNumberingType;
- void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
+ void UpdateField( SwTextField* pTextField, _SetGetExpFields& rSetList );
protected:
/// overwritten to update all RefPageGet fields
virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ) SAL_OVERRIDE;
public:
SwRefPageGetFieldType( SwDoc* pDoc );
virtual SwFieldType* Copy() const SAL_OVERRIDE;
- bool MakeSetList( _SetGetExpFlds& rTmpLst );
+ bool MakeSetList( _SetGetExpFields& rTmpLst );
SwDoc* GetDoc() const { return pDoc; }
};
// Query relative page numbering.
class SwRefPageGetField : public SwField
{
- OUString sTxt;
+ OUString sText;
public:
- SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFmt );
+ SwRefPageGetField( SwRefPageGetFieldType*, sal_uInt32 nFormat );
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
- void SetText( const OUString& rTxt ) { sTxt = rTxt; }
+ void SetText( const OUString& rText ) { sText = rText; }
- void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
+ void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField );
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
@@ -636,12 +636,12 @@ public:
SwJumpEditFieldType( SwDoc* pDoc );
virtual SwFieldType* Copy() const SAL_OVERRIDE;
- SwCharFmt* GetCharFmt();
+ SwCharFormat* GetCharFormat();
};
class SwJumpEditField : public SwField
{
- OUString sTxt, sHelp;
+ OUString sText, sHelp;
public:
SwJumpEditField( SwJumpEditFieldType*, sal_uInt32 nFormat,
const OUString& sText, const OUString& sHelp );
@@ -657,8 +657,8 @@ public:
virtual OUString GetPar2() const SAL_OVERRIDE;
virtual void SetPar2(const OUString& rStr) SAL_OVERRIDE;
- SwCharFmt* GetCharFmt() const
- { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFmt(); }
+ SwCharFormat* GetCharFormat() const
+ { return static_cast<SwJumpEditFieldType*>(GetTyp())->GetCharFormat(); }
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
};
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index c95e682dd85f..c80d81d32642 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -60,35 +60,35 @@ class SwDBManager;
struct SwDocStat;
class SwAutoCompleteWord;
-class SwFmtRefMark;
+class SwFormatRefMark;
class SwNumRule;
-class SwTxtFmtColl;
+class SwTextFormatColl;
class SwGrfNode;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
-class SwFrmFmt;
-class SwCharFmt;
+class SwFrameFormat;
+class SwCharFormat;
class SwExtTextInput;
class Graphic;
class GraphicObject;
-class SwFmtINetFmt;
+class SwFormatINetFormat;
class SwTable;
class SwTextBlocks;
-class SwFmtFtn;
+class SwFormatFootnote;
class SwSection;
class SwSectionData;
-class SwSectionFmt;
-class SwTableAutoFmt;
+class SwSectionFormat;
+class SwTableAutoFormat;
class SwPageDesc;
-class SwTxtINetFmt;
-class SwSeqFldList;
+class SwTextINetFormat;
+class SwSeqFieldList;
class SwGlblDocContent;
class SwGlblDocContents;
class SwRangeRedline;
class SwRedlineData;
-class SwFtnInfo;
+class SwFootnoteInfo;
class SwEndNoteInfo;
class SwLineNumberInfo;
class SwAuthEntry;
@@ -119,10 +119,10 @@ namespace sw {
struct SwGetINetAttr
{
OUString sText;
- const SwTxtINetFmt& rINetAttr;
+ const SwTextINetFormat& rINetAttr;
- SwGetINetAttr( const OUString& rTxt, const SwTxtINetFmt& rAttr )
- : sText( rTxt ), rINetAttr( rAttr )
+ SwGetINetAttr( const OUString& rText, const SwTextINetFormat& rAttr )
+ : sText( rText ), rINetAttr( rAttr )
{}
};
typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
@@ -133,13 +133,13 @@ typedef boost::ptr_vector<SwGetINetAttr> SwGetINetAttrs;
#define CNT_OLE 0x0010
// Test USHORT for a defined form of content.
-#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
+#define CNT_HasText(USH) ((USH)&CNT_TXT)
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
{
- static SvxSwAutoFmtFlags* s_pAutoFmtFlags;
+ static SvxSwAutoFormatFlags* s_pAutoFormatFlags;
/// For the private methods DelRange and those of AutoCorrect.
friend class SwAutoFormat;
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
/// For the PamCorrAbs/-Rel methods.
friend class SwUndo;
- SAL_DLLPRIVATE SfxPoolItem& _GetChrFmt( SfxPoolItem& ) const;
+ SAL_DLLPRIVATE SfxPoolItem& _GetChrFormat( SfxPoolItem& ) const;
/** Returns pointer to a SwGrfNode
that will be used by GetGraphic() and GetGraphicSize(). */
@@ -156,9 +156,9 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
SAL_DLLPRIVATE void DeleteSel( SwPaM& rPam, bool* pUndo = 0 );
- SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
+ SAL_DLLPRIVATE void _SetSectionAttr( SwSectionFormat& rSectFormat, const SfxItemSet& rSet );
- using SwViewShell::UpdateFlds;
+ using SwViewShell::UpdateFields;
using SwModify::GetInfo;
public:
@@ -207,8 +207,8 @@ public:
bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
long SplitNode( bool bAutoFormat = false, bool bCheckTableStart = true );
- bool AppendTxtNode();
- void AutoFmtBySplitNode();
+ bool AppendTextNode();
+ void AutoFormatBySplitNode();
/** If cursor is in a INetAttribute it will be deleted completely
including the descriptive text (needed at drag & drop). */
@@ -216,7 +216,7 @@ public:
/** If Cursor is at the end of a character style in which the DontExpand-flag
is not yet set, the latter will be set (==> return TRUE). */
- bool DontExpandFmt();
+ bool DontExpandFormat();
/** Apply / remove attributes.
@return attributes in required AttributeSet.
@@ -272,7 +272,7 @@ public:
void SetDefault( const SfxPoolItem& );
/// Query default attribute of document.
- const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
+ const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = NULL );
void GCAttr();
@@ -284,17 +284,17 @@ public:
sal_uInt16 GetCurLang() const;
/// TABLE
- size_t GetTblFrmFmtCount( bool bUsed = false ) const;
- SwFrmFmt& GetTblFrmFmt(size_t nFmt, bool bUsed = false ) const;
- OUString GetUniqueTblName() const;
+ size_t GetTableFrameFormatCount( bool bUsed = false ) const;
+ SwFrameFormat& GetTableFrameFormat(size_t nFormat, bool bUsed = false ) const;
+ OUString GetUniqueTableName() const;
/// CHAR
- sal_uInt16 GetCharFmtCount() const;
- SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const;
- SwCharFmt* GetCurCharFmt() const;
- void FillByEx(SwCharFmt*, bool bReset = false);
- SwCharFmt* MakeCharFmt( const OUString& rName, SwCharFmt* pDerivedFrom = 0 );
- SwCharFmt* FindCharFmtByName( const OUString& rName ) const;
+ sal_uInt16 GetCharFormatCount() const;
+ SwCharFormat& GetCharFormat(sal_uInt16 nFormat) const;
+ SwCharFormat* GetCurCharFormat() const;
+ void FillByEx(SwCharFormat*, bool bReset = false);
+ SwCharFormat* MakeCharFormat( const OUString& rName, SwCharFormat* pDerivedFrom = 0 );
+ SwCharFormat* FindCharFormatByName( const OUString& rName ) const;
/* FormatCollections (new) - Explaining the general naming pattern:
* GetXXXCount() returns the count of xxx in the document.
@@ -307,20 +307,20 @@ public:
*/
// TXT
- SwTxtFmtColl& GetDfltTxtFmtColl() const;
- sal_uInt16 GetTxtFmtCollCount() const;
- SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
+ SwTextFormatColl& GetDfltTextFormatColl() const;
+ sal_uInt16 GetTextFormatCollCount() const;
+ SwTextFormatColl& GetTextFormatColl( sal_uInt16 nTextFormatColl) const;
/**
* Get the named paragraph format of the current selection.
*
- * @see GetPaMTxtFmtColl()
+ * @see GetPaMTextFormatColl()
*
* @return the named paragraph format of the first node that contains one.
* Nodes are sort by order of appearance in the selections ;
* selections are sort by their order of creation
* (last created selection first, oldest selection at last).
*/
- SwTxtFmtColl* GetCurTxtFmtColl() const;
+ SwTextFormatColl* GetCurTextFormatColl() const;
/**
* Get the named paragraph format of the selection(s) described by a SwPaM.
*
@@ -329,21 +329,21 @@ public:
*
* @return the named paragraph format of the first node that contains one.
*/
- SwTxtFmtColl* GetPaMTxtFmtColl( SwPaM* pPaM ) const;
+ SwTextFormatColl* GetPaMTextFormatColl( SwPaM* pPaM ) const;
// #i62675#
- /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
- void SetTxtFmtColl(SwTxtFmtColl*, const bool bResetListAttrs = false);
- SwTxtFmtColl *MakeTxtFmtColl(const OUString &rFmtCollName,
- SwTxtFmtColl *pDerivedFrom = 0);
- void FillByEx(SwTxtFmtColl*, bool bReset = false);
- SwTxtFmtColl* FindTxtFmtCollByName( const OUString& rName ) const;
+ /// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTextFormatColl(..)>
+ void SetTextFormatColl(SwTextFormatColl*, const bool bResetListAttrs = false);
+ SwTextFormatColl *MakeTextFormatColl(const OUString &rFormatCollName,
+ SwTextFormatColl *pDerivedFrom = 0);
+ void FillByEx(SwTextFormatColl*, bool bReset = false);
+ SwTextFormatColl* FindTextFormatCollByName( const OUString& rName ) const;
/// @return "Auto-Collection" with given Id. If it does not exist create it.
- SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId );
+ SwTextFormatColl* GetTextCollFromPool( sal_uInt16 nId );
/// @return required automatic format base class.
- SwFmt* GetFmtFromPool( sal_uInt16 nId );
+ SwFormat* GetFormatFromPool( sal_uInt16 nId );
/// @return required automatic page style.
SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
@@ -352,21 +352,21 @@ public:
bool IsUsed( const SwModify& ) const;
/// @return required automatic format.
- SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
- { return static_cast<SwFrmFmt*>(SwEditShell::GetFmtFromPool( nId )); }
- SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
- { return static_cast<SwCharFmt*>(SwEditShell::GetFmtFromPool( nId )); }
+ SwFrameFormat* GetFrameFormatFromPool( sal_uInt16 nId )
+ { return static_cast<SwFrameFormat*>(SwEditShell::GetFormatFromPool( nId )); }
+ SwCharFormat* GetCharFormatFromPool( sal_uInt16 nId )
+ { return static_cast<SwCharFormat*>(SwEditShell::GetFormatFromPool( nId )); }
void Insert2(SwField&, const bool bForceExpandHints = false);
- void UpdateFlds( SwField & ); ///< One single field.
+ void UpdateFields( SwField & ); ///< One single field.
- sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
- SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
- SwFieldType* GetFldType(sal_uInt16 nResId, const OUString& rName) const;
+ sal_uInt16 GetFieldTypeCount(sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+ SwFieldType* GetFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, bool bUsed = false) const;
+ SwFieldType* GetFieldType(sal_uInt16 nResId, const OUString& rName) const;
- void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
- void RemoveFldType(sal_uInt16 nResId, const OUString& rName);
+ void RemoveFieldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
+ void RemoveFieldType(sal_uInt16 nResId, const OUString& rName);
void FieldToText( SwFieldType* pType );
@@ -385,17 +385,17 @@ public:
/// Check whether DB fields point to an available data source and returns it.
bool IsFieldDataSourceAvailable(OUString& rUsedDataSource) const;
- void UpdateExpFlds(bool bCloseDB = false);///< only every expression fields update
- void LockExpFlds();
- void UnlockExpFlds();
+ void UpdateExpFields(bool bCloseDB = false);///< only every expression fields update
+ void LockExpFields();
+ void UnlockExpFields();
- SwFldUpdateFlags GetFldUpdateFlags(bool bDocSettings = false) const;
- void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
+ SwFieldUpdateFlags GetFieldUpdateFlags(bool bDocSettings = false) const;
+ void SetFieldUpdateFlags( SwFieldUpdateFlags eFlags );
/// For evaluation of DB fields (new DB-manager).
SwDBManager* GetDBManager() const;
- SwFieldType* InsertFldType(const SwFieldType &);
+ SwFieldType* InsertFieldType(const SwFieldType &);
/// Changes in document?
bool IsModified() const;
@@ -519,7 +519,7 @@ public:
bool SelectionHasBullet() const;
OUString GetUniqueNumRuleName( const OUString* pChkStr = 0, bool bAutoNum = true ) const;
- void ChgNumRuleFmts( const SwNumRule& rRule );
+ void ChgNumRuleFormats( const SwNumRule& rRule );
/// Set (and query if) a numbering with StartFlag starts at current PointPos.
void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = NULL );
@@ -614,7 +614,7 @@ public:
else give a rap on the knuckles!
If a string-ptr != 0 return the respective name. */
void GetGrfNms( OUString* pGrfName, OUString* pFltName,
- const SwFlyFrmFmt* = 0 ) const;
+ const SwFlyFrameFormat* = 0 ) const;
/// Re-read if graphic is not ok. Current graphic is replaced by the new one.
void ReRead( const OUString& rGrfName, const OUString& rFltName,
@@ -627,14 +627,14 @@ public:
// #i73788#
/// Remove default parameter, because method always called this default value.
Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
- const SwFlyFrmFmt* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
+ const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
/** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode
(and mark is neither set not pointint to same ClientObject)
else give rap on the knuckles. */
svt::EmbeddedObjectRef& GetOLEObject() const;
- /// Is there an OLEObject with this name (SwFmt)?
+ /// Is there an OLEObject with this name (SwFormat)?
bool HasOLEObj( const OUString &rName ) const;
/// @return pointer to the data of the chart in which Cursr is.
@@ -653,13 +653,13 @@ public:
including styles. */
sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const OUString& rName,
const OUString& rShortName, bool bSaveRelFile = false,
- const OUString* pOnlyTxt=0 );
+ const OUString* pOnlyText=0 );
/// Save complete content of doc as glossary.
sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const OUString& rName,
const OUString& rShortName,
bool bSaveRelFile = false,
- bool bOnlyTxt = false );
+ bool bOnlyText = false );
// Linguistics...
/// Save selections.
@@ -675,35 +675,35 @@ public:
/// For Inserting SoftHyphen. Position is offset within the syllabificated word.
static void InsertSoftHyph( const sal_Int32 nHyphPos );
- const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR
+ const SwTable& InsertTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR
sal_uInt16 nRows, sal_uInt16 nCols,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
- const SwTableAutoFmt* pTAFmt = 0 );
+ const SwTableAutoFormat* pTAFormat = 0 );
- void InsertDDETable( const SwInsertTableOptions& rInsTblOpts, ///< HEADLINE_NO_BORDER
+ void InsertDDETable( const SwInsertTableOptions& rInsTableOpts, ///< HEADLINE_NO_BORDER
SwDDEFieldType* pDDEType,
sal_uInt16 nRows, sal_uInt16 nCols,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL );
void UpdateTable();
- void SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName );
+ void SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName );
- SwFrmFmt *GetTableFmt();
- bool TextToTable( const SwInsertTableOptions& rInsTblOpts, ///< ALL_TBL_INS_ATTR
+ SwFrameFormat *GetTableFormat();
+ bool TextToTable( const SwInsertTableOptions& rInsTableOpts, ///< ALL_TBL_INS_ATTR
sal_Unicode cCh,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
- const SwTableAutoFmt* pTAFmt = 0 );
+ const SwTableAutoFormat* pTAFormat = 0 );
bool TableToText( sal_Unicode cCh );
bool IsTextToTableAvailable() const;
- bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
- void SetTblBoxFormulaAttrs( const SfxItemSet& rSet );
+ bool GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const;
+ void SetTableBoxFormulaAttrs( const SfxItemSet& rSet );
bool IsTableBoxTextFormat() const;
OUString GetTableBoxText() const;
- TblChgMode GetTblChgMode() const;
- void SetTblChgMode( TblChgMode eMode );
+ TableChgMode GetTableChgMode() const;
+ void SetTableChgMode( TableChgMode eMode );
/// Split table at cursor position.
bool SplitTable( sal_uInt16 eMode );
@@ -766,7 +766,7 @@ public:
void SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd );
/// @return reference set in document according to given name.
- const SwFmtRefMark* GetRefMark( const OUString& rName ) const;
+ const SwFormatRefMark* GetRefMark( const OUString& rName ) const;
/** @return names of all references set in document.
If ArrayPointer == 0 then return only whether a RefMark is set in document. */
@@ -778,20 +778,20 @@ public:
bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, OUString& rWord );
/// Set our styles according to the respective rules.
- void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
+ void AutoFormat( const SvxSwAutoFormatFlags* pAFlags = 0 );
- static SvxSwAutoFmtFlags* GetAutoFmtFlags();
- static void SetAutoFmtFlags(SvxSwAutoFmtFlags *);
+ static SvxSwAutoFormatFlags* GetAutoFormatFlags();
+ static void SetAutoFormatFlags(SvxSwAutoFormatFlags *);
/// Calculates selection.
OUString Calculate();
- bool InsertURL( const SwFmtINetFmt& rFmt, const OUString& rStr,
+ bool InsertURL( const SwFormatINetFormat& rFormat, const OUString& rStr,
bool bKeepSelection = false );
void GetINetAttrs( SwGetINetAttrs& rArr );
- OUString GetDropTxt( const sal_Int32 nChars ) const;
- void ReplaceDropTxt( const OUString &rStr, SwPaM* pPaM = NULL );
+ OUString GetDropText( const sal_Int32 nChars ) const;
+ void ReplaceDropText( const OUString &rStr, SwPaM* pPaM = NULL );
/** May an outline be moved or copied?
Check whether it's in text body, not in table, and not read-only (move). */
@@ -801,11 +801,11 @@ public:
sal_uInt16 GetLineCount( bool bActPos = true );
/// Query and set footnote-text/number. Set.. to current SSelection!
- bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
- bool SetCurFtn( const SwFmtFtn& rFillFtn );
- bool HasFtns( bool bEndNotes = false ) const;
+ bool GetCurFootnote( SwFormatFootnote* pToFillFootnote = 0 );
+ bool SetCurFootnote( const SwFormatFootnote& rFillFootnote );
+ bool HasFootnotes( bool bEndNotes = false ) const;
- size_t GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
+ size_t GetSeqFootnoteList( SwSeqFieldList& rList, bool bEndNotes = false );
/// @return list of all footnotes and their first portions of text.
SwSection const* InsertSection(
@@ -820,10 +820,10 @@ public:
and not an inner one. */
SwSection* GetAnySection( bool bOutOfTab = false, const Point* pPt = 0 );
- size_t GetSectionFmtCount() const;
- size_t GetSectionFmtPos(const SwSectionFmt&) const;
- const SwSectionFmt& GetSectionFmt(size_t nFmt) const;
- void DelSectionFmt( size_t nFmt);
+ size_t GetSectionFormatCount() const;
+ size_t GetSectionFormatPos(const SwSectionFormat&) const;
+ const SwSectionFormat& GetSectionFormat(size_t nFormat) const;
+ void DelSectionFormat( size_t nFormat);
void UpdateSection( size_t const nSect, SwSectionData &,
SfxItemSet const*const = 0);
bool IsAnySectionInDoc( bool bChkReadOnly = false,
@@ -833,7 +833,7 @@ public:
OUString GetUniqueSectionName( const OUString* pChkStr = 0 ) const;
/// Set attributes.
- void SetSectionAttr(const SfxItemSet& rSet, SwSectionFmt* pSectFmt = 0);
+ void SetSectionAttr(const SfxItemSet& rSet, SwSectionFormat* pSectFormat = 0);
/** Search inside the cursor selection for full selected sections.
if any part of section in the selection @return 0.
@@ -911,8 +911,8 @@ public:
long MergeDoc( const SwDoc& rDoc );
/// Footnote attributes global to document.
- const SwFtnInfo& GetFtnInfo() const;
- void SetFtnInfo(const SwFtnInfo& rInfo);
+ const SwFootnoteInfo& GetFootnoteInfo() const;
+ void SetFootnoteInfo(const SwFootnoteInfo& rInfo);
const SwEndNoteInfo& GetEndNoteInfo() const;
void SetEndNoteInfo(const SwEndNoteInfo& rInfo);
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index e58953cc7380..149ba2b94dba 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -26,47 +26,47 @@
#include <vector>
class SfxPoolItem;
-class SwTxtNode;
+class SwTextNode;
class SwFrm;
struct SwPosition;
-class SwTxtFld;
+class SwTextField;
class SwDoc;
-class SwFmtFld;
-class _SetGetExpFlds;
+class SwFormatField;
+class _SetGetExpFields;
class SwEditShell;
-/// Forward declaration: get "BodyTxtNode" for exp.fld in Fly's headers/footers/footnotes.
-const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
+/// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes.
+const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos,
const SwFrm& rFrm );
OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false);
-struct _SeqFldLstElem
+struct _SeqFieldLstElem
{
OUString sDlgEntry;
sal_uInt16 nSeqNo;
- _SeqFldLstElem( const OUString& rStr, sal_uInt16 nNo )
+ _SeqFieldLstElem( const OUString& rStr, sal_uInt16 nNo )
: sDlgEntry( rStr ), nSeqNo( nNo )
{}
};
-class SW_DLLPUBLIC SwSeqFldList
+class SW_DLLPUBLIC SwSeqFieldList
{
- std::vector<_SeqFldLstElem*> maData;
+ std::vector<_SeqFieldLstElem*> maData;
public:
- ~SwSeqFldList()
+ ~SwSeqFieldList()
{
- for( std::vector<_SeqFldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
+ for( std::vector<_SeqFieldLstElem*>::const_iterator it = maData.begin(); it != maData.end(); ++it )
delete *it;
}
- bool InsertSort(_SeqFldLstElem* pNew);
- bool SeekEntry(const _SeqFldLstElem& rNew, size_t* pPos) const;
+ bool InsertSort(_SeqFieldLstElem* pNew);
+ bool SeekEntry(const _SeqFieldLstElem& rNew, size_t* pPos) const;
size_t Count() { return maData.size(); }
- _SeqFldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
- const _SeqFldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
+ _SeqFieldLstElem* operator[](size_t nIndex) { return maData[nIndex]; }
+ const _SeqFieldLstElem* operator[](size_t nIndex) const { return maData[nIndex]; }
void Clear() { maData.clear(); }
};
@@ -85,7 +85,7 @@ protected:
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
{
OUString sExpand;
- bool bIsInBodyTxt;
+ bool bIsInBodyText;
sal_uInt16 nSubType;
bool bLateInitialization; // #i82544#
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
public:
SwGetExpField( SwGetExpFieldType*, const OUString& rFormel,
- sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0);
+ sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFormat = 0);
virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
virtual void SetLanguage(sal_uInt16 nLng) SAL_OVERRIDE;
@@ -104,14 +104,14 @@ public:
inline void ChgExpStr(const OUString& rExpand);
/// Called by formatting.
- inline bool IsInBodyTxt() const;
+ inline bool IsInBodyText() const;
- /// Set by UpdateExpFlds where node position is known.
- inline void ChgBodyTxtFlag( bool bIsInBody );
+ /// Set by UpdateExpFields where node position is known.
+ inline void ChgBodyTextFlag( bool bIsInBody );
/** For fields in header/footer/footnotes/flys:
Only called by formatting!! */
- void ChangeExpansion( const SwFrm&, const SwTxtFld& );
+ void ChangeExpansion( const SwFrm&, const SwTextField& );
virtual OUString GetFieldName() const SAL_OVERRIDE;
@@ -124,7 +124,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) SAL_OVERRIDE;
- static sal_Int32 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc, sal_Int32 nHint = 0);
+ static sal_Int32 GetReferenceTextPos( const SwFormatField& rFormat, SwDoc& rDoc, sal_Int32 nHint = 0);
// #i82544#
void SetLateInitialization() { bLateInitialization = true;}
};
@@ -136,12 +136,12 @@ inline OUString SwGetExpField::GetExpStr() const
{ return sExpand; }
/// Called by formatting.
-inline bool SwGetExpField::IsInBodyTxt() const
- { return bIsInBodyTxt; }
+inline bool SwGetExpField::IsInBodyText() const
+ { return bIsInBodyText; }
- /// Set by UpdateExpFlds where node position is known.
-inline void SwGetExpField::ChgBodyTxtFlag( bool bIsInBody )
- { bIsInBodyTxt = bIsInBody; }
+ /// Set by UpdateExpFields where node position is known.
+inline void SwGetExpField::ChgBodyTextFlag( bool bIsInBody )
+ { bIsInBodyText = bIsInBody; }
class SwSetExpField;
@@ -175,9 +175,9 @@ public:
/// Overlay, because set-field takes care for its being updated by itself.
inline OUString GetSetRefName() const;
- sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
+ sal_uInt16 SetSeqRefNo( SwSetExpField& rField );
- size_t GetSeqFldList( SwSeqFldList& rList );
+ size_t GetSeqFieldList( SwSeqFieldList& rList );
OUString MakeSeqName( sal_uInt16 nSeqNo );
/// Number sequence fields chapterwise if required.
@@ -185,9 +185,9 @@ public:
void SetDelimiter( const OUString& s ) { sDelim = s; }
sal_uInt8 GetOutlineLvl() const { return nLevel; }
void SetOutlineLvl( sal_uInt8 n ) { nLevel = n; }
- void SetChapter( SwSetExpField& rFld, const SwNode& rNd );
+ void SetChapter( SwSetExpField& rField, const SwNode& rNd );
- /** Member only for SwDoc::UpdateExpFld.
+ /** Member only for SwDoc::UpdateExpField.
It is needed only at runtime of sequence field types! */
const SwNode* GetOutlineChgNd() const { return pOutlChgNd; }
void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
@@ -215,16 +215,16 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
bool bInput;
sal_uInt16 nSeqNo;
sal_uInt16 nSubType;
- SwFmtFld * mpFmtFld; /// pool item to which the SwSetExpField belongs
+ SwFormatField * mpFormatField; /// pool item to which the SwSetExpField belongs
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFmt = 0);
+ SwSetExpField(SwSetExpFieldType*, const OUString& rFormel, sal_uLong nFormat = 0);
- void SetFmtFld(SwFmtFld & rFmtFld);
- SwFmtFld* GetFmtFld() { return mpFmtFld;}
+ void SetFormatField(SwFormatField & rFormatField);
+ SwFormatField* GetFormatField() { return mpFormatField;}
virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
@@ -243,7 +243,7 @@ public:
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
virtual void SetSubType(sal_uInt16 nType) SAL_OVERRIDE;
- inline bool IsSequenceFld() const;
+ inline bool IsSequenceField() const;
/// Logical number, sequence fields.
inline void SetSeqNumber( sal_uInt16 n ) { nSeqNo = n; }
@@ -277,7 +277,7 @@ inline void SwSetExpField::SetInputFlag(bool bInp)
inline bool SwSetExpField::GetInputFlag() const
{ return bInput; }
-inline bool SwSetExpField::IsSequenceFld() const
+inline bool SwSetExpField::IsSequenceField() const
{ return 0 != (nsSwGetSetExpType::GSE_SEQ & static_cast<SwSetExpFieldType*>(GetTyp())->GetType()); }
class SwInputFieldType : public SwFieldType
@@ -300,7 +300,7 @@ class SW_DLLPUBLIC SwInputField : public SwField
sal_uInt16 nSubType;
bool mbIsFormField;
- SwFmtFld* mpFmtFld; // attribute to which the <SwInputField> belongs to
+ SwFormatField* mpFormatField; // attribute to which the <SwInputField> belongs to
virtual OUString Expand() const SAL_OVERRIDE;
virtual SwField* Copy() const SAL_OVERRIDE;
@@ -318,12 +318,12 @@ public:
const OUString& rContent,
const OUString& rPrompt,
sal_uInt16 nSubType = 0,
- sal_uLong nFmt = 0,
+ sal_uLong nFormat = 0,
bool bIsFormField = true );
virtual ~SwInputField();
- void SetFmtFld( SwFmtFld& rFmtFld );
- SwFmtFld* GetFmtFld() { return mpFmtFld;}
+ void SetFormatField( SwFormatField& rFormatField );
+ SwFormatField* GetFormatField() { return mpFormatField;}
// Providing new Input Field's content:
// Fill Input Field's content depending on <nSupType>.
@@ -374,19 +374,19 @@ public:
private:
SwEditShell* pSh;
- _SetGetExpFlds* pSrtLst;
- std::set<const SwTxtFld*> aTmpLst;
+ _SetGetExpFields* pSrtLst;
+ std::set<const SwTextField*> aTmpLst;
};
/// Implementation in tblcalc.cxx.
-class SwTblFieldType : public SwValueFieldType
+class SwTableFieldType : public SwValueFieldType
{
public:
- SwTblFieldType(SwDoc* pDocPtr);
+ SwTableFieldType(SwDoc* pDocPtr);
virtual SwFieldType* Copy() const SAL_OVERRIDE;
};
-class SwTblField : public SwValueField, public SwTableFormula
+class SwTableField : public SwValueField, public SwTableFormula
{
OUString sExpand;
sal_uInt16 nSubType;
@@ -400,8 +400,8 @@ class SwTblField : public SwValueField, public SwTableFormula
OUString GetCommand();
public:
- SwTblField( SwTblFieldType*, const OUString& rFormel,
- sal_uInt16 nSubType = 0, sal_uLong nFmt = 0);
+ SwTableField( SwTableFieldType*, const OUString& rFormel,
+ sal_uInt16 nSubType = 0, sal_uLong nFormat = 0);
virtual void SetValue( const double& rVal ) SAL_OVERRIDE;
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
@@ -410,7 +410,7 @@ public:
OUString GetExpStr() const { return sExpand; }
void ChgExpStr(const OUString& rStr) { sExpand = rStr; }
- void CalcField( SwTblCalcPara& rCalcPara );
+ void CalcField( SwTableCalcPara& rCalcPara );
virtual OUString GetFieldName() const SAL_OVERRIDE;
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index d70f43a18a82..0e044b0b9dbb 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -24,29 +24,29 @@
#include <format.hxx>
#include <charfmt.hxx>
-class SwTxtCharFmt;
+class SwTextCharFormat;
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtCharFmt: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatCharFormat: public SfxPoolItem, public SwClient
{
- friend class SwTxtCharFmt;
- SwTxtCharFmt* pTxtAttr; ///< My text attribute.
+ friend class SwTextCharFormat;
+ SwTextCharFormat* pTextAttr; ///< My text attribute.
public:
- SwFmtCharFmt() : pTxtAttr(0) {}
+ SwFormatCharFormat() : pTextAttr(0) {}
/// single argument ctors shall be explicit.
- explicit SwFmtCharFmt( SwCharFmt *pFmt );
- virtual ~SwFmtCharFmt();
+ explicit SwFormatCharFormat( SwCharFormat *pFormat );
+ virtual ~SwFormatCharFormat();
/// @@@ public copy ctor, but no copy assignment?
- SwFmtCharFmt( const SwFmtCharFmt& rAttr );
+ SwFormatCharFormat( const SwFormatCharFormat& rAttr );
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
private:
/// @@@ public copy ctor, but no copy assignment?
- SwFmtCharFmt & operator= (const SwFmtCharFmt &) SAL_DELETED_FUNCTION;
+ SwFormatCharFormat & operator= (const SwFormatCharFormat &) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
@@ -65,8 +65,8 @@ public:
virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
- void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
- SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
+ void SetCharFormat( SwFormat* pFormat ) { pFormat->Add(this); }
+ SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
};
#endif
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 6925032b79ae..b3bbfcda8aa9 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -43,15 +43,15 @@ class SwFlyFrm;
class SwTabCols;
class SvxBrushItem;
class SvxFrameDirectionItem;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
class SwFrm;
-class SwFmtFrmSize;
-class SwFmtRowSplit;
+class SwFormatFrmSize;
+class SwFormatRowSplit;
class SdrObject;
class Color;
class Outliner;
class SotDataObject;
-class SwFrmFmt;
+class SwFrameFormat;
struct SwSortOptions;
class SdrMarkList;
@@ -139,9 +139,9 @@ enum CurRectType
struct SwGetCurColNumPara
{
- const SwFrmFmt* pFrmFmt;
+ const SwFrameFormat* pFrameFormat;
const SwRect* pPrtRect, *pFrmRect;
- SwGetCurColNumPara() : pFrmFmt( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
+ SwGetCurColNumPara() : pFrameFormat( 0 ), pPrtRect( 0 ), pFrmRect( 0 ) {}
};
#define SW_PASTESDR_INSERT 1
@@ -235,7 +235,7 @@ public:
virtual ~SwFEShell();
/// Copy and Paste methods for internal clipboard.
- bool Copy( SwDoc* pClpDoc, const OUString* pNewClpTxt = 0 );
+ bool Copy( SwDoc* pClpDoc, const OUString* pNewClpText = 0 );
bool Paste( SwDoc* pClpDoc, bool bIncludingPageFrames = false);
/// Paste some pages into another doc - used in mailmerge.
@@ -248,7 +248,7 @@ public:
void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false );
/// Is selected frame within another frame?
- const SwFrmFmt* IsFlyInFly();
+ const SwFrameFormat* IsFlyInFly();
/** If an object as been given, exactly this object is selected
(instead of searching over position). */
@@ -311,12 +311,12 @@ public:
const RndStdIds _nAnchorId,
const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
const sal_Int16 _eVertRelOrient = com::sun::star::text::RelOrientation::FRAME,
- const SwPosition* _pToCharCntntPos = NULL,
+ const SwPosition* _pToCharContentPos = NULL,
const bool _bFollowTextFlow = false,
bool _bMirror = false,
Point* _opRef = NULL,
Size* _opPercent = NULL,
- const SwFmtFrmSize* pFmtFrmSize = 0 ) const;
+ const SwFormatFrmSize* pFormatFrmSize = 0 ) const;
/// Set size of draw objects.
void SetObjRect( const SwRect& rRect );
@@ -332,18 +332,18 @@ public:
Size GetObjSize() const;
/// SS for envelopes: get all page-bound objects and set them to new page.
- void GetPageObjs( std::vector<SwFrmFmt*>& rFillArr );
- void SetPageObjsNewPage( std::vector<SwFrmFmt*>& rFillArr, int nOffset = 1 );
+ void GetPageObjs( std::vector<SwFrameFormat*>& rFillArr );
+ void SetPageObjsNewPage( std::vector<SwFrameFormat*>& rFillArr, int nOffset = 1 );
/// Show current selection (frame / draw object as required).
virtual void MakeSelVisible() SAL_OVERRIDE;
- /** @return FrmFmt of object that may be under Point.
+ /** @return FrameFormat of object that may be under Point.
Object does not become selected! */
- const SwFrmFmt* GetFmtFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
+ const SwFrameFormat* GetFormatFromObj( const Point& rPt, SwRect** pRectToFill = 0 ) const;
/// @return a format too, if the point is over the text of any fly.
- const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const;
+ const SwFrameFormat* GetFormatFromAnyObj( const Point& rPt ) const;
/** Which Protection is set at selected object?
returns several flags in sal_uInt8 */
@@ -363,8 +363,8 @@ public:
bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
bool SetFlyFrmAttr( SfxItemSet &rSet );
bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
- const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
- SwFrmFmt *pParent = 0 );
+ const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
+ SwFrameFormat *pParent = 0 );
void SetFlyPos( const Point &rAbsPos);
Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
@@ -373,12 +373,12 @@ public:
- add output parameter <bVertL2R> */
bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
- SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0.
- void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
+ SwFrameFormat* GetCurFrameFormat() const; ///< If frame then frame style, else 0.
+ void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = 0 ); ///< If frame then set frame style.
const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
/// Find/delete fly containing the cursor.
- SwFrmFmt* WizzardGetFly();
+ SwFrameFormat* WizzardGetFly();
/// Independent selecting of flys.
bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
@@ -388,14 +388,14 @@ public:
/// Iterate over flys - for Basic-collections.
size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
- const SwFrmFmt* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
+ const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
- /// If a fly is selected, it draws cursor into the first CntntFrm.
- const SwFrmFmt* SelFlyGrabCrsr();
+ /// If a fly is selected, it draws cursor into the first ContentFrm.
+ const SwFrameFormat* SelFlyGrabCrsr();
/// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys
- const SwFrmFmt* GetFlyFrmFmt() const;
- SwFrmFmt* GetFlyFrmFmt();
+ const SwFrameFormat* GetFlyFrameFormat() const;
+ SwFrameFormat* GetFlyFrameFormat();
/** OLE. Server requires new size. Desired values are adjusted as frame attributes.
If the values are not allowed, the formatting clips and determines scaling.
@@ -413,7 +413,7 @@ public:
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
const SwRect *pFlyPrtRect = 0,
const SwRect *pFlyFrmRect = 0,
- const bool bNoTxtFrmPrtAreaChanged = false ) = 0;
+ const bool bNoTextFrmPrtAreaChanged = false ) = 0;
/** Connect objects with ActivateWhenVisible at Paint.
Called by notxtfrm::Paint, implemented in wrtsh. */
@@ -445,16 +445,16 @@ public:
bool bSelFrame = true );
/// Position is a graphic with URL?
- const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
+ const SwFrameFormat* IsURLGrfAtPos( const Point& rPt, OUString* pURL = 0,
OUString *pTargetFrameName = 0,
OUString *pURLDescription = 0 ) const;
/** For Chain always connect Fly specified by format with that hit by point.
rRect contains rect of Fly (for its highlight). */
- SwChainRet Chainable( SwRect &rRect, const SwFrmFmt &rSource, const Point &rPt ) const;
- SwChainRet Chain( SwFrmFmt &rSource, const Point &rPt );
- SwChainRet Chain( SwFrmFmt &rSource, const SwFrmFmt &rDest );
- void Unchain( SwFrmFmt &rFmt );
+ SwChainRet Chainable( SwRect &rRect, const SwFrameFormat &rSource, const Point &rPt ) const;
+ SwChainRet Chain( SwFrameFormat &rSource, const Point &rPt );
+ SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
+ void Unchain( SwFrameFormat &rFormat );
void HideChainMarker();
void SetChainMarker();
@@ -530,7 +530,7 @@ public:
/** Get selected DrawObj as graphics (MetaFile/Bitmap).
Return value indicates if it was converted. */
- bool GetDrawObjGraphic( SotClipboardFormatId nFmt, Graphic& rGrf ) const;
+ bool GetDrawObjGraphic( SotClipboardFormatId nFormat, Graphic& rGrf ) const;
void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
bool Paste( const Graphic &rGrf, const OUString& rURL );
@@ -544,7 +544,7 @@ public:
const Graphic* pGraphic = 0,
const SfxItemSet* pFlyAttrSet = 0,
const SfxItemSet* pGrfAttrSet = 0,
- SwFrmFmt* = 0 );
+ SwFrameFormat* = 0 );
/// Insertion of a drawing object which have to be already inserted in the DrawModel.
void InsertDrawObj( SdrObject& rDrawObj,
@@ -562,7 +562,7 @@ public:
void AlignAllFormulasToBaseline();
/// Provide information about content situated closes to given Point.
- Point GetCntntPos( const Point& rPoint, bool bNext ) const;
+ Point GetContentPos( const Point& rPoint, bool bNext ) const;
/// Convert document position into position relative to the current page.
Point GetRelativePagePosition(const Point& rDocPos);
@@ -595,14 +595,14 @@ public:
sal_uInt16 GetPageNumber( const Point &rPoint ) const;
bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
- SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&,
+ SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
const SfxItemSet* pFlyAttrSet = 0,
const SfxItemSet* pGrfAttrSet = 0,
- SwFrmFmt* = 0 );
+ SwFrameFormat* = 0 );
bool FinishOLEObj(); ///< Shutdown server.
- void GetTblAttr( SfxItemSet & ) const;
- void SetTblAttr( const SfxItemSet & );
+ void GetTableAttr( SfxItemSet & ) const;
+ void SetTableAttr( const SfxItemSet & );
bool HasWholeTabSelection() const;
@@ -615,7 +615,7 @@ public:
bool DeleteTable();
bool DeleteRow(bool bCompleteTable = false);
- bool DeleteTblSel(); ///< Current selection, may be whole table.
+ bool DeleteTableSel(); ///< Current selection, may be whole table.
sal_uInt16 MergeTab(); /**< Merge selected parts of table.
@return error via enum. */
@@ -624,13 +624,13 @@ public:
bool SplitTab( bool nVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
bool Sort(const SwSortOptions&); //Sortieren.
- void SetRowHeight( const SwFmtFrmSize &rSz );
+ void SetRowHeight( const SwFormatFrmSize &rSz );
/// Pointer must be detroyed by caller != 0.
- void GetRowHeight( SwFmtFrmSize *&rpSz ) const;
+ void GetRowHeight( SwFormatFrmSize *&rpSz ) const;
- void SetRowSplit( const SwFmtRowSplit &rSz );
- void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
+ void SetRowSplit( const SwFormatRowSplit &rSz );
+ void GetRowSplit( SwFormatRowSplit *&rpSz ) const;
void SetBoxAlign( sal_uInt16 nOrient );
sal_uInt16 GetBoxAlign() const; ///< USHRT_MAX if ambiguous.
@@ -662,7 +662,7 @@ public:
const Point &rPt );
/// pEnd will be used during MouseMove
- bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
+ bool SelTableRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
void GetTabRows( SwTabCols &rToFill ) const;
void SetTabRows( const SwTabCols &rNew, bool bCurColOnly );
@@ -672,9 +672,9 @@ public:
void ProtectCells(); /**< If a table selection exists it is destroyed in case
cursor is not allowed in readonly. */
void UnProtectCells(); ///< Refers to table selection.
- void UnProtectTbls(); ///< Unprotect all tables in selection.
- bool HasTblAnyProtection( const OUString* pTblName = 0,
- bool* pFullTblProtection = 0 );
+ void UnProtectTables(); ///< Unprotect all tables in selection.
+ bool HasTableAnyProtection( const OUString* pTableName = 0,
+ bool* pFullTableProtection = 0 );
bool CanUnProtectCells() const;
sal_uInt16 GetRowsToRepeat() const;
@@ -700,13 +700,13 @@ public:
bool BalanceCellWidth( bool bTstOnly );
/// AutoFormat for table/ table selection.
- bool SetTableAutoFmt( const SwTableAutoFmt& rNew );
+ bool SetTableAutoFormat( const SwTableAutoFormat& rNew );
- bool GetTableAutoFmt( SwTableAutoFmt& rGet );
+ bool GetTableAutoFormat( SwTableAutoFormat& rGet );
bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 );
- bool GetAutoSum( OUString& rFml ) const;
+ bool GetAutoSum( OUString& rFormula ) const;
/** Phy: real page count.
Virt: consider offset that may have been set by user. */
@@ -716,7 +716,7 @@ public:
void SetPageOffset( sal_uInt16 nOffset ); ///< Changes last page offset.
sal_uInt16 GetPageOffset() const; ///< @return last page offset.
- void InsertLabel( const SwLabelType eType, const OUString &rTxt, const OUString& rSeparator,
+ void InsertLabel( const SwLabelType eType, const OUString &rText, const OUString& rSeparator,
const OUString& rNumberSeparator,
const bool bBefore, const sal_uInt16 nId,
const OUString& rCharacterStyle,
@@ -737,10 +737,10 @@ public:
bool IsLastCellInRow() const;
/// Width of current range for column-dialog.
- long GetSectionWidth( SwFmt const & rFmt ) const;
+ long GetSectionWidth( SwFormat const & rFormat ) const;
- void GetConnectableFrmFmts
- (SwFrmFmt & rFmt, const OUString & rReference, bool bSuccessors,
+ void GetConnectableFrameFormats
+ (SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
::std::vector< OUString > & aPrevPageVec,
::std::vector< OUString > & aThisPageVec,
::std::vector< OUString > & aNextPageVec,
@@ -775,10 +775,10 @@ public:
void ParkCursorInTab();
- SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
+ SwTextNode * GetNumRuleNodeAtPos(const Point &rPot);
bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
- static bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
+ static bool IsVerticalModeAtNdAndPos( const SwTextNode& _rTextNode,
const Point& _rDocPos );
void ToggleHeaderFooterEdit( );
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index cc365ed6b2ec..7447fdb86096 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -78,7 +78,7 @@ enum RES_FIELDS
};
/// List of FieldTypes at UI.
-enum SwFldTypesEnum
+enum SwFieldTypesEnum
{
TYP_BEGIN,
TYP_DATEFLD = TYP_BEGIN, // 0
@@ -224,7 +224,7 @@ enum SwDateTimeSubType
};
/// General tools.
-OUString GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
+OUString GetResult(double nVal, sal_uInt32 nNumFormat, sal_uInt16 nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const OUString& rStr);
OUString FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
@@ -240,9 +240,9 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
sal_uInt16 m_nWhich;
friend void _FinitUI(); ///< In order to delete pointer!
- static std::vector<OUString>* s_pFldNames;
+ static std::vector<OUString>* s_pFieldNames;
- static void _GetFldName(); ///< Sets up FldNames; fldmgr.cxx!
+ static void _GetFieldName(); ///< Sets up FieldNames; fldmgr.cxx!
protected:
/// Single argument ctors shall be explicit.
@@ -267,10 +267,10 @@ public:
sal_uInt16 Which() const { return m_nWhich; }
- inline void UpdateFlds() const;
+ inline void UpdateFields() const;
};
-inline void SwFieldType::UpdateFlds() const
+inline void SwFieldType::UpdateFields() const
{
const_cast<SwFieldType*>(this)->ModifyNotification( 0, 0 );
}
@@ -297,7 +297,7 @@ protected:
void SetFormat(sal_uInt32 const nSet) { m_nFormat = nSet; }
SwField( SwFieldType* pTyp,
- sal_uInt32 nFmt = 0,
+ sal_uInt32 nFormat = 0,
sal_uInt16 nLang = LANGUAGE_SYSTEM,
bool m_bUseFieldValueCache = true );
@@ -314,7 +314,7 @@ public:
@remark most callers should use the cached field value.
this is because various fields need special handing
(ChangeExpansion()) to return correct values, and only
- SwTxtFormatter::NewFldPortion() sets things up properly.
+ SwTextFormatter::NewFieldPortion() sets things up properly.
@return the generated text (suitable for display)
*/
OUString ExpandField(bool const bCached, ToxAuthorityField eField = AUTH_FIELD_IDENTIFIER) const;
@@ -396,9 +396,9 @@ public:
inline bool UseFormat() const { return m_bUseFormat; }
inline void EnableFormat(bool bFormat = true) { m_bUseFormat = bFormat; }
- OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const;
+ OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const;
OUString DoubleToString(const double &rVal, LanguageType eLng) const;
- OUString DoubleToString(const double &rVal, sal_uInt32 nFmt) const;
+ OUString DoubleToString(const double &rVal, sal_uInt32 nFormat) const;
};
class SW_DLLPUBLIC SwValueField : public SwField
@@ -407,8 +407,8 @@ private:
double m_fValue;
protected:
- SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
- SwValueField( const SwValueField& rFld );
+ SwValueField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+ SwValueField( const SwValueField& rField );
public:
virtual ~SwValueField();
@@ -421,10 +421,10 @@ public:
virtual double GetValue() const;
virtual void SetValue( const double& rVal );
- inline OUString ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const
- { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFmt, nLng); }
+ inline OUString ExpandValue(const double& rVal, sal_uInt32 nFormat, sal_uInt16 nLng=0) const
+ { return static_cast<SwValueFieldType*>(GetTyp())->ExpandValue(rVal, nFormat, nLng); }
- static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
+ static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFormat);
};
class SW_DLLPUBLIC SwFormulaField : public SwValueField
@@ -433,8 +433,8 @@ private:
OUString m_sFormula;
protected:
- SwFormulaField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, const double fVal = 0.0 );
- SwFormulaField( const SwFormulaField& rFld );
+ SwFormulaField( SwValueFieldType* pFieldType, sal_uInt32 nFormat = 0, const double fVal = 0.0 );
+ SwFormulaField( const SwFormulaField& rField );
public:
virtual OUString GetFormula() const SAL_OVERRIDE;
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 2bfbec12cc6f..f99eb558d7ab 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -98,7 +98,7 @@ class SW_DLLPUBLIC SwDateTimeField : public SwValueField
public:
SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
- sal_uLong nFmt = 0, sal_uInt16 nLng = 0);
+ sal_uLong nFormat = 0, sal_uInt16 nLng = 0);
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index 99d77062483d..ab53fea827da 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -22,7 +22,7 @@
#include "rcid.hrc"
/*--------------------------------------------------------------------
- TypeId, see SwFldTypesEnum
+ TypeId, see SwFieldTypesEnum
--------------------------------------------------------------------*/
#define STR_TYPE_BEGIN RC_FLDDLG_BEGIN
diff --git a/sw/inc/fldupde.hxx b/sw/inc/fldupde.hxx
index 788ec5966282..6995b403dbb1 100644
--- a/sw/inc/fldupde.hxx
+++ b/sw/inc/fldupde.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SW_INC_FLDUPDE_HXX
#define INCLUDED_SW_INC_FLDUPDE_HXX
-enum SwFldUpdateFlags
+enum SwFieldUpdateFlags
{
AUTOUPD_OFF,
AUTOUPD_FIELD_ONLY,
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index f3434bdb2ed9..0a912d06ce2f 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -23,20 +23,20 @@
#include <boost/shared_ptr.hpp>
#include <set>
-class SwFrmFmt;
+class SwFrameFormat;
class SwNodeIndex;
/// For querying current flys in document.
class SW_DLLPUBLIC SwPosFlyFrm
{
- const SwFrmFmt* pFrmFmt; ///< FlyFrmFmt
+ const SwFrameFormat* pFrameFormat; ///< FlyFrameFormat
SwNodeIndex* pNdIdx; ///< Index for node is sufficient.
sal_uInt32 nOrdNum;
public:
- SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos );
+ SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
- const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
+ const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
sal_uInt32 GetOrdNum() const { return nOrdNum; }
};
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 38bedd19415f..54468ab91cb5 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -31,9 +31,9 @@ struct SwPosition;
class IntlWrapper;
/// FlyAnchors
-class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatAnchor: public SfxPoolItem
{
- ::boost::scoped_ptr<SwPosition> m_pCntntAnchor; /**< 0 for page-bound frames.
+ ::boost::scoped_ptr<SwPosition> m_pContentAnchor; /**< 0 for page-bound frames.
Index for paragraph-bound frames.
Position for character-bound frames. */
RndStdIds nAnchorId;
@@ -44,11 +44,11 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
static sal_uInt32 mnOrderCounter;
public:
- SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
- SwFmtAnchor( const SwFmtAnchor &rCpy );
- virtual ~SwFmtAnchor();
+ SwFormatAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
+ SwFormatAnchor( const SwFormatAnchor &rCpy );
+ virtual ~SwFormatAnchor();
- SwFmtAnchor &operator=( const SwFmtAnchor& );
+ SwFormatAnchor &operator=( const SwFormatAnchor& );
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -64,7 +64,7 @@ public:
RndStdIds GetAnchorId() const { return nAnchorId; }
sal_uInt16 GetPageNum() const { return nPageNum; }
- const SwPosition *GetCntntAnchor() const { return m_pCntntAnchor.get(); }
+ const SwPosition *GetContentAnchor() const { return m_pContentAnchor.get(); }
// #i28701#
sal_uInt32 GetOrder() const { return mnOrder;}
@@ -75,10 +75,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtAnchor &SwAttrSet::GetAnchor(bool bInP) const
- { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
+inline const SwFormatAnchor &SwAttrSet::GetAnchor(bool bInP) const
+ { return static_cast<const SwFormatAnchor&>(Get(RES_ANCHOR, bInP)); }
- inline const SwFmtAnchor &SwFmt::GetAnchor(bool bInP) const
+ inline const SwFormatAnchor &SwFormat::GetAnchor(bool bInP) const
{ return m_aSet.GetAnchor(bInP); }
#endif
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index e7816237226c..048307c15c2b 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -23,21 +23,21 @@
#include <format.hxx>
#include <memory>
-class SwFmtAutoFmt: public SfxPoolItem
+class SwFormatAutoFormat: public SfxPoolItem
{
std::shared_ptr<SfxItemSet> mpHandle;
public:
- SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
+ SwFormatAutoFormat( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
/// single argument ctors shall be explicit.
- virtual ~SwFmtAutoFmt();
+ virtual ~SwFormatAutoFormat();
/// @@@ public copy ctor, but no copy assignment?
- SwFmtAutoFmt( const SwFmtAutoFmt& rAttr );
+ SwFormatAutoFormat( const SwFormatAutoFormat& rAttr );
private:
/// @@@ public copy ctor, but no copy assignment?
- SwFmtAutoFmt & operator= (const SwFmtAutoFmt &) SAL_DELETED_FUNCTION;
+ SwFormatAutoFormat & operator= (const SwFormatAutoFormat &) SAL_DELETED_FUNCTION;
public:
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index e7371a468fe4..cd4a34ab2768 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -25,10 +25,10 @@
#include "swdllapi.h"
/// If text in multi-column sections should be evenly distributed.
-class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatNoBalancedColumns : public SfxBoolItem
{
public:
- SwFmtNoBalancedColumns( bool bFlag = false )
+ SwFormatNoBalancedColumns( bool bFlag = false )
: SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
/// "pure virtual methods" of SfxPoolItem
@@ -36,10 +36,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
- { return static_cast<const SwFmtNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
+inline const SwFormatNoBalancedColumns &SwAttrSet::GetBalancedColumns(bool bInP) const
+ { return static_cast<const SwFormatNoBalancedColumns&>(Get( RES_COLUMNBALANCE, bInP )); }
-inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(bool bInP) const
+inline const SwFormatNoBalancedColumns &SwFormat::GetBalancedColumns(bool bInP) const
{ return m_aSet.GetBalancedColumns( bInP ); }
#endif
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 267d54190e63..18f25baa75ee 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -68,7 +68,7 @@ enum SwColLineAdj
COLADJ_BOTTOM
};
-class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatCol : public SfxPoolItem
{
editeng::SvxBorderStyle m_eLineStyle; ///< style of the separator line
sal_uLong m_nLineWidth; ///< Width of the separator line.
@@ -92,14 +92,14 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
SAL_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
public:
- SwFmtCol();
- SwFmtCol( const SwFmtCol& );
- virtual ~SwFmtCol();
+ SwFormatCol();
+ SwFormatCol( const SwFormatCol& );
+ virtual ~SwFormatCol();
//#i120133#
sal_Int16 GetAdjustValue() const { return m_aWidthAdjustValue; }
void SetAdjustValue( const sal_Int16& n ) { m_aWidthAdjustValue = n; }
- SwFmtCol& operator=( const SwFmtCol& );
+ SwFormatCol& operator=( const SwFormatCol& );
/// "pure virtual methods" of SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -166,10 +166,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtCol &SwAttrSet::GetCol(bool bInP) const
- { return static_cast<const SwFmtCol&>(Get( RES_COL,bInP)); }
+inline const SwFormatCol &SwAttrSet::GetCol(bool bInP) const
+ { return static_cast<const SwFormatCol&>(Get( RES_COL,bInP)); }
-inline const SwFmtCol &SwFmt::GetCol(bool bInP) const
+inline const SwFormatCol &SwFormat::GetCol(bool bInP) const
{ return m_aSet.GetCol(bInP); }
#endif
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 9c908b18893b..ce848e2ae4b9 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -28,16 +28,16 @@
class IntlWrapper;
/// Connection (text flow) between two FlyFrms.
-class SW_DLLPUBLIC SwFmtChain: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
{
- SwClient aPrev, ///< Previous SwFlyFrmFmt (if existent).
- aNext; ///< Next SwFlyFrmFmt (if existent).
+ SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
+ aNext; ///< Next SwFlyFrameFormat (if existent).
public:
- SwFmtChain() : SfxPoolItem( RES_CHAIN ) {}
- SwFmtChain( const SwFmtChain &rCpy );
+ SwFormatChain() : SfxPoolItem( RES_CHAIN ) {}
+ SwFormatChain( const SwFormatChain &rCpy );
- inline SwFmtChain &operator=( const SwFmtChain& );
+ inline SwFormatChain &operator=( const SwFormatChain& );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -50,24 +50,24 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
- SwFlyFrmFmt* GetPrev() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aPrev.GetRegisteredIn())); }
- SwFlyFrmFmt* GetNext() const { return const_cast<SwFlyFrmFmt*>(static_cast<const SwFlyFrmFmt*>(aNext.GetRegisteredIn())); }
+ SwFlyFrameFormat* GetPrev() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aPrev.GetRegisteredIn())); }
+ SwFlyFrameFormat* GetNext() const { return const_cast<SwFlyFrameFormat*>(static_cast<const SwFlyFrameFormat*>(aNext.GetRegisteredIn())); }
- void SetPrev( SwFlyFrmFmt *pFmt );
- void SetNext( SwFlyFrmFmt *pFmt );
+ void SetPrev( SwFlyFrameFormat *pFormat );
+ void SetNext( SwFlyFrameFormat *pFormat );
};
-SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
+SwFormatChain &SwFormatChain::operator=( const SwFormatChain &rCpy )
{
SetPrev( rCpy.GetPrev() );
SetNext( rCpy.GetNext() );
return *this;
}
-inline const SwFmtChain &SwAttrSet::GetChain(bool bInP) const
- { return static_cast<const SwFmtChain&>(Get( RES_CHAIN,bInP)); }
+inline const SwFormatChain &SwAttrSet::GetChain(bool bInP) const
+ { return static_cast<const SwFormatChain&>(Get( RES_CHAIN,bInP)); }
-inline const SwFmtChain &SwFmt::GetChain(bool bInP) const
+inline const SwFormatChain &SwFormat::GetChain(bool bInP) const
{ return m_aSet.GetChain(bInP); }
#endif
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index b11c160a3f02..77c33f9eaeaa 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -26,33 +26,33 @@
class SwNodeIndex;
class SwStartNode;
-/// Cntnt, content of frame (header, footer, fly).
-class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
+/// Content, content of frame (header, footer, fly).
+class SW_DLLPUBLIC SwFormatContent: public SfxPoolItem
{
SwNodeIndex *pStartNode;
- SwFmtCntnt &operator=( const SwFmtCntnt & ) SAL_DELETED_FUNCTION;
+ SwFormatContent &operator=( const SwFormatContent & ) SAL_DELETED_FUNCTION;
public:
- SwFmtCntnt( const SwStartNode* pStartNode = 0 );
- SwFmtCntnt( const SwFmtCntnt &rCpy );
- virtual ~SwFmtCntnt();
+ SwFormatContent( const SwStartNode* pStartNode = 0 );
+ SwFormatContent( const SwFormatContent &rCpy );
+ virtual ~SwFormatContent();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- const SwNodeIndex *GetCntntIdx() const { return pStartNode; }
- void SetNewCntntIdx( const SwNodeIndex *pIdx );
+ const SwNodeIndex *GetContentIdx() const { return pStartNode; }
+ void SetNewContentIdx( const SwNodeIndex *pIdx );
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtCntnt &SwAttrSet::GetCntnt(bool bInP) const
- { return static_cast<const SwFmtCntnt&>(Get( RES_CNTNT,bInP)); }
+inline const SwFormatContent &SwAttrSet::GetContent(bool bInP) const
+ { return static_cast<const SwFormatContent&>(Get( RES_CNTNT,bInP)); }
-inline const SwFmtCntnt &SwFmt::GetCntnt(bool bInP) const
- { return m_aSet.GetCntnt(bInP); }
+inline const SwFormatContent &SwFormat::GetContent(bool bInP) const
+ { return m_aSet.GetContent(bInP); }
#endif
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 4d4b047c9897..b3529802206c 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -28,33 +28,33 @@
class SwDoc;
namespace sw{ class DocumentStylePoolManager; }
-class SwFmtColl : public SwFmt
+class SwFormatColl : public SwFormat
{
protected:
- SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName,
- const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
- sal_uInt16 nFmtWhich )
- : SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+ SwFormatColl( SwAttrPool& rPool, const sal_Char* pFormatName,
+ const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+ sal_uInt16 nFormatWhich )
+ : SwFormat( rPool, pFormatName, pWhichRanges, pDerFrom, nFormatWhich )
{ SetAuto( false ); }
- SwFmtColl( SwAttrPool& rPool, const OUString &rFmtName,
- const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
- sal_uInt16 nFmtWhich )
- : SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
+ SwFormatColl( SwAttrPool& rPool, const OUString &rFormatName,
+ const sal_uInt16* pWhichRanges, SwFormatColl* pDerFrom,
+ sal_uInt16 nFormatWhich )
+ : SwFormat( rPool, rFormatName, pWhichRanges, pDerFrom, nFormatWhich )
{ SetAuto( false ); }
private:
- SwFmtColl(const SwFmtColl & ) SAL_DELETED_FUNCTION;
- const SwFmtColl &operator=(const SwFmtColl &) SAL_DELETED_FUNCTION;
+ SwFormatColl(const SwFormatColl & ) SAL_DELETED_FUNCTION;
+ const SwFormatColl &operator=(const SwFormatColl &) SAL_DELETED_FUNCTION;
};
/// Represents the style of a paragraph.
-class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
+class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl
{
friend class SwDoc;
friend class ::sw::DocumentStylePoolManager;
- SwTxtFmtColl(const SwTxtFmtColl & rRef) SAL_DELETED_FUNCTION;
+ SwTextFormatColl(const SwTextFormatColl & rRef) SAL_DELETED_FUNCTION;
bool mbStayAssignedToListLevelOfOutlineStyle;
@@ -62,26 +62,26 @@ protected:
bool mbAssignedToOutlineStyle;
- SwTxtFmtColl *pNextTxtFmtColl;
+ SwTextFormatColl *pNextTextFormatColl;
- SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
- SwTxtFmtColl* pDerFrom = 0,
- sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
- : SwFmtColl(rPool, pFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+ SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+ SwTextFormatColl* pDerFrom = 0,
+ sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+ : SwFormatColl(rPool, pFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
, mbStayAssignedToListLevelOfOutlineStyle(false)
, mbAssignedToOutlineStyle(false)
{
- pNextTxtFmtColl = this;
+ pNextTextFormatColl = this;
}
- SwTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
- SwTxtFmtColl* pDerFrom = 0,
- sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
- : SwFmtColl(rPool, rFmtCollName, aTxtFmtCollSetRange, pDerFrom, nFmtWh)
+ SwTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+ SwTextFormatColl* pDerFrom = 0,
+ sal_uInt16 nFormatWh = RES_TXTFMTCOLL )
+ : SwFormatColl(rPool, rFormatCollName, aTextFormatCollSetRange, pDerFrom, nFormatWh)
, mbStayAssignedToListLevelOfOutlineStyle(false)
, mbAssignedToOutlineStyle(false)
{
- pNextTxtFmtColl = this;
+ pNextTextFormatColl = this;
}
/// To get UL- / LR- / FontHeight-changes.
@@ -91,8 +91,8 @@ public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
- inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
- SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
+ inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
+ SwTextFormatColl& GetNextTextFormatColl() const { return *pNextTextFormatColl; }
bool IsAtDocNodeSet() const;
@@ -117,12 +117,12 @@ public:
/** Override to recognize changes on the <SwNumRuleItem> and register/unregister
the paragragh style at the corresponding <SwNumRule> instance. */
- virtual bool SetFmtAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
- virtual bool SetFmtAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
- virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
+ virtual bool SetFormatAttr( const SfxPoolItem& rAttr ) SAL_OVERRIDE;
+ virtual bool SetFormatAttr( const SfxItemSet& rSet ) SAL_OVERRIDE;
+ virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ) SAL_OVERRIDE;
- /// Override <ResetAllFmtAttr()> to stay assigned to list level of outline style.
- virtual sal_uInt16 ResetAllFmtAttr() SAL_OVERRIDE;
+ /// Override <ResetAllFormatAttr()> to stay assigned to list level of outline style.
+ virtual sal_uInt16 ResetAllFormatAttr() SAL_OVERRIDE;
inline bool StayAssignedToListLevelOfOutlineStyle() const
{
@@ -134,19 +134,19 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-class SwGrfFmtColl: public SwFmtColl
+class SwGrfFormatColl: public SwFormatColl
{
friend class SwDoc;
protected:
- SwGrfFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
- SwGrfFmtColl* pDerFrom = 0 )
- : SwFmtColl( rPool, pFmtCollName, aGrfFmtCollSetRange,
+ SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+ SwGrfFormatColl* pDerFrom = 0 )
+ : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange,
pDerFrom, RES_GRFFMTCOLL )
{}
- SwGrfFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
- SwGrfFmtColl* pDerFrom = 0 )
- : SwFmtColl( rPool, rFmtCollName, aGrfFmtCollSetRange,
+ SwGrfFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+ SwGrfFormatColl* pDerFrom = 0 )
+ : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange,
pDerFrom, RES_GRFFMTCOLL )
{}
@@ -178,15 +178,15 @@ class SW_DLLPUBLIC SwCollCondition : public SwClient
union
{
sal_uLong nSubCondition;
- OUString* pFldExpression;
+ OUString* pFieldExpression;
} aSubCondition;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
- SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+ SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
sal_uLong nSubCond = 0 );
- SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+ SwCollCondition( SwTextFormatColl* pColl, sal_uLong nMasterCond,
const OUString& rSubExp );
virtual ~SwCollCondition();
@@ -203,50 +203,50 @@ public:
sal_uLong GetCondition() const { return nCondition; }
sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; }
- const OUString* GetFldExpression() const
- { return aSubCondition.pFldExpression; }
+ const OUString* GetFieldExpression() const
+ { return aSubCondition.pFieldExpression; }
void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
- SwTxtFmtColl* GetTxtFmtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); }
- void RegisterToFormat( SwFmt& );
+ SwTextFormatColl* GetTextFormatColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); }
+ void RegisterToFormat( SwFormat& );
};
-class SwFmtCollConditions : public boost::ptr_vector<SwCollCondition> {};
+class SwFormatCollConditions : public boost::ptr_vector<SwCollCondition> {};
-class SW_DLLPUBLIC SwConditionTxtFmtColl : public SwTxtFmtColl
+class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl
{
friend class SwDoc;
friend class ::sw::DocumentStylePoolManager;
protected:
- SwFmtCollConditions aCondColls;
+ SwFormatCollConditions aCondColls;
- SwConditionTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
- SwTxtFmtColl* pDerFrom = 0 )
- : SwTxtFmtColl( rPool, pFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+ SwConditionTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName,
+ SwTextFormatColl* pDerFrom = 0 )
+ : SwTextFormatColl( rPool, pFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
{}
- SwConditionTxtFmtColl( SwAttrPool& rPool, const OUString &rFmtCollName,
- SwTxtFmtColl* pDerFrom = 0 )
- : SwTxtFmtColl( rPool, rFmtCollName, pDerFrom, RES_CONDTXTFMTCOLL )
+ SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName,
+ SwTextFormatColl* pDerFrom = 0 )
+ : SwTextFormatColl( rPool, rFormatCollName, pDerFrom, RES_CONDTXTFMTCOLL )
{}
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
- virtual ~SwConditionTxtFmtColl();
+ virtual ~SwConditionTextFormatColl();
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
- const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
+ const SwFormatCollConditions& GetCondColls() const { return aCondColls; }
void InsertCondition( const SwCollCondition& rCond );
bool RemoveCondition( const SwCollCondition& rCond );
- void SetConditions( const SwFmtCollConditions& );
+ void SetConditions( const SwFormatCollConditions& );
};
// FEATURE::CONDCOLL
/// Inline implementations.
-inline void SwTxtFmtColl::SetNextTxtFmtColl( SwTxtFmtColl& rNext )
+inline void SwTextFormatColl::SetNextTextFormatColl( SwTextFormatColl& rNext )
{
- pNextTxtFmtColl = &rNext;
+ pNextTextFormatColl = &rNext;
}
#endif
diff --git a/sw/inc/fmtcolfunc.hxx b/sw/inc/fmtcolfunc.hxx
index e8b4771908c9..e6b12d0ef61b 100644
--- a/sw/inc/fmtcolfunc.hxx
+++ b/sw/inc/fmtcolfunc.hxx
@@ -19,12 +19,12 @@
#ifndef INCLUDED_SW_INC_FMTCOLFUNC_HXX
#define INCLUDED_SW_INC_FMTCOLFUNC_HXX
-class SwFmt;
+class SwFormat;
class SwNumRuleItem;
-// namespace <TxtFmtCollFunc> for functions and procedures working on
-// paragraph styles (instances of <SwTxtFmtColl>
-namespace TxtFmtCollFunc
+// namespace <TextFormatCollFunc> for functions and procedures working on
+// paragraph styles (instances of <SwTextFormatColl>
+namespace TextFormatCollFunc
{
/** Checks, if assignment of paragraph style to list level of outline style
has to be deleted, and deletes the assignment, if needed.
@@ -36,43 +36,43 @@ namespace TxtFmtCollFunc
@author OD
*/
- void CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle(
- SwFmt* pFmt,
+ void CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle(
+ SwFormat* pFormat,
const SwNumRuleItem* pNewNumRuleItem = 0L );
/** determines the list style, which directly set at the given paragraph style
@author OD
- @param rTxtFmtColl
+ @param rTextFormatColl
input parameter - paragraph style for which the list style should be retrieved
@return pointer to <SwNumRule> instance, if the given paragraph style
has directly set a list style, 0 otherwise
*/
- SwNumRule* GetNumRule( SwTxtFmtColl& rTxtFmtColl );
+ SwNumRule* GetNumRule( SwTextFormatColl& rTextFormatColl );
/** adds the given paragraph style at the directly set list style
Note: If the given paragraph style has no directly set list style, nothing happens
- @param rTxtFmtColl
+ @param rTextFormatColl
input parameter - paragraph style which is added to its directly set list style
@author OD
*/
- void AddToNumRule( SwTxtFmtColl& rTxtFmtColl );
+ void AddToNumRule( SwTextFormatColl& rTextFormatColl );
/** removes te given paragraph style from the directly set list style
Note: If the given paragraph style has no directly set list style, nothing happens
- @param rTxtFmtColl
+ @param rTextFormatColl
input parameter - paragraph style which is removed from its directly set list style
@author OD
*/
- void RemoveFromNumRule( SwTxtFmtColl& rTxtFmtColl );
+ void RemoveFromNumRule( SwTextFormatColl& rTextFormatColl );
}
#endif
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index 6c4045ca1994..6d2625579bd5 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -26,10 +26,10 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatEditInReadonly : public SfxBoolItem
{
public:
- SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
+ SwFormatEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
bool bPrt = false ) : SfxBoolItem( nId, bPrt ) {}
/// "pure virtual methos" of SfxPoolItem
@@ -42,10 +42,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
- { return static_cast<const SwFmtEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
+inline const SwFormatEditInReadonly &SwAttrSet::GetEditInReadonly(bool bInP) const
+ { return static_cast<const SwFormatEditInReadonly&>(Get( RES_EDIT_IN_READONLY,bInP)); }
-inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(bool bInP) const
+inline const SwFormatEditInReadonly &SwFormat::GetEditInReadonly(bool bInP) const
{ return m_aSet.GetEditInReadonly(bInP); }
#endif
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 136038d69209..64115f61d5eb 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -21,33 +21,33 @@
#include <svl/poolitem.hxx>
-class SwFrmFmt;
-class SwTxtFlyCnt;
+class SwFrameFormat;
+class SwTextFlyCnt;
/**
* Format of a fly content.
*
* A pool item that is attached to the placeholder character of an as-character frame. (TextFrame, etc.)
*/
-class SwFmtFlyCnt : public SfxPoolItem
+class SwFormatFlyCnt : public SfxPoolItem
{
- friend class SwTxtFlyCnt;
- SwTxtFlyCnt* pTxtAttr;
- SwFrmFmt* pFmt; ///< My Fly/DrawFrame-format.
- SwFmtFlyCnt& operator=(const SwFmtFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
+ friend class SwTextFlyCnt;
+ SwTextFlyCnt* pTextAttr;
+ SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
+ SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) SAL_DELETED_FUNCTION;
public:
- SwFmtFlyCnt( SwFrmFmt *pFrmFmt );
+ SwFormatFlyCnt( SwFrameFormat *pFrameFormat );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const SAL_OVERRIDE;
- inline SwFrmFmt *GetFrmFmt() const { return pFmt; }
+ inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
/// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object.
- inline void SetFlyFmt( SwFrmFmt* pNew = 0 ) { pFmt = pNew; }
+ inline void SetFlyFormat( SwFrameFormat* pNew = 0 ) { pFormat = pNew; }
- const SwTxtFlyCnt *GetTxtFlyCnt() const { return pTxtAttr; }
- SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; }
+ const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
+ SwTextFlyCnt *GetTextFlyCnt() { return pTextAttr; }
bool Sw3ioExportAllowed() const;
};
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index c4f5e973a5d6..0d4f86bf58f1 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -31,27 +31,27 @@
#include <calbck.hxx>
class SwField;
-class SwTxtFld;
+class SwTextField;
class SwView;
class SwFieldType;
// ATT_FLD
-class SW_DLLPUBLIC SwFmtFld
+class SW_DLLPUBLIC SwFormatField
: public SfxPoolItem
, public SwModify
, public SfxBroadcaster
{
friend void _InitCore();
- SwFmtFld( sal_uInt16 nWhich ); // for default-Attibute
+ SwFormatField( sal_uInt16 nWhich ); // for default-Attibute
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextField> m_wXTextField;
SwField* mpField;
- SwTxtFld* mpTxtFld; // the TextAttribute
+ SwTextField* mpTextField; // the TextAttribute
// @@@ copy construction allowed, but copy assignment is not? @@@
- SwFmtFld& operator=(const SwFmtFld& rFld) SAL_DELETED_FUNCTION;
+ SwFormatField& operator=(const SwFormatField& rField) SAL_DELETED_FUNCTION;
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
@@ -61,12 +61,12 @@ public:
TYPEINFO_OVERRIDE();
/// Single argument constructors shall be explicit.
- explicit SwFmtFld( const SwField &rFld );
+ explicit SwFormatField( const SwField &rField );
/// @@@ copy construction allowed, but copy assignment is not? @@@
- SwFmtFld( const SwFmtFld& rAttr );
+ SwFormatField( const SwFormatField& rAttr );
- virtual ~SwFmtFld();
+ virtual ~SwFormatField();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -94,19 +94,19 @@ public:
*/
void SetField( SwField * pField );
- const SwTxtFld* GetTxtFld() const
+ const SwTextField* GetTextField() const
{
- return mpTxtFld;
+ return mpTextField;
}
- SwTxtFld* GetTxtFld()
+ SwTextField* GetTextField()
{
- return mpTxtFld;
+ return mpTextField;
}
- void SetTxtFld( SwTxtFld& rTxtFld );
- void ClearTxtFld();
+ void SetTextField( SwTextField& rTextField );
+ void ClearTextField();
void RegisterToFieldType( SwFieldType& );
- bool IsFldInDoc() const;
+ bool IsFieldInDoc() const;
bool IsProtect() const;
SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
@@ -117,7 +117,7 @@ public:
{ m_wXTextField = xTextField; }
};
-enum class SwFmtFldHintWhich
+enum class SwFormatFieldHintWhich
{
INSERTED = 1,
REMOVED = 2,
@@ -126,21 +126,21 @@ enum class SwFmtFldHintWhich
LANGUAGE = 5
};
-class SW_DLLPUBLIC SwFmtFldHint : public SfxHint
+class SW_DLLPUBLIC SwFormatFieldHint : public SfxHint
{
- const SwFmtFld* pFld;
- SwFmtFldHintWhich nWhich;
+ const SwFormatField* pField;
+ SwFormatFieldHintWhich nWhich;
const SwView* pView;
public:
- SwFmtFldHint( const SwFmtFld* p, SwFmtFldHintWhich n, const SwView* pV = 0)
- : pFld(p)
+ SwFormatFieldHint( const SwFormatField* p, SwFormatFieldHintWhich n, const SwView* pV = 0)
+ : pField(p)
, nWhich(n)
, pView(pV)
{}
- const SwFmtFld* GetField() const { return pFld; }
- SwFmtFldHintWhich Which() const { return nWhich; }
+ const SwFormatField* GetField() const { return pField; }
+ SwFormatFieldHintWhich Which() const { return nWhich; }
const SwView* GetView() const { return pView; }
};
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 7152b7f0f764..431eb4d3fddd 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -26,10 +26,10 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatFollowTextFlow : public SfxBoolItem
{
public:
- SwFmtFollowTextFlow( bool bFlag = false )
+ SwFormatFollowTextFlow( bool bFlag = false )
: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
TYPEINFO_OVERRIDE();
@@ -45,10 +45,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
- { return static_cast<const SwFmtFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
+inline const SwFormatFollowTextFlow &SwAttrSet::GetFollowTextFlow(bool bInP) const
+ { return static_cast<const SwFormatFollowTextFlow&>(Get( RES_FOLLOW_TEXT_FLOW, bInP )); }
-inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(bool bInP) const
+inline const SwFormatFollowTextFlow &SwFormat::GetFollowTextFlow(bool bInP) const
{ return m_aSet.GetFollowTextFlow( bInP ); }
#endif
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index 4c9fd044afa0..259a5dc7c9da 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -33,11 +33,11 @@ enum SwFillOrder
SW_FILL_ORDER_END
};
-class SwFmtFillOrder: public SfxEnumItem
+class SwFormatFillOrder: public SfxEnumItem
{
public:
- SwFmtFillOrder( SwFillOrder = ATT_TOP_DOWN );
- inline SwFmtFillOrder &operator=( const SwFmtFillOrder &rCpy );
+ SwFormatFillOrder( SwFillOrder = ATT_TOP_DOWN );
+ inline SwFormatFillOrder &operator=( const SwFormatFillOrder &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -46,16 +46,16 @@ public:
SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
};
-inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
+inline SwFormatFillOrder &SwFormatFillOrder::operator=( const SwFormatFillOrder &rCpy )
{
SetValue( rCpy.GetValue() );
return *this;
}
-inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
- { return static_cast<const SwFmtFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
+inline const SwFormatFillOrder &SwAttrSet::GetFillOrder(bool bInP) const
+ { return static_cast<const SwFormatFillOrder&>(Get( RES_FILL_ORDER,bInP)); }
-inline const SwFmtFillOrder &SwFmt::GetFillOrder(bool bInP) const
+inline const SwFormatFillOrder &SwFormat::GetFillOrder(bool bInP) const
{ return m_aSet.GetFillOrder(bInP); }
#endif
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index c448feee7701..2a5cf5558c29 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -38,7 +38,7 @@ enum SwFrmSize
(can be exceeded but not be less). */
};
-class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem
{
Size m_aSize;
SwFrmSize m_eFrmHeightType;
@@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
// minus borders in BrowseView if the environment is the page.
public:
- SwFmtFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
+ SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
SwTwips nWidth = 0, SwTwips nHeight = 0 );
- SwFmtFrmSize& operator=( const SwFmtFrmSize& rCpy );
+ SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -101,10 +101,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
- { return static_cast<const SwFmtFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
+inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
+ { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
-inline const SwFmtFrmSize &SwFmt::GetFrmSize(bool bInP) const
+inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const
{ return m_aSet.GetFrmSize(bInP); }
#endif
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 51e6a215919c..2e6a78894ee1 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -31,28 +31,28 @@ namespace com { namespace sun { namespace star {
} } }
class SwDoc;
-class SwTxtFtn;
+class SwTextFootnote;
// ATT_FTN
-class SW_DLLPUBLIC SwFmtFtn
+class SW_DLLPUBLIC SwFormatFootnote
: public SfxPoolItem
, public SwModify
{
- friend class SwTxtFtn;
- SwTxtFtn* m_pTxtAttr; ///< My TextAttribute.
+ friend class SwTextFootnote;
+ SwTextFootnote* m_pTextAttr; ///< My TextAttribute.
OUString m_aNumber; ///< User-defined 'Number'.
sal_uInt16 m_nNumber; ///< Automatische Nummerierung
bool m_bEndNote; ///< Is it an End note?
css::uno::WeakReference<css::text::XFootnote> m_wXFootnote;
- SwFmtFtn& operator=(const SwFmtFtn& rFtn) SAL_DELETED_FUNCTION;
- SwFmtFtn( const SwFmtFtn& ) SAL_DELETED_FUNCTION;
+ SwFormatFootnote& operator=(const SwFormatFootnote& rFootnote) SAL_DELETED_FUNCTION;
+ SwFormatFootnote( const SwFormatFootnote& ) SAL_DELETED_FUNCTION;
public:
- SwFmtFtn( bool bEndNote = false );
- virtual ~SwFmtFtn();
+ SwFormatFootnote( bool bEndNote = false );
+ virtual ~SwFormatFootnote();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -72,16 +72,16 @@ public:
void SetNumber( sal_uInt16 nNo ) { m_nNumber = nNo; }
void SetEndNote( bool b );
- void SetNumber( const SwFmtFtn& rFtn )
+ void SetNumber( const SwFormatFootnote& rFootnote )
{
- m_nNumber = rFtn.m_nNumber;
- m_aNumber = rFtn.m_aNumber;
+ m_nNumber = rFootnote.m_nNumber;
+ m_aNumber = rFootnote.m_aNumber;
}
- const SwTxtFtn *GetTxtFtn() const { return m_pTxtAttr; }
- SwTxtFtn *GetTxtFtn() { return m_pTxtAttr; }
+ const SwTextFootnote *GetTextFootnote() const { return m_pTextAttr; }
+ SwTextFootnote *GetTextFootnote() { return m_pTextAttr; }
- void GetFtnText( OUString& rStr ) const;
+ void GetFootnoteText( OUString& rStr ) const;
/// Returns string to be displayed of footnote / endnote.
OUString GetViewNumStr( const SwDoc& rDoc, bool bInclStrs = false ) const;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 48ec7c6b286a..cfb7c7346d46 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -25,7 +25,7 @@
#include <numrule.hxx>
#include "swdllapi.h"
-enum SwFtnEndPosEnum
+enum SwFootnoteEndPosEnum
{
FTNEND_ATPGORDOCEND, ///< at page or document end
FTNEND_ATTXTEND, ///< at end of the current text end
@@ -34,20 +34,20 @@ enum SwFtnEndPosEnum
FTNEND_ATTXTEND_END
};
-class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
+class SW_DLLPUBLIC SwFormatFootnoteEndAtTextEnd : public SfxEnumItem
{
OUString sPrefix;
OUString sSuffix;
- SvxNumberType aFmt;
+ SvxNumberType aFormat;
sal_uInt16 nOffset;
protected:
- SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos )
+ SwFormatFootnoteEndAtTextEnd( sal_uInt16 nWhichL, SwFootnoteEndPosEnum ePos )
: SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 )
{}
- SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr )
+ SwFormatFootnoteEndAtTextEnd( const SwFormatFootnoteEndAtTextEnd& rAttr )
: SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
- sSuffix( rAttr.sSuffix ), aFmt( rAttr.aFmt ),
+ sSuffix( rAttr.sSuffix ), aFormat( rAttr.aFormat ),
nOffset( rAttr.nOffset )
{}
@@ -67,12 +67,12 @@ public:
inline bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
- SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
+ SwFormatFootnoteEndAtTextEnd & operator=( const SwFormatFootnoteEndAtTextEnd & rAttr );
- sal_Int16 GetNumType() const { return aFmt.GetNumberingType(); }
- void SetNumType( sal_Int16 eType ) { aFmt.SetNumberingType(eType); }
+ sal_Int16 GetNumType() const { return aFormat.GetNumberingType(); }
+ void SetNumType( sal_Int16 eType ) { aFormat.SetNumberingType(eType); }
- const SvxNumberType& GetSwNumType() const { return aFmt; }
+ const SvxNumberType& GetSwNumType() const { return aFormat; }
sal_uInt16 GetOffset() const { return nOffset; }
void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; }
@@ -84,21 +84,21 @@ public:
void SetSuffix(const OUString& rSet) { sSuffix = rSet; }
};
-class SW_DLLPUBLIC SwFmtFtnAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatFootnoteAtTextEnd : public SwFormatFootnoteEndAtTextEnd
{
public:
- SwFmtFtnAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
- : SwFmtFtnEndAtTxtEnd( RES_FTN_AT_TXTEND, ePos )
+ SwFormatFootnoteAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+ : SwFormatFootnoteEndAtTextEnd( RES_FTN_AT_TXTEND, ePos )
{}
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
-class SW_DLLPUBLIC SwFmtEndAtTxtEnd : public SwFmtFtnEndAtTxtEnd
+class SW_DLLPUBLIC SwFormatEndAtTextEnd : public SwFormatFootnoteEndAtTextEnd
{
public:
- SwFmtEndAtTxtEnd( SwFtnEndPosEnum ePos = FTNEND_ATPGORDOCEND )
- : SwFmtFtnEndAtTxtEnd( RES_END_AT_TXTEND, ePos )
+ SwFormatEndAtTextEnd( SwFootnoteEndPosEnum ePos = FTNEND_ATPGORDOCEND )
+ : SwFormatFootnoteEndAtTextEnd( RES_END_AT_TXTEND, ePos )
{
SetNumType( SVX_NUM_ROMAN_LOWER );
}
@@ -106,15 +106,15 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
};
-inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(bool bInP) const
- { return static_cast<const SwFmtFtnAtTxtEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
-inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(bool bInP) const
- { return static_cast<const SwFmtEndAtTxtEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
+inline const SwFormatFootnoteAtTextEnd &SwAttrSet::GetFootnoteAtTextEnd(bool bInP) const
+ { return static_cast<const SwFormatFootnoteAtTextEnd&>(Get( RES_FTN_AT_TXTEND, bInP)); }
+inline const SwFormatEndAtTextEnd &SwAttrSet::GetEndAtTextEnd(bool bInP) const
+ { return static_cast<const SwFormatEndAtTextEnd&>(Get( RES_END_AT_TXTEND, bInP)); }
-inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(bool bInP) const
- { return m_aSet.GetFtnAtTxtEnd(bInP); }
-inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(bool bInP) const
- { return m_aSet.GetEndAtTxtEnd(bInP); }
+inline const SwFormatFootnoteAtTextEnd &SwFormat::GetFootnoteAtTextEnd(bool bInP) const
+ { return m_aSet.GetFootnoteAtTextEnd(bInP); }
+inline const SwFormatEndAtTextEnd &SwFormat::GetEndAtTextEnd(bool bInP) const
+ { return m_aSet.GetEndAtTextEnd(bInP); }
#endif
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 84caf2e15c27..2130ac1db86b 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -26,21 +26,21 @@
#include <frmfmt.hxx>
class IntlWrapper;
-class SwFmt;
+class SwFormat;
/** Header, for PageFormats
- Client of FrmFmt describing the header. */
+ Client of FrameFormat describing the header. */
-class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatHeader: public SfxPoolItem, public SwClient
{
bool bActive; ///< Only for controlling (creation of content).
public:
- SwFmtHeader( bool bOn = false );
- SwFmtHeader( SwFrmFmt *pHeaderFmt );
- SwFmtHeader( const SwFmtHeader &rCpy );
- virtual ~SwFmtHeader();
- SwFmtHeader& operator=( const SwFmtHeader &rCpy );
+ SwFormatHeader( bool bOn = false );
+ SwFormatHeader( SwFrameFormat *pHeaderFormat );
+ SwFormatHeader( const SwFormatHeader &rCpy );
+ virtual ~SwFormatHeader();
+ SwFormatHeader& operator=( const SwFormatHeader &rCpy );
TYPEINFO_OVERRIDE();
@@ -53,27 +53,27 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- const SwFrmFmt *GetHeaderFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
- SwFrmFmt *GetHeaderFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+ const SwFrameFormat *GetHeaderFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+ SwFrameFormat *GetHeaderFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
- void RegisterToFormat( SwFmt& rFmt );
+ void RegisterToFormat( SwFormat& rFormat );
bool IsActive() const { return bActive; }
void SetActive( bool bNew = true ) { bActive = bNew; }
};
/**Footer, for pageformats
- Client of FrmFmt describing the footer */
+ Client of FrameFormat describing the footer */
-class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatFooter: public SfxPoolItem, public SwClient
{
bool bActive; // Only for controlling (creation of content).
public:
- SwFmtFooter( bool bOn = false );
- SwFmtFooter( SwFrmFmt *pFooterFmt );
- SwFmtFooter( const SwFmtFooter &rCpy );
- virtual ~SwFmtFooter();
- SwFmtFooter& operator=( const SwFmtFooter &rCpy );
+ SwFormatFooter( bool bOn = false );
+ SwFormatFooter( SwFrameFormat *pFooterFormat );
+ SwFormatFooter( const SwFormatFooter &rCpy );
+ virtual ~SwFormatFooter();
+ SwFormatFooter& operator=( const SwFormatFooter &rCpy );
TYPEINFO_OVERRIDE();
@@ -86,22 +86,22 @@ public:
OUString &rText,
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
- const SwFrmFmt *GetFooterFmt() const { return static_cast<const SwFrmFmt*>(GetRegisteredIn()); }
- SwFrmFmt *GetFooterFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
+ const SwFrameFormat *GetFooterFormat() const { return static_cast<const SwFrameFormat*>(GetRegisteredIn()); }
+ SwFrameFormat *GetFooterFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
- void RegisterToFormat( SwFmt& rFmt );
+ void RegisterToFormat( SwFormat& rFormat );
bool IsActive() const { return bActive; }
void SetActive( bool bNew = true ) { bActive = bNew; }
};
-inline const SwFmtHeader &SwAttrSet::GetHeader(bool bInP) const
- { return static_cast<const SwFmtHeader&>(Get( RES_HEADER,bInP)); }
-inline const SwFmtFooter &SwAttrSet::GetFooter(bool bInP) const
- { return static_cast<const SwFmtFooter&>(Get( RES_FOOTER,bInP)); }
+inline const SwFormatHeader &SwAttrSet::GetHeader(bool bInP) const
+ { return static_cast<const SwFormatHeader&>(Get( RES_HEADER,bInP)); }
+inline const SwFormatFooter &SwAttrSet::GetFooter(bool bInP) const
+ { return static_cast<const SwFormatFooter&>(Get( RES_FOOTER,bInP)); }
-inline const SwFmtHeader &SwFmt::GetHeader(bool bInP) const
+inline const SwFormatHeader &SwFormat::GetHeader(bool bInP) const
{ return m_aSet.GetHeader(bInP); }
-inline const SwFmtFooter &SwFmt::GetFooter(bool bInP) const
+inline const SwFormatFooter &SwFormat::GetFooter(bool bInP) const
{ return m_aSet.GetFooter(bInP); }
#endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index d3c4d6b8b48f..35d7a7dc88ec 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -24,29 +24,29 @@
class SvxMacro;
class SvxMacroTableDtor;
-class SwTxtINetFmt;
+class SwTextINetFormat;
class IntlWrapper;
// ATT_INETFMT
-class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatINetFormat: public SfxPoolItem
{
- friend class SwTxtINetFmt;
+ friend class SwTextINetFormat;
OUString msURL; ///< URL.
OUString msTargetFrame; ///< Target frame for URL.
- OUString msINetFmtName;
- OUString msVisitedFmtName;
+ OUString msINetFormatName;
+ OUString msVisitedFormatName;
OUString msHyperlinkName; ///< Name of the link.
- SvxMacroTableDtor* mpMacroTbl;
- SwTxtINetFmt* mpTxtAttr; ///< My TextAttribute.
- sal_uInt16 mnINetFmtId;
- sal_uInt16 mnVisitedFmtId;
+ SvxMacroTableDtor* mpMacroTable;
+ SwTextINetFormat* mpTextAttr; ///< My TextAttribute.
+ sal_uInt16 mnINetFormatId;
+ sal_uInt16 mnVisitedFormatId;
public:
- SwFmtINetFmt( const OUString& rURL, const OUString& rTarget );
- SwFmtINetFmt( const SwFmtINetFmt& rAttr );
- SwFmtINetFmt(); ///< For TypeInfo.
- virtual ~SwFmtINetFmt();
+ SwFormatINetFormat( const OUString& rURL, const OUString& rTarget );
+ SwFormatINetFormat( const SwFormatINetFormat& rAttr );
+ SwFormatINetFormat(); ///< For TypeInfo.
+ virtual ~SwFormatINetFormat();
TYPEINFO_OVERRIDE();
@@ -64,13 +64,13 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
- const SwTxtINetFmt* GetTxtINetFmt() const
+ const SwTextINetFormat* GetTextINetFormat() const
{
- return mpTxtAttr;
+ return mpTextAttr;
}
- SwTxtINetFmt* GetTxtINetFmt()
+ SwTextINetFormat* GetTextINetFormat()
{
- return mpTxtAttr;
+ return mpTextAttr;
}
const OUString& GetValue() const
@@ -92,47 +92,47 @@ public:
return msTargetFrame;
}
- void SetINetFmtAndId(
+ void SetINetFormatAndId(
const OUString& rNm,
const sal_uInt16 nId )
{
- msINetFmtName = rNm;
- mnINetFmtId = nId;
+ msINetFormatName = rNm;
+ mnINetFormatId = nId;
}
- const OUString& GetINetFmt() const
+ const OUString& GetINetFormat() const
{
- return msINetFmtName;
+ return msINetFormatName;
}
- sal_uInt16 GetINetFmtId() const
+ sal_uInt16 GetINetFormatId() const
{
- return mnINetFmtId;
+ return mnINetFormatId;
}
- void SetVisitedFmtAndId(
+ void SetVisitedFormatAndId(
const OUString& rNm,
const sal_uInt16 nId )
{
- msVisitedFmtName = rNm;
- mnVisitedFmtId = nId;
+ msVisitedFormatName = rNm;
+ mnVisitedFormatId = nId;
}
- const OUString& GetVisitedFmt() const
+ const OUString& GetVisitedFormat() const
{
- return msVisitedFmtName;
+ return msVisitedFormatName;
}
- sal_uInt16 GetVisitedFmtId() const
+ sal_uInt16 GetVisitedFormatId() const
{
- return mnVisitedFmtId;
+ return mnVisitedFormatId;
}
/// Set a new MacroTable or clear the current one.
- void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
- const SvxMacroTableDtor* GetMacroTbl() const
+ void SetMacroTable( const SvxMacroTableDtor* pTable = 0 );
+ const SvxMacroTableDtor* GetMacroTable() const
{
- return mpMacroTbl;
+ return mpMacroTable;
}
/// Macro getter and setter.
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index cd5d85e3d605..e6373b137502 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -26,14 +26,14 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatLineNumber: public SfxPoolItem
{
sal_uLong nStartValue :24; ///< Starting value for the paragraph. 0 == no starting value.
bool bCountLines :1; ///< Also count lines of paragraph.
public:
- SwFmtLineNumber();
- virtual ~SwFmtLineNumber();
+ SwFormatLineNumber();
+ virtual ~SwFormatLineNumber();
TYPEINFO_OVERRIDE();
@@ -55,8 +55,8 @@ public:
void SetCountLines( bool b ) { bCountLines = b; }
};
-inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
- { return static_cast<const SwFmtLineNumber&>(Get( RES_LINENUMBER,bInP)); }
+inline const SwFormatLineNumber &SwAttrSet::GetLineNumber(bool bInP) const
+ { return static_cast<const SwFormatLineNumber&>(Get( RES_LINENUMBER,bInP)); }
#endif
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 1a1f94104795..d08dd84fe6d0 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -26,10 +26,10 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatLayoutSplit : public SfxBoolItem
{
public:
- SwFmtLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
+ SwFormatLayoutSplit( bool bSplit = true ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
/// "pure virtual methods" of SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
-inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
- { return static_cast<const SwFmtLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
+inline const SwFormatLayoutSplit &SwAttrSet::GetLayoutSplit(bool bInP) const
+ { return static_cast<const SwFormatLayoutSplit&>(Get( RES_LAYOUT_SPLIT,bInP)); }
-inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(bool bInP) const
+inline const SwFormatLayoutSplit &SwFormat::GetLayoutSplit(bool bInP) const
{ return m_aSet.GetLayoutSplit(bInP); }
#endif
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index d79a5808b16e..f73ec36f3a53 100644
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -39,8 +39,8 @@ namespace com { namespace sun { namespace star {
/**
* The classes that make up a meta entity are:
* <dl>
- * <dt>SwTxtMeta</dt><dd>the text hint</dd>
- * <dt>SwFmtMeta</dt><dd>the pool item</dd>
+ * <dt>SwTextMeta</dt><dd>the text hint</dd>
+ * <dt>SwFormatMeta</dt><dd>the pool item</dd>
* <dt>sw::Meta</dt><dd>the metadatable entity itself</dd>
* <dt>SwXMeta</dt><dd>the UNO wrapper object</dd>
* </dl>
@@ -74,47 +74,47 @@ namespace com { namespace sun { namespace star {
* </ol>
*/
-class SwTxtMeta;
+class SwTextMeta;
class SwXMeta;
class SwXMetaField;
-class SwTxtNode;
+class SwTextNode;
namespace sw {
class Meta;
class MetaFieldManager;
}
-class SwFmtMeta
+class SwFormatMeta
: public SfxPoolItem
{
private:
- friend class SwTxtMeta; ///< needs SetTxtAttr, DoCopy
- friend class ::sw::Meta; ///< needs m_pTxtAttr
+ friend class SwTextMeta; ///< needs SetTextAttr, DoCopy
+ friend class ::sw::Meta; ///< needs m_pTextAttr
::boost::shared_ptr< ::sw::Meta > m_pMeta;
- SwTxtMeta * m_pTxtAttr;
+ SwTextMeta * m_pTextAttr;
- SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; }
- void SetTxtAttr(SwTxtMeta * const i_pTxtAttr);
+ SwTextMeta * GetTextAttr() { return m_pTextAttr; }
+ void SetTextAttr(SwTextMeta * const i_pTextAttr);
/// this method <em>must</em> be called when the hint is actually copied
void DoCopy(::sw::MetaFieldManager & i_rTargetDocManager,
- SwTxtNode & i_rTargetTxtNode);
+ SwTextNode & i_rTargetTextNode);
- explicit SwFmtMeta( const sal_uInt16 i_nWhich );
+ explicit SwFormatMeta( const sal_uInt16 i_nWhich );
public:
/// takes ownership
- explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
+ explicit SwFormatMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
const sal_uInt16 i_nWhich );
- virtual ~SwFmtMeta();
+ virtual ~SwFormatMeta();
/// SfxPoolItem
virtual bool operator==( const SfxPoolItem & ) const SAL_OVERRIDE;
virtual SfxPoolItem * Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
/// notify clients registered at m_pMeta that this meta is being (re-)moved
- void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
- static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
+ void NotifyChangeTextNode(SwTextNode *const pTextNode);
+ static SwFormatMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
::sw::Meta * GetMeta() { return m_pMeta.get(); }
};
@@ -125,23 +125,23 @@ class Meta
, public SwModify
{
protected:
- friend class ::SwFmtMeta; ///< SetFmtMeta, NotifyChangeTxtNode
- friend class ::SwXMeta; ///< GetTxtNode, GetTxtAttr, Get/SetXMeta
+ friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode
+ friend class ::SwXMeta; ///< GetTextNode, GetTextAttr, Get/SetXMeta
::com::sun::star::uno::WeakReference<
::com::sun::star::rdf::XMetadatable> m_wXMeta;
- SwFmtMeta * m_pFmt;
- SwTxtNode * m_pTxtNode;
+ SwFormatMeta * m_pFormat;
+ SwTextNode * m_pTextNode;
- SwTxtMeta * GetTxtAttr() const;
- SwTxtNode * GetTxtNode() const { return m_pTxtNode;} ///< @return 0 if not in document (undo)
+ SwTextMeta * GetTextAttr() const;
+ SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo)
- SwFmtMeta * GetFmtMeta() const { return m_pFmt; }
- void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; };
+ SwFormatMeta * GetFormatMeta() const { return m_pFormat; }
+ void SetFormatMeta( SwFormatMeta * const i_pFormat ) { m_pFormat = i_pFormat; };
- void NotifyChangeTxtNodeImpl();
- void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
+ void NotifyChangeTextNodeImpl();
+ void NotifyChangeTextNode(SwTextNode *const pTextNode);
::com::sun::star::uno::WeakReference<
::com::sun::star::rdf::XMetadatable> const& GetXMeta() const
@@ -154,7 +154,7 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
public:
- explicit Meta(SwFmtMeta * const i_pFmt = 0);
+ explicit Meta(SwFormatMeta * const i_pFormat = 0);
virtual ~Meta();
/// sfx2::Metadatable
@@ -170,7 +170,7 @@ class MetaField
: public Meta
{
private:
- friend class ::SwFmtMeta;
+ friend class ::SwFormatMeta;
friend class ::SwXMetaField;
friend class ::sw::MetaFieldManager;
@@ -182,7 +182,7 @@ private:
bool IsFixedLanguage() const { return m_bIsFixedLanguage; }
void SetIsFixedLanguage(bool b) { m_bIsFixedLanguage = b; }
- explicit MetaField(SwFmtMeta * const i_pFmt = 0,
+ explicit MetaField(SwFormatMeta * const i_pFormat = 0,
const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
const bool bIsFixedLanguage = false );
@@ -203,7 +203,7 @@ private:
public:
MetaFieldManager();
::boost::shared_ptr<MetaField> makeMetaField(
- SwFmtMeta * const i_pFmt = 0,
+ SwFormatMeta * const i_pFormat = 0,
const sal_uInt32 nNumberFormat = SAL_MAX_UINT32,
const bool bIsFixedLanguage = false );
/// get all meta fields
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index cde5b958d595..87b9f8f4977c 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -30,16 +30,16 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatVertOrient: public SfxPoolItem
{
SwTwips m_nYPos; ///< Contains *always* the current RelPos.
sal_Int16 m_eOrient;
sal_Int16 m_eRelation;
public:
TYPEINFO_OVERRIDE();
- SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
+ SwFormatVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA );
- inline SwFmtVertOrient &operator=( const SwFmtVertOrient &rCpy );
+ inline SwFormatVertOrient &operator=( const SwFormatVertOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -66,7 +66,7 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatHoriOrient: public SfxPoolItem
{
SwTwips m_nXPos; ///< Contains *always* the current RelPos.
sal_Int16 m_eOrient;
@@ -74,9 +74,9 @@ class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
bool m_bPosToggle : 1; ///< Flip position on even pages.
public:
TYPEINFO_OVERRIDE();
- SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
+ SwFormatHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, bool bPos = false );
- inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
+ inline SwFormatHoriOrient &operator=( const SwFormatHoriOrient &rCpy );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -103,14 +103,14 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy )
+inline SwFormatVertOrient &SwFormatVertOrient::operator=( const SwFormatVertOrient &rCpy )
{
m_nYPos = rCpy.GetPos();
m_eOrient = rCpy.GetVertOrient();
m_eRelation = rCpy.GetRelationOrient();
return *this;
}
-inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy )
+inline SwFormatHoriOrient &SwFormatHoriOrient::operator=( const SwFormatHoriOrient &rCpy )
{
m_nXPos = rCpy.GetPos();
m_eOrient = rCpy.GetHoriOrient();
@@ -119,14 +119,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy
return *this;
}
-inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
- { return static_cast<const SwFmtVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
-inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
- { return static_cast<const SwFmtHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
+inline const SwFormatVertOrient &SwAttrSet::GetVertOrient(bool bInP) const
+ { return static_cast<const SwFormatVertOrient&>(Get( RES_VERT_ORIENT,bInP)); }
+inline const SwFormatHoriOrient &SwAttrSet::GetHoriOrient(bool bInP) const
+ { return static_cast<const SwFormatHoriOrient&>(Get( RES_HORI_ORIENT,bInP)); }
-inline const SwFmtVertOrient &SwFmt::GetVertOrient(bool bInP) const
+inline const SwFormatVertOrient &SwFormat::GetVertOrient(bool bInP) const
{ return m_aSet.GetVertOrient(bInP); }
-inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(bool bInP) const
+inline const SwFormatHoriOrient &SwFormat::GetHoriOrient(bool bInP) const
{ return m_aSet.GetHoriOrient(bInP); }
#endif
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index f4d6de755c09..0195015709b8 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -36,7 +36,7 @@ class SwEndNoteInfo;
/** Pagedescriptor
Client of SwPageDesc that is "described" by the attribute. */
-class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient
{
/** This "Doc"-function is made friend in order to be able
to set the auto-flag after copying!! */
@@ -45,16 +45,16 @@ class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient
::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number.
sal_uInt16 nDescNameIdx; ///< SW3-Reader: stringpool-index of style name.
SwModify* pDefinedIn; /**< Points to the object in which the
- attribute was set (CntntNode/Format). */
+ attribute was set (ContentNode/Format). */
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) SAL_OVERRIDE;
virtual void SwClientNotify( const SwModify&, const SfxHint& rHint ) SAL_OVERRIDE;
public:
- SwFmtPageDesc( const SwPageDesc *pDesc = 0 );
- SwFmtPageDesc( const SwFmtPageDesc &rCpy );
- SwFmtPageDesc &operator=( const SwFmtPageDesc &rCpy );
- virtual ~SwFmtPageDesc();
+ SwFormatPageDesc( const SwPageDesc *pDesc = 0 );
+ SwFormatPageDesc( const SwFormatPageDesc &rCpy );
+ SwFormatPageDesc &operator=( const SwFormatPageDesc &rCpy );
+ virtual ~SwFormatPageDesc();
TYPEINFO_OVERRIDE();
@@ -84,10 +84,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
- { return static_cast<const SwFmtPageDesc&>(Get( RES_PAGEDESC,bInP)); }
+inline const SwFormatPageDesc &SwAttrSet::GetPageDesc(bool bInP) const
+ { return static_cast<const SwFormatPageDesc&>(Get( RES_PAGEDESC,bInP)); }
-inline const SwFmtPageDesc &SwFmt::GetPageDesc(bool bInP) const
+inline const SwFormatPageDesc &SwFormat::GetPageDesc(bool bInP) const
{ return m_aSet.GetPageDesc(bInP); }
#endif
diff --git a/sw/inc/fmtrfmrk.hxx b/sw/inc/fmtrfmrk.hxx
index cfa8efd67d8f..8e054f660859 100644
--- a/sw/inc/fmtrfmrk.hxx
+++ b/sw/inc/fmtrfmrk.hxx
@@ -29,26 +29,26 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextContent; }
} } }
-class SwTxtRefMark;
+class SwTextRefMark;
// ATT_REFMARK
-class SwFmtRefMark
+class SwFormatRefMark
: public SfxPoolItem
, public SwModify
{
- friend class SwTxtRefMark;
- SwTxtRefMark* pTxtAttr;
+ friend class SwTextRefMark;
+ SwTextRefMark* pTextAttr;
- SwFmtRefMark& operator=(const SwFmtRefMark& rRefMark) SAL_DELETED_FUNCTION;
+ SwFormatRefMark& operator=(const SwFormatRefMark& rRefMark) SAL_DELETED_FUNCTION;
OUString aRefName;
css::uno::WeakReference<css::text::XTextContent> m_wXReferenceMark;
public:
- SwFmtRefMark( const OUString& rTxt );
- SwFmtRefMark( const SwFmtRefMark& rRefMark );
- virtual ~SwFmtRefMark( );
+ SwFormatRefMark( const OUString& rText );
+ SwFormatRefMark( const SwFormatRefMark& rRefMark );
+ virtual ~SwFormatRefMark( );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -60,8 +60,8 @@ public:
void InvalidateRefMark();
- const SwTxtRefMark *GetTxtRefMark() const { return pTxtAttr; }
- SwTxtRefMark *GetTxtRefMark() { return pTxtAttr; }
+ const SwTextRefMark *GetTextRefMark() const { return pTextAttr; }
+ SwTextRefMark *GetTextRefMark() { return pTextAttr; }
inline OUString &GetRefName() { return aRefName; }
inline const OUString &GetRefName() const { return aRefName; }
diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx
index 5ac88cca87e0..dd2dceebecd8 100644
--- a/sw/inc/fmtrowsplt.hxx
+++ b/sw/inc/fmtrowsplt.hxx
@@ -26,10 +26,10 @@
class IntlWrapper;
-class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem
+class SW_DLLPUBLIC SwFormatRowSplit : public SfxBoolItem
{
public:
- SwFmtRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
+ SwFormatRowSplit( bool bSplit = true ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {}
// "pure virtual methods" of SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -40,10 +40,10 @@ public:
const IntlWrapper* pIntl = 0 ) const SAL_OVERRIDE;
};
-inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
- { return static_cast<const SwFmtRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
+inline const SwFormatRowSplit &SwAttrSet::GetRowSplit(bool bInP) const
+ { return static_cast<const SwFormatRowSplit&>(Get( RES_ROW_SPLIT,bInP)); }
-inline const SwFmtRowSplit &SwFmt::GetRowSplit(bool bInP) const
+inline const SwFormatRowSplit &SwFormat::GetRowSplit(bool bInP) const
{ return m_aSet.GetRowSplit(bInP); }
#endif
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index f0945e6227d1..219f3ddab687 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -21,25 +21,25 @@
#include <svl/poolitem.hxx>
-class SwTxtRuby;
+class SwTextRuby;
-class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem
+class SW_DLLPUBLIC SwFormatRuby : public SfxPoolItem
{
- friend class SwTxtRuby;
+ friend class SwTextRuby;
- OUString sRubyTxt; ///< The ruby txt.
- OUString sCharFmtName; ///< Name of the charformat.
- SwTxtRuby* pTxtAttr; ///< The TextAttribute.
- sal_uInt16 nCharFmtId; ///< PoolId of the charformat.
+ OUString sRubyText; ///< The ruby txt.
+ OUString sCharFormatName; ///< Name of the charformat.
+ SwTextRuby* pTextAttr; ///< The TextAttribute.
+ sal_uInt16 nCharFormatId; ///< PoolId of the charformat.
sal_uInt16 nPosition; ///< Position of the Ruby-character.
sal_uInt16 nAdjustment; ///< Specific adjustment of the Ruby-ch.
public:
- SwFmtRuby( const OUString& rRubyTxt );
- SwFmtRuby( const SwFmtRuby& rAttr );
- virtual ~SwFmtRuby();
+ SwFormatRuby( const OUString& rRubyText );
+ SwFormatRuby( const SwFormatRuby& rAttr );
+ virtual ~SwFormatRuby();
- SwFmtRuby& operator=( const SwFmtRuby& rAttr );
+ SwFormatRuby& operator=( const SwFormatRuby& rAttr );
// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -56,17 +56,17 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal,
sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
- const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; }
- SwTxtRuby* GetTxtRuby() { return pTxtAttr; }
+ const SwTextRuby* GetTextRuby() const { return pTextAttr; }
+ SwTextRuby* GetTextRuby() { return pTextAttr; }
- OUString GetText() const { return sRubyTxt; }
- void SetText( const OUString& rTxt ) { sRubyTxt = rTxt; }
+ OUString GetText() const { return sRubyText; }
+ void SetText( const OUString& rText ) { sRubyText = rText; }
- OUString GetCharFmtName() const { return sCharFmtName; }
- void SetCharFmtName( const OUString& rNm ) { sCharFmtName = rNm; }
+ OUString GetCharFormatName() const { return sCharFormatName; }
+ void SetCharFormatName( const OUString& rNm ) { sCharFormatName = rNm; }
- sal_uInt16 GetCharFmtId() const { return nCharFmtId; }
- void SetCharFmtId( sal_uInt16 nNew ) { nCharFmtId = nNew; }
+ sal_uInt16 GetCharFormatId() const { return nCharFormatId; }
+ void SetCharFormatId( sal_uInt16 nNew ) { nCharFormatId = nNew; }
sal_uInt16 GetPosition() const { return nPosition; }
void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; }
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index 23009806fb35..5b933e99b287 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -27,16 +27,16 @@
#include <fmtsrndenum.hxx>
class IntlWrapper;
-// SwFmtSurround: How document content under the frame shall behave.
-class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem
+// SwFormatSurround: How document content under the frame shall behave.
+class SW_DLLPUBLIC SwFormatSurround: public SfxEnumItem
{
bool bAnchorOnly :1;
bool bContour :1;
bool bOutside :1;
public:
- SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL );
- SwFmtSurround( const SwFmtSurround & );
- inline SwFmtSurround &operator=( const SwFmtSurround &rCpy );
+ SwFormatSurround( SwSurround eNew = SURROUND_PARALLEL );
+ SwFormatSurround( const SwFormatSurround & );
+ inline SwFormatSurround &operator=( const SwFormatSurround &rCpy );
// "Pure virtual Methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -62,7 +62,7 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
+inline SwFormatSurround &SwFormatSurround::operator=( const SwFormatSurround &rCpy )
{
bAnchorOnly = rCpy.IsAnchorOnly();
bContour = rCpy.IsContour();
@@ -71,10 +71,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy )
return *this;
}
-inline const SwFmtSurround &SwAttrSet::GetSurround(bool bInP) const
- { return static_cast<const SwFmtSurround&>(Get( RES_SURROUND,bInP)); }
+inline const SwFormatSurround &SwAttrSet::GetSurround(bool bInP) const
+ { return static_cast<const SwFormatSurround&>(Get( RES_SURROUND,bInP)); }
-inline const SwFmtSurround &SwFmt::GetSurround(bool bInP) const
+inline const SwFormatSurround &SwFormat::GetSurround(bool bInP) const
{ return m_aSet.GetSurround(bInP); }
#endif
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index 766b59d4f8f2..bdcf92f8283e 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -29,7 +29,7 @@ class IntlWrapper;
// URL, ServerMap und ClientMap
-class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatURL: public SfxPoolItem
{
OUString sTargetFrameName; ///< Target frame for URL.
OUString sURL; ///< Simple URL.
@@ -38,15 +38,15 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem
bool bIsServerMap; ///< A ServerSideImageMap with the URL.
- SwFmtURL& operator=( const SwFmtURL& ) SAL_DELETED_FUNCTION;
+ SwFormatURL& operator=( const SwFormatURL& ) SAL_DELETED_FUNCTION;
public:
- SwFmtURL();
+ SwFormatURL();
/// @@@ copy construction allowed, but assigment is not? @@@
- SwFmtURL( const SwFmtURL& );
+ SwFormatURL( const SwFormatURL& );
- virtual ~SwFmtURL();
+ virtual ~SwFormatURL();
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -73,10 +73,10 @@ public:
void SetName( const OUString& rNm ) { sName = rNm; }
};
-inline const SwFmtURL &SwAttrSet::GetURL(bool bInP) const
- { return static_cast<const SwFmtURL&>(Get( RES_URL,bInP)); }
+inline const SwFormatURL &SwAttrSet::GetURL(bool bInP) const
+ { return static_cast<const SwFormatURL&>(Get( RES_URL,bInP)); }
-inline const SwFmtURL &SwFmt::GetURL(bool bInP) const
+inline const SwFormatURL &SwFormat::GetURL(bool bInP) const
{ return m_aSet.GetURL(bInP); }
#endif
diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx
index ff6dc2315e20..88e86a2c46d4 100644
--- a/sw/inc/fmtwrapinfluenceonobjpos.hxx
+++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx
@@ -24,7 +24,7 @@
#include <svl/poolitem.hxx>
#include <com/sun/star/text/WrapInfluenceOnPosition.hpp>
-class SW_DLLPUBLIC SwFmtWrapInfluenceOnObjPos: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatWrapInfluenceOnObjPos: public SfxPoolItem
{
private:
sal_Int16 mnWrapInfluenceOnPosition;
@@ -33,15 +33,15 @@ public:
TYPEINFO_OVERRIDE();
// #i35017# - constant name has changed
- SwFmtWrapInfluenceOnObjPos(
+ SwFormatWrapInfluenceOnObjPos(
sal_Int16 _nWrapInfluenceOnPosition =
com::sun::star::text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
- SwFmtWrapInfluenceOnObjPos(
- const SwFmtWrapInfluenceOnObjPos& _rCpy );
- virtual ~SwFmtWrapInfluenceOnObjPos();
+ SwFormatWrapInfluenceOnObjPos(
+ const SwFormatWrapInfluenceOnObjPos& _rCpy );
+ virtual ~SwFormatWrapInfluenceOnObjPos();
- SwFmtWrapInfluenceOnObjPos& operator=(
- const SwFmtWrapInfluenceOnObjPos& _rSource );
+ SwFormatWrapInfluenceOnObjPos& operator=(
+ const SwFormatWrapInfluenceOnObjPos& _rSource );
/// pure virtual methods of class <SfxPoolItem>
virtual bool operator==( const SfxPoolItem& _rAttr ) const SAL_OVERRIDE;
@@ -60,10 +60,10 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
-inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
- { return static_cast<const SwFmtWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
+inline const SwFormatWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(bool bInP) const
+ { return static_cast<const SwFormatWrapInfluenceOnObjPos&>(Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP)); }
- inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(bool bInP) const
+ inline const SwFormatWrapInfluenceOnObjPos& SwFormat::GetWrapInfluenceOnObjPos(bool bInP) const
{ return m_aSet.GetWrapInfluenceOnObjPos(bInP); }
#endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 63bb3bb13472..11ed94319e81 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -41,39 +41,39 @@ namespace drawinglayer { namespace attribute {
}}
/// Base class for various Writer styles.
-class SW_DLLPUBLIC SwFmt : public SwModify
+class SW_DLLPUBLIC SwFormat : public SwModify
{
- OUString m_aFmtName;
+ OUString m_aFormatName;
SwAttrSet m_aSet;
sal_uInt16 m_nWhichId;
- sal_uInt16 m_nPoolFmtId; /**< Id for "automatically" created formats.
+ sal_uInt16 m_nPoolFormatId; /**< Id for "automatically" created formats.
(is not hard attribution!!!) */
sal_uInt16 m_nPoolHelpId; ///< HelpId for this Pool-style.
sal_uInt8 m_nPoolHlpFileId; ///< FilePos to Doc to these style helps.
bool m_bWritten : 1; ///< TRUE: already written.
- bool m_bAutoFmt : 1; /**< FALSE: it is a template.
+ bool m_bAutoFormat : 1; /**< FALSE: it is a template.
default is true! */
- bool m_bFmtInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able
- to recognize this in FmtChg-message!! */
- bool m_bAutoUpdateFmt : 1;/**< TRUE: Set attributes of a whole paragraph
+ bool m_bFormatInDTOR : 1; /**< TRUE: Format becomes deleted. In order to be able
+ to recognize this in FormatChg-message!! */
+ bool m_bAutoUpdateFormat : 1;/**< TRUE: Set attributes of a whole paragraph
at format (UI-side!). */
bool m_bHidden : 1;
std::shared_ptr<SfxGrabBagItem> m_pGrabBagItem; ///< Style InteropGrabBag.
protected:
- SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
- SwFmt( SwAttrPool& rPool, const OUString &rFmtNm, const sal_uInt16* pWhichRanges,
- SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich );
- SwFmt( const SwFmt& rFmt );
+ SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+ SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges,
+ SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+ SwFormat( const SwFormat& rFormat );
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
- virtual ~SwFmt();
- SwFmt &operator=(const SwFmt&);
+ virtual ~SwFormat();
+ SwFormat &operator=(const SwFormat&);
/// for Querying of Writer-functions.
sal_uInt16 Which() const { return m_nWhichId; }
@@ -82,36 +82,36 @@ public:
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
/// Copy attributes even among documents.
- void CopyAttrs( const SwFmt&, bool bReplace=true );
+ void CopyAttrs( const SwFormat&, bool bReplace=true );
- /// Delete all attributes that are not in rFmt.
+ /// Delete all attributes that are not in rFormat.
void DelDiffs( const SfxItemSet& rSet );
- void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); }
+ void DelDiffs( const SwFormat& rFormat ) { DelDiffs( rFormat.GetAttrSet() ); }
/// 0 is Default.
- bool SetDerivedFrom(SwFmt *pDerivedFrom = 0);
+ bool SetDerivedFrom(SwFormat *pDerivedFrom = 0);
/// If bInParents is FALSE, search only in this format for attribute.
//UUUUinline
- const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich,
+ const SfxPoolItem& GetFormatAttr( sal_uInt16 nWhich,
bool bInParents = true ) const;
//UUUUinline
SfxItemState GetItemState( sal_uInt16 nWhich, bool bSrchInParent = true,
const SfxPoolItem **ppItem = 0 ) const;
SfxItemState GetBackgroundState(SvxBrushItem &rItem,
bool bSrchInParent = true) const;
- virtual bool SetFmtAttr( const SfxPoolItem& rAttr );
- virtual bool SetFmtAttr( const SfxItemSet& rSet );
- virtual bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
+ virtual bool SetFormatAttr( const SfxPoolItem& rAttr );
+ virtual bool SetFormatAttr( const SfxItemSet& rSet );
+ virtual bool ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
/** Takes all hints from Delta-Array,
@return count of deleted hints. */
- virtual sal_uInt16 ResetAllFmtAttr();
+ virtual sal_uInt16 ResetAllFormatAttr();
- inline SwFmt* DerivedFrom() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+ inline SwFormat* DerivedFrom() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
inline bool IsDefault() const { return DerivedFrom() == 0; }
- inline OUString GetName() const { return m_aFmtName; }
+ inline OUString GetName() const { return m_aFormatName; }
void SetName( const OUString& rNewName, bool bBroadcast=false );
inline void SetName( const sal_Char* pNewName,
bool bBroadcast=false);
@@ -145,8 +145,8 @@ public:
IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess();
/// Get and set Pool style IDs.
- sal_uInt16 GetPoolFmtId() const { return m_nPoolFmtId; }
- void SetPoolFmtId( sal_uInt16 nId ) { m_nPoolFmtId = nId; }
+ sal_uInt16 GetPoolFormatId() const { return m_nPoolFormatId; }
+ void SetPoolFormatId( sal_uInt16 nId ) { m_nPoolFormatId = nId; }
/// Get and set Help-IDs for document templates.
sal_uInt16 GetPoolHelpId() const { return m_nPoolHelpId; }
@@ -162,9 +162,9 @@ public:
/// Format-ID for reading/writing:
void ResetWritten() { m_bWritten = false; }
- /// Query / set AutoFmt-flag.
- bool IsAuto() const { return m_bAutoFmt; }
- void SetAuto( bool bNew = false ) { m_bAutoFmt = bNew; }
+ /// Query / set AutoFormat-flag.
+ bool IsAuto() const { return m_bAutoFormat; }
+ void SetAuto( bool bNew = false ) { m_bAutoFormat = bNew; }
bool IsHidden() const { return m_bHidden; }
void SetHidden( bool bValue = false ) { m_bHidden = bValue; }
@@ -172,11 +172,11 @@ public:
void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
- /// Query / set bAutoUpdateFmt-flag.
- bool IsAutoUpdateFmt() const { return m_bAutoUpdateFmt; }
- void SetAutoUpdateFmt( bool bNew = true ) { m_bAutoUpdateFmt = bNew; }
+ /// Query / set bAutoUpdateFormat-flag.
+ bool IsAutoUpdateFormat() const { return m_bAutoUpdateFormat; }
+ void SetAutoUpdateFormat( bool bNew = true ) { m_bAutoUpdateFormat = bNew; }
- bool IsFmtInDTOR() const { return m_bFmtInDTOR; }
+ bool IsFormatInDTOR() const { return m_bFormatInDTOR; }
/** GetMethods: Bool indicates whether to search only in Set (FALSE)
or also in Parents.
@@ -227,48 +227,48 @@ public:
inline const SvxShadowItem &GetCharShadow( bool = true ) const;
/// Frame-attributes - implemented in frmatr.hxx.
- inline const SwFmtFillOrder &GetFillOrder( bool = true ) const;
- inline const SwFmtFrmSize &GetFrmSize( bool = true ) const;
- inline const SwFmtHeader &GetHeader( bool = true ) const;
- inline const SwFmtFooter &GetFooter( bool = true ) const;
- inline const SwFmtSurround &GetSurround( bool = true ) const;
- inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const;
- inline const SwFmtAnchor &GetAnchor( bool = true ) const;
- inline const SwFmtCol &GetCol( bool = true ) const;
+ inline const SwFormatFillOrder &GetFillOrder( bool = true ) const;
+ inline const SwFormatFrmSize &GetFrmSize( bool = true ) const;
+ inline const SwFormatHeader &GetHeader( bool = true ) const;
+ inline const SwFormatFooter &GetFooter( bool = true ) const;
+ inline const SwFormatSurround &GetSurround( bool = true ) const;
+ inline const SwFormatHoriOrient &GetHoriOrient( bool = true ) const;
+ inline const SwFormatAnchor &GetAnchor( bool = true ) const;
+ inline const SwFormatCol &GetCol( bool = true ) const;
inline const SvxPaperBinItem &GetPaperBin( bool = true ) const;
inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const;
inline const SvxULSpaceItem &GetULSpace( bool = true ) const;
- inline const SwFmtCntnt &GetCntnt( bool = true ) const;
+ inline const SwFormatContent &GetContent( bool = true ) const;
inline const SvxPrintItem &GetPrint( bool = true ) const;
inline const SvxOpaqueItem &GetOpaque( bool = true ) const;
inline const SvxProtectItem &GetProtect( bool = true ) const;
- inline const SwFmtVertOrient &GetVertOrient( bool = true ) const;
+ inline const SwFormatVertOrient &GetVertOrient( bool = true ) const;
inline const SvxBoxItem &GetBox( bool = true ) const;
- inline const SvxFmtKeepItem &GetKeep( bool = true ) const;
+ inline const SvxFormatKeepItem &GetKeep( bool = true ) const;
//UUUU Create SvxBrushItem for Background fill (partially for backwards compatibility)
SvxBrushItem makeBackgroundBrushItem( bool = true ) const;
inline const SvxShadowItem &GetShadow( bool = true ) const;
- inline const SwFmtPageDesc &GetPageDesc( bool = true ) const;
- inline const SvxFmtBreakItem &GetBreak( bool = true ) const;
+ inline const SwFormatPageDesc &GetPageDesc( bool = true ) const;
+ inline const SvxFormatBreakItem &GetBreak( bool = true ) const;
inline const SvxMacroItem &GetMacro( bool = true ) const;
- inline const SwFmtURL &GetURL( bool = true ) const;
- inline const SwFmtEditInReadonly &GetEditInReadonly( bool = true ) const;
- inline const SwFmtLayoutSplit &GetLayoutSplit( bool = true ) const;
- inline const SwFmtRowSplit &GetRowSplit( bool = true ) const;
- inline const SwFmtChain &GetChain( bool = true ) const;
- inline const SwFmtLineNumber &GetLineNumber( bool = true ) const;
- inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( bool = true ) const;
- inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( bool = true ) const;
- inline const SwFmtNoBalancedColumns &GetBalancedColumns( bool = true ) const;
+ inline const SwFormatURL &GetURL( bool = true ) const;
+ inline const SwFormatEditInReadonly &GetEditInReadonly( bool = true ) const;
+ inline const SwFormatLayoutSplit &GetLayoutSplit( bool = true ) const;
+ inline const SwFormatRowSplit &GetRowSplit( bool = true ) const;
+ inline const SwFormatChain &GetChain( bool = true ) const;
+ inline const SwFormatLineNumber &GetLineNumber( bool = true ) const;
+ inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const;
+ inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const;
+ inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const;
inline const SwTextGridItem &GetTextGrid( bool = true ) const;
inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
// #i18732#
- inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const;
+ inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const;
// #i28701#
- inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+ inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
/// Graphics-attributes - implemented in grfatr.hxx
@@ -288,14 +288,14 @@ public:
/// Paragraph-attributes - implemented in paratr.hxx.
inline const SvxLineSpacingItem &GetLineSpacing( bool = true ) const;
inline const SvxAdjustItem &GetAdjust( bool = true ) const;
- inline const SvxFmtSplitItem &GetSplit( bool = true ) const;
+ inline const SvxFormatSplitItem &GetSplit( bool = true ) const;
inline const SwRegisterItem &GetRegister( bool = true ) const;
inline const SwNumRuleItem &GetNumRule( bool = true ) const;
inline const SvxWidowsItem &GetWidows( bool = true ) const;
inline const SvxOrphansItem &GetOrphans( bool = true ) const;
inline const SvxTabStopItem &GetTabStops( bool = true ) const;
inline const SvxHyphenZoneItem &GetHyphenZone( bool = true ) const;
- inline const SwFmtDrop &GetDrop( bool = true ) const;
+ inline const SwFormatDrop &GetDrop( bool = true ) const;
inline const SvxScriptSpaceItem &GetScriptSpace(bool = true) const;
inline const SvxHangingPunctuationItem &GetHangingPunctuation(bool = true) const;
inline const SvxForbiddenRuleItem &GetForbiddenRule(bool = true) const;
@@ -304,11 +304,11 @@ public:
inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
/// TableBox attributes - implemented in cellatr.hxx.
- inline const SwTblBoxNumFormat &GetTblBoxNumFmt( bool = true ) const;
- inline const SwTblBoxFormula &GetTblBoxFormula( bool = true ) const;
- inline const SwTblBoxValue &GetTblBoxValue( bool = true ) const;
+ inline const SwTableBoxNumFormat &GetTableBoxNumFormat( bool = true ) const;
+ inline const SwTableBoxFormula &GetTableBoxFormula( bool = true ) const;
+ inline const SwTableBoxValue &GetTableBoxValue( bool = true ) const;
- /** SwFmt::IsBackgroundTransparent
+ /** SwFormat::IsBackgroundTransparent
Virtual method to determine, if background of format is transparent.
Default implementation returns false. Thus, subclasses have to override
@@ -325,7 +325,7 @@ public:
virtual bool supportsFullDrawingLayerFillAttributeSet() const;
};
-inline void SwFmt::SetName( const sal_Char* pNewName,
+inline void SwFormat::SetName( const sal_Char* pNewName,
bool bBroadcast )
{
SetName(OUString::createFromAscii(pNewName), bBroadcast);
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 4a68855a734b..4685e24ddbd1 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -53,14 +53,14 @@ inline const SvxProtectItem &SwAttrSet::GetProtect(bool bInP) const
{ return static_cast<const SvxProtectItem&>(Get( RES_PROTECT,bInP)); }
inline const SvxBoxItem &SwAttrSet::GetBox(bool bInP) const
{ return static_cast<const SvxBoxItem&>(Get( RES_BOX,bInP)); }
-inline const SvxFmtKeepItem &SwAttrSet::GetKeep(bool bInP) const
- { return static_cast<const SvxFmtKeepItem&>(Get( RES_KEEP,bInP)); }
+inline const SvxFormatKeepItem &SwAttrSet::GetKeep(bool bInP) const
+ { return static_cast<const SvxFormatKeepItem&>(Get( RES_KEEP,bInP)); }
inline const SvxBrushItem &SwAttrSet::GetBackground(bool bInP) const
{ return static_cast<const SvxBrushItem&>(Get( RES_BACKGROUND,bInP)); }
inline const SvxShadowItem &SwAttrSet::GetShadow(bool bInP) const
{ return static_cast<const SvxShadowItem&>(Get( RES_SHADOW,bInP)); }
-inline const SvxFmtBreakItem &SwAttrSet::GetBreak(bool bInP) const
- { return static_cast<const SvxFmtBreakItem&>(Get( RES_BREAK,bInP)); }
+inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const
+ { return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); }
inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
{ return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
@@ -68,32 +68,32 @@ inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
{ return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
-// Implementation of FrameAttribute methods of SwFmt.
-inline const SvxPaperBinItem &SwFmt::GetPaperBin(bool bInP) const
+// Implementation of FrameAttribute methods of SwFormat.
+inline const SvxPaperBinItem &SwFormat::GetPaperBin(bool bInP) const
{ return m_aSet.GetPaperBin(bInP); }
-inline const SvxLRSpaceItem &SwFmt::GetLRSpace(bool bInP) const
+inline const SvxLRSpaceItem &SwFormat::GetLRSpace(bool bInP) const
{ return m_aSet.GetLRSpace(bInP); }
-inline const SvxULSpaceItem &SwFmt::GetULSpace(bool bInP) const
+inline const SvxULSpaceItem &SwFormat::GetULSpace(bool bInP) const
{ return m_aSet.GetULSpace(bInP); }
-inline const SvxPrintItem &SwFmt::GetPrint(bool bInP) const
+inline const SvxPrintItem &SwFormat::GetPrint(bool bInP) const
{ return m_aSet.GetPrint(bInP); }
-inline const SvxOpaqueItem &SwFmt::GetOpaque(bool bInP) const
+inline const SvxOpaqueItem &SwFormat::GetOpaque(bool bInP) const
{ return m_aSet.GetOpaque(bInP); }
-inline const SvxProtectItem &SwFmt::GetProtect(bool bInP) const
+inline const SvxProtectItem &SwFormat::GetProtect(bool bInP) const
{ return m_aSet.GetProtect(bInP); }
-inline const SvxBoxItem &SwFmt::GetBox(bool bInP) const
+inline const SvxBoxItem &SwFormat::GetBox(bool bInP) const
{ return m_aSet.GetBox(bInP); }
-inline const SvxFmtKeepItem &SwFmt::GetKeep(bool bInP) const
+inline const SvxFormatKeepItem &SwFormat::GetKeep(bool bInP) const
{ return m_aSet.GetKeep(bInP); }
-inline const SvxShadowItem &SwFmt::GetShadow(bool bInP) const
+inline const SvxShadowItem &SwFormat::GetShadow(bool bInP) const
{ return m_aSet.GetShadow(bInP); }
-inline const SvxFmtBreakItem &SwFmt::GetBreak(bool bInP) const
+inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const
{ return m_aSet.GetBreak(bInP); }
-inline const SvxMacroItem &SwFmt::GetMacro(bool bInP) const
+inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const
{ return m_aSet.GetMacro(bInP); }
-inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(bool bInP) const
+inline const SvxFrameDirectionItem &SwFormat::GetFrmDir(bool bInP) const
{ return m_aSet.GetFrmDir(bInP); }
-inline const SdrTextVertAdjustItem &SwFmt::GetTextVertAdjust(bool bInP) const
+inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const
{ return m_aSet.GetTextVertAdjust(bInP); }
#endif // INCLUDED_SW_INC_FRMATR_HXX
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 33a16b2019c8..2b88accce81f 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -36,7 +36,7 @@ class SdrObject;
namespace sw { class DocumentLayoutManager; }
/// Style of a layout element.
-class SW_DLLPUBLIC SwFrmFmt: public SwFmt
+class SW_DLLPUBLIC SwFrameFormat: public SwFormat
{
friend class SwDoc;
friend class SwPageDesc; ///< Is allowed to call protected CTor.
@@ -49,25 +49,25 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes;
protected:
- SwFrmFmt(
+ SwFrameFormat(
SwAttrPool& rPool,
- const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm,
- sal_uInt16 nFmtWhich = RES_FRMFMT,
+ const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm,
+ sal_uInt16 nFormatWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = 0);
- SwFrmFmt(
+ SwFrameFormat(
SwAttrPool& rPool,
- const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm,
- sal_uInt16 nFmtWhich = RES_FRMFMT,
+ const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm,
+ sal_uInt16 nFormatWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = 0);
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); ///< Already in base class Client.
- virtual ~SwFrmFmt();
+ virtual ~SwFrameFormat();
/// Destroys all Frms in aDepend (Frms are identified via PTR_CAST).
virtual void DelFrms();
@@ -95,21 +95,21 @@ public:
The UserCall knows its SdrObject. */
SwContact *FindContactObj();
const SwContact *FindContactObj() const
- { return const_cast<SwFrmFmt*>(this)->FindContactObj(); }
+ { return const_cast<SwFrameFormat*>(this)->FindContactObj(); }
/** @return the SdrObject, that is connected to the ContactObject.
- Only DrawFrmFmts are connected to the "real SdrObject". FlyFrmFmts
+ Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats
are connected to a Master and all FlyFrms has the "real SdrObject".
"Real SdrObject" has position and a Z-order. */
SdrObject *FindSdrObject();
const SdrObject *FindSdrObject() const
- { return const_cast<SwFrmFmt*>(this)->FindSdrObject(); }
+ { return const_cast<SwFrameFormat*>(this)->FindSdrObject(); }
SdrObject *FindRealSdrObject();
const SdrObject *FindRealSdrObject() const
- { return const_cast<SwFrmFmt*>(this)->FindRealSdrObject(); }
+ { return const_cast<SwFrameFormat*>(this)->FindRealSdrObject(); }
- bool IsLowerOf( const SwFrmFmt& rFmt ) const;
+ bool IsLowerOf( const SwFrameFormat& rFormat ) const;
enum tLayoutDir
{
@@ -119,8 +119,8 @@ public:
VERT_L2R ///< Not supported yet.
};
- virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
- virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
+ virtual SwFrameFormat::tLayoutDir GetLayoutDir() const;
+ virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir );
virtual sal_Int16 GetPositionLayoutDir() const;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
@@ -134,8 +134,8 @@ public:
::com::sun::star::uno::XInterface> const& xObject)
{ m_wXObject = xObject; }
- DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt)
- void RegisterToFormat( SwFmt& rFmt );
+ DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrameFormat)
+ void RegisterToFormat( SwFormat& rFormat );
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
@@ -146,7 +146,7 @@ public:
// The FlyFrame-Format
-class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat
{
friend class SwDoc;
OUString msTitle;
@@ -158,22 +158,22 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt
when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
Point m_aLastFlyFrmPrtRectPos;
- SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
- SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+ SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+ SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
protected:
- SwFlyFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+ SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT )
{}
- SwFlyFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FLYFRMFMT )
+ SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT )
{}
public:
TYPEINFO_OVERRIDE();
- virtual ~SwFlyFrmFmt();
+ virtual ~SwFlyFrameFormat();
/// Creates the views.
virtual void MakeFrms() SAL_OVERRIDE;
@@ -193,7 +193,7 @@ public:
OUString GetObjDescription() const;
void SetObjDescription( const OUString& rDescription, bool bBroadcast = false );
- /** SwFlyFrmFmt::IsBackgroundTransparent
+ /** SwFlyFrameFormat::IsBackgroundTransparent
Override virtual method and its default implementation,
because format of fly frame provides transparent backgrounds.
@@ -206,7 +206,7 @@ public:
*/
virtual bool IsBackgroundTransparent() const SAL_OVERRIDE;
- /** SwFlyFrmFmt::IsBackgroundBrushInherited
+ /** SwFlyFrameFormat::IsBackgroundBrushInherited
Method to determine, if the brush for drawing the
background is "inherited" from its parent/grandparent.
@@ -222,45 +222,45 @@ public:
const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; }
void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
- DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt)
+ DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
};
//The DrawFrame-Format
-class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
+class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
{
friend class SwDoc;
mutable const SdrObject * pSdrObjCached;
mutable OUString sSdrObjCachedComment;
- SwDrawFrmFmt( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
- SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy ) SAL_DELETED_FUNCTION;
+ SwDrawFrameFormat( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
+ SwDrawFrameFormat &operator=( const SwDrawFrameFormat &rCpy ) SAL_DELETED_FUNCTION;
- SwFrmFmt::tLayoutDir meLayoutDir;
+ SwFrameFormat::tLayoutDir meLayoutDir;
sal_Int16 mnPositionLayoutDir;
bool mbPosAttrSet;
protected:
- SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+ SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
- meLayoutDir( SwFrmFmt::HORI_L2R ),
+ meLayoutDir( SwFrameFormat::HORI_L2R ),
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
mbPosAttrSet( false )
{}
- SwDrawFrmFmt( SwAttrPool& rPool, const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
+ SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
- meLayoutDir( SwFrmFmt::HORI_L2R ),
+ meLayoutDir( SwFrameFormat::HORI_L2R ),
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
@@ -269,7 +269,7 @@ protected:
public:
TYPEINFO_OVERRIDE();
- virtual ~SwDrawFrmFmt();
+ virtual ~SwDrawFrameFormat();
/** DrawObjects are removed from the arrays at the layout.
The DrawObjects are marked as deleted. */
@@ -281,8 +281,8 @@ public:
virtual Graphic MakeGraphic( ImageMap* pMap = NULL ) SAL_OVERRIDE;
- virtual SwFrmFmt::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
- virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
+ virtual SwFrameFormat::tLayoutDir GetLayoutDir() const SAL_OVERRIDE;
+ virtual void SetLayoutDir( const SwFrameFormat::tLayoutDir _eLayoutDir ) SAL_OVERRIDE;
virtual sal_Int16 GetPositionLayoutDir() const SAL_OVERRIDE;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir ) SAL_OVERRIDE;
@@ -297,10 +297,10 @@ public:
virtual OUString GetDescription() const SAL_OVERRIDE;
- DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrmFmt);
+ DECL_FIXEDMEMPOOL_NEWDEL(SwDrawFrameFormat);
};
-SW_DLLPUBLIC bool IsFlyFrmFmtInHeader(const SwFrmFmt& rFmt);
+SW_DLLPUBLIC bool IsFlyFrameFormatInHeader(const SwFrameFormat& rFormat);
#endif
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index ee695e18ff06..b79a57e72980 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -23,44 +23,44 @@
#include <sal/types.h>
#include <o3tl/sorted_vector.hxx>
-class SwTxtFtn;
+class SwTextFootnote;
class SwNodeIndex;
class SwSectionNode;
// Everywhere where NodeIndex is used, the header files missing here
// are already included. Therefore put here as defines only and
// not as inline methods (saves compile time).
-#define _SwTxtFtn_GetIndex( pFIdx ) (pFIdx->GetTxtNode().GetIndex())
+#define _SwTextFootnote_GetIndex( pFIdx ) (pFIdx->GetTextNode().GetIndex())
-struct CompareSwFtnIdxs
+struct CompareSwFootnoteIdxs
{
- bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const;
+ bool operator()(SwTextFootnote* const& lhs, SwTextFootnote* const& rhs) const;
};
-class SwFtnIdxs : public o3tl::sorted_vector<SwTxtFtn*, CompareSwFtnIdxs>
+class SwFootnoteIdxs : public o3tl::sorted_vector<SwTextFootnote*, CompareSwFootnoteIdxs>
{
public:
- SwFtnIdxs() {}
+ SwFootnoteIdxs() {}
- void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos.
- void UpdateAllFtn(); // Update all footnotes.
+ void UpdateFootnote( const SwNodeIndex& rStt ); // Update all from pos.
+ void UpdateAllFootnote(); // Update all footnotes.
- SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
+ SwTextFootnote* SeekEntry( const SwNodeIndex& rIdx, size_t* pPos = 0 ) const;
};
-class SwUpdFtnEndNtAtEnd
+class SwUpdFootnoteEndNtAtEnd
{
- std::vector<const SwSectionNode*> aFtnSects, aEndSects;
- std::vector<sal_uInt16> aFtnNums, aEndNums;
+ std::vector<const SwSectionNode*> aFootnoteSects, aEndSects;
+ std::vector<sal_uInt16> aFootnoteNums, aEndNums;
public:
- SwUpdFtnEndNtAtEnd() : aFtnSects(), aEndSects() {}
+ SwUpdFootnoteEndNtAtEnd() : aFootnoteSects(), aEndSects() {}
static const SwSectionNode* FindSectNdWithEndAttr(
- const SwTxtFtn& rTxtFtn );
+ const SwTextFootnote& rTextFootnote );
- sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd );
- sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn );
+ sal_uInt16 GetNumber( const SwTextFootnote& rTextFootnote, const SwSectionNode& rNd );
+ sal_uInt16 ChkNumber( const SwTextFootnote& rTextFootnote );
};
#endif // INCLUDED_SW_INC_FTNIDX_HXX
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index 2b250287892b..fc5a4e5f0bb7 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -25,15 +25,15 @@
#include <editeng/numitem.hxx>
#include <fmtcol.hxx>
-class SwTxtFmtColl;
+class SwTextFormatColl;
class SwPageDesc;
-class SwCharFmt;
+class SwCharFormat;
class SwDoc;
class SW_DLLPUBLIC SwEndNoteInfo : public SwClient
{
SwDepend aPageDescDep;
- SwDepend aCharFmtDep, aAnchorCharFmtDep;
+ SwDepend aCharFormatDep, aAnchorCharFormatDep;
OUString sPrefix;
OUString sSuffix;
protected:
@@ -41,29 +41,29 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
- SvxNumberType aFmt;
- sal_uInt16 nFtnOffset;
+ SvxNumberType aFormat;
+ sal_uInt16 nFootnoteOffset;
void ChgPageDesc( SwPageDesc *pDesc );
SwPageDesc* GetPageDesc( SwDoc &rDoc ) const;
bool KnowsPageDesc() const;
bool DependsOn( const SwPageDesc* ) const;
- void SetFtnTxtColl(SwTxtFmtColl& rColl);
- SwTxtFmtColl* GetFtnTxtColl() const { return const_cast<SwTxtFmtColl*>(static_cast<const SwTxtFmtColl*>(GetRegisteredIn())); } // can be 0.
+ void SetFootnoteTextColl(SwTextFormatColl& rColl);
+ SwTextFormatColl* GetFootnoteTextColl() const { return const_cast<SwTextFormatColl*>(static_cast<const SwTextFormatColl*>(GetRegisteredIn())); } // can be 0.
- SwCharFmt* GetCharFmt(SwDoc &rDoc) const;
- void SetCharFmt( SwCharFmt* );
- SwClient *GetCharFmtDep() const { return (SwClient*)&aCharFmtDep; }
+ SwCharFormat* GetCharFormat(SwDoc &rDoc) const;
+ void SetCharFormat( SwCharFormat* );
+ SwClient *GetCharFormatDep() const { return (SwClient*)&aCharFormatDep; }
- SwCharFmt* GetAnchorCharFmt(SwDoc &rDoc) const;
- void SetAnchorCharFmt( SwCharFmt* );
- SwClient *GetAnchorCharFmtDep() const { return (SwClient*)&aAnchorCharFmtDep; }
+ SwCharFormat* GetAnchorCharFormat(SwDoc &rDoc) const;
+ void SetAnchorCharFormat( SwCharFormat* );
+ SwClient *GetAnchorCharFormatDep() const { return (SwClient*)&aAnchorCharFormatDep; }
SwEndNoteInfo & operator=(const SwEndNoteInfo&);
bool operator==( const SwEndNoteInfo &rInf ) const;
- SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
+ SwEndNoteInfo( SwTextFormatColl *pTextColl = 0);
SwEndNoteInfo(const SwEndNoteInfo&);
const OUString& GetPrefix() const { return sPrefix; }
@@ -74,34 +74,34 @@ public:
void ReleaseCollection() { if ( GetRegisteredInNonConst() ) GetRegisteredInNonConst()->Remove( this ); }
};
-enum SwFtnPos
+enum SwFootnotePos
{
// Momentarily only PAGE and CHAPTER. CHAPTER == document-endnotes.
FTNPOS_PAGE = 1,
FTNPOS_CHAPTER = 8
};
-enum SwFtnNum
+enum SwFootnoteNum
{
FTNNUM_PAGE, FTNNUM_CHAPTER, FTNNUM_DOC
};
-class SW_DLLPUBLIC SwFtnInfo: public SwEndNoteInfo
+class SW_DLLPUBLIC SwFootnoteInfo: public SwEndNoteInfo
{
using SwEndNoteInfo::operator ==;
public:
OUString aQuoVadis;
OUString aErgoSum;
- SwFtnPos ePos;
- SwFtnNum eNum;
+ SwFootnotePos ePos;
+ SwFootnoteNum eNum;
- SwFtnInfo& operator=(const SwFtnInfo&);
+ SwFootnoteInfo& operator=(const SwFootnoteInfo&);
- bool operator==( const SwFtnInfo &rInf ) const;
+ bool operator==( const SwFootnoteInfo &rInf ) const;
- SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
- SwFtnInfo(const SwFtnInfo&);
+ SwFootnoteInfo(SwTextFormatColl* pTextColl = 0);
+ SwFootnoteInfo(const SwFootnoteInfo&);
};
#endif
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index 2f09cb190435..3b7fed9b6df6 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -314,30 +314,30 @@ inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(bool bInP) const
inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(bool bInP) const
{ return static_cast<const SwDrawModeGrf&>(Get( RES_GRFATR_DRAWMODE,bInP)); }
-// Implementation of graphics attributes methods of SwFmt
-inline const SwMirrorGrf &SwFmt::GetMirrorGrf(bool bInP) const
+// Implementation of graphics attributes methods of SwFormat
+inline const SwMirrorGrf &SwFormat::GetMirrorGrf(bool bInP) const
{ return m_aSet.GetMirrorGrf(bInP); }
-inline const SwCropGrf &SwFmt::GetCropGrf(bool bInP) const
+inline const SwCropGrf &SwFormat::GetCropGrf(bool bInP) const
{ return m_aSet.GetCropGrf(bInP); }
-inline const SwRotationGrf &SwFmt::GetRotationGrf(bool bInP) const
+inline const SwRotationGrf &SwFormat::GetRotationGrf(bool bInP) const
{ return m_aSet.GetRotationGrf(bInP); }
-inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(bool bInP) const
+inline const SwLuminanceGrf &SwFormat::GetLuminanceGrf(bool bInP) const
{ return m_aSet.GetLuminanceGrf( bInP); }
-inline const SwContrastGrf &SwFmt::GetContrastGrf(bool bInP) const
+inline const SwContrastGrf &SwFormat::GetContrastGrf(bool bInP) const
{ return m_aSet.GetContrastGrf( bInP); }
-inline const SwChannelRGrf &SwFmt::GetChannelRGrf(bool bInP) const
+inline const SwChannelRGrf &SwFormat::GetChannelRGrf(bool bInP) const
{ return m_aSet.GetChannelRGrf( bInP); }
-inline const SwChannelGGrf &SwFmt::GetChannelGGrf(bool bInP) const
+inline const SwChannelGGrf &SwFormat::GetChannelGGrf(bool bInP) const
{ return m_aSet.GetChannelGGrf( bInP); }
-inline const SwChannelBGrf &SwFmt::GetChannelBGrf(bool bInP) const
+inline const SwChannelBGrf &SwFormat::GetChannelBGrf(bool bInP) const
{ return m_aSet.GetChannelBGrf( bInP); }
-inline const SwGammaGrf &SwFmt::GetGammaGrf(bool bInP) const
+inline const SwGammaGrf &SwFormat::GetGammaGrf(bool bInP) const
{ return m_aSet.GetGammaGrf( bInP); }
-inline const SwInvertGrf &SwFmt::GetInvertGrf(bool bInP) const
+inline const SwInvertGrf &SwFormat::GetInvertGrf(bool bInP) const
{ return m_aSet.GetInvertGrf( bInP); }
-inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(bool bInP) const
+inline const SwTransparencyGrf &SwFormat::GetTransparencyGrf(bool bInP) const
{ return m_aSet.GetTransparencyGrf( bInP); }
-inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(bool bInP) const
+inline const SwDrawModeGrf &SwFormat::GetDrawModeGrf(bool bInP) const
{ return m_aSet.GetDrawModeGrf(bInP); }
#endif // INCLUDED_SW_INC_GRFATR_HXX
diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx
index fe1a417d6d95..f648b84083b9 100644
--- a/sw/inc/hfspacingitem.hxx
+++ b/sw/inc/hfspacingitem.hxx
@@ -43,7 +43,7 @@ public:
inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(bool bInP) const
{ return static_cast<const SwHeaderAndFooterEatSpacingItem&>(Get( RES_HEADER_FOOTER_EAT_SPACING,bInP)); }
-inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(bool bInP) const
+inline const SwHeaderAndFooterEatSpacingItem &SwFormat::GetHeaderAndFooterEatSpacing(bool bInP) const
{ return m_aSet.GetHeaderAndFooterEatSpacing(bInP); }
#endif
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 43c1e326f53c..61c8c437558f 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
sal_uInt16 m_nPageStart; ///< first checked page
bool m_bIsDrawObj;
- bool m_bIsOtherCntnt;
+ bool m_bIsOtherContent;
bool m_bStartChk;
bool m_bIsSelection; ///< true if only the selected text should be converted
bool m_bStartDone;
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index f98b10389497..93af3fba2a0e 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -24,7 +24,7 @@
#include <svx/xdef.hxx>
#include "swdllapi.h"
-// For SwTxtHints without end index the following char is added:
+// For SwTextHints without end index the following char is added:
#define CH_TXTATR_BREAKWORD ((sal_Unicode)0x01)
#define CH_TXTATR_INWORD ((sal_Unicode)0xFFF9)
@@ -109,7 +109,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
/** text attributes with start and end.
#i105453#:
- Hints (SwTxtAttr) with the same start and end position are sorted by
+ Hints (SwTextAttr) with the same start and end position are sorted by
WhichId, i.e., the TXTATR constants defined here.
The text formatting (SwAttrIter) poses some requirements on TXTATR order:
- AUTOFMT must precede CHARFMT, so that auto style can overwrite char style.
@@ -118,7 +118,7 @@ RES_TXTATR_BEGIN = RES_CHRATR_END,
hints on insertion, but on exporting to ODF. if CHARFMT would precede
INETFMT, then exporting and importing will effectively change precedence)
- Nesting hints (SwTxtAttrNesting) also have requirements on TXTATR order,
+ Nesting hints (SwTextAttrNesting) also have requirements on TXTATR order,
to ensure proper nesting (because CJK_RUBY and INETFMT have no CH_TXTATR):
- INETFMT should precede CJK_RUBY (for UNO API it does not matter...)
- META and METAFIELD must precede CJK_RUBY and INETFMT
@@ -438,35 +438,35 @@ SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript
// This function returns
// CH_TXTATR_BREAKWORD for Textattribute which breaks a word (default)
// CH_TXTATR_INWORD for Textattribute which dont breaks a word
-class SwTxtAttr;
-sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr );
+class SwTextAttr;
+sal_Unicode GetCharOfTextAttr( const SwTextAttr& rAttr );
// all Sets defined in init.cxx
// AttrSet-Range for the 3 Break-Attribute
extern sal_uInt16 aBreakSetRange[];
-// AttrSet-Range for TxtFmtColl
-extern sal_uInt16 aTxtFmtCollSetRange[];
-// AttrSet-Range for GrfFmtColl
-extern sal_uInt16 aGrfFmtCollSetRange[];
+// AttrSet-Range for TextFormatColl
+extern sal_uInt16 aTextFormatCollSetRange[];
+// AttrSet-Range for GrfFormatColl
+extern sal_uInt16 aGrfFormatCollSetRange[];
// AttrSet-Range for TextNode
-SW_DLLPUBLIC extern sal_uInt16 aTxtNodeSetRange[];
-// AttrSet-Range for NoTxtNode
-extern sal_uInt16 aNoTxtNodeSetRange[];
+SW_DLLPUBLIC extern sal_uInt16 aTextNodeSetRange[];
+// AttrSet-Range for NoTextNode
+extern sal_uInt16 aNoTextNodeSetRange[];
// AttrSet-Range for SwTable
extern sal_uInt16 aTableSetRange[];
// AttrSet-Range for SwTableLine
extern sal_uInt16 aTableLineSetRange[];
// AttrSet-Range for SwTableBox
extern sal_uInt16 aTableBoxSetRange[];
-// AttrSet-Range for SwFrmFmt
-SW_DLLPUBLIC extern sal_uInt16 aFrmFmtSetRange[];
-// AttrSet-Range for SwCharFmt
-extern sal_uInt16 aCharFmtSetRange[];
+// AttrSet-Range for SwFrameFormat
+SW_DLLPUBLIC extern sal_uInt16 aFrameFormatSetRange[];
+// AttrSet-Range for SwCharFormat
+extern sal_uInt16 aCharFormatSetRange[];
// AttrSet-Range for the autostyles
-extern sal_uInt16 aCharAutoFmtSetRange[];
-// AttrSet-Range for SwPageDescFmt
-extern sal_uInt16 aPgFrmFmtSetRange[];
+extern sal_uInt16 aCharAutoFormatSetRange[];
+// AttrSet-Range for SwPageDescFormat
+extern sal_uInt16 aPgFrameFormatSetRange[];
// check if ID is InRange of AttrSet-Ids
bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 92a5744bbb7f..5920b042f270 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -23,15 +23,15 @@
#include <vcl/vclptr.hxx>
#include <vector>
-class SwFmt;
+class SwFormat;
class OutputDevice;
class SwTable;
class SwNode;
class SwNodes;
-class SwCntntNode;
+class SwContentNode;
class SwPageFrm;
class SwFrm;
-class SwTxtNode;
+class SwTextNode;
class SwHistory;
// Base class for all Message-Hints:
@@ -59,23 +59,23 @@ public:
};
/*
- * SwFmtChg is sent when a format has changed to another format. 2 Hints are always sent
+ * SwFormatChg is sent when a format has changed to another format. 2 Hints are always sent
* the old and the new format
*/
-class SwFmtChg: public SwMsgPoolItem
+class SwFormatChg: public SwMsgPoolItem
{
public:
- SwFmt *pChangedFmt;
- SwFmtChg( SwFmt *pFmt );
+ SwFormat *pChangedFormat;
+ SwFormatChg( SwFormat *pFormat );
};
-class SwInsTxt: public SwMsgPoolItem
+class SwInsText: public SwMsgPoolItem
{
public:
sal_Int32 nPos;
sal_Int32 nLen;
- SwInsTxt( sal_Int32 nP, sal_Int32 nL );
+ SwInsText( sal_Int32 nP, sal_Int32 nL );
};
class SwDelChr: public SwMsgPoolItem
@@ -86,13 +86,13 @@ public:
SwDelChr( sal_Int32 nP );
};
-class SwDelTxt: public SwMsgPoolItem
+class SwDelText: public SwMsgPoolItem
{
public:
sal_Int32 nStart;
sal_Int32 nLen;
- SwDelTxt( sal_Int32 nS, sal_Int32 nL );
+ SwDelText( sal_Int32 nS, sal_Int32 nL );
};
class SwUpdateAttr : public SwMsgPoolItem
@@ -101,7 +101,7 @@ private:
sal_Int32 nStart;
sal_Int32 nEnd;
sal_uInt16 nWhichAttr;
- std::vector<sal_uInt16> aWhichFmtAttr; // attributes changed inside RES_TXTATR_AUTOFMT
+ std::vector<sal_uInt16> aWhichFormatAttr; // attributes changed inside RES_TXTATR_AUTOFMT
public:
SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW );
@@ -121,16 +121,16 @@ public:
return nWhichAttr;
}
- const std::vector<sal_uInt16>& getFmtAttr() const
+ const std::vector<sal_uInt16>& getFormatAttr() const
{
- return aWhichFmtAttr;
+ return aWhichFormatAttr;
}
};
-/** SwRefMarkFldUpdate is sent when the referencemarks should be updated.
+/** SwRefMarkFieldUpdate is sent when the referencemarks should be updated.
To determine Page- / chapternumbers the current frame has to be asked.
For this we need the current outputdevice */
-class SwRefMarkFldUpdate : public SwMsgPoolItem
+class SwRefMarkFieldUpdate : public SwMsgPoolItem
{
public:
VclPtr<OutputDevice> pOut; ///< pointer to the current output device
@@ -139,7 +139,7 @@ public:
To get the page/chapter number, the frame has to be asked. For that we need
the current OutputDevice.
*/
- SwRefMarkFldUpdate( OutputDevice* );
+ SwRefMarkFieldUpdate( OutputDevice* );
};
/** SwDocPosUpdate is sent to signal that only the frames from or to a specified document-global position
@@ -151,39 +151,39 @@ public:
SwDocPosUpdate( const long nDocPos );
};
-/// SwTableFmlUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
-enum TableFmlUpdtFlags { TBL_CALC = 0,
+/// SwTableFormulaUpdate is sent when the table has to be newly calculated or when a table itself is merged or splitted
+enum TableFormulaUpdateFlags { TBL_CALC = 0,
TBL_BOXNAME,
TBL_BOXPTR,
TBL_RELBOXNAME,
TBL_MERGETBL,
TBL_SPLITTBL
};
-class SwTableFmlUpdate : public SwMsgPoolItem
+class SwTableFormulaUpdate : public SwMsgPoolItem
{
public:
- const SwTable* pTbl; ///< Pointer to the current table
+ const SwTable* pTable; ///< Pointer to the current table
union {
- const SwTable* pDelTbl; ///< Merge: Pointer to the table to be removed
- const OUString* pNewTblNm; ///< Split: the name of the new table
+ const SwTable* pDelTable; ///< Merge: Pointer to the table to be removed
+ const OUString* pNewTableNm; ///< Split: the name of the new table
} DATA;
SwHistory* pHistory;
sal_uInt16 nSplitLine; ///< Split: from this BaseLine on will be splitted
- TableFmlUpdtFlags eFlags;
+ TableFormulaUpdateFlags eFlags;
bool bModified : 1;
bool bBehindSplitLine : 1;
/** Is sent if a table should be recalculated */
- SwTableFmlUpdate( const SwTable* );
+ SwTableFormulaUpdate( const SwTable* );
};
-class SwAutoFmtGetDocNode: public SwMsgPoolItem
+class SwAutoFormatGetDocNode: public SwMsgPoolItem
{
public:
- const SwCntntNode* pCntntNode;
+ const SwContentNode* pContentNode;
const SwNodes* pNodes;
- SwAutoFmtGetDocNode( const SwNodes* pNds );
+ SwAutoFormatGetDocNode( const SwNodes* pNds );
};
/*
@@ -219,8 +219,8 @@ public:
class SwCondCollCondChg: public SwMsgPoolItem
{
public:
- SwFmt *pChangedFmt;
- SwCondCollCondChg( SwFmt *pFmt );
+ SwFormat *pChangedFormat;
+ SwCondCollCondChg( SwFormat *pFormat );
};
class SwVirtPageNumInfo: public SwMsgPoolItem
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 27cb7bc2e94e..928ae53023d6 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -30,7 +30,7 @@ class SwTableBox;
class SwTable;
class SwHTMLTableLayout;
class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
#define HTMLTABLE_RESIZE_NOW (ULONG_MAX)
@@ -239,7 +239,7 @@ class SwHTMLTableLayout
void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const;
const SwStartNode *GetAnyBoxStartNode() const;
- SwFrmFmt *FindFlyFrmFmt() const;
+ SwFrameFormat *FindFlyFrameFormat() const;
const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); }
void ClearPass1Info() { nMin = nMax = 0; }
@@ -251,7 +251,7 @@ class SwHTMLTableLayout
static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc );
public:
- SwHTMLTableLayout( const SwTable *pSwTbl,
+ SwHTMLTableLayout( const SwTable *pSwTable,
sal_uInt16 nRows, sal_uInt16 nCols, bool bColsOpt, bool ColTgs,
sal_uInt16 nWidth, bool bPrcWidth, sal_uInt16 nBorderOpt,
sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust,
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinf