/ure/

ab465b90f6c6da5595393a0ba73f33a1e71a2b65'/> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
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
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
bin/rename-sw-abbreviations.sh libreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat
-rw-r--r--chart2/source/controller/main/ShapeController.cxx4
-rw-r--r--cui/source/dialogs/hltpbase.cxx4
-rw-r--r--cui/source/inc/macroass.hxx8
-rw-r--r--cui/source/inc/numpages.hxx14
-rw-r--r--cui/source/inc/paragrph.hxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx42
-rw-r--r--cui/source/tabpages/numpages.cxx26
-rw-r--r--cui/source/tabpages/paragrph.cxx54
-rw-r--r--cui/source/tabpages/tabstpge.cxx2
-rw-r--r--editeng/source/editeng/editattr.hxx4
-rw-r--r--editeng/source/editeng/editdbg.cxx4
-rw-r--r--editeng/source/editeng/editdoc.cxx4
-rw-r--r--editeng/source/editeng/editeng.cxx6
-rw-r--r--editeng/source/editeng/editobj.cxx4
-rw-r--r--editeng/source/editeng/impedit2.cxx8
-rw-r--r--editeng/source/editeng/impedit3.cxx16
-rw-r--r--editeng/source/editeng/impedit4.cxx4
-rw-r--r--editeng/source/items/frmitems.cxx68
-rw-r--r--editeng/source/items/numitem.cxx2
-rw-r--r--editeng/source/items/paraitem.cxx18
-rw-r--r--editeng/source/items/svxfont.cxx2
-rw-r--r--editeng/source/misc/acorrcfg.cxx20
-rw-r--r--editeng/source/misc/swafopt.cxx24
-rw-r--r--editeng/source/outliner/outliner.cxx12
-rw-r--r--editeng/source/rtf/rtfitem.cxx8
-rw-r--r--editeng/source/rtf/svxrtf.cxx8
-rw-r--r--filter/source/msfilter/msdffimp.cxx4
-rw-r--r--filter/source/msfilter/svdfppt.cxx4
-rw-r--r--include/editeng/acorrcfg.hxx4
-rw-r--r--include/editeng/formatbreakitem.hxx18
-rw-r--r--include/editeng/keepitem.hxx12
-rw-r--r--include/editeng/lrspitem.hxx20
-rw-r--r--include/editeng/memberids.hrc2
-rw-r--r--include/editeng/numitem.hxx6
-rw-r--r--include/editeng/outliner.hxx10
-rw-r--r--include/editeng/protitem.hxx6
-rw-r--r--include/editeng/spltitem.hxx16
-rw-r--r--include/editeng/svxacorr.hxx4
-rw-r--r--include/editeng/svxfont.hxx2
-rw-r--r--include/editeng/svxrtf.hxx2
-rw-r--r--include/editeng/swafopt.hxx18
-rw-r--r--include/filter/msfilter/msdffimp.hxx8
-rw-r--r--include/svl/zforlist.hxx4
-rw-r--r--include/svtools/svparser.hxx2
-rw-r--r--include/svx/clipboardctl.hxx2
-rw-r--r--include/svx/clipfmtitem.hxx12
-rw-r--r--include/svx/hlnkitem.hxx2
-rw-r--r--include/svx/optgrid.hxx24
-rw-r--r--sc/source/core/tool/viewopti.cxx36
-rw-r--r--sc/source/ui/app/scmod.cxx2
-rw-r--r--sc/source/ui/app/typemap.cxx4
-rw-r--r--sc/source/ui/drawfunc/drtxtob.cxx6
-rw-r--r--sc/source/ui/drawfunc/drtxtob1.cxx4
-rw-r--r--sc/source/ui/inc/cellsh.hxx4
-rw-r--r--sc/source/ui/unoobj/confuno.cxx16
-rw-r--r--sc/source/ui/view/cellsh.cxx6
-rw-r--r--sc/source/ui/view/cellsh1.cxx2
-rw-r--r--sc/source/ui/view/drawview.cxx10
-rw-r--r--sc/source/ui/view/editsh.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx16
-rw-r--r--sd/source/core/drawdoc4.cxx2
-rw-r--r--sd/source/core/sdpage.cxx2
-rw-r--r--sd/source/core/stlpool.cxx2
-rw-r--r--sd/source/core/stlsheet.cxx8
-rw-r--r--sd/source/filter/xml/sdtransform.cxx4
-rw-r--r--sd/source/ui/app/optsitem.cxx84
-rw-r--r--sd/source/ui/app/sdmod2.cxx4
-rw-r--r--sd/source/ui/func/fuparagr.cxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx4
-rw-r--r--sd/source/ui/inc/optsitem.hxx24
-rw-r--r--sd/source/ui/view/drviews3.cxx30
-rw-r--r--sd/source/ui/view/drviews7.cxx10
-rw-r--r--sd/source/ui/view/frmview.cxx8
-rw-r--r--sfx2/sdi/sfx.sdi2
-rw-r--r--sfx2/sdi/sfxitems.sdi2
-rw-r--r--starmath/sdi/smitems.sdi6
-rw-r--r--svl/source/numbers/zforlist.cxx6
-rw-r--r--svtools/source/svrtf/svparser.cxx2
-rw-r--r--svx/sdi/svx.sdi6
-rw-r--r--svx/sdi/svxitems.sdi6
-rw-r--r--svx/source/dialog/fntctrl.cxx6
-rw-r--r--svx/source/dialog/svxruler.cxx26
-rw-r--r--svx/source/items/clipfmtitem.cxx44
-rw-r--r--svx/source/items/hlnkitem.cxx4
-rw-r--r--svx/source/mnuctrls/clipboardctl.cxx2
-rw-r--r--svx/source/sidebar/nbdtmg.cxx20
-rw-r--r--svx/source/sidebar/paragraph/ParaPropertyPanel.cxx24
-rw-r--r--svx/source/styles/CommonStylePreviewRenderer.cxx2
-rw-r--r--svx/source/svdraw/svdedxv.cxx6
-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
1107 files changed, 50156 insertions, 50156 deletions
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index e0176be4eff4..77fff3fe3456 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,8 +582,8 @@ void ShapeController::executeDispatch_ParagraphDialog()
0 );
aNewAttr.Put( aAttr );
aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
- aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
- aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) );
+ aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+ aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3be79e68b9be..44724042527d 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
if ( pHyperlinkItem->GetMacroEvents() )
{
// get macros from itemset
- const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTbl();
+ const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTable();
SvxMacroItem aItem ( GetWhich(SID_ATTR_MACROITEM) );
if( pMacroTbl )
aItem.SetMacroTable( *pMacroTbl );
@@ -381,7 +381,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
- return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
+ return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTable());
}
// try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a5b4f6b0ae..9cb85a13414a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -61,8 +61,8 @@ public:
void AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
- const SvxMacroTableDtor& GetMacroTbl() const;
- void SetMacroTbl( const SvxMacroTableDtor& rTbl );
+ const SvxMacroTableDtor& GetMacroTable() const;
+ void SetMacroTable( const SvxMacroTableDtor& rTbl );
void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -77,12 +77,12 @@ public:
bool IsReadOnly() const SAL_OVERRIDE;
};
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const
{
return aTbl;
}
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl )
{
aTbl = rTbl;
}
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 032ad4596818..21c975343d76 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -138,7 +138,7 @@ class SvxBulletPickTabPage : public SfxTabPage
bool bPreset : 1;
sal_uInt16 nNumItemId;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
protected:
DECL_LINK(NumSelectHdl_Impl, void *);
DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -156,7 +156,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
+ void SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -170,7 +170,7 @@ class SvxNumPickTabPage : public SfxTabPage
VclPtr<SvxNumValueSet> m_pExamplesVS;
OUString sNumCharFmtName;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // is initialized with the five formats
@@ -200,9 +200,9 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
+ void SetCharFormatNames(const OUString& rCharName, const OUString& rBulName)
{ sNumCharFmtName = rCharName;
- sBulletCharFmtName = rBulName;}
+ sBulletCharFormatName = rBulName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -298,7 +298,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
VclPtr<SvxNumberingPreview> m_pPreviewWIN;
OUString m_sNumCharFmtName;
- OUString m_sBulletCharFmtName;
+ OUString m_sBulletCharFormatName;
Timer aInvalidateTimer;
@@ -365,7 +365,7 @@ public:
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
{
m_sNumCharFmtName = rNumName;
- m_sBulletCharFmtName = rBulletName;
+ m_sBulletCharFormatName = rBulletName;
}
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7662a9d2ea9f..0c55af1988e2 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -183,8 +183,8 @@ public:
[Items]
<SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
- <SvxFmtBreakItem><SID_ATTR_PARA_PAGEBREAK>
- <SvxFmtSplitItem><SID_ATTR_PARA_SPLIT>
+ <SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
+ <SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
<SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
<SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
*/
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 09f62262fc76..c4a91772b2fe 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -97,7 +97,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
{
// remove smart tag tab page if no extensions are installed
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
RemoveTabPage("smarttags");
@@ -521,7 +521,7 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags();
bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
@@ -610,18 +610,18 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatByInpDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatDelSpacesBetweenLines = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatByInpDelSpacesBetweenLines = bCheck;
if(bModified || nFlags != pAutoCorrect->GetFlags())
{
@@ -641,7 +641,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const long nFlags = pAutoCorrect->GetFlags();
m_pCheckLB->SetUpdateMode(false);
@@ -683,10 +683,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
m_pCheckLB->CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFormatDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFormatDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesBetweenLines );
m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode );
m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl );
m_pCheckLB->CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum );
@@ -1926,7 +1926,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
bool bModified = false;
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
bModified |= pOpt->bAddNonBrkSpace != bCheck;
@@ -1991,7 +1991,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
// Initialize the Sw options
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pSwCheckLB->SetUpdateMode( false );
m_pSwCheckLB->Clear();
@@ -2254,7 +2254,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false, bCheck;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
sal_uInt16 nVal;
bCheck = m_pCBActiv->IsChecked();
@@ -2306,7 +2306,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
void OfaAutoCompleteTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pCBActiv->Check( pOpt->bAutoCompleteWords );
m_pCBCollect->Check( pOpt->bAutoCmpltCollectWords );
@@ -2640,7 +2640,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust!
@@ -2683,7 +2683,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust, should not happen!
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 86930e231508..4d721afaffa0 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( aEmptyStr );
else
aFmt.SetSuffix(_pSet->sSuffix);
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
pActNum->SetLevel(i, aFmt);
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( OUString() );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
pActNum->SetLevel(i, aFmt);
@@ -548,7 +548,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
if (pBulletCharFmt)
- SetCharFmtName( pBulletCharFmt->GetValue());
+ SetCharFormatName( pBulletCharFmt->GetValue());
}
@@ -773,14 +773,14 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
? pLevelSettings->sBulletChar[0]
: 0 );
- aFmt.SetCharFmtName( sBulletCharFmtName );
+ aFmt.SetCharFormatName( sBulletCharFormatName );
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
}
else
{
aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
// #i93908#
@@ -808,7 +808,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
if (pNumCharFmt &&pBulletCharFmt)
- SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
+ SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
aFmt.SetNumberingType(nSetNumberingType);
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
- aFmt.SetCharFmtName( sNumCharFmtName );
+ aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
@@ -1611,7 +1611,7 @@ void SvxNumOptionsTabPage::InitControls()
if(SAL_MAX_UINT16 == nLvl)
{
nLvl = i;
- sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName();
+ sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
eFirstOrient = aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap)
aFirstSize = aNumFmtArr[i]->GetGraphicSize();
@@ -1624,7 +1624,7 @@ void SvxNumOptionsTabPage::InitControls()
bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
- bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+ bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap && bSameSize)
bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -1933,7 +1933,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
// allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
- sSelectStyle = m_sBulletCharFmtName;
+ sSelectStyle = m_sBulletCharFormatName;
}
}
else
@@ -2118,7 +2118,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- aNumFmt.SetCharFmtName(m_sNumCharFmtName);
+ aNumFmt.SetCharFormatName(m_sNumCharFmtName);
aNumFmt.SetGraphic(aGrfName);
// set size for a later comparison
@@ -2355,11 +2355,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
if( 0 == nEntryPos )
- aNumFmt.SetCharFmtName(aEmptyStr);
+ aNumFmt.SetCharFormatName(aEmptyStr);
else
{
if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
- aNumFmt.SetCharFmtName(sEntry);
+ aNumFmt.SetCharFormatName(sEntry);
}
pActNum->SetLevel(i, aNumFmt);
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 94c007053d8c..d128a30060b4 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -319,10 +319,10 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
static_cast<const SvxLRSpaceItem&>(GetItemSet().GetParent()->Get( nWhich ));
if ( m_pLeftIndent->IsRelative() )
- aMargin.SetTxtLeft( rOldItem.GetTxtLeft(),
+ aMargin.SetTextLeft( rOldItem.GetTextLeft(),
(sal_uInt16)m_pLeftIndent->GetValue() );
else
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
if ( m_pRightIndent->IsRelative() )
aMargin.SetRight( rOldItem.GetRight(),
@@ -331,21 +331,21 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
if ( m_pFLineIndent->IsRelative() )
- aMargin.SetTxtFirstLineOfst( rOldItem.GetTxtFirstLineOfst(),
+ aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(),
(sal_uInt16)m_pFLineIndent->GetValue() );
else
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
else
{
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
aMargin.SetAutoFirst(m_pAutoCB->IsChecked());
- if ( aMargin.GetTxtFirstLineOfst() < 0 )
+ if ( aMargin.GetTextFirstLineOfst() < 0 )
bNullTab = true;
eState = GetItemSet().GetItemState( nWhich );
@@ -452,7 +452,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
{
m_pLeftIndent->SetRelative();
SetFieldUnit( *m_pLeftIndent, eFUnit );
- SetMetricValue( *m_pLeftIndent, rOldItem.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rOldItem.GetTextLeft(), eUnit );
}
if ( rOldItem.GetPropRight() != 100 )
@@ -467,17 +467,17 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
SetMetricValue( *m_pRightIndent, rOldItem.GetRight(), eUnit );
}
- if ( rOldItem.GetPropTxtFirstLineOfst() != 100 )
+ if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
{
m_pFLineIndent->SetRelative( true );
- m_pFLineIndent->SetValue( rOldItem.GetPropTxtFirstLineOfst() );
+ m_pFLineIndent->SetValue( rOldItem.GetPropTextFirstLineOfst() );
}
else
{
m_pFLineIndent->SetRelative();
m_pFLineIndent->SetMin(-9999);
SetFieldUnit( *m_pFLineIndent, eFUnit );
- SetMetricValue( *m_pFLineIndent, rOldItem.GetTxtFirstLineOfst(),
+ SetMetricValue( *m_pFLineIndent, rOldItem.GetTextFirstLineOfst(),
eUnit );
}
m_pAutoCB->Check(rOldItem.IsAutoFirst());
@@ -487,9 +487,9 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
const SvxLRSpaceItem& rSpace =
static_cast<const SvxLRSpaceItem&>(rSet->Get( _nWhich ));
- SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rSpace.GetTextLeft(), eUnit );
SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit );
- SetMetricValue( *m_pFLineIndent, rSpace.GetTxtFirstLineOfst(), eUnit );
+ SetMetricValue( *m_pFLineIndent, rSpace.GetTextFirstLineOfst(), eUnit );
m_pAutoCB->Check(rSpace.IsAutoFirst());
}
AutoHdl_Impl(m_pAutoCB);
@@ -1430,7 +1430,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( bIsPageModel )
// if PageModel is turned on, always turn off PageBreak
- rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+ rOutSet->Put( SvxFormatBreakItem( SVX_BREAK_NONE, _nWhich ) );
else
{
eState = m_pPageBreakBox->GetState();
@@ -1441,9 +1441,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
m_pBreakTypeLB->IsValueChangedFromSaved() ||
m_pBreakPositionLB->IsValueChangedFromSaved() )
{
- const SvxFmtBreakItem rOldBreak(
- static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( _nWhich )));
- SvxFmtBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
+ const SvxFormatBreakItem rOldBreak(
+ static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( _nWhich )));
+ SvxFormatBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
switch ( eState )
{
@@ -1476,7 +1476,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
if ( eState != m_pPageBreakBox->GetSavedValue() ||
- !pOld || !( *static_cast<const SvxFmtBreakItem*>(pOld) == aBreak ) )
+ !pOld || !( *static_cast<const SvxFormatBreakItem*>(pOld) == aBreak ) )
{
bModified = true;
rOutSet->Put( aBreak );
@@ -1492,10 +1492,10 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
- if ( !pOld || static_cast<const SvxFmtSplitItem*>(pOld)->GetValue() !=
+ if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() !=
( eState == TRISTATE_FALSE ) )
{
- rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+ rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
bModified = true;
}
}
@@ -1507,7 +1507,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( m_pKeepParaBox->IsValueChangedFromSaved() )
{
// if the status has changed, putting is necessary
- rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+ rOutSet->Put( SvxFormatKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = true;
}
@@ -1655,8 +1655,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtBreakItem& rPageBreak =
- static_cast<const SvxFmtBreakItem&>(rSet->Get( _nWhich ));
+ const SvxFormatBreakItem& rPageBreak =
+ static_cast<const SvxFormatBreakItem&>(rSet->Get( _nWhich ));
SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
@@ -1727,8 +1727,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
m_pKeepParaBox->EnableTriState( false );
- const SvxFmtKeepItem& rKeep =
- static_cast<const SvxFmtKeepItem&>(rSet->Get( _nWhich ));
+ const SvxFormatKeepItem& rKeep =
+ static_cast<const SvxFormatKeepItem&>(rSet->Get( _nWhich ));
if ( rKeep.GetValue() )
m_pKeepParaBox->SetState( TRISTATE_TRUE );
@@ -1745,8 +1745,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtSplitItem& rSplit =
- static_cast<const SvxFmtSplitItem&>(rSet->Get( _nWhich ));
+ const SvxFormatSplitItem& rSplit =
+ static_cast<const SvxFormatSplitItem&>(rSet->Get( _nWhich ));
m_pKeepTogetherBox->EnableTriState( false );
if ( !rSplit.GetValue() )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 9dd3c078639f..6bef88304734 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -233,7 +233,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
if (SfxItemState::SET != rSet->GetItemState(GetWhich(SID_ATTR_LRSPACE), true, &pLRSpace))
pLRSpace = GetOldItem(*rSet, SID_ATTR_LRSPACE);
- if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTxtFirstLineOfst() < 0)
+ if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTextFirstLineOfst() < 0)
{
SvxTabStop aNull(0, SVX_TAB_ADJUST_DEFAULT);
aNewTabs.Insert(aNull);
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index c5f7a3b32f40..fb210c6813a3 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -375,8 +375,8 @@ public:
{ return !(operator == ( rAttr ) ); }
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
- Color*& GetTxtColor() { return pTxtColor; }
- Color*& GetFldColor() { return pFldColor; }
+ Color*& GetTextColor() { return pTxtColor; }
+ Color*& GetFieldColor() { return pFldColor; }
const OUString& GetFieldValue() const { return aFieldValue;}
void SetFieldValue(const OUString& rVal);
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index fa1f99af1169..d59654f713e5 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -70,9 +70,9 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
aDebStr.append("FI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst()));
+ aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst()));
aDebStr.append(", LI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft()));
+ aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()));
aDebStr.append(", RI=");
aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight()));
break;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c9fe9755005f..6f447b90f291 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -878,8 +878,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
{
DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: invalid Item!" );
SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem);
- rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
- rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) );
+ rItem.SetTextFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTextFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
+ rItem.SetTextLeft( OutputDevice::LogicToLogic( rItem.GetTextLeft(), eSourceUnit, eDestUnit ) );
rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) );
}
break;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3a356ab28115..a119b58dc8dc 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1922,11 +1922,11 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
else
{
const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() );
-// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) );
+// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) );
sal_Int32 nSpaceBefore = 0;
pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore );
- short nX = (short)(rLRItem.GetTxtLeft()
- + rLRItem.GetTxtFirstLineOfst()
+ short nX = (short)(rLRItem.GetTextLeft()
+ + rLRItem.GetTextFirstLineOfst()
+ nSpaceBefore);
aPoint.X() = pImpEditEngine->GetXValue( nX
);
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index c4f3afca1338..ecee5b62ef22 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1564,14 +1564,14 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
{
ContentInfo& rC = aContents[i];
const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rC.GetParaAttribs().Get(EE_PARA_LRSPACE));
- if ( rLRSpace.GetTxtLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
+ if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
{
const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS));
SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
{
const SvxTabStop& rT = rTabs[ t ];
- aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
+ aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTextLeft(),
rT.GetAdjustment(), rT.GetDecimal(), rT.GetFill() ) );
}
rC.GetParaAttribs().Put( aNewTabs );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index bfded820d6fa..87a1f947af28 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2943,12 +2943,12 @@ bool ImpEditEngine::UpdateFields()
rField.Reset();
if ( aStatus.MarkFields() )
- rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
+ rField.GetFieldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
OUString aFldValue =
GetEditEnginePtr()->CalcFieldValue(
static_cast<const SvxFieldItem&>(*rField.GetItem()),
- nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor());
+ nPara, rField.GetStart(), rField.GetTextColor(), rField.GetFieldColor());
rField.SetFieldValue(aFldValue);
if (rField != *pCurrent)
@@ -3089,10 +3089,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace )
// width, here not preferred. I general, it is best not leave it
// to StartPosX, also the right indents have to be taken into
// account!
- nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+ nCurWidth = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
if ( nLine == 0 )
{
- long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+ long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
nCurWidth -= nFI;
if ( pPortion->GetBulletX() > nCurWidth )
{
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1a8ac4d5918b..fb071e08799e 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -737,10 +737,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nPortionStart = 0;
sal_Int32 nPortionEnd = 0;
- long nStartX = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+ long nStartX = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
if ( nIndex == 0 )
{
- long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+ long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
nStartX += nFI;
if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) )
@@ -907,9 +907,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
- short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
- aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
- aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
+ short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth);
+ aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() );
+ aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) );
aCurrentTab.bValid = false;
// Switch direction in R2L para...
@@ -1577,12 +1577,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore );
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
- short nStartX = GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBefore));
+ short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore));
Rectangle aBulletArea = Rectangle( Point(), Point() );
if ( bLineBreak )
{
- nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+ nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
}
else
{
@@ -1593,7 +1593,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly.
if ( pParaPortion->GetBulletX() > nStartX )
{
- nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+ nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
if ( pParaPortion->GetBulletX() > nStartX )
nStartX = pParaPortion->GetBulletX();
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0fb7962a54da..8cd007a3de34 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -723,11 +723,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_PARA_LRSPACE:
{
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
- sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst();
+ sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst();
nTxtFirst = LogicToTwips( nTxtFirst );
rOutput.WriteInt32AsString( nTxtFirst );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
- sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft());
+ sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft());
nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
rOutput.WriteInt32AsString( nTxtLeft );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 50db5864bc23..d872838d7250 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -149,8 +149,8 @@ TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
-TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
+TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
@@ -496,7 +496,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
break;
case MID_TXT_LMARGIN :
- SetTxtLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
+ SetTextLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
break;
case MID_R_MARGIN:
@@ -518,11 +518,11 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
case MID_FIRST_LINE_INDENT :
- SetTxtFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal));
+ SetTextFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal));
break;
case MID_FIRST_LINE_REL_INDENT:
- SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
+ SetPropTextFirstLineOfst ( (sal_uInt16)nVal );
break;
case MID_FIRST_AUTO:
@@ -557,11 +557,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr);
return (
- nFirstLineOfst == rOther.GetTxtFirstLineOfst() &&
- nTxtLeft == rOther.GetTxtLeft() &&
+ nFirstLineOfst == rOther.GetTextFirstLineOfst() &&
+ nTxtLeft == rOther.GetTextLeft() &&
nLeftMargin == rOther.GetLeft() &&
nRightMargin == rOther.GetRight() &&
- nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() &&
+ nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() &&
nPropLeftMargin == rOther.GetPropLeft() &&
nPropRightMargin == rOther.GetPropRight() &&
bAutoFirst == rOther.IsAutoFirst() &&
@@ -673,7 +673,7 @@ bool SvxLRSpaceItem::GetPresentation
SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
short nSaveFI = nFirstLineOfst;
- const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create()
+ const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create()
sal_uInt16 nMargin = 0;
if( nLeftMargin > 0 )
@@ -713,7 +713,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
}
}
- const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( nSaveFI );
+ const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( nSaveFI );
return rStrm;
}
@@ -1268,7 +1268,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
sal_Int8 cProt = 0;
if( IsPosProtected() ) cProt |= 0x01;
if( IsSizeProtected() ) cProt |= 0x02;
- if( IsCntntProtected() ) cProt |= 0x04;
+ if( IsContentProtected() ) cProt |= 0x04;
rStrm.WriteSChar( cProt );
return rStrm;
}
@@ -1282,7 +1282,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
SvxProtectItem* pAttr = new SvxProtectItem( Which() );
pAttr->SetPosProtect( ( cFlags & 0x01 ) != 0 );
pAttr->SetSizeProtect( ( cFlags & 0x02 ) != 0 );
- pAttr->SetCntntProtect( ( cFlags & 0x04 ) != 0 );
+ pAttr->SetContentProtect( ( cFlags & 0x04 ) != 0 );
return pAttr;
}
@@ -2937,18 +2937,18 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
-bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" );
- return GetValue() == static_cast<const SvxFmtBreakItem&>( rAttr ).GetValue();
+ return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue();
}
-bool SvxFmtBreakItem::GetPresentation
+bool SvxFormatBreakItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -2962,14 +2962,14 @@ bool SvxFmtBreakItem::GetPresentation
-OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
}
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
style::BreakType eBreak = style::BreakType_NONE;
switch ( (SvxBreak)GetValue() )
@@ -2986,7 +2986,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons
return true;
}
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
style::BreakType nBreak;
@@ -3017,14 +3017,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
-SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
{
- return new SvxFmtBreakItem( *this );
+ return new SvxFormatBreakItem( *this );
}
-SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
rStrm.WriteSChar( GetValue() );
if( FMTBREAK_NOAUTO > nItemVersion )
@@ -3034,44 +3034,44 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co
-sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
+sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
SOFFICE_FILEFORMAT_50==nFFVer,
- "SvxFmtBreakItem: Is there a new file format? ");
+ "SvxFormatBreakItem: Is there a new file format? ");
return SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
}
-SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
+SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
sal_Int8 eBreak, bDummy;
rStrm.ReadSChar( eBreak );
if( FMTBREAK_NOAUTO > nVersion )
rStrm.ReadSChar( bDummy );
- return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
+ return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() );
}
-sal_uInt16 SvxFmtBreakItem::GetValueCount() const
+sal_uInt16 SvxFormatBreakItem::GetValueCount() const
{
return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1
}
-// class SvxFmtKeepItem -------------------------------------------------
+// class SvxFormatKeepItem -------------------------------------------------
-SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
{
- return new SvxFmtKeepItem( *this );
+ return new SvxFormatKeepItem( *this );
}
-SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
@@ -3079,16 +3079,16 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
-SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsKeep;
rStrm.ReadSChar( bIsKeep );
- return new SvxFmtKeepItem( bIsKeep != 0, Which() );
+ return new SvxFormatKeepItem( bIsKeep != 0, Which() );
}
-bool SvxFmtKeepItem::GetPresentation
+bool SvxFormatKeepItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c78822484e39..6b846e74491f 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -565,7 +565,7 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper )
return sRet;
}
-OUString SvxNumberFormat::GetCharFmtName()const
+OUString SvxNumberFormat::GetCharFormatName()const
{
return sCharStyleName;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 758e2480ccda..452704b0d9ff 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
@@ -1208,19 +1208,19 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
-// class SvxFmtSplitItem -------------------------------------------------
-SvxFmtSplitItem::~SvxFmtSplitItem()
+// class SvxFormatSplitItem -------------------------------------------------
+SvxFormatSplitItem::~SvxFormatSplitItem()
{
}
-SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
{
- return new SvxFmtSplitItem( *this );
+ return new SvxFormatSplitItem( *this );
}
-SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
@@ -1228,16 +1228,16 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
-SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsSplit;
rStrm.ReadSChar( bIsSplit );
- return new SvxFmtSplitItem( bIsSplit != 0, Which() );
+ return new SvxFormatSplitItem( bIsSplit != 0, Which() );
}
-bool SvxFmtSplitItem::GetPresentation
+bool SvxFormatSplitItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index da7e9183e4ad..7de20d1eed9d 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -434,7 +434,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
}
-Size SvxFont::GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+Size SvxFont::GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx, const sal_Int32 nLen ) const
{
sal_Int32 nTmp = nLen;
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 3971ce8d8e74..325e787217dd 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -398,7 +398,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
{
- SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
if(pValues[nProp].hasValue())
@@ -461,16 +461,16 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
sal::static_int_cast< sal_uInt8 >(nVal);
}
break; // "Format/Option/CombineValue",
- case 23: rSwFlags.bAFmtDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
- case 24: rSwFlags.bAFmtDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
+ case 23: rSwFlags.bAFormatDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
+ case 24: rSwFlags.bAFormatDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
case 25: rParent.bAutoFmtByInput = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/Enable",
case 26: rSwFlags.bChgToEnEmDash = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeDash",
case 27: rSwFlags.bSetNumRule = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ApplyNumbering/Enable",
case 28: rSwFlags.bSetBorder = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToBorders",
case 29: rSwFlags.bCreateTable = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToTable",
case 30: rSwFlags.bReplaceStyles = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ReplaceStyle",
- case 31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
- case 32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
+ case 31: rSwFlags.bAFormatByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
+ case 32: rSwFlags.bAFormatByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
case 33: rSwFlags.bAutoCompleteWords = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Completion/Enable",
case 34:
{
@@ -554,7 +554,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
const Type& rType = cppu::UnoType<bool>::get();
sal_Bool bVal;
- SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
switch(nProp)
@@ -597,16 +597,16 @@ void SvxSwAutoCorrCfg::ImplCommit()
case 22:
pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin;
break; // "Format/Option/CombineValue",
- case 23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
- case 24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
+ case 23: bVal = rSwFlags.bAFormatDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
+ case 24: bVal = rSwFlags.bAFormatDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
case 25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
case 26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
case 27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
case 28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
case 29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
case 30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
- case 31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
- case 32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
+ case 31: bVal = rSwFlags.bAFormatByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
+ case 32: bVal = rSwFlags.bAFormatByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
case 33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
case 34:
pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 74645ed982c2..31f085c805c1 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -21,7 +21,7 @@
#include <tools/gen.hxx>
#include <vcl/keycodes.hxx>
-SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
+SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
: aBulletFont( OUString("StarSymbol"),
Size( 0, 14 ) )
{
@@ -36,10 +36,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
bChgToEnEmDash =
bChgWeightUnderl =
bSetINetAttr =
- bAFmtDelSpacesAtSttEnd =
- bAFmtDelSpacesBetweenLines =
- bAFmtByInpDelSpacesAtSttEnd =
- bAFmtByInpDelSpacesBetweenLines =
+ bAFormatDelSpacesAtSttEnd =
+ bAFormatDelSpacesBetweenLines =
+ bAFormatByInpDelSpacesAtSttEnd =
+ bAFormatByInpDelSpacesBetweenLines =
bDummy = true;
bReplaceStyles =
@@ -52,7 +52,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
bSetBorder =
bCreateTable =
bSetNumRule =
- bAFmtByInput =
+ bAFormatByInput =
bRightMargin =
bAutoCompleteWords =
bAutoCmpltCollectWords =
@@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
}
-SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags )
+SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
{
bAutoCorrect = rAFFlags.bAutoCorrect;
bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
@@ -92,7 +92,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
bChgEnumNum = rAFFlags.bChgEnumNum;
bDelEmptyNode = rAFFlags.bDelEmptyNode;
bSetNumRule = rAFFlags.bSetNumRule;
- bAFmtByInput = rAFFlags.bAFmtByInput;
+ bAFormatByInput = rAFFlags.bAFormatByInput;
bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
@@ -102,10 +102,10 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
bSetBorder = rAFFlags.bSetBorder;
bCreateTable = rAFFlags.bCreateTable;
bReplaceStyles = rAFFlags.bReplaceStyles;
- bAFmtDelSpacesAtSttEnd = rAFFlags.bAFmtDelSpacesAtSttEnd;
- bAFmtDelSpacesBetweenLines = rAFFlags.bAFmtDelSpacesBetweenLines;
- bAFmtByInpDelSpacesAtSttEnd = rAFFlags.bAFmtByInpDelSpacesAtSttEnd;
- bAFmtByInpDelSpacesBetweenLines = rAFFlags.bAFmtByInpDelSpacesBetweenLines;
+ bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd;
+ bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines;
+ bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
+ bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
bDummy = rAFFlags.bDummy;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 8f704bb192bf..b573ea1ebd5e 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -679,17 +679,17 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
EditFieldInfo aFldInfo( this, rField, nPara, nPos );
// The FldColor is preset with COL_LIGHTGRAY.
if ( rpFldColor )
- aFldInfo.SetFldColor( *rpFldColor );
+ aFldInfo.SetFieldColor( *rpFldColor );
aCalcFieldValueHdl.Call( &aFldInfo );
- if ( aFldInfo.GetTxtColor() )
+ if ( aFldInfo.GetTextColor() )
{
delete rpTxtColor;
- rpTxtColor = new Color( *aFldInfo.GetTxtColor() );
+ rpTxtColor = new Color( *aFldInfo.GetTextColor() );
}
delete rpFldColor;
- rpFldColor = aFldInfo.GetFldColor() ? new Color( *aFldInfo.GetFldColor() ) : 0;
+ rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0;
return aFldInfo.GetRepresentation();
}
@@ -1578,9 +1578,9 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ) );
- aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore;
+ aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore;
- long nBulletWidth = std::max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
+ long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
if ( nBulletWidth < aBulletSize.Width() ) // The Bullet creates its space
nBulletWidth = aBulletSize.Width();
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index fdfda0726f7f..67a574bac6e2 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_KEEP:
if( aPardMap.nSplit )
{
- pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit ));
+ pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit ));
}
break;
case RTF_KEEPN:
if( aPardMap.nKeep )
{
- pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep ));
+ pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep ));
}
break;
@@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
CalcValue();
nSz = sal_uInt16(nTokenValue);
}
- aLR.SetTxtFirstLineOfst( nSz );
+ aLR.SetTextFirstLineOfst( nSz );
pSet->Put( aLR );
}
break;
@@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
CalcValue();
nSz = sal_uInt16(nTokenValue);
}
- aLR.SetTxtLeft( nSz );
+ aLR.SetTextLeft( nSz );
pSet->Put( aLR );
}
break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 552c52a77b27..56ef7368e8fc 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser()
sBaseURL.clear();
// generate the correct WhichId table from the set WhichIds.
- BuildWhichTbl();
+ BuildWhichTable();
return SvRTFParser::CallParser();
}
@@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & )
{
}
-void SvxRTFParser::BuildWhichTbl()
+void SvxRTFParser::BuildWhichTable()
{
aWhichMap.clear();
aWhichMap.push_back( 0 );
@@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl()
// Building a Which-Map 'rWhichMap' from an array of
// 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'.
// The Which-Map is not going to be deleted.
- SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
- SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
+ SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
+ SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
}
const SfxItemSet& SvxRTFParser::GetRTFDefaults()
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 506c449d9bed..9e88ceb4a361 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
void SvxMSDffManager::StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
short nHdFtSection) const
{
sal_uInt16 nShpCnt = pShapeOrders->size();
@@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId,
void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject,
sal_uLong nTxBx,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
SdrObject* pObject) const
{
sal_uInt16 nShpCnt = pShapeOrders->size();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 42f3c2d0b531..4536cda3ad52 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 );
sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 );
aLRSpaceItem.SetLeft( nAbsLSpace );
- aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset );
+ aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset );
rSet.Put( aLRSpaceItem );
}
else
{
SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
aLRSpaceItem.SetLeft( 0 );
- aLRSpaceItem.SetTxtFirstLineOfstValue( 0 );
+ aLRSpaceItem.SetTextFirstLineOfstValue( 0 );
rSet.Put( aLRSpaceItem );
}
if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) )
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 1a90fb301e7c..e2fd887ad02e 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -96,8 +96,8 @@ public:
// the pointer is transferred to the possession of the ConfigItems!
void SetAutoCorrect( SvxAutoCorrect* );
- bool IsAutoFmtByInput() const { return bAutoFmtByInput; }
- void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
+ bool IsAutoFormatByInput() const { return bAutoFmtByInput; }
+ void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
bool IsSaveRelFile() const { return bFileRel; }
void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); }
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 65a1bf12cc81..7dee5d66e039 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -24,7 +24,7 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
/* [Description]
@@ -33,15 +33,15 @@
*/
#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+ inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
const sal_uInt16 nWhich );
- inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
- inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+ inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
+ inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -69,17 +69,17 @@ public:
};
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
const sal_uInt16 _nWhich ) :
SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
{}
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
SfxEnumItem( rBreak )
{}
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
- const SvxFmtBreakItem& rBreak )
+inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
+ const SvxFormatBreakItem& rBreak )
{
SetValue( rBreak.GetValue() );
return *this;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 1092311baeda..4646cf75b919 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -23,21 +23,21 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtKeepItem ------------------------------------------------
+// class SvxFormatKeepItem ------------------------------------------------
/* [Description]
This item describes a logical variable "keep paragraphs together?".
*/
-class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtKeepItem( const bool bKeep /*= false*/,
+ inline SvxFormatKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
- inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
+ inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -50,11 +50,11 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
SfxBoolItem( _nWhich, bKeep )
{}
-inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep )
+inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep )
{
SetValue( rKeep.GetValue() );
return *this;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 123264e9cd89..4e1b0796bbd6 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -36,7 +36,7 @@
0 coordinate for the first line indent:
UI UI LAYOUT UI/TEXT UI/TEXT (Where?)
- SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (What?)
+ SetTextLeft SetTxtFirst GetLeft GetTextLeft GetTxtFirst (What?)
500 -500 0 500 -500 (How much?)
500 0 500 500 0
500 +500 500 500 +500
@@ -115,16 +115,16 @@ public:
inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
// The UI/text interface:
- inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
- inline long GetTxtLeft() const { return nTxtLeft; }
+ inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
+ inline long GetTextLeft() const { return nTxtLeft; }
- inline void SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
- inline short GetTxtFirstLineOfst() const { return nFirstLineOfst; }
- inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
+ inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
+ inline short GetTextFirstLineOfst() const { return nFirstLineOfst; }
+ inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 )
{ nPropFirstLineOfst = nProp; }
- inline sal_uInt16 GetPropTxtFirstLineOfst() const
+ inline sal_uInt16 GetPropTextFirstLineOfst() const
{ return nPropFirstLineOfst; }
- inline void SetTxtFirstLineOfstValue( const short nValue )
+ inline void SetTextFirstLineOfstValue( const short nValue )
{ nFirstLineOfst = nValue; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
@@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
nRightMargin = (nR * nProp) / 100;
nPropRightMargin = nProp;
}
-inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
+inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF,
const sal_uInt16 nProp )
{
nFirstLineOfst = short((long(nF) * nProp ) / 100);
@@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
AdjustLeft();
}
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
{
if (0 == nL)
{
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1e9e623a8466..d3768a8237a1 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -172,7 +172,7 @@
#define MID_BACK_COLOR_TRANSPARENCY 10
#define MID_SHADING_VALUE 11
-//SvxFmtBreakItem
+//SvxFormatBreakItem
#define MID_BREAK_BEFORE 0
#define MID_BREAK_AFTER 1
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ae7b3150d72c..bcf8b29b054a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -71,7 +71,7 @@ public:
void SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
bool IsShowSymbol()const{return bShowSymbol;}
- bool IsTxtFmt() const
+ bool IsTextFormat() const
{
return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType &&
com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType &&
@@ -163,8 +163,8 @@ public:
void SetSuffix(const OUString& rSet) { sSuffix = rSet;}
const OUString& GetSuffix() const { return sSuffix;}
- void SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
- virtual OUString GetCharFmtName()const;
+ void SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
+ virtual OUString GetCharFormatName()const;
void SetBulletFont(const vcl::Font* pFont);
const vcl::Font* GetBulletFont() const {return pBulletFont;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 4b47caeb97ec..5a2dbe9f8cf9 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -524,14 +524,14 @@ public:
const SvxFieldItem& GetField() const { return rFldItem; }
- Color* GetTxtColor() const { return pTxtColor; }
- void SetTxtColor( const Color& rColor )
+ Color* GetTextColor() const { return pTxtColor; }
+ void SetTextColor( const Color& rColor )
{ delete pTxtColor; pTxtColor = new Color( rColor ); }
- Color* GetFldColor() const { return pFldColor; }
- void SetFldColor( const Color& rColor )
+ Color* GetFieldColor() const { return pFldColor; }
+ void SetFieldColor( const Color& rColor )
{ delete pFldColor; pFldColor = new Color( rColor ); }
- void ClearFldColor()
+ void ClearFieldColor()
{ delete pFldColor; pFldColor = 0; }
sal_Int32 GetPara() const { return nPara; }
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 66fa1a30d1ca..119a8dd3a4ba 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -57,10 +57,10 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
- bool IsCntntProtected() const { return bCntnt; }
+ bool IsContentProtected() const { return bCntnt; }
bool IsSizeProtected() const { return bSize; }
bool IsPosProtected() const { return bPos; }
- void SetCntntProtect( bool bNew ) { bCntnt = bNew; }
+ void SetContentProtect( bool bNew ) { bCntnt = bNew; }
void SetSizeProtect ( bool bNew ) { bSize = bNew; }
void SetPosProtect ( bool bNew ) { bPos = bNew; }
@@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
{
- bCntnt = rCpy.IsCntntProtected();
+ bCntnt = rCpy.IsContentProtected();
bSize = rCpy.IsSizeProtected();
bPos = rCpy.IsPosProtected();
return *this;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index f84ce3b348bc..c5c8b769d8b5 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -24,22 +24,22 @@
class SvXMLUnitConverter;
-// class SvxFmtSplitItem -------------------------------------------------
+// class SvxFormatSplitItem -------------------------------------------------
/* [Description]
This item describes a logical variable "split paragraph yes or no".
*/
-class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- virtual ~SvxFmtSplitItem();
+ virtual ~SvxFormatSplitItem();
- inline SvxFmtSplitItem( const bool bSplit /*= true*/,
+ inline SvxFormatSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );
- inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
+ inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -52,12 +52,12 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
SfxBoolItem( nWh, bSplit )
{}
-inline SvxFmtSplitItem& SvxFmtSplitItem::operator=(
- const SvxFmtSplitItem& rSplit )
+inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
+ const SvxFormatSplitItem& rSplit )
{
SetValue( rSplit.GetValue() );
return *this;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4438d42d835..18fb82a31315 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
OUString sShareAutoCorrFile, sUserAutoCorrFile;
- SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat Flags
+ SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags
// all languages in a table
boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable;
@@ -328,7 +328,7 @@ public:
// Query/Set the current settings of AutoCorrect
long GetFlags() const { return nFlags; }
- inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;}
+ inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;}
bool IsAutoCorrFlag( long nFlag ) const
{ return (nFlags & nFlag) != 0; }
void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 51a0c0dcdde6..c84df967ac0d 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -89,7 +89,7 @@ public:
Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt );
- Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+ Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 39290ec9f376..42098f663220 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
// Execute pard / plain
void RTFPardPlain( bool bPard, SfxItemSet** ppSet );
- void BuildWhichTbl();
+ void BuildWhichTable();
enum RTF_CharTypeDef
{
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 7bfcb353f3e5..5cf829d94ff8 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -59,7 +59,7 @@ public:
} // namespace editeng
// Class of options for AutoFormat
-struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
{
vcl::Font aBulletFont;
vcl::Font aByInputBulletFont;
@@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bChgUserColl : 1;
bool bChgEnumNum : 1;
- bool bAFmtByInput : 1;
+ bool bAFormatByInput : 1;
bool bDelEmptyNode : 1;
bool bSetNumRule : 1;
@@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bAutoCmpltAppendBlanc : 1;
bool bAutoCmpltShowAsTip : 1;
- bool bAFmtDelSpacesAtSttEnd : 1;
- bool bAFmtDelSpacesBetweenLines : 1;
- bool bAFmtByInpDelSpacesAtSttEnd : 1;
- bool bAFmtByInpDelSpacesBetweenLines : 1;
+ bool bAFormatDelSpacesAtSttEnd : 1;
+ bool bAFormatDelSpacesBetweenLines : 1;
+ bool bAFormatByInpDelSpacesAtSttEnd : 1;
+ bool bAFormatByInpDelSpacesBetweenLines : 1;
bool bAutoCmpltKeepList : 1;
@@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bDummy8 : 1
;
- SvxSwAutoFmtFlags();
- SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; }
- SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& );
+ SvxSwAutoFormatFlags();
+ SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
+ SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
};
#endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index fc54adeaba6b..a3572ca48f7b 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,7 @@ class Polygon;
namespace tools { class PolyPolygon; }
class FmFormModel;
class SdrModel;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
struct SvxMSDffBLIPInfo;
struct SvxMSDffShapeInfo;
@@ -695,12 +695,12 @@ public:
void StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrmFmt* pFly = 0,
+ SwFlyFrameFormat* pFly = 0,
short nHdFtSection = 0) const;
void ExchangeInShapeOrder(SdrObject* pOldObject,
sal_uLong nTxBx,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
SdrObject* pObject) const;
void RemoveFromShapeOrder( SdrObject* pObject ) const;
@@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder
{
sal_uLong nShapeId; ///< shape id used in PLCF SPA and in mso_fbtSp (FSP)
sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL)
- SwFlyFrmFmt* pFly; ///< format of frame that was inserted as a replacement
+ SwFlyFrameFormat* pFly; ///< format of frame that was inserted as a replacement
///< for a Sdr-Text object in Writer - needed for
///< chaining!
short nHdFtSection; ///< used by Writer to find out if linked frames are in
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bc553c013966..0127662ebcfb 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -593,9 +593,9 @@ public:
SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
/// Whether a merge table is present or not
- bool HasMergeFmtTbl() const;
+ bool HasMergeFormatTable() const;
/// Return the new format index for an old format index, if a merge table exists
- sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
+ sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const;
/** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32
entries merge table to ::std::map with old index key and new index key.
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b8705dc16ffc..eabdf18c6807 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -169,7 +169,7 @@ public:
// build a Which-Map 'rWhichMap' from an array of WhichIds
// 'pWhichIds'. It has the length 'nWhichIds'.
// The WhichMap is not deleted.
- static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+ static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
sal_uInt16 *pWhichIds,
sal_uInt16 nWhichIds );
};
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 64ed0d94e832..6b00c35b14fd 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,7 +28,7 @@
#include <svx/svxdllapi.h>
class PopupMenu;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
{
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index e8a9453f2da8..052ed8ffc6e7 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -24,11 +24,11 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
-struct SvxClipboardFmtItem_Impl;
+struct SvxClipboardFormatItem_Impl;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
{
- SvxClipboardFmtItem_Impl* pImpl;
+ SvxClipboardFormatItem_Impl* pImpl;
protected:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -36,9 +36,9 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SvxClipboardFmtItem( sal_uInt16 nId = 0 );
- SvxClipboardFmtItem( const SvxClipboardFmtItem& );
- virtual ~SvxClipboardFmtItem();
+ SvxClipboardFormatItem( sal_uInt16 nId = 0 );
+ SvxClipboardFormatItem( const SvxClipboardFormatItem& );
+ virtual ~SvxClipboardFormatItem();
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index a448aa120844..06c4af78bfbb 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -87,7 +87,7 @@ public:
void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
void SetMacroTable( const SvxMacroTableDtor& rTbl );
- const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; }
+ const SvxMacroTableDtor* GetMacroTable() const { return pMacroTable; }
void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9aeee8d1c8c1..68b8072ebfa0 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -48,23 +48,23 @@ public:
SvxOptionsGrid();
~SvxOptionsGrid();
- void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
- void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
- void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
- void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
- void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
- void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
+ void SetFieldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
+ void SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
+ void SetFieldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
+ void SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
+ void SetFieldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
+ void SetFieldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;}
void SetSynchronize( bool bSet ) {bSynchronize = bSet;}
void SetGridVisible( bool bSet ) {bGridVisible = bSet;}
void SetEqualGrid( bool bSet ) {bEqualGrid = bSet;}
- sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; }
- sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;}
- sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; }
- sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;}
- sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; }
- sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; }
+ sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; }
+ sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;}
+ sal_uInt32 GetFieldDrawY ( ) const { return nFldDrawY; }
+ sal_uInt32 GetFieldDivisionY() const { return nFldDivisionY;}
+ sal_uInt32 GetFieldSnapX( ) const { return nFldSnapX; }
+ sal_uInt32 GetFieldSnapY ( ) const { return nFldSnapY; }
bool GetUseGridSnap( ) const { return bUseGridsnap; }
bool GetSynchronize( ) const { return bSynchronize; }
bool GetGridVisible( ) const { return bGridVisible; }
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 32f6223c8976..f1c529ad2064 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -178,12 +178,12 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP
{
SvxGridItem* pItem = new SvxGridItem( nId );
- pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() );
- pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() );
- pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() );
- pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() );
- pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() );
- pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() );
+ pItem->SetFieldDrawX ( aGridOpt.GetFieldDrawX() );
+ pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() );
+ pItem->SetFieldDrawY ( aGridOpt.GetFieldDrawY() );
+ pItem->SetFieldDivisionY ( aGridOpt.GetFieldDivisionY() );
+ pItem->SetFieldSnapX ( aGridOpt.GetFieldSnapX() );
+ pItem->SetFieldSnapY ( aGridOpt.GetFieldSnapY() );
pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() );
pItem->SetSynchronize ( aGridOpt.GetSynchronize() );
pItem->SetGridVisible ( aGridOpt.GetGridVisible() );
@@ -483,22 +483,22 @@ ScViewCfg::ScViewCfg() :
switch(nProp)
{
case SCGRIDOPT_RESOLU_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( nIntVal );
break;
case SCGRIDOPT_RESOLU_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( nIntVal );
break;
case SCGRIDOPT_SUBDIV_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionX( nIntVal );
break;
case SCGRIDOPT_SUBDIV_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionY( nIntVal );
break;
case SCGRIDOPT_OPTION_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapX( nIntVal );
break;
case SCGRIDOPT_OPTION_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapY( nIntVal );
break;
case SCGRIDOPT_SNAPTOGRID:
aGrid.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
@@ -624,22 +624,22 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl)
switch(nProp)
{
case SCGRIDOPT_RESOLU_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawX();
break;
case SCGRIDOPT_RESOLU_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawY();
break;
case SCGRIDOPT_SUBDIV_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionX();
break;
case SCGRIDOPT_SUBDIV_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionY();
break;
case SCGRIDOPT_OPTION_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapX();
break;
case SCGRIDOPT_OPTION_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY();
break;
case SCGRIDOPT_SNAPTOGRID:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f2b7b1bbffbb..c135b531975a 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
svtools::ColorConfigEntry eEntry =
INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
- pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor );
+ pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor );
}
else
{
diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx
index 973d63f1c907..171e4c3980ee 100644
--- a/sc/source/ui/app/typemap.cxx
+++ b/sc/source/ui/app/typemap.cxx
@@ -111,7 +111,7 @@
#define aSfxUInt32Item_Impl sc_source_ui_appl_typemap_aSfxUInt32Item_Impl
#define aSfxVoidItem_Impl sc_source_ui_appl_typemap_aSfxVoidItem_Impl
#define aSvxCharReliefItem_Impl sc_source_ui_appl_typemap_aSvxCharReliefItem_Impl
-#define aSvxClipboardFmtItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFmtItem_Impl
+#define aSvxClipboardFormatItem_Impl sc_source_ui_appl_typemap_aSvxClipboardFormatItem_Impl
#define aSvxColorItem_Impl sc_source_ui_appl_typemap_aSvxColorItem_Impl
#define aSvxContourItem_Impl sc_source_ui_appl_typemap_aSvxContourItem_Impl
#define aSvxCrossedOutItem_Impl sc_source_ui_appl_typemap_aSvxCrossedOutItem_Impl
@@ -136,7 +136,7 @@
#undef aSfxUInt32Item_Impl
#undef aSfxVoidItem_Impl
#undef aSvxCharReliefItem_Impl
-#undef aSvxClipboardFmtItem_Impl
+#undef aSvxClipboardFormatItem_Impl
#undef aSvxColorItem_Impl
#undef aSvxContourItem_Impl
#undef aSvxCrossedOutItem_Impl
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index ce261fb3aa8f..ae5bb94123e1 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -524,7 +524,7 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet )
case SID_CLIPBOARD_FORMAT_ITEMS:
if ( bPastePossible )
{
- SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+ SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
@@ -913,8 +913,8 @@ void ScDrawTextObjectBar::ExecuteAttr( SfxRequest &rReq )
SfxItemSet aAttr( GetPool(), EE_PARA_LRSPACE, EE_PARA_LRSPACE );
nId = EE_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
- rItem.GetRight(), rItem.GetTxtLeft(),
- rItem.GetTxtFirstLineOfst(), nId );
+ rItem.GetRight(), rItem.GetTextLeft(),
+ rItem.GetTextFirstLineOfst(), nId );
aAttr.Put( aLRSpaceItem );
pView->SetAttributes( aAttr );
}
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index a2e6a82ebde9..1c03ba30758d 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -86,8 +86,8 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
// aNewAttr.Put( SvxParaDlgLimitsItem( 567 * 50, 5670) );
aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
- aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
- aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) );
+ aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+ aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
diff --git a/sc/source/ui/inc/cellsh.hxx b/sc/source/ui/inc/cellsh.hxx
index 3beb0784296a..6e03ef1e5d0c 100644
--- a/sc/source/ui/inc/cellsh.hxx
+++ b/sc/source/ui/inc/cellsh.hxx
@@ -29,7 +29,7 @@
#include "formatsh.hxx"
#include "address.hxx"
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
class TransferableDataHelper;
class TransferableClipboardListener;
class AbstractScLinkedAreaDlg;
@@ -52,7 +52,7 @@ private:
CellShell_Impl* pImpl;
bool bPastePossible;
- void GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats );
+ void GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats );
void ExecuteExternalSource(
const OUString& _rFile, const OUString& _rFilter, const OUString& _rOptions,
const OUString& _rSource, sal_uLong _nRefresh, SfxRequest& _rRequest );
diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx
index 728d17c5f8fd..a56c36f8293f 100644
--- a/sc/source/ui/unoobj/confuno.cxx
+++ b/sc/source/ui/unoobj/confuno.cxx
@@ -306,13 +306,13 @@ void SAL_CALL ScDocumentConfiguration::setPropertyValue(
else if ( aPropertyName == SC_UNO_RASTERVIS )
aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else if ( aPropertyName == SC_UNO_RASTERRESX )
- aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+ aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
else if ( aPropertyName == SC_UNO_RASTERRESY )
- aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+ aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
else if ( aPropertyName == SC_UNO_RASTERSUBX )
- aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+ aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
else if ( aPropertyName == SC_UNO_RASTERSUBY )
- aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
+ aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( aValue ) ) );
else if ( aPropertyName == SC_UNO_RASTERSYNC )
aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( aValue ) );
else
@@ -442,13 +442,13 @@ uno::Any SAL_CALL ScDocumentConfiguration::getPropertyValue( const OUString& aPr
else if ( aPropertyName == SC_UNO_RASTERVIS )
ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetGridVisible() );
else if ( aPropertyName == SC_UNO_RASTERRESX )
- aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+ aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
else if ( aPropertyName == SC_UNO_RASTERRESY )
- aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+ aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
else if ( aPropertyName == SC_UNO_RASTERSUBX )
- aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+ aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
else if ( aPropertyName == SC_UNO_RASTERSUBY )
- aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+ aRet <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
else if ( aPropertyName == SC_UNO_RASTERSYNC )
ScUnoHelpFunctions::SetBoolInAny( aRet, aGridOpt.GetSynchronize() );
else
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index b8627ba945c1..aba13687fb3f 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -365,7 +365,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet )
}
}
-static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHelper& rDataHelper,
+static bool lcl_TestFormat( SvxClipboardFormatItem& rFormats, const TransferableDataHelper& rDataHelper,
SotClipboardFormatId nFormatId )
{
if ( rDataHelper.HasFormat( nFormatId ) )
@@ -399,7 +399,7 @@ static bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDat
return false;
}
-void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats )
+void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFormatItem& rFormats )
{
vcl::Window* pWin = GetViewData()->GetActiveWin();
bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
@@ -569,7 +569,7 @@ void ScCellShell::GetClipState( SfxItemSet& rSet )
}
else if ( rSet.GetItemState( SID_CLIPBOARD_FORMAT_ITEMS ) != SfxItemState::UNKNOWN )
{
- SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+ SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
GetPossibleClipboardFormats( aFormats );
rSet.Put( aFormats );
}
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 1b81de7c4eb7..6fd0e5074493 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1564,7 +1564,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
bool bDraw = ( ScDrawTransferObj::GetOwnClipboard( pWin ) != NULL );
- SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+ SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
GetPossibleClipboardFormats( aFormats );
sal_uInt16 nFormatCount = aFormats.Count();
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 94b89305b738..2c258c6e7662 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -612,13 +612,13 @@ void ScDrawView::UpdateUserViewOptions()
SetSnapEnabled( rGrid.GetUseGridSnap() );
SetGridSnap( rGrid.GetUseGridSnap() );
- Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 );
- Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 );
+ Fraction aFractX( rGrid.GetFieldDrawX(), rGrid.GetFieldDivisionX() + 1 );
+ Fraction aFractY( rGrid.GetFieldDrawY(), rGrid.GetFieldDivisionY() + 1 );
SetSnapGridWidth( aFractX, aFractY );
- SetGridCoarse( Size( rGrid.GetFldDrawX(), rGrid.GetFldDrawY() ) );
- SetGridFine( Size( rGrid.GetFldDrawX() / (rGrid.GetFldDivisionX() + 1),
- rGrid.GetFldDrawY() / (rGrid.GetFldDivisionY() + 1) ) );
+ SetGridCoarse( Size( rGrid.GetFieldDrawX(), rGrid.GetFieldDrawY() ) );
+ SetGridFine( Size( rGrid.GetFieldDrawX() / (rGrid.GetFieldDivisionX() + 1),
+ rGrid.GetFieldDrawY() / (rGrid.GetFieldDivisionY() + 1) ) );
}
}
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 763157ff21bf..ea1a91265caa 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -801,7 +801,7 @@ void ScEditShell::GetClipState( SfxItemSet& rSet )
case SID_CLIPBOARD_FORMAT_ITEMS:
if( bPastePossible )
{
- SvxClipboardFmtItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
+ SvxClipboardFormatItem aFormats( SID_CLIPBOARD_FORMAT_ITEMS );
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard( pViewData->GetActiveWin() ) );
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index a2872ba3ca5a..22d46dcd7f05 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2722,13 +2722,13 @@ void ScViewData::WriteUserDataSequence(uno::Sequence <beans::PropertyValue>& rSe
pSettings[SC_RASTERVIS].Name = SC_UNO_RASTERVIS;
ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERVIS].Value, aGridOpt.GetGridVisible() );
pSettings[SC_RASTERRESX].Name = SC_UNO_RASTERRESX;
- pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawX() );
+ pSettings[SC_RASTERRESX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawX() );
pSettings[SC_RASTERRESY].Name = SC_UNO_RASTERRESY;
- pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDrawY() );
+ pSettings[SC_RASTERRESY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDrawY() );
pSettings[SC_RASTERSUBX].Name = SC_UNO_RASTERSUBX;
- pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionX() );
+ pSettings[SC_RASTERSUBX].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionX() );
pSettings[SC_RASTERSUBY].Name = SC_UNO_RASTERSUBY;
- pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFldDivisionY() );
+ pSettings[SC_RASTERSUBY].Value <<= static_cast<sal_Int32> ( aGridOpt.GetFieldDivisionY() );
pSettings[SC_RASTERSYNC].Name = SC_UNO_RASTERSYNC;
ScUnoHelpFunctions::SetBoolInAny( pSettings[SC_RASTERSYNC].Value, aGridOpt.GetSynchronize() );
}
@@ -2878,13 +2878,13 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue>
else if ( sName == SC_UNO_RASTERVIS )
aGridOpt.SetGridVisible( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
else if ( sName == SC_UNO_RASTERRESX )
- aGridOpt.SetFldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+ aGridOpt.SetFieldDrawX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
else if ( sName == SC_UNO_RASTERRESY )
- aGridOpt.SetFldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+ aGridOpt.SetFieldDrawY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
else if ( sName == SC_UNO_RASTERSUBX )
- aGridOpt.SetFldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+ aGridOpt.SetFieldDivisionX( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
else if ( sName == SC_UNO_RASTERSUBY )
- aGridOpt.SetFldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
+ aGridOpt.SetFieldDivisionY( static_cast <sal_uInt32> ( ScUnoHelpFunctions::GetInt32FromAny( rSettings[i].Value ) ) );
else if ( sName == SC_UNO_RASTERSYNC )
aGridOpt.SetSynchronize( ScUnoHelpFunctions::GetBoolFromAny( rSettings[i].Value ) );
pOptions->SetGridOptions(aGridOpt);
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 2b26fda54c1e..b9b4558adf4f 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -356,7 +356,7 @@ void SdDrawDocument::CreateLayoutTemplates()
pISet->Put(XFillStyleItem(drawing::FillStyle_NONE));
SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
- aLRSpaceItem.SetTxtFirstLineOfst(600); // Indentation of first line: 6mm; right: 0
+ aLRSpaceItem.SetTextFirstLineOfst(600); // Indentation of first line: 6mm; right: 0
pISet->Put(aLRSpaceItem);
// Title
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 3c8e33b0958a..5a8de34029fe 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -2164,7 +2164,7 @@ SdrObject* convertPresentationObjectImpl(SdPage& rPage, SdrObject* pSourceObj, P
const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>( aSet.Get(EE_PARA_LRSPACE) );
SvxLRSpaceItem aNewLRItem(rLRItem);
- aNewLRItem.SetTxtLeft(0);
+ aNewLRItem.SetTextLeft(0);
aSet.Put(aNewLRItem);
pNewObj->SetMergedItemSet(aSet);
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 944c77ebb2d3..f4eee3948da8 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, bool
rSubtitleSet.Put( SdrTextVertAdjustItem( SDRTEXTVERTADJUST_CENTER ) );
// #i16874# enable kerning by default but only for new documents
rSubtitleSet.Put( SvxAutoKernItem( true, EE_CHAR_PAIRKERNING ) );
- aSvxLRSpaceItem.SetTxtLeft(0);
+ aSvxLRSpaceItem.SetTextLeft(0);
rSubtitleSet.Put(aSvxLRSpaceItem);
vcl::Font aTmpFont( GetBulletFont() );
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 223f4c39e41d..a3b018cddec7 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -576,11 +576,11 @@ void SdStyleSheet::AdjustToFontHeight(SfxItemSet& rSet, bool bOnlyMissingItems)
if (rSet.GetItemState(EE_PARA_LRSPACE) != SfxItemState::SET || !bOnlyMissingItems)
{
const SvxLRSpaceItem& rLRItem = static_cast<const SvxLRSpaceItem&>(pCurSet->Get(EE_PARA_LRSPACE));
- double fIndentFraction = double(rLRItem.GetTxtLeft()) / nOldHeight;
+ double fIndentFraction = double(rLRItem.GetTextLeft()) / nOldHeight;
SvxLRSpaceItem aNewLRItem(rLRItem);
- aNewLRItem.SetTxtLeft(fIndentFraction * nNewHeight);
- double fFirstIndentFraction = double(rLRItem.GetTxtFirstLineOfst()) / nOldHeight;
- aNewLRItem.SetTxtFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
+ aNewLRItem.SetTextLeft(fIndentFraction * nNewHeight);
+ double fFirstIndentFraction = double(rLRItem.GetTextFirstLineOfst()) / nOldHeight;
+ aNewLRItem.SetTextFirstLineOfst((short)(fFirstIndentFraction * nNewHeight));
rSet.Put(aNewLRItem);
}
diff --git a/sd/source/filter/xml/sdtransform.cxx b/sd/source/filter/xml/sdtransform.cxx
index fa6dd6c3a4cb..46a986dee476 100644
--- a/sd/source/filter/xml/sdtransform.cxx
+++ b/sd/source/filter/xml/sdtransform.cxx
@@ -299,10 +299,10 @@ bool SdTransformOOo2xDocument::transformItemSet( SfxItemSet& rSet, bool bNumberi
if( bNumbering )
{
SvxLRSpaceItem aItem( *static_cast<const SvxLRSpaceItem*>(rSet.GetItem( EE_PARA_LRSPACE )) );
- if( (aItem.GetLeft() != 0) || (aItem.GetTxtFirstLineOfst() != 0) )
+ if( (aItem.GetLeft() != 0) || (aItem.GetTextFirstLineOfst() != 0) )
{
aItem.SetLeftValue( 0 );
- aItem.SetTxtFirstLineOfst( 0 );
+ aItem.SetTextFirstLineOfst( 0 );
rSet.Put( aItem );
bRet = true;
}
diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx
index f16a6af69c9e..4e8ef7296313 100644
--- a/sd/source/ui/app/optsitem.cxx
+++ b/sd/source/ui/app/optsitem.cxx
@@ -992,12 +992,12 @@ void SdOptionsGrid::SetDefaults()
{
const sal_uInt32 nVal = 1000;
- SetFldDivisionX( nVal );
- SetFldDivisionY( nVal );
- SetFldDrawX( nVal );
- SetFldDrawY( nVal );
- SetFldSnapX( nVal );
- SetFldSnapY( nVal );
+ SetFieldDivisionX( nVal );
+ SetFieldDivisionY( nVal );
+ SetFieldDrawX( nVal );
+ SetFieldDrawY( nVal );
+ SetFieldSnapX( nVal );
+ SetFieldSnapY( nVal );
SetUseGridSnap( false );
SetSynchronize( true );
SetGridVisible( false );
@@ -1006,12 +1006,12 @@ void SdOptionsGrid::SetDefaults()
bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const
{
- return( GetFldDrawX() == rOpt.GetFldDrawX() &&
- GetFldDivisionX() == rOpt.GetFldDivisionX() &&
- GetFldDrawY() == rOpt.GetFldDrawY() &&
- GetFldDivisionY() == rOpt.GetFldDivisionY() &&
- GetFldSnapX() == rOpt.GetFldSnapX() &&
- GetFldSnapY() == rOpt.GetFldSnapY() &&
+ return( GetFieldDrawX() == rOpt.GetFieldDrawX() &&
+ GetFieldDivisionX() == rOpt.GetFieldDivisionX() &&
+ GetFieldDrawY() == rOpt.GetFieldDrawY() &&
+ GetFieldDivisionY() == rOpt.GetFieldDivisionY() &&
+ GetFieldSnapX() == rOpt.GetFieldSnapX() &&
+ GetFieldSnapY() == rOpt.GetFieldSnapY() &&
IsUseGridSnap() == rOpt.IsUseGridSnap() &&
IsSynchronize() == rOpt.IsSynchronize() &&
IsGridVisible() == rOpt.IsGridVisible() &&
@@ -1060,23 +1060,23 @@ void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount )
bool SdOptionsGrid::ReadData( const Any* pValues )
{
- if( pValues[0].hasValue() ) SetFldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
- if( pValues[1].hasValue() ) SetFldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
+ if( pValues[0].hasValue() ) SetFieldDrawX( *static_cast<sal_Int32 const *>(pValues[ 0 ].getValue()) );
+ if( pValues[1].hasValue() ) SetFieldDrawY( *static_cast<sal_Int32 const *>(pValues[ 1 ].getValue()) );
if( pValues[2].hasValue() )
{
const sal_uInt32 nDivX = FRound( *static_cast<double const *>(pValues[ 2 ].getValue()) );
- SetFldDivisionX( SvxOptionsGrid::GetFldDrawX() / ( nDivX + 1 ) );
+ SetFieldDivisionX( SvxOptionsGrid::GetFieldDrawX() / ( nDivX + 1 ) );
}
if( pValues[3].hasValue() )
{
const sal_uInt32 nDivY = FRound( *static_cast<double const *>(pValues[ 3 ].getValue()) );
- SetFldDivisionY( SvxOptionsGrid::GetFldDrawY() / ( nDivY + 1 ) );
+ SetFieldDivisionY( SvxOptionsGrid::GetFieldDrawY() / ( nDivY + 1 ) );
}
- if( pValues[4].hasValue() ) SetFldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
- if( pValues[5].hasValue() ) SetFldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
+ if( pValues[4].hasValue() ) SetFieldSnapX( *static_cast<sal_Int32 const *>(pValues[ 4 ].getValue()) );
+ if( pValues[5].hasValue() ) SetFieldSnapY( *static_cast<sal_Int32 const *>(pValues[ 5 ].getValue()) );
if( pValues[6].hasValue() ) SetUseGridSnap( *static_cast<sal_Bool const *>(pValues[ 6 ].getValue()) );
if( pValues[7].hasValue() ) SetSynchronize( *static_cast<sal_Bool const *>(pValues[ 7 ].getValue()) );
if( pValues[8].hasValue() ) SetGridVisible( *static_cast<sal_Bool const *>(pValues[ 8 ].getValue()) );
@@ -1087,12 +1087,12 @@ bool SdOptionsGrid::ReadData( const Any* pValues )
bool SdOptionsGrid::WriteData( Any* pValues ) const
{
- pValues[ 0 ] <<= (sal_Int32) GetFldDrawX();
- pValues[ 1 ] <<= (sal_Int32) GetFldDrawY();
- pValues[ 2 ] <<= ( GetFldDivisionX() ? ( (double) GetFldDrawX() / GetFldDivisionX() - 1.0 ) : (double) 0 );
- pValues[ 3 ] <<= ( GetFldDivisionY() ? ( (double) GetFldDrawY() / GetFldDivisionY() - 1.0 ) : (double) 0 );
- pValues[ 4 ] <<= (sal_Int32) GetFldSnapX();
- pValues[ 5 ] <<= (sal_Int32) GetFldSnapY();
+ pValues[ 0 ] <<= (sal_Int32) GetFieldDrawX();
+ pValues[ 1 ] <<= (sal_Int32) GetFieldDrawY();
+ pValues[ 2 ] <<= ( GetFieldDivisionX() ? ( (double) GetFieldDrawX() / GetFieldDivisionX() - 1.0 ) : (double) 0 );
+ pValues[ 3 ] <<= ( GetFieldDivisionY() ? ( (double) GetFieldDrawY() / GetFieldDivisionY() - 1.0 ) : (double) 0 );
+ pValues[ 4 ] <<= (sal_Int32) GetFieldSnapX();
+ pValues[ 5 ] <<= (sal_Int32) GetFieldSnapY();
pValues[ 6 ] <<= IsUseGridSnap();
pValues[ 7 ] <<= IsSynchronize();
pValues[ 8 ] <<= IsGridVisible();
@@ -1115,23 +1115,23 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
if( pView )
{
- SetFldDrawX( pView->GetGridCoarse().Width() );
- SetFldDrawY( pView->GetGridCoarse().Height() );
- SetFldDivisionX( pView->GetGridFine().Width() ? ( GetFldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
- SetFldDivisionY( pView->GetGridFine().Height() ? ( GetFldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
- SetFldSnapX( long(pView->GetSnapGridWidthX()) );
- SetFldSnapY( long(pView->GetSnapGridWidthY()) );
+ SetFieldDrawX( pView->GetGridCoarse().Width() );
+ SetFieldDrawY( pView->GetGridCoarse().Height() );
+ SetFieldDivisionX( pView->GetGridFine().Width() ? ( GetFieldDrawX() / pView->GetGridFine().Width() - 1 ) : 0 );
+ SetFieldDivisionY( pView->GetGridFine().Height() ? ( GetFieldDrawY() / pView->GetGridFine().Height() - 1 ) : 0 );
+ SetFieldSnapX( long(pView->GetSnapGridWidthX()) );
+ SetFieldSnapY( long(pView->GetSnapGridWidthY()) );
SetUseGridSnap( pView->IsGridSnap() );
SetGridVisible( pView->IsGridVisible() );
}
else
{
- SetFldDrawX( pOpts->GetFldDrawX() );
- SetFldDrawY( pOpts->GetFldDrawY() );
- SetFldDivisionX( pOpts->GetFldDivisionX() ? ( pOpts->GetFldDrawX() / pOpts->GetFldDivisionX() - 1 ) : 0 );
- SetFldDivisionY( pOpts->GetFldDivisionY() ? ( pOpts->GetFldDrawY() / pOpts->GetFldDivisionY() - 1 ) : 0 );
- SetFldSnapX( pOpts->GetFldSnapX() );
- SetFldSnapY( pOpts->GetFldSnapY() );
+ SetFieldDrawX( pOpts->GetFieldDrawX() );
+ SetFieldDrawY( pOpts->GetFieldDrawY() );
+ SetFieldDivisionX( pOpts->GetFieldDivisionX() ? ( pOpts->GetFieldDrawX() / pOpts->GetFieldDivisionX() - 1 ) : 0 );
+ SetFieldDivisionY( pOpts->GetFieldDivisionY() ? ( pOpts->GetFieldDrawY() / pOpts->GetFieldDivisionY() - 1 ) : 0 );
+ SetFieldSnapX( pOpts->GetFieldSnapX() );
+ SetFieldSnapY( pOpts->GetFieldSnapY() );
SetUseGridSnap( pOpts->IsUseGridSnap() );
SetGridVisible( pOpts->IsGridVisible() );
}
@@ -1139,12 +1139,12 @@ SdOptionsGridItem::SdOptionsGridItem( sal_uInt16 _nWhich, SdOptions* pOpts, ::sd
void SdOptionsGridItem::SetOptions( SdOptions* pOpts ) const
{
- pOpts->SetFldDrawX( GetFldDrawX() );
- pOpts->SetFldDivisionX( GetFldDrawX() / ( GetFldDivisionX() + 1 ) );
- pOpts->SetFldDrawY( GetFldDrawY() );
- pOpts->SetFldDivisionY( GetFldDrawY() / ( GetFldDivisionY() + 1 ) );
- pOpts->SetFldSnapX( GetFldSnapX() );
- pOpts->SetFldSnapY( GetFldSnapY() );
+ pOpts->SetFieldDrawX( GetFieldDrawX() );
+ pOpts->SetFieldDivisionX( GetFieldDrawX() / ( GetFieldDivisionX() + 1 ) );
+ pOpts->SetFieldDrawY( GetFieldDrawY() );
+ pOpts->SetFieldDivisionY( GetFieldDrawY() / ( GetFieldDivisionY() + 1 ) );
+ pOpts->SetFieldSnapX( GetFieldSnapX() );
+ pOpts->SetFieldSnapY( GetFieldSnapY() );
pOpts->SetUseGridSnap( GetUseGridSnap() );
pOpts->SetSynchronize( GetSynchronize() );
pOpts->SetGridVisible( GetGridVisible() );
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index a817f5ed2767..da621f689b55 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -334,11 +334,11 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, pInfo)
svtools::ColorConfig aConfig;
svtools::ColorConfigEntry eEntry =
INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
- pInfo->SetTxtColor( aConfig.GetColorValue(eEntry).nColor );
+ pInfo->SetTextColor( aConfig.GetColorValue(eEntry).nColor );
}
else if ( dynamic_cast< const SdrMeasureField* >(pField))
{
- pInfo->ClearFldColor();
+ pInfo->ClearFieldColor();
}
else
{
diff --git a/sd/source/ui/func/fuparagr.cxx b/sd/source/ui/func/fuparagr.cxx
index 7d1393ac2108..fc4031d03d8b 100644
--- a/sd/source/ui/func/fuparagr.cxx
+++ b/sd/source/ui/func/fuparagr.cxx
@@ -78,7 +78,7 @@ void FuParagraph::DoExecute( SfxRequest& rReq )
aNewAttr.Put( aEditAttr );
// left border is offset
- const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTxtLeft();
+ const long nOff = static_cast<const SvxLRSpaceItem&>(aNewAttr.Get( EE_PARA_LRSPACE ) ).GetTextLeft();
// conversion since TabulatorTabPage always uses Twips!
SfxInt32Item aOff( SID_ATTR_TABSTOP_OFFSET, nOff );
aNewAttr.Put( aOff );
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 73f17fb8577e..405e7af90876 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -42,7 +42,7 @@ class TransferableDataHelper;
class TransferableClipboardListener;
class AbstractSvxNameDialog;
class SdrLayer;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
struct ESelection;
namespace sd {
@@ -431,7 +431,7 @@ private:
content that are supported both by that content and by the
DrawViewShell.
*/
- ::std::unique_ptr<SvxClipboardFmtItem> mpCurrentClipboardFormats;
+ ::std::unique_ptr<SvxClipboardFormatItem> mpCurrentClipboardFormats;
/** On some occasions it is necessary to make SwitchPage calls
asynchronously.
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index f2bb07312507..4e13f9725fe0 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -456,23 +456,23 @@ public:
void SetDefaults();
bool operator==( const SdOptionsGrid& rOpt ) const;
- sal_uInt32 GetFldDrawX() const { Init(); return SvxOptionsGrid::GetFldDrawX(); }
- sal_uInt32 GetFldDivisionX() const { Init(); return SvxOptionsGrid::GetFldDivisionX(); }
- sal_uInt32 GetFldDrawY() const { Init(); return SvxOptionsGrid::GetFldDrawY(); }
- sal_uInt32 GetFldDivisionY() const { Init(); return SvxOptionsGrid::GetFldDivisionY(); }
- sal_uInt32 GetFldSnapX() const { Init(); return SvxOptionsGrid::GetFldSnapX(); }
- sal_uInt32 GetFldSnapY() const { Init(); return SvxOptionsGrid::GetFldSnapY(); }
+ sal_uInt32 GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); }
+ sal_uInt32 GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); }
+ sal_uInt32 GetFieldDrawY() const { Init(); return SvxOptionsGrid::GetFieldDrawY(); }
+ sal_uInt32 GetFieldDivisionY() const { Init(); return SvxOptionsGrid::GetFieldDivisionY(); }
+ sal_uInt32 GetFieldSnapX() const { Init(); return SvxOptionsGrid::GetFieldSnapX(); }
+ sal_uInt32 GetFieldSnapY() const { Init(); return SvxOptionsGrid::GetFieldSnapY(); }
bool IsUseGridSnap() const { Init(); return SvxOptionsGrid::GetUseGridSnap(); }
bool IsSynchronize() const { Init(); return SvxOptionsGrid::GetSynchronize(); }
bool IsGridVisible() const { Init(); return SvxOptionsGrid::GetGridVisible(); }
bool IsEqualGrid() const { Init(); return SvxOptionsGrid::GetEqualGrid(); }
- void SetFldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawX( nSet ); } }
- void SetFldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionX( nSet ); } }
- void SetFldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDrawY( nSet ); } }
- void SetFldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFldDivisionY( nSet ); } }
- void SetFldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapX( nSet ); } }
- void SetFldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFldSnapY( nSet ); } }
+ void SetFieldDrawX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawX( nSet ); } }
+ void SetFieldDivisionX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionX( nSet ); } }
+ void SetFieldDrawY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDrawY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDrawY( nSet ); } }
+ void SetFieldDivisionY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldDivisionY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldDivisionY( nSet ); } }
+ void SetFieldSnapX( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapX() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapX( nSet ); } }
+ void SetFieldSnapY( sal_uInt32 nSet ) { if( nSet != SvxOptionsGrid::GetFieldSnapY() ) { OptionsChanged(); SvxOptionsGrid::SetFieldSnapY( nSet ); } }
void SetUseGridSnap( bool bSet ) { if( bSet != SvxOptionsGrid::GetUseGridSnap() ) { OptionsChanged(); SvxOptionsGrid::SetUseGridSnap( bSet ); } }
void SetSynchronize( bool bSet ) { if( bSet != SvxOptionsGrid::GetSynchronize() ) { OptionsChanged(); SvxOptionsGrid::SetSynchronize( bSet ); } }
void SetGridVisible( bool bSet ) { if( bSet != SvxOptionsGrid::GetGridVisible() ) { OptionsChanged(); SvxOptionsGrid::SetGridVisible( bSet ); } }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index ac9ecbca1f6a..22ca54640576 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -782,8 +782,8 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
nId = EE_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rItem.GetLeft(),
- rItem.GetRight(), rItem.GetTxtLeft(),
- rItem.GetTxtFirstLineOfst(), nId );
+ rItem.GetRight(), rItem.GetTextLeft(),
+ rItem.GetTextFirstLineOfst(), nId );
const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>(aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
const SvxLRSpaceItem& rOrigLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ));
@@ -801,28 +801,28 @@ void DrawViewShell::ExecRuler(SfxRequest& rReq)
// become negative - EditEngine really does not
// like that.
const short nAbsLSpace=aFormat.GetAbsLSpace();
- const long nTxtLeft=rItem.GetTxtLeft();
+ const long nTxtLeft=rItem.GetTextLeft();
const long nLeftIndent=std::max(0L,nTxtLeft - nAbsLSpace);
- aLRSpaceItem.SetTxtLeft(nLeftIndent);
+ aLRSpaceItem.SetTextLeft(nLeftIndent);
// control for clipped left indent - remainder
// reduces number format first line indent
aFormat.SetAbsLSpace(nTxtLeft - nLeftIndent);
// negative first line indent goes to the number
// format, positive to the lrSpace item
- if( rItem.GetTxtFirstLineOfst() < 0 )
+ if( rItem.GetTextFirstLineOfst() < 0 )
{
aFormat.SetFirstLineOffset(
- rItem.GetTxtFirstLineOfst()
- - rOrigLRSpaceItem.GetTxtFirstLineOfst()
+ rItem.GetTextFirstLineOfst()
+ - rOrigLRSpaceItem.GetTextFirstLineOfst()
+ aFormat.GetCharTextDistance());
- aLRSpaceItem.SetTxtFirstLineOfst(0);
+ aLRSpaceItem.SetTextFirstLineOfst(0);
}
else
{
aFormat.SetFirstLineOffset(0);
- aLRSpaceItem.SetTxtFirstLineOfst(
- rItem.GetTxtFirstLineOfst()
+ aLRSpaceItem.SetTextFirstLineOfst(
+ rItem.GetTextFirstLineOfst()
- aFormat.GetFirstLineOffset()
+ aFormat.GetCharTextDistance());
}
@@ -916,8 +916,8 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
const SvxLRSpaceItem& rLRSpaceItem = static_cast<const SvxLRSpaceItem&>( aEditAttr.Get( EE_PARA_LRSPACE ) );
sal_uInt16 nId = SID_ATTR_PARA_LRSPACE;
SvxLRSpaceItem aLRSpaceItem( rLRSpaceItem.GetLeft(),
- rLRSpaceItem.GetRight(), rLRSpaceItem.GetTxtLeft(),
- rLRSpaceItem.GetTxtFirstLineOfst(), nId );
+ rLRSpaceItem.GetRight(), rLRSpaceItem.GetTextLeft(),
+ rLRSpaceItem.GetTextFirstLineOfst(), nId );
const sal_Int16 nOutlineLevel = static_cast<const SfxInt16Item&>( aEditAttr.Get( EE_PARA_OUTLLEVEL )).GetValue();
const SvxNumBulletItem& rNumBulletItem = static_cast<const SvxNumBulletItem&>( aEditAttr.Get( EE_PARA_NUMBULLET ) );
@@ -926,9 +926,9 @@ void DrawViewShell::GetRulerState(SfxItemSet& rSet)
rNumBulletItem.GetNumRule()->GetLevelCount() > nOutlineLevel )
{
const SvxNumberFormat& rFormat = rNumBulletItem.GetNumRule()->GetLevel(nOutlineLevel);
- aLRSpaceItem.SetTxtLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTxtLeft());
- aLRSpaceItem.SetTxtFirstLineOfst(
- rLRSpaceItem.GetTxtFirstLineOfst() + rFormat.GetFirstLineOffset()
+ aLRSpaceItem.SetTextLeft(rFormat.GetAbsLSpace() + rLRSpaceItem.GetTextLeft());
+ aLRSpaceItem.SetTextFirstLineOfst(
+ rLRSpaceItem.GetTextFirstLineOfst() + rFormat.GetFirstLineOffset()
- rFormat.GetCharTextDistance());
}
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 183b09808415..8b6d968a3bcb 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -93,13 +93,13 @@ using namespace ::com::sun::star::linguistic2;
/** Create a list of clipboard formats that are supported both from the
current clipboard content and the DrawViewShell.
- The list is stored in a new instance of SvxClipboardFmtItem.
+ The list is stored in a new instance of SvxClipboardFormatItem.
*/
-::std::unique_ptr<SvxClipboardFmtItem> GetSupportedClipboardFormats (
+::std::unique_ptr<SvxClipboardFormatItem> GetSupportedClipboardFormats (
TransferableDataHelper& rDataHelper)
{
- ::std::unique_ptr<SvxClipboardFmtItem> pResult (
- new SvxClipboardFmtItem(SID_CLIPBOARD_FORMAT_ITEMS));
+ ::std::unique_ptr<SvxClipboardFormatItem> pResult (
+ new SvxClipboardFormatItem(SID_CLIPBOARD_FORMAT_ITEMS));
sal_uInt32 nFormatCount (rDataHelper.GetFormatCount());
for (sal_uInt32 i=0; i<nFormatCount; i++)
@@ -193,7 +193,7 @@ IMPL_LINK( DrawViewShell, ClipboardChanged, TransferableDataHelper*, pDataHelper
// exit immediately.
TransferableDataHelper aDataHelper (
TransferableDataHelper::CreateFromSystemClipboard(GetActiveWindow()));
- ::std::unique_ptr<SvxClipboardFmtItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
+ ::std::unique_ptr<SvxClipboardFormatItem> pFormats (GetSupportedClipboardFormats(aDataHelper));
if (mpDrawView == NULL)
return 0;
mpCurrentClipboardFormats = std::move(pFormats);
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 44338eb2763d..329fa9cff449 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -298,10 +298,10 @@ void FrameView::Update(SdOptions* pOptions)
SetSolidDragging( pOptions->IsSolidDragging() );
- SetGridCoarse( Size( pOptions->GetFldDrawX(), pOptions->GetFldDrawY() ) );
- SetGridFine( Size( pOptions->GetFldDivisionX(), pOptions->GetFldDivisionY() ) );
- Fraction aFractX(pOptions->GetFldDrawX(), pOptions->GetFldDrawX() / ( pOptions->GetFldDivisionX() ? pOptions->GetFldDivisionX() : 1 ));
- Fraction aFractY(pOptions->GetFldDrawY(), pOptions->GetFldDrawY() / ( pOptions->GetFldDivisionY() ? pOptions->GetFldDivisionY() : 1 ));
+ SetGridCoarse( Size( pOptions->GetFieldDrawX(), pOptions->GetFieldDrawY() ) );
+ SetGridFine( Size( pOptions->GetFieldDivisionX(), pOptions->GetFieldDivisionY() ) );
+ Fraction aFractX(pOptions->GetFieldDrawX(), pOptions->GetFieldDrawX() / ( pOptions->GetFieldDivisionX() ? pOptions->GetFieldDivisionX() : 1 ));
+ Fraction aFractY(pOptions->GetFieldDrawY(), pOptions->GetFieldDrawY() / ( pOptions->GetFieldDivisionY() ? pOptions->GetFieldDivisionY() : 1 ));
SetSnapGridWidth(aFractX, aFractY);
SetQuickEdit(pOptions->IsQuickEdit());
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 1656a6f76425..13a2afa8fe89 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4176,7 +4176,7 @@ SfxVoidItem ClipboardFormatItems SID_CLIPBOARD_FORMAT_ITEMS
Synchron;
/* status: */
- SlotType = SvxClipboardFmtItem
+ SlotType = SvxClipboardFormatItem
/* config: */
AccelConfig = FALSE,
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi
index f0f1795b5293..1d7649e1d98d 100644
--- a/sfx2/sdi/sfxitems.sdi
+++ b/sfx2/sdi/sfxitems.sdi
@@ -104,7 +104,7 @@
String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
};
item SfxScriptOrganizer SfxScriptOrganizerItem;
- item String SvxClipboardFmtItem; //! Dummy
+ item String SvxClipboardFormatItem; //! Dummy
struct SvxZoom
{
diff --git a/starmath/sdi/smitems.sdi b/starmath/sdi/smitems.sdi
index 017fc16a65f4..279f7eea421d 100644
--- a/starmath/sdi/smitems.sdi
+++ b/starmath/sdi/smitems.sdi
@@ -279,12 +279,12 @@ struct SvxFmtBreak
BOOL Auto MID_AUTOBREAK;
UINT16 Break MID_BREAKxxx;
}
-item SvxFmtBreak SvxFmtBreakItem;
+item SvxFmtBreak SvxFormatBreakItem;
-item BOOL SvxFmtKeepItem;
-item BOOL SvxFmtSplitItem;
+item BOOL SvxFormatKeepItem;
+item BOOL SvxFormatSplitItem;
struct SvxFontHeight
{
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index 8b8f03f3e15d..d17954ec99cf 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -2969,7 +2969,7 @@ SvNumberFormatterIndexTable* SvNumberFormatter::MergeFormatter(SvNumberFormatter
SvNumberFormatterMergeMap SvNumberFormatter::ConvertMergeTableToMap()
{
- if (!HasMergeFmtTbl())
+ if (!HasMergeFormatTable())
{
return SvNumberFormatterMergeMap();
}
@@ -3837,7 +3837,7 @@ sal_uInt16 SvNumberFormatter::GetCurrencyFormatStrings( NfWSStringsDtor& rStrArr
return nDefault;
}
-sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
+sal_uInt32 SvNumberFormatter::GetMergeFormatIndex( sal_uInt32 nOldFmt ) const
{
if (pMergeTable)
{
@@ -3850,7 +3850,7 @@ sal_uInt32 SvNumberFormatter::GetMergeFmtIndex( sal_uInt32 nOldFmt ) const
return nOldFmt;
}
-bool SvNumberFormatter::HasMergeFmtTbl() const
+bool SvNumberFormatter::HasMergeFormatTable() const
{
return pMergeTable && !pMergeTable->empty();
}
diff --git a/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 5b5354081bd2..50c231390e0d 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.cxx
@@ -550,7 +550,7 @@ void SvParser::Continue( int )
{
}
-void SvParser::BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+void SvParser::BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
sal_uInt16 *pWhichIds,
sal_uInt16 nWhichIds )
{
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9d9f7694fed7..91f08bf8ba60 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8299,7 +8299,7 @@ SfxVoidItem OutlineUp SID_OUTLINE_UP
]
-SvxFmtBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
+SvxFormatBreakItem Pagebreak SID_ATTR_PARA_PAGEBREAK
[
/* flags: */
@@ -8486,7 +8486,7 @@ SfxVoidItem ParagraphDialog SID_PARA_DLG
]
-SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
+SvxFormatKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
[
/* flags: */
@@ -8513,7 +8513,7 @@ SvxFmtKeepItem ParaKeepTogether SID_ATTR_PARA_KEEP
]
-SvxFmtSplitItem ParaSplit SID_ATTR_PARA_SPLIT
+SvxFormatSplitItem ParaSplit SID_ATTR_PARA_SPLIT
[
/* flags: */
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index 6ee210581d40..b8d771160d06 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -321,9 +321,9 @@ item BOOL SvxBlinkItem;
item BOOL SvxAutoKernItem;
item INT32 SvxColorItem;
item BOOL SvxContourItem;
-item INT16 SvxFmtBreakItem; // enum
-item BOOL SvxFmtKeepItem;
-item BOOL SvxFmtSplitItem;
+item INT16 SvxFormatBreakItem; // enum
+item BOOL SvxFormatKeepItem;
+item BOOL SvxFormatSplitItem;
item INT16 SvxKerningItem;
item INT16 SvxLanguageItem;
item BOOL SvxNoHyphenItem;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index a890925a0801..34768b21677f 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -322,7 +322,7 @@ Size FontPrevWin_Impl::CalcTextSize(vcl::RenderContext& rRenderContext, OutputDe
((nScript == css::i18n::ScriptType::COMPLEX) ?
maCTLFont :
rInFont);
- sal_uIntPtr nWidth = rFont.GetTxtSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
+ sal_uIntPtr nWidth = rFont.GetTextSize(_pPrinter, maText, nStart, nEnd - nStart).Width();
if (nIdx >= maTextWidth.size())
break;
@@ -771,12 +771,12 @@ void SvxFontPrevWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangl
if (pImpl->mcStartBracket)
{
OUString sBracket(pImpl->mcStartBracket);
- nStartBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+ nStartBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
}
if (pImpl->mcEndBracket)
{
OUString sBracket(pImpl->mcEndBracket);
- nEndBracketWidth = rFont.GetTxtSize(pPrinter, sBracket).Width();
+ nEndBracketWidth = rFont.GetTextSize(pPrinter, sBracket).Width();
}
nTextWidth = pImpl->CalcTextSize(rRenderContext, pPrinter, aSmallFont).Width();
long nResultWidth = nStartBracketWidth;
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 5f3f1b4b216b..421795807ceb 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -626,9 +626,9 @@ void SvxRuler::MouseMove( const MouseEvent& rMEvt )
long nIndentValue = 0.0;
if (nIndex == INDENT_LEFT_MARGIN)
- nIndentValue = mxParaItem->GetTxtLeft();
+ nIndentValue = mxParaItem->GetTextLeft();
else if (nIndex == INDENT_FIRST_LINE)
- nIndentValue = mxParaItem->GetTxtFirstLineOfst();
+ nIndentValue = mxParaItem->GetTextFirstLineOfst();
else if (nIndex == INDENT_RIGHT_MARGIN)
nIndentValue = mxParaItem->GetRight();
@@ -908,14 +908,14 @@ void SvxRuler::UpdatePara()
if(bRTLText)
{
- leftMargin = nRightFrameMargin - mxParaItem->GetTxtLeft() + lAppNullOffset;
- leftFirstLine = leftMargin - mxParaItem->GetTxtFirstLineOfst();
+ leftMargin = nRightFrameMargin - mxParaItem->GetTextLeft() + lAppNullOffset;
+ leftFirstLine = leftMargin - mxParaItem->GetTextFirstLineOfst();
rightMargin = nLeftFrameMargin + mxParaItem->GetRight() + lAppNullOffset;
}
else
{
- leftMargin = nLeftFrameMargin + mxParaItem->GetTxtLeft() + lAppNullOffset;
- leftFirstLine = leftMargin + mxParaItem->GetTxtFirstLineOfst();
+ leftMargin = nLeftFrameMargin + mxParaItem->GetTextLeft() + lAppNullOffset;
+ leftFirstLine = leftMargin + mxParaItem->GetTextFirstLineOfst();
rightMargin = nRightFrameMargin - mxParaItem->GetRight() + lAppNullOffset;
}
@@ -1089,7 +1089,7 @@ void SvxRuler::UpdateTabs()
long nRightFrameMargin = GetRightFrameMargin();
//#i24363# tab stops relative to indent
- const long nParaItemTxtLeft = mxParaItem->GetTxtLeft();
+ const long nParaItemTxtLeft = mxParaItem->GetTextLeft();
const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
@@ -2218,8 +2218,8 @@ void SvxRuler::ApplyIndents()
nNewRight = RoundToCurrentMapMode(nNewRight);
}
- mxParaItem->SetTxtFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
- mxParaItem->SetTxtLeft(nNewTxtLeft);
+ mxParaItem->SetTextFirstLineOfst(sal::static_int_cast<short>(nNewFirstLineOffset));
+ mxParaItem->SetTextLeft(nNewTxtLeft);
mxParaItem->SetRight(nNewRight);
sal_uInt16 nParagraphId = bHorz ? SID_ATTR_PARA_LRSPACE : SID_ATTR_PARA_LRSPACE_VERTICAL;
@@ -2608,7 +2608,7 @@ void SvxRuler::Click()
if(mxTabStopItem.get() &&
(nFlags & SvxRulerSupportFlags::TABS) == SvxRulerSupportFlags::TABS)
{
- bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+ bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
if( bContentProtected ) return;
const long lPos = GetClickPos();
if((bRTL && lPos < std::min(GetFirstLineIndent(), GetLeftIndent()) && lPos > GetRightIndent()) ||
@@ -2686,7 +2686,7 @@ void SvxRuler::CalcMinMax()
//top border is not moveable when table rows are displayed
// protection of content means the margin is not moveable
// - it's just a page break inside of a cell
- if(bHorz && !mxRulerImpl->aProtectItem.IsCntntProtected())
+ if(bHorz && !mxRulerImpl->aProtectItem.IsContentProtected())
{
nMaxLeft = mpBorders[0].nMinPos + lNullPix;
if(nDragType & SvxRulerDragFlags::OBJECT_SIZE_PROPORTIONAL)
@@ -2777,7 +2777,7 @@ void SvxRuler::CalcMinMax()
{
// get the bottom move range from the last border position - only available for rows!
// protection of content means the margin is not moveable - it's just a page break inside of a cell
- if(bHorz || mxRulerImpl->aProtectItem.IsCntntProtected())
+ if(bHorz || mxRulerImpl->aProtectItem.IsContentProtected())
{
nMaxLeft = nMaxRight = mpBorders[mxColumnItem->Count() - 1].nMaxPos + lNullPix;
}
@@ -3196,7 +3196,7 @@ bool SvxRuler::StartDrag()
<SvxRuler::CalcMinMax()>
<SvxRuler::EndDrag()>
*/
- bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
+ bool bContentProtected = mxRulerImpl->aProtectItem.IsContentProtected();
if(!bValid)
return false;
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index eafce45383d1..c16ba6f24490 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -24,41 +24,41 @@
#include <svx/clipfmtitem.hxx>
#include <com/sun/star/frame/status/ClipboardFormats.hpp>
-struct SvxClipboardFmtItem_Impl
+struct SvxClipboardFormatItem_Impl
{
std::vector<OUString> aFmtNms;
std::vector<SotClipboardFormatId> aFmtIds;
- SvxClipboardFmtItem_Impl() {}
- SvxClipboardFmtItem_Impl( const SvxClipboardFmtItem_Impl& );
+ SvxClipboardFormatItem_Impl() {}
+ SvxClipboardFormatItem_Impl( const SvxClipboardFormatItem_Impl& );
};
-TYPEINIT1_FACTORY( SvxClipboardFmtItem, SfxPoolItem , new SvxClipboardFmtItem(0));
+TYPEINIT1_FACTORY( SvxClipboardFormatItem, SfxPoolItem , new SvxClipboardFormatItem(0));
-SvxClipboardFmtItem_Impl::SvxClipboardFmtItem_Impl(
- const SvxClipboardFmtItem_Impl& rCpy )
+SvxClipboardFormatItem_Impl::SvxClipboardFormatItem_Impl(
+ const SvxClipboardFormatItem_Impl& rCpy )
: aFmtNms(rCpy.aFmtNms)
, aFmtIds(rCpy.aFmtIds)
{
}
-SvxClipboardFmtItem::SvxClipboardFmtItem( sal_uInt16 nId )
- : SfxPoolItem( nId ), pImpl( new SvxClipboardFmtItem_Impl )
+SvxClipboardFormatItem::SvxClipboardFormatItem( sal_uInt16 nId )
+ : SfxPoolItem( nId ), pImpl( new SvxClipboardFormatItem_Impl )
{
}
-SvxClipboardFmtItem::SvxClipboardFmtItem( const SvxClipboardFmtItem& rCpy )
+SvxClipboardFormatItem::SvxClipboardFormatItem( const SvxClipboardFormatItem& rCpy )
: SfxPoolItem( rCpy.Which() ),
- pImpl( new SvxClipboardFmtItem_Impl( *rCpy.pImpl ) )
+ pImpl( new SvxClipboardFormatItem_Impl( *rCpy.pImpl ) )
{
}
-SvxClipboardFmtItem::~SvxClipboardFmtItem()
+SvxClipboardFormatItem::~SvxClipboardFormatItem()
{
delete pImpl;
}
-bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxClipboardFormatItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
sal_uInt16 nCount = Count();
@@ -76,7 +76,7 @@ bool SvxClipboardFmtItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxClipboardFormatItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
::com::sun::star::frame::status::ClipboardFormats aClipFormats;
if ( rVal >>= aClipFormats )
@@ -94,9 +94,9 @@ bool SvxClipboardFmtItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_
return false;
}
-bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
+bool SvxClipboardFormatItem::operator==( const SfxPoolItem& rComp ) const
{
- const SvxClipboardFmtItem& rCmp = static_cast<const SvxClipboardFmtItem&>(rComp);
+ const SvxClipboardFormatItem& rCmp = static_cast<const SvxClipboardFormatItem&>(rComp);
if(rCmp.pImpl->aFmtNms.size() != pImpl->aFmtNms.size())
return false;
@@ -114,12 +114,12 @@ bool SvxClipboardFmtItem::operator==( const SfxPoolItem& rComp ) const
return nRet;
}
-SfxPoolItem* SvxClipboardFmtItem::Clone( SfxItemPool * /*pPool*/ ) const
+SfxPoolItem* SvxClipboardFormatItem::Clone( SfxItemPool * /*pPool*/ ) const
{
- return new SvxClipboardFmtItem( *this );
+ return new SvxClipboardFormatItem( *this );
}
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16 nPos )
{
if( nPos > pImpl->aFmtNms.size() )
nPos = pImpl->aFmtNms.size();
@@ -128,7 +128,7 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, sal_uInt16
pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
}
-void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
+void SvxClipboardFormatItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUString& rName,
sal_uInt16 nPos )
{
if( nPos > pImpl->aFmtNms.size() )
@@ -138,17 +138,17 @@ void SvxClipboardFmtItem::AddClipbrdFormat( SotClipboardFormatId nId, const OUSt
pImpl->aFmtIds.insert( pImpl->aFmtIds.begin()+nPos, nId );
}
-sal_uInt16 SvxClipboardFmtItem::Count() const
+sal_uInt16 SvxClipboardFormatItem::Count() const
{
return pImpl->aFmtIds.size();
}
-SotClipboardFormatId SvxClipboardFmtItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
+SotClipboardFormatId SvxClipboardFormatItem::GetClipbrdFormatId( sal_uInt16 nPos ) const
{
return pImpl->aFmtIds[ nPos ];
}
-const OUString SvxClipboardFmtItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
+const OUString SvxClipboardFormatItem::GetClipbrdFormatName( sal_uInt16 nPos ) const
{
return pImpl->aFmtNms[nPos];
}
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 08d68167b8fb..b1b5b39b4195 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -198,8 +198,8 @@ SvxHyperlinkItem::SvxHyperlinkItem( const SvxHyperlinkItem& rHyperlinkItem ):
sIntName = rHyperlinkItem.sIntName;
nMacroEvents = rHyperlinkItem.nMacroEvents;
- if( rHyperlinkItem.GetMacroTbl() )
- pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTbl() );
+ if( rHyperlinkItem.GetMacroTable() )
+ pMacroTable = new SvxMacroTableDtor( *rHyperlinkItem.GetMacroTable() );
else
pMacroTable=NULL;
diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx
index 5b7255bff356..a0eb16f61b3c 100644
--- a/svx/source/mnuctrls/clipboardctl.cxx
+++ b/svx/source/mnuctrls/clipboardctl.cxx
@@ -63,7 +63,7 @@ SvxClipBoardControl::~SvxClipBoardControl()
VclPtr<SfxPopupWindow> SvxClipBoardControl::CreatePopupWindow()
{
- const SvxClipboardFmtItem* pFmtItem = PTR_CAST( SvxClipboardFmtItem, pClipboardFmtItem );
+ const SvxClipboardFormatItem* pFmtItem = PTR_CAST( SvxClipboardFormatItem, pClipboardFmtItem );
if ( pFmtItem )
{
if (pPopup)
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 838e1c749114..7c7e2c491f7a 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -421,7 +421,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
vcl::Font rActBulletFont = pActualBullets[nIndex]->aFont;
sal_uInt16 nMask = 1;
- OUString sBulletCharFmtName = GetBulCharFmtName();
+ OUString sBulletCharFormatName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{
if(mLevel & nMask)
@@ -430,7 +430,7 @@ bool BulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
OUString aEmptyStr;
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
@@ -686,7 +686,7 @@ bool GraphyicBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, s
aFmt.SetNumberingType(nSetNumberingType);
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
- aFmt.SetCharFmtName( sNumCharFmtName );
+ aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, pEntry->nGallaryIndex, &aGraphic))
@@ -1149,7 +1149,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
//vcl::Font& rActBulletFont = lcl_GetDefaultBulletFont();
vcl::Font rActBulletFont = static_cast<BulletsSettings_Impl*>(pCurrentBullets->pBullets)->aFont;
sal_uInt16 nMask = 1;
- OUString sBulletCharFmtName = GetBulCharFmtName();
+ OUString sBulletCharFormatName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{
if(mLevel & nMask)
@@ -1159,7 +1159,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
aFmt.SetNumberingType( SVX_NUM_CHAR_SPECIAL );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
OUString aEmptyStr;
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
@@ -1187,7 +1187,7 @@ bool MixBulletsTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uI
aFmt.SetNumberingType(nSetNumberingType);
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
- aFmt.SetCharFmtName( sNumCharFmtName );
+ aFmt.SetCharFormatName( sNumCharFmtName );
if ( pCurrentBullets->nIndexDefault == (sal_uInt16)0xFFFF && pEntry->pGrfObj )
{
Size aSize = pEntry->aSize;
@@ -1428,7 +1428,7 @@ bool NumberingTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uIn
aFmt.SetPrefix(_pSet->pNumSetting->sPrefix);
aFmt.SetSuffix(_pSet->pNumSetting->sSuffix);
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
if (isResetSize) aFmt.SetBulletRelSize(100);
aNum.SetLevel(i, aFmt);
}
@@ -1711,7 +1711,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
NumSettingsArr_Impl *pNumSettingsArr=pItemArr->pNumSettingsArr;
NumSettings_ImplPtr pLevelSettings = 0;
- OUString sBulletCharFmtName = GetBulCharFmtName();
+ OUString sBulletCharFormatName = GetBulCharFmtName();
for(sal_uInt16 i = 0; i < aNum.GetLevelCount(); i++)
{
if(pNumSettingsArr->size() > i)
@@ -1774,7 +1774,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
}
aFmt.SetBulletChar(cChar);
- aFmt.SetCharFmtName( sBulletCharFmtName );
+ aFmt.SetCharFormatName( sBulletCharFormatName );
if (isResetSize) aFmt.SetBulletRelSize(45);
}else if ((aFmt.GetNumberingType()&(~LINK_TOKEN)) == SVX_NUM_BITMAP ) {
if (pLevelSettings->pBrushItem) {
@@ -1793,7 +1793,7 @@ bool OutlineTypeMgr::ApplyNumRule(SvxNumRule& aNum, sal_uInt16 nIndex, sal_uInt1
} else
{
aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? aNum.GetLevelCount() : 0));
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
if (isResetSize) aFmt.SetBulletRelSize(100);
}
if(pNumSettingsArr->size() > i) {
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 2604ea250a40..35a0305eb3b3 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -250,9 +250,9 @@ void ParaPropertyPanel::initial()
IMPL_LINK_NOARG( ParaPropertyPanel, ModifyIndentHdl_Impl)
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
- aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -283,9 +283,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
maTxtLeft += INDENT_STEP;
sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
- aMargin.SetTxtLeft( (const long)nVal );
+ aMargin.SetTextLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -317,9 +317,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
- aMargin.SetTxtLeft( (const long)nVal );
+ aMargin.SetTextLeft( (const long)nVal );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextFirstLineOfst( (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -329,9 +329,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickIndent_IncDec_Hdl_Impl, ToolBox *, pCont
else if (aCommand == UNO_HANGINGINDENT)
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
- aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+ aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
GetBindings()->GetDispatcher()->Execute(
SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
@@ -353,9 +353,9 @@ IMPL_LINK_TYPED(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl,
else if (aCommand == UNO_HANGINGINDENT2)
{
SvxLRSpaceItem aMargin( SID_ATTR_PARA_LRSPACE );
- aMargin.SetTxtLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
+ aMargin.SetTextLeft( (const long)GetCoreValue( *mpLeftIndent, m_eLRSpaceUnit ) + (const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ) );
aMargin.SetRight( (const long)GetCoreValue( *mpRightIndent, m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
+ aMargin.SetTextFirstLineOfst( ((const short)GetCoreValue( *mpFLineIndent, m_eLRSpaceUnit ))*(-1) );
GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SfxCallMode::RECORD, &aMargin, 0L);
}
@@ -466,7 +466,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
if( pState && eState >= SfxItemState::DEFAULT )
{
const SvxLRSpaceItem* pSpace = static_cast<const SvxLRSpaceItem*>(pState);
- maTxtLeft = pSpace->GetTxtLeft();
+ maTxtLeft = pSpace->GetTextLeft();
maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
maTxtLeft = OutputDevice::LogicToLogic( maTxtLeft, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
@@ -474,7 +474,7 @@ void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemStat
aTxtRight = OutputDevice::LogicToLogic( aTxtRight, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
aTxtRight = OutputDevice::LogicToLogic( aTxtRight, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
- long aTxtFirstLineOfst = pSpace->GetTxtFirstLineOfst();
+ long aTxtFirstLineOfst = pSpace->GetTextFirstLineOfst();
aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, (MapUnit)m_eLRSpaceUnit, MAP_100TH_MM );
aTxtFirstLineOfst = OutputDevice::LogicToLogic( aTxtFirstLineOfst, MAP_100TH_MM, (MapUnit)(SFX_MAPUNIT_TWIP) );
diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx
index 9ef4ffdc64d2..ab1271ac8fe0 100644
--- a/svx/source/styles/CommonStylePreviewRenderer.cxx
+++ b/svx/source/styles/CommonStylePreviewRenderer.cxx
@@ -168,7 +168,7 @@ bool CommonStylePreviewRenderer::recalculate()
Size CommonStylePreviewRenderer::getRenderSize()
{
- maPixelSize = maFont.GetTxtSize(&mrOutputDev, maStyleName);
+ maPixelSize = maFont.GetTextSize(&mrOutputDev, maStyleName);
if (maPixelSize.Height() > mnMaxHeight)
maPixelSize.Height() = mnMaxHeight;
return maPixelSize;
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index b2712615e1f9..8e5b31dd72d6 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -493,14 +493,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
bOk=pTextObj->CalcFieldValue(pFI->GetField(),pFI->GetPara(),pFI->GetPos(),true,pTxtCol,pFldCol,rStr);
if (bOk) {
if (pTxtCol!=NULL) {
- pFI->SetTxtColor(*pTxtCol);
+ pFI->SetTextColor(*pTxtCol);
delete pTxtCol;
}
if (pFldCol!=NULL) {
- pFI->SetFldColor(*pFldCol);
+ pFI->SetFieldColor(*pFldCol);
delete pFldCol;
} else {
- pFI->SetFldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
+ pFI->SetFieldColor(Color(COL_LIGHTGRAY)); // TODO: remove this later on (357)
}
}
}
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/lineinfo.hxx
index f5a6f3c22a92..a1e2695dcf2f 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -23,7 +23,7 @@
#include <editeng/numitem.hxx>
#include "swdllapi.h"
-class SwCharFmt;
+class SwCharFormat;
class IDocumentStylePoolAccess;
enum LineNumberPosition
@@ -59,8 +59,8 @@ public:
SwLineNumberInfo& operator=(const SwLineNumberInfo&);
bool operator==( const SwLineNumberInfo& rInf ) const;
- SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const;
- void SetCharFmt( SwCharFmt* );
+ SwCharFormat *GetCharFormat( IDocumentStylePoolAccess& rIDSPA ) const;
+ void SetCharFormat( SwCharFormat* );
const SvxNumberType &GetNumType() const { return aType; }
void SetNumType( SvxNumberType aNew ){ aType = aNew; }
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index ca4dcf4c7943..1e21326cdcd2 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -54,7 +54,7 @@ void EnableCmdInterface(bool bEnable = true);
void RepaintPagePreview( SwViewShell* pVwSh, const SwRect& rRect );
// Read ChgMode for tables from configuration.
-TblChgMode GetTblChgDefaultMode();
+TableChgMode GetTableChgDefaultMode();
bool JumpToSwMark( SwViewShell* pVwSh, const OUString& rMark );
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 7088f2784fe9..06fc3f1412f5 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -36,7 +36,7 @@ class SwModuleOptions;
class InsCaptionOpt;
// text format for the sending of messages ------------------------------
-enum class MailTxtFormats
+enum class MailTextFormats
{
NONE = 0x00,
ASCII = 0x01,
@@ -46,7 +46,7 @@ enum class MailTxtFormats
};
namespace o3tl
{
- template<> struct typed_flags<MailTxtFormats> : is_typed_flags<MailTxtFormats, 0x0f> {};
+ template<> struct typed_flags<MailTextFormats> : is_typed_flags<MailTextFormats, 0x0f> {};
}
@@ -122,7 +122,7 @@ class SwInsertConfig : public utl::ConfigItem
bool bInsWithCaption; //Insert/Caption/Automatic
bool bCaptionOrderNumberingFirst; //#i61007# caption order starting with numbering
- SwInsertTableOptions aInsTblOpts;
+ SwInsertTableOptions aInsTableOpts;
bool bIsWeb;
const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -142,15 +142,15 @@ class SwTableConfig : public utl::ConfigItem
{
friend class SwModuleOptions;
- sal_uInt16 nTblHMove; //int Table/Shift/Row
- sal_uInt16 nTblVMove; //int Table/Shift/Column
- sal_uInt16 nTblHInsert; //int Table/Insert/Row
- sal_uInt16 nTblVInsert; //int Table/Insert/Column
- TblChgMode eTblChgMode; //int Table/Change/Effect
+ sal_uInt16 nTableHMove; //int Table/Shift/Row
+ sal_uInt16 nTableVMove; //int Table/Shift/Column
+ sal_uInt16 nTableHInsert; //int Table/Insert/Row
+ sal_uInt16 nTableVInsert; //int Table/Insert/Column
+ TableChgMode eTableChgMode; //int Table/Change/Effect
- bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers.
- bool bInsTblChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats.
- bool bInsTblAlignNum; // Table/Input/Alignment // Align numbers.
+ bool bInsTableFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers.
+ bool bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition // Automatic recognition of number formats.
+ bool bInsTableAlignNum; // Table/Input/Alignment // Align numbers.
static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames();
@@ -177,7 +177,7 @@ class SwMiscConfig : public utl::ConfigItem
bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs
bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation
bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged'
- MailTxtFormats nMailingFormats; // FormLetter/MailingOutput/Formats
+ MailTextFormats nMailingFormats; // FormLetter/MailingOutput/Formats
OUString sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!)
OUString sMailingPath; // FormLetter/FileOutput/Path
OUString sMailName; // FormLetter/FileOutput/FileName/FromManualSetting (string!)
@@ -214,24 +214,24 @@ class SW_DLLPUBLIC SwModuleOptions
public:
SwModuleOptions();
- TblChgMode GetTblMode() const { return aTableConfig.eTblChgMode;}
- void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet;
+ TableChgMode GetTableMode() const { return aTableConfig.eTableChgMode;}
+ void SetTableMode( TableChgMode eSet ) { aTableConfig.eTableChgMode = eSet;
aTableConfig.SetModified();}
- sal_uInt16 GetTblHMove() const { return aTableConfig.nTblHMove;}
- void SetTblHMove( sal_uInt16 nSet ) { aTableConfig.nTblHMove = nSet;
+ sal_uInt16 GetTableHMove() const { return aTableConfig.nTableHMove;}
+ void SetTableHMove( sal_uInt16 nSet ) { aTableConfig.nTableHMove = nSet;
aTableConfig.SetModified();}
- sal_uInt16 GetTblVMove() const { return aTableConfig.nTblVMove;}
- void SetTblVMove( sal_uInt16 nSet ) { aTableConfig.nTblVMove = nSet;
+ sal_uInt16 GetTableVMove() const { return aTableConfig.nTableVMove;}
+ void SetTableVMove( sal_uInt16 nSet ) { aTableConfig.nTableVMove = nSet;
aTableConfig.SetModified();}
- sal_uInt16 GetTblHInsert() const {return aTableConfig.nTblHInsert;}
- void SetTblHInsert( sal_uInt16 nSet ) { aTableConfig.nTblHInsert = nSet;
+ sal_uInt16 GetTableHInsert() const {return aTableConfig.nTableHInsert;}
+ void SetTableHInsert( sal_uInt16 nSet ) { aTableConfig.nTableHInsert = nSet;
aTableConfig.SetModified();}
- sal_uInt16 GetTblVInsert() const {return aTableConfig.nTblVInsert;}
- void SetTblVInsert( sal_uInt16 nSet ) { aTableConfig.nTblVInsert = nSet;
+ sal_uInt16 GetTableVInsert() const {return aTableConfig.nTableVInsert;}
+ void SetTableVInsert( sal_uInt16 nSet ) { aTableConfig.nTableVInsert = nSet;
aTableConfig.SetModified();}
const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; }
@@ -271,28 +271,28 @@ public:
}
}
- bool IsInsTblFormatNum(bool bHTML) const
- { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; }
- void SetInsTblFormatNum( bool bHTML, bool b )
- { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b);
+ bool IsInsTableFormatNum(bool bHTML) const
+ { return bHTML ? aWebTableConfig.bInsTableFormatNum : aTableConfig.bInsTableFormatNum; }
+ void SetInsTableFormatNum( bool bHTML, bool b )
+ { bHTML ? (aWebTableConfig.bInsTableFormatNum = b) : (aTableConfig.bInsTableFormatNum = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
- bool IsInsTblChangeNumFormat(bool bHTML) const
- { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; }
- void SetInsTblChangeNumFormat( bool bHTML, bool b )
- { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b);
+ bool IsInsTableChangeNumFormat(bool bHTML) const
+ { return bHTML ? aWebTableConfig.bInsTableChangeNumFormat : aTableConfig.bInsTableChangeNumFormat; }
+ void SetInsTableChangeNumFormat( bool bHTML, bool b )
+ { bHTML ? (aWebTableConfig.bInsTableChangeNumFormat = b) : (aTableConfig.bInsTableChangeNumFormat = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
- bool IsInsTblAlignNum(bool bHTML) const
- { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; }
- void SetInsTblAlignNum( bool bHTML, bool b )
- { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b);
+ bool IsInsTableAlignNum(bool bHTML) const
+ { return bHTML ? aWebTableConfig.bInsTableAlignNum : aTableConfig.bInsTableAlignNum; }
+ void SetInsTableAlignNum( bool bHTML, bool b )
+ { bHTML ? (aWebTableConfig.bInsTableAlignNum = b) : (aTableConfig.bInsTableAlignNum = b);
bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();}
- SwInsertTableOptions GetInsTblFlags(bool bHTML) const
- { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;}
- void SetInsTblFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
- bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts);
+ SwInsertTableOptions GetInsTableFlags(bool bHTML) const
+ { return bHTML ? aWebInsertConfig.aInsTableOpts : aInsertConfig.aInsTableOpts;}
+ void SetInsTableFlags( bool bHTML, const SwInsertTableOptions& rOpts ) {
+ bHTML ? (aWebInsertConfig.aInsTableOpts = rOpts) : (aInsertConfig.aInsTableOpts = rOpts);
bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();}
const InsCaptionOpt* GetCapOption(bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId);
@@ -302,8 +302,8 @@ public:
void SetGrfToGalleryAsLnk( bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b;
aMiscConfig.SetModified();}
- MailTxtFormats GetMailingFormats() const { return aMiscConfig.nMailingFormats;}
- void SetMailingFormats( MailTxtFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
+ MailTextFormats GetMailingFormats() const { return aMiscConfig.nMailingFormats;}
+ void SetMailingFormats( MailTextFormats nSet ) { aMiscConfig.nMailingFormats = nSet;
aMiscConfig.SetModified();}
bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; }
diff --git a/sw/inc/modeltoviewhelper.hxx b/sw/inc/modeltoviewhelper.hxx
index 386b536b50dc..15bf06052554 100644
--- a/sw/inc/modeltoviewhelper.hxx
+++ b/sw/inc/modeltoviewhelper.hxx
@@ -25,7 +25,7 @@
#include <o3tl/typed_flags_set.hxx>
#include <vector>
-class SwTxtNode;
+class SwTextNode;
/** Some helpers for converting model strings to view strings.
@@ -36,7 +36,7 @@ class SwTxtNode;
helper functions are provided to convert model positions to view positions
and vice versa.
- CH_TXTATR_BREAKWORD -> SwTxtNode will have field attributes associated with these
+ CH_TXTATR_BREAKWORD -> SwTextNode will have field attributes associated with these
. .
. .
. .
@@ -125,7 +125,7 @@ public:
ModelPosition() : mnPos(0), mnSubPos(0), mbIsField(false) {}
};
- ModelToViewHelper(const SwTxtNode &rNode,
+ ModelToViewHelper(const SwTextNode &rNode,
// defaults are appropriate for spell/grammar checking
ExpandMode eMode = ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
ModelToViewHelper() //pass through filter, view == model
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 158b8dc2d0a8..4ff30a8749be 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -38,9 +38,9 @@ class Graphic;
class GraphicObject;
class SwAttrSet;
class SfxItemSet;
-class SwCntntNode;
+class SwContentNode;
class SwDoc;
-class SwGrfFmtColl;
+class SwGrfFormatColl;
class SwGrfNode;
class SwHistory;
class SwNode;
@@ -50,20 +50,20 @@ class SwOLENode;
class SwOutlineNodes;
class SwPaM;
class SwSectionData;
-class SwSectionFmt;
+class SwSectionFormat;
class SwTOXBase;
class SwSectionNode;
class SwStartNode;
-class SwTableBoxFmt;
-class SwTableFmt;
+class SwTableBoxFormat;
+class SwTableFormat;
class SwTableLine;
-class SwTableLineFmt;
+class SwTableLineFormat;
class SwTableNode;
-class SwTblToTxtSaves;
-class SwTxtFmtColl;
-class SwTxtNode;
-class SwUndoTblToTxt;
-class SwUndoTxtToTbl;
+class SwTableToTextSaves;
+class SwTextFormatColl;
+class SwTextNode;
+class SwUndoTableToText;
+class SwUndoTextToTable;
struct SwPosition;
namespace sw { class DocumentContentOperationsManager; }
@@ -123,10 +123,10 @@ class SW_DLLPUBLIC SwNodes
void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize,
SwNodeIndex& rInsPos, bool bNewFrms );
- void UpdtOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node.
+ void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node.
void _CopyNodes( const SwNodeRange&, const SwNodeIndex&,
- bool bNewFrms = true, bool bTblInsDummyNode = false ) const;
+ bool bNewFrms = true, bool bTableInsDummyNode = false ) const;
void _DelDummyNodes( const SwNodeRange& rRg );
protected:
@@ -186,19 +186,19 @@ public:
static void GoStartOfSection(SwNodeIndex *);
static void GoEndOfSection(SwNodeIndex *);
- SwCntntNode* GoNext(SwNodeIndex *) const;
- static SwCntntNode* GoPrevious(SwNodeIndex *);
+ SwContentNode* GoNext(SwNodeIndex *) const;
+ static SwContentNode* GoPrevious(SwNodeIndex *);
- /** Go to next/previous Cntnt/Table-node for which LayoutFrames exist.
+ /** Go to next/previous Content/Table-node for which LayoutFrames exist.
While doing this do not leave Header/Footer/Frame etc. */
SwNode* GoNextWithFrm(SwNodeIndex *) const;
SwNode* GoPreviousWithFrm(SwNodeIndex *) const;
/** Go to next content-node that is not protected or hidden
(Both set FALSE ==> GoNext/GoPrevious!!!). */
- SwCntntNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true,
+ SwContentNode* GoNextSection( SwNodeIndex *, bool bSkipHidden = true,
bool bSkipProtect = true ) const;
- static SwCntntNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true,
+ static SwContentNode* GoPrevSection( SwNodeIndex *, bool bSkipHidden = true,
bool bSkipProtect = true );
/** Create an empty section of Start- and EndNote. It may be called
@@ -208,35 +208,35 @@ public:
SwStartNodeType = SwNormalStartNode );
/// Implementations of "Make...Node" are in the given .cxx-files.
- SwTxtNode *MakeTxtNode( const SwNodeIndex & rWhere,
- SwTxtFmtColl *pColl,
+ SwTextNode *MakeTextNode( const SwNodeIndex & rWhere,
+ SwTextFormatColl *pColl,
SwAttrSet* pAutoAttr = 0 ); ///< in ndtxt.cxx
SwStartNode* MakeTextSection( const SwNodeIndex & rWhere,
SwStartNodeType eSttNdTyp,
- SwTxtFmtColl *pColl,
+ SwTextFormatColl *pColl,
SwAttrSet* pAutoAttr = 0 );
static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
const OUString& rGrfName,
const OUString& rFltName,
const Graphic* pGraphic,
- SwGrfFmtColl *pColl,
+ SwGrfFormatColl *pColl,
SwAttrSet* pAutoAttr = 0,
bool bDelayed = false ); ///< in ndgrf.cxx
static SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere,
const GraphicObject& rGrfObj,
- SwGrfFmtColl *pColl,
+ SwGrfFormatColl *pColl,
SwAttrSet* pAutoAttr = 0 ); ///< in ndgrf.cxx
SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
const svt::EmbeddedObjectRef&,
- SwGrfFmtColl *pColl,
+ SwGrfFormatColl *pColl,
SwAttrSet* pAutoAttr = 0 ); ///< in ndole.cxx
SwOLENode *MakeOLENode( const SwNodeIndex & rWhere,
const OUString &rName,
sal_Int64 nAspect,
- SwGrfFmtColl *pColl,
+ SwGrfFormatColl *pColl,
SwAttrSet* pAutoAttr ); ///< in ndole.cxx
/// Array of all OutlineNodes.
@@ -250,46 +250,46 @@ public:
New parameter pAttrSet: If pAttrSet is non-null and contains an
adjust item it is propagated to the table cells. If there is an
- adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
+ adjust in pContentTextColl or pHeadlineTextColl this adjust item
overrides the item in pAttrSet. */
static SwTableNode* InsertTable( const SwNodeIndex& rNdIdx,
- sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl,
+ sal_uInt16 nBoxes, SwTextFormatColl* pContentTextColl,
sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0,
- SwTxtFmtColl* pHeadlineTxtColl = 0,
+ SwTextFormatColl* pHeadlineTextColl = 0,
const SwAttrSet * pAttrSet = 0);
/// Create balanced table from selected range.
SwTableNode* TextToTable( const SwNodeRange& rRange, sal_Unicode cCh,
- SwTableFmt* pTblFmt,
- SwTableLineFmt* pLineFmt,
- SwTableBoxFmt* pBoxFmt,
- SwTxtFmtColl* pTxtColl,
- SwUndoTxtToTbl* pUndo = 0 );
+ SwTableFormat* pTableFormat,
+ SwTableLineFormat* pLineFormat,
+ SwTableBoxFormat* pBoxFormat,
+ SwTextFormatColl* pTextColl,
+ SwUndoTextToTable* pUndo = 0 );
static SwNodeRange * ExpandRangeForTableBox(const SwNodeRange & rRange);
/// create a table from a vector of NodeRanges - API support
SwTableNode* TextToTable( const TableRanges_t& rTableNodes,
- SwTableFmt* pTblFmt,
- SwTableLineFmt* pLineFmt,
- SwTableBoxFmt* pBoxFmt,
- SwTxtFmtColl* pTxtColl
+ SwTableFormat* pTableFormat,
+ SwTableLineFormat* pLineFormat,
+ SwTableBoxFormat* pBoxFormat,
+ SwTextFormatColl* pTextColl
/*, SwUndo... pUndo*/ );
/// Create regular text from what was table.
bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh,
- SwUndoTblToTxt* = 0 );
+ SwUndoTableToText* = 0 );
/// Is in untbl.cxx and may called only by Undo-object.
SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd,
- const SwTblToTxtSaves& rSavedData );
+ const SwTableToTextSaves& rSavedData );
/** Insert a new box in the line before InsPos. Its format
is taken from the following one (or from the previous one if we are
at the end). In the line there must be a box already. */
- bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*,
+ bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFormat*,
/// Formats for TextNode of box.
- SwTxtFmtColl*, const SfxItemSet* pAutoAttr,
+ SwTextFormatColl*, const SfxItemSet* pAutoAttr,
sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 );
/** Splits a table at the base-line which contains the index.
All base lines behind it are moved to a new table/ -node.
@@ -305,7 +305,7 @@ public:
/// Insert a new SwSection.
SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx,
- SwSectionFmt& rSectionFmt,
+ SwSectionFormat& rSectionFormat,
SwSectionData const&,
SwTOXBase const*const pTOXBase,
SwNodeIndex const*const pEnde,
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index bdf9e77961f3..668c5f5ecc61 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -27,13 +27,13 @@
#include <boost/weak_ptr.hpp>
class SwAsyncRetrieveInputStreamThreadConsumer;
-class SwGrfFmtColl;
+class SwGrfFormatColl;
class SwDoc;
class GraphicAttr;
class SotStorage;
// SwGrfNode
-class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
+class SW_DLLPUBLIC SwGrfNode: public SwNoTextNode
{
friend class SwNodes;
@@ -57,16 +57,16 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
SwGrfNode( const SwNodeIndex& rWhere,
const OUString& rGrfName, const OUString& rFltName,
const Graphic* pGraphic,
- SwGrfFmtColl* pGrfColl,
+ SwGrfFormatColl* pGrfColl,
SwAttrSet* pAutoAttr = 0 );
///< Ctor for reading (SW/G) without graphics.
SwGrfNode( const SwNodeIndex& rWhere,
const OUString& rGrfName, const OUString& rFltName,
- SwGrfFmtColl* pGrfColl,
+ SwGrfFormatColl* pGrfColl,
SwAttrSet* pAutoAttr = 0 );
SwGrfNode( const SwNodeIndex& rWhere,
const GraphicObject& rGrfObj,
- SwGrfFmtColl* pGrfColl,
+ SwGrfFormatColl* pGrfColl,
SwAttrSet* pAutoAttr = 0 );
void InsertLink( const OUString& rGrfName, const OUString& rFltName );
@@ -125,7 +125,7 @@ public:
const Graphic& GetGrf(bool bWait = false) const;
const GraphicObject& GetGrfObj(bool bWait = false) const;
const GraphicObject* GetReplacementGrfObj() const;
- virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
/// isolated only way to set GraphicObject to allow more actions when doing so
void SetGraphic(const Graphic& rGraphic, const OUString& rLink);
@@ -157,7 +157,7 @@ public:
void SetScaleImageMap( bool b ) { bScaleImageMap = b; }
/// in ndcopy.cxx
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
/** Re-read in case graphic was not OK. The current one
gets replaced by the new one. */
@@ -206,7 +206,7 @@ public:
bool IsAsyncRetrieveInputStreamPossible() const;
};
-// Inline methods from Node.hxx - it is only now that we know TxtNode!!
+// Inline methods from Node.hxx - it is only now that we know TextNode!!
inline SwGrfNode *SwNode::GetGrfNode()
{
return ND_GRFNODE == nNodeType ? static_cast<SwGrfNode*>(this) : 0;
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index 86e7fd452ff8..44c853b98f1f 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -24,10 +24,10 @@
#include "swtypes.hxx"
-class SwTxtNode;
+class SwTextNode;
class SwRegHistory; // Is in RolBck.hxx.
-class SwTxtAttr;
-class SwTxtAttrNesting;
+class SwTextAttr;
+class SwTextAttrNesting;
class SfxPoolItem;
class SfxItemSet;
@@ -38,28 +38,28 @@ typedef enum {
NEW = int(false),
} CopyOrNew_t;
-/// if COPY then pTxtNode must be given!
-SwTxtAttr * MakeTxtAttr(
+/// if COPY then pTextNode must be given!
+SwTextAttr * MakeTextAttr(
SwDoc & rDoc,
SfxPoolItem & rNew,
sal_Int32 const nStt,
sal_Int32 const nEnd,
CopyOrNew_t const bIsCopy = NEW,
- SwTxtNode *const pTxtNode = 0 );
+ SwTextNode *const pTextNode = 0 );
-SwTxtAttr * MakeTxtAttr(
+SwTextAttr * MakeTextAttr(
SwDoc & rDoc,
const SfxItemSet & rSet,
sal_Int32 nStt,
sal_Int32 nEnd );
/// create redline dummy text hint that must not be inserted into hints array
-SwTxtAttr* MakeRedlineTxtAttr(
+SwTextAttr* MakeRedlineTextAttr(
SwDoc & rDoc,
SfxPoolItem& rAttr );
/** Class SwpHints is derived indirectly via SwpHts, because only the
- class SwTxtNode should be allowed to insert and remove attributes.
+ class SwTextNode should be allowed to insert and remove attributes.
Other classes like the Frames are given only reading access via
the index-operator.
Size when created is 1 because an array is created only if
@@ -69,16 +69,16 @@ SwTxtAttr* MakeRedlineTxtAttr(
struct CompareSwpHtStart
{
- bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+ bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
};
-class SwpHtStart : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtStart,
+class SwpHtStart : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtStart,
o3tl::find_partialorder_ptrequals> {};
struct CompareSwpHtEnd
{
- bool operator()(SwTxtAttr* const lhs, SwTxtAttr* const rhs) const;
+ bool operator()(SwTextAttr* const lhs, SwTextAttr* const rhs) const;
};
-class SwpHtEnd : public o3tl::sorted_vector<SwTxtAttr*, CompareSwpHtEnd,
+class SwpHtEnd : public o3tl::sorted_vector<SwTextAttr*, CompareSwpHtEnd,
o3tl::find_partialorder_ptrequals> {};
/// Class SwpHintsArr
@@ -97,31 +97,31 @@ protected:
//FIXME: why are the non-const methods public?
public:
- void Insert( const SwTxtAttr *pHt );
+ void Insert( const SwTextAttr *pHt );
void DeleteAtPos( const size_t nPosInStart );
void Resort();
- SwTxtAttr * Cut( const size_t nPosInStart )
+ SwTextAttr * Cut( const size_t nPosInStart )
{
- SwTxtAttr *pHt = GetTextHint(nPosInStart);
+ SwTextAttr *pHt = GetTextHint(nPosInStart);
DeleteAtPos( nPosInStart );
return pHt;
}
- const SwTxtAttr * GetStart( const size_t nPos ) const
+ const SwTextAttr * GetStart( const size_t nPos ) const
{
assert(nPos < m_HintStarts.size());
return m_HintStarts[nPos];
}
- const SwTxtAttr * GetEnd( const size_t nPos ) const
+ const SwTextAttr * GetEnd( const size_t nPos ) const
{
assert(nPos < m_HintEnds.size());
return m_HintEnds[nPos];
}
- SwTxtAttr * GetStart( const size_t nPos )
+ SwTextAttr * GetStart( const size_t nPos )
{
assert(nPos < m_HintStarts.size());
return m_HintStarts[nPos];
}
- SwTxtAttr * GetEnd( const size_t nPos )
+ SwTextAttr * GetEnd( const size_t nPos )
{
assert(nPos < m_HintEnds.size());
return m_HintEnds[nPos];
@@ -130,10 +130,10 @@ public:
size_t GetEndCount() const { return m_HintEnds.size(); }
size_t GetStartCount() const { return m_HintStarts.size(); }
- size_t GetStartOf( const SwTxtAttr *pHt ) const
+ size_t GetStartOf( const SwTextAttr *pHt ) const
{
SwpHtStart::const_iterator const it =
- m_HintStarts.find(const_cast<SwTxtAttr*>(pHt));
+ m_HintStarts.find(const_cast<SwTextAttr*>(pHt));
if ( it == m_HintStarts.end() )
{
return SAL_MAX_SIZE;
@@ -141,13 +141,13 @@ public:
return it - m_HintStarts.begin();
}
- bool Contains( const SwTxtAttr *pHt ) const;
+ bool Contains( const SwTextAttr *pHt ) const;
- const SwTxtAttr * GetTextHint( const size_t nIdx ) const
+ const SwTextAttr * GetTextHint( const size_t nIdx ) const
{ return GetStart(nIdx); }
- SwTxtAttr * GetTextHint( const size_t nIdx )
+ SwTextAttr * GetTextHint( const size_t nIdx )
{ return GetStart(nIdx); }
- const SwTxtAttr * operator[]( const size_t nIdx ) const
+ const SwTextAttr * operator[]( const size_t nIdx ) const
{ return GetStart(nIdx); }
size_t Count() const { return GetStartCount(); }
@@ -169,22 +169,22 @@ private:
bool m_bInSplitNode : 1;
/// m_bHasHiddenParaField is invalid, call CalcHiddenParaField()
bool m_bCalcHiddenParaField : 1;
- bool m_bHasHiddenParaField : 1; ///< HiddenParaFld
+ bool m_bHasHiddenParaField : 1; ///< HiddenParaField
bool m_bFootnote : 1; ///< footnotes
bool m_bDDEFields : 1; ///< the TextNode has DDE fields
/// records a new attibute in m_pHistory.
- void NoteInHistory( SwTxtAttr *pAttr, const bool bNew = false );
+ void NoteInHistory( SwTextAttr *pAttr, const bool bNew = false );
void CalcFlags( );
/** Delete methods may only be called by the TextNode!
Because the TextNode also guarantees removal of the Character for
attributes without an end. */
- friend class SwTxtNode;
+ friend class SwTextNode;
void DeleteAtPos( const size_t nPos );
/// Delete the given Hint. The Hint must actually be in the array!
- void Delete( SwTxtAttr* pTxtHt );
+ void Delete( SwTextAttr* pTextHt );
void SetInSplitNode(bool bInSplit) { m_bInSplitNode = bInSplit; }
void SetCalcHiddenParaField() { m_bCalcHiddenParaField = true; }
@@ -198,11 +198,11 @@ private:
return m_bHasHiddenParaField;
}
- void InsertNesting(SwTxtAttrNesting & rNewHint);
- bool TryInsertNesting(SwTxtNode & rNode, SwTxtAttrNesting & rNewHint);
- void BuildPortions( SwTxtNode& rNode, SwTxtAttr& rNewHint,
+ void InsertNesting(SwTextAttrNesting & rNewHint);
+ bool TryInsertNesting(SwTextNode & rNode, SwTextAttrNesting & rNewHint);
+ void BuildPortions( SwTextNode& rNode, SwTextAttr& rNewHint,
const SetAttrMode nMode );
- bool MergePortions( SwTxtNode& rNode );
+ bool MergePortions( SwTextNode& rNode );
public:
SwpHints();
@@ -217,10 +217,10 @@ public:
/// try to insert the hint
/// @return true iff hint successfully inserted
- bool TryInsertHint( SwTxtAttr * const pHint, SwTxtNode & rNode,
+ bool TryInsertHint( SwTextAttr * const pHint, SwTextNode & rNode,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
- bool HasFtn() const { return m_bFootnote; }
+ bool HasFootnote() const { return m_bFootnote; }
bool IsInSplitNode() const { return m_bInSplitNode; }
/// calc current value of m_bHasHiddenParaField, returns true iff changed
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 584fd5c24baa..ec0f494f6112 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -23,12 +23,12 @@
namespace tools { class PolyPolygon; }
-// SwNoTxtNode
+// SwNoTextNode
-class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
+class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
{
friend class SwNodes;
- friend class SwNoTxtFrm;
+ friend class SwNoTextFrm;
tools::PolyPolygon *pContour;
bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -38,22 +38,22 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode
bool bPixelContour : 1; // contour map mode is invalid and pixel.
// Creates for all derivations an AttrSet with ranges for frame- and
- // graphics-attributes (only called by SwCntntNode).
+ // graphics-attributes (only called by SwContentNode).
virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
- SwNoTxtNode( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
- SwNoTxtNode &operator=( const SwNoTxtNode& ) SAL_DELETED_FUNCTION;
+ SwNoTextNode( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
+ SwNoTextNode &operator=( const SwNoTextNode& ) SAL_DELETED_FUNCTION;
protected:
- SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
- SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
+ SwNoTextNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType,
+ SwGrfFormatColl *pGrColl, SwAttrSet* pAutoAttr = 0 );
public:
- virtual ~SwNoTxtNode();
+ virtual ~SwNoTextNode();
- virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+ virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
- inline SwGrfFmtColl *GetGrfColl() const { return const_cast<SwGrfFmtColl*>(static_cast<const SwGrfFmtColl*>(GetRegisteredIn())); }
+ inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
virtual Size GetTwipSize() const = 0;
@@ -90,14 +90,14 @@ public:
Graphic GetGraphic() const;
};
-// Inline methods from Node.hxx - we know TxtNode only here!!
-inline SwNoTxtNode *SwNode::GetNoTxtNode()
+// Inline methods from Node.hxx - we know TextNode only here!!
+inline SwNoTextNode *SwNode::GetNoTextNode()
{
- return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTxtNode*>(this) : 0;
+ return ND_NOTXTNODE & nNodeType ? static_cast<SwNoTextNode*>(this) : 0;
}
-inline const SwNoTxtNode *SwNode::GetNoTxtNode() const
+inline const SwNoTextNode *SwNode::GetNoTextNode() const
{
- return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTxtNode*>(this) : 0;
+ return ND_NOTXTNODE & nNodeType ? static_cast<const SwNoTextNode*>(this) : 0;
}
#endif // INCLUDED_SW_INC_NDNOTXT_HXX
diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx
index 3091cc03abf9..b2787a393f78 100644
--- a/sw/inc/ndole.hxx
+++ b/sw/inc/ndole.hxx
@@ -23,7 +23,7 @@
#include <svtools/embedhlp.hxx>
-class SwGrfFmtColl;
+class SwGrfFormatColl;
class SwDoc;
class SwOLENode;
@@ -66,11 +66,11 @@ public:
// SwOLENode
-class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
+class SW_DLLPUBLIC SwOLENode: public SwNoTextNode
{
friend class SwNodes;
mutable SwOLEObj aOLEObj;
- OUString sChartTblName; ///< with chart objects: name of referenced table.
+ OUString sChartTableName; ///< with chart objects: name of referenced table.
bool bOLESizeInvalid; /**< Should be considered at SwDoc::PrtOLENotify
(e.g. copied). Is not persistent. */
@@ -79,28 +79,28 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode
SwOLENode( const SwNodeIndex &rWhere,
const svt::EmbeddedObjectRef&,
- SwGrfFmtColl *pGrfColl,
+ SwGrfFormatColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
SwOLENode( const SwNodeIndex &rWhere,
const OUString &rName,
sal_Int64 nAspect,
- SwGrfFmtColl *pGrfColl,
+ SwGrfFormatColl *pGrfColl,
SwAttrSet* pAutoAttr = 0 );
SwOLENode( const SwOLENode & ) SAL_DELETED_FUNCTION;
- using SwNoTxtNode::GetGraphic;
+ using SwNoTextNode::GetGraphic;
public:
const SwOLEObj& GetOLEObj() const { return aOLEObj; }
SwOLEObj& GetOLEObj() { return aOLEObj; }
virtual ~SwOLENode();
- virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
/// Is in ndcopy.cxx.
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
virtual Size GetTwipSize() const SAL_OVERRIDE;
@@ -133,8 +133,8 @@ public:
// #i99665#
bool IsChart() const;
- OUString GetChartTblName() const { return sChartTblName; }
- void SetChartTblName( const OUString& rNm ) { sChartTblName = rNm; }
+ OUString GetChartTableName() const { return sChartTableName; }
+ void SetChartTableName( const OUString& rNm ) { sChartTableName = rNm; }
};
/// Inline methods from Node.hxx
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 87a29ec1bd7d..94ffd6a7401b 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -44,10 +44,10 @@ namespace utl {
class TransliterationWrapper;
}
-class SwTxtFmtColl;
-class SwCntntFrm;
-class SwTxtFld;
-class SwTxtInputFld;
+class SwTextFormatColl;
+class SwContentFrm;
+class SwTextField;
+class SwTextInputField;
class SfxItemSet;
class SwUndoTransliterate;
struct SwSpellArgs;
@@ -69,14 +69,14 @@ namespace com { namespace sun { namespace star {
typedef std::set< sal_Int32 > SwSoftPageBreakList;
-/// SwTxtNode is a paragraph in the document model.
-class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
+/// SwTextNode is a paragraph in the document model.
+class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
{
- friend class SwCntntNode;
+ friend class SwContentNode;
/// For creating the first TextNode.
- friend class SwDoc; ///< CTOR and AppendTxtNode()
+ friend class SwDoc; ///< CTOR and AppendTextNode()
friend class SwNodes;
- friend class SwTxtFrm;
+ friend class SwTextFrm;
friend class SwScriptInfo;
/** May be 0. It is only then not 0 if it contains hard attributes.
@@ -118,22 +118,22 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
//UUUU DrawingLayer FillAttributes in a preprocessed form for primitive usage
drawinglayer::attribute::SdrAllFillAttributesHelperPtr maFillAttributes;
- SAL_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
+ SAL_DLLPRIVATE SwTextNode( const SwNodeIndex &rWhere, SwTextFormatColl *pTextColl,
const SfxItemSet* pAutoAttr = 0 );
/// Copies the attributes at nStart to pDest.
- SAL_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
+ SAL_DLLPRIVATE void CopyAttr( SwTextNode *pDest, const sal_Int32 nStart, const sal_Int32 nOldPos);
- SAL_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, bool bNext = true,
+ SAL_DLLPRIVATE SwTextNode* _MakeNewTextNode( const SwNodeIndex&, bool bNext = true,
bool bChgFollow = true );
SAL_DLLPRIVATE void CutImpl(
- SwTxtNode * const pDest, const SwIndex & rDestStart,
+ SwTextNode * const pDest, const SwIndex & rDestStart,
const SwIndex & rStart, /*const*/ sal_Int32 nLen,
const bool bUpdate = true );
/// Move all comprising hard attributes to the AttrSet of the paragraph.
- SAL_DLLPRIVATE void MoveTxtAttr_To_AttrSet(); // Called by SplitNode.
+ SAL_DLLPRIVATE void MoveTextAttr_To_AttrSet(); // Called by SplitNode.
/// Create the specific AttrSet.
SAL_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ) SAL_OVERRIDE;
@@ -177,11 +177,11 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
inline void TryDeleteSwpHints();
- SAL_DLLPRIVATE void impl_FmtToTxtAttr(const SfxItemSet& i_rAttrSet);
+ SAL_DLLPRIVATE void impl_FormatToTextAttr(const SfxItemSet& i_rAttrSet);
- const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) const;
+ const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const;
- void DelFrms_TxtNodePart();
+ void DelFrms_TextNodePart();
public:
bool IsWordCountDirty() const;
@@ -206,14 +206,14 @@ public:
/// End: Data collected during idle time
protected:
- /// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
+ /// for hanging TextFormatCollections somewhere else (Outline-Numbering!)
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
public:
- using SwCntntNode::GetAttr;
+ using SwContentNode::GetAttr;
- const OUString& GetTxt() const { return m_Text; }
+ const OUString& GetText() const { return m_Text; }
// returns the maximum number of characters that can still be added to the node
inline sal_Int32 GetSpaceLeft() const;
@@ -226,7 +226,7 @@ public:
inline bool HasHints() const { return m_pSwpHints != nullptr; }
inline SwpHints &GetOrCreateSwpHints();
- virtual ~SwTxtNode();
+ virtual ~SwTextNode();
virtual sal_Int32 Len() const SAL_OVERRIDE;
@@ -270,7 +270,7 @@ public:
only the ones which have exactly same range. Don't delete the ones
which are simply included in the range.
*/
- void RstTxtAttr(
+ void RstTextAttr(
const SwIndex &rIdx,
const sal_Int32 nLen,
const sal_uInt16 nWhich = 0,
@@ -280,7 +280,7 @@ public:
void GCAttr();
// Delete text attribute (needs to be deregistered at Pool!)
- void DestroyAttr( SwTxtAttr* pAttr );
+ void DestroyAttr( SwTextAttr* pAttr );
// delete all attributes from SwpHintsArray.
void ClearSwpHintsArr( bool bDelFields );
@@ -289,16 +289,16 @@ public:
void FileLoadedInitHints();
/// Insert pAttr into hints array. @return true iff inserted successfully
- bool InsertHint( SwTxtAttr * const pAttr,
+ bool InsertHint( SwTextAttr * const pAttr,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
/// create new text attribute from rAttr and insert it
/// @return inserted hint; 0 if not sure the hint is inserted
- SwTxtAttr* InsertItem( SfxPoolItem& rAttr,
+ SwTextAttr* InsertItem( SfxPoolItem& rAttr,
const sal_Int32 nStart, const sal_Int32 nEnd,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
/** Set these attributes at TextNode. If the whole range is comprised
- set them only in AutoAttrSet (SwCntntNode::SetAttr). */
+ set them only in AutoAttrSet (SwContentNode::SetAttr). */
bool SetAttr( const SfxItemSet& rSet,
sal_Int32 nStt, sal_Int32 nEnd,
const SetAttrMode nMode = SetAttrMode::DEFAULT );
@@ -306,38 +306,38 @@ public:
Introduce 4th optional parameter <bMergeIndentValuesOfNumRule>.
If <bMergeIndentValuesOfNumRule> == true, the indent attributes of
the corresponding list level of an applied list style is merged into
- the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == false,
+ the requested item set as a LR-SPACE item, if <bOnlyTextAttr> == false,
corresponding node has not its own indent attributes and the
position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. */
bool GetAttr( SfxItemSet& rSet, sal_Int32 nStt, sal_Int32 nEnd,
- const bool bOnlyTxtAttr = false,
- const bool bGetFromChrFmt = true,
+ const bool bOnlyTextAttr = false,
+ const bool bGetFromChrFormat = true,
const bool bMergeIndentValuesOfNumRule = false ) const;
- /// Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray.
- void FmtToTxtAttr( SwTxtNode* pNd );
+ /// Convey attributes of an AttrSet (AutoFormat) to SwpHintsArray.
+ void FormatToTextAttr( SwTextNode* pNd );
/// delete all attributes of type nWhich at nStart (opt. end nEnd)
void DeleteAttributes( const sal_uInt16 nWhich,
const sal_Int32 nStart, const sal_Int32 nEnd = 0 );
- /// delete the attribute pTxtAttr
- void DeleteAttribute ( SwTxtAttr * const pTxtAttr );
+ /// delete the attribute pTextAttr
+ void DeleteAttribute ( SwTextAttr * const pTextAttr );
/** Actions on text and attributes.
introduce optional parameter to control, if all attributes have to be copied. */
- void CopyText( SwTxtNode * const pDest,
+ void CopyText( SwTextNode * const pDest,
const SwIndex &rStart,
const sal_Int32 nLen,
const bool bForceCopyOfAllAttrs = false );
- void CopyText( SwTxtNode * const pDest,
+ void CopyText( SwTextNode * const pDest,
const SwIndex &rDestStart,
const SwIndex &rStart,
sal_Int32 nLen,
const bool bForceCopyOfAllAttrs = false );
- void CutText(SwTxtNode * const pDest,
+ void CutText(SwTextNode * const pDest,
const SwIndex & rStart, const sal_Int32 nLen);
- inline void CutText(SwTxtNode * const pDest, const SwIndex &rDestStart,
+ inline void CutText(SwTextNode * const pDest, const SwIndex &rDestStart,
const SwIndex & rStart, const sal_Int32 nLen);
/// replace nDelLen characters at rStart with rText
@@ -349,19 +349,19 @@ public:
const OUString& rText,
const ::com::sun::star::uno::Sequence<sal_Int32>& rOffsets );
- /// Virtual methods from CntntNode.
- virtual SwCntntFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
- virtual SwCntntNode *SplitCntntNode( const SwPosition & ) SAL_OVERRIDE;
- virtual SwCntntNode *JoinNext() SAL_OVERRIDE;
- virtual SwCntntNode *JoinPrev() SAL_OVERRIDE;
+ /// Virtual methods from ContentNode.
+ virtual SwContentFrm *MakeFrm( SwFrm* ) SAL_OVERRIDE;
+ virtual SwContentNode *SplitContentNode( const SwPosition & ) SAL_OVERRIDE;
+ virtual SwContentNode *JoinNext() SAL_OVERRIDE;
+ virtual SwContentNode *JoinPrev() SAL_OVERRIDE;
- SwCntntNode *AppendNode( const SwPosition & );
+ SwContentNode *AppendNode( const SwPosition & );
/// When appropriate set DontExpand-flag at INet or character styles respectively.
- bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
- bool bFmtToTxtAttributes = true );
+ bool DontExpandFormat( const SwIndex& rIdx, bool bFlag = true,
+ bool bFormatToTextAttributes = true );
- enum GetTxtAttrMode {
+ enum GetTextAttrMode {
DEFAULT, /// DEFAULT: (Start <= nIndex < End)
EXPAND, /// EXPAND : (Start < nIndex <= End)
PARENT, /// PARENT : (Start < nIndex < End)
@@ -369,25 +369,25 @@ public:
/** get the innermost text attribute covering position nIndex.
@param nWhich only attribute with this id is returned.
- @param eMode the predicate for matching (@see GetTxtAttrMode).
+ @param eMode the predicate for matching (@see GetTextAttrMode).
ATTENTION: this function is not well-defined for those
hints of which several may cover a single position, like
RES_TXTATR_CHARFMT, RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK
*/
- SwTxtAttr *GetTxtAttrAt(
+ SwTextAttr *GetTextAttrAt(
sal_Int32 const nIndex,
RES_TXTATR const nWhich,
- enum GetTxtAttrMode const eMode = DEFAULT ) const;
+ enum GetTextAttrMode const eMode = DEFAULT ) const;
/** get the innermost text attributes covering position nIndex.
@param nWhich only attributes with this id are returned.
- @param eMode the predicate for matching (@see GetTxtAttrMode).
+ @param eMode the predicate for matching (@see GetTextAttrMode).
*/
- ::std::vector<SwTxtAttr *> GetTxtAttrsAt(
+ ::std::vector<SwTextAttr *> GetTextAttrsAt(
sal_Int32 const nIndex,
RES_TXTATR const nWhich,
- enum GetTxtAttrMode const eMode = DEFAULT ) const;
+ enum GetTextAttrMode const eMode = DEFAULT ) const;
/** get the text attribute at position nIndex which owns
the dummy character CH_TXTATR_* at that position, if one exists.
@@ -396,27 +396,27 @@ public:
attribute with given which id
@return the text attribute at nIndex of type nWhich, if it exists
*/
- SwTxtAttr *GetTxtAttrForCharAt(
+ SwTextAttr *GetTextAttrForCharAt(
const sal_Int32 nIndex,
const RES_TXTATR nWhich = RES_TXTATR_END ) const;
- SwTxtFld* GetFldTxtAttrAt(
+ SwTextField* GetFieldTextAttrAt(
const sal_Int32 nIndex,
- const bool bIncludeInputFldAtStart = false ) const;
+ const bool bIncludeInputFieldAtStart = false ) const;
OUString GetCurWord(sal_Int32) const;
bool Spell(SwSpellArgs*);
bool Convert( SwConversionArgs & );
- inline SwTxtFmtColl *GetTxtColl() const;
- virtual SwFmtColl *ChgFmtColl( SwFmtColl* ) SAL_OVERRIDE;
- void _ChgTxtCollUpdateNum( const SwTxtFmtColl* pOld,
- const SwTxtFmtColl* pNew );
+ inline SwTextFormatColl *GetTextColl() const;
+ virtual SwFormatColl *ChgFormatColl( SwFormatColl* ) SAL_OVERRIDE;
+ void _ChgTextCollUpdateNum( const SwTextFormatColl* pOld,
+ const SwTextFormatColl* pNew );
/** Copy collection with all auto formats to dest-node.
The latter might be in an other document!
(Method in ndcopy.cxx!!). */
- void CopyCollFmt( SwTxtNode& rDestNd );
+ void CopyCollFormat( SwTextNode& rDestNd );
// BEGIN OF BULLET/NUMBERING/OUTLINE STUFF:
@@ -473,11 +473,11 @@ public:
/**
Returns the additional indents of this text node and its numbering.
- @param bTxtLeft ???
+ @param bTextLeft ???
@return additional indents
*/
- long GetLeftMarginWithNum( bool bTxtLeft = false ) const;
+ long GetLeftMarginWithNum( bool bTextLeft = false ) const;
/**
Returns the combined first line indent of this text node and
@@ -529,7 +529,7 @@ public:
This node is numbered if it has a SwNodeNum and it has a
numbering rule and has not a hidden SwNodeNum.
- ATTENTION: Returns true even if the SwNumFmt has type
+ ATTENTION: Returns true even if the SwNumFormat has type
SVX_NUM_NUMBER_NONE.
@retval true This node is numbered.
@@ -579,7 +579,7 @@ public:
Otherwise the text node has no outline level (NO_NUMBERING).
NOTE: The outline level of text nodes is subject to change. The
- plan is to have an SwTxtNode::nOutlineLevel member that is
+ plan is to have an SwTextNode::nOutlineLevel member that is
updated from a paragraph style upon appliance of that paragraph
style.
@@ -670,9 +670,9 @@ public:
/// in ndcopy.cxx
bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const SAL_OVERRIDE;
- /// Interactive hyphenation: we find TxtFrm and call its CalcHyph.
+ /// Interactive hyphenation: we find TextFrm and call its CalcHyph.
bool Hyphenate( SwInterHyphInfo &rHyphInf );
void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd );
@@ -682,20 +682,20 @@ public:
add 5th optional parameter <bWithSpacesForLevel> indicating, if additional
spaces are inserted in front of the expanded text string depending on
the list level. */
- OUString GetExpandTxt( const sal_Int32 nIdx = 0,
+ OUString GetExpandText( const sal_Int32 nIdx = 0,
const sal_Int32 nLen = -1,
const bool bWithNum = false,
const bool bAddSpaceAfterListLabelStr = false,
const bool bWithSpacesForLevel = false,
- const bool bWithFtn = true ) const;
- bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0,
+ const bool bWithFootnote = true ) const;
+ bool GetExpandText( SwTextNode& rDestNd, const SwIndex* pDestIdx = 0,
sal_Int32 nIdx = 0, sal_Int32 nLen = -1,
- bool bWithNum = false, bool bWithFtn = true,
+ bool bWithNum = false, bool bWithFootnote = true,
bool bReplaceTabsWithSpaces = false ) const;
- OUString GetRedlineTxt( sal_Int32 nIdx = 0,
+ OUString GetRedlineText( sal_Int32 nIdx = 0,
sal_Int32 nLen = SAL_MAX_INT32,
- bool bExpandFlds = false,
+ bool bExpandFields = false,
bool bWithNum = false ) const;
/** @return actual count of initial chars for initial-function.
@@ -800,31 +800,31 @@ public:
sal_uInt32 GetRsid( sal_Int32 nStt, sal_Int32 nEnd ) const;
sal_uInt32 GetParRsid() const;
- bool CompareRsid( const SwTxtNode &rTxtNode, sal_Int32 nStt1, sal_Int32 nStt2,
+ bool CompareRsid( const SwTextNode &rTextNode, sal_Int32 nStt1, sal_Int32 nStt2,
sal_Int32 nEnd1 = 0, sal_Int32 nEnd2 = 0 ) const;
- bool CompareParRsid( const SwTxtNode &rTxtNode ) const;
+ bool CompareParRsid( const SwTextNode &rTextNode ) const;
- DECL_FIXEDMEMPOOL_NEWDEL(SwTxtNode)
+ DECL_FIXEDMEMPOOL_NEWDEL(SwTextNode)
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const SAL_OVERRIDE;
/// In MS Word, the font underline setting of the paragraph end position wont affect the formatting of numbering, so we ignore it
- static bool IsIgnoredCharFmtForNumbering(const sal_uInt16 nWhich);
+ static bool IsIgnoredCharFormatForNumbering(const sal_uInt16 nWhich);
};
-inline SwpHints & SwTxtNode::GetSwpHints()
+inline SwpHints & SwTextNode::GetSwpHints()
{
assert( m_pSwpHints );
return *m_pSwpHints;
}
-inline const SwpHints &SwTxtNode::GetSwpHints() const
+inline const SwpHints &SwTextNode::GetSwpHints() const
{
assert( m_pSwpHints );
return *m_pSwpHints;
}
-inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
+inline SwpHints& SwTextNode::GetOrCreateSwpHints()
{
if ( !m_pSwpHints )
{
@@ -833,7 +833,7 @@ inline SwpHints& SwTxtNode::GetOrCreateSwpHints()
return *m_pSwpHints;
}
-inline void SwTxtNode::TryDeleteSwpHints()
+inline void SwTextNode::TryDeleteSwpHints()
{
if ( m_pSwpHints && m_pSwpHints->CanBeDeleted() )
{
@@ -841,30 +841,30 @@ inline void SwTxtNode::TryDeleteSwpHints()
}
}
-inline SwTxtFmtColl* SwTxtNode::GetTxtColl() const
+inline SwTextFormatColl* SwTextNode::GetTextColl() const
{
- return static_cast<SwTxtFmtColl*>(const_cast<SwModify*>(GetRegisteredIn()));
+ return static_cast<SwTextFormatColl*>(const_cast<SwModify*>(GetRegisteredIn()));
}
/// Inline methods from Node.hxx
-inline SwTxtNode *SwNode::GetTxtNode()
+inline SwTextNode *SwNode::GetTextNode()
{
- return ND_TEXTNODE == nNodeType ? static_cast<SwTxtNode*>(this) : 0;
+ return ND_TEXTNODE == nNodeType ? static_cast<SwTextNode*>(this) : 0;
}
-inline const SwTxtNode *SwNode::GetTxtNode() const
+inline const SwTextNode *SwNode::GetTextNode() const
{
- return ND_TEXTNODE == nNodeType ? static_cast<const SwTxtNode*>(this) : 0;
+ return ND_TEXTNODE == nNodeType ? static_cast<const SwTextNode*>(this) : 0;
}
inline void
-SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex & rDestStart,
+SwTextNode::CutText(SwTextNode * const pDest, const SwIndex & rDestStart,
const SwIndex & rStart, const sal_Int32 nLen)
{
CutImpl( pDest, rDestStart, rStart, nLen, true );
}
-inline sal_Int32 SwTxtNode::GetSpaceLeft() const
+inline sal_Int32 SwTextNode::GetSpaceLeft() const
{
// do not fill the String up to the max - need to be able to have a
// SwPosition "behind" the last character, i.e., at index TXTNODE_MAX + 1
diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx
index cbf71abfe00e..081ccadf1637 100644
--- a/sw/inc/ndtyp.hxx
+++ b/sw/inc/ndtyp.hxx
@@ -33,7 +33,7 @@ const sal_uInt8 ND_OLENODE = 0x20;
const sal_uInt8 ND_SECTIONNODE = 0x40 | ND_STARTNODE; ///< SwSectionNode is derived from SwStartNode.
const sal_uInt8 ND_PLACEHOLDER = 0x80;
-// NoTxtNode (if any of the 2 bits are set).
+// NoTextNode (if any of the 2 bits are set).
const sal_uInt8 ND_NOTXTNODE = ND_GRFNODE | ND_OLENODE;
// ContentNode (if any of the 3 bits are set).
const sal_uInt8 ND_CONTENTNODE = ND_TEXTNODE | ND_NOTXTNODE;
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d27494db31ef..bc8f8d090a31 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -32,19 +32,19 @@
#include <memory>
#include <vector>
-class SwCntntFrm;
-class SwCntntNode;
+class SwContentFrm;
+class SwContentNode;
class SwDoc;
class SwEndNode;
class SwFrm;
-class SwFrmFmt;
+class SwFrameFormat;
class SwGrfNode;
-class SwNoTxtNode;
+class SwNoTextNode;
class SwNodeIndex;
class SwOLENode;
class SwRect;
class SwSection;
-class SwSectionFmt;
+class SwSectionFormat;
class SwTOXBase;
class SwSectionNode;
class SwStartNode;
@@ -53,7 +53,7 @@ class SwRootFrm;
class SwTable;
class SwTableNode;
class SwTableBox;
-class SwTxtNode;
+class SwTextNode;
class SwPageDesc;
class SwViewShell;
struct SwPosition;
@@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwNode
sal_uInt8 nNodeType;
/// For text nodes: level of auto format. Was put here because we had still free bits.
- sal_uInt8 nAFmtNumLvl : 3;
+ sal_uInt8 nAFormatNumLvl : 3;
bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag
@@ -94,10 +94,10 @@ class SW_DLLPUBLIC SwNode
long m_nSerial;
#endif
- /// all SwFrmFmt that are anchored at the node
- /// invariant: SwFrmFmt is in the list iff
- /// SwFrmFmt::GetAnchor().GetCntntAnchor() points to this node
- std::unique_ptr<std::vector<SwFrmFmt*>> m_pAnchoredFlys;
+ /// all SwFrameFormat that are anchored at the node
+ /// invariant: SwFrameFormat is in the list iff
+ /// SwFrameFormat::GetAnchor().GetContentAnchor() points to this node
+ std::unique_ptr<std::vector<SwFrameFormat*>> m_pAnchoredFlys;
protected:
SwStartNode* pStartOfSection;
@@ -126,8 +126,8 @@ public:
inline const SwEndNode* EndOfSectionNode() const;
inline SwEndNode* EndOfSectionNode();
- inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; }
- inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; }
+ inline sal_uInt8 GetAutoFormatLvl() const { return nAFormatNumLvl; }
+ inline void SetAutoFormatLvl( sal_uInt8 nVal ) { nAFormatNumLvl = nVal; }
inline bool IsSetNumLSpace() const { return bSetNumLSpace; }
inline void SetNumLSpace( bool bFlag ) { bSetNumLSpace = bFlag; }
@@ -139,16 +139,16 @@ public:
inline SwStartNode *GetStartNode();
inline const SwStartNode *GetStartNode() const;
- inline SwCntntNode *GetCntntNode();
- inline const SwCntntNode *GetCntntNode() const;
+ inline SwContentNode *GetContentNode();
+ inline const SwContentNode *GetContentNode() const;
inline SwEndNode *GetEndNode();
inline const SwEndNode *GetEndNode() const;
- inline SwTxtNode *GetTxtNode();
- inline const SwTxtNode *GetTxtNode() const;
+ inline SwTextNode *GetTextNode();
+ inline const SwTextNode *GetTextNode() const;
inline SwOLENode *GetOLENode();
inline const SwOLENode *GetOLENode() const;
- inline SwNoTxtNode *GetNoTxtNode();
- inline const SwNoTxtNode *GetNoTxtNode() const;
+ inline SwNoTextNode *GetNoTextNode();
+ inline const SwNoTextNode *GetNoTextNode() const;
inline SwGrfNode *GetGrfNode();
inline const SwGrfNode *GetGrfNode() const;
inline SwTableNode *GetTableNode();
@@ -157,13 +157,13 @@ public:
inline const SwSectionNode *GetSectionNode() const;
inline bool IsStartNode() const;
- inline bool IsCntntNode() const;
+ inline bool IsContentNode() const;
inline bool IsEndNode() const;
- inline bool IsTxtNode() const;
+ inline bool IsTextNode() const;
inline bool IsTableNode() const;
inline bool IsSectionNode() const;
inline bool IsOLENode() const;
- inline bool IsNoTxtNode() const;
+ inline bool IsNoTextNode() const;
inline bool IsGrfNode() const;
/**
@@ -271,20 +271,20 @@ public:
const SwPageDesc* FindPageDesc( bool bCalcLay, size_t* pPgDescNdIdx = 0 ) const;
/// If node is in a fly return the respective format.
- SwFrmFmt* GetFlyFmt() const;
+ SwFrameFormat* GetFlyFormat() const;
/// If node is in a table return the respective table box.
- SwTableBox* GetTblBox() const;
+ SwTableBox* GetTableBox() const;
inline sal_uLong GetIndex() const { return GetPos(); }
- const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
+ const SwTextNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const;
sal_uInt8 HasPrevNextLayNode() const;
- std::vector<SwFrmFmt *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
- void AddAnchoredFly(SwFrmFmt *);
- void RemoveAnchoredFly(SwFrmFmt *);
+ std::vector<SwFrameFormat *> const* GetAnchoredFlys() const { return m_pAnchoredFlys.get(); }
+ void AddAnchoredFly(SwFrameFormat *);
+ void RemoveAnchoredFly(SwFrameFormat *);
/**
* Dumps the node structure to the given destination (file nodes.xml in the current directory by default)
@@ -349,9 +349,9 @@ private:
SwEndNode & operator= ( const SwEndNode & rNode ) SAL_DELETED_FUNCTION;
};
-// SwCntntNode
+// SwContentNode
-class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexReg
+class SW_DLLPUBLIC SwContentNode: public SwModify, public SwNode, public SwIndexReg
{
//FEATURE::CONDCOLL
@@ -360,14 +360,14 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe
mutable bool mbSetModifyAtAttr;
protected:
- SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
- SwFmtColl *pFmtColl );
+ SwContentNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType,
+ SwFormatColl *pFormatColl );
/** the = 0 forces the class to be an abstract base class, but the dtor can be still called
from subclasses */
- virtual ~SwCntntNode() = 0;
+ virtual ~SwContentNode() = 0;
- /** Attribute-set for all auto attributes of a CntntNode.
- (e.g. TxtNode or NoTxtNode). */
+ /** Attribute-set for all auto attributes of a ContentNode.
+ (e.g. TextNode or NoTextNode). */
std::shared_ptr<const SfxItemSet> mpAttrSet;
/// Make respective nodes create the specific AttrSets.
@@ -384,12 +384,12 @@ public:
/** MakeFrm will be called for a certain layout
pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */
- virtual SwCntntFrm *MakeFrm( SwFrm* pSib ) = 0;
+ virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0;
- virtual SwCntntNode *SplitCntntNode(const SwPosition & ) = 0;
+ virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
- virtual SwCntntNode *JoinNext();
- virtual SwCntntNode *JoinPrev();
+ virtual SwContentNode *JoinNext();
+ virtual SwContentNode *JoinPrev();
/** Is it possible to join two nodes?
In pIdx the second position can be returned. */
bool CanJoinNext( SwNodeIndex* pIdx =0 ) const;
@@ -402,7 +402,7 @@ public:
bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
/// Replacement for good old GetFrm(..):
- SwCntntFrm *getLayoutFrm( const SwRootFrm*,
+ SwContentFrm *getLayoutFrm( const SwRootFrm*,
const Point* pDocPos = 0,
const SwPosition *pPos = 0,
const bool bCalcFrm = true ) const;
@@ -417,7 +417,7 @@ public:
/** Method creates all views of document for given node. The content
frames that are created are put in the respective layout. */
- void MakeFrms( SwCntntNode& rNode );
+ void MakeFrms( SwContentNode& rNode );
/** Method deletes all views of document for the node. The content-
frames are removed from the respective layout.
@@ -430,7 +430,7 @@ public:
There are differences between text node and formula node. */
virtual sal_Int32 Len() const;
- virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
+ virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0;
/// Get information from Client.
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -456,13 +456,13 @@ public:
inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); }
inline bool HasSwAttrSet() const { return mpAttrSet != nullptr; }
- virtual SwFmtColl* ChgFmtColl( SwFmtColl* );
- SwFmtColl* GetFmtColl() const { return const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn())); }
+ virtual SwFormatColl* ChgFormatColl( SwFormatColl* );
+ SwFormatColl* GetFormatColl() const { return const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn())); }
//FEATURE::CONDCOLL
- inline SwFmtColl& GetAnyFmtColl() const;
- void SetCondFmtColl( SwFmtColl* );
- inline SwFmtColl* GetCondFmtColl() const;
+ inline SwFormatColl& GetAnyFormatColl() const;
+ void SetCondFormatColl( SwFormatColl* );
+ inline SwFormatColl* GetCondFormatColl() const;
bool IsAnyCondition( SwCollCondition& rTmp ) const;
void ChkCondColl();
@@ -480,14 +480,14 @@ public:
inline void SetModifyAtAttr( bool bSetModifyAtAttr ) const { mbSetModifyAtAttr = bSetModifyAtAttr; }
inline bool GetModifyAtAttr() const { return mbSetModifyAtAttr; }
- static SwOLENodes* CreateOLENodesArray( const SwFmtColl& rColl, bool bOnlyWithInvalidSize );
+ static SwOLENodes* CreateOLENodesArray( const SwFormatColl& rColl, bool bOnlyWithInvalidSize );
//UUUU Access to DrawingLayer FillAttributes in a preprocessed form for primitive usage
virtual drawinglayer::attribute::SdrAllFillAttributesHelperPtr getSdrAllFillAttributesHelper() const;
private:
- SwCntntNode( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
- SwCntntNode & operator= ( const SwCntntNode & rNode ) SAL_DELETED_FUNCTION;
+ SwContentNode( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
+ SwContentNode & operator= ( const SwContentNode & rNode ) SAL_DELETED_FUNCTION;
};
// SwTableNode
@@ -544,7 +544,7 @@ protected:
public:
SwSectionNode(SwNodeIndex const&,
- SwSectionFmt & rFmt, SwTOXBase const*const pTOXBase);
+ SwSectionFormat & rFormat, SwTOXBase const*const pTOXBase);
const SwSection& GetSection() const { return *m_pSection; }
SwSection& GetSection() { return *m_pSection; }
@@ -572,7 +572,7 @@ public:
/** Check for not hidden areas whether there is content that is not in
a hidden sub-area. */
- bool IsCntntHidden() const;
+ bool IsContentHidden() const;
};
@@ -620,20 +620,20 @@ inline const SwSectionNode *SwNode::GetSectionNode() const
{
return ND_SECTIONNODE == nNodeType ? static_cast<const SwSectionNode*>(this) : 0;
}
-inline SwCntntNode *SwNode::GetCntntNode()
+inline SwContentNode *SwNode::GetContentNode()
{
- return ND_CONTENTNODE & nNodeType ? static_cast<SwCntntNode*>(this) : 0;
+ return ND_CONTENTNODE & nNodeType ? static_cast<SwContentNode*>(this) : 0;
}
-inline const SwCntntNode *SwNode::GetCntntNode() const
+inline const SwContentNode *SwNode::GetContentNode() const
{
- return ND_CONTENTNODE & nNodeType ? static_cast<const SwCntntNode*>(this) : 0;
+ return ND_CONTENTNODE & nNodeType ? static_cast<const SwContentNode*>(this) : 0;
}
inline bool SwNode::IsStartNode() const
{
return (ND_STARTNODE & nNodeType) != 0;
}
-inline bool SwNode::IsCntntNode() const
+inline bool SwNode::IsContentNode() const
{
return (ND_CONTENTNODE & nNodeType) != 0;
}
@@ -641,7 +641,7 @@ inline bool SwNode::IsEndNode() const
{
return ND_ENDNODE == nNodeType;
}
-inline bool SwNode::IsTxtNode() const
+inline bool SwNode::IsTextNode() const
{
return ND_TEXTNODE == nNodeType;
}
@@ -653,7 +653,7 @@ inline bool SwNode::IsSectionNode() const
{
return ND_SECTIONNODE == nNodeType;
}
-inline bool SwNode::IsNoTxtNode() const
+inline bool SwNode::IsNoTextNode() const
{
return (ND_NOTXTNODE & nNodeType) != 0;
}
@@ -716,26 +716,26 @@ inline const SwDoc* SwNode::GetDoc() const
return GetNodes().GetDoc();
}
-inline SwFmtColl* SwCntntNode::GetCondFmtColl() const
+inline SwFormatColl* SwContentNode::GetCondFormatColl() const
{
- return pCondColl ? static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn()) : 0;
+ return pCondColl ? static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn()) : 0;
}
-inline SwFmtColl& SwCntntNode::GetAnyFmtColl() const
+inline SwFormatColl& SwContentNode::GetAnyFormatColl() const
{
return pCondColl && pCondColl->GetRegisteredIn()
- ? *static_cast<SwFmtColl*>(pCondColl->GetRegisteredIn())
- : *const_cast<SwFmtColl*>(static_cast<const SwFmtColl*>(GetRegisteredIn()));
+ ? *static_cast<SwFormatColl*>(pCondColl->GetRegisteredIn())
+ : *const_cast<SwFormatColl*>(static_cast<const SwFormatColl*>(GetRegisteredIn()));
}
-inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const
+inline const SwAttrSet& SwContentNode::GetSwAttrSet() const
{
- return mpAttrSet ? *GetpSwAttrSet() : GetAnyFmtColl().GetAttrSet();
+ return mpAttrSet ? *GetpSwAttrSet() : GetAnyFormatColl().GetAttrSet();
}
//FEATURE::CONDCOLL
-inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich,
+inline const SfxPoolItem& SwContentNode::GetAttr( sal_uInt16 nWhich,
bool bInParents ) const
{
return GetSwAttrSet().Get( nWhich, bInParents );
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index c83d1de861f7..585937dfe188 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -33,7 +33,7 @@
#include <vector>
#include <charfmt.hxx>
-class SwTxtFmtColl;
+class SwTextFormatColl;
class IDocumentListsAccess;
class SwNodeNum;
namespace vcl { class Font; }
@@ -41,15 +41,15 @@ class SvxBrushItem;
class SfxGrabBagItem;
class SvxNumRule;
class SwDoc;
-class SwFmtVertOrient;
-class SwTxtNode;
+class SwFormatVertOrient;
+class SwTextNode;
class Size;
const sal_Unicode cBulletChar = 0x2022; ///< Character for lists.
-class SW_DLLPUBLIC SwNumFmt : public SvxNumberFormat, public SwClient
+class SW_DLLPUBLIC SwNumFormat : public SvxNumberFormat, public SwClient
{
- SwFmtVertOrient* pVertOrient;
+ SwFormatVertOrient* pVertOrient;
//For i120928,record the cp info of graphic within bullet
sal_Unicode cGrfBulletCP;
SAL_DLLPRIVATE void UpdateNumNodes( SwDoc* pDoc );
@@ -62,22 +62,22 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
- SwNumFmt();
- SwNumFmt( const SwNumFmt& );
- SwNumFmt( const SvxNumberFormat&, SwDoc* pDoc);
+ SwNumFormat();
+ SwNumFormat( const SwNumFormat& );
+ SwNumFormat( const SvxNumberFormat&, SwDoc* pDoc);
- virtual ~SwNumFmt();
+ virtual ~SwNumFormat();
- SwNumFmt& operator=( const SwNumFmt& );
+ SwNumFormat& operator=( const SwNumFormat& );
- bool operator==( const SwNumFmt& ) const;
- bool operator!=( const SwNumFmt& r ) const { return !(*this == r); }
+ bool operator==( const SwNumFormat& ) const;
+ bool operator!=( const SwNumFormat& r ) const { return !(*this == r); }
- SwCharFmt* GetCharFmt() const { return const_cast<SwCharFmt*>(static_cast<const SwCharFmt*>(GetRegisteredIn())); }
- void SetCharFmt( SwCharFmt* );
+ SwCharFormat* GetCharFormat() const { return const_cast<SwCharFormat*>(static_cast<const SwCharFormat*>(GetRegisteredIn())); }
+ void SetCharFormat( SwCharFormat* );
- void SetCharFmtName(const OUString& rSet);
- virtual OUString GetCharFmtName() const SAL_OVERRIDE;
+ void SetCharFormatName(const OUString& rSet);
+ virtual OUString GetCharFormatName() const SAL_OVERRIDE;
//For i120928,access the cp info of graphic within bullet
void SetGrfBulletCP(sal_Unicode cP){cGrfBulletCP = cP;}
@@ -87,7 +87,7 @@ public:
virtual void SetVertOrient(sal_Int16 eSet) SAL_OVERRIDE;
virtual sal_Int16 GetVertOrient() const SAL_OVERRIDE;
- const SwFmtVertOrient* GetGraphicOrientation() const;
+ const SwFormatVertOrient* GetGraphicOrientation() const;
bool IsEnumeration() const; // #i22362#
bool IsItemize() const; // #i29560#
@@ -99,8 +99,8 @@ class SW_DLLPUBLIC SwNumRule
{
public:
- typedef std::vector< SwTxtNode* > tTxtNodeList;
- typedef std::vector< SwTxtFmtColl* > tParagraphStyleList;
+ typedef std::vector< SwTextNode* > tTextNodeList;
+ typedef std::vector< SwTextFormatColl* > tParagraphStyleList;
struct Extremities
{
@@ -111,16 +111,16 @@ public:
private:
friend void _FinitCore();
- static SwNumFmt* maBaseFmts [ RULE_END ][ MAXLEVEL ];
+ static SwNumFormat* maBaseFormats [ RULE_END ][ MAXLEVEL ];
static const sal_uInt16 maDefNumIndents[ MAXLEVEL ];
/// default list level properties for position-and-space mode LABEL_ALIGNMENT
- static SwNumFmt* maLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ];
+ static SwNumFormat* maLabelAlignmentBaseFormats [ RULE_END ][ MAXLEVEL ];
static sal_uInt16 mnRefCount;
- SwNumFmt* maFmts[ MAXLEVEL ];
+ SwNumFormat* maFormats[ MAXLEVEL ];
/** container for associated text nodes */
- tTxtNodeList maTxtNodeList;
+ tTextNodeList maTextNodeList;
/** container for associated paragraph styles */
tParagraphStyleList maParagraphStyleList;
@@ -130,7 +130,7 @@ private:
OUString msName;
SwNumRuleType meRuleType;
- sal_uInt16 mnPoolFmtId; ///< Id-for NumRules created "automatically"
+ sal_uInt16 mnPoolFormatId; ///< Id-for NumRules created "automatically"
sal_uInt16 mnPoolHelpId; ///< HelpId for this Pool-style.
sal_uInt8 mnPoolHlpFileId; ///< FilePos at Doc on style helps.
bool mbAutoRuleFlag : 1;
@@ -158,14 +158,14 @@ public:
bool operator==( const SwNumRule& ) const;
bool operator!=( const SwNumRule& r ) const { return !(*this == r); }
- const SwNumFmt* GetNumFmt( sal_uInt16 i ) const;
- const SwNumFmt& Get( sal_uInt16 i ) const;
+ const SwNumFormat* GetNumFormat( sal_uInt16 i ) const;
+ const SwNumFormat& Get( sal_uInt16 i ) const;
bool IsHidden( ) const { return mbHidden; }
void SetHidden( bool bValue ) { mbHidden = bValue; }
- void Set( sal_uInt16 i, const SwNumFmt* );
- void Set( sal_uInt16 i, const SwNumFmt& );
+ void Set( sal_uInt16 i, const SwNumFormat* );
+ void Set( sal_uInt16 i, const SwNumFormat& );
OUString MakeNumString( const SwNodeNum&, bool bInclStrings = true,
bool bOnlyArabic = false ) const;
/** - add optional parameter <_nRestrictToThisLevel> in order to
@@ -183,15 +183,15 @@ public:
@return list of associated text nodes
*/
- void GetTxtNodeList( SwNumRule::tTxtNodeList& rTxtNodeList ) const;
- SwNumRule::tTxtNodeList::size_type GetTxtNodeListSize() const;
+ void GetTextNodeList( SwNumRule::tTextNodeList& rTextNodeList ) const;
+ SwNumRule::tTextNodeList::size_type GetTextNodeListSize() const;
- void AddTxtNode( SwTxtNode& rTxtNode );
- void RemoveTxtNode( SwTxtNode& rTxtNode );
+ void AddTextNode( SwTextNode& rTextNode );
+ void RemoveTextNode( SwTextNode& rTextNode );
SwNumRule::tParagraphStyleList::size_type GetParagraphStyleListSize() const;
- void AddParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
- void RemoveParagraphStyle( SwTxtFmtColl& rTxtFmtColl );
+ void AddParagraphStyle( SwTextFormatColl& rTextFormatColl );
+ void RemoveParagraphStyle( SwTextFormatColl& rTextFormatColl );
inline void SetDefaultListId( const OUString& sDefaultListId )
{
@@ -225,7 +225,7 @@ public:
/** Tests whether the CharFormats are from the given doc
and copies them if appropriate. */
- void CheckCharFmts( SwDoc* pDoc );
+ void CheckCharFormats( SwDoc* pDoc );
OUString GetName() const { return msName; }
@@ -250,8 +250,8 @@ public:
void SetCountPhantoms(bool bCountPhantoms);
/// Query and set PoolFormat IDs.
- sal_uInt16 GetPoolFmtId() const { return mnPoolFmtId; }
- void SetPoolFmtId( sal_uInt16 nId ) { mnPoolFmtId = nId; }
+ sal_uInt16 GetPoolFormatId() const { return mnPoolFormatId; }
+ void SetPoolFormatId( sal_uInt16 nId ) { mnPoolFormatId = nId; }
/// Query and set Help-IDs for document styles.
sal_uInt16 GetPoolHelpId() const { return mnPoolHelpId; }
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index b25e9af8ca11..5bdb73884dbf 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -28,11 +28,11 @@
#include <editeng/borderline.hxx>
class SfxPoolItem;
-class SwTxtFmtColl;
+class SwTextFormatColl;
class SwNode;
/// Separator line adjustment.
-enum SwFtnAdj
+enum SwFootnoteAdj
{
FTNADJ_LEFT,
FTNADJ_CENTER,
@@ -40,7 +40,7 @@ enum SwFtnAdj
};
/// Footnote information.
-class SW_DLLPUBLIC SwPageFtnInfo
+class SW_DLLPUBLIC SwPageFootnoteInfo
{
private:
SwTwips m_nMaxHeight; ///< maximum height of the footnote area.
@@ -48,7 +48,7 @@ private:
editeng::SvxBorderStyle m_eLineStyle; ///< Style of the separator line
Color m_LineColor; ///< color of the separator line
Fraction m_Width; ///< percentage width of the separator line.
- SwFtnAdj m_eAdjust; ///< line adjustment.
+ SwFootnoteAdj m_eAdjust; ///< line adjustment.
SwTwips m_nTopDist; ///< distance between body and separator.
SwTwips m_nBottomDist; ///< distance between separator and first footnote
@@ -58,7 +58,7 @@ public:
const Color& GetLineColor() const { return m_LineColor;}
editeng::SvxBorderStyle GetLineStyle() const { return m_eLineStyle; }
const Fraction& GetWidth() const { return m_Width; }
- SwFtnAdj GetAdj() const { return m_eAdjust; }
+ SwFootnoteAdj GetAdj() const { return m_eAdjust; }
SwTwips GetTopDist() const { return m_nTopDist; }
SwTwips GetBottomDist() const { return m_nBottomDist; }
@@ -67,19 +67,19 @@ public:
void SetLineStyle(editeng::SvxBorderStyle const eSet) {m_eLineStyle = eSet;}
void SetLineColor(const Color& rCol) { m_LineColor = rCol;}
void SetWidth(const Fraction & rNew) { m_Width = rNew; }
- void SetAdj(SwFtnAdj const eNew) { m_eAdjust = eNew; }
+ void SetAdj(SwFootnoteAdj const eNew) { m_eAdjust = eNew; }
void SetTopDist (SwTwips const nNew) { m_nTopDist = nNew; }
void SetBottomDist(SwTwips const nNew) { m_nBottomDist = nNew; }
- SwPageFtnInfo();
- SwPageFtnInfo( const SwPageFtnInfo& );
- SwPageFtnInfo& operator=( const SwPageFtnInfo& );
+ SwPageFootnoteInfo();
+ SwPageFootnoteInfo( const SwPageFootnoteInfo& );
+ SwPageFootnoteInfo& operator=( const SwPageFootnoteInfo& );
- bool operator ==( const SwPageFtnInfo& ) const;
+ bool operator ==( const SwPageFootnoteInfo& ) const;
};
/*
- * Use of UseOnPage (m_eUse) and of FrmFmts
+ * Use of UseOnPage (m_eUse) and of FrameFormats
*
* RIGHT - m_Master only for right hand (odd) pages, left hand (even) pages
* always empty.
@@ -134,11 +134,11 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
OUString m_StyleName;
SvxNumberType m_NumType;
- SwFrmFmt m_Master;
- SwFrmFmt m_Left;
+ SwFrameFormat m_Master;
+ SwFrameFormat m_Left;
// FIXME epicycles growing here - page margins need to be stored differently
- SwFrmFmt m_FirstMaster;
- SwFrmFmt m_FirstLeft;
+ SwFrameFormat m_FirstMaster;
+ SwFrameFormat m_FirstLeft;
SwDepend m_Depend; ///< Because of grid alignment (Registerhaltigkeit).
SwPageDesc *m_pFollow;
sal_uInt16 m_nRegHeight; ///< Sentence spacing and fontascent of style.
@@ -148,7 +148,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
bool m_IsHidden;
/// Footnote information.
- SwPageFtnInfo m_IsFtnInfo;
+ SwPageFootnoteInfo m_IsFootnoteInfo;
/** Called for mirroring of Chg (doc).
No adjustment at any other place. */
@@ -156,7 +156,7 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify
SAL_DLLPRIVATE void ResetAllAttr( bool bLeft );
- SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrmFmt*, SwDoc *pDc );
+ SAL_DLLPRIVATE SwPageDesc(const OUString&, SwFrameFormat*, SwDoc *pDc );
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue ) SAL_OVERRIDE;
@@ -172,9 +172,9 @@ public:
const SvxNumberType &GetNumType() const { return m_NumType; }
void SetNumType(const SvxNumberType& rNew) { m_NumType = rNew; }
- const SwPageFtnInfo &GetFtnInfo() const { return m_IsFtnInfo; }
- SwPageFtnInfo &GetFtnInfo() { return m_IsFtnInfo; }
- void SetFtnInfo(const SwPageFtnInfo &rNew) { m_IsFtnInfo = rNew; }
+ const SwPageFootnoteInfo &GetFootnoteInfo() const { return m_IsFootnoteInfo; }
+ SwPageFootnoteInfo &GetFootnoteInfo() { return m_IsFootnoteInfo; }
+ void SetFootnoteInfo(const SwPageFootnoteInfo &rNew) { m_IsFootnoteInfo = rNew; }
inline bool IsHeaderShared() const;
inline bool IsFooterShared() const;
@@ -192,14 +192,14 @@ public:
void WriteUseOn(UseOnPage const eNew) { m_eUse = eNew; }
UseOnPage ReadUseOn() const { return m_eUse; }
- SwFrmFmt &GetMaster() { return m_Master; }
- SwFrmFmt &GetLeft() { return m_Left; }
- SwFrmFmt &GetFirstMaster() { return m_FirstMaster; }
- SwFrmFmt &GetFirstLeft() { return m_FirstLeft; }
- const SwFrmFmt &GetMaster() const { return m_Master; }
- const SwFrmFmt &GetLeft() const { return m_Left; }
- const SwFrmFmt &GetFirstMaster() const { return m_FirstMaster; }
- const SwFrmFmt &GetFirstLeft() const { return m_FirstLeft; }
+ SwFrameFormat &GetMaster() { return m_Master; }
+ SwFrameFormat &GetLeft() { return m_Left; }
+ SwFrameFormat &GetFirstMaster() { return m_FirstMaster; }
+ SwFrameFormat &GetFirstLeft() { return m_FirstLeft; }
+ const SwFrameFormat &GetMaster() const { return m_Master; }
+ const SwFrameFormat &GetLeft() const { return m_Left; }
+ const SwFrameFormat &GetFirstMaster() const { return m_FirstMaster; }
+ const SwFrameFormat &GetFirstLeft() const { return m_FirstLeft; }
/** Reset all attrs of the format but keep the ones a pagedesc
cannot live without. */
@@ -208,10 +208,10 @@ public:
/** Layout uses the following methods to obtain a format in order
to be able to create a page. */
- SwFrmFmt *GetRightFmt(bool const bFirst = false);
- inline const SwFrmFmt *GetRightFmt(bool const bFirst = false) const;
- SwFrmFmt *GetLeftFmt(bool const bFirst = false);
- inline const SwFrmFmt *GetLeftFmt(bool const bFirst = false) const;
+ SwFrameFormat *GetRightFormat(bool const bFirst = false);
+ inline const SwFrameFormat *GetRightFormat(bool const bFirst = false) const;
+ SwFrameFormat *GetLeftFormat(bool const bFirst = false);
+ inline const SwFrameFormat *GetLeftFormat(bool const bFirst = false) const;
sal_uInt16 GetRegHeight() const { return m_nRegHeight; }
sal_uInt16 GetRegAscent() const { return m_nRegAscent; }
@@ -222,13 +222,13 @@ public:
const SwPageDesc* GetFollow() const { return m_pFollow; }
SwPageDesc* GetFollow() { return m_pFollow; }
- void SetRegisterFmtColl( const SwTxtFmtColl* rFmt );
- const SwTxtFmtColl* GetRegisterFmtColl() const;
+ void SetRegisterFormatColl( const SwTextFormatColl* rFormat );
+ const SwTextFormatColl* GetRegisterFormatColl() const;
void RegisterChange();
/// Query and set PoolFormat-Id.
- sal_uInt16 GetPoolFmtId() const { return m_Master.GetPoolFmtId(); }
- void SetPoolFmtId(sal_uInt16 const nId) { m_Master.SetPoolFmtId(nId); }
+ sal_uInt16 GetPoolFormatId() const { return m_Master.GetPoolFormatId(); }
+ void SetPoolFormatId(sal_uInt16 const nId) { m_Master.SetPoolFormatId(nId); }
sal_uInt16 GetPoolHelpId() const { return m_Master.GetPoolHelpId(); }
void SetPoolHelpId(sal_uInt16 const nId){ m_Master.SetPoolHelpId(nId); }
sal_uInt8 GetPoolHlpFileId() const { return m_Master.GetPoolHlpFileId(); }
@@ -237,7 +237,7 @@ public:
/// Query information from Client.
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
- const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd,
+ const SwFrameFormat* GetPageFormatOfNode( const SwNode& rNd,
bool bCheckForThisPgDc = true ) const;
bool IsFollowNextPageOfNode( const SwNode& rNd ) const;
@@ -310,13 +310,13 @@ inline void SwPageDesc::ResetAllLeftAttr()
ResetAllAttr( true );
}
-inline const SwFrmFmt *SwPageDesc::GetRightFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetRightFormat(bool const bFirst) const
{
- return const_cast<SwPageDesc*>(this)->GetRightFmt(bFirst);
+ return const_cast<SwPageDesc*>(this)->GetRightFormat(bFirst);
}
-inline const SwFrmFmt *SwPageDesc::GetLeftFmt(bool const bFirst) const
+inline const SwFrameFormat *SwPageDesc::GetLeftFormat(bool const bFirst) const
{
- return const_cast<SwPageDesc*>(this)->GetLeftFmt(bFirst);
+ return const_cast<SwPageDesc*>(this)->GetLeftFormat(bFirst);
}
class SwPageDescExt
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 916e4e0a585e..451895460a67 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -30,12 +30,12 @@
#include <iostream>
-class SwFmt;
+class SwFormat;
class SfxPoolItem;
class SfxItemSet;
class SwDoc;
class SwNode;
-class SwCntntNode;
+class SwContentNode;
class SwPaM;
class Point;
@@ -53,10 +53,10 @@ struct SW_DLLPUBLIC SwPosition
SwNodeIndex nNode;
SwIndex nContent;
- SwPosition( const SwNodeIndex &rNode, const SwIndex &rCntnt );
+ SwPosition( const SwNodeIndex &rNode, const SwIndex &rContent );
explicit SwPosition( const SwNodeIndex &rNode );
explicit SwPosition( const SwNode& rNode );
- explicit SwPosition( SwCntntNode& rNode, const sal_Int32 nOffset = 0 );
+ explicit SwPosition( SwContentNode& rNode, const sal_Int32 nOffset = 0 );
SwPosition( const SwPosition & );
SwPosition &operator=(const SwPosition &);
@@ -147,10 +147,10 @@ typedef bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove );
SW_DLLPUBLIC extern SwGoInDoc fnGoDoc;
extern SwGoInDoc fnGoSection;
SW_DLLPUBLIC extern SwGoInDoc fnGoNode;
-SW_DLLPUBLIC extern SwGoInDoc fnGoCntnt; ///< SwPam::Move() default argument.
-extern SwGoInDoc fnGoCntntCells;
-extern SwGoInDoc fnGoCntntSkipHidden;
-extern SwGoInDoc fnGoCntntCellsSkipHidden;
+SW_DLLPUBLIC extern SwGoInDoc fnGoContent; ///< SwPam::Move() default argument.
+extern SwGoInDoc fnGoContentCells;
+extern SwGoInDoc fnGoContentSkipHidden;
+extern SwGoInDoc fnGoContentCellsSkipHidden;
void _InitPam();
@@ -175,12 +175,12 @@ public:
long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
SwPaM( const SwNode& rMk, const SwNode& rPt,
long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = 0 );
- SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkCntnt,
- const SwNodeIndex& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
- SwPaM( const SwNode& rMk, sal_Int32 nMkCntnt,
- const SwNode& rPt, sal_Int32 nPtCntnt, SwPaM* pRing = 0 );
- SwPaM( const SwNode& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
- SwPaM( const SwNodeIndex& rNd, sal_Int32 nCntnt = 0, SwPaM* pRing = 0 );
+ SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkContent,
+ const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+ SwPaM( const SwNode& rMk, sal_Int32 nMkContent,
+ const SwNode& rPt, sal_Int32 nPtContent, SwPaM* pRing = 0 );
+ SwPaM( const SwNode& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
+ SwPaM( const SwNodeIndex& rNd, sal_Int32 nContent = 0, SwPaM* pRing = 0 );
virtual ~SwPaM();
/// this takes a second parameter, which indicates the Ring that
@@ -191,15 +191,15 @@ public:
/// Movement of cursor.
bool Move( SwMoveFn fnMove = fnMoveForward,
- SwGoInDoc fnGo = fnGoCntnt );
+ SwGoInDoc fnGo = fnGoContent );
/// Search.
bool Find( const com::sun::star::util::SearchOptions& rSearchOpt,
bool bSearchInNotes,
- utl::TextSearch& rSTxt,
+ utl::TextSearch& rSText,
SwMoveFn fnMove = fnMoveForward,
const SwPaM *pPam =0, bool bInReadOnly = false);
- bool Find( const SwFmt& rFmt,
+ bool Find( const SwFormat& rFormat,
SwMoveFn fnMove = fnMoveForward,
const SwPaM *pPam =0, bool bInReadOnly = false);
bool Find( const SfxPoolItem& rAttr, bool bValue = true,
@@ -209,9 +209,9 @@ public:
SwMoveFn fnMove,
const SwPaM *pPam, bool bInReadOnly, bool bMoveFirst );
- bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+ bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSText,
SwMoveFn fnMove, bool bSrchForward, bool bRegSearch, bool bChkEmptyPara, bool bChkParaEnd,
- sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen, SwNode* pNode, SwPaM* pPam);
+ sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen, SwNode* pNode, SwPaM* pPam);
inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; }
inline void _SetInFrontOfLabel( bool bNew ) { m_bIsInFrontOfLabel = bNew; }
@@ -271,9 +271,9 @@ public:
}
/// @return current ContentNode at Point/Mark
- SwCntntNode* GetCntntNode( bool bPoint = true ) const
+ SwContentNode* GetContentNode( bool bPoint = true ) const
{
- return GetNode(bPoint).GetCntntNode();
+ return GetNode(bPoint).GetContentNode();
}
/**
@@ -306,7 +306,7 @@ public:
DECL_FIXEDMEMPOOL_NEWDEL(SwPaM);
- OUString GetTxt() const;
+ OUString GetText() const;
void InvalidatePaM();
SwPaM* GetNext()
{ return GetNextInRing(); }
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 6fbe6c99415d..d0a11094c25a 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -40,35 +40,35 @@
#include <editeng/paravertalignitem.hxx>
#include <editeng/pgrditem.hxx>
-class SwCharFmt;
+class SwCharFormat;
class IntlWrapper;
#define DROP_WHOLEWORD ((sal_uInt16)0x0001)
-/** If SwFmtDrop is a Client, it is the CharFmt that describes the font for the
- DropCaps. If it is not a Client, formatting uses the CharFmt of the paragraph.
- If the CharFmt is modified, this change is propagated to the paragraphs
- via the Modify of SwFmtDrop. */
-class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient
+/** If SwFormatDrop is a Client, it is the CharFormat that describes the font for the
+ DropCaps. If it is not a Client, formatting uses the CharFormat of the paragraph.
+ If the CharFormat is modified, this change is propagated to the paragraphs
+ via the Modify of SwFormatDrop. */
+class SW_DLLPUBLIC SwFormatDrop: public SfxPoolItem, public SwClient
{
SwModify* pDefinedIn; /**< Modify-Object, that contains DropCaps.
- Can only be TxtFmtCollection/TxtNode. */
+ Can only be TextFormatCollection/TextNode. */
sal_uInt16 nDistance; ///< Distance to beginning of text.
- sal_uInt16 nReadFmt; ///< For Sw3-Reader: CharFormat-Id (load Pool!).
+ sal_uInt16 nReadFormat; ///< For Sw3-Reader: CharFormat-Id (load Pool!).
sal_uInt8 nLines; ///< Line count.
sal_uInt8 nChars; ///< Character count.
bool bWholeWord; ///< First word with initials.
public:
TYPEINFO_OVERRIDE(); ///< Already in base class SwClient.
- SwFmtDrop();
- virtual ~SwFmtDrop();
+ SwFormatDrop();
+ virtual ~SwFormatDrop();
// @@@ public copy ctor, but no copy assignment?
- SwFmtDrop( const SwFmtDrop & );
+ SwFormatDrop( const SwFormatDrop & );
private:
// @@@ public copy ctor, but no copy assignment?
- SwFmtDrop & operator= (const SwFmtDrop &) SAL_DELETED_FUNCTION;
+ SwFormatDrop & operator= (const SwFormatDrop &) SAL_DELETED_FUNCTION;
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
@@ -98,9 +98,9 @@ public:
inline sal_uInt16 GetDistance() const { return nDistance; }
inline sal_uInt16 &GetDistance() { return nDistance; }
- inline const SwCharFmt *GetCharFmt() const { return static_cast<const SwCharFmt*>(GetRegisteredIn()); }
- inline SwCharFmt *GetCharFmt() { return static_cast<SwCharFmt*>(GetRegisteredIn()); }
- void SetCharFmt( SwCharFmt *pNew );
+ inline const SwCharFormat *GetCharFormat() const { return static_cast<const SwCharFormat*>(GetRegisteredIn()); }
+ inline SwCharFormat *GetCharFormat() { return static_cast<SwCharFormat*>(GetRegisteredIn()); }
+ void SetCharFormat( SwCharFormat *pNew );
/// Get information from Client.
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
@@ -207,8 +207,8 @@ inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(bool bInP) const
{ return static_cast<const SvxLineSpacingItem&>(Get( RES_PARATR_LINESPACING,bInP)); }
inline const SvxAdjustItem &SwAttrSet::GetAdjust(bool bInP) const
{ return static_cast<const SvxAdjustItem&>(Get( RES_PARATR_ADJUST,bInP)); }
-inline const SvxFmtSplitItem &SwAttrSet::GetSplit(bool bInP) const
- { return static_cast<const SvxFmtSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
+inline const SvxFormatSplitItem &SwAttrSet::GetSplit(bool bInP) const
+ { return static_cast<const SvxFormatSplitItem&>(Get( RES_PARATR_SPLIT,bInP)); }
inline const SwRegisterItem &SwAttrSet::GetRegister(bool bInP) const
{ return static_cast<const SwRegisterItem&>(Get( RES_PARATR_REGISTER,bInP)); }
inline const SvxWidowsItem &SwAttrSet::GetWidows(bool bInP) const
@@ -219,8 +219,8 @@ inline const SvxTabStopItem &SwAttrSet::GetTabStops(bool bInP) const
{ return static_cast<const SvxTabStopItem&>(Get( RES_PARATR_TABSTOP,bInP)); }
inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(bool bInP) const
{ return static_cast<const SvxHyphenZoneItem&>(Get(RES_PARATR_HYPHENZONE,bInP)); }
-inline const SwFmtDrop &SwAttrSet::GetDrop(bool bInP) const
- { return static_cast<const SwFmtDrop&>(Get(RES_PARATR_DROP,bInP)); }
+inline const SwFormatDrop &SwAttrSet::GetDrop(bool bInP) const
+ { return static_cast<const SwFormatDrop&>(Get(RES_PARATR_DROP,bInP)); }
inline const SwNumRuleItem &SwAttrSet::GetNumRule(bool bInP) const
{ return static_cast<const SwNumRuleItem&>(Get(RES_PARATR_NUMRULE,bInP)); }
inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(bool bInP) const
@@ -236,38 +236,38 @@ inline const SvxParaGridItem &SwAttrSet::GetParaGrid(bool bInP) const
inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(bool bInP) const
{ return static_cast<const SwParaConnectBorderItem&>(Get( RES_PARATR_CONNECT_BORDER, bInP )); }
-// Implementation of paragraph-attributes methods of SwFmt
-inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(bool bInP) const
+// Implementation of paragraph-attributes methods of SwFormat
+inline const SvxLineSpacingItem &SwFormat::GetLineSpacing(bool bInP) const
{ return m_aSet.GetLineSpacing(bInP); }
-inline const SvxAdjustItem &SwFmt::GetAdjust(bool bInP) const
+inline const SvxAdjustItem &SwFormat::GetAdjust(bool bInP) const
{ return m_aSet.GetAdjust(bInP); }
-inline const SvxFmtSplitItem &SwFmt::GetSplit(bool bInP) const
+inline const SvxFormatSplitItem &SwFormat::GetSplit(bool bInP) const
{ return m_aSet.GetSplit(bInP); }
-inline const SwRegisterItem &SwFmt::GetRegister(bool bInP) const
+inline const SwRegisterItem &SwFormat::GetRegister(bool bInP) const
{ return m_aSet.GetRegister(bInP); }
-inline const SvxWidowsItem &SwFmt::GetWidows(bool bInP) const
+inline const SvxWidowsItem &SwFormat::GetWidows(bool bInP) const
{ return m_aSet.GetWidows(bInP); }
-inline const SvxOrphansItem &SwFmt::GetOrphans(bool bInP) const
+inline const SvxOrphansItem &SwFormat::GetOrphans(bool bInP) const
{ return m_aSet.GetOrphans(bInP); }
-inline const SvxTabStopItem &SwFmt::GetTabStops(bool bInP) const
+inline const SvxTabStopItem &SwFormat::GetTabStops(bool bInP) const
{ return m_aSet.GetTabStops(bInP); }
-inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(bool bInP) const
+inline const SvxHyphenZoneItem &SwFormat::GetHyphenZone(bool bInP) const
{ return m_aSet.GetHyphenZone(bInP); }
-inline const SwFmtDrop &SwFmt::GetDrop(bool bInP) const
+inline const SwFormatDrop &SwFormat::GetDrop(bool bInP) const
{ return m_aSet.GetDrop(bInP); }
-inline const SwNumRuleItem &SwFmt::GetNumRule(bool bInP) const
+inline const SwNumRuleItem &SwFormat::GetNumRule(bool bInP) const
{ return m_aSet.GetNumRule(bInP); }
-inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(bool bInP) const
+inline const SvxScriptSpaceItem& SwFormat::GetScriptSpace(bool bInP) const
{ return m_aSet.GetScriptSpace(bInP) ; }
-inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(bool bInP) const
+inline const SvxHangingPunctuationItem &SwFormat::GetHangingPunctuation(bool bInP) const
{ return m_aSet.GetHangingPunctuation(bInP) ; }
-inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(bool bInP) const
+inline const SvxForbiddenRuleItem &SwFormat::GetForbiddenRule(bool bInP) const
{ return static_cast<const SvxForbiddenRuleItem&>(m_aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP)); }
-inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(bool bInP) const
+inline const SvxParaVertAlignItem &SwFormat::GetParaVertAlign(bool bInP) const
{ return static_cast<const SvxParaVertAlignItem&>(m_aSet.Get( RES_PARATR_VERTALIGN, bInP )); }
-inline const SvxParaGridItem &SwFmt::GetParaGrid(bool bInP) const
+inline const SvxParaGridItem &SwFormat::GetParaGrid(bool bInP) const
{ return static_cast<const SvxParaGridItem&>(m_aSet.Get( RES_PARATR_SNAPTOGRID, bInP )); }
-inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(bool bInP) const
+inline const SwParaConnectBorderItem &SwFormat::GetParaConnectBorder(bool bInP) const
{ return static_cast<const SwParaConnectBorderItem&>(m_aSet.Get( RES_PARATR_CONNECT_BORDER, bInP )); }
#endif
diff --git a/sw/inc/poolfmt.awk b/sw/inc/poolfmt.awk
index 3c196fc8fe2d..58f758c94640 100644
--- a/sw/inc/poolfmt.awk
+++ b/sw/inc/poolfmt.awk
@@ -40,7 +40,7 @@ function Main() {
print
print "void main( int , char *[] ) {"
sStr = "#define"
- print " int nSize = (sizeof(ppPoolIds) / sizeof(PoolFmtIds)) - 1;"
+ print " int nSize = (sizeof(ppPoolIds) / sizeof(PoolFormatIds)) - 1;"
print " for( int n = 0; n < nSize; n++ )"
print " printf( \"" sStr " %s\\t%8d\\n\", ppPoolIds[ n ].pStr, ppPoolIds[ n ].nId );"
print "}"
@@ -48,8 +48,8 @@ function Main() {
function TableHead() {
print
- print "struct PoolFmtIds { int nId; const char* pStr; };"
- print "static PoolFmtIds ppPoolIds[] = {"
+ print "struct PoolFormatIds { int nId; const char* pStr; };"
+ print "static PoolFormatIds ppPoolIds[] = {"
}
function TableTail() {
diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index df029593b836..b80e0ed8e6a2 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -82,7 +82,7 @@ const sal_uInt16 POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID;
const sal_uInt16 POOL_IDUSER_FMT =
USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID);
-inline bool IsPoolUserFmt( sal_uInt16 nId )
+inline bool IsPoolUserFormat( sal_uInt16 nId )
{
return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID));
}
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index e8fa575ae36c..47e8c3fb9721 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -27,7 +27,7 @@
#include <SidebarWindowsTypes.hxx>
class SfxBroadcaster;
-class SwTxtFld;
+class SwTextField;
class SwRootFrm;
class SwPostItMgr;
class SwEditWin;
@@ -112,7 +112,7 @@ public:
virtual SwPosition GetAnchorPosition() const = 0;
virtual bool UseElement() = 0;
- virtual const SwFmtFld& GetFmtFld() const = 0;
+ virtual const SwFormatField& GetFormatField() const = 0;
virtual const SfxBroadcaster* GetBroadCaster() const = 0;
virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow( SwEditWin& rEditWin,
WinBits nBits,
@@ -124,11 +124,11 @@ class SwAnnotationItem: public SwSidebarItem
{
public:
SwAnnotationItem(
- SwFmtFld& rFmtFld,
+ SwFormatField& rFormatField,
const bool aShow,
const bool aFocus)
: SwSidebarItem( aShow, aFocus )
- , mrFmtFld( rFmtFld )
+ , mrFormatField( rFormatField )
{
}
@@ -138,13 +138,13 @@ public:
virtual SwPosition GetAnchorPosition() const SAL_OVERRIDE;
virtual bool UseElement() SAL_OVERRIDE;
- virtual const SwFmtFld& GetFmtFld() const SAL_OVERRIDE
+ virtual const SwFormatField& GetFormatField() const SAL_OVERRIDE
{
- return mrFmtFld;
+ return mrFormatField;
}
virtual const SfxBroadcaster* GetBroadCaster() const SAL_OVERRIDE
{
- return dynamic_cast<const SfxBroadcaster *> (&mrFmtFld);
+ return dynamic_cast<const SfxBroadcaster *> (&mrFormatField);
}
virtual VclPtr<sw::sidebarwindows::SwSidebarWin> GetSidebarWindow(
SwEditWin& rEditWin,
@@ -153,7 +153,7 @@ public:
SwPostItBits aBits ) SAL_OVERRIDE;
private:
- SwFmtFld& mrFmtFld;
+ SwFormatField& mrFormatField;
};
#endif // INCLUDED_SW_INC_POSTITHELPER_HXX
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 6c5e6f3efae7..5f7b7cb0a9c0 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -33,7 +33,7 @@
class SwDoc;
class SwDocShell;
-class _SetGetExpFlds;
+class _SetGetExpFields;
class SwViewOption;
class OutputDevice;
class SwViewOptionAdjust_Impl;
@@ -233,8 +233,8 @@ class SwRenderData
public:
// PostIt relevant data
- /// an array of "_SetGetExpFld *" sorted by page and line numbers
- ::boost::scoped_ptr<_SetGetExpFlds> m_pPostItFields;
+ /// an array of "_SetGetExpField *" sorted by page and line numbers
+ ::boost::scoped_ptr<_SetGetExpFields> m_pPostItFields;
/// this contains a SwDoc with the post-it content
::boost::scoped_ptr<SwViewShell> m_pPostItShell;
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 533c027628a2..6fd7ad6f2ed9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -49,15 +49,15 @@ public:
virtual bool operator == ( const SwRedlineExtraData& ) const;
};
-class SwRedlineExtraData_FmtColl : public SwRedlineExtraData
+class SwRedlineExtraData_FormatColl : public SwRedlineExtraData
{
- OUString sFmtNm;
+ OUString sFormatNm;
SfxItemSet* pSet;
sal_uInt16 nPoolId;
public:
- SwRedlineExtraData_FmtColl( const OUString& rColl, sal_uInt16 nPoolFmtId,
+ SwRedlineExtraData_FormatColl( const OUString& rColl, sal_uInt16 nPoolFormatId,
const SfxItemSet* pSet = 0 );
- virtual ~SwRedlineExtraData_FmtColl();
+ virtual ~SwRedlineExtraData_FormatColl();
virtual SwRedlineExtraData* CreateNew() const SAL_OVERRIDE;
virtual void Reject( SwPaM& rPam ) const SAL_OVERRIDE;
virtual bool operator == ( const SwRedlineExtraData& ) const SAL_OVERRIDE;
@@ -149,7 +149,7 @@ public:
void SetComment( const OUString& rS ) { sComment = rS; }
void SetTimeStamp( const DateTime& rDT ) { aStamp = rDT; }
- void SetAutoFmtFlag()
+ void SetAutoFormatFlag()
{ eType = (RedlineType_t)(eType | nsRedlineType_t::REDLINE_FORM_AUTOFMT); }
bool CanCombine( const SwRedlineData& rCmp ) const
{
@@ -182,7 +182,7 @@ public:
class SW_DLLPUBLIC SwRangeRedline : public SwPaM
{
SwRedlineData* pRedlineData;
- SwNodeIndex* pCntntSect;
+ SwNodeIndex* pContentSect;
bool bDelLastPara : 1;
bool bIsLastParaDelete : 1;
bool bIsVisible : 1;
@@ -199,13 +199,13 @@ public:
// For sw3io: pData is taken over!
SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos, bool bVsbl,
bool bDelLP, bool bIsPD) :
- SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ),
+ SwPaM( rPos ), pRedlineData( pData ), pContentSect( 0 ),
bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl )
{}
SwRangeRedline( const SwRangeRedline& );
virtual ~SwRangeRedline();
- SwNodeIndex* GetContentIdx() const { return pCntntSect; }
+ SwNodeIndex* GetContentIdx() const { return pContentSect; }
// For Undo.
void SetContentIdx( const SwNodeIndex* );
@@ -230,7 +230,7 @@ public:
{ return *pRedlineData == rCmp; }
bool operator!=( const SwRedlineData& rCmp ) const
{ return *pRedlineData != rCmp; }
- void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); }
+ void SetAutoFormatFlag() { pRedlineData->SetAutoFormatFlag(); }
sal_uInt16 GetStackCount() const;
sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const;
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 058d57d815ca..a6ececb2cd96 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -23,11 +23,11 @@
class SfxPoolItem;
class SwDoc;
-class SwTxtNode;
-class SwTxtFld;
+class SwTextNode;
+class SwTextField;
-bool IsFrameBehind( const SwTxtNode& rMyNd, sal_Int32 nMySttPos,
- const SwTxtNode& rBehindNd, sal_Int32 nSttPos );
+bool IsFrameBehind( const SwTextNode& rMyNd, sal_Int32 nMySttPos,
+ const SwTextNode& rBehindNd, sal_Int32 nSttPos );
enum REFERENCESUBTYPE
{
@@ -74,7 +74,7 @@ public:
void MergeWithOtherDoc( SwDoc& rDestDoc );
- static SwTxtNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
+ static SwTextNode* FindAnchor( SwDoc* pDoc, const OUString& rRefMark,
sal_uInt16 nSubType, sal_uInt16 nSeqNo,
sal_Int32* pStt, sal_Int32* pEnd = 0 );
};
@@ -83,7 +83,7 @@ class SW_DLLPUBLIC SwGetRefField : public SwField
{
private:
OUString sSetRefName;
- OUString sTxt;
+ OUString sText;
sal_uInt16 nSubType;
sal_uInt16 nSeqNo;
@@ -91,13 +91,13 @@ private:
virtual SwField* Copy() const SAL_OVERRIDE;
// #i81002#
- static OUString MakeRefNumStr( const SwTxtNode& rTxtNodeOfField,
- const SwTxtNode& rTxtNodeOfReferencedItem,
+ static OUString MakeRefNumStr( const SwTextNode& rTextNodeOfField,
+ const SwTextNode& rTextNodeOfReferencedItem,
const sal_uInt32 nRefNumFormat );
public:
SwGetRefField( SwGetRefFieldType*, const OUString& rSetRef,
- sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt );
+ sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFormat );
virtual ~SwGetRefField();
@@ -106,15 +106,15 @@ public:
OUString GetSetRefName() const { return sSetRefName; }
// #i81002#
- /** The <SwTxtFld> instance, which represents the text attribute for the
+ /** The <SwTextField> instance, which represents the text attribute for the
<SwGetRefField> instance, has to be passed to the method.
- This <SwTxtFld> instance is needed for the reference format type REF_UPDOWN
+ This <SwTextField> instance is needed for the reference format type REF_UPDOWN
and REF_NUMBER.
Note: This instance may be NULL (field in Undo/Redo). This will cause
no update for these reference format types. */
- void UpdateField( const SwTxtFld* pFldTxtAttr );
+ void UpdateField( const SwTextField* pFieldTextAttr );
- void SetExpand( const OUString& rStr ) { sTxt = rStr; }
+ void SetExpand( const OUString& rStr ) { sText = rStr; }
/// Get/set sub type.
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
@@ -123,9 +123,9 @@ public:
// --> #i81002#
bool IsRefToHeadingCrossRefBookmark() const;
bool IsRefToNumItemCrossRefBookmark() const;
- const SwTxtNode* GetReferencedTxtNode() const;
+ const SwTextNode* GetReferencedTextNode() const;
// #i85090#
- OUString GetExpandedTxtOfReferencedTxtNode() const;
+ OUString GetExpandedTextOfReferencedTextNode() const;
/// Get/set SequenceNo (of interest only for REF_SEQUENCEFLD).
sal_uInt16 GetSeqNo() const { return nSeqNo; }
diff --git a/sw/inc/rubylist.hxx b/sw/inc/rubylist.hxx
index 5dfd0bd0a6f7..38572b2e71da 100644
--- a/sw/inc/rubylist.hxx
+++ b/sw/inc/rubylist.hxx
@@ -26,7 +26,7 @@
class SwRubyListEntry
{
OUString m_sText;
- SwFmtRuby m_aRubyAttr;
+ SwFormatRuby m_aRubyAttr;
public:
SwRubyListEntry() : m_aRubyAttr( OUString() ) {}
~SwRubyListEntry();
@@ -34,9 +34,9 @@ public:
OUString GetText() const { return m_sText; }
void SetText( const OUString& rStr ) { m_sText = rStr; }
- const SwFmtRuby& GetRubyAttr() const { return m_aRubyAttr; }
- SwFmtRuby& GetRubyAttr() { return m_aRubyAttr; }
- void SetRubyAttr( const SwFmtRuby& rAttr ) { m_aRubyAttr = rAttr; }
+ const SwFormatRuby& GetRubyAttr() const { return m_aRubyAttr; }
+ SwFormatRuby& GetRubyAttr() { return m_aRubyAttr; }
+ void SetRubyAttr( const SwFormatRuby& rAttr ) { m_aRubyAttr = rAttr; }
};
class SwRubyList : public boost::ptr_vector<SwRubyListEntry> {};
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 6dc7d17a4d88..a3d34be61988 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -35,7 +35,7 @@ namespace com { namespace sun { namespace star {
namespace text { class XTextSection; }
} } }
-class SwSectionFmt;
+class SwSectionFormat;
class SwDoc;
class SwSection;
class SwSectionNode;
@@ -162,7 +162,7 @@ public:
TYPEINFO_OVERRIDE(); // rtti
SwSection(SectionType const eType, OUString const& rName,
- SwSectionFmt & rFormat);
+ SwSectionFormat & rFormat);
virtual ~SwSection();
bool DataEquals(SwSectionData const& rCmp) const;
@@ -174,8 +174,8 @@ public:
SectionType GetType() const { return m_Data.GetType(); }
void SetType(SectionType const eType) { return m_Data.SetType(eType); }
- inline SwSectionFmt* GetFmt();
- inline SwSectionFmt const * GetFmt() const;
+ inline SwSectionFormat* GetFormat();
+ inline SwSectionFormat const * GetFormat() const;
// Set hidden/protected -> update the whole tree!
// (Attributes/flags are set/get.)
@@ -256,34 +256,34 @@ public:
class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint
{
public:
- SwSectionFrmMoveAndDeleteHint( const bool bSaveCntnt )
+ SwSectionFrmMoveAndDeleteHint( const bool bSaveContent )
: SfxSimpleHint( SFX_HINT_DYING )
- , mbSaveCntnt( bSaveCntnt )
+ , mbSaveContent( bSaveContent )
{}
virtual ~SwSectionFrmMoveAndDeleteHint()
{}
- bool IsSaveCntnt() const
+ bool IsSaveContent() const
{
- return mbSaveCntnt;
+ return mbSaveContent;
}
private:
- const bool mbSaveCntnt;
+ const bool mbSaveContent;
};
enum SectionSort { SORTSECT_NOT, SORTSECT_NAME, SORTSECT_POS };
-class SW_DLLPUBLIC SwSectionFmt
- : public SwFrmFmt
+class SW_DLLPUBLIC SwSectionFormat
+ : public SwFrameFormat
, public ::sfx2::Metadatable
{
friend class SwDoc;
- /** Why does this exist in addition to the m_wXObject in SwFrmFmt?
+ /** Why does this exist in addition to the m_wXObject in SwFrameFormat?
in case of an index, both a SwXDocumentIndex and a SwXTextSection
- register at this SwSectionFmt, so we need to have two refs.
+ register at this SwSectionFormat, so we need to have two refs.
*/
::com::sun::star::uno::WeakReference<
::com::sun::star::text::XTextSection> m_wXTextSection;
@@ -291,12 +291,12 @@ class SW_DLLPUBLIC SwSectionFmt
SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed.
protected:
- SwSectionFmt( SwFrmFmt* pDrvdFrm, SwDoc *pDoc );
+ SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc );
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) SAL_OVERRIDE;
public:
TYPEINFO_OVERRIDE(); // Already contained in base class client.
- virtual ~SwSectionFmt();
+ virtual ~SwSectionFormat();
// Deletes all Frms in aDepend (Frms are recognized via PTR_CAST).
virtual void DelFrms() SAL_OVERRIDE;
@@ -308,7 +308,7 @@ public:
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
SwSection* GetSection() const;
- inline SwSectionFmt* GetParent() const;
+ inline SwSectionFormat* GetParent() const;
inline SwSection* GetParentSection() const;
// All sections that are derived from this one:
@@ -323,7 +323,7 @@ public:
SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false);
const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const
- { return const_cast<SwSectionFmt *>(this)
+ { return const_cast<SwSectionFormat *>(this)
->GetSectionNode(bEvenIfInUndo); }
// Is section a valid one for global document?
@@ -347,36 +347,36 @@ public:
};
-SwSectionFmt* SwSection::GetFmt()
+SwSectionFormat* SwSection::GetFormat()
{
- return static_cast<SwSectionFmt*>(GetRegisteredIn());
+ return static_cast<SwSectionFormat*>(GetRegisteredIn());
}
-SwSectionFmt const * SwSection::GetFmt() const
+SwSectionFormat const * SwSection::GetFormat() const
{
- return static_cast<SwSectionFmt const *>(GetRegisteredIn());
+ return static_cast<SwSectionFormat const *>(GetRegisteredIn());
}
inline SwSection* SwSection::GetParent() const
{
- SwSectionFmt const * pFmt = GetFmt();
+ SwSectionFormat const * pFormat = GetFormat();
SwSection* pRet = 0;
- if( pFmt )
- pRet = pFmt->GetParentSection();
+ if( pFormat )
+ pRet = pFormat->GetParentSection();
return pRet;
}
-inline SwSectionFmt* SwSectionFmt::GetParent() const
+inline SwSectionFormat* SwSectionFormat::GetParent() const
{
- SwSectionFmt* pRet = 0;
+ SwSectionFormat* pRet = 0;
if( GetRegisteredIn() )
- pRet = const_cast<SwSectionFmt*>(PTR_CAST( SwSectionFmt, GetRegisteredIn() ));
+ pRet = const_cast<SwSectionFormat*>(PTR_CAST( SwSectionFormat, GetRegisteredIn() ));
return pRet;
}
-inline SwSection* SwSectionFmt::GetParentSection() const
+inline SwSection* SwSectionFormat::GetParentSection() const
{
- SwSectionFmt* pParent = GetParent();
+ SwSectionFormat* pParent = GetParent();
SwSection* pRet = 0;
if( pParent )
{
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index b7e36ddb70a1..da2622d60241 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -47,7 +47,7 @@ class SfxMedium;
class SvStream;
class SvxFontItem;
class SvxMacroTableDtor;
-class SwCntntNode;
+class SwContentNode;
class SwCrsrShell;
class SwDoc;
class SwPaM;
@@ -106,42 +106,42 @@ class SwgReaderOption
SwAsciiOptions aASCIIOpts;
union
{
- bool bFmtsOnly;
+ bool bFormatsOnly;
struct
{
- bool bFrmFmts: 1;
+ bool bFrameFormats: 1;
bool bPageDescs: 1;
- bool bTxtFmts: 1;
+ bool bTextFormats: 1;
bool bNumRules: 1;
bool bMerge:1;
- } Fmts;
+ } Formats;
} What;
public:
- void ResetAllFmtsOnly() { What.bFmtsOnly = false; }
- bool IsFmtsOnly() const { return What.bFmtsOnly; }
+ void ResetAllFormatsOnly() { What.bFormatsOnly = false; }
+ bool IsFormatsOnly() const { return What.bFormatsOnly; }
- bool IsFrmFmts() const { return What.Fmts.bFrmFmts; }
- void SetFrmFmts( const bool bNew) { What.Fmts.bFrmFmts = bNew; }
+ bool IsFrameFormats() const { return What.Formats.bFrameFormats; }
+ void SetFrameFormats( const bool bNew) { What.Formats.bFrameFormats = bNew; }
- bool IsPageDescs() const { return What.Fmts.bPageDescs; }
- void SetPageDescs( const bool bNew) { What.Fmts.bPageDescs = bNew; }
+ bool IsPageDescs() const { return What.Formats.bPageDescs; }
+ void SetPageDescs( const bool bNew) { What.Formats.bPageDescs = bNew; }
- bool IsTxtFmts() const { return What.Fmts.bTxtFmts; }
- void SetTxtFmts( const bool bNew) { What.Fmts.bTxtFmts = bNew; }
+ bool IsTextFormats() const { return What.Formats.bTextFormats; }
+ void SetTextFormats( const bool bNew) { What.Formats.bTextFormats = bNew; }
- bool IsNumRules() const { return What.Fmts.bNumRules; }
- void SetNumRules( const bool bNew) { What.Fmts.bNumRules = bNew; }
+ bool IsNumRules() const { return What.Formats.bNumRules; }
+ void SetNumRules( const bool bNew) { What.Formats.bNumRules = bNew; }
- bool IsMerge() const { return What.Fmts.bMerge; }
- void SetMerge( const bool bNew ) { What.Fmts.bMerge = bNew; }
+ bool IsMerge() const { return What.Formats.bMerge; }
+ void SetMerge( const bool bNew ) { What.Formats.bMerge = bNew; }
const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; }
void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; }
void ResetASCIIOpts() { aASCIIOpts.Reset(); }
SwgReaderOption()
- { ResetAllFmtsOnly(); aASCIIOpts.Reset(); }
+ { ResetAllFormatsOnly(); aASCIIOpts.Reset(); }
};
class SW_DLLPUBLIC SwReader: public SwDocFac
@@ -225,11 +225,11 @@ public:
virtual void SetFltName( const OUString& rFltNm );
// Adapt item-set of a Frm-Format to the old format.
- static void ResetFrmFmtAttrs( SfxItemSet &rFrmSet );
+ static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet );
// Adapt Frame-/Graphics-/OLE- styles to the old format
// (without borders etc.).
- static void ResetFrmFmts( SwDoc& rDoc );
+ static void ResetFrameFormats( SwDoc& rDoc );
// Load filter template, set it and release it again.
SwDoc* GetTemplateDoc();
@@ -339,8 +339,8 @@ public:
OUString GetFileName() const; // Filename of pImp.
bool IsReadOnly() const; // ReadOnly-flag of pImp.
- bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl );
- bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl );
+ bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTable );
+ bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTable );
bool StartPutMuchBlockEntries();
void EndPutMuchBlockEntries();
@@ -381,7 +381,7 @@ protected:
void ResetWriter();
bool CopyNextPam( SwPaM ** );
- void PutNumFmtFontsInAttrPool();
+ void PutNumFormatFontsInAttrPool();
void PutEditEngFontsInAttrPool( bool bIncl_CJK_CTL = true );
virtual sal_uLong WriteStream() = 0;
@@ -434,9 +434,9 @@ public:
sal_Int32 FindPos_Bkmk( const SwPosition& rPos ) const;
// Build a bookmark table, which is sort by the node position. The
// OtherPos of the bookmarks also inserted.
- void CreateBookmarkTbl();
+ void CreateBookmarkTable();
// Search alle Bookmarks in the range and return it in the Array.
- bool GetBookmarks( const SwCntntNode& rNd,
+ bool GetBookmarks( const SwContentNode& rNd,
sal_Int32 nStt, sal_Int32 nEnd,
std::vector< const ::sw::mark::IMark* >& rArr );
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 60ab4a16cb3a..ca89be7dd7c6 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -42,10 +42,10 @@ struct SW_DLLPUBLIC ShellResource : public Resource
OUString aCalc_Error;
// For GetRefField - up/down.
- OUString aGetRefFld_Up;
- OUString aGetRefFld_Down;
+ OUString aGetRefField_Up;
+ OUString aGetRefField_Down;
// For GetRefField - referenced item not found.
- OUString aGetRefFld_RefItemNotFound;
+ OUString aGetRefField_RefItemNotFound;
// For dynamic menu - string "all".
OUString aStrAllPageHeadFoot;
// For some list boxes - string "none"
@@ -71,7 +71,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
std::vector<OUString> aDocInfoLst;
// The autoFormat-Redline comments.
- inline const std::vector<OUString>& GetAutoFmtNameLst() const;
+ inline const std::vector<OUString>& GetAutoFormatNameLst() const;
enum PageNameMode
{
@@ -88,18 +88,18 @@ struct SW_DLLPUBLIC ShellResource : public Resource
~ShellResource();
private:
- void _GetAutoFmtNameLst() const;
- mutable std::vector<OUString> *pAutoFmtNameLst;
+ void _GetAutoFormatNameLst() const;
+ mutable std::vector<OUString> *pAutoFormatNameLst;
OUString sPageDescFirstName;
OUString sPageDescFollowName;
OUString sPageDescName;
};
-inline const std::vector<OUString>& ShellResource::GetAutoFmtNameLst() const
+inline const std::vector<OUString>& ShellResource::GetAutoFormatNameLst() const
{
- if( !pAutoFmtNameLst )
- _GetAutoFmtNameLst();
- return *pAutoFmtNameLst;
+ if( !pAutoFormatNameLst )
+ _GetAutoFormatNameLst();
+ return *pAutoFormatNameLst;
}
#endif // INCLUDED_SW_INC_SHELLRES_HXX
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 8a09c261b437..cce7388ff0e6 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -28,30 +28,30 @@
#include <com/sun/star/linguistic2/XSpellChecker1.hpp>
#include <com/sun/star/linguistic2/XHyphenatedWord.hpp>
-class SwTxtNode;
+class SwTextNode;
class SwIndex;
namespace vcl { class Font; }
struct SwArgsBase // used for text conversion (Hangul/Hanja, ...)
{
- SwTxtNode *pStartNode;
+ SwTextNode *pStartNode;
SwIndex *pStartIdx;
- SwTxtNode *pEndNode;
+ SwTextNode *pEndNode;
SwIndex *pEndIdx;
SwArgsBase(
- SwTxtNode* pStart, SwIndex& rStart,
- SwTxtNode* pEnd, SwIndex& rEnd )
+ SwTextNode* pStart, SwIndex& rStart,
+ SwTextNode* pEnd, SwIndex& rEnd )
: pStartNode( pStart ), pStartIdx( &rStart ),
pEndNode( pEnd ), pEndIdx( &rEnd )
{}
- void SetStart(SwTxtNode* pStart, SwIndex& rStart )
+ void SetStart(SwTextNode* pStart, SwIndex& rStart )
{
pStartNode = pStart; pStartIdx = &rStart ;
}
- void SetEnd( SwTxtNode* pEnd, SwIndex& rEnd )
+ void SetEnd( SwTextNode* pEnd, SwIndex& rEnd )
{
pEndNode = pEnd; pEndIdx = &rEnd ;
}
@@ -71,8 +71,8 @@ struct SwConversionArgs : SwArgsBase
bool bAllowImplicitChangesForNotConvertibleText;
SwConversionArgs( LanguageType nLang,
- SwTxtNode* pStart, SwIndex& rStart,
- SwTxtNode* pEnd, SwIndex& rEnd )
+ SwTextNode* pStart, SwIndex& rStart,
+ SwTextNode* pEnd, SwIndex& rEnd )
: SwArgsBase( pStart, rStart, pEnd, rEnd ),
nConvSrcLang( nLang ),
nConvTextLang( LANGUAGE_NONE ),
@@ -94,8 +94,8 @@ struct SwSpellArgs : SwArgsBase
SwSpellArgs(::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &rxSplChk,
- SwTxtNode* pStart, SwIndex& rStart,
- SwTxtNode* pEnd, SwIndex& rEnd,
+ SwTextNode* pStart, SwIndex& rStart,
+ SwTextNode* pEnd, SwIndex& rEnd,
bool bGrammar )
: SwArgsBase( pStart, rStart, pEnd, rEnd ),
xSpeller( rxSplChk ),
@@ -105,8 +105,8 @@ struct SwSpellArgs : SwArgsBase
// Parameter-class for Hyphenate.
// docedt.cxx: SwDoc::Hyphenate()
-// txtedt.cxx: SwTxtNode::Hyphenate()
-// txthyph.cxx: SwTxtFrm::Hyphenate()
+// txtedt.cxx: SwTextNode::Hyphenate()
+// txthyph.cxx: SwTextFrm::Hyphenate()
class SwInterHyphInfo
{
diff --git a/sw/inc/sw3convert.hxx b/sw/inc/sw3convert.hxx
index d837db2aa776..1c500f06195b 100644
--- a/sw/inc/sw3convert.hxx
+++ b/sw/inc/sw3convert.hxx
@@ -25,7 +25,7 @@
class SwDoc;
SW_DLLPUBLIC void sw3io_ConvertFromOldField( SwDoc& rDoc, sal_uInt16& rWhich,
- sal_uInt16& rSubType, sal_uLong &rFmt,
+ sal_uInt16& rSubType, sal_uLong &rFormat,
sal_uInt16 nVersion );
#endif
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index a4fa8d788185..cb5ec2feb3f5 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -47,7 +47,7 @@ class SfxStyleSheetBase;
class SwGlossaryHdl;
class SwField;
-class SwLabFmtPage;
+class SwLabFormatPage;
class SwLabRec;
class SwAsciiOptions;
class SwDocShell;
@@ -55,7 +55,7 @@ class SvStream;
class SwWrtShell;
class SfxRequest;
class SwView;
-class SwTableAutoFmt;
+class SwTableAutoFormat;
class SwTOXMgr;
class SwForm;
struct CurTOXType;
@@ -101,7 +101,7 @@ public:
virtual OUString GetCurrShortName() const = 0;
};
-class AbstractFldInputDlg : public VclAbstractTerminatedDialog
+class AbstractFieldInputDlg : public VclAbstractTerminatedDialog
{
public:
//from class SalFrame
@@ -125,8 +125,8 @@ class AbstractInsTableDlg : public VclAbstractDialog
{
public:
virtual void GetValues( OUString& rName, sal_uInt16& rRow, sal_uInt16& rCol,
- SwInsertTableOptions& rInsTblFlags, OUString& rTableAutoFmtName,
- SwTableAutoFmt *& prTAFmt ) = 0;
+ SwInsertTableOptions& rInsTableFlags, OUString& rTableAutoFormatName,
+ SwTableAutoFormat *& prTAFormat ) = 0;
};
class AbstractJavaEditDialog : public VclAbstractDialog
@@ -225,8 +225,8 @@ class AbstractSwConvertTableDlg : public VclAbstractDialog
{
public:
virtual void GetValues( sal_Unicode& rDelim,
- SwInsertTableOptions& rInsTblFlags,
- SwTableAutoFmt const*& prTAFmt ) = 0;
+ SwInsertTableOptions& rInsTableFlags,
+ SwTableAutoFormat const*& prTAFormat ) = 0;
};
class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog
@@ -264,10 +264,10 @@ public:
class AbstractSwAutoFormatDlg : public VclAbstractDialog
{
public:
- virtual void FillAutoFmtOfIndex( SwTableAutoFmt*& rToFill ) const = 0;
+ virtual void FillAutoFormatOfIndex( SwTableAutoFormat*& rToFill ) const = 0;
};
-class AbstractSwFldDlg : public SfxAbstractTabDialog
+class AbstractSwFieldDlg : public SfxAbstractTabDialog
{
public:
virtual void Start( bool bShow = true ) = 0; //this method from sfxtabdialog
@@ -339,7 +339,7 @@ public:
virtual AbstractSwBreakDlg * CreateSwBreakDlg(vcl::Window *pParent, SwWrtShell &rSh) = 0;
virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0;
virtual SfxAbstractTabDialog * CreateSwCharDlg(vcl::Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet,
- sal_uInt8 nDialogMode, const OUString* pFmtStr = 0) = 0;
+ sal_uInt8 nDialogMode, const OUString* pFormatStr = 0) = 0;
virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
virtual VclAbstractDialog * CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV,int nResId) = 0;
@@ -369,11 +369,11 @@ public:
virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg(vcl::Window * pParent, const OUString &rShortName) = 0;
virtual VclAbstractDialog * CreateVclAbstractDialog ( vcl::Window * pParent, SwWrtShell &rSh, int nResId ) = 0;
- virtual AbstractSplitTableDialog * CreateSplitTblDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
+ virtual AbstractSplitTableDialog * CreateSplitTableDialog ( vcl::Window * pParent, SwWrtShell &rSh ) = 0;
virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( vcl::Window* pParent, SwWrtShell* pShell,
- bool bSetAutoFmt = true,
- const SwTableAutoFmt* pSelFmt = 0 ) = 0;
+ bool bSetAutoFormat = true,
+ const SwTableAutoFormat* pSelFormat = 0 ) = 0;
virtual SfxAbstractDialog * CreateSwBorderDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwBorderModes nType, int nResId ) = 0;
virtual SfxAbstractDialog * CreateSwWrapDlg ( vcl::Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, bool bDrawMode, int nResId ) = 0;
@@ -381,21 +381,21 @@ public:
virtual SfxAbstractTabDialog* CreateSwTableTabDlg(vcl::Window* pParent, SfxItemPool& Pool,
const SfxItemSet* pItemSet, SwWrtShell* pSh) = 0;
- virtual AbstractSwFldDlg * CreateSwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
- virtual SfxAbstractDialog* CreateSwFldEditDlg ( SwView& rVw, int nResId ) = 0;
+ virtual AbstractSwFieldDlg * CreateSwFieldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, vcl::Window *pParent) = 0;
+ virtual SfxAbstractDialog* CreateSwFieldEditDlg ( SwView& rVw, int nResId ) = 0;
virtual AbstractSwRenameXNamedDlg * CreateSwRenameXNamedDlg(vcl::Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > & xNamed,
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > & xNameAccess) = 0;
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
- virtual VclAbstractDialog* CreateTblMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
+ virtual VclAbstractDialog* CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OUString &rDialogType,
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
bool bNewFrm = true,
- bool bFmt = false,
+ bool bFormat = false,
const OString& sDefPage = OString(),
- const OUString* pFmtStr = 0) = 0;
+ const OUString* pFormatStr = 0) = 0;
/// @param nSlot
/// Identifies optional Slot by which the creation of the Template (Style) dialog is triggered.
/// Currently used, if nRegion == SFX_STYLE_FAMILY_PAGE in order to activate certain dialog pane
@@ -409,7 +409,7 @@ public:
virtual AbstractGlossaryDlg* CreateGlossaryDlg(SfxViewFrame* pViewFrame,
SwGlossaryHdl* pGlosHdl,
SwWrtShell *pWrtShell) = 0;
- virtual AbstractFldInputDlg* CreateFldInputDlg(vcl::Window *pParent,
+ virtual AbstractFieldInputDlg* CreateFieldInputDlg(vcl::Window *pParent,
SwWrtShell &rSh, SwField* pField, bool bNextButton = false) = 0;
virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(vcl::Window * pParent,
SwWrtShell &rSh, bool bEd = false) = 0;
@@ -421,7 +421,7 @@ public:
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
vcl::Window* pParent, SwWrtShell& rSh,
const OUString& rSourceName,
- const OUString& rTblName,
+ const OUString& rTableName,
sal_Int32 nCommandType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& xConnection,
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >* pSelection = 0 ) = 0;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index 867f269e2d7a..160f858fabc3 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -57,45 +57,45 @@ class SvxCharReliefItem;
class SvxCharHiddenItem;
// Frame attributes
-class SwFmtFillOrder;
-class SwFmtFrmSize;
+class SwFormatFillOrder;
+class SwFormatFrmSize;
class SvxPaperBinItem;
class SvxLRSpaceItem;
class SvxULSpaceItem;
-class SwFmtCntnt;
-class SwFmtHeader;
-class SwFmtFooter;
+class SwFormatContent;
+class SwFormatHeader;
+class SwFormatFooter;
class SvxPrintItem;
class SvxOpaqueItem;
class SvxProtectItem;
-class SwFmtSurround;
-class SwFmtVertOrient;
-class SwFmtHoriOrient;
-class SwFmtAnchor;
+class SwFormatSurround;
+class SwFormatVertOrient;
+class SwFormatHoriOrient;
+class SwFormatAnchor;
class SvxBoxItem;
class SvxBrushItem;
class XFillStyleItem;
class XFillGradientItem;
class SvxShadowItem;
-class SwFmtPageDesc;
-class SvxFmtBreakItem;
-class SwFmtCol;
+class SwFormatPageDesc;
+class SvxFormatBreakItem;
+class SwFormatCol;
class SvxMacroItem;
-class SvxFmtKeepItem;
-class SwFmtURL;
-class SwFmtLineNumber;
-class SwFmtEditInReadonly;
-class SwFmtLayoutSplit;
-class SwFmtRowSplit;
-class SwFmtChain;
-class SwFmtFtnAtTxtEnd;
-class SwFmtEndAtTxtEnd;
-class SwFmtNoBalancedColumns;
+class SvxFormatKeepItem;
+class SwFormatURL;
+class SwFormatLineNumber;
+class SwFormatEditInReadonly;
+class SwFormatLayoutSplit;
+class SwFormatRowSplit;
+class SwFormatChain;
+class SwFormatFootnoteAtTextEnd;
+class SwFormatEndAtTextEnd;
+class SwFormatNoBalancedColumns;
class SvxFrameDirectionItem;
class SwTextGridItem;
class SwHeaderAndFooterEatSpacingItem;
-class SwFmtFollowTextFlow;
-class SwFmtWrapInfluenceOnObjPos;
+class SwFormatFollowTextFlow;
+class SwFormatWrapInfluenceOnObjPos;
class SdrTextVertAdjustItem;
// Graphic attributes
@@ -115,14 +115,14 @@ class SwDrawModeGrf;
// Paragraph attributes
class SvxLineSpacingItem;
class SvxAdjustItem;
-class SvxFmtSplitItem;
+class SvxFormatSplitItem;
class SwRegisterItem;
class SwNumRuleItem;
class SvxWidowsItem;
class SvxOrphansItem;
class SvxTabStopItem;
class SvxHyphenZoneItem;
-class SwFmtDrop;
+class SwFormatDrop;
class SvxScriptSpaceItem;
class SvxHangingPunctuationItem;
class SvxForbiddenRuleItem;
@@ -131,9 +131,9 @@ class SvxParaGridItem;
class SwParaConnectBorderItem;
// TableBox attributes
-class SwTblBoxNumFormat;
-class SwTblBoxFormula;
-class SwTblBoxValue;
+class SwTableBoxNumFormat;
+class SwTableBoxFormula;
+class SwTableBoxValue;
class SwAttrPool : public SfxItemPool
{
@@ -206,10 +206,10 @@ public:
// Special treatment for some attributes.
// Set Modify-pointer (the old pDefinedIn) at the following attributes:
- // - SwFmtDropCaps
- // - SwFmtPageDesc
+ // - SwFormatDropCaps
+ // - SwFormatPageDesc
// (Is called at insert in formats/nodes.)
- // Second version is for the SwAttrSet handles of SwCntntNode.
+ // Second version is for the SwAttrSet handles of SwContentNode.
bool SetModifyAtAttr( const SwModify* pModify );
// Document is set at SwAttrPool. Therefore it is always accessible.
@@ -262,43 +262,43 @@ public:
inline const SvxShadowItem &GetCharShadow( bool = true ) const;
// Frame attributes. Implementation in frmatr.hxx.
- inline const SwFmtFillOrder &GetFillOrder( bool = true ) const;
- inline const SwFmtFrmSize &GetFrmSize( bool = true ) const;
+ inline const SwFormatFillOrder &GetFillOrder( bool = true ) const;
+ inline const SwFormatFrmSize &GetFrmSize( 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 SwFmtHeader &GetHeader( bool = true ) const;
- inline const SwFmtFooter &GetFooter( bool = true ) const;
+ inline const SwFormatContent &GetContent( bool = true ) const;
+ inline const SwFormatHeader &GetHeader( bool = true ) const;
+ inline const SwFormatFooter &GetFooter( 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 SwFmtSurround &GetSurround( bool = true ) const;
- inline const SwFmtVertOrient &GetVertOrient( bool = true ) const;
- inline const SwFmtHoriOrient &GetHoriOrient( bool = true ) const;
- inline const SwFmtAnchor &GetAnchor( bool = true ) const;
+ inline const SwFormatSurround &GetSurround( bool = true ) const;
+ inline const SwFormatVertOrient &GetVertOrient( bool = true ) const;
+ inline const SwFormatHoriOrient &GetHoriOrient( bool = true ) const;
+ inline const SwFormatAnchor &GetAnchor( bool = true ) const;
inline const SvxBoxItem &GetBox( bool = true ) const;
- inline const SvxFmtKeepItem &GetKeep( bool = true ) const;
+ inline const SvxFormatKeepItem &GetKeep( bool = true ) const;
inline const SvxBrushItem &GetBackground( 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 SwFmtCol &GetCol( bool = true ) const;
+ inline const SwFormatPageDesc &GetPageDesc( bool = true ) const;
+ inline const SvxFormatBreakItem &GetBreak( bool = true ) const;
+ inline const SwFormatCol &GetCol( 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;
- inline const SwFmtFollowTextFlow &GetFollowTextFlow(bool = true) const;
- inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
+ inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const;
+ inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
inline const SdrTextVertAdjustItem& GetTextVertAdjust(bool = true) const;
// Graphic attributes - implementation in grfatr.hxx
@@ -318,14 +318,14 @@ public:
// Paragraph attributes - implementation 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;
@@ -334,9 +334,9 @@ public:
inline const SwParaConnectBorderItem &GetParaConnectBorder(bool = true ) const;
// Tablebox attributes - implementation 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;
DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet)
};
diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx
index 8da7be7bd1bb..3a09b6c91b2b 100644
--- a/sw/inc/swbaslnk.hxx
+++ b/sw/inc/swbaslnk.hxx
@@ -22,7 +22,7 @@
#include <sfx2/lnkbase.hxx>
class SwNode;
-class SwCntntNode;
+class SwContentNode;
class ReReadThread;
long GrfNodeChanged( void* pLink, void* pCaller );
@@ -30,7 +30,7 @@ class SwBaseLink : public ::sfx2::SvBaseLink
{
friend long GrfNodeChanged( void* pLink, void* pCaller );
- SwCntntNode* pCntntNode;
+ SwContentNode* pContentNode;
bool bSwapIn : 1;
bool bNoDataFlag : 1;
bool bIgnoreDataChanged : 1;
@@ -42,8 +42,8 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwCntntNode* pNode = 0 )
- : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ),
+ SwBaseLink( SfxLinkUpdateMode nMode, SotClipboardFormatId nFormat, SwContentNode* pNode = 0 )
+ : ::sfx2::SvBaseLink( nMode, nFormat ), pContentNode( pNode ),
bSwapIn( false ), bNoDataFlag( false ), bIgnoreDataChanged( false ),
m_pReReadThread(0)
{}
@@ -56,7 +56,7 @@ public:
virtual const SwNode* GetAnchor() const;
- SwCntntNode *GetCntntNode() { return pCntntNode; }
+ SwContentNode *GetContentNode() { return pContentNode; }
// For graphics only.
bool SwapIn( bool bWaitForData = false, bool bNativFormat = false );
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 5e3ea0a228b0..7e55f59a8cae 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -78,7 +78,7 @@ protected:
const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; }
- virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+ virtual const SwContentFrm* DoSetBidiLevelLeftRight(
bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr);
virtual void DoSetBidiLevelUpDown();
virtual bool IsSelOvrCheck(int eFlags);
@@ -97,7 +97,7 @@ public:
virtual SwCursor* Create( SwPaM* pRing = 0 ) const;
virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO
- virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
+ virtual void SaveTableBoxContent( const SwPosition* pPos = 0 );
void FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const;
SwMoveFnCollection* MakeFindRange( SwDocPositions, SwDocPositions,
@@ -109,11 +109,11 @@ public:
bool& bCancel,
FindRanges = FND_IN_BODY,
bool bReplace = false );
- sal_uLong Find( const SwTxtFmtColl& rFmtColl,
+ sal_uLong Find( const SwTextFormatColl& rFormatColl,
SwDocPositions nStart, SwDocPositions nEnde,
bool& bCancel,
FindRanges = FND_IN_BODY,
- const SwTxtFmtColl* pReplFmt = 0 );
+ const SwTextFormatColl* pReplFormat = 0 );
sal_uLong Find( const SfxItemSet& rSet, bool bNoCollections,
SwDocPositions nStart, SwDocPositions nEnde,
bool& bCancel,
@@ -172,14 +172,14 @@ public:
bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( true, nCnt ); }
bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( false, nCnt ); }
virtual bool GotoTable( const OUString& rName );
- bool GotoTblBox( const OUString& rName );
+ bool GotoTableBox( const OUString& rName );
bool GotoRegion( const OUString& rName );
- bool GotoFtnAnchor();
- bool GotoFtnTxt();
- bool GotoNextFtnAnchor();
- bool GotoPrevFtnAnchor();
- bool GotoNextFtnCntnt();
- bool GotoPrevFtnCntnt();
+ bool GotoFootnoteAnchor();
+ bool GotoFootnoteText();
+ bool GotoNextFootnoteAnchor();
+ bool GotoPrevFootnoteAnchor();
+ bool GotoNextFootnoteContent();
+ bool GotoPrevFootnoteContent();
bool MovePara( SwWhichPara, SwPosPara );
bool MoveSection( SwWhichSection, SwPosSection );
@@ -194,7 +194,7 @@ public:
nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
bool IsInProtectTable( bool bMove = false,
bool bChgCrsr = true );
- bool IsNoCntnt() const;
+ bool IsNoContent() const;
/** Restore cursor state to the one saved by SwCrsrSaveState **/
void RestoreSavePos();
@@ -240,12 +240,12 @@ public:
struct _SwCursor_SavePos
{
sal_uLong nNode;
- sal_Int32 nCntnt;
+ sal_Int32 nContent;
_SwCursor_SavePos* pNext;
_SwCursor_SavePos( const SwCursor& rCrsr )
: nNode( rCrsr.GetPoint()->nNode.GetIndex() ),
- nCntnt( rCrsr.GetPoint()->nContent.GetIndex() ),
+ nContent( rCrsr.GetPoint()->nContent.GetIndex() ),
pNext( 0 )
{}
virtual ~_SwCursor_SavePos() {}
@@ -257,10 +257,10 @@ class SwTableCursor : public virtual SwCursor
{
protected:
- sal_uLong m_nTblPtNd;
- sal_uLong m_nTblMkNd;
- sal_Int32 m_nTblPtCnt;
- sal_Int32 m_nTblMkCnt;
+ sal_uLong m_nTablePtNd;
+ sal_uLong m_nTableMkNd;
+ sal_Int32 m_nTablePtCnt;
+ sal_Int32 m_nTableMkCnt;
SwSelBoxes m_SelectedBoxes;
bool m_bChanged : 1;
bool m_bParked : 1; // Table-cursor was parked.
@@ -276,7 +276,7 @@ public:
bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) SAL_OVERRIDE;
virtual bool GotoTable( const OUString& rName ) SAL_OVERRIDE;
- void InsertBox( const SwTableBox& rTblBox );
+ void InsertBox( const SwTableBox& rTableBox );
void DeleteBox(size_t nPos);
size_t GetSelectedBoxesCount() const { return m_SelectedBoxes.size(); }
const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; }
@@ -287,14 +287,14 @@ public:
bool HasReadOnlyBoxSel() const;
// Has table cursor been changed? If so, save new values immediately.
- bool IsCrsrMovedUpdt();
+ bool IsCrsrMovedUpdate();
// Has table cursor been changed?
bool IsCrsrMoved() const
{
- return m_nTblMkNd != GetMark()->nNode.GetIndex() ||
- m_nTblPtNd != GetPoint()->nNode.GetIndex() ||
- m_nTblMkCnt != GetMark()->nContent.GetIndex() ||
- m_nTblPtCnt != GetPoint()->nContent.GetIndex();
+ return m_nTableMkNd != GetMark()->nNode.GetIndex() ||
+ m_nTablePtNd != GetPoint()->nNode.GetIndex() ||
+ m_nTableMkCnt != GetMark()->nContent.GetIndex() ||
+ m_nTablePtCnt != GetPoint()->nContent.GetIndex();
}
bool IsChgd() const { return m_bChanged; }
diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx
index 025fe81ce21c..ec76169e7309 100644
--- a/sw/inc/swddetbl.hxx
+++ b/sw/inc/swddetbl.hxx
@@ -38,16 +38,16 @@ public:
void ChangeContent();
bool NoDDETable();
- SwDDEFieldType* GetDDEFldType();
- inline const SwDDEFieldType* GetDDEFldType() const;
+ SwDDEFieldType* GetDDEFieldType();
+ inline const SwDDEFieldType* GetDDEFieldType() const;
protected:
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ) SAL_OVERRIDE;
virtual void SwClientNotify( const SwModify&, const SfxHint& ) SAL_OVERRIDE;
};
-inline const SwDDEFieldType* SwDDETable::GetDDEFldType() const
+inline const SwDDEFieldType* SwDDETable::GetDDEFieldType() const
{
- return const_cast<SwDDETable*>(this)->GetDDEFldType();
+ return const_cast<SwDDETable*>(this)->GetDDEFieldType();
}
#endif
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 356c7bf56ba6..e2ca9302d2fd 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -51,8 +51,8 @@
#define STR_SW_EVENT_FRM_RESIZE 11
#define STR_SW_EVENT_FRM_MOVE 12
-class SwFrmFmt;
-class SwFmtINetFmt;
+class SwFrameFormat;
+class SwFormatINetFormat;
class IMapObject;
// Enum for objects that call events into Basic or JavaScript.
@@ -73,43 +73,43 @@ struct SwCallMouseEvent
union
{
// EVENT_OBJECT_IMAGE/EVENT_OBJECT_URLITEM
- const SwFrmFmt* pFmt;
+ const SwFrameFormat* pFormat;
// EVENT_OBJECT_INETATTR
- const SwFmtINetFmt* pINetAttr;
+ const SwFormatINetFormat* pINetAttr;
// EVENT_OBJECT_IMAGEMAP
struct
{
- const SwFrmFmt* pFmt;
+ const SwFrameFormat* pFormat;
const IMapObject* pIMapObj;
} IMAP;
} PTR;
SwCallMouseEvent()
: eType( EVENT_OBJECT_NONE )
- { PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+ { PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
- void Set( SwCallEventObjectType eTyp, const SwFrmFmt* pFmt )
- { eType = eTyp; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = 0; }
+ void Set( SwCallEventObjectType eTyp, const SwFrameFormat* pFormat )
+ { eType = eTyp; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = 0; }
- void Set( const SwFrmFmt* pFmt, const IMapObject* pIMapObj )
- { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFmt = pFmt; PTR.IMAP.pIMapObj = pIMapObj; }
+ void Set( const SwFrameFormat* pFormat, const IMapObject* pIMapObj )
+ { eType = EVENT_OBJECT_IMAGEMAP; PTR.pFormat = pFormat; PTR.IMAP.pIMapObj = pIMapObj; }
- void Set( const SwFmtINetFmt* pINetAttr )
+ void Set( const SwFormatINetFormat* pINetAttr )
{ eType = EVENT_OBJECT_INETATTR; PTR.pINetAttr = pINetAttr; PTR.IMAP.pIMapObj = 0; }
bool operator==( const SwCallMouseEvent& rEvent ) const
{
return eType == rEvent.eType &&
- PTR.pFmt == rEvent.PTR.pFmt &&
+ PTR.pFormat == rEvent.PTR.pFormat &&
PTR.IMAP.pIMapObj == rEvent.PTR.IMAP.pIMapObj;
}
bool operator!=( const SwCallMouseEvent& rEvent ) const
{ return !( *this == rEvent ); }
void Clear()
- { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; }
+ { eType = EVENT_OBJECT_NONE; PTR.pFormat = 0; PTR.IMAP.pIMapObj = 0; }
bool HasEvent() const { return EVENT_OBJECT_NONE != eType; }
};
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 0b5504a57c3a..6c3dc36c738f 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -152,7 +152,7 @@ public:
sal_uInt16 nDest = VIEWOPT_DEST_VIEW );
void ApplyUserMetric( FieldUnit eMetric, bool bWeb );
void ApplyRulerMetric( FieldUnit eMetric, bool bHorizontal, bool bWeb );
- void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags);
+ void ApplyFieldUpdateFlags(SwFieldUpdateFlags eFieldFlags);
void ApplyLinkMode(sal_Int32 nNewLinkMode);
// Default page mode for text grid.
@@ -184,9 +184,9 @@ public:
static void ShowDBObj( SwView& rView, const SwDBData& rData, bool bOnlyIfAvailable = false);
// Table modi.
- bool IsInsTblFormatNum(bool bHTML) const;
- bool IsInsTblChangeNumFormat(bool bHTML) const;
- bool IsInsTblAlignNum(bool bHTML) const;
+ bool IsInsTableFormatNum(bool bHTML) const;
+ bool IsInsTableChangeNumFormat(bool bHTML) const;
+ bool IsInsTableAlignNum(bool bHTML) const;
// Redlining.
sal_uInt16 GetRedlineAuthor();
@@ -214,7 +214,7 @@ public:
// Pass update-statuses.
sal_uInt16 GetLinkUpdMode( bool bWeb ) const;
- SwFldUpdateFlags GetFldUpdateFlags( bool bWeb ) const;
+ SwFieldUpdateFlags GetFieldUpdateFlags( bool bWeb ) const;
// Virtual methods for options dialog.
virtual SfxItemSet* CreateItemSet( sal_uInt16 nId ) SAL_OVERRIDE;
diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx
index 2e2749fe0496..40fcfcb9801a 100644
--- a/sw/inc/swscanner.hxx
+++ b/sw/inc/swscanner.hxx
@@ -23,14 +23,14 @@
#include <i18nlangtag/lang.h>
#include <modeltoviewhelper.hxx>
-class SwTxtNode;
+class SwTextNode;
// Helper class that provides consecutively the words of a selected area
// during spell check
class SwScanner
{
OUString aWord;
- const SwTxtNode& rNode;
+ const SwTextNode& rNode;
const OUString aPreDashReplacementText;
OUString aText;
const LanguageType* pLanguage;
@@ -45,7 +45,7 @@ class SwScanner
bool bClip;
public:
- SwScanner( const SwTxtNode& rNd, const OUString& rTxt,
+ SwScanner( const SwTextNode& rNd, const OUString& rText,
const LanguageType* pLang,
const ModelToViewHelper& rConvMap,
sal_uInt16 nWordType,
diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx
index 3da7b1a28df4..053912718280 100644
--- a/sw/inc/swserv.hxx
+++ b/sw/inc/swserv.hxx
@@ -36,7 +36,7 @@ protected:
enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType;
union {
::sw::mark::IMark* pBkmk;
- SwTableNode* pTblNd;
+ SwTableNode* pTableNd;
SwSectionNode* pSectNd;
} CNTNT_TYPE;
@@ -51,7 +51,7 @@ public:
SwServerObject( SwTableNode& rTableNd )
: eType( TABLE_SERVER )
{
- CNTNT_TYPE.pTblNd = &rTableNd;
+ CNTNT_TYPE.pTableNd = &rTableNd;
}
SwServerObject( SwSectionNode& rSectNd )
: eType( SECTION_SERVER )
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 088c01b82703..f3197b567a9d 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -33,12 +33,12 @@
#include <o3tl/sorted_vector.hxx>
class SwStartNode;
-class SwFmt;
+class SwFormat;
class Color;
-class SwFrmFmt;
-class SwTableFmt;
-class SwTableLineFmt;
-class SwTableBoxFmt;
+class SwFrameFormat;
+class SwTableFormat;
+class SwTableLineFormat;
+class SwTableBoxFormat;
class SwHTMLTableLayout;
class SwTableLine;
class SwTableBox;
@@ -46,22 +46,22 @@ class SwTableNode;
class SwTabCols;
class SwDoc;
class SwSelBoxes;
-class SwTblCalcPara;
+class SwTableCalcPara;
struct SwPosition;
class SwNodeIndex;
class SwNode;
class SfxPoolItem;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
class SwUndo;
class SwPaM;
class SwTableBox_Impl;
-class SwUndoTblCpyTbl;
+class SwUndoTableCpyTable;
class SwBoxSelection;
struct SwSaveRowSpan;
struct Parm;
class SwServerObject;
-void sw_GetTblBoxColStr( sal_uInt16 nCol, OUString& rNm );
+void sw_GetTableBoxColStr( sal_uInt16 nCol, OUString& rNm );
class SwTableLines : public std::vector<SwTableLine*> {
public:
@@ -91,7 +91,7 @@ public:
class SwTableSortBoxes : public o3tl::sorted_vector<SwTableBox*> {};
/// SwTable is one table in the document model, containing rows (which contain cells).
-class SW_DLLPUBLIC SwTable: public SwClient //Client of FrmFmt.
+class SW_DLLPUBLIC SwTable: public SwClient //Client of FrameFormat.
{
protected:
@@ -108,7 +108,7 @@ protected:
SwTableNode* pTableNode;
// Should that be adjustable for every table?
- TblChgMode eTblChgMode;
+ TableChgMode eTableChgMode;
sal_uInt16 nGrfsThatResize; // Count of Grfs that initiate a resize of table
// at HTML-import.
@@ -136,7 +136,7 @@ public:
TYPEINFO_OVERRIDE();
// single argument ctors shall be explicit.
- explicit SwTable( SwTableFmt* );
+ explicit SwTable( SwTableFormat* );
virtual ~SwTable();
// @@@ public copy ctor, but no copy assignment?
@@ -146,10 +146,10 @@ private:
SwTable & operator= (const SwTable &) SAL_DELETED_FUNCTION;
// no default ctor.
SwTable();
- bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* );
+ bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTableMerge* );
bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged,
- SwTableBox*, SwUndoTblMerge* );
+ SwTableBox*, SwUndoTableMerge* );
bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, bool );
SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const;
void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt );
@@ -184,8 +184,8 @@ public:
SwTableLines &GetTabLines() { return aLines; }
const SwTableLines &GetTabLines() const { return aLines; }
- SwTableFmt* GetFrmFmt() { return static_cast<SwTableFmt*>(GetRegisteredIn()); }
- SwTableFmt* GetFrmFmt() const { return const_cast<SwTableFmt*>(static_cast<const SwTableFmt*>(GetRegisteredIn())); }
+ SwTableFormat* GetFrameFormat() { return static_cast<SwTableFormat*>(GetRegisteredIn()); }
+ SwTableFormat* GetFrameFormat() const { return const_cast<SwTableFormat*>(static_cast<const SwTableFormat*>(GetRegisteredIn())); }
void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart,
bool bHidden = false, bool bCurRowOnly = false ) const;
@@ -213,7 +213,7 @@ public:
// It's not allowed to change the table model after the first call of one of these functions.
bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
- SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
+ SwTableBox* pMergeBox, SwUndoTableMerge* pUndo = 0 )
{
#ifdef DBG_UTIL
m_bDontChangeModel = true;
@@ -231,7 +231,7 @@ public:
OldSplitRow( pDoc, rBoxes, nCnt, bSameHeight );
}
bool PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
- SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo );
+ SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo );
void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const;
void PrepareDeleteCol( long nMin, long nMax );
@@ -244,7 +244,7 @@ public:
SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
bool Merge( const SwSelBoxes& rBoxes,
- SwTableBox* pMergeBox, SwUndoTblMerge* = 0 );
+ SwTableBox* pMergeBox, SwUndoTableMerge* = 0 );
void FindSuperfluousRows( SwSelBoxes& rBoxes )
{ _FindSuperfluousRows( rBoxes, 0, 0 ); }
@@ -253,7 +253,7 @@ public:
SwTableSortBoxes& GetTabSortBoxes() { return m_TabSortContentBoxes; }
const SwTableSortBoxes& GetTabSortBoxes() const { return m_TabSortContentBoxes; }
- // Read 1st number and delete it from string (used by GetTblBox and SwTblFld).
+ // Read 1st number and delete it from string (used by GetTableBox and SwTableField).
// #i80314#
// add 3rd parameter in order to control validation check on <rStr>
@@ -266,31 +266,31 @@ public:
// #i80314#
// add 2nd parameter in order to control validation check in called method
// <_GetBoxNum(..)>
- const SwTableBox* GetTblBox( const OUString& rName,
+ const SwTableBox* GetTableBox( const OUString& rName,
const bool bPerformValidCheck = false ) const;
// Copy selected boxes to another document.
bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&,
bool bCpyNds = true, bool bCpyName = false ) const;
// Copy table in this
- bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&,
- SwUndoTblCpyTbl* pUndo = 0 );
- bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&,
- SwUndoTblCpyTbl* pUndo = 0 );
- bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&,
- SwUndoTblCpyTbl* pUndo );
+ bool InsTable( const SwTable& rCpyTable, const SwNodeIndex&,
+ SwUndoTableCpyTable* pUndo = 0 );
+ bool InsTable( const SwTable& rCpyTable, const SwSelBoxes&,
+ SwUndoTableCpyTable* pUndo = 0 );
+ bool InsNewTable( const SwTable& rCpyTable, const SwSelBoxes&,
+ SwUndoTableCpyTable* pUndo );
// Copy headline of table (with content!) into an other one.
- bool CopyHeadlineIntoTable( SwTableNode& rTblNd );
+ bool CopyHeadlineIntoTable( SwTableNode& rTableNd );
// Get box, whose start index is set on nBoxStt.
- SwTableBox* GetTblBox( sal_uLong nSttIdx );
- const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
- { return const_cast<SwTable*>(this)->GetTblBox( nSttIdx ); }
+ SwTableBox* GetTableBox( sal_uLong nSttIdx );
+ const SwTableBox* GetTableBox( sal_uLong nSttIdx ) const
+ { return const_cast<SwTable*>(this)->GetTableBox( nSttIdx ); }
// Returns true if table contains nestings.
- bool IsTblComplex() const;
+ bool IsTableComplex() const;
// Returns true if table or selection is balanced.
- bool IsTblComplexForChart( const OUString& rSel ) const;
+ bool IsTableComplexForChart( const OUString& rSel ) const;
// Search all content-bearing boxes of the base line on which this box stands.
// rBoxes as a return value for immediate use.
@@ -303,7 +303,7 @@ public:
virtual bool GetInfo( SfxPoolItem& ) const SAL_OVERRIDE;
// Search in format for registered table.
- static SwTable * FindTable( SwFrmFmt const*const pFmt );
+ static SwTable * FindTable( SwFrameFormat const*const pFormat );
// Clean up structure a bit.
void GCLines();
@@ -320,14 +320,14 @@ public:
// Fill data for chart.
void UpdateCharts() const;
- TblChgMode GetTblChgMode() const { return eTblChgMode; }
- void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; }
+ TableChgMode GetTableChgMode() const { return eTableChgMode; }
+ void SetTableChgMode( TableChgMode eMode ) { eTableChgMode = eMode; }
bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
- void RegisterToFormat( SwFmt& rFmt );
+ void RegisterToFormat( SwFormat& rFormat );
#ifdef DBG_UTIL
void CheckConsistency() const;
#endif
@@ -336,7 +336,7 @@ public:
};
/// SwTableLine is one table row in the document model.
-class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrmFmt.
+class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat.
{
SwTableBoxes aBoxes;
SwTableBox *pUpper;
@@ -346,7 +346,7 @@ public:
SwTableLine() : pUpper(0) {}
- SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp );
+ SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp );
virtual ~SwTableLine();
SwTableBoxes &GetTabBoxes() { return aBoxes; }
@@ -356,27 +356,27 @@ public:
const SwTableBox *GetUpper() const { return pUpper; }
void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
- // Creates a own FrmFmt if more lines depend on it.
- SwFrmFmt* ClaimFrmFmt();
- void ChgFrmFmt( SwTableLineFmt* pNewFmt );
+ // Creates a own FrameFormat if more lines depend on it.
+ SwFrameFormat* ClaimFrameFormat();
+ void ChgFrameFormat( SwTableLineFormat* pNewFormat );
// Search next/previous box with content.
SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
- bool bOvrTblLns=true ) const;
+ bool bOvrTableLns=true ) const;
SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
- bool bOvrTblLns=true ) const;
+ bool bOvrTableLns=true ) const;
SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const;
bool hasSoftPageBreak() const;
- void RegisterToFormat( SwFmt& rFmt );
+ void RegisterToFormat( SwFormat& rFormat );
};
/// SwTableBox is one table cell in the document model.
-class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt.
+class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrameFormat.
{
friend class SwNodes; // Transpose index.
friend void DelBoxNode(SwTableSortBoxes&); // Delete StartNode* !
@@ -392,16 +392,16 @@ class SW_DLLPUBLIC SwTableBox: public SwClient //Client of FrmFmt.
// In case Format contains formulas/values already,
// a new one must be created for the new box.
- static SwTableBoxFmt* CheckBoxFmt( SwTableBoxFmt* );
+ static SwTableBoxFormat* CheckBoxFormat( SwTableBoxFormat* );
public:
TYPEINFO_OVERRIDE();
SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {}
- SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
- SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 );
- SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 );
+ SwTableBox( SwTableBoxFormat*, sal_uInt16 nLines, SwTableLine *pUp = 0 );
+ SwTableBox( SwTableBoxFormat*, const SwStartNode&, SwTableLine *pUp = 0 );
+ SwTableBox( SwTableBoxFormat*, const SwNodeIndex&, SwTableLine *pUp = 0 );
virtual ~SwTableBox();
SwTableLines &GetTabLines() { return aLines; }
@@ -411,12 +411,12 @@ public:
const SwTableLine *GetUpper() const { return pUpper; }
void SetUpper( SwTableLine *pNew ) { pUpper = pNew; }
- SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
- // Creates its own FrmFmt if more boxes depend on it.
- SwFrmFmt* ClaimFrmFmt();
- void ChgFrmFmt( SwTableBoxFmt *pNewFmt );
+ // Creates its own FrameFormat if more boxes depend on it.
+ SwFrameFormat* ClaimFrameFormat();
+ void ChgFrameFormat( SwTableBoxFormat *pNewFormat );
void RemoveFromTable();
const SwStartNode *GetSttNd() const { return pSttNd; }
@@ -424,25 +424,25 @@ public:
// Search next/previous box with content.
SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0,
- bool bOvrTblLns=true ) const;
+ bool bOvrTableLns=true ) const;
SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0,
- bool bOvrTblLns=true ) const;
+ bool bOvrTableLns=true ) const;
// Return name of this box. It is determined dynamically and
// is calculated from the position in the lines/boxes/table.
OUString GetName() const;
// Return "value" of box (for calculating in table).
- double GetValue( SwTblCalcPara& rPara ) const;
+ double GetValue( SwTableCalcPara& rPara ) const;
// Computes "coordinates" of a box, used to computed selection
// width or height when inserting cols or rows
Point GetCoordinates() const;
- bool IsInHeadline( const SwTable* pTbl = 0 ) const;
+ bool IsInHeadline( const SwTable* pTable = 0 ) const;
// Contains box contents, that can be formatted as a number?
- bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex,
- bool& rIsEmptyTxtNd ) const;
- sal_uLong IsValidNumTxtNd( bool bCheckAttr = true ) const;
+ bool HasNumContent( double& rNum, sal_uInt32& rFormatIndex,
+ bool& rIsEmptyTextNd ) const;
+ sal_uLong IsValidNumTextNd( bool bCheckAttr = true ) const;
// If a table formula is set, test if box contents is congruent with number.
// (For Redo of change of NumFormat!).
bool IsNumberChanged() const;
@@ -459,9 +459,9 @@ public:
// Access on internal data - currently used for the NumFormatter.
inline const Color* GetSaveUserColor() const;
- inline const Color* GetSaveNumFmtColor() const;
+ inline const Color* GetSaveNumFormatColor() const;
inline void SetSaveUserColor(const Color* p );
- inline void SetSaveNumFmtColor( const Color* p );
+ inline void SetSaveNumFormatColor( const Color* p );
long getRowSpan() const;
void setRowSpan( long nNewRowSpan );
@@ -477,7 +477,7 @@ public:
const SwTableBox& FindEndOfRowSpan( const SwTable& rTable,
sal_uInt16 nMaxStep = USHRT_MAX ) const
{ return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); }
- void RegisterToFormat( SwFmt& rFmt ) ;
+ void RegisterToFormat( SwFormat& rFormat ) ;
};
class SwCellFrm;
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 181bf23b67b0..336bb39a0193 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -23,62 +23,62 @@
class SwDoc;
-class SW_DLLPUBLIC SwTableFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat
{
friend class SwDoc;
protected:
- SwTableFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+ SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
{}
- SwTableFmt( SwAttrPool& rPool, const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+ SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
{}
public:
TYPEINFO_OVERRIDE(); // Already in base class Content.
- DECL_FIXEDMEMPOOL_NEWDEL(SwTableFmt)
+ DECL_FIXEDMEMPOOL_NEWDEL(SwTableFormat)
virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
};
-class SwTableLineFmt : public SwFrmFmt
+class SwTableLineFormat : public SwFrameFormat
{
friend class SwDoc;
protected:
- SwTableLineFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+ SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
{}
- SwTableLineFmt( SwAttrPool& rPool, const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+ SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
{}
public:
TYPEINFO_OVERRIDE(); // Already in base class Content.
- DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFmt)
+ DECL_FIXEDMEMPOOL_NEWDEL(SwTableLineFormat)
virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
};
-class SW_DLLPUBLIC SwTableBoxFmt : public SwFrmFmt
+class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat
{
friend class SwDoc;
protected:
- SwTableBoxFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+ SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
{}
- SwTableBoxFmt( SwAttrPool& rPool, const OUString &rFmtNm,
- SwFrmFmt *pDrvdFrm )
- : SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+ SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm,
+ SwFrameFormat *pDrvdFrm )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
{}
// For recognition of changes (especially TableBoxAttribute).
@@ -87,7 +87,7 @@ protected:
public:
TYPEINFO_OVERRIDE(); // Already in base class Content.
- DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFmt)
+ DECL_FIXEDMEMPOOL_NEWDEL(SwTableBoxFormat)
virtual bool supportsFullDrawingLayerFillAttributeSet() const SAL_OVERRIDE;
};
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index b5107323d63f..b724fbdc3313 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -130,7 +130,7 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
#define INIT_SEQ_FLDTYPES 4
// The former Rendevouz-IDs live on:
-// There are IDs for the anchors (SwFmtAnchor) and some others
+// There are IDs for the anchors (SwFormatAnchor) and some others
// that are only of importance for interfaces (SwDoc).
enum RndStdIds
{
@@ -257,7 +257,7 @@ enum PrepareHint
// (Check for Fly-break). In void* of Prepare()
// a sal_Bool& is passed. If this is sal_True,
// it indicateds that a format has been executed.
- PREP_UL_SPACE, // UL-Space has changed, TxtFrms have to
+ PREP_UL_SPACE, // UL-Space has changed, TextFrms have to
// re-calculate line space.
PREP_MUST_FIT, // Make frm fit (split) even if the attributes do
// not allow that (e.g. "keep together").
@@ -269,7 +269,7 @@ enum PrepareHint
// order to format the text into it.
PREP_BOSS_CHGD, // If a Frm changes its column/page this additional
// Prepare is sended to POS_CHGD in MoveFwd/Bwd
- // (join Ftn-numbers etc.)
+ // (join Footnote-numbers etc.)
// Direction is communicated via pVoid:
// MoveFwd: pVoid == 0
// MoveBwd: pVoid == pOldPage
@@ -279,7 +279,7 @@ enum PrepareHint
PREP_MOVEFTN, // A footnote changes its page. Its contents receives at first a
// height of zero in order to avoid too much noise. At formatting
// it checks whether it fits and if necessary changes its page again.
- PREP_ERGOSUM, // Needed because of movement in FtnFrms. Check QuoVadis/ErgoSum.
+ PREP_ERGOSUM, // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum.
PREP_END // END.
};
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 8c96abafcc87..8f51b2287392 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -62,7 +62,7 @@ struct SwAfVersions;
class SvNumberFormatter;
-class SwBoxAutoFmt
+class SwBoxAutoFormat
{
// common attributes of Calc and Writer
// --- from 641 on: CJK and CTL font settings
@@ -95,7 +95,7 @@ class SwBoxAutoFmt
// Writer specific
SvxAdjustItem aAdjust;
SvxFrameDirectionItem m_aTextOrientation;
- SwFmtVertOrient m_aVerticalAlignment;
+ SwFormatVertOrient m_aVerticalAlignment;
// Calc specific
SvxHorJustifyItem aHorJustify;
@@ -107,16 +107,16 @@ class SwBoxAutoFmt
SvxRotateModeItem aRotateMode;
// number format
- OUString sNumFmtString;
- LanguageType eSysLanguage, eNumFmtLanguage;
+ OUString sNumFormatString;
+ LanguageType eSysLanguage, eNumFormatLanguage;
public:
- SwBoxAutoFmt();
- SwBoxAutoFmt( const SwBoxAutoFmt& rNew );
- ~SwBoxAutoFmt();
+ SwBoxAutoFormat();
+ SwBoxAutoFormat( const SwBoxAutoFormat& rNew );
+ ~SwBoxAutoFormat();
- int operator==( const SwBoxAutoFmt& rCmp ) const;
- SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew );
+ int operator==( const SwBoxAutoFormat& rCmp ) const;
+ SwBoxAutoFormat& operator=( const SwBoxAutoFormat& rNew );
// The get-methods.
const SvxFontItem &GetFont() const { return aFont; }
@@ -139,13 +139,13 @@ public:
const SvxColorItem &GetColor() const { return aColor; }
const SvxAdjustItem &GetAdjust() const { return aAdjust; }
const SvxFrameDirectionItem& GetTextOrientation() const { return m_aTextOrientation; }
- const SwFmtVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
+ const SwFormatVertOrient& GetVerticalAlignment() const { return m_aVerticalAlignment; }
const SvxBoxItem &GetBox() const { return aBox; }
const SvxLineItem &GetTLBR() const { return aTLBR; }
const SvxLineItem &GetBLTR() const { return aBLTR; }
const SvxBrushItem &GetBackground() const { return aBackground; }
- void GetValueFormat( OUString& rFmt, LanguageType& rLng, LanguageType& rSys ) const
- { rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
+ void GetValueFormat( OUString& rFormat, LanguageType& rLng, LanguageType& rSys ) const
+ { rFormat = sNumFormatString; rLng = eNumFormatLanguage; rSys = eSysLanguage; }
// The set-methods.
void SetFont( const SvxFontItem& rNew ) { aFont = rNew; }
@@ -173,11 +173,11 @@ public:
aAdjust.SetLastBlock( rNew.GetLastBlock() );
}
void SetTextOrientation(const SvxFrameDirectionItem& rNew) { m_aTextOrientation = rNew; }
- void SetVerticalAlignment(const SwFmtVertOrient& rNew) { m_aVerticalAlignment = rNew; }
+ void SetVerticalAlignment(const SwFormatVertOrient& rNew) { m_aVerticalAlignment = rNew; }
void SetBox( const SvxBoxItem& rNew ) { aBox = rNew; }
void SetBackground( const SvxBrushItem& rNew ) { aBackground = rNew; }
- void SetValueFormat( const OUString& rFmt, LanguageType eLng, LanguageType eSys )
- { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; }
+ void SetValueFormat( const OUString& rFormat, LanguageType eLng, LanguageType eSys )
+ { sNumFormatString = rFormat; eNumFormatLanguage = eLng; eSysLanguage = eSys; }
bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer );
bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
@@ -228,10 +228,10 @@ The properties saved are divided into three categories:
Character and box properties are stored per cell (and are lossy for tables larger than 4x4). Table
properties are stored per-table, and are lossless.
*/
-class SW_DLLPUBLIC SwTableAutoFmt
+class SW_DLLPUBLIC SwTableAutoFormat
{
friend void _FinitCore(); // To destroy default pointer.
- static SwBoxAutoFmt* pDfltBoxAutoFmt;
+ static SwBoxAutoFormat* pDfltBoxAutoFormat;
OUString m_aName;
sal_uInt16 nStrResId;
@@ -246,12 +246,12 @@ class SW_DLLPUBLIC SwTableAutoFmt
// Calc specific flags.
bool bInclWidthHeight : 1;
- SwBoxAutoFmt* aBoxAutoFmt[ 16 ];
+ SwBoxAutoFormat* aBoxAutoFormat[ 16 ];
// Writer-specific options
- SvxFmtBreakItem m_aBreak;
- SwFmtPageDesc m_aPageDesc;
- SvxFmtKeepItem m_aKeepWithNextPara;
+ SvxFormatBreakItem m_aBreak;
+ SwFormatPageDesc m_aPageDesc;
+ SvxFormatKeepItem m_aKeepWithNextPara;
sal_uInt16 m_aRepeatHeading;
bool m_bLayoutSplit;
bool m_bRowSplit;
@@ -259,14 +259,14 @@ class SW_DLLPUBLIC SwTableAutoFmt
SvxShadowItem m_aShadow;
public:
- SwTableAutoFmt( const OUString& rName );
- SwTableAutoFmt( const SwTableAutoFmt& rNew );
- ~SwTableAutoFmt();
+ SwTableAutoFormat( const OUString& rName );
+ SwTableAutoFormat( const SwTableAutoFormat& rNew );
+ ~SwTableAutoFormat();
- SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew );
+ SwTableAutoFormat& operator=( const SwTableAutoFormat& rNew );
- void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos );
- const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const;
+ void SetBoxFormat( const SwBoxAutoFormat& rNew, sal_uInt8 nPos );
+ const SwBoxAutoFormat& GetBoxFormat( sal_uInt8 nPos ) const;
void SetName( const OUString& rNew ) { m_aName = rNew; nStrResId = USHRT_MAX; }
OUString GetName() const { return m_aName; }
@@ -297,7 +297,7 @@ public:
bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
};
-class SW_DLLPUBLIC SwTableAutoFmtTbl
+class SW_DLLPUBLIC SwTableAutoFormatTable
{
struct Impl;
::boost::scoped_ptr<Impl> m_pImpl;
@@ -306,15 +306,15 @@ class SW_DLLPUBLIC SwTableAutoFmtTbl
SAL_DLLPRIVATE bool Save( SvStream& rStream ) const;
public:
- explicit SwTableAutoFmtTbl();
- ~SwTableAutoFmtTbl();
+ explicit SwTableAutoFormatTable();
+ ~SwTableAutoFormatTable();
size_t size() const;
- SwTableAutoFmt const& operator[](size_t i) const;
- SwTableAutoFmt & operator[](size_t i);
- void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
- void EraseAutoFmt(size_t i);
- SwTableAutoFmt* ReleaseAutoFmt(size_t i);
+ SwTableAutoFormat const& operator[](size_t i) const;
+ SwTableAutoFormat & operator[](size_t i);
+ void InsertAutoFormat(size_t i, SwTableAutoFormat * pFormat);
+ void EraseAutoFormat(size_t i);
+ SwTableAutoFormat* ReleaseAutoFormat(size_t i);
bool Load();
bool Save() const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index e99713af88f4..0fef6bb66504 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -20,35 +20,35 @@
#define INCLUDED_SW_INC_TBLENUM_HXX
// For changing table columns/rows widths/heights.
-typedef sal_uInt16 TblChgWidthHeightType;
+typedef sal_uInt16 TableChgWidthHeightType;
-namespace nsTblChgWidthHeightType
+namespace nsTableChgWidthHeightType
{
- const TblChgWidthHeightType WH_COL_LEFT = 0;
- const TblChgWidthHeightType WH_COL_RIGHT = 1;
- const TblChgWidthHeightType WH_ROW_TOP = 2;
- const TblChgWidthHeightType WH_ROW_BOTTOM = 3;
- const TblChgWidthHeightType WH_CELL_LEFT = 4;
- const TblChgWidthHeightType WH_CELL_RIGHT = 5;
- const TblChgWidthHeightType WH_CELL_TOP = 6;
- const TblChgWidthHeightType WH_CELL_BOTTOM = 7;
+ const TableChgWidthHeightType WH_COL_LEFT = 0;
+ const TableChgWidthHeightType WH_COL_RIGHT = 1;
+ const TableChgWidthHeightType WH_ROW_TOP = 2;
+ const TableChgWidthHeightType WH_ROW_BOTTOM = 3;
+ const TableChgWidthHeightType WH_CELL_LEFT = 4;
+ const TableChgWidthHeightType WH_CELL_RIGHT = 5;
+ const TableChgWidthHeightType WH_CELL_TOP = 6;
+ const TableChgWidthHeightType WH_CELL_BOTTOM = 7;
// The following can "or"ed into.
- const TblChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-mode: the Bigger-Flag
+ const TableChgWidthHeightType WH_FLAG_INSDEL = 0x4000; // Insert/Del-mode: the Bigger-Flag
// tells what happens:
// bBigger -> box gets removed.
// !bBigger-> box gets inserted.
- const TblChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box becomes larger -> else smaller.
+ const TableChgWidthHeightType WH_FLAG_BIGGER = 0x8000; // Box becomes larger -> else smaller.
}
-enum TblChgMode
+enum TableChgMode
{
TBLFIX_CHGABS, // Table fixed width, change neighbour.
TBLFIX_CHGPROP, // Table fixed width, change all neighbours.
TBLVAR_CHGABS // Table variable, change all neighbours.
};
-enum SplitTbl_HeadlineOption
+enum SplitTable_HeadlineOption
{
HEADLINE_NONE = 0, // Leave everything in place.
HEADLINE_BORDERCOPY, // Copy border of the previous line.
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 10d237ea62eb..aa1001607b8f 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -38,7 +38,7 @@ class SwLayoutFrm;
class SwPaM;
class SwNode;
class SwTable;
-class SwUndoTblMerge;
+class SwUndoTableMerge;
class SwCellFrm;
typedef ::std::deque< SwCellFrm* > SwCellFrms;
@@ -56,32 +56,32 @@ class SwSelBoxes : public o3tl::sorted_vector<SwTableBox*, CompareSwSelBoxes> {}
// Selection gets extended in given direction according to enum-parameter.
// Boxes are collected via the Layout; works correctly if tables are split.
// (Cf. MakeSelUnions().)
-typedef sal_uInt16 SwTblSearchType;
-namespace nsSwTblSearchType
+typedef sal_uInt16 SwTableSearchType;
+namespace nsSwTableSearchType
{
- const SwTblSearchType TBLSEARCH_NONE = 0x1; // No extension.
- const SwTblSearchType TBLSEARCH_ROW = 0x2; // Extend to rows.
- const SwTblSearchType TBLSEARCH_COL = 0x3; // Extend to columns.
+ const SwTableSearchType TBLSEARCH_NONE = 0x1; // No extension.
+ const SwTableSearchType TBLSEARCH_ROW = 0x2; // Extend to rows.
+ const SwTableSearchType TBLSEARCH_COL = 0x3; // Extend to columns.
// As flag to the other values!
- const SwTblSearchType TBLSEARCH_PROTECT = 0x8; // Collect protected boxes too.
- const SwTblSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
+ const SwTableSearchType TBLSEARCH_PROTECT = 0x8; // Collect protected boxes too.
+ const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
}
-SW_DLLPUBLIC void GetTblSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
-void GetTblSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// As before, but don't start from selection but from Start- EndFrms.
-void GetTblSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
+void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
SwSelBoxes& rBoxes, SwCellFrms* pCells,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// As before but directly via PaMs.
-void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
-void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes );
// Collect boxes relevant for auto sum.
bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
@@ -93,16 +93,16 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes );
bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd);
// Check if cell is part of SSelection.
-// (Became a function, in order to make sure that GetTblSel() and MakeTblCrsr()
+// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr()
// have always the same concept of the selection.
-bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell );
+bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell );
// Determine boxes to be merged.
// In this process the rectangle gets "adapted" on the base of the layout,
// i.e. boxes are added if some overlap at the sides.
// Additionally a new box is created and filled with the relevant content.
void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes,
- SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 );
+ SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo = 0 );
// Check if selected boxes allow for a valid merge.
sal_uInt16 CheckMergeSel( const SwPaM& rPam );
@@ -112,9 +112,9 @@ bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
// Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// For working on tab selection also for split tables.
class SwSelUnion
@@ -138,11 +138,11 @@ typedef boost::ptr_vector<SwSelUnion> SwSelUnions;
// Gets the tables involved in a table selection and the union-rectangles of the selections
// - also for split tables.
-// If a parameter is passed that != nsSwTblSearchType::TBLSEARCH_NONE
+// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE
// the selection is extended in the given direction.
void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart,
const SwLayoutFrm *pEnd,
- const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE );
+ const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// These classes copy the current table selections (rBoxes) into a
// separate structure while keeping the table structure.
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index 89802c3d41f2..f4fb97a3dc6d 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -24,9 +24,9 @@
class SdrPage;
class SdrObject;
class SfxItemSet;
-class SwFrmFmt;
-class SwFrmFmts;
-class SwFmtCntnt;
+class SwFrameFormat;
+class SwFrameFormats;
+class SwFormatContent;
class SwDoc;
class Rectangle;
class _ZSortFly;
@@ -42,58 +42,58 @@ class SW_DLLPUBLIC SwTextBoxHelper
{
public:
/// Maps a draw format to a fly format.
- typedef std::map<const SwFrmFmt*, const SwFrmFmt*> SavedLink;
+ typedef std::map<const SwFrameFormat*, const SwFrameFormat*> SavedLink;
/// Maps a draw format to content.
- typedef std::map<const SwFrmFmt*, SwFmtCntnt> SavedContent;
+ typedef std::map<const SwFrameFormat*, SwFormatContent> SavedContent;
/// Create a TextBox for a shape.
- static void create(SwFrmFmt* pShape);
+ static void create(SwFrameFormat* pShape);
/// Destroy a TextBox for a shape.
- static void destroy(SwFrmFmt* pShape);
+ static void destroy(SwFrameFormat* pShape);
/// Get interface of a shape's TextBox, if there is any.
- static css::uno::Any queryInterface(SwFrmFmt* pShape, const css::uno::Type& rType);
+ static css::uno::Any queryInterface(SwFrameFormat* pShape, const css::uno::Type& rType);
/// Sync property of TextBox with the one of the shape.
- static void syncProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
+ static void syncProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, const css::uno::Any& rValue);
/// Does the same, but works on properties which lack an sw-specific WID / MemberID.
- static void syncProperty(SwFrmFmt* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
+ static void syncProperty(SwFrameFormat* pShape, const OUString& rPropertyName, const css::uno::Any& rValue);
/// Get a property of the underlying TextFrame.
- static void getProperty(SwFrmFmt* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
+ static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
/// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes).
- static void syncFlyFrmAttr(SwFrmFmt& rShape, SfxItemSet& rSet);
+ static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
/// If we have an associated TextFrame, then return that.
- static SwFrmFmt* findTextBox(const SwFrmFmt* pShape);
- static SwFrmFmt* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
+ static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
+ static SwFrameFormat* findTextBox(css::uno::Reference<css::drawing::XShape> xShape);
/// Return the textbox rectangle of a draw shape (in twips).
- static Rectangle getTextRectangle(SwFrmFmt* pShape, bool bAbsolute = true);
+ static Rectangle getTextRectangle(SwFrameFormat* pShape, bool bAbsolute = true);
/// Look up TextFrames in a document, which are in fact TextBoxes.
- static std::set<const SwFrmFmt*> findTextBoxes(const SwDoc* pDoc);
+ static std::set<const SwFrameFormat*> findTextBoxes(const SwDoc* pDoc);
/**
* Look up TextFrames in a document, which are in fact TextBoxes.
*
- * If rNode has a matching SwCntntFrm, then only TextBoxes of rNode are
+ * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are
* returned.
*/
- static std::set<const SwFrmFmt*> findTextBoxes(const SwNode& rNode);
+ static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode);
/// Is pObject a textbox of a drawinglayer shape?
static bool isTextBox(const SdrObject* pObject);
/// Build a textbox -> shape format map.
- static std::map<SwFrmFmt*, SwFrmFmt*> findShapes(const SwDoc* pDoc);
+ static std::map<SwFrameFormat*, SwFrameFormat*> findShapes(const SwDoc* pDoc);
/// Count number of shapes in the document, excluding TextBoxes.
- static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrmFmt*>& rTextBoxes);
+ static sal_Int32 getCount(SdrPage* pPage, std::set<const SwFrameFormat*>& rTextBoxes);
/// Get a shape by index, excluding TextBoxes.
- static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrmFmt*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
+ static css::uno::Any getByIndex(SdrPage* pPage, sal_Int32 nIndex, std::set<const SwFrameFormat*>& rTextBoxes) throw(css::lang::IndexOutOfBoundsException);
/// Get the order of the shape, excluding TextBoxes.
- static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrmFmt*>& rTextBoxes);
+ static sal_Int32 getOrdNum(const SdrObject* pObject, std::set<const SwFrameFormat*>& rTextBoxes);
/// Saves the current shape -> textbox links in a map, so they can be restored later.
- static void saveLinks(const SwFrmFmts& rFormats, std::map<const SwFrmFmt*, const SwFrmFmt*>& rLinks);
+ static void saveLinks(const SwFrameFormats& rFormats, std::map<const SwFrameFormat*, const SwFrameFormat*>& rLinks);
/// Reset the shape -> textbox link on the shape, and save it to the map, so it can be restored later.
- static void resetLink(SwFrmFmt* pShape, std::map<const SwFrmFmt*, SwFmtCntnt>& rOldContent);
+ static void resetLink(SwFrameFormat* pShape, std::map<const SwFrameFormat*, SwFormatContent>& rOldContent);
/// Undo the effect of saveLinks() + individual resetLink() calls.
- static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrmFmt*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
+ static void restoreLinks(std::set<_ZSortFly>& rOld, std::vector<SwFrameFormat*>& rNew, SavedLink& rSavedLinks, SavedContent& rResetContent);
};
#endif // INCLUDED_SW_INC_TEXTBOXHELPER_HXX
diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx
index 8e67ce5b032f..de112998501d 100644
--- a/sw/inc/tgrditem.hxx
+++ b/sw/inc/tgrditem.hxx
@@ -108,7 +108,7 @@ public:
inline const SwTextGridItem &SwAttrSet::GetTextGrid(bool bInP) const
{ return static_cast<const SwTextGridItem&>(Get( RES_TEXTGRID, bInP )); }
-inline const SwTextGridItem &SwFmt::GetTextGrid(bool bInP) const
+inline const SwTextGridItem &SwFormat::GetTextGrid(bool bInP) const
{ return static_cast<const SwTextGridItem&>(m_aSet.Get( RES_TEXTGRID, bInP )); }
#endif
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 6e394742b0bb..1b75da2d9472 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
class SwTOXType;
class SwTOXMark;
-class SwTxtTOXMark;
+class SwTextTOXMark;
class SwDoc;
typedef std::vector<SwTOXMark*> SwTOXMarks;
@@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwTOXMark
, public SwModify
{
friend void _InitCore();
- friend class SwTxtTOXMark;
+ friend class SwTextTOXMark;
OUString aAltText; // Text of caption is different.
OUString aPrimaryKey;
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwTOXMark
OUString aPrimaryKeyReading;
OUString aSecondaryKeyReading;
- SwTxtTOXMark* pTxtAttr;
+ SwTextTOXMark* pTextAttr;
sal_uInt16 nLevel;
OUString m_aBookmarkName;
@@ -137,8 +137,8 @@ public:
inline const SwTOXType* GetTOXType() const;
- const SwTxtTOXMark* GetTxtTOXMark() const { return pTxtAttr; }
- SwTxtTOXMark* GetTxtTOXMark() { return pTxtAttr; }
+ const SwTextTOXMark* GetTextTOXMark() const { return pTextAttr; }
+ SwTextTOXMark* GetTextTOXMark() { return pTextAttr; }
SAL_DLLPRIVATE ::com::sun::star::uno::WeakReference<
::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
@@ -332,7 +332,7 @@ public:
static OUString GetFormLinkStt();
static OUString GetFormLinkEnd();
static OUString GetFormEntryNum();
- static OUString GetFormEntryTxt();
+ static OUString GetFormEntryText();
static OUString GetFormChapterMark();
static OUString GetFormText();
static OUString GetFormAuth();
@@ -585,10 +585,10 @@ inline void SwTOXMark::SetSecondaryKey( const OUString& rKey )
aSecondaryKey = rKey;
}
-inline void SwTOXMark::SetTextReading( const OUString& rTxt )
+inline void SwTOXMark::SetTextReading( const OUString& rText )
{
SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
- aTextReading = rTxt;
+ aTextReading = rText;
}
inline void SwTOXMark::SetPrimaryKeyReading( const OUString& rKey )
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index d1588022cc15..b83e34906146 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -45,7 +45,7 @@ public:
void SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { aLcl = rLocale; }
- OUString GetIndexKey( const OUString& rTxt, const OUString& rTxtReading,
+ OUString GetIndexKey( const OUString& rText, const OUString& rTextReading,
const ::com::sun::star::lang::Locale& rLocale ) const;
OUString GetFollowingText( bool bMorePages ) const;
@@ -56,9 +56,9 @@ public:
bool LoadAlgorithm( const ::com::sun::star::lang::Locale& rLcl,
const OUString& sSortAlgorithm, long nOptions ) const;
- sal_Int16 CompareIndexEntry( const OUString& rTxt1, const OUString& rTxtReading1,
+ sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString& rTextReading1,
const ::com::sun::star::lang::Locale& rLcl1,
- const OUString& rTxt2, const OUString& rTxtReading2,
+ const OUString& rText2, const OUString& rTextReading2,
const ::com::sun::star::lang::Locale& rLcl2 ) const;
};
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index d8ccb02eded6..f1f70b431555 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -38,7 +38,7 @@
class SfxItemPool;
class SvXMLAttrContainerItem;
-class SwTxtAttr : private boost::noncopyable
+class SwTextAttr : private boost::noncopyable
{
private:
SfxPoolItem * const m_pAttr;
@@ -47,23 +47,23 @@ private:
bool m_bLockExpandFlag : 1;
bool m_bDontMoveAttr : 1; // refmarks, toxmarks
- bool m_bCharFmtAttr : 1; // charfmt, inet
+ bool m_bCharFormatAttr : 1; // charfmt, inet
bool m_bOverlapAllowedAttr : 1; // refmarks, toxmarks
bool m_bPriorityAttr : 1; // attribute has priority (redlining)
bool m_bDontExpandStart : 1; // don't expand start at paragraph start (ruby)
- bool m_bNesting : 1; // SwTxtAttrNesting
+ bool m_bNesting : 1; // SwTextAttrNesting
bool m_bHasDummyChar : 1; // without end + meta
bool m_bFormatIgnoreStart : 1; ///< text formatting should ignore start
bool m_bFormatIgnoreEnd : 1; ///< text formatting should ignore end
bool m_bHasContent : 1; // text attribute with content
protected:
- SwTxtAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
- virtual ~SwTxtAttr();
+ SwTextAttr( SfxPoolItem& rAttr, sal_Int32 nStart );
+ virtual ~SwTextAttr();
void SetLockExpandFlag( bool bFlag ) { m_bLockExpandFlag = bFlag; }
void SetDontMoveAttr( bool bFlag ) { m_bDontMoveAttr = bFlag; }
- void SetCharFmtAttr( bool bFlag ) { m_bCharFmtAttr = bFlag; }
+ void SetCharFormatAttr( bool bFlag ) { m_bCharFormatAttr = bFlag; }
void SetOverlapAllowedAttr( bool bFlag ){ m_bOverlapAllowedAttr = bFlag; }
void SetDontExpandStartAttr(bool bFlag) { m_bDontExpandStart = bFlag; }
void SetNesting(const bool bFlag) { m_bNesting = bFlag; }
@@ -73,7 +73,7 @@ protected:
public:
/// destroy instance
- static void Destroy( SwTxtAttr * pToDestroy, SfxItemPool& rPool );
+ static void Destroy( SwTextAttr * pToDestroy, SfxItemPool& rPool );
/// start position
sal_Int32& GetStart() { return m_nStart; }
@@ -89,7 +89,7 @@ public:
bool DontExpand() const { return m_bDontExpand; }
bool IsLockExpandFlag() const { return m_bLockExpandFlag; }
bool IsDontMoveAttr() const { return m_bDontMoveAttr; }
- bool IsCharFmtAttr() const { return m_bCharFmtAttr; }
+ bool IsCharFormatAttr() const { return m_bCharFormatAttr; }
bool IsOverlapAllowedAttr() const { return m_bOverlapAllowedAttr; }
bool IsPriorityAttr() const { return m_bPriorityAttr; }
void SetPriorityAttr( bool bFlag ) { m_bPriorityAttr = bFlag; }
@@ -106,66 +106,66 @@ public:
inline SfxPoolItem& GetAttr();
inline sal_uInt16 Which() const { return GetAttr().Which(); }
- bool operator==( const SwTxtAttr& ) const;
+ bool operator==( const SwTextAttr& ) const;
- inline const SwFmtCharFmt &GetCharFmt() const;
- inline const SwFmtAutoFmt &GetAutoFmt() const;
- inline const SwFmtFld &GetFmtFld() const;
- inline const SwFmtFtn &GetFtn() const;
- inline const SwFmtFlyCnt &GetFlyCnt() const;
+ inline const SwFormatCharFormat &GetCharFormat() const;
+ inline const SwFormatAutoFormat &GetAutoFormat() const;
+ inline const SwFormatField &GetFormatField() const;
+ inline const SwFormatFootnote &GetFootnote() const;
+ inline const SwFormatFlyCnt &GetFlyCnt() const;
inline const SwTOXMark &GetTOXMark() const;
- inline const SwFmtRefMark &GetRefMark() const;
- inline const SwFmtINetFmt &GetINetFmt() const;
- inline const SwFmtRuby &GetRuby() const;
- inline const SwFmtMeta &GetMeta() const;
+ inline const SwFormatRefMark &GetRefMark() const;
+ inline const SwFormatINetFormat &GetINetFormat() const;
+ inline const SwFormatRuby &GetRuby() const;
+ inline const SwFormatMeta &GetMeta() const;
void dumpAsXml(struct _xmlTextWriter* pWriter) const;
};
-class SwTxtAttrEnd : public virtual SwTxtAttr
+class SwTextAttrEnd : public virtual SwTextAttr
{
protected:
sal_Int32 m_nEnd;
public:
- SwTxtAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+ SwTextAttrEnd( SfxPoolItem& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
virtual sal_Int32* GetEnd() SAL_OVERRIDE;
};
// attribute that must not overlap others
-class SwTxtAttrNesting : public SwTxtAttrEnd
+class SwTextAttrNesting : public SwTextAttrEnd
{
protected:
- SwTxtAttrNesting( SfxPoolItem & i_rAttr,
+ SwTextAttrNesting( SfxPoolItem & i_rAttr,
const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
- virtual ~SwTxtAttrNesting();
+ virtual ~SwTextAttrNesting();
};
-inline const sal_Int32* SwTxtAttr::End() const
+inline const sal_Int32* SwTextAttr::End() const
{
- return const_cast<SwTxtAttr * >(this)->GetEnd();
+ return const_cast<SwTextAttr * >(this)->GetEnd();
}
-inline const sal_Int32* SwTxtAttr::GetAnyEnd() const
+inline const sal_Int32* SwTextAttr::GetAnyEnd() const
{
const sal_Int32* pEnd = End();
return pEnd ? pEnd : &GetStart();
}
-inline const SfxPoolItem& SwTxtAttr::GetAttr() const
+inline const SfxPoolItem& SwTextAttr::GetAttr() const
{
assert( m_pAttr );
return *m_pAttr;
}
-inline SfxPoolItem& SwTxtAttr::GetAttr()
+inline SfxPoolItem& SwTextAttr::GetAttr()
{
return const_cast<SfxPoolItem&>(
- const_cast<const SwTxtAttr*>(this)->GetAttr());
+ const_cast<const SwTextAttr*>(this)->GetAttr());
}
-inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
+inline void SwTextAttr::SetDontExpand( bool bDontExpand )
{
if ( !m_bLockExpandFlag )
{
@@ -173,68 +173,68 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
}
}
-inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
+inline const SwFormatCharFormat& SwTextAttr::GetCharFormat() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT );
- return static_cast<const SwFmtCharFmt&>(*m_pAttr);
+ return static_cast<const SwFormatCharFormat&>(*m_pAttr);
}
-inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
+inline const SwFormatAutoFormat& SwTextAttr::GetAutoFormat() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT );
- return static_cast<const SwFmtAutoFmt&>(*m_pAttr);
+ return static_cast<const SwFormatAutoFormat&>(*m_pAttr);
}
-inline const SwFmtFld& SwTxtAttr::GetFmtFld() const
+inline const SwFormatField& SwTextAttr::GetFormatField() const
{
assert( m_pAttr
&& ( m_pAttr->Which() == RES_TXTATR_FIELD
|| m_pAttr->Which() == RES_TXTATR_ANNOTATION
|| m_pAttr->Which() == RES_TXTATR_INPUTFIELD ));
- return static_cast<const SwFmtFld&>(*m_pAttr);
+ return static_cast<const SwFormatField&>(*m_pAttr);
}
-inline const SwFmtFtn& SwTxtAttr::GetFtn() const
+inline const SwFormatFootnote& SwTextAttr::GetFootnote() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN );
- return static_cast<const SwFmtFtn&>(*m_pAttr);
+ return static_cast<const SwFormatFootnote&>(*m_pAttr);
}
-inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const
+inline const SwFormatFlyCnt& SwTextAttr::GetFlyCnt() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT );
- return static_cast<const SwFmtFlyCnt&>(*m_pAttr);
+ return static_cast<const SwFormatFlyCnt&>(*m_pAttr);
}
-inline const SwTOXMark& SwTxtAttr::GetTOXMark() const
+inline const SwTOXMark& SwTextAttr::GetTOXMark() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK );
return static_cast<const SwTOXMark&>(*m_pAttr);
}
-inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const
+inline const SwFormatRefMark& SwTextAttr::GetRefMark() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK );
- return static_cast<const SwFmtRefMark&>(*m_pAttr);
+ return static_cast<const SwFormatRefMark&>(*m_pAttr);
}
-inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const
+inline const SwFormatINetFormat& SwTextAttr::GetINetFormat() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT );
- return static_cast<const SwFmtINetFmt&>(*m_pAttr);
+ return static_cast<const SwFormatINetFormat&>(*m_pAttr);
}
-inline const SwFmtRuby& SwTxtAttr::GetRuby() const
+inline const SwFormatRuby& SwTextAttr::GetRuby() const
{
assert( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY );
- return static_cast<const SwFmtRuby&>(*m_pAttr);
+ return static_cast<const SwFormatRuby&>(*m_pAttr);
}
-inline const SwFmtMeta& SwTxtAttr::GetMeta() const
+inline const SwFormatMeta& SwTextAttr::GetMeta() const
{
assert( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
m_pAttr->Which() == RES_TXTATR_METAFIELD) );
- return static_cast<const SwFmtMeta&>(*m_pAttr);
+ return static_cast<const SwFormatMeta&>(*m_pAttr);
}
// these should be static_casts but with virtual inheritance it's not possible
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index ced47511f808..6ab4f0c1a06d 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -26,8 +26,8 @@
#include <swtypes.hxx>
#include <deque>
-class SwTxtNode;
-class SwTxtAttr;
+class SwTextNode;
+class SwTextAttr;
class SfxPoolItem;
class SwScriptIterator
@@ -48,22 +48,22 @@ public:
const OUString& GetText() const { return m_rText; }
};
-class SwTxtAttrIterator
+class SwTextAttrIterator
{
SwScriptIterator aSIter;
- std::deque<const SwTxtAttr*> aStack;
- const SwTxtNode& rTxtNd;
+ std::deque<const SwTextAttr*> aStack;
+ const SwTextNode& rTextNd;
const SfxPoolItem *pParaItem, *pCurItem;
size_t nAttrPos;
sal_Int32 nChgPos;
sal_uInt16 nWhichId;
bool bIsUseGetWhichOfScript;
- void AddToStack( const SwTxtAttr& rAttr );
+ void AddToStack( const SwTextAttr& rAttr );
void SearchNextChg();
public:
- SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId,
+ SwTextAttrIterator( const SwTextNode& rTextNd, sal_uInt16 nWhichId,
sal_Int32 nStart = 0, bool bUseGetWhichOfScript = true );
bool Next();
@@ -72,13 +72,13 @@ public:
sal_Int32 GetChgPos() const { return nChgPos; }
};
-class SwLanguageIterator : public SwTxtAttrIterator
+class SwLanguageIterator : public SwTextAttrIterator
{
public:
- SwLanguageIterator( const SwTxtNode& rTxtNode, sal_Int32 nStart = 0,
+ SwLanguageIterator( const SwTextNode& rTextNode, sal_Int32 nStart = 0,
sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
bool bUseGetWhichOfScript = true )
- : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript )
+ : SwTextAttrIterator( rTextNode, nWhich, nStart, bUseGetWhichOfScript )
{}
sal_uInt16 GetLanguage() const
diff --git a/sw/inc/txtannotationfld.hxx b/sw/inc/txtannotationfld.hxx
index 5dc18ecd303c..7f7e330b6134 100644
--- a/sw/inc/txtannotationfld.hxx
+++ b/sw/inc/txtannotationfld.hxx
@@ -25,15 +25,15 @@
class SwDoc;
-class SwTxtAnnotationFld : public SwTxtFld
+class SwTextAnnotationField : public SwTextField
{
public:
- SwTxtAnnotationFld(
- SwFmtFld & rAttr,
+ SwTextAnnotationField(
+ SwFormatField & rAttr,
sal_Int32 const nStart,
bool const bInClipboard );
- virtual ~SwTxtAnnotationFld();
+ virtual ~SwTextAnnotationField();
::sw::mark::IMark* GetAnnotationMark(
SwDoc* pDoc = NULL ) const;
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index a5a4e1d8b282..02e5a1f2b82d 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -22,82 +22,82 @@
#include <txatbase.hxx>
#include <calbck.hxx>
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
namespace sw {
class MetaFieldManager;
}
-class SwTxtCharFmt : public SwTxtAttrEnd
+class SwTextCharFormat : public SwTextAttrEnd
{
- SwTxtNode * m_pTxtNode;
+ SwTextNode * m_pTextNode;
sal_uInt16 m_nSortNumber;
public:
- SwTxtCharFmt( SwFmtCharFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
- virtual ~SwTxtCharFmt( );
+ SwTextCharFormat( SwFormatCharFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+ virtual ~SwTextCharFormat( );
- // Passed from SwFmtCharFmt (no derivation from SwClient!).
+ // Passed from SwFormatCharFormat (no derivation from SwClient!).
void ModifyNotification( const SfxPoolItem*, const SfxPoolItem* );
bool GetInfo( SfxPoolItem& rInfo ) const;
- // get and set TxtNode pointer
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ // get and set TextNode pointer
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; }
sal_uInt16 GetSortNumber() const { return m_nSortNumber; }
};
-class SwTxtMeta : public SwTxtAttrNesting
+class SwTextMeta : public SwTextAttrNesting
{
private:
- SwTxtMeta( SwFmtMeta & i_rAttr,
+ SwTextMeta( SwFormatMeta & i_rAttr,
const sal_Int32 i_nStart, const sal_Int32 i_nEnd );
public:
- static SwTxtMeta * CreateTxtMeta(
+ static SwTextMeta * CreateTextMeta(
::sw::MetaFieldManager & i_rTargetDocManager,
- SwTxtNode *const i_pTargetTxtNode,
- SwFmtMeta & i_rAttr,
+ SwTextNode *const i_pTargetTextNode,
+ SwFormatMeta & i_rAttr,
sal_Int32 const i_nStart, sal_Int32 const i_nEnd,
bool const i_bIsCopy);
- virtual ~SwTxtMeta();
+ virtual ~SwTextMeta();
- void ChgTxtNode(SwTxtNode * const pNode);
+ void ChgTextNode(SwTextNode * const pNode);
};
-class SW_DLLPUBLIC SwTxtRuby : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextRuby : public SwTextAttrNesting, public SwClient
{
- SwTxtNode* m_pTxtNode;
+ SwTextNode* m_pTextNode;
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
- SwTxtRuby( SwFmtRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
- virtual ~SwTxtRuby();
+ SwTextRuby( SwFormatRuby& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+ virtual ~SwTextRuby();
TYPEINFO_OVERRIDE();
virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
- SAL_DLLPRIVATE void InitRuby(SwTxtNode & rNode);
+ SAL_DLLPRIVATE void InitRuby(SwTextNode & rNode);
- /// Get and set TxtNode pointer.
- const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
- inline const SwTxtNode& GetTxtNode() const;
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ /// Get and set TextNode pointer.
+ const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+ inline const SwTextNode& GetTextNode() const;
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
- SwCharFmt* GetCharFmt();
- const SwCharFmt* GetCharFmt() const
- { return (const_cast<SwTxtRuby*>(this))->GetCharFmt(); }
+ SwCharFormat* GetCharFormat();
+ const SwCharFormat* GetCharFormat() const
+ { return (const_cast<SwTextRuby*>(this))->GetCharFormat(); }
};
-inline const SwTxtNode& SwTxtRuby::GetTxtNode() const
+inline const SwTextNode& SwTextRuby::GetTextNode() const
{
- assert( m_pTxtNode );
- return *m_pTxtNode;
+ assert( m_pTextNode );
+ return *m_pTextNode;
}
#endif
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index b3e2b6cfb103..74f78691db0f 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -23,34 +23,34 @@
class SwFlyInCntFrm;
class SwFrm;
-class SwTxtNode;
+class SwTextNode;
class SwDoc;
// Attribute for line-bound frames (without end index).
-class SwTxtFlyCnt : public SwTxtAttr
+class SwTextFlyCnt : public SwTextAttr
{
SwFlyInCntFrm *_GetFlyFrm( const SwFrm *pCurrFrm );
public:
- SwTxtFlyCnt( SwFmtFlyCnt& rAttr, sal_Int32 nStart );
+ SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart );
- // Sets anchor in pFmt and
- void SetAnchor( const SwTxtNode *pNode );
+ // Sets anchor in pFormat and
+ void SetAnchor( const SwTextNode *pNode );
inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm );
inline const SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ) const;
// creates for itself a new FlyFrameFormat.
- void CopyFlyFmt( SwDoc* pDoc );
+ void CopyFlyFormat( SwDoc* pDoc );
};
-inline SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
+inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
{
return _GetFlyFrm( pCurrFrm );
}
-inline const SwFlyInCntFrm *SwTxtFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
+inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
{
- return (const_cast<SwTxtFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
+ return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
}
#endif
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index fa40f76090d3..d4189ed6f8cd 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -26,70 +26,70 @@
#include <boost/shared_ptr.hpp>
class SwPaM;
-class SwTxtNode;
+class SwTextNode;
-class SwTxtFld : public virtual SwTxtAttr
+class SwTextField : public virtual SwTextAttr
{
- mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTxtFld()>
- SwTxtNode * m_pTxtNode;
+ mutable OUString m_aExpand; // only used to determine, if field content is changing in <ExpandTextField()>
+ SwTextNode * m_pTextNode;
public:
- SwTxtFld(
- SwFmtFld & rAttr,
+ SwTextField(
+ SwFormatField & rAttr,
sal_Int32 const nStart,
bool const bInClipboard );
- virtual ~SwTxtFld();
+ virtual ~SwTextField();
- void CopyTxtFld( SwTxtFld *pDest ) const;
+ void CopyTextField( SwTextField *pDest ) const;
- void ExpandTxtFld( const bool bForceNotify = false ) const;
+ void ExpandTextField( const bool bForceNotify = false ) const;
- // get and set TxtNode pointer
- SwTxtNode* GetpTxtNode() const
+ // get and set TextNode pointer
+ SwTextNode* GetpTextNode() const
{
- return m_pTxtNode;
+ return m_pTextNode;
}
- SwTxtNode& GetTxtNode() const
+ SwTextNode& GetTextNode() const
{
- OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
- return *m_pTxtNode;
+ OSL_ENSURE( m_pTextNode, "SwTextField:: where is my TextNode?" );
+ return *m_pTextNode;
}
- void ChgTxtNode( SwTxtNode* pNew )
+ void ChgTextNode( SwTextNode* pNew )
{
- m_pTxtNode = pNew;
+ m_pTextNode = pNew;
}
- bool IsFldInDoc() const;
+ bool IsFieldInDoc() const;
// enable notification that field content has changed and needs reformatting
- virtual void NotifyContentChange( SwFmtFld& rFmtFld );
+ virtual void NotifyContentChange( SwFormatField& rFormatField );
// deletes the given field via removing the corresponding text selection from the document's content
- static void DeleteTxtFld( const SwTxtFld& rTxtFld );
+ static void DeleteTextField( const SwTextField& rTextField );
// return text selection for the given field
- static void GetPamForTxtFld( const SwTxtFld& rTxtFld,
- boost::shared_ptr< SwPaM >& rPamForTxtFld );
+ static void GetPamForTextField( const SwTextField& rTextField,
+ boost::shared_ptr< SwPaM >& rPamForTextField );
};
-class SwTxtInputFld
- : public SwTxtAttrNesting
- , public SwTxtFld
+class SwTextInputField
+ : public SwTextAttrNesting
+ , public SwTextField
{
public:
- SwTxtInputFld(
- SwFmtFld & rAttr,
+ SwTextInputField(
+ SwFormatField & rAttr,
sal_Int32 const nStart,
sal_Int32 const nEnd,
bool const bInClipboard );
- virtual ~SwTxtInputFld();
+ virtual ~SwTextInputField();
void LockNotifyContentChange();
void UnlockNotifyContentChange();
- virtual void NotifyContentChange( SwFmtFld& rFmtFld ) SAL_OVERRIDE;
+ virtual void NotifyContentChange( SwFormatField& rFormatField ) SAL_OVERRIDE;
void UpdateTextNodeContent( const OUString& rNewContent );
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 94b2712c2f0a..2d34daaabae6 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -24,34 +24,34 @@
namespace rtl { class OUString; }
class SwNodeIndex;
-class SwTxtNode;
+class SwTextNode;
class SwNodes;
class SwDoc;
class SwFrm;
-class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr
+class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr
{
SwNodeIndex * m_pStartNode;
- SwTxtNode * m_pTxtNode;
+ SwTextNode * m_pTextNode;
sal_uInt16 m_nSeqNo;
public:
- SwTxtFtn( SwFmtFtn& rAttr, sal_Int32 nStart );
- virtual ~SwTxtFtn();
+ SwTextFootnote( SwFormatFootnote& rAttr, sal_Int32 nStart );
+ virtual ~SwTextFootnote();
inline SwNodeIndex *GetStartNode() const { return m_pStartNode; }
void SetStartNode( const SwNodeIndex *pNode, bool bDelNodes = true );
void SetNumber( const sal_uInt16 nNumber, const OUString &sNumStr );
- void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const;
+ void CopyFootnote(SwTextFootnote & rDest, SwTextNode & rDestNode) const;
- // Get and set TxtNode pointer.
- inline const SwTxtNode& GetTxtNode() const;
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ // Get and set TextNode pointer.
+ inline const SwTextNode& GetTextNode() const;
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
// Create a new empty TextSection for this footnote.
void MakeNewTextSection( SwNodes& rNodes );
- // Delete the FtnFrame from page.
+ // Delete the FootnoteFrame from page.
void DelFrms( const SwFrm* );
// Check conditional paragraph styles.
@@ -65,10 +65,10 @@ public:
static void SetUniqueSeqRefNo( SwDoc& rDoc );
};
-inline const SwTxtNode& SwTxtFtn::GetTxtNode() const
+inline const SwTextNode& SwTextFootnote::GetTextNode() const
{
- assert( m_pTxtNode );
- return *m_pTxtNode;
+ assert( m_pTextNode );
+ return *m_pTextNode;
}
#endif
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 8e70df02e96c..9a08f70faa67 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -23,12 +23,12 @@
#include <txtatr.hxx>
#include <calbck.hxx>
-class SwTxtNode;
-class SwCharFmt;
+class SwTextNode;
+class SwCharFormat;
-class SW_DLLPUBLIC SwTxtINetFmt : public SwTxtAttrNesting, public SwClient
+class SW_DLLPUBLIC SwTextINetFormat : public SwTextAttrNesting, public SwClient
{
- SwTxtNode * m_pTxtNode;
+ SwTextNode * m_pTextNode;
bool m_bVisited : 1; // visited link?
bool m_bVisitedValid : 1; // is m_bVisited valid?
@@ -36,23 +36,23 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
public:
- SwTxtINetFmt( SwFmtINetFmt& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
- virtual ~SwTxtINetFmt();
+ SwTextINetFormat( SwFormatINetFormat& rAttr, sal_Int32 nStart, sal_Int32 nEnd );
+ virtual ~SwTextINetFormat();
TYPEINFO_OVERRIDE();
virtual bool GetInfo( SfxPoolItem& rInfo ) const SAL_OVERRIDE;
- SAL_DLLPRIVATE void InitINetFmt(SwTxtNode & rNode);
+ SAL_DLLPRIVATE void InitINetFormat(SwTextNode & rNode);
- // get and set TxtNode pointer
- const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; }
- inline const SwTxtNode& GetTxtNode() const;
- inline SwTxtNode& GetTxtNode();
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ // get and set TextNode pointer
+ const SwTextNode* GetpTextNode() const { return m_pTextNode; }
+ inline const SwTextNode& GetTextNode() const;
+ inline SwTextNode& GetTextNode();
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
- SwCharFmt* GetCharFmt();
- const SwCharFmt* GetCharFmt() const
- { return const_cast<SwTxtINetFmt*>(this)->GetCharFmt(); }
+ SwCharFormat* GetCharFormat();
+ const SwCharFormat* GetCharFormat() const
+ { return const_cast<SwTextINetFormat*>(this)->GetCharFormat(); }
bool IsVisited() const { return m_bVisited; }
void SetVisited( bool bNew ) { m_bVisited = bNew; }
@@ -63,15 +63,15 @@ public:
bool IsProtect() const;
};
-inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const
+inline const SwTextNode& SwTextINetFormat::GetTextNode() const
{
- assert( m_pTxtNode );
- return *m_pTxtNode;
+ assert( m_pTextNode );
+ return *m_pTextNode;
}
-inline SwTxtNode& SwTxtINetFmt::GetTxtNode()
+inline SwTextNode& SwTextINetFormat::GetTextNode()
{
- return const_cast<SwTxtNode&>( const_cast<SwTxtINetFmt const*>(this)->GetTxtNode() );
+ return const_cast<SwTextNode&>( const_cast<SwTextINetFormat const*>(this)->GetTextNode() );
}
#endif
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index eee21e2f9f32..ab72f76d3cf0 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -21,29 +21,29 @@
#include <txatbase.hxx>
-class SwTxtNode;
+class SwTextNode;
// Attribute for content-/position references in text.
-class SwTxtRefMark : public SwTxtAttrEnd
+class SwTextRefMark : public SwTextAttrEnd
{
- SwTxtNode * m_pTxtNode;
+ SwTextNode * m_pTextNode;
sal_Int32 * m_pEnd; // end is optional (point reference)
public:
- SwTxtRefMark( SwFmtRefMark& rAttr,
+ SwTextRefMark( SwFormatRefMark& rAttr,
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
- virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTxtAttr
+ virtual sal_Int32* GetEnd() SAL_OVERRIDE; // SwTextAttr
- // get and set TxtNode pointer
- inline const SwTxtNode& GetTxtNode() const;
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ // get and set TextNode pointer
+ inline const SwTextNode& GetTextNode() const;
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
};
-inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const
+inline const SwTextNode& SwTextRefMark::GetTextNode() const
{
- assert( m_pTxtNode );
- return *m_pTxtNode;
+ assert( m_pTextNode );
+ return *m_pTextNode;
}
#endif
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 6436b859f342..f935254fc682 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -21,34 +21,34 @@
#include <txatbase.hxx>
-class SwTxtNode;
+class SwTextNode;
class SwDoc;
// Attribute for indices/tables of contents.
-class SwTxtTOXMark : public SwTxtAttrEnd
+class SwTextTOXMark : public SwTextAttrEnd
{
- SwTxtNode * m_pTxtNode;
+ SwTextNode * m_pTextNode;
sal_Int32 * m_pEnd; // 0 if SwTOXMark without AlternativeText
public:
- SwTxtTOXMark( SwTOXMark& rAttr,
+ SwTextTOXMark( SwTOXMark& rAttr,
sal_Int32 const nStart, sal_Int32 const*const pEnd = 0);
- virtual ~SwTxtTOXMark();
+ virtual ~SwTextTOXMark();
- virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTxtAttr
+ virtual sal_Int32 *GetEnd() SAL_OVERRIDE; // SwTextAttr
void CopyTOXMark( SwDoc* pDestDoc );
- // get and set TxtNode pointer
- inline const SwTxtNode* GetpTxtNd() const { return m_pTxtNode; }
- inline const SwTxtNode& GetTxtNode() const;
- void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; }
+ // get and set TextNode pointer
+ inline const SwTextNode* GetpTextNd() const { return m_pTextNode; }
+ inline const SwTextNode& GetTextNode() const;
+ void ChgTextNode( SwTextNode* pNew ) { m_pTextNode = pNew; }
};
-inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const
+inline const SwTextNode& SwTextTOXMark::GetTextNode() const
{
- assert( m_pTxtNode );
- return *m_pTxtNode;
+ assert( m_pTextNode );
+ return *m_pTextNode;
}
#endif
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index 9ec5e4dc7d88..69703760d8a5 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -34,8 +34,8 @@ class SwIndex;
class SwPaM;
struct SwPosition;
class SwDoc;
-class SwTxtFmtColl;
-class SwFrmFmt;
+class SwTextFormatColl;
+class SwFrameFormat;
class SwNodeIndex;
class SwNodeRange;
class SwRedlineData;
@@ -116,30 +116,30 @@ public:
// Save and set Redline data.
static bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData,
bool bDelRange = true, bool bCopyNext = true );
- static bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& );
+ static bool FillSaveDataForFormat( const SwPaM& , SwRedlineSaveDatas& );
static void SetSaveData( SwDoc& rDoc, SwRedlineSaveDatas& rSData );
static bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData );
};
-typedef sal_uInt16 DelCntntType;
-namespace nsDelCntntType
+typedef sal_uInt16 DelContentType;
+namespace nsDelContentType
{
- const DelCntntType DELCNT_FTN = 0x01;
- const DelCntntType DELCNT_FLY = 0x02;
- const DelCntntType DELCNT_TOC = 0x04;
- const DelCntntType DELCNT_BKM = 0x08;
- const DelCntntType DELCNT_ALL = 0x0F;
- const DelCntntType DELCNT_CHKNOCNTNT = 0x80;
+ const DelContentType DELCNT_FTN = 0x01;
+ const DelContentType DELCNT_FLY = 0x02;
+ const DelContentType DELCNT_TOC = 0x04;
+ const DelContentType DELCNT_BKM = 0x08;
+ const DelContentType DELCNT_ALL = 0x0F;
+ const DelContentType DELCNT_CHKNOCNTNT = 0x80;
}
-/// will DelCntntIndex destroy a frame anchored at character at rAnchorPos?
+/// will DelContentIndex destroy a frame anchored at character at rAnchorPos?
bool IsDestroyFrameAnchoredAtChar(SwPosition const & rAnchorPos,
SwPosition const & rStart, SwPosition const & rEnd, const SwDoc* doc,
- DelCntntType const nDelCntntType = nsDelCntntType::DELCNT_ALL);
+ DelContentType const nDelContentType = nsDelContentType::DELCNT_ALL);
// This class has to be inherited into an Undo-object if it saves content
// for Redo/Undo...
-class SwUndoSaveCntnt
+class SwUndoSaveContent
{
protected:
@@ -166,16 +166,16 @@ protected:
// Before moving stuff into UndoNodes-Array care has to be taken that
// the content-bearing attributes are removed from the nodes-array.
- void DelCntntIndex( const SwPosition& pMark, const SwPosition& pPoint,
- DelCntntType nDelCntntType = nsDelCntntType::DELCNT_ALL );
+ void DelContentIndex( const SwPosition& pMark, const SwPosition& pPoint,
+ DelContentType nDelContentType = nsDelContentType::DELCNT_ALL );
public:
- SwUndoSaveCntnt();
- ~SwUndoSaveCntnt();
+ SwUndoSaveContent();
+ ~SwUndoSaveContent();
};
// Save a complete section in nodes-array.
-class SwUndoSaveSection : private SwUndoSaveCntnt
+class SwUndoSaveSection : private SwUndoSaveContent
{
SwNodeIndex *pMvStt;
SwRedlineSaveDatas* pRedlSaveData;
@@ -205,27 +205,27 @@ class SwUndRng
{
public:
sal_uLong nSttNode, nEndNode;
- sal_Int32 nSttCntnt, nEndCntnt;
+ sal_Int32 nSttContent, nEndContent;
SwUndRng();
SwUndRng( const SwPaM& );
void SetValues( const SwPaM& rPam );
- void SetPaM( SwPaM&, bool bCorrToCntnt = false ) const;
+ void SetPaM( SwPaM&, bool bCorrToContent = false ) const;
SwPaM & AddUndoRedoPaM(
- ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const;
+ ::sw::UndoRedoContext &, bool const bCorrToContent = false) const;
};
-class SwUndoInsLayFmt;
+class SwUndoInsLayFormat;
// base class for insertion of Document, Glossaries and Copy
-class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt
+class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveContent
{
- SwTxtFmtColl *pTxtFmtColl, *pLastNdColl;
- std::vector<SwFrmFmt*>* pFrmFmts;
- ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos;
+ SwTextFormatColl *pTextFormatColl, *pLastNdColl;
+ std::vector<SwFrameFormat*>* pFrameFormats;
+ ::std::vector< ::boost::shared_ptr<SwUndoInsLayFormat> > m_FlyUndos;
SwRedlineData* pRedlData;
- bool bSttWasTxtNd;
+ bool bSttWasTextNd;
protected:
sal_uLong nNdDiff;
/// start of Content in UndoNodes for Redo
@@ -242,7 +242,7 @@ public:
// Set destination range after reading.
void SetInsertRange( const SwPaM&, bool bScanFlys = true,
- bool bSttWasTxtNd = true );
+ bool bSttWasTextNd = true );
};
class SwUndoInsDoc : public SwUndoInserts
@@ -260,16 +260,16 @@ public:
class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection
{
protected:
- SwFrmFmt* pFrmFmt; // The saved FlyFormat.
+ SwFrameFormat* pFrameFormat; // The saved FlyFormat.
sal_uLong nNdPgPos;
sal_Int32 nCntPos; // Page at/in paragraph.
sal_uInt16 nRndId;
- bool bDelFmt; // Delete saved format.
+ bool bDelFormat; // Delete saved format.
void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true);
void DelFly( SwDoc* );
- SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId );
+ SwUndoFlyBase( SwFrameFormat* pFormat, SwUndoId nUndoId );
SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); }
sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); }
@@ -279,14 +279,14 @@ public:
};
-class SwUndoInsLayFmt : public SwUndoFlyBase
+class SwUndoInsLayFormat : public SwUndoFlyBase
{
sal_uLong mnCrsrSaveIndexPara; // Cursor position
sal_Int32 mnCrsrSaveIndexPos; // for undo
public:
- SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
+ SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
- virtual ~SwUndoInsLayFmt();
+ virtual ~SwUndoInsLayFormat();
virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
@@ -296,11 +296,11 @@ public:
};
-class SwUndoDelLayFmt : public SwUndoFlyBase
+class SwUndoDelLayFormat : public SwUndoFlyBase
{
bool bShowSelFrm;
public:
- SwUndoDelLayFmt( SwFrmFmt* pFormat );
+ SwUndoDelLayFormat( SwFrameFormat* pFormat );
virtual void UndoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
virtual void RedoImpl( ::sw::UndoRedoContext & ) SAL_OVERRIDE;
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 8f135031bb52..ebee75cf4092 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -58,7 +58,7 @@ class SwTableBox;
class SwUnoCrsr;
struct SwRangeDescriptor;
class SwSelBoxes;
-class SwFrmFmt;
+class SwFrameFormat;
bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const OUString &rCellRangeName );
@@ -190,7 +190,7 @@ public:
virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
void AddDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
void RemoveDataSequence( const SwTable &rTable, ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDataSequence > &rxDataSequence );
@@ -265,7 +265,7 @@ class SwChartDataSequence :
::com::sun::star::uno::Reference< com::sun::star::chart2::data::XDataProvider > xDataProvider;
SwChartDataProvider * pDataProvider;
- SwUnoCrsr* pTblCrsr; // cursor spanned over cells to use
+ SwUnoCrsr* pTableCrsr; // cursor spanned over cells to use
SwDepend aCursorDepend; //the cursor is removed after the doc has been removed
const SfxItemPropertySet* _pPropSet;
@@ -281,7 +281,7 @@ protected:
public:
SwChartDataSequence( SwChartDataProvider &rProvider,
- SwFrmFmt &rTblFmt,
+ SwFrameFormat &rTableFormat,
SwUnoCrsr *pTableCursor );
virtual ~SwChartDataSequence();
@@ -345,7 +345,7 @@ public:
virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
bool DeleteBox( const SwTableBox &rBox );
void FillRangeDesc( SwRangeDescriptor &rRangeDesc ) const;
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index 4426e3582028..ff27c0ad0586 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -31,7 +31,7 @@
#include "swdllapi.h"
class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
namespace com{namespace sun {namespace star {namespace text
{
class XTextTable;
@@ -39,12 +39,12 @@ namespace com{namespace sun {namespace star {namespace text
class XFootnote;
}}}}
class SwXFrame;
-class SwFrmFmt;
-class SwFmtFtn;
+class SwFrameFormat;
+class SwFormatFootnote;
class XBookmark;
class SwXReferenceMark;
-class SwSectionFmt;
-class SwFmtRefMark;
+class SwSectionFormat;
+class SwFormatRefMark;
class SwXReferenceMark;
class SwXBookmark;
struct SvEventDescription;
@@ -290,7 +290,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- static css::uno::Reference<css::text::XTextTable> GetObject(SwFrmFmt& rFmt);
+ static css::uno::Reference<css::text::XTextTable> GetObject(SwFrameFormat& rFormat);
};
typedef
@@ -404,7 +404,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFmt& rFmt );
+ static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection> GetObject( SwSectionFormat& rFormat );
};
class SwXBookmarks : public SwCollectionBaseClass,
@@ -487,7 +487,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFmtFtn& rFmt );
+ static ::com::sun::star::uno::Reference< ::com::sun::star::text::XFootnote> GetObject( SwDoc& rDoc, const SwFormatFootnote& rFormat );
};
class SwXReferenceMarks : public SwCollectionBaseClass,
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 66aa05ab7c5f..c32905025539 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -35,7 +35,7 @@ public:
protected:
- virtual const SwCntntFrm* DoSetBidiLevelLeftRight(
+ virtual const SwContentFrm* DoSetBidiLevelLeftRight(
bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) SAL_OVERRIDE;
virtual void DoSetBidiLevelUpDown() SAL_OVERRIDE;
@@ -74,7 +74,7 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
// The selection has the same order as the table boxes, i.e.
// if something is deleted from the one array at a certain position
// it has also to be deleted from the other!
- SwCursor m_aTblSel;
+ SwCursor m_aTableSel;
using SwTableCursor::MakeBoxSels;
@@ -93,8 +93,8 @@ public:
void MakeBoxSels();
- SwCursor& GetSelRing() { return m_aTblSel; }
- const SwCursor& GetSelRing() const { return m_aTblSel; }
+ SwCursor& GetSelRing() { return m_aTableSel; }
+ const SwCursor& GetSelRing() const { return m_aTableSel; }
};
#endif
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 4d14357831b0..a7bd39e0ab40 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -33,11 +33,11 @@ class SfxItemSet;
class SfxItemPropertySet;
struct SfxItemPropertySimpleEntry;
class SdrObject;
-class SwTxtNode;
+class SwTextNode;
class SwCursor;
class SwUnoCrsr;
class SwUnoTableCrsr;
-class SwFmtColl;
+class SwFormatColl;
struct SwSortOptions;
class SwDoc;
@@ -76,22 +76,22 @@ namespace SwUnoCursorHelper
};
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
- GetNestedTextContent(SwTxtNode & rTextNode, sal_Int32 const nIndex,
+ GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex,
bool const bParent);
bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, com::sun::star::uno::Any *pAny
, com::sun::star::beans::PropertyState& eState
- , const SwTxtNode* pNode = 0 );
+ , const SwTextNode* pNode = 0 );
void GetCurPageStyle(SwPaM& rPaM, OUString &rString);
inline bool IsStartOfPara(SwPaM& rUnoCrsr)
{ return rUnoCrsr.GetPoint()->nContent == 0;}
inline bool IsEndOfPara(SwPaM& rUnoCrsr)
- { return rUnoCrsr.GetCntntNode() &&
- rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetCntntNode()->Len();}
+ { return rUnoCrsr.GetContentNode() &&
+ rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();}
void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
void InsertFile(SwUnoCrsr* pUnoCrsr,
@@ -135,10 +135,10 @@ namespace SwUnoCursorHelper
const SetAttrMode nAttrMode,
const bool bTableMode = false);
void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
- const bool bOnlyTxtAttr = false,
- const bool bGetFromChrFmt = true);
+ const bool bOnlyTextAttr = false,
+ const bool bGetFromChrFormat = true);
void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
- SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
+ SwFormatColl * GetCurTextFormatColl(SwPaM & rPam, const bool bConditional);
void SelectPam(SwPaM & rPam, const bool bExpand);
void SetString(SwCursor & rCursor, const OUString & rString);
@@ -216,7 +216,7 @@ namespace SwUnoCursorHelper
bool SetPageDesc(
const ::com::sun::star::uno::Any& rValue,
SwDoc & rDoc, SfxItemSet & rSet);
- void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
+ void SetTextFormatColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
throw (::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException);
bool SetCursorPropertyValue(
SfxItemPropertySimpleEntry const& rEntry,
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 68e4d40e2910..ce894a9687b7 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -119,7 +119,7 @@ public:
void InvalidateSwDoc(); // {pDoc = 0;}
SwDoc* GetDoc();
/// Same as getByIndex(nIndex), except that it also takes a set of formats to ignore, so the method itself doesn't have to generate such a list.
- css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrmFmt*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
+ css::uno::Any getByIndex(sal_Int32 nIndex, std::set<const SwFrameFormat*>* pTextBoxes) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception);
};
class SwShapeDescriptor_Impl;
@@ -273,11 +273,11 @@ public:
virtual OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > GetAggregationInterface() {return xShapeAgg;}
// helper
- static void AddExistingShapeToFmt( SdrObject& _rObj );
+ static void AddExistingShapeToFormat( SdrObject& _rObj );
};
class SwXGroupShape :
diff --git a/sw/inc/unofieldcoll.hxx b/sw/inc/unofieldcoll.hxx
index 1d1fbb1701a2..1b1cab829262 100644
--- a/sw/inc/unofieldcoll.hxx
+++ b/sw/inc/unofieldcoll.hxx
@@ -43,7 +43,7 @@ protected:
public:
SwXTextFieldMasters(SwDoc* pDoc);
- static bool getInstanceName(const SwFieldType& rFldType, OUString& rName);
+ static bool getInstanceName(const SwFieldType& rFieldType, OUString& rName);
// XServiceInfo
virtual OUString SAL_CALL getImplementationName()
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 281098940a4f..730a93954c97 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -39,8 +39,8 @@
class SdrObject;
class SwDoc;
-class SwFmt;
-class SwFlyFrmFmt;
+class SwFormat;
+class SwFlyFrameFormat;
class BaseFrameProperties_Impl;
class SwXFrame : public cppu::WeakImplHelper
@@ -80,12 +80,12 @@ protected:
SwXFrame(FlyCntType eSet,
const SfxItemPropertySet* pPropSet,
SwDoc *pDoc ); //Descriptor-If
- SwXFrame(SwFrmFmt& rFrmFmt, FlyCntType eSet,
+ SwXFrame(SwFrameFormat& rFrameFormat, FlyCntType eSet,
const SfxItemPropertySet* pPropSet);
template<class Interface, class Impl>
static css::uno::Reference<Interface>
- CreateXFrame(SwDoc & rDoc, SwFrmFmt *const pFrmFmt);
+ CreateXFrame(SwDoc & rDoc, SwFrameFormat *const pFrameFormat);
public:
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -139,13 +139,13 @@ public:
void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw(css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception);
void attach( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xTextRange ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException, std::exception);
- const SwFrmFmt* GetFrmFmt() const
+ const SwFrameFormat* GetFrameFormat() const
{
- return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+ return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
}
- SwFrmFmt* GetFrmFmt()
+ SwFrameFormat* GetFrameFormat()
{
- return PTR_CAST ( SwFrmFmt, GetRegisteredIn() );
+ return PTR_CAST ( SwFrameFormat, GetRegisteredIn() );
}
FlyCntType GetFlyCntType()const {return eType;}
@@ -153,7 +153,7 @@ public:
void ResetDescriptor();
//copy text from a given source PaM
void SetSelection(SwPaM& rCopySource);
- static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrmFmt &rFmt);
+ static SW_DLLPUBLIC SdrObject *GetOrCreateSdrObject(SwFlyFrameFormat &rFormat);
};
typedef cppu::WeakImplHelper
@@ -181,11 +181,11 @@ protected:
virtual ~SwXTextFrame();
SwXTextFrame(SwDoc *pDoc);
- SwXTextFrame(SwFrmFmt& rFmt);
+ SwXTextFrame(SwFrameFormat& rFormat);
public:
static SW_DLLPUBLIC css::uno::Reference<css::text::XTextFrame>
- CreateXTextFrame(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+ CreateXTextFrame(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
// FIXME: EVIL HACK: make available for SwXFrame::attachToRange
void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(pDoc); };
@@ -254,12 +254,12 @@ protected:
virtual ~SwXTextGraphicObject();
SwXTextGraphicObject( SwDoc *pDoc );
- SwXTextGraphicObject(SwFrmFmt& rFmt);
+ SwXTextGraphicObject(SwFrameFormat& rFormat);
public:
static css::uno::Reference<css::text::XTextContent>
- CreateXTextGraphicObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+ CreateXTextGraphicObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
@@ -307,12 +307,12 @@ protected:
virtual ~SwXTextEmbeddedObject();
SwXTextEmbeddedObject( SwDoc *pDoc );
- SwXTextEmbeddedObject(SwFrmFmt& rFmt);
+ SwXTextEmbeddedObject(SwFrameFormat& rFormat);
public:
static css::uno::Reference<css::text::XTextContent>
- CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrmFmt * pFrmFmt);
+ CreateXTextEmbeddedObject(SwDoc & rDoc, SwFrameFormat * pFrameFormat);
virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual void SAL_CALL acquire( ) throw() SAL_OVERRIDE;
@@ -357,9 +357,9 @@ class SwXOLEListener : public cppu::WeakImplHelper
{
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLEModel;
- SwFmt* GetFmt() const { return const_cast<SwFmt*>(static_cast<const SwFmt*>(GetRegisteredIn())); }
+ SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); }
public:
- SwXOLEListener(SwFmt& rOLEFmt, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
+ SwXOLEListener(SwFormat& rOLEFormat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xOLE);
virtual ~SwXOLEListener();
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/unomid.h b/sw/inc/unomid.h
index bc0794409c74..db8ba9335565 100644
--- a/sw/inc/unomid.h
+++ b/sw/inc/unomid.h
@@ -90,7 +90,7 @@
#define MID_COLUMNS 0
#define MID_COLUMN_SEPARATOR_LINE 1
-//SwFmtFtnAtTxtEnd
+//SwFormatFootnoteAtTextEnd
#define MID_COLLECT 0
#define MID_RESTART_NUM 1
#define MID_NUM_START_AT 2
@@ -109,7 +109,7 @@
#define MID_LINE_FOOTNOTE_DIST 6
#define MID_FTN_LINE_STYLE 7
-//SwFmtRuby
+//SwFormatRuby
#define MID_RUBY_TEXT 0
#define MID_RUBY_ADJUST 1
#define MID_RUBY_CHARSTYLE 2
@@ -143,7 +143,7 @@
#define MID_ENV_SHIFT_RIGHT 12
#define MID_ENV_SHIFT_DOWN 13
-// SwFmtWrapInfluenceOnObjPos
+// SwFormatWrapInfluenceOnObjPos
#define MID_WRAP_INFLUENCE 0
#endif
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 8c048865fcf5..5bca49d1912b 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -43,7 +43,7 @@ struct SwPosition;
class SwPaM;
class SwUnoCrsr;
class SwStartNode;
-class SwTxtNode;
+class SwTextNode;
class SwTable;
class SwXText;
@@ -74,7 +74,7 @@ private:
SwXParagraph(::com::sun::star::uno::Reference<
::com::sun::star::text::XText > const & xParent,
- SwTxtNode & rTxtNode,
+ SwTextNode & rTextNode,
const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
/// descriptor
@@ -84,17 +84,17 @@ public:
static ::com::sun::star::uno::Reference<
::com::sun::star::text::XTextContent>
- CreateXParagraph(SwDoc & rDoc, SwTxtNode * pTxtNode,
+ CreateXParagraph(SwDoc & rDoc, SwTextNode * pTextNode,
::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
const& xParentText = 0,
const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
- const SwTxtNode * GetTxtNode() const;
+ const SwTextNode * GetTextNode() const;
bool IsDescriptor() const;
/// make rPaM select the paragraph
bool SelectPaM(SwPaM & rPaM);
/// for SwXText
- void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
+ void attachToText(SwXText & rParent, SwTextNode & rTextNode);
// MetadatableMixin
virtual ::sfx2::Metadatable* GetCoreObject() SAL_OVERRIDE;
diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 2f97eb84bc1d..94935ad8a2ac 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -34,10 +34,10 @@
#include <svl/itemprop.hxx>
class SwDoc;
-class SwFmtCol;
+class SwFormatCol;
class SwDocShell;
class SwNumRule;
-class SwNumFmt;
+class SwNumFormat;
class SwXFootnoteProperties : public cppu::WeakAggImplHelper2
<
@@ -206,11 +206,11 @@ public:
void Invalidate() {pDocShell = 0;}
OUString GetCreatedNumRuleName() const {return m_sCreatedNumRuleName;}
- static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFmt(
- const SwNumFmt& rFmt, OUString const& rCharFormatName,
+ static css::uno::Sequence<css::beans::PropertyValue> GetPropertiesForNumFormat(
+ const SwNumFormat& rFormat, OUString const& rCharFormatName,
OUString const* pHeadingStyleName);
- static void SetPropertiesToNumFmt(
- SwNumFmt & aFmt,
+ static void SetPropertiesToNumFormat(
+ SwNumFormat & aFormat,
OUString & rCharStyleName,
OUString *const pBulletFontName,
OUString *const pHeadingStyleName,
@@ -264,7 +264,7 @@ protected:
virtual ~SwXTextColumns();
public:
SwXTextColumns(sal_uInt16 nColCount);
- SwXTextColumns(const SwFmtCol& rFmtCol);
+ SwXTextColumns(const SwFormatCol& rFormatCol);
static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index ffe6985b43ec..11b30a346ca7 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -48,9 +48,9 @@ class SwTable;
class SwTableBox;
class SwTableLine;
class SwTableCursor;
-class SwTableBoxFmt;
+class SwTableBoxFormat;
class SwChartDataProvider;
-class SwFrmFmt;
+class SwFrameFormat;
typedef
cppu::WeakImplHelper
@@ -65,8 +65,8 @@ class SwXCell SAL_FINAL : public SwXCellBaseClass,
public SwXText,
public SwClient
{
- friend void sw_setString( SwXCell &rCell, const OUString &rTxt,
- bool bKeepNumberFmt );
+ friend void sw_setString( SwXCell &rCell, const OUString &rText,
+ bool bKeepNumberFormat );
friend double sw_getValue( SwXCell &rCell );
friend void sw_setValue( SwXCell &rCell, double nVal );
@@ -95,8 +95,8 @@ protected:
virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
public:
- SwXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, size_t nPos = NOTFOUND);
- SwXCell(SwFrmFmt* pTblFmt, const SwStartNode& rStartNode); // XML import interface
+ SwXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, size_t nPos = NOTFOUND);
+ SwXCell(SwFrameFormat* pTableFormat, const SwStartNode& rStartNode); // XML import interface
TYPEINFO_OVERRIDE();
@@ -147,11 +147,11 @@ public:
virtual ::com::sun::star::uno::Type SAL_CALL getElementType( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
virtual sal_Bool SAL_CALL hasElements( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- SwTableBox* GetTblBox()const {return pBox;}
- static SwXCell* CreateXCell(SwFrmFmt* pTblFmt, SwTableBox* pBox, SwTable *pTbl = 0 );
+ SwTableBox* GetTableBox()const {return pBox;}
+ static SwXCell* CreateXCell(SwFrameFormat* pTableFormat, SwTableBox* pBox, SwTable *pTable = 0 );
SwTableBox* FindBox(SwTable* pTable, SwTableBox* pBox);
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
};
class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
@@ -164,8 +164,8 @@ class SwXTextTableRow SAL_FINAL : public cppu::WeakImplHelper
const SfxItemPropertySet* m_pPropSet;
SwTableLine* pLine;
- SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
- const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTextTableRow*>(this)->GetFrmFmt(); }
+ SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+ const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTextTableRow*>(this)->GetFrameFormat(); }
protected:
virtual ~SwXTextTableRow();
//SwClient
@@ -173,7 +173,7 @@ protected:
virtual void SwClientNotify(const SwModify&, const SfxHint&) SAL_OVERRIDE;
public:
- SwXTextTableRow(SwFrmFmt* pFmt, SwTableLine* pLine);
+ SwXTextTableRow(SwFrameFormat* pFormat, SwTableLine* pLine);
TYPEINFO_OVERRIDE();
@@ -197,7 +197,7 @@ public:
virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE;
- const SwTableLine* GetTblRow() const {return pLine;}
+ const SwTableLine* GetTableRow() const {return pLine;}
static SwTableLine* FindLine(SwTable* pTable, SwTableLine* pLine);
};
@@ -216,8 +216,8 @@ class SW_DLLPUBLIC SwXTextTableCursor : public SwXTextTableCursor_Base
protected:
virtual ~SwXTextTableCursor();
public:
- SwXTextTableCursor(SwFrmFmt* pFmt, SwTableBox* pBox);
- SwXTextTableCursor(SwFrmFmt& rTableFmt,
+ SwXTextTableCursor(SwFrameFormat* pFormat, SwTableBox* pBox);
+ SwXTextTableCursor(SwFrameFormat& rTableFormat,
const SwTableCursor* pTableSelection);
DECLARE_XINTERFACE()
@@ -275,7 +275,7 @@ public:
const SwUnoCrsr* GetCrsr() const;
SwUnoCrsr* GetCrsr();
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
};
struct SwRangeDescriptor
@@ -324,11 +324,11 @@ private:
protected:
virtual ~SwXTextTable();
SwXTextTable();
- SwXTextTable(SwFrmFmt& rFrmFmt);
+ SwXTextTable(SwFrameFormat& rFrameFormat);
public:
static css::uno::Reference<css::text::XTextTable>
- CreateXTextTable(SwFrmFmt * pFrmFmt);
+ CreateXTextTable(SwFrameFormat * pFrameFormat);
SW_DLLPUBLIC static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
@@ -428,14 +428,14 @@ public:
sal_uInt16 getRowCount();
sal_uInt16 getColumnCount();
- static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrmFmt* pFmt, SwTable* pTable,
+ static ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > GetRangeByName(SwFrameFormat* pFormat, SwTable* pTable,
const OUString& sTLName, const OUString& sBRName,
SwRangeDescriptor& rDesc);
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
};
class SwXCellRange : public cppu::WeakImplHelper
@@ -457,7 +457,7 @@ class SwXCellRange : public cppu::WeakImplHelper
SwRangeDescriptor aRgDesc;
const SfxItemPropertySet* m_pPropSet;
- SwUnoCrsr* pTblCrsr;
+ SwUnoCrsr* pTableCrsr;
bool m_bFirstRowAsLabel;
bool m_bFirstColumnAsLabel;
@@ -466,7 +466,7 @@ class SwXCellRange : public cppu::WeakImplHelper
void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow);
public:
- SwXCellRange(SwUnoCrsr* pCrsr, SwFrmFmt& rFrmFmt, SwRangeDescriptor& rDesc);
+ SwXCellRange(SwUnoCrsr* pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
{ m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; }
std::vector< css::uno::Reference< css::table::XCell > > getCells();
@@ -538,16 +538,16 @@ public:
//SwClient
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
sal_uInt16 getRowCount();
sal_uInt16 getColumnCount();
- const SwUnoCrsr* GetTblCrsr() const;
+ const SwUnoCrsr* GetTableCrsr() const;
// for SwChartDataSequence
void GetDataSequence(
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > *pAnySeq,
- ::com::sun::star::uno::Sequence< OUString > *pTxtSeq,
+ ::com::sun::star::uno::Sequence< OUString > *pTextSeq,
::com::sun::star::uno::Sequence< double > *pDblSeq,
bool bForceNumberResults = false ) throw (::com::sun::star::uno::RuntimeException);
@@ -561,12 +561,12 @@ class SwXTableRows SAL_FINAL : public cppu::WeakImplHelper
public SwClient
{
- SwFrmFmt* GetFrmFmt() { return static_cast<SwFrmFmt*>(GetRegisteredIn()); }
- const SwFrmFmt* GetFrmFmt() const { return const_cast<SwXTableRows*>(this)->GetFrmFmt(); }
+ SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
+ const SwFrameFormat* GetFrameFormat() const { return const_cast<SwXTableRows*>(this)->GetFrameFormat(); }
protected:
virtual ~SwXTableRows();
public:
- SwXTableRows(SwFrmFmt& rFrmFmt);
+ SwXTableRows(SwFrameFormat& rFrameFormat);
TYPEINFO_OVERRIDE();
@@ -603,11 +603,11 @@ class SwXTableColumns : public cppu::WeakImplHelper
public SwClient
{
- SwFrmFmt* GetFrmFmt() const { return const_cast<SwFrmFmt*>(static_cast<const SwFrmFmt*>(GetRegisteredIn())); }
+ SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
protected:
virtual ~SwXTableColumns();
public:
- SwXTableColumns(SwFrmFmt& rFrmFmt);
+ SwXTableColumns(SwFrameFormat& rFrameFormat);
TYPEINFO_OVERRIDE();
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
index 71662286ff6d..6f46a3905734 100644
--- a/sw/inc/unotextbodyhf.hxx
+++ b/sw/inc/unotextbodyhf.hxx
@@ -30,7 +30,7 @@
#include <unotext.hxx>
class SwDoc;
-class SwFrmFmt;
+class SwFrameFormat;
class SwXTextCursor;
typedef ::cppu::WeakAggImplHelper2
@@ -134,12 +134,12 @@ protected:
virtual ~SwXHeadFootText();
- SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+ SwXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
public:
static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
- CreateXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+ CreateXHeadFootText(SwFrameFormat & rHeadFootFormat, const bool bIsHeader);
static bool IsXHeadFootText(SwClient *const pClient);
// XInterface
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 312b68eec8a8..b7f7ae90b743 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -37,7 +37,7 @@
class SwDoc;
class SwUnoCrsr;
-class SwFrmFmt;
+class SwFrameFormat;
class SW_DLLPUBLIC SwUnoInternalPaM
: public SwPaM
@@ -114,7 +114,7 @@ public:
::com::sun::star::text::XText > & xParent,
const enum RangePosition eRange = RANGE_IN_TEXT);
// only for RANGE_IS_TABLE
- SwXTextRange(SwFrmFmt& rTblFmt);
+ SwXTextRange(SwFrameFormat& rTableFormat);
const SwDoc* GetDoc() const;
SwDoc* GetDoc();
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index b7fb3d0e4f9c..90e7f02b9335 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -148,7 +148,7 @@ private:
css::uno::Reference< css::text::XText > xBodyText;
SwXBodyText* pBodyText;
- css::uno::Reference< css::uno::XAggregation > xNumFmtAgg;
+ css::uno::Reference< css::uno::XAggregation > xNumFormatAgg;
css::uno::Reference< css::container::XIndexAccess > * pxXNumberingRules;
css::uno::Reference< css::container::XIndexAccess > * pxXFootnotes;
diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx
index ef4c88d0dfbf..e0d1730c5ce7 100644
--- a/sw/inc/usrfld.hxx
+++ b/sw/inc/usrfld.hxx
@@ -41,10 +41,10 @@ public:
virtual OUString GetName() const SAL_OVERRIDE;
virtual SwFieldType* Copy() const SAL_OVERRIDE;
- OUString Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng);
+ OUString Expand(sal_uInt32 nFormat, sal_uInt16 nSubType, sal_uInt16 nLng);
- OUString GetContent( sal_uInt32 nFmt = 0 );
- void SetContent( const OUString& rStr, sal_uInt32 nFmt = 0 );
+ OUString GetContent( sal_uInt32 nFormat = 0 );
+ void SetContent( const OUString& rStr, sal_uInt32 nFormat = 0 );
inline bool IsValid() const;
inline void ChgValid( bool bNew );
@@ -95,7 +95,7 @@ class SW_DLLPUBLIC SwUserField : public SwValueField
virtual SwField* Copy() const SAL_OVERRIDE;
public:
- SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 0);
+ SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFormat = 0);
virtual sal_uInt16 GetSubType() const SAL_OVERRIDE;
virtual void SetSubType(sal_uInt16 nSub) SAL_OVERRIDE;
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 8f10c195d0e6..64c1e269f2f6 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -157,7 +157,7 @@ protected:
sal_uInt16 nZoom; // In percent.
SvxZoomType eZoom; // 'enum' for zoom.
- sal_uInt8 nTblDest; // Destination for table background.
+ sal_uInt8 nTableDest; // Destination for table background.
#ifdef DBG_UTIL
// Corresponds to statements in ui/config/cfgvw.src.
@@ -236,8 +236,8 @@ public:
inline void SetSoftHyph( bool b )
{ b ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); }
- inline bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
- inline void SetFldName( bool b )
+ inline bool IsFieldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) != 0; }
+ inline void SetFieldName( bool b )
{ b ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); }
inline bool IsPostIts() const
@@ -462,7 +462,7 @@ public:
SvxZoomType GetZoomType() const { return eZoom; }
- sal_uInt8 GetTblDest() const { return nTblDest; }
+ sal_uInt8 GetTableDest() const { return nTableDest; }
void SetViewVScrollBar(bool b)
{ b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); }
@@ -480,7 +480,7 @@ public:
{ b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); }
void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; }
- void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; }
+ void SetTableDest( sal_uInt8 nNew ) { nTableDest = nNew; }
const OUString& GetSymbolFont() const {return sSymbolFont;}
void SetSymbolFont(const OUString& sSet) {sSymbolFont = sSet;}
@@ -597,7 +597,7 @@ inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
{
nUIOptions = rVOpt.nUIOptions;
- nTblDest = rVOpt.nTblDest;
+ nTableDest = rVOpt.nTableDest;
nShdwCrsrFillMode = rVOpt.nShdwCrsrFillMode;
}
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index fee06ba39842..b63eaeffd284 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -70,7 +70,7 @@ class SwRegionRects;
class SwFrm;
class SvtAccessibilityOptions;
class SwPagePreviewLayout;
-class SwTxtFrm;
+class SwTextFrm;
class BitmapEx;
struct SwAccessibilityOptions;
@@ -381,7 +381,7 @@ public:
void CalcPagesForPrint( sal_uInt16 nMax );
// All about fields.
- void UpdateFlds(bool bCloseDB = false);
+ void UpdateFields(bool bCloseDB = false);
bool IsAnyFieldInDoc() const;
// Update all charts, for that exists any table.
void UpdateAllCharts();
@@ -520,18 +520,18 @@ public:
@author OD
- @param _pFromTxtFrm
+ @param _pFromTextFrm
input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
has to be invalidated.
If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated
- @param _pToTxtFrm
+ @param _pToTextFrm
input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO
has to be invalidated.
If NULL, no CONTENT_FLOWS_TO relation has to be invalidated
*/
- void InvalidateAccessibleParaFlowRelation( const SwTxtFrm* _pFromTxtFrm,
- const SwTxtFrm* _pToTxtFrm );
+ void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
+ const SwTextFrm* _pToTextFrm );
/** invalidate text selection for paragraphs
@@ -546,10 +546,10 @@ public:
@author OD
- @param rTxtFrm
+ @param rTextFrm
input parameter - paragraph frame, whose attributes have changed
*/
- void InvalidateAccessibleParaAttrs( const SwTxtFrm& rTxtFrm );
+ void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm );
SwAccessibleMap* GetAccessibleMap();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 99b25f761f22..a15dbd30b04b 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -28,7 +28,7 @@
class SwCrsrShell;
class SwShellCrsr;
-class SwTxtInputFld;
+class SwTextInputField;
// From here classes/methods for non-text cursor.
@@ -40,7 +40,7 @@ class SwVisCrsr
bool m_bIsVisible;
bool m_bIsDragCrsr;
- vcl::Cursor m_aTxtCrsr;
+ vcl::Cursor m_aTextCrsr;
const SwCrsrShell* m_pCrsrShell;
void _SetPosAndShow();
@@ -79,10 +79,10 @@ class SwSelPaintRects : public SwRects
void setCursorOverlay(sdr::overlay::OverlayObject* pNew) { m_pCursorOverlay = pNew; }
#endif
- bool m_bShowTxtInputFldOverlay;
- sw::overlay::OverlayRangesOutline* m_pTxtInputFldOverlay;
+ bool m_bShowTextInputFieldOverlay;
+ sw::overlay::OverlayRangesOutline* m_pTextInputFieldOverlay;
- void HighlightInputFld();
+ void HighlightInputField();
public:
SwSelPaintRects( const SwCrsrShell& rCSh );
@@ -100,9 +100,9 @@ public:
void Hide();
void Invalidate( const SwRect& rRect );
- inline void SetShowTxtInputFldOverlay( const bool bShow )
+ inline void SetShowTextInputFieldOverlay( const bool bShow )
{
- m_bShowTxtInputFldOverlay = bShow;
+ m_bShowTextInputFieldOverlay = bShow;
}
const SwCrsrShell* GetShell() const { return m_pCursorShell; }
@@ -152,7 +152,7 @@ public:
virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
- virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+ virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
bool UpDown( bool bUp, sal_uInt16 nCnt = 1 );
@@ -192,7 +192,7 @@ public:
virtual SwCursor* Create( SwPaM* pRing = 0 ) const SAL_OVERRIDE;
virtual short MaxReplaceArived() SAL_OVERRIDE; //returns RET_YES/RET_CANCEL/RET_NO
- virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
+ virtual void SaveTableBoxContent( const SwPosition* pPos = 0 ) SAL_OVERRIDE;
// true: Cursor can be set to this position.
virtual bool IsAtValidPos( bool bPoint = true ) const SAL_OVERRIDE;
diff --git a/sw/qa/complex/accessibility/AccessibleRelationSet.java b/sw/qa/complex/accessibility/AccessibleRelationSet.java
index 562bcfe98d7e..b1d0b4cc58ea 100644
--- a/sw/qa/complex/accessibility/AccessibleRelationSet.java
+++ b/sw/qa/complex/accessibility/AccessibleRelationSet.java
@@ -71,11 +71,11 @@ public class AccessibleRelationSet {
"didn't gain correct relation type for paragraph 0", types[2],
types[firstrelation]);
- XAccessibleText paraTxt2 =
+ XAccessibleText paraText2 =
UnoRuntime.queryInterface(XAccessibleText.class, para2);
assertEquals(
"didn't gain correct target paragraph", atarget.getText(),
- paraTxt2.getText());
+ paraText2.getText());
}
@Test public void contents_flows_from() {
@@ -131,21 +131,21 @@ public class AccessibleRelationSet {
"didn't gain correct relation type for paragraph 1", types[1],
types[relationtypes[0]]);
- XAccessibleText paraTxt1 =
+ XAccessibleText paraText1 =
UnoRuntime.queryInterface(XAccessibleText.class, para1);
assertEquals(
"didn't gain correct target paragraph", atargets[0].getText(),
- paraTxt1.getText());
+ paraText1.getText());
assertEquals(
"didn't gain correct relation type for paragraph 3", types[2],
types[relationtypes[1]]);
- XAccessibleText paraTxt3 =
+ XAccessibleText paraText3 =
UnoRuntime.queryInterface(XAccessibleText.class, para3);
assertEquals(
"didn't gain correct target paragraph", atargets[1].getText(),
- paraTxt3.getText());
+ paraText3.getText());
}
@Before public void before()
diff --git a/sw/qa/complex/writer/CheckCrossReferences.java b/sw/qa/complex/writer/CheckCrossReferences.java
index 508ca6cf6a04..651604b439b7 100644
--- a/sw/qa/complex/writer/CheckCrossReferences.java
+++ b/sw/qa/complex/writer/CheckCrossReferences.java
@@ -33,7 +33,7 @@ public class CheckCrossReferences {
private com.sun.star.container.XEnumeration xParaEnum;
private com.sun.star.container.XEnumeration xPortionEnum;
- private com.sun.star.util.XRefreshable xFldsRefresh;
+ private com.sun.star.util.XRefreshable xFieldsRefresh;
public com.sun.star.text.XTextField getNextField()
throws com.sun.star.uno.Exception
@@ -86,18 +86,18 @@ public class CheckCrossReferences {
public void checkField( com.sun.star.text.XTextField xField,
com.sun.star.beans.XPropertySet xProps,
short nFormat,
- String aExpectedFldResult )
+ String aExpectedFieldResult )
throws com.sun.star.uno.Exception
{
// set requested format
xProps.setPropertyValue("ReferenceFieldPart", Short.valueOf(nFormat));
// refresh fields in order to get new format applied
- xFldsRefresh.refresh();
+ xFieldsRefresh.refresh();
- String aFldResult = xField.getPresentation( false );
+ String aFieldResult = xField.getPresentation( false );
assertEquals( "set reference field format doesn't result in correct field result",
- aExpectedFldResult, aFldResult);
+ aExpectedFieldResult, aFieldResult);
}
@Test public void checkCrossReferences() throws com.sun.star.uno.Exception {
@@ -114,25 +114,25 @@ public class CheckCrossReferences {
com.sun.star.text.XTextFieldsSupplier xFieldSupp =
UnoRuntime.queryInterface(
com.sun.star.text.XTextFieldsSupplier.class, document);
- xFldsRefresh = UnoRuntime.queryInterface(
+ xFieldsRefresh = UnoRuntime.queryInterface(
com.sun.star.util.XRefreshable.class, xFieldSupp.getTextFields());
}
// check first reference field
{
// strings for checking
- final String FldResult1 = "*i*";
- final String FldResult2 = "+b+*i*";
- final String FldResult3 = "-1-+b+*i*";
- final String FldResult4 = "1";
- final String FldResult5 = "1";
- final String FldResult6 = "A.1";
- final String FldResult7 = "2(a)";
- final String FldResult8 = "2(b)";
- final String FldResult9 = "2";
- final String FldResult10 = "1(a)";
- final String FldResult11 = "(b)";
- final String FldResult12 = "(a)";
+ final String FieldResult1 = "*i*";
+ final String FieldResult2 = "+b+*i*";
+ final String FieldResult3 = "-1-+b+*i*";
+ final String FieldResult4 = "1";
+ final String FieldResult5 = "1";
+ final String FieldResult6 = "A.1";
+ final String FieldResult7 = "2(a)";
+ final String FieldResult8 = "2(b)";
+ final String FieldResult9 = "2";
+ final String FieldResult10 = "1(a)";
+ final String FieldResult11 = "(b)";
+ final String FieldResult12 = "(a)";
// variables for current field
com.sun.star.text.XTextField xField = null;
@@ -140,75 +140,75 @@ public class CheckCrossReferences {
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult2 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult2 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult1 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult1 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult3 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult1 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult3 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult3 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult1 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult3 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult5 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult5 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult6 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult6 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult6 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult6 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult7 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult7 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult8 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult11 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult8 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult8 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult11 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult8 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult9 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult9 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult9 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult9 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult9 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult9 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult4 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult4 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult4 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult10 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult10 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult10 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult10 );
xField = getNextField();
xProps = getFieldProps( xField );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FldResult12 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FldResult12 );
- checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FldResult7 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER, FieldResult12 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_NO_CONTEXT, FieldResult12 );
+ checkField( xField, xProps, com.sun.star.text.ReferenceFieldPart.NUMBER_FULL_CONTEXT, FieldResult7 );
}
// insert a certain cross-reference bookmark and a reference field to this bookmark
@@ -267,7 +267,7 @@ public class CheckCrossReferences {
UnoRuntime.queryInterface(
com.sun.star.text.XTextRange.class, xParaEnum.nextElement());
xNewField.attach(xFieldTextRange.getEnd());
- xFldsRefresh.refresh();
+ xFieldsRefresh.refresh();
}
// check inserted reference field
@@ -278,7 +278,7 @@ public class CheckCrossReferences {
"J", xField.getPresentation( false ) );
xParaTextRange.getStart().setString( "Hallo new bookmark: " );
- xFldsRefresh.refresh();
+ xFieldsRefresh.refresh();
assertEquals( "inserted reference field doesn't has correct field result",
"Hallo new bookmark: J", xField.getPresentation( false ) );
}
diff --git a/sw/qa/complex/writer/CheckTable.java b/sw/qa/complex/writer/CheckTable.java
index 83b92da818f8..e4d33d3ee6f1 100644
--- a/sw/qa/complex/writer/CheckTable.java
+++ b/sw/qa/complex/writer/CheckTable.java
@@ -275,7 +275,7 @@ public class CheckTable
// get anchor
XTextRange xAnchor = xTable.getAnchor();
// check all properties on the anchor - shouldn't crash despite
- // pointing to a non-SwTxtNode
+ // pointing to a non-SwTextNode
XPropertySet xProps = UnoRuntime.queryInterface(XPropertySet.class, xAnchor);
XPropertySetInfo xPropsInfo = xProps.getPropertySetInfo();
Property[] props = xPropsInfo.getProperties();
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index c754bb431517..5b90d8acfe80 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -193,14 +193,14 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
SwPaM aPaM(aIdx);
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
- rIDCO.AppendTxtNode(*aPaM.GetPoint());
+ rIDCO.AppendTextNode(*aPaM.GetPoint());
rIDCO.InsertString(aPaM, OUString("A"));
- rIDCO.AppendTxtNode(*aPaM.GetPoint());
+ rIDCO.AppendTextNode(*aPaM.GetPoint());
rIDCO.InsertString(aPaM, OUString("A"));
- rIDCO.AppendTxtNode(*aPaM.GetPoint());
+ rIDCO.AppendTextNode(*aPaM.GetPoint());
aPaM.Move(fnMoveBackward, fnGoNode);
aPaM.Move(fnMoveBackward, fnGoNode);
- aPaM.Move(fnMoveBackward, fnGoCntnt);
+ aPaM.Move(fnMoveBackward, fnGoContent);
aPaM.SetMark();
aPaM.Move(fnMoveForward, fnGoDoc);
IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
@@ -210,7 +210,7 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
// select so pMark start position is on a node that is fully deleted
aPaM.Move(fnMoveBackward, fnGoNode);
// must leave un-selected content in last node to get the bJoinPrev flag!
- aPaM.Move(fnMoveBackward, fnGoCntnt);
+ aPaM.Move(fnMoveBackward, fnGoContent);
aPaM.Exchange();
aPaM.Move(fnMoveBackward, fnGoDoc);
// delete
@@ -219,8 +219,8 @@ void SwMacrosTest::testBookmarkDeleteAndJoin()
for (IDocumentMarkAccess::const_iterator_t i = rIDMA.getAllMarksBegin(); i != rIDMA.getAllMarksEnd(); ++i)
{
// problem was that the nContent was pointing at deleted node
- CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetCntntNode() ==
- static_cast<const SwCntntNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
+ CPPUNIT_ASSERT((*i)->GetMarkStart().nNode.GetNode().GetContentNode() ==
+ static_cast<const SwContentNode*>((*i)->GetMarkStart().nContent.GetIdxReg()));
}
}
@@ -232,11 +232,11 @@ void SwMacrosTest::testBookmarkDeleteTdf90816()
SwPaM aPaM(aIdx);
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
- rIDCO.AppendTxtNode(*aPaM.GetPoint());
+ rIDCO.AppendTextNode(*aPaM.GetPoint());
rIDCO.InsertString(aPaM, OUString("ABC"));
- aPaM.Move(fnMoveBackward, fnGoCntnt);
+ aPaM.Move(fnMoveBackward, fnGoContent);
aPaM.SetMark();
- aPaM.Move(fnMoveBackward, fnGoCntnt);
+ aPaM.Move(fnMoveBackward, fnGoContent);
IDocumentMarkAccess & rIDMA = *pDoc->getIDocumentMarkAccess();
sw::mark::IMark *pMark =
rIDMA.makeMark(aPaM, "test", IDocumentMarkAccess::MarkType::BOOKMARK);
@@ -435,18 +435,18 @@ void SwMacrosTest::testFindReplace()
// we need a full document with view and layout etc. because ::GetNode()
Reference<lang::XComponent> const xComponent =
loadFromDesktop("private:factory/swriter", "com.sun.star.text.TextDocument");
- SwXTextDocument *const pTxtDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwDoc *const pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwXTextDocument *const pTextDoc = dynamic_cast<SwXTextDocument *>(xComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
// use a UnoCrsr so it will be corrected when deleting nodes
SwUnoCrsr *const pPaM(pDoc->CreateUnoCrsr(SwPosition(aIdx), false));
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
rIDCO.InsertString(*pPaM, OUString("foo"));
- rIDCO.AppendTxtNode(*pPaM->GetPoint());
+ rIDCO.AppendTextNode(*pPaM->GetPoint());
rIDCO.InsertString(*pPaM, OUString("bar"));
- rIDCO.AppendTxtNode(*pPaM->GetPoint());
+ rIDCO.AppendTextNode(*pPaM->GetPoint());
rIDCO.InsertString(*pPaM, OUString("baz"));
pPaM->Move(fnMoveBackward, fnGoDoc);
@@ -467,7 +467,7 @@ void SwMacrosTest::testFindReplace()
opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_BODY, false);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
- CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
// now do another Find, inside the selection from the first Find
// opts.searchFlags = 71680;
@@ -475,7 +475,7 @@ void SwMacrosTest::testFindReplace()
opts, false, DOCPOS_CURR, DOCPOS_END, bCancel, FND_IN_SEL, false);
CPPUNIT_ASSERT(bFound);
CPPUNIT_ASSERT(pPaM->HasMark());
- CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString(""), pPaM->GetText());
rIDCO.ReplaceRange(*pPaM, " ", true);
@@ -484,10 +484,10 @@ void SwMacrosTest::testFindReplace()
// problem was that after the 2nd Find, the wrong newline was selected
CPPUNIT_ASSERT_EQUAL(OUString("foo bar"),
- pPaM->Start()->nNode.GetNode().GetTxtNode()->GetTxt());
+ pPaM->Start()->nNode.GetNode().GetTextNode()->GetText());
pPaM->Move(fnMoveForward, fnGoNode);
CPPUNIT_ASSERT_EQUAL(OUString("baz"),
- pPaM->End()->nNode.GetNode().GetTxtNode()->GetTxt());
+ pPaM->End()->nNode.GetNode().GetTextNode()->GetText());
}
SwMacrosTest::SwMacrosTest()
diff --git a/sw/qa/core/test_ToxLinkProcessor.cxx b/sw/qa/core/test_ToxLinkProcessor.cxx
index 7c16c18b03a6..e768c210ce2b 100644
--- a/sw/qa/core/test_ToxLinkProcessor.cxx
+++ b/sw/qa/core/test_ToxLinkProcessor.cxx
@@ -104,8 +104,8 @@ ToxLinkProcessorTest::LinkIsCreatedCorrectly()
sut.StartNewLink(0, STYLE_NAME_1);
sut.CloseLink(1, URL_1);
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
- CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link", STYLE_NAME_1, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
+ CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link", URL_1, sut.mClosedLinks.at(0).mINetFormat.GetValue());
}
void
@@ -122,18 +122,18 @@ ToxLinkProcessorTest::LinkSequenceIsPreserved()
// check first closed element
CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
- STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFmt.GetVisitedFmt());
+ STYLE_NAME_2, sut.mClosedLinks.at(0).mINetFormat.GetVisitedFormat());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
- POOL_ID_2, sut.mClosedLinks.at(0).mINetFmt.GetINetFmtId());
+ POOL_ID_2, sut.mClosedLinks.at(0).mINetFormat.GetINetFormatId());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
- URL_2, sut.mClosedLinks.at(0).mINetFmt.GetValue());
+ URL_2, sut.mClosedLinks.at(0).mINetFormat.GetValue());
// check second closed element
CPPUNIT_ASSERT_EQUAL_MESSAGE("Style is stored correctly in link",
- STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFmt.GetVisitedFmt());
+ STYLE_NAME_1, sut.mClosedLinks.at(1).mINetFormat.GetVisitedFormat());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Pool id is stored correctly in link",
- POOL_ID_1, sut.mClosedLinks.at(1).mINetFmt.GetINetFmtId());
+ POOL_ID_1, sut.mClosedLinks.at(1).mINetFormat.GetINetFormatId());
CPPUNIT_ASSERT_EQUAL_MESSAGE("Url is stored correctly in link",
- URL_1, sut.mClosedLinks.at(1).mINetFmt.GetValue());
+ URL_1, sut.mClosedLinks.at(1).mINetFormat.GetValue());
}
// Put the test suite in the registry
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 2101c4a8b825..0dcda9f18717 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -86,7 +86,7 @@ void
ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfNoTextMarkIsSet()
{
MockedSortTab sortTab;
- sortTab.pTxtMark = NULL;
+ sortTab.pTextMark = NULL;
OUString expected("");
OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -97,7 +97,7 @@ void
ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
{
MockedSortTab sortTab;
- sortTab.pTxtMark = reinterpret_cast<SwTxtTOXMark*>(1);
+ sortTab.pTextMark = reinterpret_cast<SwTextTOXMark*>(1);
OUString expected("");
OUString actual = ToxTextGenerator::GetNumStringOfFirstNode(sortTab, false, 0);
@@ -107,7 +107,7 @@ ToxTextGeneratorTest::EmptyStringIsReturnedAsNumStringIfToxSourcesIsEmpty()
class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
public:
virtual HandledTabStopToken
- HandleTabStopToken(const SwFormToken& aToken, const SwTxtNode& targetNode,
+ HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
const SwRootFrm *currentLayout) const SAL_OVERRIDE {
(void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid unused warnings.
return HandledTabStopToken();
@@ -128,7 +128,7 @@ public:
private:
SwChapterField
ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
- const SwCntntFrm* contentFrame, const SwCntntNode *contentNode) const SAL_OVERRIDE {
+ const SwContentFrm* contentFrame, const SwContentNode *contentNode) const SAL_OVERRIDE {
// get rid of 'unused-parameters' warnings
(void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
return mChapterField;
diff --git a/sw/qa/core/uwriter.cxx b/sw/qa/core/uwriter.cxx
index 6e7e3092942f..966a2aa23bbf 100644
--- a/sw/qa/core/uwriter.cxx
+++ b/sw/qa/core/uwriter.cxx
@@ -270,30 +270,30 @@ void SwDocTest::testUserPerceivedCharCount()
CPPUNIT_ASSERT_MESSAGE("Surrogate Pair should be counted as single character", nCount == 1);
}
-SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument(SwDoc *pDoc)
{
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- SwFmtFtn aFtn;
- aFtn.SetNumStr(OUString("foo"));
+ SwFormatFootnote aFootnote;
+ aFootnote.SetNumStr(OUString("foo"));
- pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA BBBBB "));
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
- pTxtNode->InsertItem(aFtn, nPos, nPos);
+ pTextNode->InsertItem(aFootnote, nPos, nPos);
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" CCCCC "));
nPos = aPaM.GetPoint()->nContent.GetIndex();
- pTxtNode->InsertItem(aFtn, nPos, nPos);
+ pTextNode->InsertItem(aFootnote, nPos, nPos);
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" DDDDD"));
- CPPUNIT_ASSERT(pTxtNode->GetTxt().getLength() == (4*5) + 5 + 2);
+ CPPUNIT_ASSERT(pTextNode->GetText().getLength() == (4*5) + 5 + 2);
//set start of selection to first B
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 6);
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 6);
aPaM.SetMark();
//set end of selection to last C
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 14);
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 14);
//set character attribute hidden on range
SvxCharHiddenItem aHidden(true, RES_CHRATR_HIDDEN);
pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aHidden );
@@ -305,24 +305,24 @@ SwTxtNode* getModelToViewTestDocument(SwDoc *pDoc)
CPPUNIT_ASSERT_MESSAGE("redlines should be visible", IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
//set start of selection to last A
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 4);
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 4);
aPaM.SetMark();
//set end of selection to second last B
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 9);
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 9);
pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM); //redline-aware deletion api
aPaM.DeleteMark();
- return pTxtNode;
+ return pTextNode;
}
-SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
+SwTextNode* getModelToViewTestDocument2(SwDoc *pDoc)
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(pDoc);
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("AAAAA"));
IDocumentMarkAccess* pMarksAccess = pDoc->getIDocumentMarkAccess();
sw::mark::IFieldmark *pFieldmark = dynamic_cast<sw::mark::IFieldmark*>(
@@ -333,28 +333,28 @@ SwTxtNode* getModelToViewTestDocument2(SwDoc *pDoc)
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_LISTENTRY] = uno::makeAny(vListEntries);
(*pFieldmark->GetParameters())[ODF_FORMDROPDOWN_RESULT] = uno::makeAny(sal_Int32(0));
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("CCCCC"));
- pTxtNode = aPaM.GetNode().GetTxtNode();
+ pTextNode = aPaM.GetNode().GetTextNode();
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(11),
- pTxtNode->GetTxt().getLength());
+ pTextNode->GetText().getLength());
- return pTxtNode;
+ return pTextNode;
}
void SwDocTest::testModelToViewHelperPassthrough()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::PassThrough);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::PassThrough);
OUString sViewText = aModelToViewHelper.getViewText();
- OUString sModelText = pTxtNode->GetTxt();
+ OUString sModelText = pTextNode->GetText();
CPPUNIT_ASSERT_EQUAL(sModelText, sViewText);
}
void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString("AAAAA BBBBB foo CCCCC foo DDDDD"), sViewText);
@@ -362,9 +362,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote()
void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
@@ -382,9 +382,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode()
void SwDocTest::testModelToViewHelperExpandFields()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString("AAAAA BBBBB CCCCC DDDDD"), sViewText);
@@ -392,9 +392,9 @@ void SwDocTest::testModelToViewHelperExpandFields()
void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(OUString("AAAAA BBBBB CCCCC DDDDD"),
@@ -407,9 +407,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsReplaceMode()
void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString("AAAAA CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -418,9 +418,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisible()
void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideDeletions);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideDeletions);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString("AAAABB " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " CCCCC " + OUStringLiteral1<CH_TXTATR_BREAKWORD>() + " DDDDD"),
@@ -429,18 +429,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideRedlined()
void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnote()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(OUString("AAAAA CCCCC foo DDDDD"), sViewText);
}
void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteReplaceMode()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
@@ -456,9 +456,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleExpandFootnoteRepl
void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
OUString("AAAABB foo CCCCC foo DDDDD"), sViewText);
@@ -466,9 +466,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnote(
void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteReplaceMode()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
@@ -486,9 +486,9 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideHideRedlinedExpandFootnoteR
void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::HideInvisible | ExpandMode::HideDeletions);
OUString sViewText = aModelToViewHelper.getViewText();
OUStringBuffer aBuffer;
aBuffer.append("AAAACCCCC ");
@@ -499,18 +499,18 @@ void SwDocTest::testModelToViewHelperHideInvisibleHideRedlined()
void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnote()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(OUString("AAAACCCCC foo DDDDD"), sViewText);
}
void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpandFootnoteReplaceMode()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::HideInvisible | ExpandMode::HideDeletions | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(sViewText,
@@ -525,18 +525,18 @@ void SwDocTest::testModelToViewHelperExpandFieldsHideInvisibleHideRedlinedExpand
void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnote2()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
+ ModelToViewHelper aModelToViewHelper(*pTextNode, ExpandMode::ExpandFields | ExpandMode::ExpandFootnote);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(OUString("AAAAABBBBBCCCCC"), sViewText);
}
void SwDocTest::testModelToViewHelperExpandFieldsExpandFootnoteReplaceMode2()
{
- SwTxtNode* pTxtNode = getModelToViewTestDocument2(m_pDoc);
+ SwTextNode* pTextNode = getModelToViewTestDocument2(m_pDoc);
- ModelToViewHelper aModelToViewHelper(*pTxtNode,
+ ModelToViewHelper aModelToViewHelper(*pTextNode,
ExpandMode::ExpandFields | ExpandMode::ExpandFootnote | ExpandMode::ReplaceMode);
OUString sViewText = aModelToViewHelper.getViewText();
CPPUNIT_ASSERT_EQUAL(
@@ -555,16 +555,16 @@ void SwDocTest::testSwScanner()
SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
- CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTxtNode);
+ CPPUNIT_ASSERT_MESSAGE("Has Text Node", pTextNode);
//See https://bugs.libreoffice.org/show_bug.cgi?id=40449
//See https://bugs.libreoffice.org/show_bug.cgi?id=39365
//Use a temporary OUString as the arg, as that's the trouble behind
//fdo#40449 and fdo#39365
{
- SwScanner aScanner(*pTxtNode,
+ SwScanner aScanner(*pTextNode,
OUString("Hello World"),
0, ModelToViewHelper(), i18n::WordType::DICTIONARY_WORD, 0,
RTL_CONSTASCII_LENGTH("Hello World"));
@@ -595,8 +595,8 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
SwDocStat aDocStat;
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(IDEOGRAPHICFULLSTOP_D));
CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nChar == 2);
CPPUNIT_ASSERT_MESSAGE("Should be 2", aDocStat.nCharExcludingSpaces == 2);
@@ -621,7 +621,7 @@ void SwDocTest::testSwScanner()
0x0020, 0x0064, 0x006F, 0x0065, 0x0073, 0x0020, 0x0074, 0x0068,
0x0069, 0x0073, 0x0020, 0x0064, 0x006F, 0x003F, 0x0020, 0x0020
};
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(test,
SAL_N_ELEMENTS(test)));
@@ -631,8 +631,8 @@ void SwDocTest::testSwScanner()
m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, aWestLangItem );
SwDocStat aDocStat;
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(test));
CPPUNIT_ASSERT_MESSAGE("58 words", aDocStat.nWord == 58);
CPPUNIT_ASSERT_MESSAGE("43 Asian characters and Korean syllables", aDocStat.nAsianWord == 43);
CPPUNIT_ASSERT_MESSAGE("105 non-whitespace chars", aDocStat.nCharExcludingSpaces == 105);
@@ -650,10 +650,10 @@ void SwDocTest::testSwScanner()
0x0065, 0x0065, 0x2019
};
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeThree, SAL_N_ELEMENTS(aShouldBeThree)));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeThree));
CPPUNIT_ASSERT_MESSAGE("Should be 3", aDocStat.nWord == 3);
const sal_Unicode aShouldBeFive[] = {
@@ -667,11 +667,11 @@ void SwDocTest::testSwScanner()
0x006C, 0x0065, 0x0072, 0x3000, 0x00BB
};
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aShouldBeFive, SAL_N_ELEMENTS(aShouldBeFive)));
- pTxtNode = aPaM.GetNode().GetTxtNode();
+ pTextNode = aPaM.GetNode().GetTextNode();
aDocStat.Reset();
- pTxtNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
+ pTextNode->CountWords(aDocStat, 0, SAL_N_ELEMENTS(aShouldBeFive));
CPPUNIT_ASSERT_MESSAGE("Should be 5", aDocStat.nWord == 5);
}
@@ -679,47 +679,47 @@ void SwDocTest::testSwScanner()
{
SwDocStat aDocStat;
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
- pTxtNode = aPaM.GetNode().GetTxtNode();
+ pTextNode = aPaM.GetNode().GetTextNode();
sal_Int32 nPos = aPaM.GetPoint()->nContent.GetIndex();
- SwFmtFtn aFtn;
- aFtn.SetNumStr(OUString("banana"));
- SwTxtAttr* pTA = pTxtNode->InsertItem(aFtn, nPos, nPos);
+ SwFormatFootnote aFootnote;
+ aFootnote.SetNumStr(OUString("banana"));
+ SwTextAttr* pTA = pTextNode->InsertItem(aFootnote, nPos, nPos);
CPPUNIT_ASSERT(pTA);
- CPPUNIT_ASSERT(pTxtNode->Len() == 6); //Apple + 0x02
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ CPPUNIT_ASSERT(pTextNode->Len() == 6); //Apple + 0x02
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 1);
CPPUNIT_ASSERT_MESSAGE("footnote should be expanded", aDocStat.nChar == 11);
const sal_Int32 nNextPos = aPaM.GetPoint()->nContent.GetIndex();
CPPUNIT_ASSERT(nNextPos == nPos+1);
- SwFmtRefMark aRef(OUString("refmark"));
- pTA = pTxtNode->InsertItem(aRef, nNextPos, nNextPos);
+ SwFormatRefMark aRef(OUString("refmark"));
+ pTA = pTextNode->InsertItem(aRef, nNextPos, nNextPos);
CPPUNIT_ASSERT(pTA);
aDocStat.Reset();
- pTxtNode->SetWordCountDirty(true);
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode->SetWordCountDirty(true);
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 1);
CPPUNIT_ASSERT_MESSAGE("refmark anchor should not be counted", aDocStat.nChar == 11);
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
DateTime aDate(DateTime::SYSTEM);
SwPostItField aPostIt(
- static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD)), OUString("An Author"),
+ static_cast<SwPostItFieldType*>(m_pDoc->getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD)), OUString("An Author"),
OUString("Some Text"), OUString("Initials"), OUString("Name"), aDate );
- m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFmtFld(aPostIt));
+ m_pDoc->getIDocumentContentOperations().InsertPoolItem(aPaM, SwFormatField(aPostIt));
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Apple"));
- pTxtNode = aPaM.GetNode().GetTxtNode();
+ pTextNode = aPaM.GetNode().GetTextNode();
aDocStat.Reset();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 1);
CPPUNIT_ASSERT_MESSAGE("postit anchor should effectively not exist", aDocStat.nChar == 10);
- CPPUNIT_ASSERT(pTxtNode->Len() == 11);
+ CPPUNIT_ASSERT(pTextNode->Len() == 11);
aDocStat.Reset();
}
@@ -729,10 +729,10 @@ void SwDocTest::testSwScanner()
SwDocStat aDocStat;
const char aString[] = "Lorem ipsum";
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(aString));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(2));
//turn on red-lining and show changes
@@ -742,17 +742,17 @@ void SwDocTest::testSwScanner()
//delete everything except the first word
aPaM.SetMark(); //set start of selection to current pos
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 5); //set end of selection to fifth char of current node
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 5); //set end of selection to fifth char of current node
m_pDoc->getIDocumentContentOperations().DeleteAndJoin(aPaM); //redline-aware deletion api
//"real underlying text should be the same"
- CPPUNIT_ASSERT_EQUAL(pTxtNode->GetTxt(), OUString(aString));
+ CPPUNIT_ASSERT_EQUAL(pTextNode->GetText(), OUString(aString));
aDocStat.Reset();
- pTxtNode->SetWordCountDirty(true);
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+ pTextNode->SetWordCountDirty(true);
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
- pTxtNode->SetWordCountDirty(true);
+ pTextNode->SetWordCountDirty(true);
//keep red-lining on but hide changes
m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON);
@@ -760,28 +760,28 @@ void SwDocTest::testSwScanner()
CPPUNIT_ASSERT_MESSAGE("redlines should be invisible", !IDocumentRedlineAccess::IsShowChanges(m_pDoc->getIDocumentRedlineAccess().GetRedlineMode()));
aDocStat.Reset();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //but word-counting the text should only count the non-deleted text
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //but word-counting the text should only count the non-deleted text
CPPUNIT_ASSERT_EQUAL(aDocStat.nWord, static_cast<sal_uLong>(1));
- OUString sLorem = pTxtNode->GetTxt();
+ OUString sLorem = pTextNode->GetText();
CPPUNIT_ASSERT(sLorem == "Lorem");
- const SwRedlineTbl& rTbl = m_pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+ const SwRedlineTable& rTable = m_pDoc->getIDocumentRedlineAccess().GetRedlineTable();
SwNodes& rNds = m_pDoc->GetNodes();
- CPPUNIT_ASSERT(rTbl.size() == 1);
+ CPPUNIT_ASSERT(rTable.size() == 1);
- SwNodeIndex* pNodeIdx = rTbl[0]->GetContentIdx();
+ SwNodeIndex* pNodeIdx = rTable[0]->GetContentIdx();
CPPUNIT_ASSERT(pNodeIdx);
- pTxtNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTxtNode(); //first deleted txtnode
- CPPUNIT_ASSERT(pTxtNode);
+ pTextNode = rNds[ pNodeIdx->GetIndex() + 1 ]->GetTextNode(); //first deleted txtnode
+ CPPUNIT_ASSERT(pTextNode);
- OUString sIpsum = pTxtNode->GetTxt();
+ OUString sIpsum = pTextNode->GetText();
CPPUNIT_ASSERT(sIpsum == " ipsum");
aDocStat.Reset();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len()); //word-counting the text should only count the non-deleted text, and this whole chunk should be ignored
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nWord);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(0), aDocStat.nChar);
@@ -789,18 +789,18 @@ void SwDocTest::testSwScanner()
// redline *added* text though
m_pDoc->getIDocumentRedlineAccess().SetRedlineMode(nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_SHOW_DELETE|nsRedlineMode_t::REDLINE_SHOW_INSERT);
aPaM.DeleteMark();
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), 0);
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), 0);
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, "redline-new-text ");
aDocStat.Reset();
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->SetWordCountDirty(true);
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->SetWordCountDirty(true);
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(2), aDocStat.nWord);
//redline-new-text Lorem ipsum
//+++++++++++++++++ ------
//select start of original text and part of deleted text
aDocStat.Reset();
- pTxtNode->CountWords(aDocStat, 17, 25);
+ pTextNode->CountWords(aDocStat, 17, 25);
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uLong>(5), aDocStat.nChar);
}
@@ -810,73 +810,73 @@ void SwDocTest::testSwScanner()
OUString sTemplate("ThisXis a test.");
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', ' '));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
aDocStat.nCharExcludingSpaces == 12 &&
aDocStat.nChar == 15);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" = ")));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 17);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" _ ")));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 17);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), OUString(" -- ")));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 5 &&
aDocStat.nCharExcludingSpaces == 14 &&
aDocStat.nChar == 18);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '_'));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', '-'));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2012));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2015));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 3 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
@@ -884,19 +884,19 @@ void SwDocTest::testSwScanner()
//But default configuration should, msword-alike treak emdash
//and endash as word separators for word-counting
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2013));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
aDocStat.Reset();
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replace('X', 0x2014));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 15);
@@ -904,10 +904,10 @@ void SwDocTest::testSwScanner()
const sal_Unicode aChunk[] = {' ', 0x2013, ' '};
OUString sChunk(aChunk, SAL_N_ELEMENTS(aChunk));
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, sTemplate.replaceAll(OUString('X'), sChunk));
- pTxtNode = aPaM.GetNode().GetTxtNode();
- pTxtNode->CountWords(aDocStat, 0, pTxtNode->Len());
+ pTextNode = aPaM.GetNode().GetTextNode();
+ pTextNode->CountWords(aDocStat, 0, pTextNode->Len());
CPPUNIT_ASSERT(aDocStat.nWord == 4 &&
aDocStat.nCharExcludingSpaces == 13 &&
aDocStat.nChar == 17);
@@ -921,26 +921,26 @@ void SwDocTest::testMergePortionsDeleteNotSorted()
SwPaM aPaM(aIdx);
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString(" AABBCC"));
- SwCharFmt *const pCharFmt(m_pDoc->MakeCharFmt("foo", 0));
- SwFmtCharFmt const charFmt(pCharFmt);
+ SwCharFormat *const pCharFormat(m_pDoc->MakeCharFormat("foo", 0));
+ SwFormatCharFormat const charFormat(pCharFormat);
- SwFmtINetFmt const inetFmt("http://example.com", "");
+ SwFormatINetFormat const inetFormat("http://example.com", "");
IDocumentContentOperations & rIDCO(m_pDoc->getIDocumentContentOperations());
aPaM.SetMark();
aPaM.GetPoint()->nContent = 2;
aPaM.GetMark()->nContent = 4;
- rIDCO.InsertPoolItem(aPaM, charFmt);
+ rIDCO.InsertPoolItem(aPaM, charFormat);
aPaM.GetPoint()->nContent = 2;
aPaM.GetMark()->nContent = 5;
- rIDCO.InsertPoolItem(aPaM, inetFmt);
+ rIDCO.InsertPoolItem(aPaM, inetFormat);
aPaM.GetPoint()->nContent = 6;
aPaM.GetMark()->nContent = 8;
- rIDCO.InsertPoolItem(aPaM, charFmt);
+ rIDCO.InsertPoolItem(aPaM, charFormat);
aPaM.GetPoint()->nContent = 4;
aPaM.GetMark()->nContent = 6;
// this triggered an STL assert in SwpHints::MergePortions()
- rIDCO.InsertPoolItem(aPaM, charFmt);
+ rIDCO.InsertPoolItem(aPaM, charFormat);
}
//See https://bugs.libreoffice.org/show_bug.cgi?id=40599
@@ -952,34 +952,34 @@ void SwDocTest::testGraphicAnchorDeletion()
SwPaM aPaM(aIdx);
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 1"));
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("graphic anchor>><<graphic anchor"));
SwNodeIndex nPara2 = aPaM.GetPoint()->nNode;
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
aPaM.GetPoint()->nNode = nPara2;
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>>"));
//Insert a graphic at X of >>X<< in paragraph 2
SfxItemSet aFlySet(m_pDoc->GetAttrPool(), RES_FRMATR_BEGIN, RES_FRMATR_END-1);
- SwFmtAnchor aAnchor(FLY_AS_CHAR);
+ SwFormatAnchor aAnchor(FLY_AS_CHAR);
aAnchor.SetAnchor(aPaM.GetPoint());
aFlySet.Put(aAnchor);
- SwFlyFrmFmt *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
+ SwFlyFrameFormat *pFrame = m_pDoc->getIDocumentContentOperations().Insert(aPaM, OUString(), OUString(), NULL, &aFlySet, NULL, NULL);
CPPUNIT_ASSERT_MESSAGE("Expected frame", pFrame != NULL);
CPPUNIT_ASSERT_MESSAGE("Should be 1 graphic", m_pDoc->GetFlyCount(FLYCNTTYPE_GRF) == 1);
//Delete >X<
aPaM.GetPoint()->nNode = nPara2;
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(),
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(),
RTL_CONSTASCII_LENGTH("graphic anchor>><")+1);
aPaM.SetMark();
aPaM.GetPoint()->nNode = nPara2;
- aPaM.GetPoint()->nContent.Assign(aPaM.GetCntntNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetContentNode(), RTL_CONSTASCII_LENGTH("graphic anchor>"));
m_pDoc->getIDocumentContentOperations().DeleteRange(aPaM);
#ifdef DEBUG_AS_HTML
@@ -1143,7 +1143,7 @@ translitTest(SwDoc & rDoc, SwPaM & rPaM, sal_uInt32 const nType)
utl::TransliterationWrapper aTrans(
::comphelper::getProcessComponentContext(), nType);
rDoc.getIDocumentContentOperations().TransliterateText(rPaM, aTrans);
- return rPaM.GetTxt();
+ return rPaM.GetText();
}
void SwDocTest::testTransliterate()
@@ -1154,7 +1154,7 @@ void SwDocTest::testTransliterate()
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("foobar"));
aPaM.SetMark();
aPaM.GetPoint()->nContent = 0;
- CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("foobar"), aPaM.GetText());
CPPUNIT_ASSERT_EQUAL(OUString("FOOBAR"),
translitTest(*m_pDoc, aPaM,
@@ -1223,13 +1223,13 @@ void SwDocTest::testMarkMove()
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
pMarksAccess->makeMark(aPaM, OUString("Para1"), IDocumentMarkAccess::MarkType::BOOKMARK);
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 2"));
aPaM.SetMark();
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
pMarksAccess->makeMark(aPaM, OUString("Para2"), IDocumentMarkAccess::MarkType::BOOKMARK);
- m_pDoc->getIDocumentContentOperations().AppendTxtNode(*aPaM.GetPoint());
+ m_pDoc->getIDocumentContentOperations().AppendTextNode(*aPaM.GetPoint());
m_pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("Paragraph 3"));
aPaM.SetMark();
aPaM.GetMark()->nContent -= aPaM.GetMark()->nContent.GetIndex();
@@ -1239,7 +1239,7 @@ void SwDocTest::testMarkMove()
// join paragraph 2 and 3 and check
{
SwNodeIndex aIdx(m_pDoc->GetNodes().GetEndOfContent(), -2);
- SwTxtNode& rParaNode2 = dynamic_cast<SwTxtNode&>(aIdx.GetNode());
+ SwTextNode& rParaNode2 = dynamic_cast<SwTextNode&>(aIdx.GetNode());
rParaNode2.JoinNext();
}
::sw::mark::IMark* pBM1 = pMarksAccess->findMark("Para1")->get();
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx
index 0126b711d4d3..b1abdec46fd8 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -164,9 +164,9 @@ void Test::testLinkedGraphicRT()
xComponent->dispose();
mxComponent = loadFromDesktop(aTempFile.GetURL(), "com.sun.star.text.TextDocument");
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTxtDoc);
- SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pTextDoc);
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), pDoc);
SwNodes& aNodes = pDoc->GetNodes();
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx b/sw/qa/extras/htmlimport/htmlimport.cxx
index 52a29e2fdb91..973b8304bda1 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -28,10 +28,10 @@ class HtmlImportTest : public SwModelTestBase
DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
// The document contains two pictures stored as a link.
- sfx2::LinkManager& rLinkManager = pTxtDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
+ sfx2::LinkManager& rLinkManager = pTextDoc->GetDocShell()->GetDoc()->GetEditShell()->GetLinkManager();
CPPUNIT_ASSERT_EQUAL(size_t(2), rLinkManager.GetLinks().size());
rLinkManager.Remove(0,2);
CPPUNIT_ASSERT_EQUAL(size_t(0), rLinkManager.GetLinks().size());
@@ -44,11 +44,11 @@ DECLARE_HTMLIMPORT_TEST(testPictureImport, "picture.html")
DECLARE_HTMLIMPORT_TEST(testInlinedImage, "inlined_image.html")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
// The document contains only one embedded picture inlined in img's src attribute.
- SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
SwEditShell* pEditShell = pDoc->GetEditShell();
CPPUNIT_ASSERT(pEditShell);
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index fd9472624c6c..a3bda095bf37 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -304,9 +304,9 @@ private:
xmlTextWriterStartDocument(pXmlWriter, NULL, NULL, NULL);
// create the dump
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
SwRootFrm* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
pLayout->dumpAsXml(pXmlWriter);
@@ -327,9 +327,9 @@ protected:
void calcLayout()
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwDoc* pDoc = pTxtDoc->GetDocShell()->GetDoc();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
pDoc->getIDocumentLayoutAccess().GetCurrentViewShell()->CalcLayout();
}
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 2c9e164bea24..42d2385387a1 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -47,9 +47,9 @@ public:
{
if (mnCurOutputType == text::MailMergeType::SHELL)
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- pTxtDoc->GetDocShell()->DoClose();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument*>(mxMMComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ pTextDoc->GetDocShell()->DoClose();
}
else
mxMMComponent->dispose();
@@ -235,9 +235,9 @@ protected:
int MMTest::documentStartPageNumber( int document ) const
{ // See SwMailMergeOutputPage::documentStartPageNumber() .
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* shell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* shell = pTextDoc->GetDocShell()->GetWrtShell();
IDocumentMarkAccess* marks = shell->GetDoc()->getIDocumentMarkAccess();
// Unfortunately, the pages are marked using UNO bookmarks, which have internals names, so they cannot be referred to by their names.
// Assume that there are no other UNO bookmarks than the ones used by mail merge, and that they are in the sorted order.
@@ -266,9 +266,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testMultiPageAnchoredDraws, "multiple-page-anchored
{
executeMailMerge();
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- sal_uInt16 nPhysPages = pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ sal_uInt16 nPhysPages = pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(8), nPhysPages);
uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier(mxMMComponent, uno::UNO_QUERY);
@@ -303,8 +303,8 @@ DECLARE_FILE_MAILMERGE_TEST(testMissingDefaultLineColor, "missing-default-line-c
uno::Reference<beans::XPropertySet> xPropertySet(xDraws->getByIndex(0), uno::UNO_QUERY);
// Lines do not have a line color.
CPPUNIT_ASSERT( !xPropertySet->getPropertySetInfo()->hasPropertyByName( "LineColor" ));
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
uno::Reference< lang::XMultiServiceFactory > xFact( mxComponent, uno::UNO_QUERY );
uno::Reference< beans::XPropertySet > xDefaults( xFact->createInstance( "com.sun.star.drawing.Defaults" ), uno::UNO_QUERY );
CPPUNIT_ASSERT( xDefaults.is());
@@ -369,9 +369,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
// SwMailMergeOutputPage::documentStartPageNumber() ).
executeMailMerge();
// Here getPages() works on the source document, so get pages of the resulting one.
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ CPPUNIT_ASSERT_EQUAL( sal_uInt16( 19 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 10 pages, but each sub-document starts on odd page number
for( int doc = 0;
doc < 10;
++doc )
@@ -383,9 +383,9 @@ DECLARE_SHELL_MAILMERGE_TEST(testPageBoundariesSimpleMailMerge, "simple-mail-mer
DECLARE_SHELL_MAILMERGE_TEST(testPageBoundaries2Pages, "simple-mail-merge-2pages.odt", "10-testing-addresses.ods", "testing-addresses")
{
executeMailMerge();
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTxtDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxMMComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ CPPUNIT_ASSERT_EQUAL( sal_uInt16( 20 ), pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum()); // 20 pages, each sub-document starts on odd page number
for( int doc = 0;
doc < 10;
++doc )
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 625905da206e..4ed43afa89b4 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -331,9 +331,9 @@ DECLARE_ODFIMPORT_TEST(testFdo56272, "fdo56272.odt")
CPPUNIT_ASSERT_EQUAL(sal_Int32(422), xShape->getPosition().Y); // Was -2371
}
-DECLARE_ODFIMPORT_TEST(testCalcFtnCntnt, "ooo32780-1.odt")
+DECLARE_ODFIMPORT_TEST(testCalcFootnoteContent, "ooo32780-1.odt")
{
- //this was a CalcFtnCntnt crash
+ //this was a CalcFootnoteContent crash
}
DECLARE_ODFIMPORT_TEST(testMoveSubTree, "ooo77837-1.odt")
@@ -431,36 +431,36 @@ DECLARE_ODFIMPORT_TEST(testTdf89802, "tdf89802.fodt")
DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
{
pWrtShell->SelAll(); // Selects A1.
- SwTxtNode& rCellEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rCellEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
// fdo#72486 This was "Hello.", i.e. a single select-all selected the whole document, not just the cell only.
- CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetText());
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
- CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+ CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
// This was "A1", i.e. Ctrl-A only selected the A1 cell of the table, not the whole document.
- CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
{
pWrtShell->SttEndDoc(false); // Go to the end of the doc.
pWrtShell->SelAll(); // And now that we're outside of the table, try Ctrl-A again.
- SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
// This was "Hello", i.e. Ctrl-A did not select the starting table.
- CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
- CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
{
@@ -468,17 +468,17 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
// And make sure the table got deleted as well.
SwNodes& rNodes = pWrtShell->GetDoc()->GetNodes();
SwNodeIndex nNode(rNodes.GetEndOfExtras());
- SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
+ SwContentNode* pContentNode = rNodes.GoNext(&nNode);
// First content node was in a table -> table wasn't deleted.
- CPPUNIT_ASSERT(!pCntntNode->FindTableNode());
+ CPPUNIT_ASSERT(!pContentNode->FindTableNode());
}
}
DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
// Ctrl-A
pWrtShell->SelAll(); // Selects A1.
pWrtShell->SelAll(); // Selects the whole table.
@@ -506,46 +506,46 @@ DECLARE_ODFIMPORT_TEST(testFdo37606Copy, "fdo37606.odt")
DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
{
// The test doc is special in that it starts with a table and it also has a footnote.
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
pWrtShell->SelAll(); // Selects A1.
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
// This was "Footnote.", as Ctrl-A also selected footnotes, but it should not.
- CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
- CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetTxt());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetText());
}
DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
{
// The test doc is special in that it starts with a table and it also has a header.
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
pWrtShell->SelAll(); // Selects A1.
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTxtNode& rStart = dynamic_cast<SwTxtNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
// This was "", as Ctrl-A also selected headers, but it should not.
- CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
- CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetTxt());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
DECLARE_ODFIMPORT_TEST(testSpellmenuRedline, "spellmenu-redline.odt")
{
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- SwWrtShell* pWrtShell = pTxtDoc->GetDocShell()->GetWrtShell();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
OUString aParaText;
uno::Reference<linguistic2::XSpellAlternatives> xAlt;
SwSpellPopup aPopup(pWrtShell, xAlt, aParaText);
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
index 19c079ede5ef..2f45f74bd6d1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx
@@ -79,7 +79,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo68418, "fdo68418.docx")
{
// The problem was that in 'MSWordExportBase::SectionProperties' function in 'wrt8sty.cxx'
// it checked if it 'IsPlausableSingleWordSection'.
- // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrmFmt' objects.
+ // The 'IsPlausableSingleWordSection' compared different aspects of 2 'SwFrameFormat' objects.
// One of the checks was 'do both formats have the same distance from the top and bottom ?'
// This check is correct if both have headers or both don't have headers.
// However - if one has a header, and the other one has an empty header (no header) - it is not correct to compare
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index a7f6078c6f7d..47589f6dafc0 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
@@ -761,7 +761,7 @@ DECLARE_OOXMLEXPORT_TEST(testHeaderBorder, "header-border.docx")
}
}
-DECLARE_OOXMLEXPORT_TEST(testTblpprShape, "tblppr-shape.docx")
+DECLARE_OOXMLEXPORT_TEST(testTablepprShape, "tblppr-shape.docx")
{
// Unhandled exception due to unexpected w:tblpPr resulted in not importing page size, either.
uno::Reference<beans::XPropertySet> xPageStyle(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2014bc870df4..66b844005f03 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1366,7 +1366,7 @@ DECLARE_OOXMLIMPORT_TEST(testTableWidth, "table_width.docx")
CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(xFrames->getByIndex(0), "FrameWidthPercent"));
}
-DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTbllook, "conditionalstyles-tbllook.docx")
+DECLARE_OOXMLIMPORT_TEST(testConditionalstylesTablelook, "conditionalstyles-tbllook.docx")
{
uno::Reference<text::XTextTablesSupplier> xTablesSupplier(mxComponent, uno::UNO_QUERY);
uno::Reference<container::XIndexAccess> xTables(xTablesSupplier->getTextTables(), uno::UNO_QUERY);
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b42f05cd3f56..da6fdb5235ec 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -125,7 +125,7 @@ void SwTiledRenderingTest::testPostKeyEvent()
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
// Did we manage to insert the character after the first one?
- CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTxtNode()->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
}
void SwTiledRenderingTest::testPostMouseEvent()
@@ -155,19 +155,19 @@ void SwTiledRenderingTest::testSetTextSelection()
pWrtShell->SelWrd();
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
// Did we indeed manage to select the second word?
- CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetText());
// Now use setTextSelection() to move the start of the selection 1000 twips left.
Point aStart = pShellCrsr->GetSttPos();
aStart.setX(aStart.getX() - 1000);
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_START, aStart.getX(), aStart.getY());
// The new selection must include the first word, too -- but not the ending dot.
- CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetText());
// Next: test that LOK_SETTEXTSELECTION_RESET + LOK_SETTEXTSELECTION_END can be used to create a selection.
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_RESET, aStart.getX(), aStart.getY());
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aStart.getX() + 1000, aStart.getY());
- CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetText());
}
void SwTiledRenderingTest::testSetGraphicSelection()
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index e8ffdd78b976..43aeb6317661 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -143,18 +143,18 @@ SwDoc* SwUiWriterTest::createDoc(const char* pName)
pName = "empty.odt";
load(DATA_DIRECTORY, pName);
- SwXTextDocument* pTxtDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
- CPPUNIT_ASSERT(pTxtDoc);
- return pTxtDoc->GetDocShell()->GetDoc();
+ SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
+ CPPUNIT_ASSERT(pTextDoc);
+ return pTextDoc->GetDocShell()->GetDoc();
}
//Replacement tests
static void lcl_selectCharacters(SwPaM& rPaM, sal_Int32 first, sal_Int32 end)
{
- rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), first);
+ rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), first);
rPaM.SetMark();
- rPaM.GetPoint()->nContent.Assign(rPaM.GetCntntNode(), end);
+ rPaM.GetPoint()->nContent.Assign(rPaM.GetContentNode(), end);
}
static const OUString ORIGINAL_REPLACE_CONTENT("toto titi tutu");
@@ -171,15 +171,15 @@ void SwUiWriterTest::testReplaceForward()
pDoc->getIDocumentContentOperations().InsertString(aPaM, ORIGINAL_REPLACE_CONTENT);
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
lcl_selectCharacters(aPaM, 5, 9);
pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
- CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
rUndoManager.Undo();
- CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
}
void SwUiWriterTest::testFdo75110()
@@ -220,16 +220,16 @@ void SwUiWriterTest::testReplaceBackward()
SwPaM aPaM(aIdx);
pDoc->getIDocumentContentOperations().InsertString(aPaM, OUString("toto titi tutu"));
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
lcl_selectCharacters(aPaM, 9, 5);
pDoc->getIDocumentContentOperations().ReplaceRange(aPaM, OUString("toto"), false);
- CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTxtNode->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(EXPECTED_REPLACE_CONTENT, pTextNode->GetText());
rUndoManager.Undo();
- CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTxtNode->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(ORIGINAL_REPLACE_CONTENT, pTextNode->GetText());
}
void SwUiWriterTest::testFdo69893()
@@ -241,9 +241,9 @@ void SwUiWriterTest::testFdo69893()
pWrtShell->SelAll(); // Selects the whole document.
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
- SwTxtNode& rEnd = dynamic_cast<SwTxtNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
// Selection did not include the para after table, this was "B1".
- CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetText());
}
void SwUiWriterTest::testFdo70807()
@@ -292,8 +292,8 @@ void SwUiWriterTest::testImportRTF()
CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
- CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTxtNode()->GetTxt());
- CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTxtNode()->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTextNode()->GetText());
}
void SwUiWriterTest::testExportRTF()
@@ -339,13 +339,13 @@ void SwUiWriterTest::testFdo74981()
// create a document with an input field
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
+ SwInputField aField(static_cast<SwInputFieldType*>(pWrtShell->GetFieldType(0, RES_INPUTFLD)), OUString("foo"), OUString("bar"), 0, 0);
pWrtShell->Insert(aField);
// expect hints
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
- SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
- CPPUNIT_ASSERT(pTxtNode->HasHints());
+ SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+ CPPUNIT_ASSERT(pTextNode->HasHints());
// go to the begin of the paragraph and split this node
pWrtShell->Left(CRSR_SKIP_CHARS, false, 100, false);
@@ -353,11 +353,11 @@ void SwUiWriterTest::testFdo74981()
// expect only the second paragraph to have hints
aIdx = SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1);
- pTxtNode = aIdx.GetNode().GetTxtNode();
- CPPUNIT_ASSERT(pTxtNode->HasHints());
+ pTextNode = aIdx.GetNode().GetTextNode();
+ CPPUNIT_ASSERT(pTextNode->HasHints());
--aIdx;
- pTxtNode = aIdx.GetNode().GetTxtNode();
- CPPUNIT_ASSERT(!pTxtNode->HasHints());
+ pTextNode = aIdx.GetNode().GetTextNode();
+ CPPUNIT_ASSERT(!pTextNode->HasHints());
}
void SwUiWriterTest::testShapeTextboxSelect()
@@ -368,14 +368,14 @@ void SwUiWriterTest::testShapeTextboxSelect()
SdrObject* pObject = pPage->GetObj(1);
SwContact* pTextBox = static_cast<SwContact*>(pObject->GetUserCall());
// First, make sure that pTextBox is a fly frame (textbox of a shape).
- CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFmt()->Which()));
+ CPPUNIT_ASSERT_EQUAL(RES_FLYFRMFMT, static_cast<RES_FMT>(pTextBox->GetFormat()->Which()));
// Then select it.
pWrtShell->SelectObj(Point(), 0, pObject);
const SdrMarkList& rMarkList = pWrtShell->GetDrawView()->GetMarkedObjectList();
SwDrawContact* pShape = static_cast<SwDrawContact*>(rMarkList.GetMark(0)->GetMarkedSdrObj()->GetUserCall());
// And finally make sure the shape got selected, not just the textbox itself.
- CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFmt()->Which()));
+ CPPUNIT_ASSERT_EQUAL(RES_DRAWFRMFMT, static_cast<RES_FMT>(pShape->GetFormat()->Which()));
}
void SwUiWriterTest::testShapeTextboxDelete()
@@ -400,22 +400,22 @@ void SwUiWriterTest::testCp1000071()
SwDoc* pDoc = createDoc("cp1000071.odt");
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- const SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
- CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
- sal_uLong redlineStart0NodeIndex = rTbl[ 0 ]->Start()->nNode.GetIndex();
- sal_Int32 redlineStart0Index = rTbl[ 0 ]->Start()->nContent.GetIndex();
- sal_uLong redlineEnd0NodeIndex = rTbl[ 0 ]->End()->nNode.GetIndex();
- sal_Int32 redlineEnd0Index = rTbl[ 0 ]->End()->nContent.GetIndex();
- sal_uLong redlineStart1NodeIndex = rTbl[ 1 ]->Start()->nNode.GetIndex();
- sal_Int32 redlineStart1Index = rTbl[ 1 ]->Start()->nContent.GetIndex();
- sal_uLong redlineEnd1NodeIndex = rTbl[ 1 ]->End()->nNode.GetIndex();
- sal_Int32 redlineEnd1Index = rTbl[ 1 ]->End()->nContent.GetIndex();
+ const SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+ CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+ sal_uLong redlineStart0NodeIndex = rTable[ 0 ]->Start()->nNode.GetIndex();
+ sal_Int32 redlineStart0Index = rTable[ 0 ]->Start()->nContent.GetIndex();
+ sal_uLong redlineEnd0NodeIndex = rTable[ 0 ]->End()->nNode.GetIndex();
+ sal_Int32 redlineEnd0Index = rTable[ 0 ]->End()->nContent.GetIndex();
+ sal_uLong redlineStart1NodeIndex = rTable[ 1 ]->Start()->nNode.GetIndex();
+ sal_Int32 redlineStart1Index = rTable[ 1 ]->Start()->nContent.GetIndex();
+ sal_uLong redlineEnd1NodeIndex = rTable[ 1 ]->End()->nNode.GetIndex();
+ sal_Int32 redlineEnd1Index = rTable[ 1 ]->End()->nContent.GetIndex();
// Change the document layout to be 2 columns, and then undo.
pWrtShell->SelAll();
SwSectionData section(CONTENT_SECTION, pWrtShell->GetUniqueSectionName());
SfxItemSet set( pDoc->GetDocShell()->GetPool(), RES_COL, RES_COL, 0 );
- SwFmtCol col;
+ SwFormatCol col;
col.Init( 2, 0, 10000 );
set.Put( col );
pWrtShell->InsertSection( section, &set );
@@ -423,15 +423,15 @@ void SwUiWriterTest::testCp1000071()
rUndoManager.Undo();
// Check that redlines are the same like at the beginning.
- CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTbl.size());
- CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTbl[ 0 ]->Start()->nNode.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTbl[ 0 ]->Start()->nContent.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTbl[ 0 ]->End()->nNode.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTbl[ 0 ]->End()->nContent.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTbl[ 1 ]->Start()->nNode.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTbl[ 1 ]->Start()->nContent.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTbl[ 1 ]->End()->nNode.GetIndex());
- CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTbl[ 1 ]->End()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( size_t( 2 ), rTable.size());
+ CPPUNIT_ASSERT_EQUAL( redlineStart0NodeIndex, rTable[ 0 ]->Start()->nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineStart0Index, rTable[ 0 ]->Start()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineEnd0NodeIndex, rTable[ 0 ]->End()->nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineEnd0Index, rTable[ 0 ]->End()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineStart1NodeIndex, rTable[ 1 ]->Start()->nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineStart1Index, rTable[ 1 ]->Start()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineEnd1NodeIndex, rTable[ 1 ]->End()->nNode.GetIndex());
+ CPPUNIT_ASSERT_EQUAL( redlineEnd1Index, rTable[ 1 ]->End()->nContent.GetIndex());
}
void SwUiWriterTest::testShapeTextboxVertadjust()
@@ -439,9 +439,9 @@ void SwUiWriterTest::testShapeTextboxVertadjust()
SwDoc* pDoc = createDoc("shape-textbox-vertadjust.odt");
SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
SdrObject* pObject = pPage->GetObj(1);
- SwFrmFmt* pFmt = static_cast<SwContact*>(pObject->GetUserCall())->GetFmt();
+ SwFrameFormat* pFormat = static_cast<SwContact*>(pObject->GetUserCall())->GetFormat();
// This was SDRTEXTVERTADJUST_TOP.
- CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFmt->GetTextVertAdjust().GetValue());
+ CPPUNIT_ASSERT_EQUAL(SDRTEXTVERTADJUST_CENTER, pFormat->GetTextVertAdjust().GetValue());
}
void SwUiWriterTest::testShapeTextboxAutosize()
@@ -464,7 +464,7 @@ void SwUiWriterTest::testFdo82191()
{
SwDoc* pDoc = createDoc("fdo82191.odt");
SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
- std::set<const SwFrmFmt*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
+ std::set<const SwFrameFormat*> aTextBoxes = SwTextBoxHelper::findTextBoxes(pDoc);
// Make sure we have a single draw shape.
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), SwTextBoxHelper::getCount(pPage, aTextBoxes));
@@ -531,8 +531,8 @@ void SwUiWriterTest::testChineseConversionBlank()
// Then
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
- CPPUNIT_ASSERT_EQUAL(OUString(), pTxtNode->GetTxt());
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ CPPUNIT_ASSERT_EQUAL(OUString(), pTextNode->GetText());
}
@@ -557,8 +557,8 @@ void SwUiWriterTest::testChineseConversionNonChineseText()
// Then
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
- CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTxtNode->GetTxt());
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ CPPUNIT_ASSERT_EQUAL(NON_CHINESE_CONTENT, pTextNode->GetText());
}
@@ -583,8 +583,8 @@ void SwUiWriterTest::testChineseConversionTraditionalToSimplified()
// Then
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
- CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTxtNode->GetTxt());
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ CPPUNIT_ASSERT_EQUAL(CHINESE_SIMPLIFIED_CONTENT, pTextNode->GetText());
}
@@ -609,8 +609,8 @@ void SwUiWriterTest::testChineseConversionSimplifiedToTraditional()
// Then
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
- CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTxtNode->GetTxt());
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ CPPUNIT_ASSERT_EQUAL(CHINESE_TRADITIONAL_CONTENT, pTextNode->GetText());
}
@@ -648,7 +648,7 @@ void SwUiWriterTest::testAutoCorr()
pWrtShell->Insert("tset");
pWrtShell->AutoCorrect(corr, cIns);
sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
- CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTxtNode*>(pDoc->GetNodes()[nIndex])->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex])->GetText());
//AutoCorrect with change style to bolt
pWrtShell->Insert("Bolt");
@@ -830,8 +830,8 @@ void SwUiWriterTest::testTdf68183()
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
SwPaM aPaM(aIdx);
- SwTxtNode* pTxtNode = aPaM.GetNode().GetTxtNode();
- CPPUNIT_ASSERT_EQUAL(false, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+ SwTextNode* pTextNode = aPaM.GetNode().GetTextNode();
+ CPPUNIT_ASSERT_EQUAL(false, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
// Then enable storing of RSID and make sure that the attribute is inserted.
SW_MOD()->GetModuleConfig()->SetStoreRsid(true);
@@ -839,7 +839,7 @@ void SwUiWriterTest::testTdf68183()
pWrtShell->DelToStartOfLine();
pWrtShell->Insert2("X");
- CPPUNIT_ASSERT_EQUAL(true, pTxtNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
+ CPPUNIT_ASSERT_EQUAL(true, pTextNode->GetSwAttrSet().HasItem(RES_PARATR_RSID));
}
void SwUiWriterTest::testCp1000115()
@@ -888,14 +888,14 @@ void SwUiWriterTest::testSearchWithTransliterate()
//transliteration option set so that at least one of the search strings is not found
sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
- CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
CPPUNIT_ASSERT_EQUAL(0,(int)case1);
SearchOpt.searchString = "paragraph";
SearchOpt.transliterateFlags = com::sun::star::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
//transliteration option set so that all search strings are found
sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END,FND_IN_BODY,false);
pShellCrsr = pWrtShell->getShellCrsr(true);
- CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText());
CPPUNIT_ASSERT_EQUAL(1,(int)case2);
}
@@ -933,13 +933,13 @@ void SwUiWriterTest::testUndoCharAttribute()
pCrsr->Move(fnMoveBackward);
}
// Check that correct text was selected
- CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetTxt());
+ CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetText());
// Apply a "Bold" attribute to selection
SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
SfxItemSet aSet( pDoc->GetAttrPool(), RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT);
// Adds selected text's attributes to aSet
- pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+ pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
SfxPoolItem const * aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
SfxPoolItem& ampPoolItem = aWeightItem;
// Check that bold is active on the selection; checks if it's in aSet
@@ -948,7 +948,7 @@ void SwUiWriterTest::testUndoCharAttribute()
rUndoManager.Undo();
// Check that bold is no longer active
aSet.ClearItem(RES_CHRATR_WEIGHT);
- pCrsr->GetNode().GetTxtNode()->GetAttr(aSet, 10, 19);
+ pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
aPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
CPPUNIT_ASSERT_EQUAL((*aPoolItem == ampPoolItem), false);
}
@@ -957,8 +957,8 @@ void SwUiWriterTest::testTdf86639()
{
SwDoc* pDoc = createDoc("tdf86639.rtf");
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwTxtFmtColl* pColl = pDoc->FindTxtFmtCollByName("Heading");
- pWrtShell->SetTxtFmtColl(pColl);
+ SwTextFormatColl* pColl = pDoc->FindTextFormatCollByName("Heading");
+ pWrtShell->SetTextFormatColl(pColl);
OUString aExpected = pColl->GetAttrSet().GetFont().GetFamilyName();
// This was Calibri, should be Liberation Sans.
CPPUNIT_ASSERT_EQUAL(aExpected, getProperty<OUString>(getRun(getParagraph(1), 1), "CharFontName"));
@@ -970,7 +970,7 @@ void SwUiWriterTest::testTdf90883TableBoxGetCoordinates()
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
pWrtShell->Down(true);
SwSelBoxes aBoxes;
- ::GetTblSel( *pWrtShell, aBoxes );
+ ::GetTableSel( *pWrtShell, aBoxes );
CPPUNIT_ASSERT_EQUAL( 2, (int)aBoxes.size() );
Point pos ( aBoxes[0]->GetCoordinates() );
CPPUNIT_ASSERT_EQUAL( 1, (int)pos.X() );
diff --git a/sw/qa/python/check_table.py b/sw/qa/python/check_table.py
index 95db0b4281b4..f31ac913105b 100644
--- a/sw/qa/python/check_table.py
+++ b/sw/qa/python/check_table.py
@@ -246,7 +246,7 @@ class CheckTable(unittest.TestCase):
xAnchor = xTable.getAnchor()
# check all properties on the anchor - shouldn't crash despite
- # pointing to a non-SwTxtNode
+ # pointing to a non-SwTextNode
xPropsInfo = xAnchor.getPropertySetInfo()
for i in xPropsInfo.getProperties():
try:
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 9e3189f8653a..6080438fcd1d 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -55,7 +55,7 @@ interface BaseText
SID_ATTR_BRUSH_CHAR // status()
[
ExecMethod = Execute ;
- StateMethod = GetTxtCtrlState ;
+ StateMethod = GetTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
@@ -1180,26 +1180,26 @@ interface BaseText
]
SID_ATTR_PARA_SPLIT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_PARA_KEEP // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_PARA_WIDOWS // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_PARA_ORPHANS // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_PARA_PAGEBREAK // status(final|play)
@@ -1271,49 +1271,49 @@ interface BaseText
]
SID_ATTR_PARA_HYPHENZONE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_RELIEF
[
- ExecMethod = ExecTxtCtrl ;
+ ExecMethod = ExecTextCtrl ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_FONT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CJK_FONT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CTL_FONT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_FONTHEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CJK_FONTHEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CTL_FONTHEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtFontCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextFontCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_COLOR_BACKGROUND // status()
@@ -1342,68 +1342,68 @@ interface BaseText
]
SID_ATTR_CHAR_COLOR // status(final|play)
[
- ExecMethod = ExecTxtCtrl ;
- StateMethod = GetTxtCtrlState ;
+ ExecMethod = ExecTextCtrl ;
+ StateMethod = GetTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_WEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CJK_WEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CTL_WEIGHT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_POSTURE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CJK_POSTURE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CTL_POSTURE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_UNDERLINE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_OVERLINE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_FLASH // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_STRIKEOUT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_UNDERLINE_DOUBLE // status(final|play)
@@ -1414,26 +1414,26 @@ interface BaseText
]
SID_ATTR_CHAR_CONTOUR // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_SHADOWED // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_AUTOKERN // // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_SET_SUPER_SCRIPT
@@ -1450,20 +1450,20 @@ interface BaseText
]
SID_ATTR_CHAR_CASEMAP // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_LANGUAGE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;;
- StateMethod = GetTxtFontCtrlState;
+ ExecMethod = ExecTextCtrl;;
+ StateMethod = GetTextFontCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_KERNING // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_CHAR_DLG // status(final|play)
@@ -1484,8 +1484,8 @@ interface BaseText
]
SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
[
- ExecMethod = ExecTxtCtrl;
- StateMethod = GetTxtCtrlState ;
+ ExecMethod = ExecTextCtrl;
+ StateMethod = GetTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_GROW_FONT_SIZE // status(final|play)
diff --git a/sw/sdi/drwtxtsh.sdi b/sw/sdi/drwtxtsh.sdi
index 53ed9110ef09..4bdcea5e7135 100644
--- a/sw/sdi/drwtxtsh.sdi
+++ b/sw/sdi/drwtxtsh.sdi
@@ -159,49 +159,49 @@ interface TextDrawText
SID_ATTR_CHAR_WEIGHT // api:
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_POSTURE // api:
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_UNDERLINE // api:
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_OVERLINE // api:
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_CONTOUR
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_SHADOWED
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_STRIKEOUT
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
@@ -473,7 +473,7 @@ interface TextDrawText
SID_AUTOSPELL_CHECK
[
ExecMethod = Execute;
- StateMethod = GetDrawTxtCtrlState
+ StateMethod = GetDrawTextCtrlState
]
SID_SEARCH_DLG
@@ -622,13 +622,13 @@ interface TextDrawText
FN_GROW_FONT_SIZE
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
FN_SHRINK_FONT_SIZE
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
}
@@ -639,57 +639,57 @@ interface TextDrawFont
SID_ATTR_CHAR_FONT // status()
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_FONTHEIGHT // status()
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_COLOR // api:
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_WORDLINEMODE // status(final|play)
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_RELIEF
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_LANGUAGE // status(final|play)
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_KERNING // status(final|play)
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_AUTOKERN // // status(final|play)
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
SID_ATTR_CHAR_ESCAPEMENT // status(final|play)
[
ExecMethod = Execute ;
- StateMethod = GetDrawTxtCtrlState ;
+ StateMethod = GetDrawTextCtrlState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
diff --git a/sw/sdi/switems.sdi b/sw/sdi/switems.sdi
index c00514fbc736..e0dd9ee1b259 100644
--- a/sw/sdi/switems.sdi
+++ b/sw/sdi/switems.sdi
@@ -24,9 +24,9 @@ struct SwLineNumber
BOOL CountLines MID_LINENUMBER_COUNT;
INT32 StartValue MID_LINENUMBER_STARTVALUE;
};
-item SwLineNumber SwFmtLineNumber;
+item SwLineNumber SwFormatLineNumber;
-struct INetFmt
+struct INetFormat
{
String URL MID_URL_URL;
String Target MID_URL_TARGET;
@@ -34,7 +34,7 @@ struct INetFmt
String VisitedFormat MID_URL_VISITED_FMT;
String UnvisitedFormat MID_URL_UNVISITED_FMT;
};
-item INetFmt SwFmtINetFmt;
+item INetFormat SwFormatINetFormat;
struct Drop
{
@@ -44,7 +44,7 @@ struct Drop
BOOL WholeWord MID_DROPCAP_WHOLE_WORD;
// String Style MID_DROPCAP_CHAR_STYLE_NAME;
};
-item Drop SwFmtDrop;
+item Drop SwFormatDrop;
struct Envelope
{
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c7d9dfdda9e3..76987c789f3b 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -1846,7 +1846,7 @@ SfxVoidItem FormatColumns FN_FORMAT_COLUMN
GroupId = GID_FORMAT;
]
-SwFmtDrop FormatDropcap FN_FORMAT_DROPCAPS
+SwFormatDrop FormatDropcap FN_FORMAT_DROPCAPS
[
/* flags: */
@@ -8785,7 +8785,7 @@ SfxUInt16Item NumNewStartAt FN_NUMBER_NEWSTART_AT
GroupId = GID_FORMAT;
]
-SwFmtLineNumber LineNumber FN_FORMAT_LINENUMBER
+SwFormatLineNumber LineNumber FN_FORMAT_LINENUMBER
[
/* flags: */
@@ -8887,7 +8887,7 @@ SfxVoidItem JumpToFootnoteArea FN_TO_FOOTNOTE_AREA
GroupId = GID_NAVIGATOR;
]
-SwFmtINetFmt HyperlinkAttributes FN_TXTATR_INET
+SwFormatINetFormat HyperlinkAttributes FN_TXTATR_INET
[
/* flags: */
diff --git a/sw/sdi/tabsh.sdi b/sw/sdi/tabsh.sdi
index f2f635e6d643..4df069ef3087 100644
--- a/sw/sdi/tabsh.sdi
+++ b/sw/sdi/tabsh.sdi
@@ -33,13 +33,13 @@ interface TextTable : BaseTextTable
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
/*
- SvxFmtSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
+ SvxFormatSplitItem TableSplit SID_ATTR_PARA_SPLIT // status(final|play)
[
ExecMethod = Execute;
StateMethod = GetState;
GroupId = GID_TABLE ;
]
- SvxFmtKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
+ SvxFormatKeepItem TableKeepTogether SID_ATTR_PARA_KEEP // status(final|play)
[
ExecMethod = Execute;
StateMethod = GetState;
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index a8821bbbec2d..ff59bddf23f8 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -25,16 +25,16 @@
#include <IDocumentListItems.hxx>
#include <doc.hxx>
-SwNodeNum::SwNodeNum( SwTxtNode* pTxtNode )
+SwNodeNum::SwNodeNum( SwTextNode* pTextNode )
: SwNumberTreeNode(),
- mpTxtNode( pTxtNode ),
+ mpTextNode( pTextNode ),
mpNumRule( 0 )
{
}
SwNodeNum::SwNodeNum( SwNumRule* pNumRule )
: SwNumberTreeNode(),
- mpTxtNode( 0 ),
+ mpTextNode( 0 ),
mpNumRule( pNumRule )
{
}
@@ -47,26 +47,26 @@ SwNodeNum::~SwNodeNum()
void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
{
- OSL_ENSURE( GetNumRule() && GetTxtNode(),
+ OSL_ENSURE( GetNumRule() && GetTextNode(),
"<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
- if ( GetNumRule() && GetTxtNode() )
+ if ( GetNumRule() && GetTextNode() )
{
- GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+ GetNumRule()->RemoveTextNode( *(GetTextNode()) );
}
mpNumRule = &rNumRule;
- if ( GetNumRule() && GetTxtNode() )
+ if ( GetNumRule() && GetTextNode() )
{
- GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+ GetNumRule()->AddTextNode( *(GetTextNode()) );
}
}
SwPosition SwNodeNum::GetPosition() const
{
- OSL_ENSURE( GetTxtNode(),
+ OSL_ENSURE( GetTextNode(),
"<SwNodeNum::GetPosition()> - no text node set at <SwNodeNum> instance" );
- return SwPosition(*mpTxtNode);
+ return SwPosition(*mpTextNode);
}
SwNumberTreeNode * SwNodeNum::Create() const
@@ -78,45 +78,45 @@ SwNumberTreeNode * SwNodeNum::Create() const
void SwNodeNum::PreAdd()
{
- OSL_ENSURE( GetTxtNode(),
+ OSL_ENSURE( GetTextNode(),
"<SwNodeNum::PreAdd()> - no text node set at <SwNodeNum> instance" );
- if ( !GetNumRule() && GetTxtNode() )
+ if ( !GetNumRule() && GetTextNode() )
{
- mpNumRule = GetTxtNode()->GetNumRule();
+ mpNumRule = GetTextNode()->GetNumRule();
}
OSL_ENSURE( GetNumRule(),
"<SwNodeNum::PreAdd()> - no list style set at <SwNodeNum> instance" );
- if ( GetNumRule() && GetTxtNode() )
+ if ( GetNumRule() && GetTextNode() )
{
- GetNumRule()->AddTxtNode( *(GetTxtNode()) );
+ GetNumRule()->AddTextNode( *(GetTextNode()) );
}
{
- if ( GetTxtNode() &&
- GetTxtNode()->GetNodes().IsDocNodes() )
+ if ( GetTextNode() &&
+ GetTextNode()->GetNodes().IsDocNodes() )
{
- GetTxtNode()->getIDocumentListItems().addListItem( *this );
+ GetTextNode()->getIDocumentListItems().addListItem( *this );
}
}
}
void SwNodeNum::PostRemove()
{
- OSL_ENSURE( GetTxtNode(),
+ OSL_ENSURE( GetTextNode(),
"<SwNodeNum::PostRemove()> - no text node set at <SwNodeNum> instance" );
OSL_ENSURE( GetNumRule(),
"<SwNodeNum::PostRemove()> - no list style set at <SwNodeNum> instance" );
- if ( GetTxtNode() )
+ if ( GetTextNode() )
{
- GetTxtNode()->getIDocumentListItems().removeListItem( *this );
+ GetTextNode()->getIDocumentListItems().removeListItem( *this );
}
if ( GetNumRule() )
{
- if ( GetTxtNode() )
+ if ( GetTextNode() )
{
- GetNumRule()->RemoveTxtNode( *(GetTxtNode()) );
+ GetNumRule()->RemoveTextNode( *(GetTextNode()) );
}
mpNumRule = 0;
}
@@ -126,8 +126,8 @@ bool SwNodeNum::IsNotifiable() const
{
bool aResult = true;
- if ( GetTxtNode() )
- aResult = GetTxtNode()->IsNotifiable();
+ if ( GetTextNode() )
+ aResult = GetTextNode()->IsNotifiable();
return aResult;
}
@@ -136,8 +136,8 @@ bool SwNodeNum::IsNotificationEnabled() const
{
bool aResult = true;
- if ( GetTxtNode() )
- aResult = GetTxtNode()->IsNotificationEnabled();
+ if ( GetTextNode() )
+ aResult = GetTextNode()->IsNotificationEnabled();
return aResult;
}
@@ -167,11 +167,11 @@ bool SwNodeNum::IsCounted() const
{
bool aResult = false;
- if ( GetTxtNode() )
+ if ( GetTextNode() )
{
// #i59559#
- // <SwTxtNode::IsCounted()> determines, if a text node is counted for numbering
- aResult = GetTxtNode()->IsCountedInList();
+ // <SwTextNode::IsCounted()> determines, if a text node is counted for numbering
+ aResult = GetTextNode()->IsCountedInList();
}
else
aResult = SwNumberTreeNode::IsCounted();
@@ -208,18 +208,18 @@ bool SwNodeNum::IsCountedForNumbering() const
{
return IsCounted() &&
( IsPhantom() || // phantoms
- !GetTxtNode() || // root node
- GetTxtNode()->HasNumber() || // text node
- GetTxtNode()->HasBullet() ); // text node
+ !GetTextNode() || // root node
+ GetTextNode()->HasNumber() || // text node
+ GetTextNode()->HasBullet() ); // text node
}
void SwNodeNum::NotifyNode()
{
ValidateMe();
- if (mpTxtNode)
+ if (mpTextNode)
{
- mpTxtNode->NumRuleChgd();
+ mpTextNode->NumRuleChgd();
}
}
@@ -228,13 +228,13 @@ bool SwNodeNum::LessThan(const SwNumberTreeNode & rNode) const
bool bResult = false;
const SwNodeNum & rTmpNode = static_cast<const SwNodeNum &>(rNode);
- if (mpTxtNode == NULL && rTmpNode.mpTxtNode != NULL)
+ if (mpTextNode == NULL && rTmpNode.mpTextNode != NULL)
bResult = true;
- else if (mpTxtNode != NULL && rTmpNode.mpTxtNode != NULL)
+ else if (mpTextNode != NULL && rTmpNode.mpTextNode != NULL)
{
// #i83479# - refactoring
// simplify comparison by comparing the indexes of the text nodes
- bResult = ( mpTxtNode->GetIndex() < rTmpNode.mpTxtNode->GetIndex() );
+ bResult = ( mpTextNode->GetIndex() < rTmpNode.mpTextNode->GetIndex() );
}
return bResult;
@@ -244,9 +244,9 @@ bool SwNodeNum::IsRestart() const
{
bool bIsRestart = false;
- if ( GetTxtNode() )
+ if ( GetTextNode() )
{
- bIsRestart = GetTxtNode()->IsListRestart();
+ bIsRestart = GetTextNode()->IsListRestart();
}
return bIsRestart;
@@ -273,9 +273,9 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
{
SwNumberTree::tSwNumTreeNumber aResult = 1;
- if ( IsRestart() && GetTxtNode() )
+ if ( IsRestart() && GetTextNode() )
{
- aResult = GetTxtNode()->GetActualListStartValue();
+ aResult = GetTextNode()->GetActualListStartValue();
}
else
{
@@ -287,10 +287,10 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const
if (nLevel >= 0 && nLevel < MAXLEVEL)
{
- const SwNumFmt * pFmt = pRule->GetNumFmt( static_cast<sal_uInt16>(nLevel));
+ const SwNumFormat * pFormat = pRule->GetNumFormat( static_cast<sal_uInt16>(nLevel));
- if (pFmt)
- aResult = pFmt->GetStart();
+ if (pFormat)
+ aResult = pFormat->GetStart();
}
}
}
@@ -343,10 +343,10 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
if ( !bIsPhantom )
{
- SwTxtNode* pTxtNode( rNodeNum.GetTxtNode() );
- if ( pTxtNode )
+ SwTextNode* pTextNode( rNodeNum.GetTextNode() );
+ if ( pTextNode )
{
- pTxtNode->RemoveFromList();
+ pTextNode->RemoveFromList();
// --> clear all list attributes and the list style
std::set<sal_uInt16> aResetAttrsArray;
aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ID );
@@ -355,8 +355,8 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_RESTARTVALUE );
aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_LIST_ISCOUNTED );
aResetAttrsArray.insert( aResetAttrsArray.end(), RES_PARATR_NUMRULE );
- SwPaM aPam( *pTxtNode );
- pTxtNode->GetDoc()->ResetAttrs( aPam, false,
+ SwPaM aPam( *pTextNode );
+ pTextNode->GetDoc()->ResetAttrs( aPam, false,
aResetAttrsArray,
false );
}
@@ -364,17 +364,17 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
}
// #i81002#
-const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTxtNode& rTxtNode ) const
+const SwNodeNum* SwNodeNum::GetPrecedingNodeNumOf( const SwTextNode& rTextNode ) const
{
const SwNodeNum* pPrecedingNodeNum( 0 );
// #i83479#
- SwNodeNum aNodeNumForTxtNode( const_cast<SwTxtNode*>(&rTxtNode) );
+ SwNodeNum aNodeNumForTextNode( const_cast<SwTextNode*>(&rTextNode) );
pPrecedingNodeNum = dynamic_cast<const SwNodeNum*>(
GetRoot()
- ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTxtNode )
- : GetPrecedingNodeOf( aNodeNumForTxtNode ) );
+ ? GetRoot()->GetPrecedingNodeOf( aNodeNumForTextNode )
+ : GetPrecedingNodeOf( aNodeNumForTextNode ) );
return pPrecedingNodeNum;
}
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index b52f9a476eef..4bab7aca9f32 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -337,13 +337,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
// XAccessibleValue
-SwFrmFmt* SwAccessibleCell::GetTblBoxFormat() const
+SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
{
assert(GetFrm());
assert(GetFrm()->IsCellFrm());
const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
- return pCellFrm->GetTabBox()->GetFrmFmt();
+ return pCellFrm->GetTabBox()->GetFrameFormat();
}
//Implement TableCell currentValue
@@ -354,7 +354,7 @@ uno::Any SwAccessibleCell::getCurrentValue( )
CHECK_FOR_DEFUNC( XAccessibleValue );
uno::Any aAny;
- aAny <<= GetTblBoxFormat()->GetTblBoxValue().GetValue();
+ aAny <<= GetTableBoxFormat()->GetTableBoxValue().GetValue();
return aAny;
}
@@ -368,8 +368,8 @@ sal_Bool SwAccessibleCell::setCurrentValue( const uno::Any& aNumber )
bool bValid = (aNumber >>= fValue);
if( bValid )
{
- SwTblBoxValue aValue( fValue );
- GetTblBoxFormat()->SetFmtAttr( aValue );
+ SwTableBoxValue aValue( fValue );
+ GetTableBoxFormat()->SetFormatAttr( aValue );
}
return bValid;
}
@@ -418,10 +418,10 @@ static OUString ReplaceFourChar(const OUString& oldOUString)
SolarMutexGuard g;
::com::sun::star::uno::Any strRet;
- SwFrmFmt *pFrmFmt = GetTblBoxFormat();
- assert(pFrmFmt);
+ SwFrameFormat *pFrameFormat = GetTableBoxFormat();
+ assert(pFrameFormat);
- const SwTblBoxFormula& tbl_formula = pFrmFmt->GetTblBoxFormula();
+ const SwTableBoxFormula& tbl_formula = pFrameFormat->GetTableBoxFormula();
OUString strFormula = ReplaceFourChar(tbl_formula.GetFormula());
OUString strFor("Formula:");
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 1a9991ff7e1a..5049b560b5d2 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -26,7 +26,7 @@
class SwCellFrm;
class SwAccessibleTable;
-class SwFrmFmt;
+class SwFrameFormat;
class SwAccessibleCell : public SwAccessibleContext,
::com::sun::star::accessibility::XAccessibleValue,
@@ -113,7 +113,7 @@ public:
::com::sun::star::uno::Any SAL_CALL getExtendedAttributes()
throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE ;
private:
- SwFrmFmt* GetTblBoxFormat() const;
+ SwFrameFormat* GetTableBoxFormat() const;
public:
virtual ::com::sun::star::uno::Any SAL_CALL getCurrentValue( )
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 30b19f62f059..09e5372440cb 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -920,22 +920,22 @@ void SAL_CALL SwAccessibleContext::grabFocus()
}
else
{
- const SwCntntFrm *pCFrm = 0;
- if( GetFrm()->IsCntntFrm() )
- pCFrm = static_cast< const SwCntntFrm * >( GetFrm() );
+ const SwContentFrm *pCFrm = 0;
+ if( GetFrm()->IsContentFrm() )
+ pCFrm = static_cast< const SwContentFrm * >( GetFrm() );
else if( GetFrm()->IsLayoutFrm() )
- pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsCntnt();
+ pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent();
- if( pCFrm && pCFrm->IsTxtFrm() )
+ if( pCFrm && pCFrm->IsTextFrm() )
{
- const SwTxtFrm *pTxtFrm = static_cast< const SwTxtFrm * >( pCFrm );
- const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
- if( pTxtNd )
+ const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm );
+ const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+ if( pTextNd )
{
// create pam for selection
- SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
- pTxtFrm->GetOfst() );
- SwPosition aStartPos( *pTxtNd, aIndex );
+ SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+ pTextFrm->GetOfst() );
+ SwPosition aStartPos( *pTextNd, aIndex );
SwPaM aPaM( aStartPos );
// set PaM at cursor shell
@@ -1425,7 +1425,7 @@ bool SwAccessibleContext::HasAdditionalAccessibleChildren()
{
bool bRet( false );
- if ( GetFrm()->IsTxtFrm() )
+ if ( GetFrm()->IsTextFrm() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1442,7 +1442,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
{
vcl::Window* pAdditionalAccessibleChild( 0 );
- if ( GetFrm()->IsTxtFrm() )
+ if ( GetFrm()->IsTextFrm() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
@@ -1458,7 +1458,7 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
/** #i88070# - get all additional accessible children */
void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren )
{
- if ( GetFrm()->IsTxtFrm() )
+ if ( GetFrm()->IsTextFrm() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 435a2474be5a..d31a6f3be31c 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -593,32 +593,32 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sAttrName = "line-number:";
- SwCntntFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
+ SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm();
sal_uLong nLineNum = 0;
- SwTxtFrm* pTxtFrm = NULL;
- SwTxtFrm* pCurrTxtFrm = NULL;
- pTxtFrm = static_cast< SwTxtFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsCntnt());
+ SwTextFrm* pTextFrm = NULL;
+ SwTextFrm* pCurrTextFrm = NULL;
+ pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent());
if (pCurrFrm->IsInFly())//such as, graphic,chart
{
SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm();
- const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
+ const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
RndStdIds eAnchorId = rAnchor.GetAnchorId();
if(eAnchorId == FLY_AS_CHAR)
{
const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm();
- if(pSwFrm->IsTxtFrm())
- pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSwFrm));
+ if(pSwFrm->IsTextFrm())
+ pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm));
}
}
else
- pCurrTxtFrm = const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm* >(pCurrFrm));
+ pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm));
//check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer
- SwFrm* pFrm = pCurrTxtFrm;
+ SwFrm* pFrm = pCurrTextFrm;
while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
pFrm = pFrm->GetUpper();
if ( pFrm )
- pCurrTxtFrm = NULL;
+ pCurrTextFrm = NULL;
//check shape
if(pCrsrShell->Imp()->GetDrawView())
{
@@ -626,48 +626,48 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
{
SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj();
- SwFrmFmt* pFmt = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFmt();
- const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
+ SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
+ const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if( FLY_AS_CHAR != rAnchor.GetAnchorId() )
- pCurrTxtFrm = NULL;
+ pCurrTextFrm = NULL;
}
}
//calculate line number
- if (pCurrTxtFrm && pTxtFrm)
+ if (pCurrTextFrm && pTextFrm)
{
- if (!(pCurrTxtFrm->IsInTab() || pCurrTxtFrm->IsInFtn()))
+ if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote()))
{
- while( pTxtFrm != pCurrTxtFrm )
+ while( pTextFrm != pCurrTextFrm )
{
//check header/footer
- pFrm = pTxtFrm;
+ pFrm = pTextFrm;
while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
pFrm = pFrm->GetUpper();
if ( pFrm )
{
- pTxtFrm = static_cast< SwTxtFrm*>(pTxtFrm->GetNextCntntFrm());
+ pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm());
continue;
}
- if (!(pTxtFrm->IsInTab() || pTxtFrm->IsInFtn() || pTxtFrm->IsInFly()))
- nLineNum += pTxtFrm->GetThisLines();
- pTxtFrm = static_cast< SwTxtFrm* >(pTxtFrm ->GetNextCntntFrm());
+ if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly()))
+ nLineNum += pTextFrm->GetThisLines();
+ pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm());
}
SwPaM* pCaret = pCrsrShell->GetCrsr();
- if (!pCurrTxtFrm->IsEmpty() && pCaret)
+ if (!pCurrTextFrm->IsEmpty() && pCaret)
{
- if (pCurrTxtFrm->IsTxtFrm())
+ if (pCurrTextFrm->IsTextFrm())
{
const SwPosition* pPoint = NULL;
- if(pCurrTxtFrm->IsInFly())
+ if(pCurrTextFrm->IsInFly())
{
- SwFlyFrm *pFlyFrm = pCurrTxtFrm->FindFlyFrm();
- const SwFmtAnchor& rAnchor = pFlyFrm->GetFmt()->GetAnchor();
- pPoint= rAnchor.GetCntntAnchor();
+ SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm();
+ const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+ pPoint= rAnchor.GetContentAnchor();
}
else
pPoint = pCaret->GetPoint();
const sal_Int32 nActPos = pPoint->nContent.GetIndex();
- nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+ nLineNum += pCurrTextFrm->GetLineCount( nActPos );
}
else//graphic, form, shape, etc.
{
@@ -676,7 +676,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) )
{
const sal_Int32 nActPos = pPoint->nContent.GetIndex();
- nLineNum += pCurrTxtFrm->GetLineCount( nActPos );
+ nLineNum += pCurrTextFrm->GetLineCount( nActPos );
}
}
}
@@ -722,8 +722,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sAttrName = "total-columns:";
- const SwFmtCol &rFmtCol=pCurrPage->GetAttrSet()->GetCol();
- sal_uInt16 nColCount=rFmtCol.GetNumCols();
+ const SwFormatCol &rFormatCol=pCurrPage->GetAttrSet()->GetCol();
+ sal_uInt16 nColCount=rFormatCol.GetNumCols();
nColCount = nColCount>0?nColCount:1;
sValue += sAttrName;
sValue += OUString::number( nColCount ) ;
@@ -772,8 +772,8 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
//section-total-columns
sAttrName = "section-total-columns:";
- const SwFmtCol &rFmtSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
- sal_uInt16 nSctColCount=rFmtSctCol.GetNumCols();
+ const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+ sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols();
nSctColCount = nSctColCount>0?nSctColCount:1;
sValue += sAttrName;
sValue += OUString::number( nSctColCount ) ;
@@ -868,24 +868,24 @@ sal_Int32 SAL_CALL SwAccessibleDocument::getBackground()
if ( pCrsrShell )
{
SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr;
- SwCntntNode* pPrevNode = NULL;
+ SwContentNode* pPrevNode = NULL;
std::vector<SwFrm*> vFrmList;
do
{
if ( _pStartCrsr && _pStartCrsr->HasMark() )
{
- SwCntntNode* pCntntNode = _pStartCrsr->GetCntntNode();
- if ( pCntntNode == pPrevNode )
+ SwContentNode* pContentNode = _pStartCrsr->GetContentNode();
+ if ( pContentNode == pPrevNode )
{
continue;
}
- SwFrm* pFrm = pCntntNode ? pCntntNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
+ SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : NULL;
if ( pFrm )
{
vFrmList.push_back( pFrm );
}
- pPrevNode = pCntntNode;
+ pPrevNode = pContentNode;
}
}
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index 90eabf85d952..57684d5e55d3 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -113,11 +113,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleEmbeddedObject::getImplementation
if( pFFrm )
{
style = "style:";
- SwCntntFrm* pCFrm;
- pCFrm = pFFrm->ContainsCntnt();
+ SwContentFrm* pCFrm;
+ pCFrm = pFFrm->ContainsContent();
if( pCFrm )
{
- SwCntntNode* pCNode = pCFrm->GetNode();
+ SwContentNode* pCNode = pCFrm->GetNode();
if( pCNode )
{
style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 84d728dec50b..c71e3fab4690 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -45,10 +45,10 @@ const sal_Char sImplementationNameEndnote[] = "com.sun.star.comp.Writer.SwAccess
SwAccessibleFootnote::SwAccessibleFootnote(
SwAccessibleMap* pInitMap,
bool bIsEndnote,
- const SwFtnFrm *pFtnFrm ) :
+ const SwFootnoteFrm *pFootnoteFrm ) :
SwAccessibleContext( pInitMap,
bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
- pFtnFrm )
+ pFootnoteFrm )
{
SolarMutexGuard aGuard;
@@ -56,12 +56,12 @@ SwAccessibleFootnote::SwAccessibleFootnote(
: STR_ACCESS_FOOTNOTE_NAME;
OUString sArg;
- const SwTxtFtn *pTxtFtn =
- static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
- if( pTxtFtn )
+ const SwTextFootnote *pTextFootnote =
+ static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+ if( pTextFootnote )
{
const SwDoc *pDoc = GetShell()->GetDoc();
- sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+ sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
}
SetName( GetResource( nResId, &sArg ) );
@@ -83,12 +83,12 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
: STR_ACCESS_FOOTNOTE_DESC ;
OUString sArg;
- const SwTxtFtn *pTxtFtn =
- static_cast< const SwFtnFrm *>( GetFrm() )->GetAttr();
- if( pTxtFtn )
+ const SwTextFootnote *pTextFootnote =
+ static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+ if( pTextFootnote )
{
const SwDoc *pDoc = GetMap()->GetShell()->GetDoc();
- sArg = pTxtFtn->GetFtn().GetViewNumStr( *pDoc );
+ sArg = pTextFootnote->GetFootnote().GetViewNumStr( *pDoc );
}
return GetResource( nResId, &sArg );
@@ -128,10 +128,10 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-bool SwAccessibleFootnote::IsEndnote( const SwFtnFrm *pFtnFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm )
{
- const SwTxtFtn *pTxtFtn = pFtnFrm ->GetAttr();
- return pTxtFtn && pTxtFtn->GetFtn().IsEndNote() ;
+ const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr();
+ return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index b0862a25b661..d03b94f0e1ed 100644
--- a/sw/source/core/access/accfootnote.hxx
+++ b/sw/source/core/access/accfootnote.hxx
@@ -24,7 +24,7 @@
#include <acccontext.hxx>
class SwAccessibleMap;
-class SwFtnFrm;
+class SwFootnoteFrm;
class SwAccessibleFootnote : public SwAccessibleContext
{
@@ -34,7 +34,7 @@ protected:
public:
SwAccessibleFootnote( SwAccessibleMap* pInitMap,
bool bIsEndnote,
- const SwFtnFrm *pFtnFrm );
+ const SwFootnoteFrm *pFootnoteFrm );
// XAccessibleContext
@@ -64,7 +64,7 @@ public:
// XTypeProvider
virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
- static bool IsEndnote( const SwFtnFrm *pFrm );
+ static bool IsEndnote( const SwFootnoteFrm *pFrm );
};
#endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 9a34ec721236..6582cca998b0 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -433,12 +433,12 @@ const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
OUString SwAccessibleFrame::GetFormattedPageNumber() const
{
sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum();
- sal_uInt32 nFmt = GetFrm()->FindPageFrm()->GetPageDesc()
+ sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc()
->GetNumType().GetNumberingType();
- if( SVX_NUM_NUMBER_NONE == nFmt )
- nFmt = SVX_NUM_ARABIC;
+ if( SVX_NUM_NUMBER_NONE == nFormat )
+ nFormat = SVX_NUM_ARABIC;
- OUString sRet( FormatNumber( nPageNum, nFmt ) );
+ OUString sRet( FormatNumber( nPageNum, nFormat ) );
return sRet;
}
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index d5bb32af6ae3..bfffd2dc871a 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -99,22 +99,22 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
sal_uInt8 nType = ND_TEXTNODE;
if( pFlyFrm->Lower() )
{
- if( pFlyFrm->Lower()->IsNoTxtFrm() )
+ if( pFlyFrm->Lower()->IsNoTextFrm() )
{
- const SwCntntFrm *pCntFrm =
- static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
+ const SwContentFrm *pCntFrm =
+ static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
nType = pCntFrm->GetNode()->GetNodeType();
}
}
else
{
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- const SwFmtCntnt& rCntnt = pFrmFmt->GetCntnt();
- const SwNodeIndex *pNdIdx = rCntnt.GetCntntIdx();
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFormatContent& rContent = pFrameFormat->GetContent();
+ const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
if( pNdIdx )
{
- const SwCntntNode *pCNd =
- (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetCntntNode();
+ const SwContentNode *pCNd =
+ (pNdIdx->GetNodes())[pNdIdx->GetIndex()+1]->GetContentNode();
if( pCNd )
nType = pCNd->GetNodeType();
}
@@ -132,10 +132,10 @@ SwAccessibleFrameBase::SwAccessibleFrameBase(
{
SolarMutexGuard aGuard;
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
- SetName( pFrmFmt->GetName() );
+ SetName( pFrameFormat->GetName() );
bIsSelected = IsSelected();
}
@@ -221,14 +221,14 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
case RES_NAME_CHANGED:
if( pFlyFrm )
{
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- assert(pFrmFmt == GetRegisteredIn() && "invalid frame");
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
const OUString sOldName( GetName() );
assert( !pOld ||
static_cast<const SwStringMsgPoolItem *>(pOld)->GetString() == GetName());
- SetName( pFrmFmt->GetName() );
+ SetName( pFrameFormat->GetName() );
assert( !pNew ||
static_cast<const SwStringMsgPoolItem *>(pNew)->GetString() == GetName());
@@ -250,8 +250,8 @@ void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
case RES_FMT_CHG:
if( pOld &&
- static_cast< const SwFmtChg * >(pNew)->pChangedFmt == GetRegisteredIn() &&
- static_cast< const SwFmtChg * >(pOld)->pChangedFmt->IsFmtInDTOR() )
+ static_cast< const SwFormatChg * >(pNew)->pChangedFormat == GetRegisteredIn() &&
+ static_cast< const SwFormatChg * >(pOld)->pChangedFormat->IsFormatInDTOR() )
GetRegisteredInNonConst()->Remove( this );
break;
@@ -306,18 +306,18 @@ bool SwAccessibleFrameBase::GetSelectedState( )
// SELETED.
SwFlyFrm* pFlyFrm = getFlyFrm();
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
- const SwPosition *pPos = pAnchor.GetCntntAnchor();
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+ const SwPosition *pPos = pAnchor.GetContentAnchor();
if( !pPos )
return false;
int pIndex = pPos->nContent.GetIndex();
- if( pPos->nNode.GetNode().GetTxtNode() )
+ if( pPos->nNode.GetNode().GetTextNode() )
{
SwPaM* pCrsr = GetCrsr();
if( pCrsr != NULL )
{
- const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+ const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index c6c40fa28088..ce9d3d875e3e 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -156,9 +156,9 @@ bool SwAccessibleChild::IsBoundAsChar() const
}
else if ( mpDrawObj )
{
- const SwFrmFmt* mpFrmFmt = ::FindFrmFmt( mpDrawObj );
- bRet = mpFrmFmt
- && (FLY_AS_CHAR == mpFrmFmt->GetAnchor().GetAnchorId());
+ const SwFrameFormat* mpFrameFormat = ::FindFrameFormat( mpDrawObj );
+ bRet = mpFrameFormat
+ && (FLY_AS_CHAR == mpFrameFormat->GetAnchor().GetAnchorId());
}
else if ( mpWindow )
{
@@ -351,9 +351,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
OSL_ENSURE( pContact, "sdr contact is missing" );
if( pContact )
{
- const SwFrmFmt *pFrmFmt = pContact->GetFmt();
- OSL_ENSURE( pFrmFmt, "frame format is missing" );
- if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
+ const SwFrameFormat *pFrameFormat = pContact->GetFormat();
+ OSL_ENSURE( pFrameFormat, "frame format is missing" );
+ if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
{
// For FLY_AS_CHAR the parent is the anchor
pParent = pContact->GetAnchorFrm();
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 773e1baa4beb..05168a432a36 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -76,7 +76,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
}
}
}
- else if( rFrm.IsTxtFrm() )
+ else if( rFrm.IsTextFrm() )
{
const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
if ( pObjs )
@@ -153,7 +153,7 @@ bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
{
return ( rFrm.IsPageFrm() &&
static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
- ( rFrm.IsTxtFrm() &&
+ ( rFrm.IsTextFrm() &&
rFrm.GetDrawObjs() );
}
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 68f9fbfd4b48..348eabc7bca1 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -46,7 +46,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
}
}
- else if( rFrm.IsTxtFrm() )
+ else if( rFrm.IsTextFrm() )
{
const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
if ( pObjs && pObjs->size() )
@@ -112,7 +112,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
? (*pObjs)[nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( 0 );
}
- else if( rFrm.IsTxtFrm() )
+ else if( rFrm.IsTextFrm() )
{
const SwSortedObjs* pObjs = rFrm.GetDrawObjs();
const size_t nObjsCount = pObjs ? pObjs->size() : 0;
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index 661ae5e1abda..ed4138e4c1d4 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
{
SolarMutexGuard g;
- SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+ SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
if (aURL.GetMap())
return AccessibleRole::IMAGE_MAP;
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 09d2d69a70b2..7b9e25b94382 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -44,22 +44,22 @@ SwAccessibleHyperlink::SwAccessibleHyperlink( size_t nHPos,
{
}
-const SwTxtAttr *SwAccessibleHyperlink::GetTxtAttr() const
+const SwTextAttr *SwAccessibleHyperlink::GetTextAttr() const
{
- const SwTxtAttr *pTxtAttr = 0;
+ const SwTextAttr *pTextAttr = 0;
if( xPara.is() && xPara->GetMap() )
{
- const SwTxtNode *pTxtNd = xPara->GetTxtNode();
- const SwpHints *pHints = pTxtNd->GetpSwpHints();
+ const SwTextNode *pTextNd = xPara->GetTextNode();
+ const SwpHints *pHints = pTextNd->GetpSwpHints();
if( pHints && nHintPos < pHints->Count() )
{
- const SwTxtAttr *pHt = (*pHints)[nHintPos];
+ const SwTextAttr *pHt = (*pHints)[nHintPos];
if( RES_TXTATR_INETFMT == pHt->Which() )
- pTxtAttr = pHt;
+ pTextAttr = pHt;
}
}
- return pTxtAttr;
+ return pTextAttr;
}
// XAccessibleAction
@@ -78,24 +78,24 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
if(nIndex != 0)
throw lang::IndexOutOfBoundsException();
- const SwTxtAttr *pTxtAttr = GetTxtAttr();
- if( pTxtAttr )
+ const SwTextAttr *pTextAttr = GetTextAttr();
+ if( pTextAttr )
{
- const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
- if( !rINetFmt.GetValue().isEmpty() )
+ const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+ if( !rINetFormat.GetValue().isEmpty() )
{
SwViewShell *pVSh = xPara->GetShell();
if( pVSh )
{
- LoadURL(*pVSh, rINetFmt.GetValue(), URLLOAD_NOFILTER,
- rINetFmt.GetTargetFrame());
- OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(),
+ LoadURL(*pVSh, rINetFormat.GetValue(), URLLOAD_NOFILTER,
+ rINetFormat.GetTargetFrame());
+ OSL_ENSURE( pTextAttr == rINetFormat.GetTextINetFormat(),
"lost my txt attr" );
- const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt();
- if( pTxtAttr2 )
+ const SwTextINetFormat* pTextAttr2 = rINetFormat.GetTextINetFormat();
+ if( pTextAttr2 )
{
- const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisited(true);
- const_cast<SwTxtINetFmt*>(pTxtAttr2)->SetVisitedValid(true);
+ const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisited(true);
+ const_cast<SwTextINetFormat*>(pTextAttr2)->SetVisitedValid(true);
}
bRet = true;
}
@@ -112,11 +112,11 @@ OUString SAL_CALL SwAccessibleHyperlink::getAccessibleActionDescription(
if(nIndex != 0)
throw lang::IndexOutOfBoundsException();
- const SwTxtAttr *pTxtAttr = GetTxtAttr();
- if( pTxtAttr )
+ const SwTextAttr *pTextAttr = GetTextAttr();
+ if( pTextAttr )
{
- const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
- return rINetFmt.GetValue();
+ const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+ return rINetFormat.GetValue();
}
return OUString();
@@ -169,12 +169,12 @@ uno::Any SAL_CALL SwAccessibleHyperlink::getAccessibleActionObject(
if(nIndex != 0)
throw lang::IndexOutOfBoundsException();
- const SwTxtAttr *pTxtAttr = GetTxtAttr();
+ const SwTextAttr *pTextAttr = GetTextAttr();
OUString retText;
- if( pTxtAttr )
+ if( pTextAttr )
{
- const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
- retText = OUString( rINetFmt.GetValue() );
+ const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+ retText = OUString( rINetFormat.GetValue() );
}
uno::Any aRet;
aRet <<= retText;
@@ -199,12 +199,12 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::isValid( )
SolarMutexGuard aGuard;
if (xPara.is())
{
- const SwTxtAttr *pTxtAttr = GetTxtAttr();
+ const SwTextAttr *pTextAttr = GetTextAttr();
OUString sText;
- if( pTxtAttr )
+ if( pTextAttr )
{
- const SwFmtINetFmt& rINetFmt = pTxtAttr->GetINetFmt();
- sText = OUString( rINetFmt.GetValue() );
+ const SwFormatINetFormat& rINetFormat = pTextAttr->GetINetFormat();
+ sText = OUString( rINetFormat.GetValue() );
OUString sToken = "#";
sal_Int32 nPos = sText.indexOf(sToken);
if (nPos==0)//document link
diff --git a/sw/source/core/access/acchyperlink.hxx b/sw/source/core/access/acchyperlink.hxx
index ba71c62d2f57..06570c899969 100644
--- a/sw/source/core/access/acchyperlink.hxx
+++ b/sw/source/core/access/acchyperlink.hxx
@@ -26,7 +26,7 @@
#include <fmtinfmt.hxx>
class SwAccessibleParagraph;
-class SwTxtAttr;
+class SwTextAttr;
class SwAccessibleHyperlink :
public ::cppu::WeakImplHelper<
@@ -43,7 +43,7 @@ class SwAccessibleHyperlink :
SwAccessibleParagraph *p,
sal_Int32 nStt, sal_Int32 nEnd );
- const SwTxtAttr *GetTxtAttr() const;
+ const SwTextAttr *GetTextAttr() const;
void Invalidate();
public:
diff --git a/sw/source/core/access/acchypertextdata.hxx b/sw/source/core/access/acchypertextdata.hxx
index eb081e77c9ba..e35b58718a70 100644
--- a/sw/source/core/access/acchypertextdata.hxx
+++ b/sw/source/core/access/acchypertextdata.hxx
@@ -23,21 +23,21 @@
#include <cppuhelper/weakref.hxx>
#include <map>
-class SwTxtAttr;
+class SwTextAttr;
namespace com { namespace sun { namespace star {
namespace accessibility { class XAccessibleHyperlink; }
} } }
-typedef ::std::less< const SwTxtAttr * > SwTxtAttrPtrLess;
+typedef ::std::less< const SwTextAttr * > SwTextAttrPtrLess;
class SwAccessibleHyperTextData
{
public:
- typedef const SwTxtAttr * key_type;
+ typedef const SwTextAttr * key_type;
typedef ::com::sun::star::uno::WeakReference<
com::sun::star::accessibility::XAccessibleHyperlink > mapped_type;
typedef std::pair<const key_type,mapped_type> value_type;
- typedef SwTxtAttrPtrLess key_compare;
+ typedef SwTextAttrPtrLess key_compare;
typedef std::map<key_type,mapped_type,key_compare>::iterator iterator;
private:
std::map<key_type,mapped_type,key_compare> maMap;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b4c0782d42b8..7e47ad3c6dd5 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -556,7 +556,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
// There are two reason for this. First of all, a new accessible shape
// for the XShape might be created soon. It's then cheaper if the XShape
// still exists. The other reason are situations where an accessible shape
-// is destroyed within an SwFrmFmt::Modify. In this case, destroying
+// is destroyed within an SwFrameFormat::Modify. In this case, destroying
// the XShape at the same time (indirectly by destroying the accessible
// shape) leads to an assert, because a client of the Modify is destroyed
// within a Modify call.
@@ -1162,14 +1162,14 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
bool bMarked = false;
SwAccessibleChild pFrm( (*aIter).first );
- const SwFrmFmt *pFrmFmt = (*aIter).first ? ::FindFrmFmt( (*aIter).first ) : nullptr;
- if( !pFrmFmt )
+ const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr;
+ if( !pFrameFormat )
{
++aIter;
continue;
}
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
- const SwPosition *pPos = pAnchor.GetCntntAnchor();
+ const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
+ const SwPosition *pPos = pAnchor.GetContentAnchor();
if(pAnchor.GetAnchorId() == FLY_AT_PAGE)
{
@@ -1186,12 +1186,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
++aIter;
continue;
}
- if( pPos->nNode.GetNode().GetTxtNode() )
+ if( pPos->nNode.GetNode().GetTextNode() )
{
int pIndex = pPos->nContent.GetIndex();
if( pCrsr != NULL )
{
- const SwTxtNode* pNode = pPos->nNode.GetNode().GetTxtNode();
+ const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
sal_uLong nHere = pNode->GetIndex();
for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
@@ -1286,10 +1286,10 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
if (bFrmChanged)
{
const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- if (pFrmFmt)
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ if (pFrameFormat)
{
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+ const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
{
uno::Reference< XAccessible > xAccParent = pAccFrame->getAccessibleParent();
@@ -1335,16 +1335,16 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
while(nStartIndex <= nEndIndex)
{
SwFrm *pFrm = NULL;
- if(nStartIndex.GetNode().IsCntntNode())
+ if(nStartIndex.GetNode().IsContentNode())
{
- SwCntntNode* pCNd = static_cast<SwCntntNode*>(&(nStartIndex.GetNode()));
- pFrm = SwIterator<SwFrm, SwCntntNode>(*pCNd).First();
+ SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode()));
+ pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First();
}
else if( nStartIndex.GetNode().IsTableNode() )
{
SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode()));
- SwTableFmt* pFmt = const_cast<SwTableFmt*>(pTable->GetTable().GetFrmFmt());
- pFrm = SwIterator<SwFrm, SwTableFmt>(*pFmt).First();
+ SwTableFormat* pFormat = const_cast<SwTableFormat*>(pTable->GetTable().GetFrameFormat());
+ pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First();
}
if( pFrm && mpFrmMap)
@@ -1557,10 +1557,10 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool bInvalidateFocusMode /*=fa
if (pAccShape)
{
SdrObject *pObj = GetSdrObjectFromXShape(pAccShape->GetXShape());
- SwFrmFmt *pFrmFmt = pObj ? FindFrmFmt( pObj ) : NULL;
- if (pFrmFmt)
+ SwFrameFormat *pFrameFormat = pObj ? FindFrameFormat( pObj ) : NULL;
+ if (pFrameFormat)
{
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+ const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
{
uno::Reference< XAccessible > xPara = pAccShape->getAccessibleParent();
@@ -1891,7 +1891,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
case FRM_TXT:
mnPara++;
pAcc = new SwAccessibleParagraph( *this,
- static_cast< const SwTxtFrm& >( *pFrm ) );
+ static_cast< const SwTextFrm& >( *pFrm ) );
break;
case FRM_HEADER:
pAcc = new SwAccessibleHeaderFooter( this,
@@ -1903,13 +1903,13 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
break;
case FRM_FTN:
{
- const SwFtnFrm *pFtnFrm =
- static_cast < const SwFtnFrm * >( pFrm );
+ const SwFootnoteFrm *pFootnoteFrm =
+ static_cast < const SwFootnoteFrm * >( pFrm );
bool bIsEndnote =
- SwAccessibleFootnote::IsEndnote( pFtnFrm );
+ SwAccessibleFootnote::IsEndnote( pFootnoteFrm );
pAcc = new SwAccessibleFootnote( this, bIsEndnote,
/*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
- pFtnFrm );
+ pFootnoteFrm );
}
break;
case FRM_FLY:
@@ -2318,7 +2318,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
(xParentAccImpl.is() || xShapeAccImpl.is()) )
{
// Keep a reference to the XShape to avoid that it
- // is deleted with a SwFrmFmt::Modify.
+ // is deleted with a SwFrameFormat::Modify.
uno::Reference < drawing::XShape > xShape(
const_cast< SdrObject * >( pObj )->getUnoShape(),
uno::UNO_QUERY );
@@ -2469,7 +2469,7 @@ so the new graphic accessible 'parent is NULL,
so run here: save the parent's SwFrm not the accessible object parent,
*/
bool bIsValidFrm = false;
- bool bIsTxtParent = false;
+ bool bIsTextParent = false;
if (aFrmOrObj.GetSwFrm())
{
int nType = pFrm->GetType();
@@ -2483,12 +2483,12 @@ so run here: save the parent's SwFrm not the accessible object parent,
int nType = pParent->GetType();
if (FRM_TXT == nType)
{
- bIsTxtParent =true;
+ bIsTextParent =true;
}
}
// bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
// bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
- if((bIsValidFrm || bIsTxtParent) )
+ if((bIsValidFrm || bIsTextParent) )
{
if( GetShell()->ActionPend() )
{
@@ -2544,9 +2544,9 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
}
}
-void SwAccessibleMap::InvalidateAttr( const SwTxtFrm& rTxtFrm )
+void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
{
- SwAccessibleChild aFrmOrObj( &rTxtFrm );
+ SwAccessibleChild aFrmOrObj( &rTextFrm );
if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
uno::Reference < XAccessible > xAcc;
@@ -2922,17 +2922,17 @@ void SwAccessibleMap::InvalidateRelationSet( const SwFrm* pMaster,
}
// invalidation of CONTENT_FLOW_FROM/_TO relation of a paragraph
-void SwAccessibleMap::InvalidateParaFlowRelation( const SwTxtFrm& _rTxtFrm,
+void SwAccessibleMap::InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
const bool _bFrom )
{
- _InvalidateRelationSet( &_rTxtFrm, _bFrom );
+ _InvalidateRelationSet( &_rTextFrm, _bFrom );
}
// invalidation of text selection of a paragraph
-void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
+void SwAccessibleMap::InvalidateParaTextSelection( const SwTextFrm& _rTextFrm )
{
// first, see if this frame is accessible, and if so, get the respective
- SwAccessibleChild aFrmOrObj( &_rTxtFrm );
+ SwAccessibleChild aFrmOrObj( &_rTextFrm );
if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
uno::Reference < XAccessible > xAcc;
@@ -2960,7 +2960,7 @@ void SwAccessibleMap::InvalidateParaTextSelection( const SwTxtFrm& _rTxtFrm )
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::CARET_OR_STATES,
pAccImpl,
- SwAccessibleChild( &_rTxtFrm ),
+ SwAccessibleChild( &_rTextFrm ),
AccessibleStates::TEXT_SELECTION_CHANGED );
AppendEvent( aEvent );
}
@@ -3443,8 +3443,8 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
// for a selection the cursor has to have a mark.
// for safety reasons assure that point and mark are in text nodes
if ( pCrsr->HasMark() &&
- pCrsr->GetPoint()->nNode.GetNode().IsTxtNode() &&
- pCrsr->GetMark()->nNode.GetNode().IsTxtNode() )
+ pCrsr->GetPoint()->nNode.GetNode().IsTextNode() &&
+ pCrsr->GetMark()->nNode.GetNode().IsTextNode() )
{
SwPosition* pStartPos = pCrsr->Start();
SwPosition* pEndPos = pCrsr->End();
@@ -3452,24 +3452,24 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
SwNodeIndex aIdx( pStartPos->nNode );
for ( ; aIdx.GetIndex() <= pEndPos->nNode.GetIndex(); ++aIdx )
{
- SwTxtNode* pTxtNode( aIdx.GetNode().GetTxtNode() );
- if ( pTxtNode )
+ SwTextNode* pTextNode( aIdx.GetNode().GetTextNode() );
+ if ( pTextNode )
{
// loop on all text frames registered at the text node.
- SwIterator<SwTxtFrm,SwTxtNode> aIter( *pTxtNode );
- for( SwTxtFrm* pTxtFrm = aIter.First(); pTxtFrm; pTxtFrm = aIter.Next() )
+ SwIterator<SwTextFrm,SwTextNode> aIter( *pTextNode );
+ for( SwTextFrm* pTextFrm = aIter.First(); pTextFrm; pTextFrm = aIter.Next() )
{
uno::WeakReference < XAccessible > xWeakAcc;
SwAccessibleContextMap_Impl::iterator aMapIter =
- mpFrmMap->find( pTxtFrm );
+ mpFrmMap->find( pTextFrm );
if( aMapIter != mpFrmMap->end() )
{
xWeakAcc = (*aMapIter).second;
SwAccessibleParaSelection aDataEntry(
- pTxtNode == &(pStartPos->nNode.GetNode())
+ pTextNode == &(pStartPos->nNode.GetNode())
? pStartPos->nContent.GetIndex()
: 0,
- pTxtNode == &(pEndPos->nNode.GetNode())
+ pTextNode == &(pEndPos->nNode.GetNode())
? pEndPos->nContent.GetIndex()
: -1 );
SwAccessibleSelectedParas_Impl::value_type
@@ -3552,13 +3552,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
static_cast<SwAccessibleContext*>( xAcc.get() ) );
if ( xAccImpl.is() && xAccImpl->GetFrm() )
{
- const SwTxtFrm* pTxtFrm(
- dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
- OSL_ENSURE( pTxtFrm,
+ const SwTextFrm* pTextFrm(
+ dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+ OSL_ENSURE( pTextFrm,
"<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
- if ( pTxtFrm )
+ if ( pTextFrm )
{
- InvalidateParaTextSelection( *pTxtFrm );
+ InvalidateParaTextSelection( *pTextFrm );
}
}
}
@@ -3580,13 +3580,13 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
static_cast<SwAccessibleContext*>( xAcc.get() ) );
if ( xAccImpl.is() && xAccImpl->GetFrm() )
{
- const SwTxtFrm* pTxtFrm(
- dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
- OSL_ENSURE( pTxtFrm,
+ const SwTextFrm* pTextFrm(
+ dynamic_cast<const SwTextFrm*>(xAccImpl->GetFrm()) );
+ OSL_ENSURE( pTextFrm,
"<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexpected type of frame" );
- if ( pTxtFrm )
+ if ( pTextFrm )
{
- InvalidateParaTextSelection( *pTxtFrm );
+ InvalidateParaTextSelection( *pTextFrm );
}
}
}
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index 4be902866469..cee5edbcf05b 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -41,18 +41,18 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using utl::AccessibleRelationSetHelper;
-const SwNoTxtNode *SwAccessibleNoTextFrame::GetNoTxtNode() const
+const SwNoTextNode *SwAccessibleNoTextFrame::GetNoTextNode() const
{
- const SwNoTxtNode *pNd = 0;
+ const SwNoTextNode *pNd = 0;
const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm *>( GetFrm() );
- if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTxtFrm() )
+ if( pFlyFrm->Lower() && pFlyFrm->Lower()->IsNoTextFrm() )
{
- const SwCntntFrm *pCntFrm =
- static_cast<const SwCntntFrm *>( pFlyFrm->Lower() );
- const SwCntntNode* pSwCntntNode = pCntFrm->GetNode();
- if(pSwCntntNode != NULL)
+ const SwContentFrm *pCntFrm =
+ static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
+ const SwContentNode* pSwContentNode = pCntFrm->GetNode();
+ if(pSwContentNode != NULL)
{
- pNd = pSwCntntNode->GetNoTxtNode();
+ pNd = pSwContentNode->GetNoTextNode();
}
}
@@ -64,11 +64,11 @@ SwAccessibleNoTextFrame::SwAccessibleNoTextFrame(
sal_Int16 nInitRole,
const SwFlyFrm* pFlyFrm ) :
SwAccessibleFrameBase( pInitMap, nInitRole, pFlyFrm ),
- aDepend( this, const_cast < SwNoTxtNode * >( GetNoTxtNode() ) ),
+ aDepend( this, const_cast < SwNoTextNode * >( GetNoTextNode() ) ),
msTitle(),
msDesc()
{
- const SwNoTxtNode* pNd = GetNoTxtNode();
+ const SwNoTextNode* pNd = GetNoTextNode();
// #i73249#
// consider new attributes Title and Description
if( pNd )
@@ -102,7 +102,7 @@ void SwAccessibleNoTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem
return; // probably was deleted - avoid doing anything
}
- const SwNoTxtNode *pNd = GetNoTxtNode();
+ const SwNoTextNode *pNd = GetNoTextNode();
OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
switch( nWhich )
{
@@ -308,7 +308,7 @@ throw (uno::RuntimeException, std::exception)
CHECK_FOR_DEFUNC( XAccessibleHypertext );
sal_Int32 nCount = 0;
- SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+ SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
if(aURL.GetMap() || !aURL.GetURL().isEmpty())
nCount = 1;
@@ -325,7 +325,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
uno::Reference< XAccessibleHyperlink > xRet;
- SwFmtURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFmt()->GetURL() );
+ SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
if( nLinkIndex > 0 )
throw lang::IndexOutOfBoundsException();
diff --git a/sw/source/core/access/accnotextframe.hxx b/sw/source/core/access/accnotextframe.hxx
index 4776cdb1a471..196b8eaf6c30 100644
--- a/sw/source/core/access/accnotextframe.hxx
+++ b/sw/source/core/access/accnotextframe.hxx
@@ -30,7 +30,7 @@ namespace com { namespace star {
} }
class SwFlyFrm;
-class SwNoTxtNode;
+class SwNoTextNode;
class SwAccessibleNoTextHyperlink;
class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
@@ -47,7 +47,7 @@ class SwAccessibleNoTextFrame : public SwAccessibleFrameBase,
protected:
virtual ~SwAccessibleNoTextFrame();
- const SwNoTxtNode *GetNoTxtNode() const;
+ const SwNoTextNode *GetNoTextNode() const;
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) SAL_OVERRIDE;
diff --git a/sw/source/core/access/accnotexthyperlink.cxx b/sw/source/core/access/accnotexthyperlink.cxx
index 4044c3e541a4..ba6117b33c8b 100644
--- a/sw/source/core/access/accnotexthyperlink.cxx
+++ b/sw/source/core/access/accnotexthyperlink.cxx
@@ -49,7 +49,7 @@ sal_Int32 SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionCount()
{
SolarMutexGuard g;
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
ImageMap* pMap = aURL.GetMap();
if( pMap != NULL )
{
@@ -72,7 +72,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::doAccessibleAction( sal_Int32 nIn
throw lang::IndexOutOfBoundsException();
bool bRet = false;
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
ImageMap* pMap = aURL.GetMap();
if( pMap != NULL )
{
@@ -113,7 +113,7 @@ OUString SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionDescription(
if(nIndex < 0 || nIndex >= getAccessibleActionCount())
throw lang::IndexOutOfBoundsException();
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
ImageMap* pMap = aURL.GetMap();
if( pMap != NULL )
{
@@ -141,7 +141,7 @@ Reference< XAccessibleKeyBinding > SAL_CALL
throw lang::IndexOutOfBoundsException();
bool bIsValid = false;
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
ImageMap* pMap = aURL.GetMap();
if( pMap != NULL )
{
@@ -197,7 +197,7 @@ Any SAL_CALL SwAccessibleNoTextHyperlink::getAccessibleActionObject(
if(nIndex < 0 || nIndex >= getAccessibleActionCount())
throw lang::IndexOutOfBoundsException();
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
OUString retText;
ImageMap* pMap = aURL.GetMap();
if( pMap != NULL )
@@ -231,7 +231,7 @@ sal_Bool SAL_CALL SwAccessibleNoTextHyperlink::isValid( )
{
SolarMutexGuard g;
- SwFmtURL aURL( GetFmt()->GetURL() );
+ SwFormatURL aURL( GetFormat()->GetURL() );
if( aURL.GetMap() || !aURL.GetURL().isEmpty() )
return sal_True;
diff --git a/sw/source/core/access/accnotexthyperlink.hxx b/sw/source/core/access/accnotexthyperlink.hxx
index 0dae5fef8256..79a9b9817bc8 100644
--- a/sw/source/core/access/accnotexthyperlink.hxx
+++ b/sw/source/core/access/accnotexthyperlink.hxx
@@ -37,9 +37,9 @@ class SwAccessibleNoTextHyperlink :
::rtl::Reference< SwAccessibleNoTextFrame > xFrame;
const SwFrm *mpFrm;
- SwFrmFmt *GetFmt()
+ SwFrameFormat *GetFormat()
{
- return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFmt();
+ return const_cast<SwLayoutFrm*>(static_cast<const SwLayoutFrm*>(mpFrm))->GetFormat();
}
public:
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 87580385fe97..fab40746f65c 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -119,12 +119,12 @@ namespace com { namespace sun { namespace star {
const sal_Char sServiceName[] = "com.sun.star.text.AccessibleParagraphView";
const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleParagraphView";
-const SwTxtNode* SwAccessibleParagraph::GetTxtNode() const
+const SwTextNode* SwAccessibleParagraph::GetTextNode() const
{
const SwFrm* pFrm = GetFrm();
- OSL_ENSURE( pFrm->IsTxtFrm(), "The text frame has mutated!" );
+ OSL_ENSURE( pFrm->IsTextFrm(), "The text frame has mutated!" );
- const SwTxtNode* pNode = static_cast<const SwTxtFrm*>(pFrm)->GetTxtNode();
+ const SwTextNode* pNode = static_cast<const SwTextFrm*>(pFrm)->GetTextNode();
OSL_ENSURE( pNode != NULL, "A text frame without a text node." );
return pNode;
@@ -150,7 +150,7 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
if( pCaret != NULL )
{
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
// check whether the point points into 'our' node
SwPosition* pPoint = pCaret->GetPoint();
@@ -162,8 +162,8 @@ sal_Int32 SwAccessibleParagraph::GetCaretPos()
if(!GetPortionData().IsValidCorePosition( nIndex ) ||
( GetPortionData().IsZeroCorePositionData() && nIndex== 0) )
{
- const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
- bool bFormat = (pTxtFrm && pTxtFrm->HasPara());
+ const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+ bool bFormat = (pTextFrm && pTextFrm->HasPara());
if(bFormat)
{
ClearPortionData();
@@ -208,7 +208,7 @@ bool SwAccessibleParagraph::GetSelection(
if( pCrsr != NULL )
{
// get SwPosition for my node
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
@@ -346,8 +346,8 @@ SwPaM* SwAccessibleParagraph::GetCursor( const bool _bForSelection )
bool SwAccessibleParagraph::IsHeading() const
{
- const SwTxtNode *pTxtNd = GetTxtNode();
- return pTxtNd->IsOutline();
+ const SwTextNode *pTextNd = GetTextNode();
+ return pTextNd->IsOutline();
}
void SwAccessibleParagraph::GetStates(
@@ -369,9 +369,9 @@ void SwAccessibleParagraph::GetStates(
// FOCUSED (simulates node index of cursor)
SwPaM* pCaret = GetCursor( false ); // #i27301# - consider adjusted method signature
- const SwTxtNode* pTxtNd = GetTxtNode();
- if( pCaret != 0 && pTxtNd != 0 &&
- pTxtNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
+ const SwTextNode* pTextNd = GetTextNode();
+ if( pCaret != 0 && pTextNd != 0 &&
+ pTextNd->GetIndex() == pCaret->GetPoint()->nNode.GetIndex() &&
nOldCaretPos != -1)
{
vcl::Window *pWin = GetWindow();
@@ -532,9 +532,9 @@ void SwAccessibleParagraph::_InvalidateFocus()
SwAccessibleParagraph::SwAccessibleParagraph(
SwAccessibleMap& rInitMap,
- const SwTxtFrm& rTxtFrm )
- : SwClient( const_cast<SwTxtNode*>(rTxtFrm.GetTxtNode()) ) // #i108125#
- , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTxtFrm )
+ const SwTextFrm& rTextFrm )
+ : SwClient( const_cast<SwTextNode*>(rTextFrm.GetTextNode()) ) // #i108125#
+ , SwAccessibleContext( &rInitMap, AccessibleRole::PARAGRAPH, &rTextFrm )
, sDesc()
, pPortionData( NULL )
, pHyperTextData( NULL )
@@ -543,7 +543,7 @@ SwAccessibleParagraph::SwAccessibleParagraph(
//Get the real heading level, Heading1 ~ Heading10
, nHeadingLevel (-1)
, aSelectionHelper( *this )
- , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTxtFrm ) ) // #i108125#
+ , mpParaChangeTrackInfo( new SwParaChangeTrackingInfo( rTextFrm ) ) // #i108125#
, m_bLastHasSelection(false) //To add TEXT_SELECTION_CHANGED event
{
SolarMutexGuard aGuard;
@@ -577,13 +577,13 @@ void SwAccessibleParagraph::UpdatePortionData()
{
// obtain the text frame
OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
- OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
- const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+ OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+ const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
// build new portion data
delete pPortionData;
pPortionData = new SwAccessiblePortionData(
- pFrm->GetTxtNode(), GetMap()->GetShell()->GetViewOptions() );
+ pFrm->GetTextNode(), GetMap()->GetShell()->GetViewOptions() );
pFrm->VisitPortions( *pPortionData );
OSL_ENSURE( pPortionData != NULL, "UpdatePortionData() failed" );
@@ -637,10 +637,10 @@ SwXTextPortion* SwAccessibleParagraph::CreateUnoPortion(
GetPortionData().GetModelPosition( nEndIndex );
// create UNO cursor
- SwTxtNode* pTxtNode = const_cast<SwTxtNode*>( GetTxtNode() );
- SwIndex aIndex( pTxtNode, nStart );
- SwPosition aStartPos( *pTxtNode, aIndex );
- SwUnoCrsr* pUnoCursor = pTxtNode->GetDoc()->CreateUnoCrsr( aStartPos );
+ SwTextNode* pTextNode = const_cast<SwTextNode*>( GetTextNode() );
+ SwIndex aIndex( pTextNode, nStart );
+ SwPosition aStartPos( *pTextNode, aIndex );
+ SwUnoCrsr* pUnoCursor = pTextNode->GetDoc()->CreateUnoCrsr( aStartPos );
pUnoCursor->SetMark();
pUnoCursor->GetMark()->nContent = nEnd;
@@ -675,10 +675,10 @@ bool SwAccessibleParagraph::IsValidRange(
SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
{
- const SwTxtNode* pTxtNd = GetTxtNode();
- if( pTxtNd )
+ const SwTextNode* pTextNd = GetTextNode();
+ if( pTextNd )
{
- const SwSectionNode * pSectNd = pTxtNd->FindSectionNode();
+ const SwSectionNode * pSectNd = pTextNd->FindSectionNode();
if( pSectNd )
{
const SwSection * pSect = &pSectNd->GetSection();
@@ -691,7 +691,7 @@ SwTOXSortTabBase* SwAccessibleParagraph::GetTOXSortTabBase()
for(size_t nIndex = 0; nIndex<nSize; nIndex++ )
{
pSortBase = pTOXBaseSect->GetTOXSortTabBases()[nIndex];
- if( pSortBase->pTOXNd == pTxtNd )
+ if( pSortBase->pTOXNd == pTextNd )
break;
}
@@ -713,7 +713,7 @@ const SwRangeRedline* SwAccessibleParagraph::GetRedlineAtIndex( sal_Int32 )
if ( pCrSr )
{
SwPosition* pStart = pCrSr->Start();
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
if ( pNode )
{
const SwDoc* pDoc = pNode->GetDoc();
@@ -757,7 +757,7 @@ bool SwAccessibleParagraph::GetWordBoundary(
// get locale for this position
const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
lang::Locale aLocale = g_pBreakIt->GetLocale(
- GetTxtNode()->GetLang( nModelPos ) );
+ GetTextNode()->GetLang( nModelPos ) );
// which type of word are we interested in?
// (DICTIONARY_WORD includes punctuation, ANY_WORD doesn't.)
@@ -844,7 +844,7 @@ bool SwAccessibleParagraph::GetGlyphBoundary(
// get locale for this position
const sal_Int32 nModelPos = GetPortionData().GetModelPosition( nPos );
lang::Locale aLocale = g_pBreakIt->GetLocale(
- GetTxtNode()->GetLang( nModelPos ) );
+ GetTextNode()->GetLang( nModelPos ) );
// get word boundary, as the Break-Iterator sees fit.
const sal_Int16 nIterMode = i18n::CharacterIteratorMode::SKIPCELL;
@@ -945,14 +945,14 @@ lang::Locale SAL_CALL SwAccessibleParagraph::getLocale()
{
SolarMutexGuard aGuard;
- const SwTxtFrm *pTxtFrm = PTR_CAST( SwTxtFrm, GetFrm() );
- if( !pTxtFrm )
+ const SwTextFrm *pTextFrm = PTR_CAST( SwTextFrm, GetFrm() );
+ if( !pTextFrm )
{
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (no text frame)" );
}
- const SwTxtNode *pTxtNd = pTxtFrm->GetTxtNode();
- lang::Locale aLoc( g_pBreakIt->GetLocale( pTxtNd->GetLang( 0 ) ) );
+ const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+ lang::Locale aLoc( g_pBreakIt->GetLocale( pTextNd->GetLang( 0 ) ) );
return aLoc;
}
@@ -966,12 +966,12 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
- const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm());
- OSL_ENSURE( pTxtFrm,
+ const SwTextFrm* pTextFrm = dynamic_cast<const SwTextFrm*>(GetFrm());
+ OSL_ENSURE( pTextFrm,
"<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
- if ( pTxtFrm )
+ if ( pTextFrm )
{
- const SwCntntFrm* pPrevCntFrm( pTxtFrm->FindPrevCnt( true ) );
+ const SwContentFrm* pPrevCntFrm( pTextFrm->FindPrevCnt( true ) );
if ( pPrevCntFrm )
{
uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -981,7 +981,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
pHelper->AddRelation( aAccRel );
}
- const SwCntntFrm* pNextCntFrm( pTxtFrm->FindNextCnt( true ) );
+ const SwContentFrm* pNextCntFrm( pTextFrm->FindNextCnt( true ) );
if ( pNextCntFrm )
{
uno::Sequence< uno::Reference<XInterface> > aSequence(1);
@@ -1005,18 +1005,18 @@ void SAL_CALL SwAccessibleParagraph::grabFocus()
// get cursor shell
SwCrsrShell *pCrsrSh = GetCrsrShell();
SwPaM *pCrsr = GetCursor( false ); // #i27301# - consider new method signature
- const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
- const SwTxtNode* pTxtNd = pTxtFrm->GetTxtNode();
+ const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+ const SwTextNode* pTextNd = pTextFrm->GetTextNode();
- if( pCrsrSh != 0 && pTxtNd != 0 &&
+ if( pCrsrSh != 0 && pTextNd != 0 &&
( pCrsr == 0 ||
- pCrsr->GetPoint()->nNode.GetIndex() != pTxtNd->GetIndex() ||
- !pTxtFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
+ pCrsr->GetPoint()->nNode.GetIndex() != pTextNd->GetIndex() ||
+ !pTextFrm->IsInside( pCrsr->GetPoint()->nContent.GetIndex()) ) )
{
// create pam for selection
- SwIndex aIndex( const_cast< SwTxtNode * >( pTxtNd ),
- pTxtFrm->GetOfst() );
- SwPosition aStartPos( *pTxtNd, aIndex );
+ SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
+ pTextFrm->GetOfst() );
+ SwPosition aStartPos( *pTextNd, aIndex );
SwPaM aPaM( aStartPos );
// set PaM at cursor shell
@@ -1321,7 +1321,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::setCaretPosition( sal_Int32 nIndex )
if( pCrsrShell != NULL )
{
// create pam for selection
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nIndex));
SwPosition aStartPos( *pNode, aIndex );
SwPaM aPaM( aStartPos );
@@ -1373,7 +1373,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
aMoveState.bRealHeight = true;
aMoveState.bRealWidth = true;
SwSpecialPos aSpecialPos;
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
/* #i12332# FillSpecialPos does not accept nIndex ==
GetString().getLength(). In that case nPos is set to the
@@ -1381,7 +1381,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
returns the rectangle for a cursor at the end of the
paragraph. */
const sal_Int32 nPos = bBehindText
- ? pNode->GetTxt().getLength()
+ ? pNode->GetText().getLength()
: GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
// call GetCharRect
@@ -1392,7 +1392,7 @@ com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > SwAccessiblePa
// already get the caret position
com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > tabs;
- const sal_Int32 nStrLen = GetTxtNode()->GetTxt().getLength();
+ const sal_Int32 nStrLen = GetTextNode()->GetText().getLength();
if( nStrLen > 0 )
{
SwFrm* pTFrm = const_cast<SwFrm*>(GetFrm());
@@ -1432,38 +1432,38 @@ struct IndexCompare
OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
{
OUString strTypeName;
- SwFldMgr aMgr;
- SwTxtFld* pTxtFld = NULL;
- SwTxtNode* pTxtNd = const_cast<SwTxtNode*>( GetTxtNode() );
- SwIndex fldIndex( pTxtNd, nIndex );
- sal_Int32 nFldIndex = GetPortionData().GetFieldIndex(nIndex);
- if (nFldIndex >= 0)
- {
- const SwpHints* pSwpHints = GetTxtNode()->GetpSwpHints();
+ SwFieldMgr aMgr;
+ SwTextField* pTextField = NULL;
+ SwTextNode* pTextNd = const_cast<SwTextNode*>( GetTextNode() );
+ SwIndex fldIndex( pTextNd, nIndex );
+ sal_Int32 nFieldIndex = GetPortionData().GetFieldIndex(nIndex);
+ if (nFieldIndex >= 0)
+ {
+ const SwpHints* pSwpHints = GetTextNode()->GetpSwpHints();
if (pSwpHints)
{
const size_t nSize = pSwpHints->Count();
for( size_t i = 0; i < nSize; ++i )
{
- const SwTxtAttr* pHt = (*pSwpHints)[i];
+ const SwTextAttr* pHt = (*pSwpHints)[i];
if ( ( pHt->Which() == RES_TXTATR_FIELD
|| pHt->Which() == RES_TXTATR_ANNOTATION
|| pHt->Which() == RES_TXTATR_INPUTFIELD )
- && (nFldIndex-- == 0))
+ && (nFieldIndex-- == 0))
{
- pTxtFld = const_cast<SwTxtFld*>(
- static_txtattr_cast<SwTxtFld const*>(pHt));
+ pTextField = const_cast<SwTextField*>(
+ static_txtattr_cast<SwTextField const*>(pHt));
break;
}
else if (pHt->Which() == RES_TXTATR_REFMARK
- && (nFldIndex-- == 0))
+ && (nFieldIndex-- == 0))
strTypeName = "set reference";
}
}
}
- if (pTxtFld)
+ if (pTextField)
{
- const SwField* pField = (pTxtFld->GetFmtFld()).GetField();
+ const SwField* pField = (pTextField->GetFormatField()).GetField();
if (pField)
{
strTypeName = SwFieldType::GetTypeStr(pField->GetTypeId());
@@ -1481,10 +1481,10 @@ OUString SwAccessibleParagraph::GetFieldTypeNameAtIndex(sal_Int32 nIndex)
{
case REF_BOOKMARK:
{
- const SwGetRefField* pRefFld = dynamic_cast<const SwGetRefField*>(pField);
- if ( pRefFld && pRefFld->IsRefToHeadingCrossRefBookmark() )
+ const SwGetRefField* pRefField = dynamic_cast<const SwGetRefField*>(pField);
+ if ( pRefField && pRefField->IsRefToHeadingCrossRefBookmark() )
sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Headings"));
- else if ( pRefFld && pRefFld->IsRefToNumItemCrossRefBookmark() )
+ else if ( pRefField && pRefField->IsRefToNumItemCrossRefBookmark() )
sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Numbered Paragraphs"));
else
sEntry = OUString(RTL_CONSTASCII_USTRINGPARAM("Bookmarks"));
@@ -1683,10 +1683,10 @@ uno::Sequence<PropertyValue> SwAccessibleParagraph::getCharacterAttributes(
pValues = aValues.getArray();
- const SwTxtNode* pTxtNode( GetTxtNode() );
+ const SwTextNode* pTextNode( GetTextNode() );
PropertyValue& rValue = pValues[aValues.getLength() - 1 ];
rValue.Name = "NumberingPrefix";
- OUString sNumBullet = pTxtNode->GetNumString();
+ OUString sNumBullet = pTextNode->GetNumString();
rValue.Value <<= sNumBullet;
rValue.Handle = -1;
rValue.State = PropertyState_DIRECT_VALUE;
@@ -1740,11 +1740,11 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
const bool bOnlyCharAttrs )
{
// retrieve default attributes
- const SwTxtNode* pTxtNode( GetTxtNode() );
+ const SwTextNode* pTextNode( GetTextNode() );
::boost::scoped_ptr<SfxItemSet> pSet;
if ( !bOnlyCharAttrs )
{
- pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+ pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
RES_PARATR_BEGIN, RES_PARATR_END - 1,
RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
@@ -1752,7 +1752,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
}
else
{
- pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+ pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
0 ) );
}
@@ -1760,26 +1760,26 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
// attributes are the character attributes, which are set at the paragraph style
// of the paragraph. The character attributes set at the automatic paragraph
// style of the paragraph are treated as run attributes.
- // pTxtNode->SwCntntNode::GetAttr( *pSet );
+ // pTextNode->SwContentNode::GetAttr( *pSet );
// get default paragraph attributes, if needed, and merge these into <pSet>
if ( !bOnlyCharAttrs )
{
- SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+ SfxItemSet aParaSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
RES_PARATR_BEGIN, RES_PARATR_END - 1,
RES_FRMATR_BEGIN, RES_FRMATR_END - 1,
0 );
- pTxtNode->SwCntntNode::GetAttr( aParaSet );
+ pTextNode->SwContentNode::GetAttr( aParaSet );
pSet->Put( aParaSet );
}
// get default character attributes and merge these into <pSet>
- OSL_ENSURE( pTxtNode->GetTxtColl(),
+ OSL_ENSURE( pTextNode->GetTextColl(),
"<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" );
- if ( pTxtNode->GetTxtColl() )
+ if ( pTextNode->GetTextColl() )
{
- SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+ SfxItemSet aCharSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
RES_CHRATR_BEGIN, RES_CHRATR_END - 1,
0 );
- SetPutRecursive( aCharSet, pTxtNode->GetTxtColl()->GetAttrSet() );
+ SetPutRecursive( aCharSet, pTextNode->GetTextColl()->GetAttrSet() );
pSet->Put( aCharSet );
}
@@ -1811,13 +1811,13 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
// #i72800#
// add property value entry for the paragraph style
- if ( !bOnlyCharAttrs && pTxtNode->GetTxtColl() )
+ if ( !bOnlyCharAttrs && pTextNode->GetTextColl() )
{
if ( aDefAttrSeq.find( UNO_NAME_PARA_STYLE_NAME ) == aDefAttrSeq.end() )
{
PropertyValue rPropVal;
rPropVal.Name = UNO_NAME_PARA_STYLE_NAME;
- uno::Any aVal( uno::makeAny( pTxtNode->GetTxtColl()->GetName() ) );
+ uno::Any aVal( uno::makeAny( pTextNode->GetTextColl()->GetName() ) );
rPropVal.Value = aVal;
rPropVal.Handle = -1;
rPropVal.State = beans::PropertyState_DEFAULT_VALUE;
@@ -1957,11 +1957,11 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
// create PaM for character at position <nIndex>
SwPaM* pPaM( 0 );
{
- const SwTxtNode* pTxtNode( GetTxtNode() );
- SwPosition* pStartPos = new SwPosition( *pTxtNode );
- pStartPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex );
- SwPosition* pEndPos = new SwPosition( *pTxtNode );
- pEndPos->nContent.Assign( const_cast<SwTxtNode*>(pTxtNode), nIndex+1 );
+ const SwTextNode* pTextNode( GetTextNode() );
+ SwPosition* pStartPos = new SwPosition( *pTextNode );
+ pStartPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex );
+ SwPosition* pEndPos = new SwPosition( *pTextNode );
+ pEndPos->nContent.Assign( const_cast<SwTextNode*>(pTextNode), nIndex+1 );
pPaM = new SwPaM( *pStartPos, *pEndPos );
@@ -1980,13 +1980,13 @@ void SwAccessibleParagraph::_getRunAttributesImpl(
// SwXTextCursor::GetCrsrAttr( *pPaM, aSet, sal_True, sal_True );
// get character attributes from automatic paragraph style and merge these into <aSet>
{
- const SwTxtNode* pTxtNode( GetTxtNode() );
- if ( pTxtNode->HasSwAttrSet() )
+ const SwTextNode* pTextNode( GetTextNode() );
+ if ( pTextNode->HasSwAttrSet() )
{
SfxItemSet aAutomaticParaStyleCharAttrs( pPaM->GetDoc()->GetAttrPool(),
RES_CHRATR_BEGIN, RES_CHRATR_END -1,
0 );
- aAutomaticParaStyleCharAttrs.Put( *(pTxtNode->GetpSwAttrSet()), false );
+ aAutomaticParaStyleCharAttrs.Put( *(pTextNode->GetpSwAttrSet()), false );
aSet.Put( aAutomaticParaStyleCharAttrs );
}
}
@@ -2101,9 +2101,9 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
const uno::Sequence< OUString >& aRequestedAttributes,
tAccParaPropValMap& rSupplementalAttrSeq )
{
- const SwTxtNode* pTxtNode( GetTxtNode() );
+ const SwTextNode* pTextNode( GetTextNode() );
::boost::scoped_ptr<SfxItemSet> pSet;
- pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTxtNode->GetDoc()->GetAttrPool()),
+ pSet.reset( new SfxItemSet( const_cast<SwAttrPool&>(pTextNode->GetDoc()->GetAttrPool()),
RES_PARATR_ADJUST, RES_PARATR_ADJUST,
RES_PARATR_TABSTOP, RES_PARATR_TABSTOP,
RES_PARATR_LINESPACING, RES_PARATR_LINESPACING,
@@ -2113,13 +2113,13 @@ void SwAccessibleParagraph::_getSupplementalAttributesImpl(
RES_PARATR_LIST_BEGIN, RES_PARATR_LIST_END-1,
0 ) );
- if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+ if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
{
- pSet->Put( pTxtNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
+ pSet->Put( pTextNode->GetAttr(RES_PARATR_LIST_LEVEL, true) );
}
- pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_UL_SPACE) );
- pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_LR_SPACE) );
- pSet->Put( pTxtNode->SwCntntNode::GetAttr(RES_PARATR_ADJUST) );
+ pSet->Put( pTextNode->SwContentNode::GetAttr(RES_UL_SPACE) );
+ pSet->Put( pTextNode->SwContentNode::GetAttr(RES_LR_SPACE) );
+ pSet->Put( pTextNode->SwContentNode::GetAttr(RES_PARATR_ADJUST) );
tAccParaPropValMap aSupplementalAttrSeq;
{
@@ -2227,7 +2227,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
PropertyValue* pValues = rValues.getArray();
- const SwTxtNode* pTxtNode( GetTxtNode() );
+ const SwTextNode* pTextNode( GetTextNode() );
sal_Int32 nValues = rValues.getLength();
for (sal_Int32 i = 0; i < nValues; ++i)
@@ -2291,12 +2291,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
SwCrsrShell* pCrsrShell = GetCrsrShell();
if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
{
- const SwWrongList* pWrongList = pTxtNode->GetWrong();
+ const SwWrongList* pWrongList = pTextNode->GetWrong();
if( NULL != pWrongList )
{
sal_Int32 nBegin = nIndex;
sal_Int32 nLen = 1;
- if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+ if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
{
rValue.Value <<= (sal_uInt16)UNDERLINE_WAVE;
}
@@ -2312,12 +2312,12 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
SwCrsrShell* pCrsrShell = GetCrsrShell();
if( pCrsrShell != NULL && pCrsrShell->GetViewOptions() && pCrsrShell->GetViewOptions()->IsOnlineSpell())
{
- const SwWrongList* pWrongList = pTxtNode->GetWrong();
+ const SwWrongList* pWrongList = pTextNode->GetWrong();
if( NULL != pWrongList )
{
sal_Int32 nBegin = nIndex;
sal_Int32 nLen = 1;
- if( pWrongList->InWrongWord(nBegin,nLen) && !pTxtNode->IsSymbol(nBegin) )
+ if( pWrongList->InWrongWord(nBegin,nLen) && !pTextNode->IsSymbol(nBegin) )
{
rValue.Value <<= (sal_Int32)0x00ff0000;
continue;
@@ -2367,10 +2367,10 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
//number bullet
if (rValue.Name == UNO_NAME_NUMBERING_RULES)
{
- if ( pTxtNode->HasBullet() || pTxtNode->HasNumber() )
+ if ( pTextNode->HasBullet() || pTextNode->HasNumber() )
{
uno::Any aVal;
- SwNumRule* pNumRule = pTxtNode->GetNumRule();
+ SwNumRule* pNumRule = pTextNode->GetNumRule();
if (pNumRule)
{
uno::Reference< container::XIndexReplace > xNum = new SwXNumberingRules(*pNumRule);
@@ -2416,7 +2416,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
aMoveState.bRealHeight = true;
aMoveState.bRealWidth = true;
SwSpecialPos aSpecialPos;
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
/** #i12332# FillSpecialPos does not accept nIndex ==
GetString().getLength(). In that case nPos is set to the
@@ -2424,7 +2424,7 @@ awt::Rectangle SwAccessibleParagraph::getCharacterBounds(
returns the rectangle for a cursor at the end of the
paragraph. */
const sal_Int32 nPos = bBehindText
- ? pNode->GetTxt().getLength()
+ ? pNode->GetText().getLength()
: GetPortionData().FillSpecialPos(nIndex, aSpecialPos, aMoveState.pSpecialPos );
// call GetCharRect
@@ -2467,7 +2467,7 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
CHECK_FOR_DEFUNC_THIS( XAccessibleText, *this );
// construct SwPosition (where GetCrsrOfst() will put the result into)
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
SwIndex aIndex( pNode, 0);
SwPosition aPos( *pNode, aIndex );
@@ -2500,14 +2500,14 @@ sal_Int32 SwAccessibleParagraph::getIndexAtPoint( const awt::Point& rPoint )
// ask core for position
OSL_ENSURE( GetFrm() != NULL, "The text frame has vanished!" );
- OSL_ENSURE( GetFrm()->IsTxtFrm(), "The text frame has mutated!" );
- const SwTxtFrm* pFrm = static_cast<const SwTxtFrm*>( GetFrm() );
+ OSL_ENSURE( GetFrm()->IsTextFrm(), "The text frame has mutated!" );
+ const SwTextFrm* pFrm = static_cast<const SwTextFrm*>( GetFrm() );
SwCrsrMoveState aMoveState;
aMoveState.bPosMatchesBounds = true;
const bool bSuccess = pFrm->GetCrsrOfst( &aPos, aCorePoint, &aMoveState );
- SwIndex aCntntIdx = aPos.nContent;
- const sal_Int32 nIndex = aCntntIdx.GetIndex();
+ SwIndex aContentIdx = aPos.nContent;
+ const sal_Int32 nIndex = aContentIdx.GetIndex();
if ( nIndex > 0 )
{
SwRect aResultRect;
@@ -2594,7 +2594,7 @@ sal_Bool SwAccessibleParagraph::setSelection( sal_Int32 nStartIndex, sal_Int32 n
if( pCrsrShell != NULL )
{
// create pam for selection
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
SwIndex aIndex( pNode, GetPortionData().GetModelPosition(nStartIndex));
SwPosition aStartPos( *pNode, aIndex );
SwPaM aPaM( aStartPos );
@@ -2914,7 +2914,7 @@ sal_Bool SwAccessibleParagraph::replaceText(
if( !IsEditableState() )
return sal_False;
- SwTxtNode* pNode = const_cast<SwTxtNode*>( GetTxtNode() );
+ SwTextNode* pNode = const_cast<SwTextNode*>( GetTextNode() );
// translate positions
sal_Int32 nStart;
@@ -3089,31 +3089,31 @@ class SwHyperlinkIter_Impl
size_t nPos;
public:
- SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm );
- const SwTxtAttr *next();
+ SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm );
+ const SwTextAttr *next();
size_t getCurrHintPos() const { return nPos-1; }
sal_Int32 startIdx() const { return nStt; }
sal_Int32 endIdx() const { return nEnd; }
};
-SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTxtFrm *pTxtFrm ) :
- pHints( pTxtFrm->GetTxtNode()->GetpSwpHints() ),
- nStt( pTxtFrm->GetOfst() ),
+SwHyperlinkIter_Impl::SwHyperlinkIter_Impl( const SwTextFrm *pTextFrm ) :
+ pHints( pTextFrm->GetTextNode()->GetpSwpHints() ),
+ nStt( pTextFrm->GetOfst() ),
nPos( 0 )
{
- const SwTxtFrm *pFollFrm = pTxtFrm->GetFollow();
- nEnd = pFollFrm ? pFollFrm->GetOfst() : pTxtFrm->GetTxtNode()->Len();
+ const SwTextFrm *pFollFrm = pTextFrm->GetFollow();
+ nEnd = pFollFrm ? pFollFrm->GetOfst() : pTextFrm->GetTextNode()->Len();
}
-const SwTxtAttr *SwHyperlinkIter_Impl::next()
+const SwTextAttr *SwHyperlinkIter_Impl::next()
{
- const SwTxtAttr *pAttr = 0;
+ const SwTextAttr *pAttr = 0;
if( pHints )
{
while( !pAttr && nPos < pHints->Count() )
{
- const SwTxtAttr *pHt = (*pHints)[nPos];
+ const SwTextAttr *pHt = (*pHints)[nPos];
if( RES_TXTATR_INETFMT == pHt->Which() )
{
const sal_Int32 nHtStt = pHt->GetStart();
@@ -3142,8 +3142,8 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkCount()
sal_Int32 nCount = 0;
// #i77108# - provide hyperlinks also in editable documents.
- const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
- SwHyperlinkIter_Impl aIter( pTxtFrm );
+ const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+ SwHyperlinkIter_Impl aIter( pTextFrm );
while( aIter.next() )
nCount++;
@@ -3159,11 +3159,11 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
uno::Reference< XAccessibleHyperlink > xRet;
- const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
- SwHyperlinkIter_Impl aHIter( pTxtFrm );
+ const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+ SwHyperlinkIter_Impl aHIter( pTextFrm );
sal_Int32 nTIndex = -1;
SwTOXSortTabBase* pTBase = GetTOXSortTabBase();
- SwTxtAttr* pHt = const_cast<SwTxtAttr*>(aHIter.next());
+ SwTextAttr* pHt = const_cast<SwTextAttr*>(aHIter.next());
while( (nLinkIndex < getHyperLinkCount()) && nTIndex < nLinkIndex)
{
sal_Int32 nHStt = -1;
@@ -3227,7 +3227,7 @@ uno::Reference< XAccessibleHyperlink > SAL_CALL
// iterate next
if( bH )
// iterate next hyperlink
- pHt = const_cast<SwTxtAttr*>(aHIter.next());
+ pHt = const_cast<SwTextAttr*>(aHIter.next());
else if(bTOC)
continue;
else
@@ -3256,12 +3256,12 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getHyperLinkIndex( sal_Int32 nCharInde
sal_Int32 nRet = -1;
// #i77108#
{
- const SwTxtFrm *pTxtFrm = static_cast<const SwTxtFrm*>( GetFrm() );
- SwHyperlinkIter_Impl aHIter( pTxtFrm );
+ const SwTextFrm *pTextFrm = static_cast<const SwTextFrm*>( GetFrm() );
+ SwHyperlinkIter_Impl aHIter( pTextFrm );
const sal_Int32 nIdx = GetPortionData().GetModelPosition( nCharIndex );
sal_Int32 nPos = 0;
- const SwTxtAttr *pHt = aHIter.next();
+ const SwTextAttr *pHt = aHIter.next();
while( pHt && !(nIdx >= pHt->GetStart() && nIdx < *pHt->GetAnyEnd()) )
{
pHt = aHIter.next();
@@ -3298,7 +3298,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getTextMarkupCount( sal_Int32 nTextMar
break;
default:
{
- pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+ pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
}
}
@@ -3323,7 +3323,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getSelectedPortionCount( )
if( pCrsr != NULL )
{
// get SwPosition for my node
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
@@ -3398,7 +3398,7 @@ sal_Bool SAL_CALL SwAccessibleParagraph::removeSelection( sal_Int32 selectionInd
bool bRet = false;
// get SwPosition for my node
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
@@ -3523,7 +3523,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::addSelection( sal_Int32, sal_Int32 sta
break;
default:
{
- pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+ pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
}
}
@@ -3558,7 +3558,7 @@ uno::Sequence< /*accessibility::*/TextSegment > SAL_CALL
break;
default:
{
- pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTxtNode() ) );
+ pTextMarkupHelper.reset( new SwTextMarkupHelper( GetPortionData(), *GetTextNode() ) );
}
}
@@ -3696,7 +3696,7 @@ bool SwAccessibleParagraph::GetSelectionAtIndex(
if( pCrsr != NULL )
{
// get SwPosition for my node
- const SwTxtNode* pNode = GetTxtNode();
+ const SwTextNode* pNode = GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
diff --git a/sw/source/core/access/accpara.hxx b/sw/source/core/access/accpara.hxx
index d0e53dccda8f..bc604fbb5a65 100644
--- a/sw/source/core/access/accpara.hxx
+++ b/sw/source/core/access/accpara.hxx
@@ -34,8 +34,8 @@
#include <unordered_map>
class SwField;
-class SwTxtFrm;
-class SwTxtNode;
+class SwTextFrm;
+class SwTextNode;
class SwPaM;
class SwAccessiblePortionData;
class SwAccessibleHyperTextData;
@@ -90,8 +90,8 @@ class SwAccessibleParagraph :
SwParaChangeTrackingInfo* mpParaChangeTrackInfo; // #i108125#
- /// get the SwTxtNode (requires frame; check before)
- const SwTxtNode* GetTxtNode() const;
+ /// get the SwTextNode (requires frame; check before)
+ const SwTextNode* GetTextNode() const;
/// get the (accessible) text string (requires frame; check before)
OUString GetString();
@@ -240,7 +240,7 @@ protected:
public:
SwAccessibleParagraph( SwAccessibleMap& rInitMap,
- const SwTxtFrm& rTxtFrm );
+ const SwTextFrm& rTextFrm );
inline operator ::com::sun::star::accessibility::XAccessibleText *();
diff --git a/sw/source/core/access/accportions.cxx b/sw/source/core/access/accportions.cxx
index f9359fe76666..486c40c432fd 100644
--- a/sw/source/core/access/accportions.cxx
+++ b/sw/source/core/access/accportions.cxx
@@ -66,10 +66,10 @@ using i18n::Boundary;
#define PORATTR_TERM 128
SwAccessiblePortionData::SwAccessiblePortionData(
- const SwTxtNode* pTxtNd,
+ const SwTextNode* pTextNd,
const SwViewOption* pViewOpt ) :
SwPortionHandler(),
- pTxtNode( pTxtNd ),
+ pTextNode( pTextNd ),
aBuffer(),
nModelPosition( 0 ),
pViewOptions( pViewOpt ),
@@ -85,7 +85,7 @@ SwAccessiblePortionData::SwAccessiblePortionData(
bFinished( false ),
bLastIsSpecial( false )
{
- OSL_ENSURE( pTxtNode != NULL, "Text node is needed!" );
+ OSL_ENSURE( pTextNode != NULL, "Text node is needed!" );
// reserve some space to reduce memory allocations
aLineBreaks.reserve( 5 );
@@ -103,7 +103,7 @@ SwAccessiblePortionData::~SwAccessiblePortionData()
void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/)
{
- OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+ OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
"portion exceeds model string!" );
OSL_ENSURE( !bFinished, "We are already done!" );
@@ -121,15 +121,15 @@ void SwAccessiblePortionData::Text(sal_Int32 nLength, sal_uInt16 nType, sal_Int3
aPortionAttrs.push_back( nAttr );
// update buffer + nModelPosition
- aBuffer.append( pTxtNode->GetTxt().copy(nModelPosition, nLength) );
+ aBuffer.append( pTextNode->GetText().copy(nModelPosition, nLength) );
nModelPosition += nLength;
bLastIsSpecial = false;
}
-void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFldType )
+void SwAccessiblePortionData::SetAttrFieldType( sal_uInt16 nAttrFieldType )
{
- aAttrFieldType.push_back(nAttrFldType);
+ aAttrFieldType.push_back(nAttrFieldType);
return;
}
@@ -137,7 +137,7 @@ void SwAccessiblePortionData::Special(
sal_Int32 nLength, const OUString& rText, sal_uInt16 nType, sal_Int32 /*nHeight*/, sal_Int32 /*nWidth*/, const SwFont* /*pFont*/)
{
OSL_ENSURE( nModelPosition >= 0, "illegal position" );
- OSL_ENSURE( (nModelPosition + nLength) <= pTxtNode->GetTxt().getLength(),
+ OSL_ENSURE( (nModelPosition + nLength) <= pTextNode->GetText().getLength(),
"portion exceeds model string!" );
OSL_ENSURE( !bFinished, "We are already done!" );
@@ -187,7 +187,7 @@ void SwAccessiblePortionData::Special(
// #i111768# - apply patch from kstribley:
// Include the control characters.
case POR_CONTROLCHAR:
- sDisplay = rText + OUString( pTxtNode->GetTxt()[nModelPosition] );
+ sDisplay = rText + OUString( pTextNode->GetText()[nModelPosition] );
break;
default:
sDisplay = rText;
@@ -235,7 +235,7 @@ void SwAccessiblePortionData::Skip(sal_Int32 nLength)
{
OSL_ENSURE( !bFinished, "We are already done!" );
OSL_ENSURE( aModelPositions.empty(), "Never Skip() after portions" );
- OSL_ENSURE( nLength <= pTxtNode->GetTxt().getLength(),
+ OSL_ENSURE( nLength <= pTextNode->GetText().getLength(),
"skip exceeds model string!" );
nModelPosition += nLength;
@@ -278,7 +278,7 @@ bool SwAccessiblePortionData::IsReadOnlyPortion( size_t nPortionNo ) const
bool SwAccessiblePortionData::IsGrayPortionType( sal_uInt16 nType ) const
{
// gray portions?
- // Compare with: inftxt.cxx, SwTxtPaintInfo::DrawViewOpt(...)
+ // Compare with: inftxt.cxx, SwTextPaintInfo::DrawViewOpt(...)
bool bGray = false;
switch( nType )
{
@@ -390,7 +390,7 @@ sal_Int32 SwAccessiblePortionData::GetModelPosition( sal_Int32 nPos ) const
}
// else: return nStartPos unmodified
- OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTxtNode" );
+ OSL_ENSURE( nStartPos >= 0, "There's something weird in number of characters of SwTextNode" );
return nStartPos;
}
@@ -505,7 +505,7 @@ void SwAccessiblePortionData::GetSentenceBoundary(
sal_Int32 nNew = g_pBreakIt->GetBreakIter()->endOfSentence(
sAccessibleString, nCurrent,
- g_pBreakIt->GetLocale(pTxtNode->GetLang(nModelPos)) ) + 1;
+ g_pBreakIt->GetLocale(pTextNode->GetLang(nModelPos)) ) + 1;
if( (nNew < 0) && (nNew > nLength) )
nNew = nLength;
@@ -536,7 +536,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
Boundary& rBound,
sal_Int32 nPos) const
{
- OSL_ENSURE( pTxtNode != NULL, "Need SwTxtNode!" );
+ OSL_ENSURE( pTextNode != NULL, "Need SwTextNode!" );
// attribute boundaries can only occur on portion boundaries
FillBoundary( rBound, aAccessiblePositions,
@@ -545,7 +545,7 @@ void SwAccessiblePortionData::GetAttributeBoundary(
sal_Int32 SwAccessiblePortionData::GetAccessiblePosition( sal_Int32 nPos ) const
{
- OSL_ENSURE( nPos <= pTxtNode->GetTxt().getLength(), "illegal position" );
+ OSL_ENSURE( nPos <= pTextNode->GetText().getLength(), "illegal position" );
// find the portion number
// #i70538# - consider "empty" model portions - e.g. number portion
@@ -614,7 +614,7 @@ sal_Int32 SwAccessiblePortionData::FillSpecialPos(
// if we have anything except plain text, compute nExtend + nRefPos
if( (nModelEndPos - nModelPos == 1) &&
- (pTxtNode->GetTxt()[nModelPos] != sAccessibleString[nPos]))
+ (pTextNode->GetText()[nModelPos] != sAccessibleString[nPos]))
{
// case 1: a one-character, non-text portion
// reference position is the first accessibilty for our
diff --git a/sw/source/core/access/accportions.hxx b/sw/source/core/access/accportions.hxx
index d3f879862b05..5650b25998da 100644
--- a/sw/source/core/access/accportions.hxx
+++ b/sw/source/core/access/accportions.hxx
@@ -25,7 +25,7 @@
#include <rtl/ustrbuf.hxx>
#include <vector>
-class SwTxtNode;
+class SwTextNode;
struct SwSpecialPos;
class SwViewOption;
namespace com { namespace sun { namespace star {
@@ -38,7 +38,7 @@ namespace com { namespace sun { namespace star {
class SwAccessiblePortionData : public SwPortionHandler
{
// the node this portion is referring to
- const SwTxtNode* pTxtNode;
+ const SwTextNode* pTextNode;
// variables used while collecting the data
OUStringBuffer aBuffer;
@@ -92,7 +92,7 @@ class SwAccessiblePortionData : public SwPortionHandler
sal_Int32& nCorePos, bool& bEdit ) const;
public:
- SwAccessiblePortionData( const SwTxtNode* pTxtNd,
+ SwAccessiblePortionData( const SwTextNode* pTextNd,
const SwViewOption* pViewOpt = NULL );
virtual ~SwAccessiblePortionData();
@@ -103,7 +103,7 @@ public:
virtual void Skip(sal_Int32 nLength) SAL_OVERRIDE;
virtual void Finish() SAL_OVERRIDE;
- virtual void SetAttrFieldType( sal_uInt16 nAttrFldType ) SAL_OVERRIDE;
+ virtual void SetAttrFieldType( sal_uInt16 nAttrFieldType ) SAL_OVERRIDE;
bool FillBoundaryIFDateField( com::sun::star::i18n::Boundary& rBound, const sal_Int32 nPos );
bool IsIndexInFootnode(sal_Int32 nIndex);
bool IsInGrayPortion( sal_Int32 nPos );
@@ -146,7 +146,7 @@ public:
sal_Int32 GetModelPosition( sal_Int32 nPos ) const;
/// fill a SwSpecialPos structure, suitable for calling
- /// SwTxtFrm->GetCharRect
+ /// SwTextFrm->GetCharRect
/// Returns the core position, and fills rpPos either with NULL or
/// with the &rPos, after putting the appropriate data into it.
sal_Int32 FillSpecialPos( sal_Int32 nPos,
diff --git a/sw/source/core/access/accselectionhelper.cxx b/sw/source/core/access/accselectionhelper.cxx
index 3211f0b8e73e..cec061212223 100644
--- a/sw/source/core/access/accselectionhelper.cxx
+++ b/sw/source/core/access/accselectionhelper.cxx
@@ -301,10 +301,10 @@ Reference<XAccessible> SwAccessibleSelectionHelper::getSelectedAccessibleChild(
}
else
{
- const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- if (pFrmFmt)
+ const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ if (pFrameFormat)
{
- const SwFmtAnchor& pAnchor = pFrmFmt->GetAnchor();
+ const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
if( pAnchor.GetAnchorId() == FLY_AS_CHAR )
{
const SwFrm *pParaFrm = SwAccessibleFrame::GetParent( SwAccessibleChild(pFlyFrm), m_rContext.IsInPagePreview() );
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 0c96b054f421..0deb99b4b10e 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -775,12 +775,12 @@ SwAccessibleTable::SwAccessibleTable(
{
SolarMutexGuard aGuard;
- const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
- const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
+ const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+ const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
- SetName( pFrmFmt->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
+ SetName( pFrameFormat->GetName() + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
- const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFmt()->GetName() );
+ const OUString sArg1( static_cast< const SwTabFrm * >( GetFrm() )->GetFormat()->GetName() );
const OUString sArg2( GetFormattedPageNumber() );
sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sArg1, &sArg2 );
@@ -803,11 +803,11 @@ void SwAccessibleTable::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew
case RES_NAME_CHANGED:
if( pTabFrm )
{
- const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
- OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+ const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+ OSL_ENSURE( pFrameFormat == GetRegisteredIn(), "invalid frame" );
const OUString sOldName( GetName() );
- const OUString sNewTabName = pFrmFmt->GetName();
+ const OUString sNewTabName = pFrameFormat->GetName();
SetName( sNewTabName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
@@ -1520,7 +1520,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
// if we have a selection in a table, check if it's in the
// same table that we're trying to select in
- const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTbl();
+ const SwTableNode* pSelectedTable = pCrsrShell->IsCrsrInTable();
if( pSelectedTable != NULL )
{
// get top-most table line
@@ -1535,7 +1535,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
// create the new selection
const SwStartNode* pStartNode = pBox->GetSttNd();
- if( pSelectedTable == NULL || !pCrsrShell->GetTblCrs() )
+ if( pSelectedTable == NULL || !pCrsrShell->GetTableCrs() )
{
pCrsrShell->StartAction();
// Set cursor into current cell. This deletes any table cursor.
@@ -1547,7 +1547,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
pCrsrShell->SetMark();
pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
// now set the cursor into the cell again.
- SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+ SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
: pCrsrShell->GetCrsr();
*pPaM->GetPoint() = *pPaM->GetMark();
pCrsrShell->EndAction();
@@ -1561,7 +1561,7 @@ void SAL_CALL SwAccessibleTable::selectAccessibleChild(
SwPaM aPaM( *pStartNode );
aPaM.Move( fnMoveForward, fnGoNode );
aPaM.SetMark();
- const SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+ const SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
: pCrsrShell->GetCrsr();
*(aPaM.GetMark()) = *pPaM->GetMark();
Select( aPaM );
@@ -1681,7 +1681,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
// If we unselect point, then set cursor to mark. If we clear another
// selected box, then set cursor to point.
// reduce selection to mark.
- SwPaM *pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+ SwPaM *pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
: pCrsrShell->GetCrsr();
bool bDeselectPoint =
pBox->GetSttNd() ==
@@ -1698,7 +1698,7 @@ void SAL_CALL SwAccessibleTable::deselectAccessibleChild(
pCrsrShell->SetMark();
pCrsrShell->MoveTable( fnTableCurr, fnTableEnd );
// now set the cursor into the cell again.
- pPaM = pCrsrShell->GetTblCrs() ? pCrsrShell->GetTblCrs()
+ pPaM = pCrsrShell->GetTableCrs() ? pCrsrShell->GetTableCrs()
: pCrsrShell->GetCrsr();
*pPaM->GetPoint() = *pPaM->GetMark();
pCrsrShell->EndAction();
@@ -1867,9 +1867,9 @@ SwAccessibleTableColHeaders::SwAccessibleTableColHeaders( SwAccessibleMap *pMap2
{
SolarMutexGuard aGuard;
- const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
- const_cast< SwFrmFmt * >( pFrmFmt )->Add( this );
- const OUString aName = pFrmFmt->GetName() + "-ColumnHeaders";
+ const SwFrameFormat *pFrameFormat = pTabFrm->GetFormat();
+ const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
+ const OUString aName = pFrameFormat->GetName() + "-ColumnHeaders";
SetName( aName + "-" + OUString::number( pTabFrm->GetPhyPageNum() ) );
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index b176c49c54de..cc88805cf511 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -50,11 +50,11 @@ SwAccessibleTextFrame::SwAccessibleTextFrame(
msTitle(),
msDesc()
{
- const SwFlyFrmFmt* pFlyFrmFmt =
- dynamic_cast<const SwFlyFrmFmt*>( rFlyFrm.GetFmt() );
- msTitle = pFlyFrmFmt->GetObjTitle();
+ const SwFlyFrameFormat* pFlyFrameFormat =
+ dynamic_cast<const SwFlyFrameFormat*>( rFlyFrm.GetFormat() );
+ msTitle = pFlyFrameFormat->GetObjTitle();
- msDesc = pFlyFrmFmt->GetObjDescription();
+ msDesc = pFlyFrameFormat->GetObjDescription();
if ( msDesc.isEmpty() &&
msTitle != GetName() )
{
@@ -101,9 +101,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
aEvent.NewValue <<= msTitle;
FireAccessibleEvent( aEvent );
- const SwFlyFrmFmt* pFlyFrmFmt =
- dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
- if (!pFlyFrmFmt || !pFlyFrmFmt->GetObjDescription().isEmpty())
+ const SwFlyFrameFormat* pFlyFrameFormat =
+ dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+ if (!pFlyFrameFormat || !pFlyFrameFormat->GetObjDescription().isEmpty())
{
break;
}
@@ -115,9 +115,9 @@ void SwAccessibleTextFrame::Modify( const SfxPoolItem* pOld, const SfxPoolItem *
{
const OUString sOldDesc( msDesc );
- const SwFlyFrmFmt* pFlyFrmFmt =
- dynamic_cast<const SwFlyFrmFmt*>( pFlyFrm->GetFmt() );
- const OUString& rDesc = pFlyFrmFmt->GetObjDescription();
+ const SwFlyFrameFormat* pFlyFrameFormat =
+ dynamic_cast<const SwFlyFrameFormat*>( pFlyFrm->GetFormat() );
+ const OUString& rDesc = pFlyFrameFormat->GetObjDescription();
msDesc = rDesc;
if ( msDesc.isEmpty() &&
msTitle != GetName() )
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index f9d2d5fa6b8a..405f4228f327 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -31,7 +31,7 @@
#include <algorithm>
namespace {
- void initChangeTrackTextMarkupLists( const SwTxtFrm& rTxtFrm,
+ void initChangeTrackTextMarkupLists( const SwTextFrm& rTextFrm,
SwWrongList*& opChangeTrackInsertionTextMarkupList,
SwWrongList*& opChangeTrackDeletionTextMarkupList,
SwWrongList*& opChangeTrackFormatChangeTextMarkupList )
@@ -40,14 +40,14 @@ namespace {
opChangeTrackDeletionTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
opChangeTrackFormatChangeTextMarkupList = new SwWrongList( WRONGLIST_CHANGETRACKING );
- if ( !rTxtFrm.GetTxtNode() )
+ if ( !rTextFrm.GetTextNode() )
{
- OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
+ OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <SwTextNode> instance!" );
return;
}
- const SwTxtNode& rTxtNode( *(rTxtFrm.GetTxtNode()) );
+ const SwTextNode& rTextNode( *(rTextFrm.GetTextNode()) );
- const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
+ const IDocumentRedlineAccess* pIDocChangeTrack( rTextNode.getIDocumentRedlineAccess() );
if ( !pIDocChangeTrack )
{
OSL_FAIL( "<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
@@ -55,47 +55,47 @@ namespace {
}
if ( !IDocumentRedlineAccess::IsShowChanges( pIDocChangeTrack->GetRedlineMode() ) ||
- pIDocChangeTrack->GetRedlineTbl().empty() )
+ pIDocChangeTrack->GetRedlineTable().empty() )
{
// nothing to do --> empty change track text markup lists.
return;
}
- const sal_uInt16 nIdxOfFirstRedlineForTxtNode =
- pIDocChangeTrack->GetRedlinePos( rTxtNode, USHRT_MAX );
- if ( nIdxOfFirstRedlineForTxtNode == USHRT_MAX )
+ const sal_uInt16 nIdxOfFirstRedlineForTextNode =
+ pIDocChangeTrack->GetRedlinePos( rTextNode, USHRT_MAX );
+ if ( nIdxOfFirstRedlineForTextNode == USHRT_MAX )
{
// nothing to do --> empty change track text markup lists.
return;
}
- const sal_Int32 nTxtFrmTextStartPos = rTxtFrm.IsFollow()
- ? rTxtFrm.GetOfst()
+ const sal_Int32 nTextFrmTextStartPos = rTextFrm.IsFollow()
+ ? rTextFrm.GetOfst()
: 0;
- const sal_Int32 nTxtFrmTextEndPos = rTxtFrm.HasFollow()
- ? rTxtFrm.GetFollow()->GetOfst()
- : rTxtFrm.GetTxt().getLength();
+ const sal_Int32 nTextFrmTextEndPos = rTextFrm.HasFollow()
+ ? rTextFrm.GetFollow()->GetOfst()
+ : rTextFrm.GetText().getLength();
// iteration over the redlines which overlap with the text node.
- const SwRedlineTbl& rRedlineTbl = pIDocChangeTrack->GetRedlineTbl();
- const sal_uInt16 nRedlineCount( rRedlineTbl.size() );
- for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTxtNode;
+ const SwRedlineTable& rRedlineTable = pIDocChangeTrack->GetRedlineTable();
+ const sal_uInt16 nRedlineCount( rRedlineTable.size() );
+ for ( sal_uInt16 nActRedline = nIdxOfFirstRedlineForTextNode;
nActRedline < nRedlineCount;
++nActRedline)
{
- const SwRangeRedline* pActRedline = rRedlineTbl[ nActRedline ];
- if ( pActRedline->Start()->nNode > rTxtNode.GetIndex() )
+ const SwRangeRedline* pActRedline = rRedlineTable[ nActRedline ];
+ if ( pActRedline->Start()->nNode > rTextNode.GetIndex() )
{
break;
}
- sal_Int32 nTxtNodeChangeTrackStart(COMPLETE_STRING);
- sal_Int32 nTxtNodeChangeTrackEnd(COMPLETE_STRING);
- pActRedline->CalcStartEnd( rTxtNode.GetIndex(),
- nTxtNodeChangeTrackStart,
- nTxtNodeChangeTrackEnd );
- if ( nTxtNodeChangeTrackStart > nTxtFrmTextEndPos ||
- nTxtNodeChangeTrackEnd < nTxtFrmTextStartPos )
+ sal_Int32 nTextNodeChangeTrackStart(COMPLETE_STRING);
+ sal_Int32 nTextNodeChangeTrackEnd(COMPLETE_STRING);
+ pActRedline->CalcStartEnd( rTextNode.GetIndex(),
+ nTextNodeChangeTrackStart,
+ nTextNodeChangeTrackEnd );
+ if ( nTextNodeChangeTrackStart > nTextFrmTextEndPos ||
+ nTextNodeChangeTrackEnd < nTextFrmTextStartPos )
{
// Consider only redlines which overlap with the text frame's text.
continue;
@@ -126,23 +126,23 @@ namespace {
}
if ( pMarkupList )
{
- const sal_Int32 nTxtFrmChangeTrackStart =
- std::max(nTxtNodeChangeTrackStart, nTxtFrmTextStartPos);
+ const sal_Int32 nTextFrmChangeTrackStart =
+ std::max(nTextNodeChangeTrackStart, nTextFrmTextStartPos);
- const sal_Int32 nTxtFrmChangeTrackEnd =
- std::min(nTxtNodeChangeTrackEnd, nTxtFrmTextEndPos);
+ const sal_Int32 nTextFrmChangeTrackEnd =
+ std::min(nTextNodeChangeTrackEnd, nTextFrmTextEndPos);
pMarkupList->Insert( OUString(), 0,
- nTxtFrmChangeTrackStart,
- nTxtFrmChangeTrackEnd - nTxtFrmChangeTrackStart,
+ nTextFrmChangeTrackStart,
+ nTextFrmChangeTrackEnd - nTextFrmChangeTrackStart,
pMarkupList->Count() );
}
} // eof iteration over the redlines which overlap with the text node
}
} // eof anonymous namespace
-SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm )
- : mrTxtFrm( rTxtFrm )
+SwParaChangeTrackingInfo::SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm )
+ : mrTextFrm( rTextFrm )
, mpChangeTrackInsertionTextMarkupList( 0 )
, mpChangeTrackDeletionTextMarkupList( 0 )
, mpChangeTrackFormatChangeTextMarkupList( 0 )
@@ -176,7 +176,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
"<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0,
"<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
- initChangeTrackTextMarkupLists( mrTxtFrm,
+ initChangeTrackTextMarkupLists( mrTextFrm,
mpChangeTrackInsertionTextMarkupList,
mpChangeTrackDeletionTextMarkupList,
mpChangeTrackFormatChangeTextMarkupList );
diff --git a/sw/source/core/access/parachangetrackinginfo.hxx b/sw/source/core/access/parachangetrackinginfo.hxx
index 5eaed9e6fe65..a8592529f1f0 100644
--- a/sw/source/core/access/parachangetrackinginfo.hxx
+++ b/sw/source/core/access/parachangetrackinginfo.hxx
@@ -22,13 +22,13 @@
#include <sal/types.h>
-class SwTxtFrm;
+class SwTextFrm;
class SwWrongList;
class SwParaChangeTrackingInfo
{
public:
- explicit SwParaChangeTrackingInfo( const SwTxtFrm& rTxtFrm );
+ explicit SwParaChangeTrackingInfo( const SwTextFrm& rTextFrm );
~SwParaChangeTrackingInfo();
void reset();
@@ -39,7 +39,7 @@ class SwParaChangeTrackingInfo
SwParaChangeTrackingInfo( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
SwParaChangeTrackingInfo& operator=( const SwParaChangeTrackingInfo& ) SAL_DELETED_FUNCTION;
- const SwTxtFrm& mrTxtFrm;
+ const SwTextFrm& mrTextFrm;
SwWrongList* mpChangeTrackInsertionTextMarkupList;
SwWrongList* mpChangeTrackDeletionTextMarkupList;
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index 2217f9d84c2d..d316b21ba9c2 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -33,7 +33,7 @@ using namespace com::sun::star;
// helper functions
namespace {
- const SwWrongList* getTextMarkupList( const SwTxtNode& rTxtNode,
+ const SwWrongList* getTextMarkupList( const SwTextNode& rTextNode,
const sal_Int32 nTextMarkupType )
throw (::com::sun::star::lang::IllegalArgumentException,
::com::sun::star::uno::RuntimeException)
@@ -43,7 +43,7 @@ namespace {
{
case text::TextMarkupType::SPELLCHECK:
{
- pTextMarkupList = rTxtNode.GetWrong();
+ pTextMarkupList = rTextNode.GetWrong();
}
break;
case text::TextMarkupType::PROOFREADING:
@@ -70,10 +70,10 @@ namespace {
// implementation of class <SwTextMarkupoHelper>
SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
- const SwTxtNode& rTxtNode )
+ const SwTextNode& rTextNode )
: mrPortionData( rPortionData )
// #i108125#
- , mpTxtNode( &rTxtNode )
+ , mpTextNode( &rTextNode )
, mpTextMarkupList( 0 )
{
}
@@ -82,7 +82,7 @@ SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionD
SwTextMarkupHelper::SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
const SwWrongList& rTextMarkupList )
: mrPortionData( rPortionData )
- , mpTxtNode( 0 )
+ , mpTextNode( 0 )
, mpTextMarkupList( &rTextMarkupList )
{
}
@@ -97,7 +97,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
const SwWrongList* pTextMarkupList =
mpTextMarkupList
? mpTextMarkupList
- : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+ : getTextMarkupList( *mpTextNode, nTextMarkupType );
if ( pTextMarkupList )
{
nTextMarkupCount = pTextMarkupList->Count();
@@ -127,7 +127,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
const SwWrongList* pTextMarkupList =
mpTextMarkupList
? mpTextMarkupList
- : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+ : getTextMarkupList( *mpTextNode, nTextMarkupType );
if ( pTextMarkupList )
{
const SwWrongArea* pTextMarkup =
@@ -174,7 +174,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
const SwWrongList* pTextMarkupList =
mpTextMarkupList
? mpTextMarkupList
- : getTextMarkupList( *mpTxtNode, nTextMarkupType );
+ : getTextMarkupList( *mpTextNode, nTextMarkupType );
::std::vector< ::com::sun::star::accessibility::TextSegment > aTmpTextMarkups;
if ( pTextMarkupList )
{
diff --git a/sw/source/core/access/textmarkuphelper.hxx b/sw/source/core/access/textmarkuphelper.hxx
index e38dba18ad92..37dd9f073a47 100644
--- a/sw/source/core/access/textmarkuphelper.hxx
+++ b/sw/source/core/access/textmarkuphelper.hxx
@@ -30,13 +30,13 @@ struct TextSegment;
} } } }
class SwAccessiblePortionData;
-class SwTxtNode;
+class SwTextNode;
class SwWrongList; // #i108125#
class SwTextMarkupHelper
{
public:
SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
- const SwTxtNode& rTxtNode );
+ const SwTextNode& rTextNode );
SwTextMarkupHelper( const SwAccessiblePortionData& rPortionData,
const SwWrongList& rTextMarkupList ); // #i108125#
~SwTextMarkupHelper() {}
@@ -66,7 +66,7 @@ class SwTextMarkupHelper
const SwAccessiblePortionData& mrPortionData;
// #i108125#
- const SwTxtNode* mpTxtNode;
+ const SwTextNode* mpTextNode;
const SwWrongList* mpTextMarkupList;
};
#endif
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 4e56fbaeee75..5cda63a62d3a 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -31,41 +31,41 @@
#include <calbck.hxx>
#include <swtable.hxx>
-SwTblBoxNumFormat::SwTblBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
+SwTableBoxNumFormat::SwTableBoxNumFormat( sal_uInt32 nFormat, bool bFlag )
: SfxUInt32Item( RES_BOXATR_FORMAT, nFormat ), bAuto( bFlag )
{
}
-bool SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
- return GetValue() == static_cast<const SwTblBoxNumFormat&>(rAttr).GetValue() &&
- bAuto == static_cast<const SwTblBoxNumFormat&>(rAttr).bAuto;
+ return GetValue() == static_cast<const SwTableBoxNumFormat&>(rAttr).GetValue() &&
+ bAuto == static_cast<const SwTableBoxNumFormat&>(rAttr).bAuto;
}
-SfxPoolItem* SwTblBoxNumFormat::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const
{
- return new SwTblBoxNumFormat( GetValue(), bAuto );
+ return new SwTableBoxNumFormat( GetValue(), bAuto );
}
-SwTblBoxFormula::SwTblBoxFormula( const OUString& rFormula )
+SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula )
: SfxPoolItem( RES_BOXATR_FORMULA ),
SwTableFormula( rFormula ),
pDefinedIn( 0 )
{
}
-bool SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxFormula::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
- return GetFormula() == static_cast<const SwTblBoxFormula&>(rAttr).GetFormula() &&
- pDefinedIn == static_cast<const SwTblBoxFormula&>(rAttr).pDefinedIn;
+ return GetFormula() == static_cast<const SwTableBoxFormula&>(rAttr).GetFormula() &&
+ pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).pDefinedIn;
}
-SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
{
// switch to external rendering
- SwTblBoxFormula* pNew = new SwTblBoxFormula( GetFormula() );
+ SwTableBoxFormula* pNew = new SwTableBoxFormula( GetFormula() );
pNew->SwTableFormula::operator=( *this );
return pNew;
}
@@ -77,7 +77,7 @@ SfxPoolItem* SwTblBoxFormula::Clone( SfxItemPool* ) const
Caution: Must override when inheriting.
*/
-const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
+const SwNode* SwTableBoxFormula::GetNodeOfFormula() const
{
const SwNode* pRet = 0;
if( pDefinedIn )
@@ -89,7 +89,7 @@ const SwNode* SwTblBoxFormula::GetNodeOfFormula() const
return pRet;
}
-SwTableBox* SwTblBoxFormula::GetTableBox()
+SwTableBox* SwTableBoxFormula::GetTableBox()
{
SwTableBox* pBox = 0;
if( pDefinedIn )
@@ -97,12 +97,12 @@ SwTableBox* SwTblBoxFormula::GetTableBox()
return pBox;
}
-void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
+void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
{
if( !pDefinedIn )
return ;
- SwTableFmlUpdate* pUpdtFld;
+ SwTableFormulaUpdate* pUpdateField;
if( !pItem || RES_TABLEFML_UPDATE != pItem->Which() )
{
// reset value flag
@@ -110,109 +110,109 @@ void SwTblBoxFormula::ChangeState( const SfxPoolItem* pItem )
return ;
}
- pUpdtFld = const_cast<SwTableFmlUpdate*>(static_cast<const SwTableFmlUpdate*>(pItem));
+ pUpdateField = const_cast<SwTableFormulaUpdate*>(static_cast<const SwTableFormulaUpdate*>(pItem));
// detect table that contains this attribute
- const SwTableNode* pTblNd;
+ const SwTableNode* pTableNd;
const SwNode* pNd = GetNodeOfFormula();
if( pNd && &pNd->GetNodes() == &pNd->GetDoc()->GetNodes() &&
- 0 != ( pTblNd = pNd->FindTableNode() ))
+ 0 != ( pTableNd = pNd->FindTableNode() ))
{
- switch( pUpdtFld->eFlags )
+ switch( pUpdateField->eFlags )
{
case TBL_CALC:
// reset value flag
ChgValid( false );
break;
case TBL_BOXNAME:
- if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+ if( &pTableNd->GetTable() == pUpdateField->pTable )
// use external rendering
- PtrToBoxNm( pUpdtFld->pTbl );
+ PtrToBoxNm( pUpdateField->pTable );
break;
case TBL_BOXPTR:
// internal rendering
- BoxNmToPtr( &pTblNd->GetTable() );
+ BoxNmToPtr( &pTableNd->GetTable() );
break;
case TBL_RELBOXNAME:
- if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+ if( &pTableNd->GetTable() == pUpdateField->pTable )
// relative rendering
- ToRelBoxNm( pUpdtFld->pTbl );
+ ToRelBoxNm( pUpdateField->pTable );
break;
case TBL_SPLITTBL:
- if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+ if( &pTableNd->GetTable() == pUpdateField->pTable )
{
- sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTbl(
- pTblNd->GetTable(), GetTableBox() );
- pUpdtFld->bBehindSplitLine = USHRT_MAX != nLnPos &&
- pUpdtFld->nSplitLine <= nLnPos;
+ sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTable(
+ pTableNd->GetTable(), GetTableBox() );
+ pUpdateField->bBehindSplitLine = USHRT_MAX != nLnPos &&
+ pUpdateField->nSplitLine <= nLnPos;
}
else
- pUpdtFld->bBehindSplitLine = false;
+ pUpdateField->bBehindSplitLine = false;
// no break
case TBL_MERGETBL:
- if( pUpdtFld->pHistory )
+ if( pUpdateField->pHistory )
{
// for a history record the unchanged formula is needed
- SwTblBoxFormula aCopy( *this );
- pUpdtFld->bModified = false;
- ToSplitMergeBoxNm( *pUpdtFld );
+ SwTableBoxFormula aCopy( *this );
+ pUpdateField->bModified = false;
+ ToSplitMergeBoxNm( *pUpdateField );
- if( pUpdtFld->bModified )
+ if( pUpdateField->bModified )
{
// external rendering
- aCopy.PtrToBoxNm( &pTblNd->GetTable() );
- pUpdtFld->pHistory->Add(
+ aCopy.PtrToBoxNm( &pTableNd->GetTable() );
+ pUpdateField->pHistory->Add(
&aCopy,
&aCopy,
pNd->FindTableBoxStartNode()->GetIndex());
}
}
else
- ToSplitMergeBoxNm( *pUpdtFld );
+ ToSplitMergeBoxNm( *pUpdateField );
break;
}
}
}
-void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara, double& rValue )
+void SwTableBoxFormula::Calc( SwTableCalcPara& rCalcPara, double& rValue )
{
if( !rCalcPara.rCalc.IsCalcError() )
{
// create pointers from box names
- BoxNmToPtr( rCalcPara.pTbl );
- const OUString sFml( MakeFormula( rCalcPara ));
+ BoxNmToPtr( rCalcPara.pTable );
+ const OUString sFormula( MakeFormula( rCalcPara ));
if( !rCalcPara.rCalc.IsCalcError() )
- rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
+ rValue = rCalcPara.rCalc.Calculate( sFormula ).GetDouble();
else
rValue = DBL_MAX;
ChgValid( !rCalcPara.IsStackOverflow() ); // value is now valid again
}
}
-SwTblBoxValue::SwTblBoxValue()
+SwTableBoxValue::SwTableBoxValue()
: SfxPoolItem( RES_BOXATR_VALUE ), nValue( 0 )
{
}
-SwTblBoxValue::SwTblBoxValue( const double nVal )
+SwTableBoxValue::SwTableBoxValue( const double nVal )
: SfxPoolItem( RES_BOXATR_VALUE ), nValue( nVal )
{
}
-bool SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
+bool SwTableBoxValue::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
- SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) );
+ SwTableBoxValue const& rOther( static_cast<SwTableBoxValue const&>(rAttr) );
// items with NaN should be equal to enable pooling
return ::rtl::math::isNan( nValue )
? ::rtl::math::isNan( rOther.nValue )
: ( nValue == rOther.nValue );
}
-SfxPoolItem* SwTblBoxValue::Clone( SfxItemPool* ) const
+SfxPoolItem* SwTableBoxValue::Clone( SfxItemPool* ) const
{
- return new SwTblBoxValue( nValue );
+ return new SwTableBoxValue( nValue );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtfollowtextflow.cxx b/sw/source/core/attr/fmtfollowtextflow.cxx
index 5660cdba5b3e..7cd973a47fb8 100644
--- a/sw/source/core/attr/fmtfollowtextflow.cxx
+++ b/sw/source/core/attr/fmtfollowtextflow.cxx
@@ -19,11 +19,11 @@
#include <fmtfollowtextflow.hxx>
-TYPEINIT1(SwFmtFollowTextFlow, SfxBoolItem);
+TYPEINIT1(SwFormatFollowTextFlow, SfxBoolItem);
-SfxPoolItem* SwFmtFollowTextFlow::Clone( SfxItemPool * ) const
+SfxPoolItem* SwFormatFollowTextFlow::Clone( SfxItemPool * ) const
{
- return new SwFmtFollowTextFlow(*this);
+ return new SwFormatFollowTextFlow(*this);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index 0224f4fb9605..6ee45e2c913e 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -25,45 +25,45 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-TYPEINIT1(SwFmtWrapInfluenceOnObjPos, SfxPoolItem);
+TYPEINIT1(SwFormatWrapInfluenceOnObjPos, SfxPoolItem);
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
: SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
mnWrapInfluenceOnPosition( _nWrapInfluenceOnPosition )
{
}
-SwFmtWrapInfluenceOnObjPos::SwFmtWrapInfluenceOnObjPos( const SwFmtWrapInfluenceOnObjPos& _rCpy )
+SwFormatWrapInfluenceOnObjPos::SwFormatWrapInfluenceOnObjPos( const SwFormatWrapInfluenceOnObjPos& _rCpy )
: SfxPoolItem( RES_WRAP_INFLUENCE_ON_OBJPOS ),
mnWrapInfluenceOnPosition( _rCpy.GetWrapInfluenceOnObjPos() )
{
}
-SwFmtWrapInfluenceOnObjPos::~SwFmtWrapInfluenceOnObjPos()
+SwFormatWrapInfluenceOnObjPos::~SwFormatWrapInfluenceOnObjPos()
{
}
-SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=( const SwFmtWrapInfluenceOnObjPos& _rSource )
+SwFormatWrapInfluenceOnObjPos& SwFormatWrapInfluenceOnObjPos::operator=( const SwFormatWrapInfluenceOnObjPos& _rSource )
{
mnWrapInfluenceOnPosition = _rSource.GetWrapInfluenceOnObjPos();
return *this;
}
-bool SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
+bool SwFormatWrapInfluenceOnObjPos::operator==( const SfxPoolItem& rAttr ) const
{
assert(SfxPoolItem::operator==(rAttr));
return ( mnWrapInfluenceOnPosition ==
- static_cast<const SwFmtWrapInfluenceOnObjPos&>(rAttr).
+ static_cast<const SwFormatWrapInfluenceOnObjPos&>(rAttr).
GetWrapInfluenceOnObjPos() );
}
-SfxPoolItem* SwFmtWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
+SfxPoolItem* SwFormatWrapInfluenceOnObjPos::Clone( SfxItemPool * ) const
{
- return new SwFmtWrapInfluenceOnObjPos(*this);
+ return new SwFormatWrapInfluenceOnObjPos(*this);
}
-bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
+bool SwFormatWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = true;
@@ -73,13 +73,13 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, sal_uInt8 nMemberId ) co
}
else
{
- OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+ OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
bRet = false;
}
return bRet;
}
-bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
+bool SwFormatWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId )
{
nMemberId &= ~CONVERT_TWIPS;
bool bRet = false;
@@ -98,17 +98,17 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, sal_uInt8 nMemberId
}
else
{
- OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+ OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
}
}
else
{
- OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
+ OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::PutValue(..)> - unknown MemberId" );
}
return bRet;
}
-void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
+void SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition )
{
// #i35017# - constant names have changed and consider new value <ITERATIVE>
if ( _nWrapInfluenceOnPosition == text::WrapInfluenceOnPosition::ONCE_SUCCESSIVE ||
@@ -119,13 +119,13 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
}
else
{
- OSL_FAIL( "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+ OSL_FAIL( "<SwFormatWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
}
}
// #i35017# - add parameter <_bIterativeAsOnceConcurrent> to control, if
// value <ITERATIVE> has to be treated as <ONCE_CONCURRENT>
-sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
+sal_Int16 SwFormatWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
const bool _bIterativeAsOnceConcurrent ) const
{
sal_Int16 nWrapInfluenceOnPosition( mnWrapInfluenceOnPosition );
@@ -139,9 +139,9 @@ sal_Int16 SwFmtWrapInfluenceOnObjPos::GetWrapInfluenceOnObjPos(
return nWrapInfluenceOnPosition;
}
-void SwFmtWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
+void SwFormatWrapInfluenceOnObjPos::dumpAsXml(xmlTextWriterPtr pWriter) const
{
- xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtWrapInfluenceOnObjPos"));
+ xmlTextWriterStartElement(pWriter, BAD_CAST("swFormatWrapInfluenceOnObjPos"));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nWrapInfluenceOnPosition"), BAD_CAST(OString::number(mnWrapInfluenceOnPosition).getStr()));
xmlTextWriterEndElement(pWriter);
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 9344426e9b4b..f5df08fa9860 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -38,72 +38,72 @@
using namespace com::sun::star;
-TYPEINIT1( SwFmt, SwClient );
+TYPEINIT1( SwFormat, SwClient );
-SwFmt::SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
- const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm,
- sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
+ const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm,
+ sal_uInt16 nFormatWhich )
: SwModify( pDrvdFrm ),
- m_aFmtName( OUString::createFromAscii(pFmtNm) ),
+ m_aFormatName( OUString::createFromAscii(pFormatNm) ),
m_aSet( rPool, pWhichRanges ),
- m_nWhichId( nFmtWhich ),
- m_nPoolFmtId( USHRT_MAX ),
+ m_nWhichId( nFormatWhich ),
+ m_nPoolFormatId( USHRT_MAX ),
m_nPoolHelpId( USHRT_MAX ),
m_nPoolHlpFileId( UCHAR_MAX )
{
- m_bAutoUpdateFmt = false; // LAYER_IMPL
- m_bAutoFmt = true;
- m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+ m_bAutoUpdateFormat = false; // LAYER_IMPL
+ m_bAutoFormat = true;
+ m_bWritten = m_bFormatInDTOR = m_bHidden = false;
if( pDrvdFrm )
m_aSet.SetParent( &pDrvdFrm->m_aSet );
}
-SwFmt::SwFmt( SwAttrPool& rPool, const OUString& rFmtNm,
- const sal_uInt16* pWhichRanges, SwFmt* pDrvdFrm,
- sal_uInt16 nFmtWhich )
+SwFormat::SwFormat( SwAttrPool& rPool, const OUString& rFormatNm,
+ const sal_uInt16* pWhichRanges, SwFormat* pDrvdFrm,
+ sal_uInt16 nFormatWhich )
: SwModify( pDrvdFrm ),
- m_aFmtName( rFmtNm ),
+ m_aFormatName( rFormatNm ),
m_aSet( rPool, pWhichRanges ),
- m_nWhichId( nFmtWhich ),
- m_nPoolFmtId( USHRT_MAX ),
+ m_nWhichId( nFormatWhich ),
+ m_nPoolFormatId( USHRT_MAX ),
m_nPoolHelpId( USHRT_MAX ),
m_nPoolHlpFileId( UCHAR_MAX )
{
- m_bAutoUpdateFmt = false; // LAYER_IMPL
- m_bAutoFmt = true;
- m_bWritten = m_bFmtInDTOR = m_bHidden = false;
+ m_bAutoUpdateFormat = false; // LAYER_IMPL
+ m_bAutoFormat = true;
+ m_bWritten = m_bFormatInDTOR = m_bHidden = false;
if( pDrvdFrm )
m_aSet.SetParent( &pDrvdFrm->m_aSet );
}
-SwFmt::SwFmt( const SwFmt& rFmt )
- : SwModify( rFmt.DerivedFrom() ),
- m_aFmtName( rFmt.m_aFmtName ),
- m_aSet( rFmt.m_aSet ),
- m_nWhichId( rFmt.m_nWhichId ),
- m_nPoolFmtId( rFmt.GetPoolFmtId() ),
- m_nPoolHelpId( rFmt.GetPoolHelpId() ),
- m_nPoolHlpFileId( rFmt.GetPoolHlpFileId() )
+SwFormat::SwFormat( const SwFormat& rFormat )
+ : SwModify( rFormat.DerivedFrom() ),
+ m_aFormatName( rFormat.m_aFormatName ),
+ m_aSet( rFormat.m_aSet ),
+ m_nWhichId( rFormat.m_nWhichId ),
+ m_nPoolFormatId( rFormat.GetPoolFormatId() ),
+ m_nPoolHelpId( rFormat.GetPoolHelpId() ),
+ m_nPoolHlpFileId( rFormat.GetPoolHlpFileId() )
{
- m_bWritten = m_bFmtInDTOR = false; // LAYER_IMPL
- m_bAutoFmt = rFmt.m_bAutoFmt;
- m_bHidden = rFmt.m_bHidden;
- m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+ m_bWritten = m_bFormatInDTOR = false; // LAYER_IMPL
+ m_bAutoFormat = rFormat.m_bAutoFormat;
+ m_bHidden = rFormat.m_bHidden;
+ m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
- if( rFmt.DerivedFrom() )
- m_aSet.SetParent( &rFmt.DerivedFrom()->m_aSet );
+ if( rFormat.DerivedFrom() )
+ m_aSet.SetParent( &rFormat.DerivedFrom()->m_aSet );
// a few special treatments for attributes
m_aSet.SetModifyAtAttr( this );
}
-SwFmt &SwFmt::operator=(const SwFmt& rFmt)
+SwFormat &SwFormat::operator=(const SwFormat& rFormat)
{
- m_nWhichId = rFmt.m_nWhichId;
- m_nPoolFmtId = rFmt.GetPoolFmtId();
- m_nPoolHelpId = rFmt.GetPoolHelpId();
- m_nPoolHlpFileId = rFmt.GetPoolHlpFileId();
+ m_nWhichId = rFormat.m_nWhichId;
+ m_nPoolFormatId = rFormat.GetPoolFormatId();
+ m_nPoolHelpId = rFormat.GetPoolHelpId();
+ m_nPoolHlpFileId = rFormat.GetPoolHlpFileId();
if ( IsInCache() )
{
@@ -115,8 +115,8 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
// copy only array with attributes delta
SwAttrSet aOld( *m_aSet.GetPool(), m_aSet.GetRanges() ),
aNew( *m_aSet.GetPool(), m_aSet.GetRanges() );
- m_aSet.Intersect_BC( rFmt.m_aSet, &aOld, &aNew );
- (void)m_aSet.Put_BC( rFmt.m_aSet, &aOld, &aNew );
+ m_aSet.Intersect_BC( rFormat.m_aSet, &aOld, &aNew );
+ (void)m_aSet.Put_BC( rFormat.m_aSet, &aOld, &aNew );
// a few special treatments for attributes
m_aSet.SetModifyAtAttr( this );
@@ -129,39 +129,39 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
ModifyNotification( &aChgOld, &aChgNew ); // send all modified ones
}
- if( GetRegisteredIn() != rFmt.GetRegisteredIn() )
+ if( GetRegisteredIn() != rFormat.GetRegisteredIn() )
{
if( GetRegisteredIn() )
GetRegisteredInNonConst()->Remove(this);
- if( rFmt.GetRegisteredIn() )
+ if( rFormat.GetRegisteredIn() )
{
- const_cast<SwFmt&>(rFmt).GetRegisteredInNonConst()->Add(this);
- m_aSet.SetParent( &rFmt.m_aSet );
+ const_cast<SwFormat&>(rFormat).GetRegisteredInNonConst()->Add(this);
+ m_aSet.SetParent( &rFormat.m_aSet );
}
else
{
m_aSet.SetParent( 0 );
}
}
- m_bAutoFmt = rFmt.m_bAutoFmt;
- m_bHidden = rFmt.m_bHidden;
- m_bAutoUpdateFmt = rFmt.m_bAutoUpdateFmt;
+ m_bAutoFormat = rFormat.m_bAutoFormat;
+ m_bHidden = rFormat.m_bHidden;
+ m_bAutoUpdateFormat = rFormat.m_bAutoUpdateFormat;
return *this;
}
-void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
+void SwFormat::SetName( const OUString& rNewName, bool bBroadcast )
{
OSL_ENSURE( !IsDefault(), "SetName: Defaultformat" );
if( bBroadcast )
{
- SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFmtName );
+ SwStringMsgPoolItem aOld( RES_NAME_CHANGED, m_aFormatName );
SwStringMsgPoolItem aNew( RES_NAME_CHANGED, rNewName );
- m_aFmtName = rNewName;
+ m_aFormatName = rNewName;
ModifyNotification( &aOld, &aNew );
}
else
{
- m_aFmtName = rNewName;
+ m_aFormatName = rNewName;
}
}
@@ -176,7 +176,7 @@ void SwFmt::SetName( const OUString& rNewName, bool bBroadcast )
in which <this> is defined. Currently this is important for DropCaps
because that contains data that needs to be copied deeply.
*/
-void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
+void SwFormat::CopyAttrs( const SwFormat& rFormat, bool bReplace )
{
// copy only array with attributes delta
if ( IsInCache() )
@@ -187,12 +187,12 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
SetInSwFntCache( false );
// special treatments for some attributes
- SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFmt.m_aSet);
+ SwAttrSet* pChgSet = const_cast<SwAttrSet*>(&rFormat.m_aSet);
if( !bReplace ) // refresh only those that are not set?
{
- if( pChgSet == &rFmt.m_aSet )
- pChgSet = new SwAttrSet( rFmt.m_aSet );
+ if( pChgSet == &rFormat.m_aSet )
+ pChgSet = new SwAttrSet( rFormat.m_aSet );
pChgSet->Differentiate( m_aSet );
}
@@ -215,42 +215,42 @@ void SwFmt::CopyAttrs( const SwFmt& rFmt, bool bReplace )
}
}
- if( pChgSet != &rFmt.m_aSet ) // was a Set created?
+ if( pChgSet != &rFormat.m_aSet ) // was a Set created?
delete pChgSet;
}
-SwFmt::~SwFmt()
+SwFormat::~SwFormat()
{
// This happens at a ObjectDying message. Thus put all dependent
// ones on DerivedFrom.
if( HasWriterListeners() )
{
- OSL_ENSURE( DerivedFrom(), "SwFmt::~SwFmt: Def dependents!" );
+ OSL_ENSURE( DerivedFrom(), "SwFormat::~SwFormat: Def dependents!" );
- m_bFmtInDTOR = true;
+ m_bFormatInDTOR = true;
- SwFmt* pParentFmt = DerivedFrom();
- if( !pParentFmt )
+ SwFormat* pParentFormat = DerivedFrom();
+ if( !pParentFormat )
{
SAL_WARN(
"sw.core",
- "~SwFmt: parent format missing from: " << GetName() );
+ "~SwFormat: parent format missing from: " << GetName() );
}
else
{
- SwFmtChg aOldFmt( this );
- SwFmtChg aNewFmt( pParentFmt );
- SwIterator<SwClient,SwFmt> aIter(*this);
- for(SwClient* pClient = aIter.First(); pClient && pParentFmt; pClient = aIter.Next())
+ SwFormatChg aOldFormat( this );
+ SwFormatChg aNewFormat( pParentFormat );
+ SwIterator<SwClient,SwFormat> aIter(*this);
+ for(SwClient* pClient = aIter.First(); pClient && pParentFormat; pClient = aIter.Next())
{
- pParentFmt->Add( pClient );
- pClient->ModifyNotification( &aOldFmt, &aNewFmt );
+ pParentFormat->Add( pClient );
+ pClient->ModifyNotification( &aOldFormat, &aNewFormat );
}
}
}
}
-void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
+void SwFormat::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
{
bool bContinue = true; // true = pass on to dependent ones
@@ -265,15 +265,15 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
{
// If the dying object is the parent format of this format so
// attach this to the parent of the parent
- SwFmt* pFmt = static_cast<SwFmt*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
+ SwFormat* pFormat = static_cast<SwFormat*>(static_cast<const SwPtrMsgPoolItem*>(pNewValue)->pObject);
// do not move if this is the topmost format
- if( GetRegisteredIn() && GetRegisteredIn() == pFmt )
+ if( GetRegisteredIn() && GetRegisteredIn() == pFormat )
{
- if( pFmt->GetRegisteredIn() )
+ if( pFormat->GetRegisteredIn() )
{
// if parent so register in new parent
- pFmt->DerivedFrom()->Add( this );
+ pFormat->DerivedFrom()->Add( this );
m_aSet.SetParent( &DerivedFrom()->m_aSet );
}
else
@@ -306,8 +306,8 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
// skip my own Modify
if ( pOldValue && pNewValue &&
- static_cast<const SwFmtChg*>(pOldValue)->pChangedFmt != this &&
- static_cast<const SwFmtChg*>(pNewValue)->pChangedFmt == GetRegisteredIn() )
+ static_cast<const SwFormatChg*>(pOldValue)->pChangedFormat != this &&
+ static_cast<const SwFormatChg*>(pNewValue)->pChangedFormat == GetRegisteredIn() )
{
// attach Set to new parent
m_aSet.SetParent( DerivedFrom() ? &DerivedFrom()->m_aSet : 0 );
@@ -322,7 +322,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
// mba: move the code that ignores this event to the clients
// pass Hint only to dependent formats (no Frames)
- //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) );
+ //ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFormat) );
//bContinue = false;
}
break;
@@ -345,17 +345,17 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue )
}
}
-bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
+bool SwFormat::SetDerivedFrom(SwFormat *pDerFrom)
{
if ( pDerFrom )
{
- const SwFmt* pFmt = pDerFrom;
- while ( pFmt != 0 )
+ const SwFormat* pFormat = pDerFrom;
+ while ( pFormat != 0 )
{
- if ( pFmt == this )
+ if ( pFormat == this )
return false;
- pFmt=pFmt->DerivedFrom();
+ pFormat=pFormat->DerivedFrom();
}
}
else
@@ -384,19 +384,19 @@ bool SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
pDerFrom->Add( this );
m_aSet.SetParent( &pDerFrom->m_aSet );
- SwFmtChg aOldFmt( this );
- SwFmtChg aNewFmt( this );
- ModifyNotification( &aOldFmt, &aNewFmt );
+ SwFormatChg aOldFormat( this );
+ SwFormatChg aNewFormat( this );
+ ModifyNotification( &aOldFormat, &aNewFormat );
return true;
}
-bool SwFmt::supportsFullDrawingLayerFillAttributeSet() const
+bool SwFormat::supportsFullDrawingLayerFillAttributeSet() const
{
return false;
}
-const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
+const SfxPoolItem& SwFormat::GetFormatAttr( sal_uInt16 nWhich, bool bInParents ) const
{
if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
{
@@ -415,12 +415,12 @@ const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, bool bInParents ) const
return m_aSet.Get( nWhich, bInParents );
}
-SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
+SfxItemState SwFormat::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const SfxPoolItem **ppItem ) const
{
if (RES_BACKGROUND == nWhich && supportsFullDrawingLayerFillAttributeSet())
{
//UUUU FALLBACKBREAKHERE should not be used; instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST]
- SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFmt::GetBackgroundStat (simple fallback is in place and used)");
+ SAL_INFO("sw.core", "Do no longer use SvxBrushItem, instead use [XATTR_FILL_FIRST .. XATTR_FILL_LAST] FillAttributes or SwFormat::GetBackgroundStat (simple fallback is in place and used)");
const drawinglayer::attribute::SdrAllFillAttributesHelperPtr aFill = getSdrAllFillAttributesHelper();
// check if the new fill attributes are used
@@ -450,7 +450,7 @@ SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, bool bSrchInParent, const S
return m_aSet.GetItemState( nWhich, bSrchInParent, ppItem );
}
-SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
+SfxItemState SwFormat::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent) const
{
if (supportsFullDrawingLayerFillAttributeSet())
{
@@ -478,7 +478,7 @@ SfxItemState SwFmt::GetBackgroundState(SvxBrushItem &rItem, bool bSrchInParent)
return eRet;
}
-bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
+bool SwFormat::SetFormatAttr( const SfxPoolItem& rAttr )
{
if ( IsInCache() || IsInSwFntCache() )
{
@@ -529,19 +529,19 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
}
// if Modify is locked then no modifications will be sent;
- // but call Modify always for FrmFmts
- const sal_uInt16 nFmtWhich = Which();
+ // but call Modify always for FrameFormats
+ const sal_uInt16 nFormatWhich = Which();
if( IsModifyLocked() ||
( !HasWriterListeners() &&
- (RES_GRFFMTCOLL == nFmtWhich ||
- RES_TXTFMTCOLL == nFmtWhich ) ) )
+ (RES_GRFFMTCOLL == nFormatWhich ||
+ RES_TXTFMTCOLL == nFormatWhich ) ) )
{
if( ( bRet = (0 != m_aSet.Put( rAttr ))) )
m_aSet.SetModifyAtAttr( this );
// #i71574#
- if ( nFmtWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
+ if ( nFormatWhich == RES_TXTFMTCOLL && rAttr.Which() == RES_PARATR_NUMRULE )
{
- TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+ TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
}
}
else
@@ -564,7 +564,7 @@ bool SwFmt::SetFmtAttr( const SfxPoolItem& rAttr )
return bRet;
}
-bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
+bool SwFormat::SetFormatAttr( const SfxItemSet& rSet )
{
if( !rSet.Count() )
return false;
@@ -634,19 +634,19 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
}
// if Modify is locked then no modifications will be sent;
- // but call Modify always for FrmFmts
- const sal_uInt16 nFmtWhich = Which();
+ // but call Modify always for FrameFormats
+ const sal_uInt16 nFormatWhich = Which();
if ( IsModifyLocked() ||
( !HasWriterListeners() &&
- ( RES_GRFFMTCOLL == nFmtWhich ||
- RES_TXTFMTCOLL == nFmtWhich ) ) )
+ ( RES_GRFFMTCOLL == nFormatWhich ||
+ RES_TXTFMTCOLL == nFormatWhich ) ) )
{
if( ( bRet = m_aSet.Put( aTempSet )) )
m_aSet.SetModifyAtAttr( this );
// #i71574#
- if ( nFmtWhich == RES_TXTFMTCOLL )
+ if ( nFormatWhich == RES_TXTFMTCOLL )
{
- TxtFmtCollFunc::CheckTxtFmtCollForDeletionOfAssignmentToOutlineStyle( this );
+ TextFormatCollFunc::CheckTextFormatCollForDeletionOfAssignmentToOutlineStyle( this );
}
}
else
@@ -667,7 +667,7 @@ bool SwFmt::SetFmtAttr( const SfxItemSet& rSet )
}
// remove Hint using nWhich from array with delta
-bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
+bool SwFormat::ResetFormatAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
{
if( !m_aSet.Count() )
return false;
@@ -700,7 +700,7 @@ bool SwFmt::ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 )
}
// #i73790#
-sal_uInt16 SwFmt::ResetAllFmtAttr()
+sal_uInt16 SwFormat::ResetAllFormatAttr()
{
if( !m_aSet.Count() )
return 0;
@@ -728,12 +728,12 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
return aNew.Count();
}
-bool SwFmt::GetInfo( SfxPoolItem& rInfo ) const
+bool SwFormat::GetInfo( SfxPoolItem& rInfo ) const
{
return SwModify::GetInfo( rInfo );
}
-void SwFmt::DelDiffs( const SfxItemSet& rSet )
+void SwFormat::DelDiffs( const SfxItemSet& rSet )
{
if( !m_aSet.Count() )
return;
@@ -763,7 +763,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
}
}
-/** SwFmt::IsBackgroundTransparent
+/** SwFormat::IsBackgroundTransparent
Virtual method to determine, if background of format is transparent.
Default implementation returns false. Thus, subclasses have to override
@@ -771,7 +771,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
@return false, default implementation
*/
-bool SwFmt::IsBackgroundTransparent() const
+bool SwFormat::IsBackgroundTransparent() const
{
return false;
}
@@ -779,16 +779,16 @@ bool SwFmt::IsBackgroundTransparent() const
/*
* Document Interface Access
*/
-const IDocumentSettingAccess* SwFmt::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
-const IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
-IDocumentDrawModelAccess* SwFmt::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
-const IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentLayoutAccess* SwFmt::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
-IDocumentTimerAccess* SwFmt::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
-IDocumentFieldsAccess* SwFmt::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
-IDocumentChartDataProviderAccess* SwFmt::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
-
-void SwFmt::GetGrabBagItem(uno::Any& rVal) const
+const IDocumentSettingAccess* SwFormat::getIDocumentSettingAccess() const { return & GetDoc()->GetDocumentSettingManager(); }
+const IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() const { return & GetDoc()->getIDocumentDrawModelAccess(); }
+IDocumentDrawModelAccess* SwFormat::getIDocumentDrawModelAccess() { return & GetDoc()->getIDocumentDrawModelAccess(); }
+const IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() const { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentLayoutAccess* SwFormat::getIDocumentLayoutAccess() { return &GetDoc()->getIDocumentLayoutAccess(); }
+IDocumentTimerAccess* SwFormat::getIDocumentTimerAccess() { return & GetDoc()->getIDocumentTimerAccess(); }
+IDocumentFieldsAccess* SwFormat::getIDocumentFieldsAccess() { return &GetDoc()->getIDocumentFieldsAccess(); }
+IDocumentChartDataProviderAccess* SwFormat::getIDocumentChartDataProviderAccess() { return & GetDoc()->getIDocumentChartDataProviderAccess(); }
+
+void SwFormat::GetGrabBagItem(uno::Any& rVal) const
{
if (m_pGrabBagItem.get())
m_pGrabBagItem->QueryValue(rVal);
@@ -799,7 +799,7 @@ void SwFmt::GetGrabBagItem(uno::Any& rVal) const
}
}
-void SwFmt::SetGrabBagItem(const uno::Any& rVal)
+void SwFormat::SetGrabBagItem(const uno::Any& rVal)
{
if (!m_pGrabBagItem.get())
m_pGrabBagItem.reset(new SfxGrabBagItem);
@@ -808,7 +808,7 @@ void SwFmt::SetGrabBagItem(const uno::Any& rVal)
}
//UUUU
-SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
+SvxBrushItem SwFormat::makeBackgroundBrushItem(bool bInP) const
{
if (supportsFullDrawingLayerFillAttributeSet())
{
@@ -825,7 +825,7 @@ SvxBrushItem SwFmt::makeBackgroundBrushItem(bool bInP) const
}
//UUUU
-drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFmt::getSdrAllFillAttributesHelper() const
+drawinglayer::attribute::SdrAllFillAttributesHelperPtr SwFormat::getSdrAllFillAttributesHelper() const
{
return drawinglayer::attribute::SdrAllFillAttributesHelperPtr();
}
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index c1e79806fdd2..266e2f155170 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -24,12 +24,12 @@
#include <ndtxt.hxx>
#include <swtypes.hxx>
-SwFmtChg::SwFmtChg( SwFmt* pFmt )
- : SwMsgPoolItem( RES_FMT_CHG ), pChangedFmt( pFmt )
+SwFormatChg::SwFormatChg( SwFormat* pFormat )
+ : SwMsgPoolItem( RES_FMT_CHG ), pChangedFormat( pFormat )
{
}
-SwInsTxt::SwInsTxt( sal_Int32 nP, sal_Int32 nL )
+SwInsText::SwInsText( sal_Int32 nP, sal_Int32 nL )
: SwMsgPoolItem( RES_INS_TXT ), nPos( nP ), nLen( nL )
{
}
@@ -39,17 +39,17 @@ SwDelChr::SwDelChr( sal_Int32 nP )
{
}
-SwDelTxt::SwDelTxt( sal_Int32 nS, sal_Int32 nL )
+SwDelText::SwDelText( sal_Int32 nS, sal_Int32 nL )
: SwMsgPoolItem( RES_DEL_TXT ), nStart( nS ), nLen( nL )
{
}
SwUpdateAttr::SwUpdateAttr( sal_Int32 nS, sal_Int32 nE, sal_uInt16 nW )
- : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFmtAttr()
+ : SwMsgPoolItem( RES_UPDATE_ATTR ), nStart( nS ), nEnd( nE ), nWhichAttr( nW ), aWhichFormatAttr()
{
}
-SwRefMarkFldUpdate::SwRefMarkFldUpdate( OutputDevice* pOutput )
+SwRefMarkFieldUpdate::SwRefMarkFieldUpdate( OutputDevice* pOutput )
: SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
pOut( pOutput )
{
@@ -61,18 +61,18 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
{
}
-SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
+SwTableFormulaUpdate::SwTableFormulaUpdate( const SwTable* pNewTable )
: SwMsgPoolItem( RES_TABLEFML_UPDATE ),
- pTbl( pNewTbl ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
+ pTable( pNewTable ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
eFlags( TBL_CALC )
{
- DATA.pDelTbl = 0;
+ DATA.pDelTable = 0;
bModified = bBehindSplitLine = false;
- OSL_ENSURE( pTbl, "No Table pointer" );
+ OSL_ENSURE( pTable, "No Table pointer" );
}
-SwAutoFmtGetDocNode::SwAutoFmtGetDocNode( const SwNodes* pNds )
- : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pCntntNode( 0 ), pNodes( pNds )
+SwAutoFormatGetDocNode::SwAutoFormatGetDocNode( const SwNodes* pNds )
+ : SwMsgPoolItem( RES_AUTOFMT_DOCNODE ), pContentNode( 0 ), pNodes( pNds )
{
}
@@ -129,7 +129,7 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
- OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+ OSL_ENSURE( pHt, "GetDfltFormatAttr(): Dflt == 0" );
return pHt;
}
#else
@@ -139,8 +139,8 @@ const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich )
}
#endif
-SwCondCollCondChg::SwCondCollCondChg( SwFmt *pFmt )
- : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFmt( pFmt )
+SwCondCollCondChg::SwCondCollCondChg( SwFormat *pFormat )
+ : SwMsgPoolItem( RES_CONDCOLL_CONDCHG ), pChangedFormat( pFormat )
{
}
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 8631b06e784c..13806f1a5b25 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -254,8 +254,8 @@ void SwAttrSet::Changed( const SfxPoolItem& rOld, const SfxPoolItem& rNew )
/** special treatment for some attributes
Set the Modify pointer (old pDefinedIn) for the following attributes:
- - SwFmtDropCaps
- - SwFmtPageDesc
+ - SwFormatDropCaps
+ - SwFormatPageDesc
(Is called at inserts into formats/nodes)
*/
@@ -265,32 +265,32 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
const SfxPoolItem* pItem;
if( SfxItemState::SET == GetItemState( RES_PAGEDESC, false, &pItem ) &&
- static_cast<const SwFmtPageDesc*>(pItem)->GetDefinedIn() != pModify )
+ static_cast<const SwFormatPageDesc*>(pItem)->GetDefinedIn() != pModify )
{
- const_cast<SwFmtPageDesc*>(static_cast<const SwFmtPageDesc*>(pItem))->ChgDefinedIn( pModify );
+ const_cast<SwFormatPageDesc*>(static_cast<const SwFormatPageDesc*>(pItem))->ChgDefinedIn( pModify );
bSet = true;
}
if( SfxItemState::SET == GetItemState( RES_PARATR_DROP, false, &pItem ) &&
- static_cast<const SwFmtDrop*>(pItem)->GetDefinedIn() != pModify )
+ static_cast<const SwFormatDrop*>(pItem)->GetDefinedIn() != pModify )
{
// If CharFormat is set and it is set in different attribute pools then
// the CharFormat has to be copied.
- SwCharFmt* pCharFmt;
- if( 0 != ( pCharFmt = const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->GetCharFmt() )
- && GetPool() != pCharFmt->GetAttrSet().GetPool() )
+ SwCharFormat* pCharFormat;
+ if( 0 != ( pCharFormat = const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->GetCharFormat() )
+ && GetPool() != pCharFormat->GetAttrSet().GetPool() )
{
- pCharFmt = GetDoc()->CopyCharFmt( *pCharFmt );
- const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->SetCharFmt( pCharFmt );
+ pCharFormat = GetDoc()->CopyCharFormat( *pCharFormat );
+ const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->SetCharFormat( pCharFormat );
}
- const_cast<SwFmtDrop*>(static_cast<const SwFmtDrop*>(pItem))->ChgDefinedIn( pModify );
+ const_cast<SwFormatDrop*>(static_cast<const SwFormatDrop*>(pItem))->ChgDefinedIn( pModify );
bSet = true;
}
if( SfxItemState::SET == GetItemState( RES_BOXATR_FORMULA, false, &pItem ) &&
- static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() != pModify )
+ static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() != pModify )
{
- const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChgDefinedIn( pModify );
+ const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChgDefinedIn( pModify );
bSet = true;
}
@@ -300,10 +300,10 @@ bool SwAttrSet::SetModifyAtAttr( const SwModify* pModify )
void SwAttrSet::CopyToModify( SwModify& rMod ) const
{
// copy attributes across multiple documents if needed
- SwCntntNode* pCNd = PTR_CAST( SwCntntNode, &rMod );
- SwFmt* pFmt = PTR_CAST( SwFmt, &rMod );
+ SwContentNode* pCNd = PTR_CAST( SwContentNode, &rMod );
+ SwFormat* pFormat = PTR_CAST( SwFormat, &rMod );
- if( pCNd || pFmt )
+ if( pCNd || pFormat )
{
if( Count() )
{
@@ -312,7 +312,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
const SfxPoolItem* pItem;
const SwDoc *pSrcDoc = GetDoc();
- SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFmt->GetDoc();
+ SwDoc *pDstDoc = pCNd ? pCNd->GetDoc() : pFormat->GetDoc();
// Does the NumRule has to be copied?
if( pSrcDoc != pDstDoc &&
@@ -332,7 +332,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// copy list and if needed also the corresponding list style
// for text nodes
if ( pSrcDoc != pDstDoc &&
- pCNd && pCNd->IsTxtNode() &&
+ pCNd && pCNd->IsTextNode() &&
GetItemState( RES_PARATR_LIST_ID, false, &pItem ) == SfxItemState::SET )
{
const OUString& sListId =
@@ -383,7 +383,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
const SwPageDesc* pPgDesc;
if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState(
RES_PAGEDESC, false, &pItem ) &&
- 0 != ( pPgDesc = static_cast<const SwFmtPageDesc*>(pItem)->GetPageDesc()) )
+ 0 != ( pPgDesc = static_cast<const SwFormatPageDesc*>(pItem)->GetPageDesc()) )
{
if( !tmpSet )
tmpSet.reset( new SfxItemSet( *this ));
@@ -394,13 +394,13 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
pDstPgDesc = pDstDoc->MakePageDesc(pPgDesc->GetName());
pDstDoc->CopyPageDesc( *pPgDesc, *pDstPgDesc );
}
- SwFmtPageDesc aDesc( pDstPgDesc );
- aDesc.SetNumOffset( static_cast<const SwFmtPageDesc*>(pItem)->GetNumOffset() );
+ SwFormatPageDesc aDesc( pDstPgDesc );
+ aDesc.SetNumOffset( static_cast<const SwFormatPageDesc*>(pItem)->GetNumOffset() );
tmpSet->Put( aDesc );
}
if( pSrcDoc != pDstDoc && SfxItemState::SET == GetItemState( RES_ANCHOR, false, &pItem )
- && static_cast< const SwFmtAnchor* >( pItem )->GetCntntAnchor() != NULL )
+ && static_cast< const SwFormatAnchor* >( pItem )->GetContentAnchor() != NULL )
{
if( !tmpSet )
tmpSet.reset( new SfxItemSet( *this ));
@@ -422,7 +422,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
else
{
- pFmt->SetFmtAttr( *tmpSet );
+ pFormat->SetFormatAttr( *tmpSet );
}
}
else if( pCNd )
@@ -441,7 +441,7 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
else
{
- pFmt->SetFmtAttr( *this );
+ pFormat->SetFormatAttr( *this );
}
// #i92811#
diff --git a/sw/source/core/bastyp/breakit.cxx b/sw/source/core/bastyp/breakit.cxx
index b1c834926519..83285a49e847 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -97,44 +97,44 @@ void SwBreakIt::_GetForbidden( const LanguageType aLang )
m_pForbidden = new i18n::ForbiddenCharacters( aWrap.getForbiddenCharacters() );
}
-sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos ) const
+sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rText, sal_Int32 nPos ) const
{
createBreakIterator();
sal_uInt16 nScript = i18n::ScriptType::WEAK;
- if( xBreak.is() && !rTxt.isEmpty() )
+ if( xBreak.is() && !rText.isEmpty() )
{
- if( nPos && nPos == rTxt.getLength() )
+ if( nPos && nPos == rText.getLength() )
--nPos;
else if( nPos < 0)
nPos = 0;
- nScript = xBreak->getScriptType( rTxt, nPos );
+ nScript = xBreak->getScriptType( rText, nPos );
sal_Int32 nChgPos = 0;
- if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rTxt.getLength())
+ if (i18n::ScriptType::WEAK == nScript && nPos >= 0 && nPos + 1 < rText.getLength())
{
// A weak character followed by a mark may be meant to combine with
// the mark, so prefer the following character's script
- switch (u_charType(rTxt[nPos + 1]))
+ switch (u_charType(rText[nPos + 1]))
{
case U_NON_SPACING_MARK:
case U_ENCLOSING_MARK:
case U_COMBINING_SPACING_MARK:
- nScript = xBreak->getScriptType( rTxt, nPos+1 );
+ nScript = xBreak->getScriptType( rText, nPos+1 );
break;
}
}
if( i18n::ScriptType::WEAK == nScript &&
nPos &&
- 0 < ( nChgPos = xBreak->beginOfScript( rTxt, nPos, nScript ) ) )
+ 0 < ( nChgPos = xBreak->beginOfScript( rText, nPos, nScript ) ) )
{
- nScript = xBreak->getScriptType( rTxt, nChgPos-1 );
+ nScript = xBreak->getScriptType( rText, nChgPos-1 );
}
if( i18n::ScriptType::WEAK == nScript &&
- rTxt.getLength() > ( nChgPos = xBreak->endOfScript( rTxt, nPos, nScript ) ) &&
+ rText.getLength() > ( nChgPos = xBreak->endOfScript( rText, nPos, nScript ) ) &&
0 <= nChgPos )
{
- nScript = xBreak->getScriptType( rTxt, nChgPos );
+ nScript = xBreak->getScriptType( rText, nChgPos );
}
}
if( i18n::ScriptType::WEAK == nScript )
@@ -142,7 +142,7 @@ sal_uInt16 SwBreakIt::GetRealScriptOfText( const OUString& rTxt, sal_Int32 nPos
return nScript;
}
-SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
+SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rText ) const
{
const SvtScriptType coAllScripts = ( SvtScriptType::LATIN |
SvtScriptType::ASIAN |
@@ -154,12 +154,12 @@ SvtScriptType SwBreakIt::GetAllScriptsOfText( const OUString& rTxt ) const
{
nRet = coAllScripts;
}
- else if( !rTxt.isEmpty() )
+ else if( !rText.isEmpty() )
{
- for( sal_Int32 n = 0, nEnd = rTxt.getLength(); n < nEnd;
- n = xBreak->endOfScript(rTxt, n, nScript) )
+ for( sal_Int32 n = 0, nEnd = rText.getLength(); n < nEnd;
+ n = xBreak->endOfScript(rText, n, nScript) )
{
- switch( nScript = xBreak->getScriptType( rTxt, n ) )
+ switch( nScript = xBreak->getScriptType( rText, n ) )
{
case i18n::ScriptType::LATIN: nRet |= SvtScriptType::LATIN; break;
case i18n::ScriptType::ASIAN: nRet |= SvtScriptType::ASIAN; break;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index be2939e8eec6..1eb97f33e5e9 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -186,14 +186,14 @@ _CalcOp* FindOperator( const OUString& rSrch )
}
SwHash* Find( const OUString& rStr, SwHash* const * ppTable,
- sal_uInt16 nTblSize, sal_uInt16* pPos )
+ sal_uInt16 nTableSize, sal_uInt16* pPos )
{
sal_uLong ii = 0;
for( sal_Int32 n = 0; n < rStr.getLength(); ++n )
{
ii = ii << 1 ^ rStr[n];
}
- ii %= nTblSize;
+ ii %= nTableSize;
if( pPos )
*pPos = static_cast<sal_uInt16>(ii);
@@ -312,7 +312,7 @@ SwCalc::SwCalc( SwDoc& rD )
static sal_uInt16 SwDocStat::* const aDocStat1[ 3 ] =
{
- &SwDocStat::nTbl, &SwDocStat::nGrf, &SwDocStat::nOLE
+ &SwDocStat::nTable, &SwDocStat::nGrf, &SwDocStat::nOLE
};
static sal_uLong SwDocStat::* const aDocStat2[ 4 ] =
{
@@ -458,14 +458,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
if( !pFnd )
{
// then check doc
- SwHash* const * ppDocTbl = rDoc.getIDocumentFieldsAccess().GetUpdtFlds().GetFldTypeTable();
- for( SwHash* pEntry = *(ppDocTbl+ii); pEntry; pEntry = pEntry->pNext )
+ SwHash* const * ppDocTable = rDoc.getIDocumentFieldsAccess().GetUpdateFields().GetFieldTypeTable();
+ for( SwHash* pEntry = *(ppDocTable+ii); pEntry; pEntry = pEntry->pNext )
{
if( aStr == pEntry->aStr )
{
// then insert here
pFnd = new SwCalcExp( aStr, SwSbxValue(),
- static_cast<SwCalcFldType*>(pEntry)->pFldType );
+ static_cast<SwCalcFieldType*>(pEntry)->pFieldType );
pFnd->pNext = *(VarTable+ii);
*(VarTable+ii) = pFnd;
break;
@@ -477,14 +477,14 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
{
SwCalcExp* pFndExp = static_cast<SwCalcExp*>(pFnd);
- if( pFndExp->pFldType && pFndExp->pFldType->Which() == RES_USERFLD )
+ if( pFndExp->pFieldType && pFndExp->pFieldType->Which() == RES_USERFLD )
{
- SwUserFieldType* pUFld = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFldType));
- if( nsSwGetSetExpType::GSE_STRING & pUFld->GetType() )
+ SwUserFieldType* pUField = const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFndExp->pFieldType));
+ if( nsSwGetSetExpType::GSE_STRING & pUField->GetType() )
{
- pFndExp->nValue.PutString( pUFld->GetContent() );
+ pFndExp->nValue.PutString( pUField->GetContent() );
}
- else if( !pUFld->IsValid() )
+ else if( !pUField->IsValid() )
{
// Save the current values...
sal_uInt16 nOld_ListPor = nListPor;
@@ -494,7 +494,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
SwCalcOper eOld_CurrOper = eCurrOper;
SwCalcOper eOld_CurrListOper = eCurrListOper;
- pFndExp->nValue.PutDouble( pUFld->GetValue( *this ) );
+ pFndExp->nValue.PutDouble( pUField->GetValue( *this ) );
// ...and write them back.
nListPor = nOld_ListPor;
@@ -506,7 +506,7 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool bIns )
}
else
{
- pFndExp->nValue.PutDouble( pUFld->GetValue() );
+ pFndExp->nValue.PutDouble( pUField->GetValue() );
}
}
return pFndExp;
@@ -1589,7 +1589,7 @@ SwCalcExp::SwCalcExp(const OUString& rStr, const SwSbxValue& rVal,
const SwFieldType* pType)
: SwHash(rStr)
, nValue(rVal)
- , pFldType(pType)
+ , pFieldType(pType)
{
}
@@ -1660,8 +1660,8 @@ void main()
sNType24, sNType25, sNType26
};
- const unsigned short nTblSize = 47;
- int aArr[ nTblSize ] = { 0 };
+ const unsigned short nTableSize = 47;
+ int aArr[ nTableSize ] = { 0 };
sal_Char ch;
for( int n = 0; n < 27; ++n )
@@ -1673,7 +1673,7 @@ void main()
{
ii = ii << 1 ^ *pp++;
}
- ii %= nTblSize;
+ ii %= nTableSize;
ch = aArr[ ii ] ? 'X' : ' ';
aArr[ ii ] = 1;
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c83070914984..7439d300bd1f 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -141,10 +141,10 @@ sal_uInt16 aBreakSetRange[] = {
0
};
-// AttrSet range for TxtFmtColl
+// AttrSet range for TextFormatColl
// list attributes ( RES_PARATR_LIST_BEGIN - RES_PARATR_LIST_END ) are not
// included in the paragraph style's itemset.
-sal_uInt16 aTxtFmtCollSetRange[] = {
+sal_uInt16 aTextFormatCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -156,8 +156,8 @@ sal_uInt16 aTxtFmtCollSetRange[] = {
0
};
-// AttrSet range for GrfFmtColl
-sal_uInt16 aGrfFmtCollSetRange[] = {
+// AttrSet range for GrfFormatColl
+sal_uInt16 aGrfFormatCollSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -165,7 +165,7 @@ sal_uInt16 aGrfFmtCollSetRange[] = {
};
// AttrSet range for TextNode
-sal_uInt16 aTxtNodeSetRange[] = {
+sal_uInt16 aTextNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_PARATR_BEGIN, RES_PARATR_END-1,
@@ -178,8 +178,8 @@ sal_uInt16 aTxtNodeSetRange[] = {
0
};
-// AttrSet range for NoTxtNode
-sal_uInt16 aNoTxtNodeSetRange[] = {
+// AttrSet range for NoTextNode
+sal_uInt16 aNoTextNodeSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_GRFATR_BEGIN, RES_GRFATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -227,8 +227,8 @@ sal_uInt16 aTableBoxSetRange[] = {
0
};
-// AttrSet range for SwFrmFmt
-sal_uInt16 aFrmFmtSetRange[] = {
+// AttrSet range for SwFrameFormat
+sal_uInt16 aFrameFormatSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
@@ -238,23 +238,23 @@ sal_uInt16 aFrmFmtSetRange[] = {
0
};
-// AttrSet range for SwCharFmt
-sal_uInt16 aCharFmtSetRange[] = {
+// AttrSet range for SwCharFormat
+sal_uInt16 aCharFormatSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
// AttrSet range for character autostyles
-sal_uInt16 aCharAutoFmtSetRange[] = {
+sal_uInt16 aCharAutoFormatSetRange[] = {
RES_CHRATR_BEGIN, RES_CHRATR_END-1,
RES_TXTATR_UNKNOWN_CONTAINER, RES_TXTATR_UNKNOWN_CONTAINER,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
};
-// AttrSet range for SwPageDescFmt
-sal_uInt16 aPgFrmFmtSetRange[] = {
+// AttrSet range for SwPageDescFormat
+sal_uInt16 aPgFrameFormatSetRange[] = {
RES_FRMATR_BEGIN, RES_FRMATR_END-1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0
@@ -518,21 +518,21 @@ void _InitCore()
aAttrTab[ RES_CHRATR_BIDIRTL - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_BIDIRTL, sal_Int16(-1) );
aAttrTab[ RES_CHRATR_IDCTHINT - POOLATTR_BEGIN ] = new SfxInt16Item( RES_CHRATR_IDCTHINT, sal_Int16(-1) );
- aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFmtRefMark( OUString() );
+ aAttrTab[ RES_TXTATR_REFMARK - POOLATTR_BEGIN ] = new SwFormatRefMark( OUString() );
aAttrTab[ RES_TXTATR_TOXMARK - POOLATTR_BEGIN ] = new SwTOXMark;
- aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_META);
- aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFmtMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
- aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFmtAutoFmt;
- aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFmtINetFmt( OUString(), OUString() );
- aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] = new SwFmtCharFmt( 0 );
- aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFmtRuby( OUString() );
+ aAttrTab[ RES_TXTATR_META - POOLATTR_BEGIN ] = SwFormatMeta::CreatePoolDefault(RES_TXTATR_META);
+ aAttrTab[ RES_TXTATR_METAFIELD - POOLATTR_BEGIN ] = SwFormatMeta::CreatePoolDefault(RES_TXTATR_METAFIELD);
+ aAttrTab[ RES_TXTATR_AUTOFMT- POOLATTR_BEGIN ] = new SwFormatAutoFormat;
+ aAttrTab[ RES_TXTATR_INETFMT - POOLATTR_BEGIN ] = new SwFormatINetFormat( OUString(), OUString() );
+ aAttrTab[ RES_TXTATR_CHARFMT- POOLATTR_BEGIN ] = new SwFormatCharFormat( 0 );
+ aAttrTab[ RES_TXTATR_CJK_RUBY - POOLATTR_BEGIN ] = new SwFormatRuby( OUString() );
aAttrTab[ RES_TXTATR_UNKNOWN_CONTAINER - POOLATTR_BEGIN ] = new SvXMLAttrContainerItem( RES_TXTATR_UNKNOWN_CONTAINER );
- aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_INPUTFIELD );
+ aAttrTab[ RES_TXTATR_INPUTFIELD - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_INPUTFIELD );
- aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_FIELD );
- aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] = new SwFmtFlyCnt( 0 );
- aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] = new SwFmtFtn;
- aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFmtFld( RES_TXTATR_ANNOTATION );
+ aAttrTab[ RES_TXTATR_FIELD- POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_FIELD );
+ aAttrTab[ RES_TXTATR_FLYCNT - POOLATTR_BEGIN ] = new SwFormatFlyCnt( 0 );
+ aAttrTab[ RES_TXTATR_FTN - POOLATTR_BEGIN ] = new SwFormatFootnote;
+ aAttrTab[ RES_TXTATR_ANNOTATION - POOLATTR_BEGIN ] = new SwFormatField( RES_TXTATR_ANNOTATION );
// TextAttr - Dummies
aAttrTab[ RES_TXTATR_DUMMY1 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_TXTATR_DUMMY1 );
@@ -541,7 +541,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_LINESPACING- POOLATTR_BEGIN ] = new SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] = new SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
- aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] = new SvxFmtSplitItem( true, RES_PARATR_SPLIT );
+ aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] = new SvxFormatSplitItem( true, RES_PARATR_SPLIT );
aAttrTab[ RES_PARATR_WIDOWS- POOLATTR_BEGIN ] = new SvxWidowsItem( 0, RES_PARATR_WIDOWS );
aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] = new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] = new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -550,7 +550,7 @@ void _InitCore()
static_cast<SvxHyphenZoneItem*>(pItem)->GetMaxHyphens() = 0; // Default: 0
aAttrTab[ RES_PARATR_HYPHENZONE- POOLATTR_BEGIN ] = pItem;
- aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] = new SwFmtDrop;
+ aAttrTab[ RES_PARATR_DROP- POOLATTR_BEGIN ] = new SwFormatDrop;
aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] = new SwRegisterItem( false );
aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] = new SwNumRuleItem( OUString() );
@@ -571,51 +571,51 @@ void _InitCore()
aAttrTab[ RES_PARATR_LIST_RESTARTVALUE - POOLATTR_BEGIN ] = new SfxInt16Item( RES_PARATR_LIST_RESTARTVALUE, 1 );
aAttrTab[ RES_PARATR_LIST_ISCOUNTED - POOLATTR_BEGIN ] = new SfxBoolItem( RES_PARATR_LIST_ISCOUNTED, true );
- aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] = new SwFmtFillOrder;
- aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFmtFrmSize;
+ aAttrTab[ RES_FILL_ORDER- POOLATTR_BEGIN ] = new SwFormatFillOrder;
+ aAttrTab[ RES_FRM_SIZE- POOLATTR_BEGIN ] = new SwFormatFrmSize;
aAttrTab[ RES_PAPER_BIN- POOLATTR_BEGIN ] = new SvxPaperBinItem( RES_PAPER_BIN );
aAttrTab[ RES_LR_SPACE- POOLATTR_BEGIN ] = new SvxLRSpaceItem( RES_LR_SPACE );
aAttrTab[ RES_UL_SPACE- POOLATTR_BEGIN ] = new SvxULSpaceItem( RES_UL_SPACE );
- aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] = new SwFmtPageDesc;
- aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] = new SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK);
- aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] = new SwFmtCntnt;
- aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] = new SwFmtHeader;
- aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] = new SwFmtFooter;
+ aAttrTab[ RES_PAGEDESC- POOLATTR_BEGIN ] = new SwFormatPageDesc;
+ aAttrTab[ RES_BREAK- POOLATTR_BEGIN ] = new SvxFormatBreakItem( SVX_BREAK_NONE, RES_BREAK);
+ aAttrTab[ RES_CNTNT- POOLATTR_BEGIN ] = new SwFormatContent;
+ aAttrTab[ RES_HEADER- POOLATTR_BEGIN ] = new SwFormatHeader;
+ aAttrTab[ RES_FOOTER- POOLATTR_BEGIN ] = new SwFormatFooter;
aAttrTab[ RES_PRINT- POOLATTR_BEGIN ] = new SvxPrintItem( RES_PRINT );
aAttrTab[ RES_OPAQUE- POOLATTR_BEGIN ] = new SvxOpaqueItem( RES_OPAQUE );
aAttrTab[ RES_PROTECT- POOLATTR_BEGIN ] = new SvxProtectItem( RES_PROTECT );
- aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] = new SwFmtSurround;
- aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] = new SwFmtVertOrient;
- aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] = new SwFmtHoriOrient;
- aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] = new SwFmtAnchor;
+ aAttrTab[ RES_SURROUND- POOLATTR_BEGIN ] = new SwFormatSurround;
+ aAttrTab[ RES_VERT_ORIENT- POOLATTR_BEGIN ] = new SwFormatVertOrient;
+ aAttrTab[ RES_HORI_ORIENT- POOLATTR_BEGIN ] = new SwFormatHoriOrient;
+ aAttrTab[ RES_ANCHOR- POOLATTR_BEGIN ] = new SwFormatAnchor;
aAttrTab[ RES_BACKGROUND- POOLATTR_BEGIN ] = new SvxBrushItem( RES_BACKGROUND );
aAttrTab[ RES_BOX- POOLATTR_BEGIN ] = new SvxBoxItem( RES_BOX );
aAttrTab[ RES_SHADOW- POOLATTR_BEGIN ] = new SvxShadowItem( RES_SHADOW );
aAttrTab[ RES_FRMMACRO- POOLATTR_BEGIN ] = new SvxMacroItem( RES_FRMMACRO );
- aAttrTab[ RES_COL- POOLATTR_BEGIN ] = new SwFmtCol;
- aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] = new SvxFmtKeepItem( false, RES_KEEP );
- aAttrTab[ RES_URL - POOLATTR_BEGIN ] = new SwFmtURL();
- aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] = new SwFmtEditInReadonly;
- aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] = new SwFmtLayoutSplit;
- aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] = new SwFmtChain;
+ aAttrTab[ RES_COL- POOLATTR_BEGIN ] = new SwFormatCol;
+ aAttrTab[ RES_KEEP - POOLATTR_BEGIN ] = new SvxFormatKeepItem( false, RES_KEEP );
+ aAttrTab[ RES_URL - POOLATTR_BEGIN ] = new SwFormatURL();
+ aAttrTab[ RES_EDIT_IN_READONLY - POOLATTR_BEGIN ] = new SwFormatEditInReadonly;
+ aAttrTab[ RES_LAYOUT_SPLIT - POOLATTR_BEGIN ] = new SwFormatLayoutSplit;
+ aAttrTab[ RES_CHAIN - POOLATTR_BEGIN ] = new SwFormatChain;
aAttrTab[ RES_TEXTGRID - POOLATTR_BEGIN ] = new SwTextGridItem;
aAttrTab[ RES_HEADER_FOOTER_EAT_SPACING - POOLATTR_BEGIN ] = new SwHeaderAndFooterEatSpacingItem;
- aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] = new SwFmtLineNumber;
- aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] = new SwFmtFtnAtTxtEnd;
- aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] = new SwFmtEndAtTxtEnd;
- aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] = new SwFmtNoBalancedColumns;
+ aAttrTab[ RES_LINENUMBER - POOLATTR_BEGIN ] = new SwFormatLineNumber;
+ aAttrTab[ RES_FTN_AT_TXTEND - POOLATTR_BEGIN ] = new SwFormatFootnoteAtTextEnd;
+ aAttrTab[ RES_END_AT_TXTEND - POOLATTR_BEGIN ] = new SwFormatEndAtTextEnd;
+ aAttrTab[ RES_COLUMNBALANCE - POOLATTR_BEGIN ] = new SwFormatNoBalancedColumns;
aAttrTab[ RES_FRAMEDIR - POOLATTR_BEGIN ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, RES_FRAMEDIR );
- aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] = new SwFmtRowSplit;
+ aAttrTab[ RES_ROW_SPLIT - POOLATTR_BEGIN ] = new SwFormatRowSplit;
// #i18732#
- aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] = new SwFmtFollowTextFlow(false);
+ aAttrTab[ RES_FOLLOW_TEXT_FLOW - POOLATTR_BEGIN ] = new SwFormatFollowTextFlow(false);
// collapsing borders #i29550#
aAttrTab[ RES_COLLAPSING_BORDERS - POOLATTR_BEGIN ] = new SfxBoolItem( RES_COLLAPSING_BORDERS, false );
// #i28701#
// #i35017# - constant name has changed
- aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFmtWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
+ aAttrTab[ RES_WRAP_INFLUENCE_ON_OBJPOS - POOLATTR_BEGIN ] = new SwFormatWrapInfluenceOnObjPos( text::WrapInfluenceOnPosition::ONCE_CONCURRENT );
- aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] = new SwFmtAutoFmt( RES_AUTO_STYLE );
+ aAttrTab[ RES_AUTO_STYLE - POOLATTR_BEGIN ] = new SwFormatAutoFormat( RES_AUTO_STYLE );
aAttrTab[ RES_FRMATR_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_STYLE_NAME, OUString());
aAttrTab[ RES_FRMATR_CONDITIONAL_STYLE_NAME - POOLATTR_BEGIN ] = new SfxStringItem( RES_FRMATR_CONDITIONAL_STYLE_NAME, OUString() );
aAttrTab[ RES_FRMATR_GRABBAG - POOLATTR_BEGIN ] = new SfxGrabBagItem(RES_FRMATR_GRABBAG);
@@ -641,9 +641,9 @@ void _InitCore()
aAttrTab[ RES_GRFATR_DUMMY4 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_GRFATR_DUMMY4 );
aAttrTab[ RES_GRFATR_DUMMY5 - POOLATTR_BEGIN ] = new SfxBoolItem( RES_GRFATR_DUMMY5 );
- aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] = new SwTblBoxNumFormat;
- aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] = new SwTblBoxFormula( OUString() );
- aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] = new SwTblBoxValue;
+ aAttrTab[ RES_BOXATR_FORMAT- POOLATTR_BEGIN ] = new SwTableBoxNumFormat;
+ aAttrTab[ RES_BOXATR_FORMULA- POOLATTR_BEGIN ] = new SwTableBoxFormula( OUString() );
+ aAttrTab[ RES_BOXATR_VALUE- POOLATTR_BEGIN ] = new SwTableBoxValue;
aAttrTab[ RES_UNKNOWNATR_CONTAINER- POOLATTR_BEGIN ] =
new SvXMLAttrContainerItem( RES_UNKNOWNATR_CONTAINER );
@@ -740,7 +740,7 @@ void _InitCore()
pGlobalOLEExcludeList = new std::vector<SvGlobalName*>;
- const SvxSwAutoFmtFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
+ const SvxSwAutoFormatFlags& rAFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
SwDoc::mpACmpltWords = new SwAutoCompleteWord( rAFlags.nAutoCmpltListLen,
rAFlags.nAutoCmpltWordLen );
}
@@ -758,12 +758,12 @@ void _FinitCore()
delete pCaseCollator;
// destroy default TableAutoFormat
- delete SwTableAutoFmt::pDfltBoxAutoFmt;
+ delete SwTableAutoFormat::pDfltBoxAutoFormat;
delete SwSelPaintRects::s_pMapMode;
delete SwFntObj::pPixMap;
- delete SwEditShell::s_pAutoFmtFlags;
+ delete SwEditShell::s_pAutoFormatFlags;
#if OSL_DEBUG_LEVEL > 0
// free defaults to prevent assertions
@@ -778,9 +778,9 @@ void _FinitCore()
delete SwStyleNameMapper::pRegisterUINameArray;
delete SwStyleNameMapper::pDocUINameArray;
delete SwStyleNameMapper::pHTMLUINameArray;
- delete SwStyleNameMapper::pFrmFmtUINameArray;
- delete SwStyleNameMapper::pChrFmtUINameArray;
- delete SwStyleNameMapper::pHTMLChrFmtUINameArray;
+ delete SwStyleNameMapper::pFrameFormatUINameArray;
+ delete SwStyleNameMapper::pChrFormatUINameArray;
+ delete SwStyleNameMapper::pHTMLChrFormatUINameArray;
delete SwStyleNameMapper::pPageDescUINameArray;
delete SwStyleNameMapper::pNumRuleUINameArray;
@@ -791,9 +791,9 @@ void _FinitCore()
delete SwStyleNameMapper::pRegisterProgNameArray;
delete SwStyleNameMapper::pDocProgNameArray;
delete SwStyleNameMapper::pHTMLProgNameArray;
- delete SwStyleNameMapper::pFrmFmtProgNameArray;
- delete SwStyleNameMapper::pChrFmtProgNameArray;
- delete SwStyleNameMapper::pHTMLChrFmtProgNameArray;
+ delete SwStyleNameMapper::pFrameFormatProgNameArray;
+ delete SwStyleNameMapper::pChrFormatProgNameArray;
+ delete SwStyleNameMapper::pHTMLChrFormatProgNameArray;
delete SwStyleNameMapper::pPageDescProgNameArray;
delete SwStyleNameMapper::pNumRuleProgNameArray;
diff --git a/sw/source/core/bastyp/swtypes.cxx b/sw/source/core/bastyp/swtypes.cxx
index d22cc8d79c4f..0910dd967beb 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -58,7 +58,7 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwUndoInsert )
IMPL_FIXEDMEMPOOL_NEWDEL( SwPaM )
IMPL_FIXEDMEMPOOL_NEWDEL( SwCursor )
IMPL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtNode )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextNode )
IMPL_FIXEDMEMPOOL_NEWDEL( SwpHints )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFntObj )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFontObj )
@@ -72,10 +72,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( SwPageFrm )
IMPL_FIXEDMEMPOOL_NEWDEL( SwBodyFrm )
IMPL_FIXEDMEMPOOL_NEWDEL( SwHeaderFrm )
IMPL_FIXEDMEMPOOL_NEWDEL( SwFooterFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTxtFrm )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFmt )
-IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFmt )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTextFrm )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableLineFormat )
+IMPL_FIXEDMEMPOOL_NEWDEL( SwTableBoxFormat )
IMPL_FIXEDMEMPOOL_NEWDEL( _SwCursor_SavePos )
Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index d66427fee1c6..0a308ecf69d2 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -51,15 +51,15 @@ namespace sw { namespace mark
void AnnotationMark::InitDoc(SwDoc* const io_pDoc)
{
- SwTxtNode *pTxtNode = GetMarkEnd().nNode.GetNode().GetTxtNode();
+ SwTextNode *pTextNode = GetMarkEnd().nNode.GetNode().GetTextNode();
- SwTxtFld* pTxtFld = pTxtNode ?
- pTxtNode->GetFldTxtAttrAt(
+ SwTextField* pTextField = pTextNode ?
+ pTextNode->GetFieldTextAttrAt(
GetMarkEnd().nContent.GetIndex()-1, true ) : NULL;
- OSL_ENSURE( pTxtFld != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
- if ( pTxtFld != NULL )
+ OSL_ENSURE( pTextField != NULL, "<AnnotationMark::InitDoc(..)> - missing text attribute for annotation field!" );
+ if ( pTextField != NULL )
{
- const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTxtFld->GetFmtFld().GetField());
+ const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pTextField->GetFormatField().GetField());
OSL_ENSURE( pPostItField != NULL, "<AnnotationMark::InitDoc(..)> - annotation field missing!" );
if ( pPostItField != NULL )
{
@@ -81,33 +81,33 @@ namespace sw { namespace mark
io_pDoc->getIDocumentState().SetModified();
}
- const SwFmtFld* AnnotationMark::GetAnnotationFmtFld() const
+ const SwFormatField* AnnotationMark::GetAnnotationFormatField() const
{
SwDoc* pDoc = GetMarkPos().GetDoc();
if ( pDoc == NULL )
{
- OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFmtFld()> - missing document at annotation mark" );
+ OSL_ENSURE( false, "<AnnotationMark::GetAnnotationFormatField()> - missing document at annotation mark" );
return NULL;
}
- SwFmtFld* pAnnotationFmtFld = NULL;
+ SwFormatField* pAnnotationFormatField = NULL;
- SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFldType( RES_POSTITFLD, OUString(), false );
- SwIterator<SwFmtFld,SwFieldType> aIter( *pType );
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld != NULL; pFmtFld = aIter.Next() )
+ SwFieldType* pType = pDoc->getIDocumentFieldsAccess().GetFieldType( RES_POSTITFLD, OUString(), false );
+ SwIterator<SwFormatField,SwFieldType> aIter( *pType );
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField != NULL; pFormatField = aIter.Next() )
{
- if ( pFmtFld->IsFldInDoc() )
+ if ( pFormatField->IsFieldInDoc() )
{
- const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFmtFld->GetField());
+ const SwPostItField* pPostItField = dynamic_cast< const SwPostItField* >(pFormatField->GetField());
if (pPostItField != NULL && pPostItField->GetName() == GetName())
{
- pAnnotationFmtFld = pFmtFld;
+ pAnnotationFormatField = pFormatField;
break;
}
}
}
- return pAnnotationFmtFld;
+ return pAnnotationFormatField;
}
}}
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 862fdb64adca..6b81556660ed 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -44,22 +44,22 @@ namespace
static void lcl_FixPosition(SwPosition& rPos)
{
// make sure the position has 1) the proper node, and 2) a proper index
- SwTxtNode* pTxtNode = rPos.nNode.GetNode().GetTxtNode();
- if(pTxtNode == NULL && rPos.nContent.GetIndex() > 0)
+ SwTextNode* pTextNode = rPos.nNode.GetNode().GetTextNode();
+ if(pTextNode == NULL && rPos.nContent.GetIndex() > 0)
{
SAL_INFO(
"sw.core",
"illegal position: " << rPos.nContent.GetIndex()
- << " without proper TxtNode");
+ << " without proper TextNode");
rPos.nContent.Assign(NULL, 0);
}
- else if(pTxtNode != NULL && rPos.nContent.GetIndex() > pTxtNode->Len())
+ else if(pTextNode != NULL && rPos.nContent.GetIndex() > pTextNode->Len())
{
SAL_INFO(
"sw.core",
"illegal position: " << rPos.nContent.GetIndex()
- << " is beyond " << pTxtNode->Len());
- rPos.nContent.Assign(pTxtNode, pTxtNode->Len());
+ << " is beyond " << pTextNode->Len());
+ rPos.nContent.Assign(pTextNode, pTextNode->Len());
}
}
@@ -71,9 +71,9 @@ namespace
io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
SwPosition rStart = pField->GetMarkStart();
- SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
- const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTxtNode->GetTxt().getLength() ) ? 0 :
- pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+ SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
+ const sal_Unicode ch_start = ( rStart.nContent.GetIndex() >= pStartTextNode->GetText().getLength() ) ? 0 :
+ pStartTextNode->GetText()[rStart.nContent.GetIndex()];
if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) )
{
SwPaM aStartPaM(rStart);
@@ -83,10 +83,10 @@ namespace
}
SwPosition& rEnd = pField->GetMarkEnd();
- SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+ SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
const sal_Int32 nEndPos = ( rEnd == rStart || rEnd.nContent.GetIndex() == 0 ) ?
rEnd.nContent.GetIndex() : rEnd.nContent.GetIndex() - 1;
- const sal_Unicode ch_end = nEndPos >= pEndTxtNode->GetTxt().getLength() ? 0 : pEndTxtNode->GetTxt()[nEndPos];
+ const sal_Unicode ch_end = nEndPos >= pEndTextNode->GetText().getLength() ? 0 : pEndTextNode->GetText()[nEndPos];
if ( aEndMark && ( ch_end != aEndMark ) )
{
SwPaM aEndPaM(rEnd);
@@ -105,9 +105,9 @@ namespace
io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL);
const SwPosition& rStart = pField->GetMarkStart();
- SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode();
+ SwTextNode const*const pStartTextNode = rStart.nNode.GetNode().GetTextNode();
const sal_Unicode ch_start =
- pStartTxtNode->GetTxt()[rStart.nContent.GetIndex()];
+ pStartTextNode->GetText()[rStart.nContent.GetIndex()];
if( ch_start == aStartMark )
{
@@ -117,11 +117,11 @@ namespace
}
const SwPosition& rEnd = pField->GetMarkEnd();
- SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode();
+ SwTextNode const*const pEndTextNode = rEnd.nNode.GetNode().GetTextNode();
const sal_Int32 nEndPos = ( rEnd == rStart || rEnd.nContent.GetIndex() == 0 )
? rEnd.nContent.GetIndex()
: rEnd.nContent.GetIndex() - 1;
- const sal_Unicode ch_end = pEndTxtNode->GetTxt()[nEndPos];
+ const sal_Unicode ch_end = pEndTextNode->GetText()[nEndPos];
if ( ch_end == aEndMark )
{
SwPaM aEnd(rEnd, rEnd);
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index 60ddc4601b03..76e8e3bcfc77 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -36,9 +36,9 @@
#include <breakit.hxx>
#include <vcl/window.hxx>
-SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
sal_uInt8 nAktNdTyp, long nLRPos, bool bAktSelection )
- : rShell( rSh ), nNode( nAktNode ), nCntnt( nAktCntnt ),
+ : rShell( rSh ), nNode( nAktNode ), nContent( nAktContent ),
nNdTyp( nAktNdTyp ), nLeftFrmPos( nLRPos ),
bHasSelection( bAktSelection )
{
@@ -48,15 +48,15 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
: rShell( rSh )
{
// remember SPoint-values of current cursor
- SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
+ SwPaM* pCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
SwNode& rNd = pCrsr->GetPoint()->nNode.GetNode();
nNode = rNd.GetIndex();
- nCntnt = pCrsr->GetPoint()->nContent.GetIndex();
+ nContent = pCrsr->GetPoint()->nContent.GetIndex();
nNdTyp = rNd.GetNodeType();
bHasSelection = ( *pCrsr->GetPoint() != *pCrsr->GetMark() );
- if( rNd.IsTxtNode() )
- nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTxtNode(), nCntnt,
+ if( rNd.IsTextNode() )
+ nLeftFrmPos = SwCallLink::getLayoutFrm( rShell.GetLayout(), *rNd.GetTextNode(), nContent,
!rShell.ActionPend() );
else
{
@@ -65,14 +65,14 @@ SwCallLink::SwCallLink( SwCrsrShell & rSh )
// A special treatment for SwFeShell:
// When deleting the header/footer, footnotes SwFeShell sets the
// Cursor to NULL (Node + Content).
- // If the Cursor is not on a CntntNode (ContentNode) this fact gets
+ // If the Cursor is not on a ContentNode (ContentNode) this fact gets
// saved in NdType.
if( ND_CONTENTNODE & nNdTyp )
nNdTyp = 0;
}
}
-static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
+static void lcl_notifyRow(const SwContentNode* pNode, SwCrsrShell& rShell)
{
if ( !pNode )
return;
@@ -95,7 +95,7 @@ static void lcl_notifyRow(const SwCntntNode* pNode, SwCrsrShell& rShell)
{
if (pContent->GetType() == FRM_TAB)
{
- SwFmtFrmSize pSize = pLine->GetFrmFmt()->GetFrmSize();
+ SwFormatFrmSize pSize = pLine->GetFrameFormat()->GetFrmSize();
pRow->ModifyNotification(NULL, &pSize);
return;
}
@@ -110,22 +110,22 @@ SwCallLink::~SwCallLink()
// If travelling over Nodes check formats and register them anew at the
// new Node.
- SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTblCrs() : rShell.GetCrsr();
- SwCntntNode * pCNd = pCurCrsr->GetCntntNode();
+ SwPaM* pCurCrsr = rShell.IsTableMode() ? rShell.GetTableCrs() : rShell.GetCrsr();
+ SwContentNode * pCNd = pCurCrsr->GetContentNode();
if( !pCNd )
return;
lcl_notifyRow(pCNd, rShell);
const SwDoc *pDoc=rShell.GetDoc();
- const SwCntntNode *pNode = NULL;
+ const SwContentNode *pNode = NULL;
if ( ( pDoc != NULL && nNode < pDoc->GetNodes( ).Count( ) ) )
{
- pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+ pNode = pDoc->GetNodes()[nNode]->GetContentNode();
}
lcl_notifyRow(pNode, rShell);
- sal_Int32 nCmp, nAktCntnt = pCurCrsr->GetPoint()->nContent.GetIndex();
+ sal_Int32 nCmp, nAktContent = pCurCrsr->GetPoint()->nContent.GetIndex();
sal_uInt16 nNdWhich = pCNd->GetNodeType();
sal_uLong nAktNode = pCurCrsr->GetPoint()->nNode.GetIndex();
@@ -147,32 +147,32 @@ SwCallLink::~SwCallLink()
rShell.CallChgLnk();
}
else if( rShell.m_aChgLnk.IsSet() && ND_TEXTNODE == nNdWhich &&
- nCntnt != nAktCntnt )
+ nContent != nAktContent )
{
// If travelling with left/right only and the frame is
// unchanged (columns!) then check text hints.
- if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTxtNode(), nAktCntnt,
+ if( nLeftFrmPos == SwCallLink::getLayoutFrm( rShell.GetLayout(), *pCNd->GetTextNode(), nAktContent,
!rShell.ActionPend() ) &&
- (( nCmp = nCntnt ) + 1 == nAktCntnt || // Right
- nCntnt -1 == ( nCmp = nAktCntnt )) ) // Left
+ (( nCmp = nContent ) + 1 == nAktContent || // Right
+ nContent -1 == ( nCmp = nAktContent )) ) // Left
{
- if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & select
+ if( nCmp == nAktContent && pCurCrsr->HasMark() ) // left & select
++nCmp;
- if ( pCNd->GetTxtNode()->HasHints() )
+ if ( pCNd->GetTextNode()->HasHints() )
{
- const SwpHints &rHts = pCNd->GetTxtNode()->GetSwpHints();
+ const SwpHints &rHts = pCNd->GetTextNode()->GetSwpHints();
for( size_t n = 0; n < rHts.Count(); ++n )
{
- const SwTxtAttr* pHt = rHts[ n ];
+ const SwTextAttr* pHt = rHts[ n ];
const sal_Int32 *pEnd = pHt->End();
const sal_Int32 nStart = pHt->GetStart();
// If "only start" or "start and end equal" then call on
// every overflow of start.
if( ( !pEnd || ( nStart == *pEnd ) ) &&
- ( nStart == nCntnt || nStart == nAktCntnt) )
+ ( nStart == nContent || nStart == nAktContent) )
{
rShell.CallChgLnk();
return;
@@ -193,10 +193,10 @@ SwCallLink::~SwCallLink()
if( g_pBreakIt->GetBreakIter().is() )
{
- const OUString rTxt = pCNd->GetTxtNode()->GetTxt();
+ const OUString rText = pCNd->GetTextNode()->GetText();
if( !nCmp ||
- g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp )
- != g_pBreakIt->GetBreakIter()->getScriptType( rTxt, nCmp - 1 ))
+ g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp )
+ != g_pBreakIt->GetBreakIter()->getScriptType( rText, nCmp - 1 ))
{
rShell.CallChgLnk();
return;
@@ -215,8 +215,8 @@ SwCallLink::~SwCallLink()
if( !rShell.ActionPend() && 0 != ( pFrm = pCNd->getLayoutFrm(rShell.GetLayout(), 0, 0, false) ) &&
0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
{
- const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
- OSL_ENSURE( pIndex, "Fly without Cntnt" );
+ const SwNodeIndex* pIndex = pFlyFrm->GetFormat()->GetContent().GetContentIdx();
+ OSL_ENSURE( pIndex, "Fly without Content" );
if (!pIndex)
return;
@@ -225,14 +225,14 @@ SwCallLink::~SwCallLink()
if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
nNode > rStNd.EndOfSectionIndex() )
- rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFmt() );
+ rShell.GetFlyMacroLnk().Call( (void*)pFlyFrm->GetFormat() );
}
}
-long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
+long SwCallLink::getLayoutFrm( const SwRootFrm* pRoot, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm )
{
- SwTxtFrm* pFrm = static_cast<SwTxtFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
- SwTxtFrm* pNext;
+ SwTextFrm* pFrm = static_cast<SwTextFrm*>(rNd.getLayoutFrm(pRoot,0,0,bCalcFrm));
+ SwTextFrm* pNext;
if ( pFrm && !pFrm->IsHiddenNow() )
{
if( pFrm->HasFollow() )
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 85e9799472c9..b0aebe7aa21b 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -23,7 +23,7 @@
#include <tools/solar.h>
class SwCrsrShell;
-class SwTxtNode;
+class SwTextNode;
class SwRootFrm;
class SwCallLink
@@ -31,18 +31,18 @@ class SwCallLink
public:
SwCrsrShell & rShell;
sal_uLong nNode;
- sal_Int32 nCntnt;
+ sal_Int32 nContent;
sal_uInt8 nNdTyp;
long nLeftFrmPos;
bool bHasSelection;
explicit SwCallLink( SwCrsrShell & rSh );
- SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktCntnt,
+ SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, sal_Int32 nAktContent,
sal_uInt8 nAktNdTyp, long nLRPos,
bool bAktSelection );
~SwCallLink();
- static long getLayoutFrm( const SwRootFrm*, SwTxtNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
+ static long getLayoutFrm( const SwRootFrm*, SwTextNode& rNd, sal_Int32 nCntPos, bool bCalcFrm );
};
#endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx
index 67a25d07520c..9ec38bdc5e29 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -51,7 +51,7 @@ namespace sw { namespace mark
void CrossRefBookmark::SetMarkPos(const SwPosition& rNewPos)
{
- assert(rNewPos.nNode.GetNode().GetTxtNode() &&
+ assert(rNewPos.nNode.GetNode().GetTextNode() &&
"<sw::mark::CrossRefBookmark::SetMarkPos(..)>"
" - new bookmark position for cross-reference bookmark doesn't mark text node");
assert(rNewPos.nContent.GetIndex() == 0 &&
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 4aa3dcd7bc2f..98dc7fddc554 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -181,28 +181,28 @@ SwPaM & SwCrsrShell::GetCurrentShellCursor()
* Return pointer to the current shell cursor
* @return - returns pointer to current `SwPaM` shell cursor
*/
-SwPaM* SwCrsrShell::GetCrsr( bool bMakeTblCrsr ) const
+SwPaM* SwCrsrShell::GetCrsr( bool bMakeTableCrsr ) const
{
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
- if( bMakeTblCrsr && m_pTblCrsr->IsCrsrMovedUpdt() )
+ if( bMakeTableCrsr && m_pTableCrsr->IsCrsrMovedUpdate() )
{
//don't re-create 'parked' cursors
- const SwCntntNode* pCNd;
- if( m_pTblCrsr->GetPoint()->nNode.GetIndex() &&
- m_pTblCrsr->GetMark()->nNode.GetIndex() &&
- 0 != ( pCNd = m_pTblCrsr->GetCntntNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
- 0 != ( pCNd = m_pTblCrsr->GetCntntNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
+ const SwContentNode* pCNd;
+ if( m_pTableCrsr->GetPoint()->nNode.GetIndex() &&
+ m_pTableCrsr->GetMark()->nNode.GetIndex() &&
+ 0 != ( pCNd = m_pTableCrsr->GetContentNode() ) && pCNd->getLayoutFrm( GetLayout() ) &&
+ 0 != ( pCNd = m_pTableCrsr->GetContentNode(false) ) && pCNd->getLayoutFrm( GetLayout() ) )
{
- SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTblCrsr;
- GetLayout()->MakeTblCrsrs( *pTC );
+ SwShellTableCrsr* pTC = (SwShellTableCrsr*)m_pTableCrsr;
+ GetLayout()->MakeTableCrsrs( *pTC );
}
}
- if( m_pTblCrsr->IsChgd() )
+ if( m_pTableCrsr->IsChgd() )
{
const_cast<SwCrsrShell*>(this)->m_pCurCrsr =
- dynamic_cast<SwShellCrsr*>(m_pTblCrsr->MakeBoxSels( m_pCurCrsr ));
+ dynamic_cast<SwShellCrsr*>(m_pTableCrsr->MakeBoxSels( m_pCurCrsr ));
}
}
return m_pCurCrsr;
@@ -215,11 +215,11 @@ void SwCrsrShell::StartAction()
// save for update of the ribbon bar
const SwNode& rNd = m_pCurCrsr->GetPoint()->nNode.GetNode();
m_nAktNode = rNd.GetIndex();
- m_nAktCntnt = m_pCurCrsr->GetPoint()->nContent.GetIndex();
+ m_nAktContent = m_pCurCrsr->GetPoint()->nContent.GetIndex();
m_nAktNdTyp = rNd.GetNodeType();
m_bAktSelection = *m_pCurCrsr->GetPoint() != *m_pCurCrsr->GetMark();
- if( rNd.IsTxtNode() )
- m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTxtNode&>(*rNd.GetTxtNode()), m_nAktCntnt, true );
+ if( rNd.IsTextNode() )
+ m_nLeftFrmPos = SwCallLink::getLayoutFrm( GetLayout(), const_cast<SwTextNode&>(*rNd.GetTextNode()), m_nAktContent, true );
else
m_nLeftFrmPos = 0;
}
@@ -273,7 +273,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
{
// watch Crsr-Moves, call Link if needed, the DTOR is key here!
- SwCallLink aLk( *this, m_nAktNode, m_nAktCntnt, (sal_uInt8)m_nAktNdTyp,
+ SwCallLink aLk( *this, m_nAktNode, m_nAktContent, (sal_uInt8)m_nAktNdTyp,
m_nLeftFrmPos, m_bAktSelection );
}
@@ -295,7 +295,7 @@ void SwCrsrShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
SwCallLink aLk( *this ); // watch Crsr-Moves
aLk.nNode = m_nAktNode; // call Link if needed
aLk.nNdTyp = (sal_uInt8)m_nAktNdTyp;
- aLk.nCntnt = m_nAktCntnt;
+ aLk.nContent = m_nAktContent;
aLk.nLeftFrmPos = m_nLeftFrmPos;
if( !m_nCrsrMove ||
@@ -343,7 +343,7 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
bool bRet = false;
// #i27615# Handle cursor in front of label.
- const SwTxtNode* pTxtNd = 0;
+ const SwTextNode* pTextNd = 0;
if( m_pBlockCrsr )
m_pBlockCrsr->clearPoints();
@@ -360,8 +360,8 @@ bool SwCrsrShell::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
// to the left will simply set the bInFrontOfLabel flag:
else if ( bLeft && 0 == pShellCrsr->GetPoint()->nContent.GetIndex() &&
!pShellCrsr->IsInFrontOfLabel() && !pShellCrsr->HasMark() &&
- 0 != ( pTxtNd = pShellCrsr->GetNode().GetTxtNode() ) &&
- pTxtNd->HasVisibleNumberingOrBullet() )
+ 0 != ( pTextNd = pShellCrsr->GetNode().GetTextNode() ) &&
+ pTextNd->HasVisibleNumberingOrBullet() )
{
SetInFrontOfLabel( true );
bRet = true;
@@ -412,23 +412,23 @@ void SwCrsrShell::MarkListLevel( const OUString& sListId,
void SwCrsrShell::UpdateMarkedListLevel()
{
- SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
+ SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
- if ( pTxtNd )
+ if ( pTextNd )
{
- if ( !pTxtNd->IsNumbered() )
+ if ( !pTextNd->IsNumbered() )
{
m_pCurCrsr->_SetInFrontOfLabel( false );
MarkListLevel( OUString(), 0 );
}
else if ( m_pCurCrsr->IsInFrontOfLabel() )
{
- if ( pTxtNd->IsInList() )
+ if ( pTextNd->IsInList() )
{
- OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 &&
- pTxtNd->GetActualListLevel() < MAXLEVEL, "Which level?");
- MarkListLevel( pTxtNd->GetListId(),
- pTxtNd->GetActualListLevel() );
+ OSL_ENSURE( pTextNd->GetActualListLevel() >= 0 &&
+ pTextNd->GetActualListLevel() < MAXLEVEL, "Which level?");
+ MarkListLevel( pTextNd->GetListId(),
+ pTextNd->GetActualListLevel() );
}
}
else
@@ -525,11 +525,11 @@ bool SwCrsrShell::UpDown( bool bUp, sal_uInt16 nCnt )
m_eMvState = MV_UPDOWN; // status for Crsr travelling - GetCrsrOfst
if( !ActionPend() )
{
- CrsrFlag eUpdtMode = SwCrsrShell::SCROLLWIN;
+ CrsrFlag eUpdateMode = SwCrsrShell::SCROLLWIN;
if( !bTableMode )
- eUpdtMode = (CrsrFlag) (eUpdtMode
+ eUpdateMode = (CrsrFlag) (eUpdateMode
| SwCrsrShell::UPDOWN | SwCrsrShell::CHKRANGE);
- UpdateCrsr( static_cast<sal_uInt16>(eUpdtMode) );
+ UpdateCrsr( static_cast<sal_uInt16>(eUpdateMode) );
}
}
return bRet;
@@ -554,8 +554,8 @@ bool SwCrsrShell::LRMargin( bool bLeft, bool bAPI)
if ( bLeft && !bTableMode && bRet && bWasAtLM && !_GetCrsr()->HasMark() )
{
- const SwTxtNode * pTxtNd = _GetCrsr()->GetNode().GetTxtNode();
- if ( pTxtNd && pTxtNd->HasVisibleNumberingOrBullet() )
+ const SwTextNode * pTextNd = _GetCrsr()->GetNode().GetTextNode();
+ if ( pTextNd && pTextNd->HasVisibleNumberingOrBullet() )
SetInFrontOfLabel( true );
}
else if ( !bLeft )
@@ -605,7 +605,7 @@ void SwCrsrShell::ExtendedSelectAll(bool bFootnotes)
pPos->nContent.Assign( rNodes.GoNext( &pPos->nNode ), 0 );
pPos = m_pCurCrsr->GetMark();
pPos->nNode = rNodes.GetEndOfContent();
- SwCntntNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
+ SwContentNode* pCNd = SwNodes::GoPrevious( &pPos->nNode );
pPos->nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
}
@@ -613,10 +613,10 @@ bool SwCrsrShell::ExtendedSelectedAll(bool bFootnotes)
{
SwNodes& rNodes = GetDoc()->GetNodes();
SwNodeIndex nNode = bFootnotes ? rNodes.GetEndOfPostIts() : rNodes.GetEndOfAutotext();
- SwCntntNode* pStart = rNodes.GoNext(&nNode);
+ SwContentNode* pStart = rNodes.GoNext(&nNode);
nNode = rNodes.GetEndOfContent();
- SwCntntNode* pEnd = SwNodes::GoPrevious(&nNode);
+ SwContentNode* pEnd = SwNodes::GoPrevious(&nNode);
if (!pStart || !pEnd)
return false;
@@ -631,8 +631,8 @@ bool SwCrsrShell::StartsWithTable()
{
SwNodes& rNodes = GetDoc()->GetNodes();
SwNodeIndex nNode(rNodes.GetEndOfExtras());
- SwCntntNode* pCntntNode = rNodes.GoNext(&nNode);
- return pCntntNode->FindTableNode();
+ SwContentNode* pContentNode = rNodes.GoNext(&nNode);
+ return pContentNode->FindTableNode();
}
bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
@@ -640,14 +640,14 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
bool bRet = false;
// never jump of section borders at selection
- if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoCntnt() )
+ if( !m_pCurCrsr->HasMark() || !m_pCurCrsr->IsNoContent() )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
SET_CURR_SHELL( this );
SwCrsrSaveState aSaveState( *m_pCurCrsr );
Point& rPt = m_pCurCrsr->GetPtPos();
- SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->
+ SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->
getLayoutFrm( GetLayout(), &rPt, m_pCurCrsr->GetPoint(), false );
if( pFrm && ( bRet = GetFrmInPage( pFrm, fnWhichPage,
fnPosPage, m_pCurCrsr ) ) &&
@@ -660,12 +660,12 @@ bool SwCrsrShell::MovePage( SwWhichPage fnWhichPage, SwPosPage fnPosPage )
return bRet;
}
-bool SwCrsrShell::isInHiddenTxtFrm(SwShellCrsr* pShellCrsr)
+bool SwCrsrShell::isInHiddenTextFrm(SwShellCrsr* pShellCrsr)
{
- SwCntntNode *pCNode = pShellCrsr->GetCntntNode();
- SwCntntFrm *pFrm = pCNode ?
+ SwContentNode *pCNode = pShellCrsr->GetContentNode();
+ SwContentFrm *pFrm = pCNode ?
pCNode->getLayoutFrm( GetLayout(), &pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false ) : 0;
- return !pFrm || (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow());
+ return !pFrm || (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow());
}
bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
@@ -680,7 +680,7 @@ bool SwCrsrShell::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
//which is what SwCrsrShell::UpdateCrsrPos will reset
//the position to if we pass it a position in an
//invisible hidden paragraph field
- while (isInHiddenTxtFrm(pTmpCrsr))
+ while (isInHiddenTextFrm(pTmpCrsr))
{
if (!pTmpCrsr->MovePara(fnWhichPara, fnPosPara))
break;
@@ -708,10 +708,10 @@ bool SwCrsrShell::MoveSection( SwWhichSection fnWhichSect,
static SwFrm* lcl_IsInHeaderFooter( const SwNodeIndex& rIdx, Point& rPt )
{
SwFrm* pFrm = 0;
- SwCntntNode* pCNd = rIdx.GetNode().GetCntntNode();
+ SwContentNode* pCNd = rIdx.GetNode().GetContentNode();
if( pCNd )
{
- SwCntntFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
+ SwContentFrm *pCntFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPt, 0, false );
pFrm = pCntFrm ? pCntFrm->GetUpper() : NULL;
while( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
pFrm = pFrm->IsFlyFrm() ? static_cast<SwFlyFrm*>(pFrm)->AnchorFrm()
@@ -741,12 +741,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
bOnlyText ? MV_SETONLYTEXT : MV_NONE );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
- SwTxtNode * pTxtNd = pCrsr->GetNode().GetTxtNode();
+ SwTextNode * pTextNd = pCrsr->GetNode().GetTextNode();
- if ( pTxtNd && !IsTableMode() &&
+ if ( pTextNd && !IsTableMode() &&
// #i37515# No bInFrontOfLabel during selection
!pCrsr->HasMark() &&
- pTxtNd->HasVisibleNumberingOrBullet() )
+ pTextNd->HasVisibleNumberingOrBullet() )
{
aTmpState.bInFrontOfLabel = true; // #i27615#
}
@@ -792,12 +792,12 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
if( pFrm->Frm().IsInside( rAktCrsrPt ))
return bRet;
}
- else if( aPos.nNode.GetNode().IsCntntNode() )
+ else if( aPos.nNode.GetNode().IsContentNode() )
{
// in the same frame?
- SwFrm* pOld = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+ SwFrm* pOld = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
GetLayout(), &m_aCharRect.Pos(), 0, false );
- SwFrm* pNew = static_cast<SwCntntNode&>(aPos.nNode.GetNode()).getLayoutFrm(
+ SwFrm* pNew = static_cast<SwContentNode&>(aPos.nNode.GetNode()).getLayoutFrm(
GetLayout(), &aPt, 0, false );
if( pNew == pOld )
return bRet;
@@ -836,7 +836,7 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
}
else if( bOnlyText && !m_pCurCrsr->HasMark() )
{
- if( FindValidCntntNode( bOnlyText ) )
+ if( FindValidContentNode( bOnlyText ) )
{
// position cursor in a valid content
if( aPos == *pCrsr->GetPoint() )
@@ -863,10 +863,10 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, bool bOnlyText, bool bBlock )
return bRet;
}
-void SwCrsrShell::TblCrsrToCursor()
+void SwCrsrShell::TableCrsrToCursor()
{
- OSL_ENSURE( m_pTblCrsr, "TblCrsrToCursor: Why?" );
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ OSL_ENSURE( m_pTableCrsr, "TableCrsrToCursor: Why?" );
+ delete m_pTableCrsr, m_pTableCrsr = 0;
}
void SwCrsrShell::BlockCrsrToCrsr()
@@ -907,7 +907,7 @@ void SwCrsrShell::CrsrToBlockCrsr()
void SwCrsrShell::ClearMark()
{
// is there any GetMark?
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
std::vector<SwViewShell*> vShells;
for(SwViewShell& rShell : GetRingContainer())
@@ -915,13 +915,13 @@ void SwCrsrShell::ClearMark()
vShells.push_back(&rShell);
for(SwViewShell* pShell : vShells)
delete pShell;
- m_pTblCrsr->DeleteMark();
+ m_pTableCrsr->DeleteMark();
m_pCurCrsr->DeleteMark();
- *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
- m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+ m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+ delete m_pTableCrsr, m_pTableCrsr = 0;
m_pCurCrsr->SwSelPaintRects::Show();
}
else
@@ -965,8 +965,8 @@ bool SwCrsrShell::ChgCurrPam(
SET_CURR_SHELL( this );
// check if the SPoint is in a table selection
- if( bTstOnly && m_pTblCrsr )
- return m_pTblCrsr->IsInside( rPt );
+ if( bTstOnly && m_pTableCrsr )
+ return m_pTableCrsr->IsInside( rPt );
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
// search position <rPt> in document
@@ -999,21 +999,21 @@ bool SwCrsrShell::ChgCurrPam(
void SwCrsrShell::KillPams()
{
// Does any exist for deletion?
- if( !m_pTblCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
+ if( !m_pTableCrsr && !m_pBlockCrsr && !m_pCurCrsr->IsMultiSelection() )
return;
while( m_pCurCrsr->GetNext() != m_pCurCrsr )
delete m_pCurCrsr->GetNext();
m_pCurCrsr->SetColumnSelection( false );
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
// delete the ring of cursors
m_pCurCrsr->DeleteMark();
- *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
- m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
- delete m_pTblCrsr;
- m_pTblCrsr = 0;
+ *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+ m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+ delete m_pTableCrsr;
+ m_pTableCrsr = 0;
}
else if( m_pBlockCrsr )
{
@@ -1079,7 +1079,7 @@ bool SwCrsrShell::IsSttPara() const
{ return m_pCurCrsr->GetPoint()->nContent == 0; }
bool SwCrsrShell::IsEndPara() const
-{ return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetCntntNode()->Len(); }
+{ return m_pCurCrsr->GetPoint()->nContent == m_pCurCrsr->GetContentNode()->Len(); }
bool SwCrsrShell::IsEndOfTable() const
{
@@ -1087,14 +1087,14 @@ bool SwCrsrShell::IsEndOfTable() const
{
return false;
}
- SwTableNode const*const pTableNode( IsCrsrInTbl() );
+ SwTableNode const*const pTableNode( IsCrsrInTable() );
if (!pTableNode)
{
return false;
}
SwEndNode const*const pEndTableNode(pTableNode->EndOfSectionNode());
SwNodeIndex const lastNode(*pEndTableNode, -2);
- SAL_WARN_IF(!lastNode.GetNode().GetTxtNode(), "sw.core",
+ SAL_WARN_IF(!lastNode.GetNode().GetTextNode(), "sw.core",
"text node expected");
return (lastNode == m_pCurCrsr->GetPoint()->nNode);
}
@@ -1130,7 +1130,7 @@ bool SwCrsrShell::GotoPage( sal_uInt16 nPage )
bool SwCrsrShell::GetCharRectAt(SwRect& rRect, const SwPosition* pPos)
{
- SwCntntFrm* pFrm = GetCurrFrm();
+ SwContentFrm* pFrm = GetCurrFrm();
return pFrm->GetCharRect( rRect, *pPos );
}
@@ -1139,7 +1139,7 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
{
SET_CURR_SHELL( this );
// page number: first visible page or the one at the cursor
- const SwCntntFrm* pCFrm;
+ const SwContentFrm* pCFrm;
const SwPageFrm *pPg = 0;
if( !bAtCrsrPos || 0 == (pCFrm = GetCurrFrm( bCalcFrm )) ||
@@ -1258,7 +1258,7 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
if( m_bHasFocus && !m_bBasicHideCrsr )
{
- SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
if( !ActionPend() )
{
@@ -1314,7 +1314,7 @@ void SwCrsrShell::UpdateCrsrPos()
SwShellCrsr* pShellCrsr = getShellCrsr( true );
Size aOldSz( GetDocSize() );
- if( isInHiddenTxtFrm(pShellCrsr) )
+ if( isInHiddenTextFrm(pShellCrsr) )
{
SwCrsrMoveState aTmpState( MV_NONE );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
@@ -1351,18 +1351,18 @@ static bool lcl_CheckHiddenSection( SwNodeIndex& rIdx )
static void lcl_CheckHiddenPara( SwPosition& rPos )
{
SwNodeIndex aTmp( rPos.nNode );
- SwTxtNode* pTxtNd = aTmp.GetNode().GetTxtNode();
- while( pTxtNd && pTxtNd->HasHiddenCharAttribute( true ) )
+ SwTextNode* pTextNd = aTmp.GetNode().GetTextNode();
+ while( pTextNd && pTextNd->HasHiddenCharAttribute( true ) )
{
- SwCntntNode* pCntnt = aTmp.GetNodes().GoNext( &aTmp );
- if ( pCntnt && pCntnt->IsTxtNode() )
- pTxtNd = pCntnt->GetTxtNode();
+ SwContentNode* pContent = aTmp.GetNodes().GoNext( &aTmp );
+ if ( pContent && pContent->IsTextNode() )
+ pTextNd = pContent->GetTextNode();
else
- pTxtNd = 0;
+ pTextNd = 0;
}
- if ( pTxtNd )
- rPos = SwPosition( aTmp, SwIndex( pTxtNd, 0 ) );
+ if ( pTextNd )
+ rPos = SwPosition( aTmp, SwIndex( pTextNd, 0 ) );
}
// #i27301# - helper class that notifies the accessibility about invalid text
@@ -1409,14 +1409,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
CheckRange( m_pCurCrsr ); // overlapping ranges
if( !bIdleEnd )
- CheckTblBoxCntnt();
+ CheckTableBoxContent();
// If the current cursor is in a table and point/mark in different boxes,
- // then the table mode is active (also if it is already active: m_pTblCrsr)
+ // then the table mode is active (also if it is already active: m_pTableCrsr)
SwPaM* pTstCrsr = getShellCrsr( true );
if( pTstCrsr->HasMark() && !m_pBlockCrsr &&
- mpDoc->IsIdxInTbl( pTstCrsr->GetPoint()->nNode ) &&
- ( m_pTblCrsr ||
+ mpDoc->IsIdxInTable( pTstCrsr->GetPoint()->nNode ) &&
+ ( m_pTableCrsr ||
pTstCrsr->GetNode( true ).StartOfSectionNode() !=
pTstCrsr->GetNode( false ).StartOfSectionNode() ) && !mbSelectAll)
{
@@ -1436,36 +1436,36 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
lcl_CheckHiddenPara( *pITmpCrsr->GetMark() );
}
- SwCntntFrm *pTblFrm = pPos->nNode.GetNode().GetCntntNode()->
+ SwContentFrm *pTableFrm = pPos->nNode.GetNode().GetContentNode()->
getLayoutFrm( GetLayout(), &aTmpPt, pPos, false );
- OSL_ENSURE( pTblFrm, "Tabelle Crsr nicht im Content ??" );
+ OSL_ENSURE( pTableFrm, "Tabelle Crsr nicht im Content ??" );
// --> Make code robust. The table cursor may point
// to a table in a currently inactive header.
- SwTabFrm *pTab = pTblFrm ? pTblFrm->FindTabFrm() : 0;
+ SwTabFrm *pTab = pTableFrm ? pTableFrm->FindTabFrm() : 0;
if ( pTab && pTab->GetTable()->GetRowsToRepeat() > 0 )
{
// First check if point is in repeated headline:
- bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTblFrm );
+ bool bInRepeatedHeadline = pTab->IsFollow() && pTab->IsInHeadline( *pTableFrm );
// Second check if mark is in repeated headline:
if ( !bInRepeatedHeadline )
{
- SwCntntFrm* pMarkTblFrm = pITmpCrsr->GetCntntNode( false )->
+ SwContentFrm* pMarkTableFrm = pITmpCrsr->GetContentNode( false )->
getLayoutFrm( GetLayout(), &aTmpMk, pITmpCrsr->GetMark(), false );
- OSL_ENSURE( pMarkTblFrm, "Tabelle Crsr nicht im Content ??" );
+ OSL_ENSURE( pMarkTableFrm, "Tabelle Crsr nicht im Content ??" );
- if ( pMarkTblFrm )
+ if ( pMarkTableFrm )
{
- SwTabFrm* pMarkTab = pMarkTblFrm->FindTabFrm();
+ SwTabFrm* pMarkTab = pMarkTableFrm->FindTabFrm();
OSL_ENSURE( pMarkTab, "Tabelle Crsr nicht im Content ??" );
// Make code robust:
if ( pMarkTab )
{
- bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTblFrm );
+ bInRepeatedHeadline = pMarkTab->IsFollow() && pMarkTab->IsInHeadline( *pMarkTableFrm );
}
}
}
@@ -1473,20 +1473,20 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
// No table cursor in repeated headlines:
if ( bInRepeatedHeadline )
{
- pTblFrm = 0;
+ pTableFrm = 0;
SwPosSection fnPosSect = *pPos < *pITmpCrsr->GetMark()
? fnSectionStart
: fnSectionEnd;
// then only select inside the Box
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
m_pCurCrsr->SetMark();
- *m_pCurCrsr->GetMark() = *m_pTblCrsr->GetMark();
- m_pCurCrsr->GetMkPos() = m_pTblCrsr->GetMkPos();
- m_pTblCrsr->DeleteMark();
- m_pTblCrsr->SwSelPaintRects::Hide();
+ *m_pCurCrsr->GetMark() = *m_pTableCrsr->GetMark();
+ m_pCurCrsr->GetMkPos() = m_pTableCrsr->GetMkPos();
+ m_pTableCrsr->DeleteMark();
+ m_pTableCrsr->SwSelPaintRects::Hide();
}
*m_pCurCrsr->GetPoint() = *m_pCurCrsr->GetMark();
@@ -1495,18 +1495,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
}
// we really want a table selection
- if( pTab && pTblFrm )
+ if( pTab && pTableFrm )
{
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
{
- m_pTblCrsr = new SwShellTableCrsr( *this,
+ m_pTableCrsr = new SwShellTableCrsr( *this,
*m_pCurCrsr->GetMark(), m_pCurCrsr->GetMkPos(),
*pPos, aTmpPt );
m_pCurCrsr->DeleteMark();
m_pCurCrsr->SwSelPaintRects::Hide();
- CheckTblBoxCntnt();
- if(!m_pTblCrsr)
+ CheckTableBoxContent();
+ if(!m_pTableCrsr)
{
SAL_WARN("sw", "fdo#74854: "
"this should not happen, but better lose the selection "
@@ -1517,13 +1517,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
SwCrsrMoveState aTmpState( MV_NONE );
aTmpState.bRealHeight = true;
- if( !pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint(), &aTmpState ) )
+ if( !pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint(), &aTmpState ) )
{
Point aCentrPt( m_aCharRect.Center() );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
- pTblFrm->GetCrsrOfst( m_pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
+ pTableFrm->GetCrsrOfst( m_pTableCrsr->GetPoint(), aCentrPt, &aTmpState );
bool const bResult =
- pTblFrm->GetCharRect( m_aCharRect, *m_pTblCrsr->GetPoint() );
+ pTableFrm->GetCharRect( m_aCharRect, *m_pTableCrsr->GetPoint() );
OSL_ENSURE( bResult, "GetCharRect failed." );
(void) bResult; // non-debug: unused
}
@@ -1534,7 +1534,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
(HasSelection() || eFlags & SwCrsrShell::READONLY ||
!IsCrsrReadonly()) )
{
- SwFrm* pBoxFrm = pTblFrm;
+ SwFrm* pBoxFrm = pTableFrm;
while( pBoxFrm && !pBoxFrm->IsCellFrm() )
pBoxFrm = pBoxFrm->GetUpper();
if( pBoxFrm && pBoxFrm->Frm().HasArea() )
@@ -1544,14 +1544,14 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
}
// let Layout create the Cursors in the Boxes
- if( m_pTblCrsr->IsCrsrMovedUpdt() )
- GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+ if( m_pTableCrsr->IsCrsrMovedUpdate() )
+ GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
if( m_bHasFocus && !m_bBasicHideCrsr )
- m_pTblCrsr->Show();
+ m_pTableCrsr->Show();
// set Cursor-Points to the new Positions
- m_pTblCrsr->GetPtPos().setX(m_aCharRect.Left());
- m_pTblCrsr->GetPtPos().setY(m_aCharRect.Top());
+ m_pTableCrsr->GetPtPos().setX(m_aCharRect.Left());
+ m_pTableCrsr->GetPtPos().setY(m_aCharRect.Top());
if( m_bSVCrsrVis )
{
@@ -1561,21 +1561,21 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
m_pVisCrsr->Show(); // show again
}
m_eMvState = MV_NONE; // state for cursor travelling - GetCrsrOfst
- if( pTblFrm && Imp()->IsAccessible() )
- Imp()->InvalidateAccessibleCursorPosition( pTblFrm );
+ if( pTableFrm && Imp()->IsAccessible() )
+ Imp()->InvalidateAccessibleCursorPosition( pTableFrm );
return;
}
}
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
// delete Ring
while( m_pCurCrsr->GetNext() != m_pCurCrsr )
delete m_pCurCrsr->GetNext();
m_pCurCrsr->DeleteMark();
- *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
- m_pCurCrsr->GetPtPos() = m_pTblCrsr->GetPtPos();
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
+ m_pCurCrsr->GetPtPos() = m_pTableCrsr->GetPtPos();
+ delete m_pTableCrsr, m_pTableCrsr = 0;
}
m_pVisCrsr->Hide(); // always hide visible Cursor
@@ -1591,7 +1591,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
( !mpDoc->GetDocShell() ||
!mpDoc->GetDocShell()->IsReadOnly() || m_bAllProtect )) ) )
{
- if( !FindValidCntntNode( !HasDrawView() ||
+ if( !FindValidContentNode( !HasDrawView() ||
0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
{
// everything protected/hidden -> special mode
@@ -1637,18 +1637,18 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
bool bPointIsStart = ( rCmp.Start() == rCmp.GetPoint() );
// move point; forward if it's the start, backwards if it's the end
- if( ! rCmp.GetPoint()->nNode.GetNode().IsCntntNode() )
+ if( ! rCmp.GetPoint()->nNode.GetNode().IsContentNode() )
rCmp.Move( bPointIsStart ? fnMoveForward : fnMoveBackward,
- fnGoCntnt );
+ fnGoContent );
// move mark (if exists); forward if it's the start, else backwards
if( rCmp.HasMark() )
{
- if( ! rCmp.GetMark()->nNode.GetNode().IsCntntNode() )
+ if( ! rCmp.GetMark()->nNode.GetNode().IsContentNode() )
{
rCmp.Exchange();
rCmp.Move( !bPointIsStart ? fnMoveForward : fnMoveBackward,
- fnGoCntnt );
+ fnGoContent );
rCmp.Exchange();
}
}
@@ -1656,7 +1656,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
SwRect aOld( m_aCharRect );
bool bFirst = true;
- SwCntntFrm *pFrm;
+ SwContentFrm *pFrm;
int nLoopCnt = 100;
SwShellCrsr* pShellCrsr = getShellCrsr( true );
@@ -1664,7 +1664,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
bool bAgainst;
do {
bAgainst = false;
- pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+ pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
// if the Frm doesn't exist anymore, the complete Layout has to be
// created, because there used to be a Frm here!
@@ -1673,7 +1673,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
do
{
CalcLayout();
- pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
+ pFrm = pShellCrsr->GetContentNode()->getLayoutFrm( GetLayout(),
&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(), false );
} while( !pFrm );
}
@@ -1690,7 +1690,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
{
// look for a valid position
bool bChgState = true;
- if( !FindValidCntntNode(!HasDrawView() ||
+ if( !FindValidContentNode(!HasDrawView() ||
0 == Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
{
// everything is protected / hidden -> special Mode
@@ -1809,8 +1809,8 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, bool bIdleEnd )
if( !bIdleEnd && m_bHasFocus && !m_bBasicHideCrsr )
{
- if( m_pTblCrsr )
- m_pTblCrsr->SwSelPaintRects::Show();
+ if( m_pTableCrsr )
+ m_pTableCrsr->SwSelPaintRects::Show();
else
{
m_pCurCrsr->SwSelPaintRects::Show();
@@ -1858,7 +1858,7 @@ void SwCrsrShell::RefreshBlockCursor()
OSL_ENSURE( m_pBlockCrsr, "Don't call me without a block cursor" );
SwShellCrsr &rBlock = m_pBlockCrsr->getShellCrsr();
Point aPt = rBlock.GetPtPos();
- SwCntntFrm* pFrm = rBlock.GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
+ SwContentFrm* pFrm = rBlock.GetContentNode()->getLayoutFrm( GetLayout(), &aPt, rBlock.GetPoint(), false );
Point aMk;
if( m_pBlockCrsr->getEndPoint() && m_pBlockCrsr->getStartPoint() )
{
@@ -1970,7 +1970,7 @@ void SwCrsrShell::Push()
// fdo#60513: if we have a table cursor, copy that; else copy current.
// This seems to work because UpdateCrsr() will fix this up on Pop(),
// then MakeBoxSels() will re-create the current m_pCurCrsr cell ring.
- SwShellCrsr *const pCurrent((m_pTblCrsr) ? m_pTblCrsr : m_pCurCrsr);
+ SwShellCrsr *const pCurrent((m_pTableCrsr) ? m_pTableCrsr : m_pCurCrsr);
m_pCrsrStk = new SwShellCrsr( *this, *pCurrent->GetPoint(),
pCurrent->GetPtPos(), m_pCrsrStk );
@@ -2092,7 +2092,7 @@ void SwCrsrShell::HideCrsrs()
m_pVisCrsr->Hide();
}
// revoke inversion of SSelection
- SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
pAktCrsr->Hide();
}
@@ -2102,7 +2102,7 @@ void SwCrsrShell::ShowCrsrs( bool bCrsrVis )
return;
SET_CURR_SHELL( this );
- SwShellCrsr* pAktCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwShellCrsr* pAktCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
pAktCrsr->Show();
if( m_bSVCrsrVis && bCrsrVis ) // also show SV cursor again
@@ -2114,7 +2114,7 @@ void SwCrsrShell::ShowCrsr()
if( !m_bBasicHideCrsr )
{
m_bSVCrsrVis = true;
- m_pCurCrsr->SetShowTxtInputFldOverlay( true );
+ m_pCurCrsr->SetShowTextInputFieldOverlay( true );
if (isTiledRendering())
libreOfficeKitCallback(LOK_CALLBACK_CURSOR_VISIBLE, OString::boolean(true).getStr());
@@ -2130,7 +2130,7 @@ void SwCrsrShell::HideCrsr()
m_bSVCrsrVis = false;
// possibly reverse selected areas!!
SET_CURR_SHELL( this );
- m_pCurCrsr->SetShowTxtInputFldOverlay( false );
+ m_pCurCrsr->SetShowTextInputFieldOverlay( false );
m_pVisCrsr->Hide();
if (isTiledRendering())
@@ -2158,11 +2158,11 @@ void SwCrsrShell::ShGetFcs( bool bUpdate )
}
/** Get current frame in which the cursor is positioned. */
-SwCntntFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
+SwContentFrm *SwCrsrShell::GetCurrFrm( const bool bCalcFrm ) const
{
SET_CURR_SHELL( (SwViewShell*)this );
- SwCntntFrm *pRet = 0;
- SwCntntNode *pNd = m_pCurCrsr->GetCntntNode();
+ SwContentFrm *pRet = 0;
+ SwContentNode *pNd = m_pCurCrsr->GetContentNode();
if ( pNd )
{
if ( bCalcFrm )
@@ -2201,7 +2201,7 @@ void SwCrsrShell::Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew )
nWhich == RES_ATTRSET_CHG ))
// messages are not forwarded
// #i6681#: RES_UPDATE_ATTR is implicitly unset in
- // SwTxtNode::Insert(SwTxtHint*, sal_uInt16); we react here and thus do
+ // SwTextNode::Insert(SwTextHint*, sal_uInt16); we react here and thus do
// not need to send the expensive RES_FMT_CHG in Insert.
CallChgLnk();
@@ -2235,36 +2235,36 @@ void SwCrsrShell::CallChgLnk()
}
/// get selected text of a node at current cursor
-OUString SwCrsrShell::GetSelTxt() const
+OUString SwCrsrShell::GetSelText() const
{
- OUString aTxt;
+ OUString aText;
if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
m_pCurCrsr->GetMark()->nNode.GetIndex() )
{
- SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
- if( pTxtNd )
+ SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+ if( pTextNd )
{
const sal_Int32 nStt = m_pCurCrsr->Start()->nContent.GetIndex();
- aTxt = pTxtNd->GetExpandTxt( nStt,
+ aText = pTextNd->GetExpandText( nStt,
m_pCurCrsr->End()->nContent.GetIndex() - nStt );
}
}
- return aTxt;
+ return aText;
}
/// get text only from current cursor position (until end of node)
OUString SwCrsrShell::GetText() const
{
- OUString aTxt;
+ OUString aText;
if( m_pCurCrsr->GetPoint()->nNode.GetIndex() ==
m_pCurCrsr->GetMark()->nNode.GetIndex() )
{
- SwTxtNode* pTxtNd = m_pCurCrsr->GetNode().GetTxtNode();
- if( pTxtNd )
- aTxt = pTxtNd->GetTxt().copy(
+ SwTextNode* pTextNd = m_pCurCrsr->GetNode().GetTextNode();
+ if( pTextNd )
+ aText = pTextNd->GetText().copy(
m_pCurCrsr->GetPoint()->nContent.GetIndex() );
}
- return aTxt;
+ return aText;
}
/** get the nth character of the current SSelection
@@ -2279,12 +2279,12 @@ sal_Unicode SwCrsrShell::GetChar( bool bEnd, long nOffset )
const SwPosition* pPos = !m_pCurCrsr->HasMark() ? m_pCurCrsr->GetPoint()
: bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
- SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
- if( !pTxtNd )
+ SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+ if( !pTextNd )
return 0;
const sal_Int32 nPos = pPos->nContent.GetIndex();
- const OUString& rStr = pTxtNd->GetTxt();
+ const OUString& rStr = pTextNd->GetText();
sal_Unicode cCh = 0;
if (((nPos+nOffset) >= 0 ) && (nPos+nOffset) < rStr.getLength())
@@ -2304,13 +2304,13 @@ bool SwCrsrShell::ExtendSelection( bool bEnd, sal_Int32 nCount )
return false; // no selection
SwPosition* pPos = bEnd ? m_pCurCrsr->End() : m_pCurCrsr->Start();
- SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
- OSL_ENSURE( pTxtNd, "no text node; how should this then be extended?" );
+ SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+ OSL_ENSURE( pTextNd, "no text node; how should this then be extended?" );
sal_Int32 nPos = pPos->nContent.GetIndex();
if( bEnd )
{
- if ((nPos + nCount) <= pTxtNd->GetTxt().getLength())
+ if ((nPos + nCount) <= pTextNd->GetText().getLength())
nPos = nPos + nCount;
else
return false; // not possible
@@ -2347,17 +2347,17 @@ bool SwCrsrShell::SetVisCrsr( const Point &rPt )
SetInFrontOfLabel( false ); // #i27615#
// show only in TextNodes
- SwTxtNode* pTxtNd = aPos.nNode.GetNode().GetTxtNode();
- if( !pTxtNd )
+ SwTextNode* pTextNd = aPos.nNode.GetNode().GetTextNode();
+ if( !pTextNd )
return false;
- const SwSectionNode* pSectNd = pTxtNd->FindSectionNode();
+ const SwSectionNode* pSectNd = pTextNd->FindSectionNode();
if( pSectNd && (pSectNd->GetSection().IsHiddenFlag() ||
( !IsReadOnlyAvailable() &&
pSectNd->GetSection().IsProtectFlag())) )
return false;
- SwCntntFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
+ SwContentFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, &aPos );
if ( Imp()->IsIdleAction() )
pFrm->PrepareCrsr();
SwRect aTmp( m_aCharRect );
@@ -2423,9 +2423,9 @@ bool SwCrsrShell::IsStartOfDoc() const
if( m_pCurCrsr->GetPoint()->nContent.GetIndex() )
return false;
- // after EndOfIcons comes the content selection (EndNd+StNd+CntntNd)
+ // after EndOfIcons comes the content selection (EndNd+StNd+ContentNd)
SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfExtras(), 2 );
- if( !aIdx.GetNode().IsCntntNode() )
+ if( !aIdx.GetNode().IsContentNode() )
GetDoc()->GetNodes().GoNext( &aIdx );
return aIdx == m_pCurCrsr->GetPoint()->nNode;
}
@@ -2433,7 +2433,7 @@ bool SwCrsrShell::IsStartOfDoc() const
bool SwCrsrShell::IsEndOfDoc() const
{
SwNodeIndex aIdx( GetDoc()->GetNodes().GetEndOfContent(), -1 );
- SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
if( !pCNd )
pCNd = SwNodes::GoPrevious( &aIdx );
@@ -2448,19 +2448,19 @@ bool SwCrsrShell::IsEndOfDoc() const
This is needed for Drag&Drop/ Clipboard-paste in tables.
*/
-bool SwCrsrShell::ParkTblCrsr()
+bool SwCrsrShell::ParkTableCrsr()
{
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
return false;
- m_pTblCrsr->ParkCrsr();
+ m_pTableCrsr->ParkCrsr();
while( m_pCurCrsr->GetNext() != m_pCurCrsr )
delete m_pCurCrsr->GetNext();
// *always* move cursor's Point and Mark
m_pCurCrsr->DeleteMark();
- *m_pCurCrsr->GetPoint() = *m_pTblCrsr->GetPoint();
+ *m_pCurCrsr->GetPoint() = *m_pTableCrsr->GetPoint();
return true;
}
@@ -2572,16 +2572,16 @@ void SwCrsrShell::ParkCrsr( const SwNodeIndex &rIdx )
pSh->_ParkPams( pNew, &pSh->m_pCrsrStk );
pSh->_ParkPams( pNew, &pSh->m_pCurCrsr );
- if( pSh->m_pTblCrsr )
+ if( pSh->m_pTableCrsr )
{
// set table cursor always to 0 and the current one always to
// the beginning of the table
- SwPaM* pTCrsr = pSh->GetTblCrs();
- SwNode* pTblNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
- if ( pTblNd )
+ SwPaM* pTCrsr = pSh->GetTableCrs();
+ SwNode* pTableNd = pTCrsr->GetPoint()->nNode.GetNode().FindTableNode();
+ if ( pTableNd )
{
pTCrsr->DeleteMark();
- pSh->m_pCurCrsr->GetPoint()->nNode = *pTblNd;
+ pSh->m_pCurCrsr->GetPoint()->nNode = *pTableNd;
}
}
}
@@ -2599,13 +2599,13 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
, SwModify( 0 )
, m_pCrsrStk( 0 )
, m_pBlockCrsr( 0 )
- , m_pTblCrsr( 0 )
+ , m_pTableCrsr( 0 )
, m_pBoxIdx( 0 )
, m_pBoxPtr( 0 )
, m_nUpDownX(0)
, m_nLeftFrmPos(0)
, m_nAktNode(0)
- , m_nAktCntnt(0)
+ , m_nAktContent(0)
, m_nAktNdTyp(0)
, m_bAktSelection(false)
, m_nCrsrMove( 0 )
@@ -2618,10 +2618,10 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pInitWin )
SET_CURR_SHELL( this );
// only keep the position of the current cursor of the copy shell
m_pCurCrsr = new SwShellCrsr( *this, *(rShell.m_pCurCrsr->GetPoint()) );
- m_pCurCrsr->GetCntntNode()->Add( this );
+ m_pCurCrsr->GetContentNode()->Add( this );
m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
- m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+ m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
m_bOverwriteCrsr = false;
m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
m_bSVCrsrVis = true;
@@ -2641,13 +2641,13 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
, SwModify( 0 )
, m_pCrsrStk( 0 )
, m_pBlockCrsr( 0 )
- , m_pTblCrsr( 0 )
+ , m_pTableCrsr( 0 )
, m_pBoxIdx( 0 )
, m_pBoxPtr( 0 )
, m_nUpDownX(0)
, m_nLeftFrmPos(0)
, m_nAktNode(0)
- , m_nAktCntnt(0)
+ , m_nAktContent(0)
, m_nAktNdTyp(0)
, m_bAktSelection(false)
, m_nCrsrMove( 0 )
@@ -2662,7 +2662,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
SwNodes& rNds = rDoc.GetNodes();
SwNodeIndex aNodeIdx( *rNds.GetEndOfContent().StartOfSectionNode() );
- SwCntntNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
+ SwContentNode* pCNd = rNds.GoNext( &aNodeIdx ); // go to the first ContentNode
m_pCurCrsr = new SwShellCrsr( *this, SwPosition( aNodeIdx, SwIndex( pCNd, 0 )));
@@ -2671,7 +2671,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, vcl::Window *pInitWin,
pCNd->Add( this );
m_bAllProtect = m_bVisPortChgd = m_bChgCallFlag = m_bInCMvVisportChgd =
- m_bGCAttr = m_bIgnoreReadonly = m_bSelTblCells = m_bBasicHideCrsr =
+ m_bGCAttr = m_bIgnoreReadonly = m_bSelTableCells = m_bBasicHideCrsr =
m_bOverwriteCrsr = false;
m_bCallChgLnk = m_bHasFocus = m_bAutoUpdateCells = true;
m_bSVCrsrVis = true;
@@ -2689,13 +2689,13 @@ SwCrsrShell::~SwCrsrShell()
{
// if it is not the last view then at least the field should be updated
if( !unique() )
- CheckTblBoxCntnt( m_pCurCrsr->GetPoint() );
+ CheckTableBoxContent( m_pCurCrsr->GetPoint() );
else
- ClearTblBoxCntnt();
+ ClearTableBoxContent();
delete m_pVisCrsr;
delete m_pBlockCrsr;
- delete m_pTblCrsr;
+ delete m_pTableCrsr;
// release cursors
while(m_pCurCrsr->GetNext() != m_pCurCrsr)
@@ -2718,8 +2718,8 @@ SwCrsrShell::~SwCrsrShell()
SwShellCrsr* SwCrsrShell::getShellCrsr( bool bBlock )
{
- if( m_pTblCrsr )
- return m_pTblCrsr;
+ if( m_pTableCrsr )
+ return m_pTableCrsr;
if( m_pBlockCrsr && bBlock )
return &m_pBlockCrsr->getShellCrsr();
return m_pCurCrsr;
@@ -2742,13 +2742,13 @@ bool SwCrsrShell::ShouldWait() const
pPam->End()->nNode.GetIndex();
}
-size_t SwCrsrShell::UpdateTblSelBoxes()
+size_t SwCrsrShell::UpdateTableSelBoxes()
{
- if (m_pTblCrsr && (m_pTblCrsr->IsChgd() || !m_pTblCrsr->GetSelectedBoxesCount()))
+ if (m_pTableCrsr && (m_pTableCrsr->IsChgd() || !m_pTableCrsr->GetSelectedBoxesCount()))
{
- GetLayout()->MakeTblCrsrs( *m_pTblCrsr );
+ GetLayout()->MakeTableCrsrs( *m_pTableCrsr );
}
- return (m_pTblCrsr) ? m_pTblCrsr->GetSelectedBoxesCount() : 0;
+ return (m_pTableCrsr) ? m_pTableCrsr->GetSelectedBoxesCount() : 0;
}
/// show the current selected "object"
@@ -2787,9 +2787,9 @@ void SwCrsrShell::MakeSelVisible()
}
/// search a valid content position (not protected/hidden)
-bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
+bool SwCrsrShell::FindValidContentNode( bool bOnlyText )
{
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
{
OSL_ENSURE( false, "Did not remove table selection!" );
return false;
@@ -2807,8 +2807,8 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
SwNodeIndex& rNdIdx = m_pCurCrsr->GetPoint()->nNode;
sal_uLong nNdIdx = rNdIdx.GetIndex(); // keep backup
SwNodes& rNds = mpDoc->GetNodes();
- SwCntntNode* pCNd = rNdIdx.GetNode().GetCntntNode();
- const SwCntntFrm * pFrm;
+ SwContentNode* pCNd = rNdIdx.GetNode().GetContentNode();
+ const SwContentFrm * pFrm;
if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, m_pCurCrsr->GetPoint(), false)) &&
!IsReadOnlyAvailable() && pFrm->IsProtected() &&
@@ -2834,7 +2834,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
}
*m_pCurCrsr->GetPoint() = *aPam.GetPoint();
}
- else if( bOnlyText && pCNd && pCNd->IsNoTxtNode() )
+ else if( bOnlyText && pCNd && pCNd->IsNoTextNode() )
{
// set to beginning of document
rNdIdx = mpDoc->GetNodes().GetEndOfExtras();
@@ -2857,7 +2857,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
// move forward into non-protected area.
SwPaM aPam( rNdIdx.GetNode(), 0 );
while( aPam.GetNode().IsProtect() &&
- aPam.Move( fnMoveForward, fnGoCntnt ) )
+ aPam.Move( fnMoveForward, fnGoContent ) )
; // nothing to do in the loop; the aPam.Move does the moving!
// didn't work? then go backwards!
@@ -2866,7 +2866,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
SwPaM aTmpPaM( rNdIdx.GetNode(), 0 );
aPam = aTmpPaM;
while( aPam.GetNode().IsProtect() &&
- aPam.Move( fnMoveBackward, fnGoCntnt ) )
+ aPam.Move( fnMoveBackward, fnGoContent ) )
; // nothing to do in the loop; the aPam.Move does the moving!
}
@@ -2930,7 +2930,7 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
// also check for Fly - might be protected as well
if( 0 == (pFrm = pCNd->getLayoutFrm( GetLayout(), 0, 0, false)) ||
( !IsReadOnlyAvailable() && pFrm->IsProtected() ) ||
- ( bOnlyText && pCNd->IsNoTxtNode() ) )
+ ( bOnlyText && pCNd->IsNoTextNode() ) )
{
// continue search
bOk = false;
@@ -2949,13 +2949,13 @@ bool SwCrsrShell::FindValidCntntNode( bool bOnlyText )
}
if( bOk )
{
- pCNd = rNdIdx.GetNode().GetCntntNode();
- const sal_Int32 nCntnt = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
- m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nCntnt );
+ pCNd = rNdIdx.GetNode().GetContentNode();
+ const sal_Int32 nContent = rNdIdx.GetIndex() < nNdIdx ? pCNd->Len() : 0;
+ m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, nContent );
}
else
{
- pCNd = rNdIdx.GetNode().GetCntntNode();
+ pCNd = rNdIdx.GetNode().GetContentNode();
// if cursor in hidden frame, always move it
if( !pCNd || !pCNd->getLayoutFrm( GetLayout(), 0, 0, false) )
{
@@ -2978,9 +2978,9 @@ bool SwCrsrShell::IsCrsrReadonly() const
const SwSection* pSection;
if( pFrm && pFrm->IsInFly() &&
- (pFly = pFrm->FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+ (pFly = pFrm->FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
pFly->Lower() &&
- !pFly->Lower()->IsNoTxtFrm() &&
+ !pFly->Lower()->IsNoTextFrm() &&
!GetDrawView()->GetMarkedObjectList().GetMarkCount() )
{
return false;
@@ -2992,7 +2992,7 @@ bool SwCrsrShell::IsCrsrReadonly() const
{
return false;
}
- else if ( !IsMultiSelection() && CrsrInsideInputFld() )
+ else if ( !IsMultiSelection() && CrsrInsideInputField() )
{
return false;
}
@@ -3027,10 +3027,10 @@ bool SwCrsrShell::HasReadonlySel(bool bAnnotationMode) const
// If protected area is to be ignored, then selections are never read-only.
if ((IsReadOnlyAvailable() || GetViewOptions()->IsFormView()) && !GetViewOptions()->IsIgnoreProtectedArea())
{
- if ( m_pTblCrsr != NULL )
+ if ( m_pTableCrsr != NULL )
{
- bRet = m_pTblCrsr->HasReadOnlyBoxSel()
- || m_pTblCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
+ bRet = m_pTableCrsr->HasReadOnlyBoxSel()
+ || m_pTableCrsr->HasReadonlySel( GetViewOptions()->IsFormView() );
}
else
{
@@ -3062,7 +3062,7 @@ bool SwCrsrShell::IsSelFullPara() const
nStt = nEnd;
nEnd = nTmp;
}
- const SwCntntNode* pCNd = m_pCurCrsr->GetCntntNode();
+ const SwContentNode* pCNd = m_pCurCrsr->GetContentNode();
bRet = pCNd && !nStt && nEnd == pCNd->Len();
}
return bRet;
@@ -3105,7 +3105,7 @@ bool SwCrsrShell::SelectHiddenRange()
if ( !GetViewOptions()->IsShowHiddenChar() && !m_pCurCrsr->HasMark() )
{
SwPosition& rPt = *m_pCurCrsr->GetPoint();
- const SwTxtNode* pNode = rPt.nNode.GetNode().GetTxtNode();
+ const SwTextNode* pNode = rPt.nNode.GetNode().GetTextNode();
if ( pNode )
{
const sal_Int32 nPos = rPt.nContent.GetIndex();
@@ -3134,9 +3134,9 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
FindRanges eRng,
bool bReplace )
{
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
GetCrsr();
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ delete m_pTableCrsr, m_pTableCrsr = 0;
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
sal_uLong nRet = m_pCurCrsr->Find( rSearchOpt, bSearchInNotes, eStart, eEnd,
bCancel, eRng, bReplace );
@@ -3145,18 +3145,18 @@ sal_uLong SwCrsrShell::Find( const SearchOptions& rSearchOpt,
return nRet;
}
-sal_uLong SwCrsrShell::Find( const SwTxtFmtColl& rFmtColl,
+sal_uLong SwCrsrShell::Find( const SwTextFormatColl& rFormatColl,
SwDocPositions eStart, SwDocPositions eEnd,
bool& bCancel,
FindRanges eRng,
- const SwTxtFmtColl* pReplFmt )
+ const SwTextFormatColl* pReplFormat )
{
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
GetCrsr();
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ delete m_pTableCrsr, m_pTableCrsr = 0;
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
- sal_uLong nRet = m_pCurCrsr->Find( rFmtColl, eStart, eEnd, bCancel, eRng,
- pReplFmt );
+ sal_uLong nRet = m_pCurCrsr->Find( rFormatColl, eStart, eEnd, bCancel, eRng,
+ pReplFormat );
if( nRet )
UpdateCrsr();
return nRet;
@@ -3170,9 +3170,9 @@ sal_uLong SwCrsrShell::Find( const SfxItemSet& rSet,
const SearchOptions* pSearchOpt,
const SfxItemSet* rReplSet )
{
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
GetCrsr();
- delete m_pTblCrsr, m_pTblCrsr = 0;
+ delete m_pTableCrsr, m_pTableCrsr = 0;
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
sal_uLong nRet = m_pCurCrsr->Find( rSet, bNoCollections, eStart, eEnd,
bCancel, eRng, pSearchOpt, rReplSet );
@@ -3227,7 +3227,7 @@ static const SwStartNode* lcl_NodeContext( const SwNode& rNode )
*/
bool sw_PosOk(const SwPosition & aPos)
{
- return NULL != aPos.nNode.GetNode().GetCntntNode() &&
+ return NULL != aPos.nNode.GetNode().GetContentNode() &&
aPos.nContent.GetIdxReg();
}
@@ -3301,8 +3301,8 @@ void SwCrsrShell::ClearUpCrsrs()
// If at least one of the cursors in the ring have been deleted or replaced,
// remove the table cursor.
- if (m_pTblCrsr != NULL && bChanged)
- TblCrsrToCursor();
+ if (m_pTableCrsr != NULL && bChanged)
+ TableCrsrToCursor();
}
OUString SwCrsrShell::GetCrsrDescr() const
@@ -3359,7 +3359,7 @@ static void lcl_FillRecognizerData( uno::Sequence< OUString >& rSmartTagTypes,
}
static void lcl_FillTextRange( uno::Reference<text::XTextRange>& rRange,
- SwTxtNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
+ SwTextNode& rNode, sal_Int32 nBegin, sal_Int32 nLen )
{
// create SwPosition for nStartIndex
SwIndex aIndex( &rNode, nBegin );
@@ -3384,7 +3384,7 @@ void SwCrsrShell::GetSmartTagTerm( uno::Sequence< OUString >& rSmartTagTypes,
SwPaM* pCrsr = GetCrsr();
SwPosition aPos( *pCrsr->GetPoint() );
- SwTxtNode *pNode = aPos.nNode.GetNode().GetTxtNode();
+ SwTextNode *pNode = aPos.nNode.GetNode().GetTextNode();
if ( pNode && !pNode->IsInProtectSect() )
{
const SwWrongList *pSmartTagList = pNode->GetSmartTags();
@@ -3426,11 +3426,11 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
SwCrsrMoveState eTmpState( MV_SETONLYTEXT );
SwSpecialPos aSpecialPos;
eTmpState.pSpecialPos = &aSpecialPos;
- SwTxtNode *pNode;
+ SwTextNode *pNode;
const SwWrongList *pSmartTagList;
if( GetLayout()->GetCrsrOfst( &aPos, aPt, &eTmpState ) &&
- 0 != (pNode = aPos.nNode.GetNode().GetTxtNode()) &&
+ 0 != (pNode = aPos.nNode.GetNode().GetTextNode()) &&
0 != (pSmartTagList = pNode->GetSmartTags()) &&
!pNode->IsInProtectSect() )
{
@@ -3452,7 +3452,7 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
lcl_FillTextRange( rRange, *pNode, nBegin, nLen );
// get smarttag word
- OUString aText( pNode->GetTxt().copy(nBegin, nLen) );
+ OUString aText( pNode->GetText().copy(nBegin, nLen) );
//save the start and end positions of the line and the starting point
Push();
@@ -3492,13 +3492,13 @@ void SwCrsrShell::GetSmartTagTerm( const Point& rPt, SwRect& rSelectRect,
SwRect aStartRect;
SwCrsrMoveState aState;
aState.bRealWidth = true;
- SwCntntNode* pCntntNode = pCrsr->GetCntntNode();
- SwCntntFrm *pCntntFrame = pCntntNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
+ SwContentNode* pContentNode = pCrsr->GetContentNode();
+ SwContentFrm *pContentFrame = pContentNode->getLayoutFrm( GetLayout(), &rPt, pCrsr->GetPoint(), false);
- pCntntFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
+ pContentFrame->GetCharRect( aStartRect, *pCrsr->GetPoint(), &aState );
rContent = nWordEnd - 1;
SwRect aEndRect;
- pCntntFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
+ pContentFrame->GetCharRect( aEndRect, *pCrsr->GetPoint(),&aState );
rSelectRect = aStartRect.Union( aEndRect );
Pop(false);
}
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 3b0d097ef515..99c8a56ab622 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -80,7 +80,7 @@ void SwCrsrShell::MoveCrsrToNum()
// try to set cursor onto this position, at half of the char-
// SRectangle's height
Point aPt( m_pCurCrsr->GetPtPos() );
- SwCntntFrm * pFrm = m_pCurCrsr->GetCntntNode()->getLayoutFrm( GetLayout(), &aPt,
+ SwContentFrm * pFrm = m_pCurCrsr->GetContentNode()->getLayoutFrm( GetLayout(), &aPt,
m_pCurCrsr->GetPoint() );
pFrm->GetCharRect( m_aCharRect, *m_pCurCrsr->GetPoint() );
pFrm->Calc();
@@ -122,13 +122,13 @@ bool SwCrsrShell::GotoPrevNum()
}
/// jump from content to header
-bool SwCrsrShell::GotoHeaderTxt()
+bool SwCrsrShell::GotoHeaderText()
{
const SwFrm* pFrm = GetCurrFrm()->FindPageFrm();
while( pFrm && !pFrm->IsHeaderFrm() )
pFrm = pFrm->GetLower();
// found header, search 1. content frame
- while( pFrm && !pFrm->IsCntntFrm() )
+ while( pFrm && !pFrm->IsContentFrm() )
pFrm = pFrm->GetLower();
if( pFrm )
@@ -150,7 +150,7 @@ bool SwCrsrShell::GotoHeaderTxt()
}
/// jump from content to footer
-bool SwCrsrShell::GotoFooterTxt()
+bool SwCrsrShell::GotoFooterText()
{
const SwPageFrm* pFrm = GetCurrFrm()->FindPageFrm();
if( pFrm )
@@ -160,7 +160,7 @@ bool SwCrsrShell::GotoFooterTxt()
while( pLower && !pLower->IsFooterFrm() )
pLower = pLower->GetLower();
// found footer, search 1. content frame
- while( pLower && !pLower->IsCntntFrm() )
+ while( pLower && !pLower->IsContentFrm() )
pLower = pLower->GetLower();
if( pLower )
@@ -209,25 +209,25 @@ bool SwCrsrShell::SetCrsrInHdFt( size_t nDescNo, bool bInHeader )
if( pDesc )
{
// check if the attribute exists
- const SwFmtCntnt* pCnt = 0;
+ const SwFormatContent* pCnt = 0;
if( bInHeader )
{
// mirrored pages? ignore for now
- const SwFmtHeader& rHd = pDesc->GetMaster().GetHeader();
- if( rHd.GetHeaderFmt() )
- pCnt = &rHd.GetHeaderFmt()->GetCntnt();
+ const SwFormatHeader& rHd = pDesc->GetMaster().GetHeader();
+ if( rHd.GetHeaderFormat() )
+ pCnt = &rHd.GetHeaderFormat()->GetContent();
}
else
{
- const SwFmtFooter& rFt = pDesc->GetMaster().GetFooter();
- if( rFt.GetFooterFmt() )
- pCnt = &rFt.GetFooterFmt()->GetCntnt();
+ const SwFormatFooter& rFt = pDesc->GetMaster().GetFooter();
+ if( rFt.GetFooterFormat() )
+ pCnt = &rFt.GetFooterFormat()->GetContent();
}
- if( pCnt && pCnt->GetCntntIdx() )
+ if( pCnt && pCnt->GetContentIdx() )
{
- SwNodeIndex aIdx( *pCnt->GetCntntIdx(), 1 );
- SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+ SwNodeIndex aIdx( *pCnt->GetContentIdx(), 1 );
+ SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
if( !pCNd )
pCNd = pMyDoc->GetNodes().GoNext( &aIdx );
@@ -260,15 +260,15 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
{
bool bRet = false;
- const SwSectionFmts& rFmts = GetDoc()->GetSections();
- SwCntntNode* pFnd = 0;
- for( SwSectionFmts::size_type n = rFmts.size(); n; )
+ const SwSectionFormats& rFormats = GetDoc()->GetSections();
+ SwContentNode* pFnd = 0;
+ for( SwSectionFormats::size_type n = rFormats.size(); n; )
{
- const SwSection* pSect = rFmts[ --n ]->GetSection();
+ const SwSection* pSect = rFormats[ --n ]->GetSection();
if (TOX_CONTENT_SECTION == pSect->GetType())
{
SwSectionNode const*const pSectNd(
- pSect->GetFmt()->GetSectionNode());
+ pSect->GetFormat()->GetSectionNode());
if ( pSectNd
&& m_pCurCrsr->GetPoint()->nNode < pSectNd->GetIndex()
&& (!pFnd || pFnd->GetIndex() > pSectNd->GetIndex())
@@ -276,13 +276,13 @@ bool SwCrsrShell::GotoNextTOXBase( const OUString* pName )
static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
{
SwNodeIndex aIdx(*pSectNd, 1);
- SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
if (!pCNd)
pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
if (pCNd &&
pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
{
- SwCntntFrm const*const pCFrm(
+ SwContentFrm const*const pCFrm(
pCNd->getLayoutFrm(GetLayout()));
if (pCFrm &&
(IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -311,15 +311,15 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
{
bool bRet = false;
- const SwSectionFmts& rFmts = GetDoc()->GetSections();
- SwCntntNode* pFnd = 0;
- for( SwSectionFmts::size_type n = rFmts.size(); n; )
+ const SwSectionFormats& rFormats = GetDoc()->GetSections();
+ SwContentNode* pFnd = 0;
+ for( SwSectionFormats::size_type n = rFormats.size(); n; )
{
- const SwSection* pSect = rFmts[ --n ]->GetSection();
+ const SwSection* pSect = rFormats[ --n ]->GetSection();
if (TOX_CONTENT_SECTION == pSect->GetType())
{
SwSectionNode const*const pSectNd(
- pSect->GetFmt()->GetSectionNode());
+ pSect->GetFormat()->GetSectionNode());
if ( pSectNd
&& m_pCurCrsr->GetPoint()->nNode > pSectNd->EndOfSectionIndex()
&& (!pFnd || pFnd->GetIndex() < pSectNd->GetIndex())
@@ -327,13 +327,13 @@ bool SwCrsrShell::GotoPrevTOXBase( const OUString* pName )
static_cast<SwTOXBaseSection const*>(pSect)->GetTOXName()))
{
SwNodeIndex aIdx(*pSectNd, 1);
- SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
if (!pCNd)
pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
if (pCNd &&
pCNd->EndOfSectionIndex() <= pSectNd->EndOfSectionIndex())
{
- SwCntntFrm const*const pCFrm(
+ SwContentFrm const*const pCFrm(
pCNd->getLayoutFrm(GetLayout()));
if (pCFrm &&
(IsReadOnlyAvailable() || !pCFrm->IsProtected()))
@@ -372,19 +372,19 @@ bool SwCrsrShell::GotoTOXMarkBase()
const SwTOXType* pType = aMarks[0]->GetTOXType();
SwIterator<SwTOXBase,SwTOXType> aIter( *pType );
const SwSectionNode* pSectNd;
- const SwSectionFmt* pSectFmt;
+ const SwSectionFormat* pSectFormat;
for( SwTOXBase* pTOX = aIter.First(); pTOX; pTOX = aIter.Next() )
{
if( pTOX->ISA( SwTOXBaseSection ) &&
- 0 != ( pSectFmt = static_cast<SwTOXBaseSection*>(pTOX)->GetFmt() ) &&
- 0 != ( pSectNd = pSectFmt->GetSectionNode() ))
+ 0 != ( pSectFormat = static_cast<SwTOXBaseSection*>(pTOX)->GetFormat() ) &&
+ 0 != ( pSectNd = pSectFormat->GetSectionNode() ))
{
SwNodeIndex aIdx( *pSectNd, 1 );
- SwCntntNode* pCNd = aIdx.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aIdx.GetNode().GetContentNode();
if( !pCNd )
pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
- const SwCntntFrm* pCFrm;
+ const SwContentFrm* pCFrm;
if( pCNd &&
pCNd->EndOfSectionIndex() < pSectNd->EndOfSectionIndex() &&
0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout() ) ) &&
@@ -408,7 +408,7 @@ bool SwCrsrShell::GotoTOXMarkBase()
/// Jump to next/previous table formula
/// Optionally it is possible to also jump to broken formulas
-bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
+bool SwCrsrShell::GotoNxtPrvTableFormula( bool bNext, bool bOnlyErrors )
{
if( IsTableMode() )
return false;
@@ -420,22 +420,22 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
if( !bNext )
aFndPos.nNode = 0;
- _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+ _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
{
const SwNode* pSttNd = rPos.nNode.GetNode().FindTableBoxStartNode();
if( pSttNd )
{
const SwTableBox* pTBox = pSttNd->FindTableNode()->GetTable().
- GetTblBox( pSttNd->GetIndex() );
+ GetTableBox( pSttNd->GetIndex() );
if( pTBox )
- aCurGEF = _SetGetExpFld( *pTBox );
+ aCurGEF = _SetGetExpField( *pTBox );
}
}
if( rPos.nNode < GetDoc()->GetNodes().GetEndOfExtras() )
// also at collection use only the first frame
- aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetCntntNode()->getLayoutFrm( GetLayout(),
+ aCurGEF.SetBodyPos( *rPos.nNode.GetNode().GetContentNode()->getLayoutFrm( GetLayout(),
&aPt, &rPos, false ) );
{
const SfxPoolItem* pItem;
@@ -445,19 +445,19 @@ bool SwCrsrShell::GotoNxtPrvTblFormula( bool bNext, bool bOnlyErrors )
for( n = 0; n < nMaxItems; ++n )
if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
RES_BOXATR_FORMULA, n ) ) &&
- 0 != (pTBox = static_cast<const SwTblBoxFormula*>(pItem)->GetTableBox() ) &&
+ 0 != (pTBox = static_cast<const SwTableBoxFormula*>(pItem)->GetTableBox() ) &&
pTBox->GetSttNd() &&
pTBox->GetSttNd()->GetNodes().IsDocNodes() &&
( !bOnlyErrors ||
- !static_cast<const SwTblBoxFormula*>(pItem)->HasValidBoxes() ) )
+ !static_cast<const SwTableBoxFormula*>(pItem)->HasValidBoxes() ) )
{
- const SwCntntFrm* pCFrm;
+ const SwContentFrm* pCFrm;
SwNodeIndex aIdx( *pTBox->GetSttNd() );
- const SwCntntNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
+ const SwContentNode* pCNd = GetDoc()->GetNodes().GoNext( &aIdx );
if( pCNd && 0 != ( pCFrm = pCNd->getLayoutFrm( GetLayout(), &aPt, 0, false ) ) &&
(IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
{
- _SetGetExpFld aCmp( *pTBox );
+ _SetGetExpField aCmp( *pTBox );
aCmp.SetBodyPos( *pCFrm );
if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -500,32 +500,32 @@ bool SwCrsrShell::GotoNxtPrvTOXMark( bool bNext )
SwPosition aFndPos( GetDoc()->GetNodes().GetEndOfContent() );
if( !bNext )
aFndPos.nNode = 0;
- _SetGetExpFld aFndGEF( aFndPos ), aCurGEF( rPos );
+ _SetGetExpField aFndGEF( aFndPos ), aCurGEF( rPos );
if( rPos.nNode.GetIndex() < GetDoc()->GetNodes().GetEndOfExtras().GetIndex() )
// also at collection use only the first frame
aCurGEF.SetBodyPos( *rPos.nNode.GetNode().
- GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
+ GetContentNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, false ) );
{
- const SwTxtNode* pTxtNd;
- const SwTxtTOXMark* pTxtTOX;
+ const SwTextNode* pTextNd;
+ const SwTextTOXMark* pTextTOX;
sal_uInt32 n, nMaxItems = GetDoc()->GetAttrPool().GetItemCount2( RES_TXTATR_TOXMARK );
for( n = 0; n < nMaxItems; ++n )
{
const SfxPoolItem* pItem;
- const SwCntntFrm* pCFrm;
+ const SwContentFrm* pCFrm;
if( 0 != (pItem = GetDoc()->GetAttrPool().GetItem2(
RES_TXTATR_TOXMARK, n ) ) &&
- 0 != (pTxtTOX = static_cast<const SwTOXMark*>(pItem)->GetTxtTOXMark() ) &&
- ( pTxtNd = &pTxtTOX->GetTxtNode())->GetNodes().IsDocNodes() &&
- 0 != ( pCFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
+ 0 != (pTextTOX = static_cast<const SwTOXMark*>(pItem)->GetTextTOXMark() ) &&
+ ( pTextNd = &pTextTOX->GetTextNode())->GetNodes().IsDocNodes() &&
+ 0 != ( pCFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt, 0, false )) &&
( IsReadOnlyAvailable() || !pCFrm->IsProtected() ))
{
- SwNodeIndex aNdIndex( *pTxtNd ); // UNIX needs this object
- _SetGetExpFld aCmp( aNdIndex, *pTxtTOX, 0 );
+ SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object
+ _SetGetExpField aCmp( aNdIndex, *pTextTOX, 0 );
aCmp.SetBodyPos( *pCFrm );
if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
@@ -566,9 +566,9 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
IsReadOnlyAvailable() );
// set position
SwPosition& rPos = *GetCrsr()->GetPoint();
- rPos.nNode = rNewMark.GetTxtTOXMark()->GetTxtNode();
- rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
- rNewMark.GetTxtTOXMark()->GetStart() );
+ rPos.nNode = rNewMark.GetTextTOXMark()->GetTextNode();
+ rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+ rNewMark.GetTextTOXMark()->GetStart() );
if( !m_pCurCrsr->IsSelOvr() )
UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
@@ -578,30 +578,30 @@ const SwTOXMark& SwCrsrShell::GotoTOXMark( const SwTOXMark& rStart,
}
/// jump to next/previous field type
-void lcl_MakeFldLst(
- _SetGetExpFlds& rLst,
- const SwFieldType& rFldType,
+void lcl_MakeFieldLst(
+ _SetGetExpFields& rLst,
+ const SwFieldType& rFieldType,
const bool bInReadOnly,
const bool bChkInpFlag = false )
{
// always search the 1. frame
Point aPt;
- SwTxtFld* pTxtFld = NULL;
- SwIterator<SwFmtFld,SwFieldType> aIter(rFldType);
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ SwTextField* pTextField = NULL;
+ SwIterator<SwFormatField,SwFieldType> aIter(rFieldType);
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
{
- pTxtFld = pFmtFld->GetTxtFld();
- if ( pTxtFld != NULL
+ pTextField = pFormatField->GetTextField();
+ if ( pTextField != NULL
&& ( !bChkInpFlag
- || static_cast<const SwSetExpField*>(pTxtFld->GetFmtFld().GetField())->GetInputFlag() ) )
+ || static_cast<const SwSetExpField*>(pTextField->GetFormatField().GetField())->GetInputFlag() ) )
{
- const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
- const SwCntntFrm* pCFrm =
- rTxtNode.getLayoutFrm( rTxtNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
+ const SwTextNode& rTextNode = pTextField->GetTextNode();
+ const SwContentFrm* pCFrm =
+ rTextNode.getLayoutFrm( rTextNode.GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, 0, false );
if ( pCFrm != NULL
&& ( bInReadOnly || !pCFrm->IsProtected() ) )
{
- _SetGetExpFld* pNew = new _SetGetExpFld( SwNodeIndex( rTxtNode ), pTxtFld );
+ _SetGetExpField* pNew = new _SetGetExpField( SwNodeIndex( rTextNode ), pTextField );
pNew->SetBodyPos( *pCFrm );
rLst.insert( pNew );
}
@@ -609,81 +609,81 @@ void lcl_MakeFldLst(
}
}
-static _SetGetExpFlds::const_iterator
-lcl_FindField(bool & o_rFound, _SetGetExpFlds const& rSrtLst,
- SwRootFrm *const pLayout, SwTxtNode *const pTxtNode,
- SwTxtFld *const pTxtFld, SwPosition const& rPos,
+static _SetGetExpFields::const_iterator
+lcl_FindField(bool & o_rFound, _SetGetExpFields const& rSrtLst,
+ SwRootFrm *const pLayout, SwTextNode *const pTextNode,
+ SwTextField *const pTextField, SwPosition const& rPos,
sal_Int32 const nContentOffset)
{
- boost::scoped_ptr<_SetGetExpFld> pSrch;
+ boost::scoped_ptr<_SetGetExpField> pSrch;
boost::scoped_ptr<SwIndex> pIndex;
if (-1 == nContentOffset)
{
- pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, &rPos.nContent));
+ pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, &rPos.nContent));
}
else
{
- pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetCntntNode(), nContentOffset));
- pSrch.reset(new _SetGetExpFld(rPos.nNode, pTxtFld, pIndex.get()));
+ pIndex.reset(new SwIndex(rPos.nNode.GetNode().GetContentNode(), nContentOffset));
+ pSrch.reset(new _SetGetExpField(rPos.nNode, pTextField, pIndex.get()));
}
- if (rPos.nNode.GetIndex() < pTxtNode->GetNodes().GetEndOfExtras().GetIndex())
+ if (rPos.nNode.GetIndex() < pTextNode->GetNodes().GetEndOfExtras().GetIndex())
{
// also at collection use only the first frame
Point aPt;
- pSrch->SetBodyPos(*pTxtNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
+ pSrch->SetBodyPos(*pTextNode->getLayoutFrm(pLayout, &aPt, &rPos, false));
}
- _SetGetExpFlds::const_iterator it = rSrtLst.lower_bound(pSrch.get());
+ _SetGetExpFields::const_iterator it = rSrtLst.lower_bound(pSrch.get());
o_rFound = (it != rSrtLst.end()) && (**it == *pSrch);
return it;
}
-bool SwCrsrShell::MoveFldType(
- const SwFieldType* pFldType,
+bool SwCrsrShell::MoveFieldType(
+ const SwFieldType* pFieldType,
const bool bNext,
const sal_uInt16 nResType,
- const bool bAddSetExpressionFldsToInputFlds )
+ const bool bAddSetExpressionFieldsToInputFields )
{
// sorted list of all fields
- _SetGetExpFlds aSrtLst;
+ _SetGetExpFields aSrtLst;
- if ( pFldType )
+ if ( pFieldType )
{
- if( RES_INPUTFLD != pFldType->Which() && !pFldType->HasWriterListeners() )
+ if( RES_INPUTFLD != pFieldType->Which() && !pFieldType->HasWriterListeners() )
{
return false;
}
// found Modify object, add all fields to array
- ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+ ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
- if( RES_INPUTFLD == pFldType->Which() && bAddSetExpressionFldsToInputFlds )
+ if( RES_INPUTFLD == pFieldType->Which() && bAddSetExpressionFieldsToInputFields )
{
// there are hidden input fields in the set exp. fields
- const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
- const size_t nSize = rFldTypes.size();
+ const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+ const size_t nSize = rFieldTypes.size();
for( size_t i=0; i < nSize; ++i )
{
- pFldType = rFldTypes[ i ];
- if ( RES_SETEXPFLD == pFldType->Which() )
+ pFieldType = rFieldTypes[ i ];
+ if ( RES_SETEXPFLD == pFieldType->Which() )
{
- ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable(), true );
+ ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable(), true );
}
}
}
}
else
{
- const SwFldTypes& rFldTypes = *mpDoc->getIDocumentFieldsAccess().GetFldTypes();
- const size_t nSize = rFldTypes.size();
+ const SwFieldTypes& rFieldTypes = *mpDoc->getIDocumentFieldsAccess().GetFieldTypes();
+ const size_t nSize = rFieldTypes.size();
for( size_t i=0; i < nSize; ++i )
{
- pFldType = rFldTypes[ i ];
- if( nResType == pFldType->Which() )
+ pFieldType = rFieldTypes[ i ];
+ if( nResType == pFieldType->Which() )
{
- ::lcl_MakeFldLst( aSrtLst, *pFldType, IsReadOnlyAvailable() );
+ ::lcl_MakeFieldLst( aSrtLst, *pFieldType, IsReadOnlyAvailable() );
}
}
}
@@ -692,7 +692,7 @@ bool SwCrsrShell::MoveFldType(
if( aSrtLst.empty() )
return false;
- _SetGetExpFlds::const_iterator it;
+ _SetGetExpFields::const_iterator it;
SwCursor* pCrsr = getShellCrsr( true );
{
// (1998): Always use field for search so that the right one is found as
@@ -700,39 +700,39 @@ bool SwCrsrShell::MoveFldType(
// field
const SwPosition& rPos = *pCrsr->GetPoint();
- SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
- OSL_ENSURE( pTNd, "No CntntNode" );
+ SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
+ OSL_ENSURE( pTNd, "No ContentNode" );
- SwTxtFld * pTxtFld = pTNd->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true );
- const bool bDelFld = ( pTxtFld == NULL );
+ SwTextField * pTextField = pTNd->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true );
+ const bool bDelField = ( pTextField == NULL );
sal_Int32 nContentOffset = -1;
- if( bDelFld )
+ if( bDelField )
{
// create dummy for the search
- SwFmtFld* pFmtFld = new SwFmtFld( SwDateTimeField(
- static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFldType( RES_DATETIMEFLD ) ) ) );
+ SwFormatField* pFormatField = new SwFormatField( SwDateTimeField(
+ static_cast<SwDateTimeFieldType*>(mpDoc->getIDocumentFieldsAccess().GetSysFieldType( RES_DATETIMEFLD ) ) ) );
- pTxtFld = new SwTxtFld( *pFmtFld, rPos.nContent.GetIndex(),
+ pTextField = new SwTextField( *pFormatField, rPos.nContent.GetIndex(),
mpDoc->IsClipBoard() );
- pTxtFld->ChgTxtNode( pTNd );
+ pTextField->ChgTextNode( pTNd );
}
else
{
// the cursor might be anywhere inside the input field,
// but we will be searching for the field start
- if (pTxtFld->Which() == RES_TXTATR_INPUTFIELD
- && rPos.nContent.GetIndex() != pTxtFld->GetStart())
- nContentOffset = pTxtFld->GetStart();
+ if (pTextField->Which() == RES_TXTATR_INPUTFIELD
+ && rPos.nContent.GetIndex() != pTextField->GetStart())
+ nContentOffset = pTextField->GetStart();
}
bool isSrch;
it = lcl_FindField(isSrch, aSrtLst,
- GetLayout(), pTNd, pTxtFld, rPos, nContentOffset);
+ GetLayout(), pTNd, pTextField, rPos, nContentOffset);
- if( bDelFld )
+ if( bDelField )
{
- delete static_cast<SwFmtFld*>(&pTxtFld->GetAttr());
- delete pTxtFld;
+ delete static_cast<SwFormatField*>(&pTextField->GetAttr());
+ delete pTextField;
}
if( it != aSrtLst.end() && isSrch ) // found
@@ -764,7 +764,7 @@ bool SwCrsrShell::MoveFldType(
}
}
}
- const _SetGetExpFld& rFnd = **it;
+ const _SetGetExpField& rFnd = **it;
SET_CURR_SHELL( this );
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -778,10 +778,10 @@ bool SwCrsrShell::MoveFldType(
return bRet;
}
-bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
+bool SwCrsrShell::GotoFormatField( const SwFormatField& rField )
{
bool bRet = false;
- if( rFld.GetTxtFld() )
+ if( rField.GetTextField() )
{
SET_CURR_SHELL( this );
SwCallLink aLk( *this ); // watch Crsr-Moves
@@ -789,9 +789,9 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
SwCursor* pCrsr = getShellCrsr( true );
SwCrsrSaveState aSaveState( *pCrsr );
- SwTxtNode* pTNd = rFld.GetTxtFld()->GetpTxtNode();
+ SwTextNode* pTNd = rField.GetTextField()->GetpTextNode();
pCrsr->GetPoint()->nNode = *pTNd;
- pCrsr->GetPoint()->nContent.Assign( pTNd, rFld.GetTxtFld()->GetStart() );
+ pCrsr->GetPoint()->nContent.Assign( pTNd, rField.GetTextField()->GetStart() );
bRet = !pCrsr->IsSelOvr();
if( bRet )
@@ -800,45 +800,45 @@ bool SwCrsrShell::GotoFld( const SwFmtFld& rFld )
return bRet;
}
-SwTxtFld * SwCrsrShell::GetTxtFldAtPos(
+SwTextField * SwCrsrShell::GetTextFieldAtPos(
const SwPosition* pPos,
- const bool bIncludeInputFldAtStart )
+ const bool bIncludeInputFieldAtStart )
{
- SwTxtFld* pTxtFld = NULL;
+ SwTextField* pTextField = NULL;
- SwTxtNode * const pNode = pPos->nNode.GetNode().GetTxtNode();
+ SwTextNode * const pNode = pPos->nNode.GetNode().GetTextNode();
if ( pNode != NULL )
{
- pTxtFld = pNode->GetFldTxtAttrAt( pPos->nContent.GetIndex(), bIncludeInputFldAtStart );
+ pTextField = pNode->GetFieldTextAttrAt( pPos->nContent.GetIndex(), bIncludeInputFieldAtStart );
}
- return pTxtFld;
+ return pTextField;
}
SwField* SwCrsrShell::GetFieldAtCrsr(
const SwPaM* pCrsr,
- const bool bIncludeInputFldAtStart )
+ const bool bIncludeInputFieldAtStart )
{
SwField* pFieldAtCrsr = NULL;
- SwTxtFld* pTxtFld = GetTxtFldAtPos( pCrsr->Start(), bIncludeInputFldAtStart );
- if ( pTxtFld != NULL
+ SwTextField* pTextField = GetTextFieldAtPos( pCrsr->Start(), bIncludeInputFieldAtStart );
+ if ( pTextField != NULL
&& pCrsr->Start()->nNode == pCrsr->End()->nNode )
{
- const sal_Int32 nTxtFldLength =
- pTxtFld->End() != NULL
- ? *(pTxtFld->End()) - pTxtFld->GetStart()
+ const sal_Int32 nTextFieldLength =
+ pTextField->End() != NULL
+ ? *(pTextField->End()) - pTextField->GetStart()
: 1;
- if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTxtFldLength )
+ if ( ( pCrsr->End()->nContent.GetIndex() - pCrsr->Start()->nContent.GetIndex() ) <= nTextFieldLength )
{
- pFieldAtCrsr = const_cast<SwField*>(pTxtFld->GetFmtFld().GetField());
+ pFieldAtCrsr = const_cast<SwField*>(pTextField->GetFormatField().GetField());
}
}
return pFieldAtCrsr;
}
-SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
+SwField* SwCrsrShell::GetCurField( const bool bIncludeInputFieldAtStart ) const
{
SwPaM* pCrsr = GetCrsr();
if ( pCrsr->IsMultiSelection() )
@@ -847,19 +847,19 @@ SwField* SwCrsrShell::GetCurFld( const bool bIncludeInputFldAtStart ) const
return NULL;
}
- SwField* pCurFld = GetFieldAtCrsr( pCrsr, bIncludeInputFldAtStart );;
- if ( pCurFld != NULL
- && RES_TABLEFLD == pCurFld->GetTyp()->Which() )
+ SwField* pCurField = GetFieldAtCrsr( pCrsr, bIncludeInputFieldAtStart );;
+ if ( pCurField != NULL
+ && RES_TABLEFLD == pCurField->GetTyp()->Which() )
{
// TabellenFormel ? wandel internen in externen Namen um
- const SwTableNode* pTblNd = IsCrsrInTbl();
- static_cast<SwTblField*>(pCurFld)->PtrToBoxNm( pTblNd ? &pTblNd->GetTable() : 0 );
+ const SwTableNode* pTableNd = IsCrsrInTable();
+ static_cast<SwTableField*>(pCurField)->PtrToBoxNm( pTableNd ? &pTableNd->GetTable() : 0 );
}
- return pCurFld;
+ return pCurField;
}
-bool SwCrsrShell::CrsrInsideInputFld() const
+bool SwCrsrShell::CrsrInsideInputField() const
{
for(SwPaM& rCrsr : GetCrsr()->GetRingContainer())
{
@@ -869,42 +869,42 @@ bool SwCrsrShell::CrsrInsideInputFld() const
return false;
}
-bool SwCrsrShell::PosInsideInputFld( const SwPosition& rPos )
+bool SwCrsrShell::PosInsideInputField( const SwPosition& rPos )
{
- return dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, false )) != NULL;
+ return dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, false )) != NULL;
}
-bool SwCrsrShell::DocPtInsideInputFld( const Point& rDocPt ) const
+bool SwCrsrShell::DocPtInsideInputField( const Point& rDocPt ) const
{
SwPosition aPos( *(GetCrsr()->Start()) );
Point aDocPt( rDocPt );
if ( GetLayout()->GetCrsrOfst( &aPos, aDocPt ) )
{
- return PosInsideInputFld( aPos );
+ return PosInsideInputField( aPos );
}
return false;
}
-sal_Int32 SwCrsrShell::StartOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::StartOfInputFieldAtPos( const SwPosition& rPos )
{
- const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
- if ( pTxtInputFld == NULL )
+ const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+ if ( pTextInputField == NULL )
{
- OSL_ENSURE( false, "<SwEditShell::StartOfInputFldAtPos(..)> - no Input Field at given position" );
+ OSL_ENSURE( false, "<SwEditShell::StartOfInputFieldAtPos(..)> - no Input Field at given position" );
return 0;
}
- return pTxtInputFld->GetStart();
+ return pTextInputField->GetStart();
}
-sal_Int32 SwCrsrShell::EndOfInputFldAtPos( const SwPosition& rPos )
+sal_Int32 SwCrsrShell::EndOfInputFieldAtPos( const SwPosition& rPos )
{
- const SwTxtInputFld* pTxtInputFld = dynamic_cast<const SwTxtInputFld*>(GetTxtFldAtPos( &rPos, true ));
- if ( pTxtInputFld == NULL )
+ const SwTextInputField* pTextInputField = dynamic_cast<const SwTextInputField*>(GetTextFieldAtPos( &rPos, true ));
+ if ( pTextInputField == NULL )
{
- OSL_ENSURE( false, "<SwEditShell::EndOfInputFldAtPos(..)> - no Input Field at given position" );
+ OSL_ENSURE( false, "<SwEditShell::EndOfInputFieldAtPos(..)> - no Input Field at given position" );
return 0;
}
- return *(pTxtInputFld->End());
+ return *(pTextInputField->End());
}
void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
@@ -916,9 +916,9 @@ void SwCrsrShell::GotoOutline( sal_uInt16 nIdx )
SwCrsrSaveState aSaveState( *pCrsr );
const SwNodes& rNds = GetDoc()->GetNodes();
- SwTxtNode* pTxtNd = rNds.GetOutLineNds()[ nIdx ]->GetTxtNode();
- pCrsr->GetPoint()->nNode = *pTxtNd;
- pCrsr->GetPoint()->nContent.Assign( pTxtNd, 0 );
+ SwTextNode* pTextNd = rNds.GetOutLineNds()[ nIdx ]->GetTextNode();
+ pCrsr->GetPoint()->nNode = *pTextNd;
+ pCrsr->GetPoint()->nContent.Assign( pTextNd, 0 );
if( !pCrsr->IsSelOvr() )
UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY);
@@ -961,7 +961,7 @@ bool SwCrsrShell::GotoNextOutline()
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *pCrsr );
pCrsr->GetPoint()->nNode = *pNd;
- pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+ pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
bool bRet = !pCrsr->IsSelOvr();
if( bRet )
@@ -990,7 +990,7 @@ bool SwCrsrShell::GotoPrevOutline()
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *pCrsr );
pCrsr->GetPoint()->nNode = *pNd;
- pCrsr->GetPoint()->nContent.Assign( pNd->GetTxtNode(), 0 );
+ pCrsr->GetPoint()->nContent.Assign( pNd->GetTextNode(), 0 );
bRet = !pCrsr->IsSelOvr();
if( bRet )
@@ -1014,7 +1014,7 @@ sal_uInt16 SwCrsrShell::GetOutlinePos( sal_uInt8 nLevel )
{
pNd = rNds.GetOutLineNds()[ nPos ];
- if( pNd->GetTxtNode()->GetAttrOutlineLevel()-1 <= nLevel )
+ if( pNd->GetTextNode()->GetAttrOutlineLevel()-1 <= nLevel )
return nPos;
}
@@ -1045,11 +1045,11 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
if( bWithChildren )
{
- const int nLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+ const int nLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
for( ++nEndPos; nEndPos < rOutlNds.size(); ++nEndPos )
{
pEndNd = rOutlNds[ nEndPos ];
- const int nNxtLevel = pEndNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+ const int nNxtLevel = pEndNd->GetTextNode()->GetAttrOutlineLevel()-1;
if( nNxtLevel <= nLevel )
break; // EndPos is now on the next one
}
@@ -1067,7 +1067,7 @@ bool SwCrsrShell::MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
// set end to the end of the previous content node
m_pCurCrsr->GetPoint()->nNode = *pSttNd;
- m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetCntntNode(), 0 );
+ m_pCurCrsr->GetPoint()->nContent.Assign( pSttNd->GetContentNode(), 0 );
m_pCurCrsr->SetMark();
m_pCurCrsr->GetPoint()->nNode = *pEndNd;
m_pCurCrsr->Move( fnMoveBackward, fnGoNode ); // end of predecessor
@@ -1088,12 +1088,12 @@ bool SwCrsrShell::GotoRefMark( const OUString& rRefMark, sal_uInt16 nSubType,
SwCrsrSaveState aSaveState( *m_pCurCrsr );
sal_Int32 nPos = -1;
- SwTxtNode* pTxtNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
+ SwTextNode* pTextNd = SwGetRefFieldType::FindAnchor( GetDoc(), rRefMark,
nSubType, nSeqNo, &nPos );
- if( pTxtNd && pTxtNd->GetNodes().IsDocNodes() )
+ if( pTextNd && pTextNd->GetNodes().IsDocNodes() )
{
- m_pCurCrsr->GetPoint()->nNode = *pTxtNd;
- m_pCurCrsr->GetPoint()->nContent.Assign( pTxtNd, nPos );
+ m_pCurCrsr->GetPoint()->nNode = *pTextNd;
+ m_pCurCrsr->GetPoint()->nContent.Assign( pTextNd, nPos );
if( !m_pCurCrsr->IsSelOvr() )
{
@@ -1112,9 +1112,9 @@ bool SwCrsrShell::IsPageAtPos( const Point &rPt ) const
}
bool SwCrsrShell::GetContentAtPos( const Point& rPt,
- SwContentAtPos& rCntntAtPos,
+ SwContentAtPos& rContentAtPos,
bool bSetCrsr,
- SwRect* pFldRect )
+ SwRect* pFieldRect )
{
SET_CURR_SHELL( this );
bool bRet = false;
@@ -1124,64 +1124,64 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
Point aPt( rPt );
SwPosition aPos( *m_pCurCrsr->GetPoint() );
- SwTxtNode* pTxtNd;
- SwCntntFrm *pFrm(0);
- SwTxtAttr* pTxtAttr;
+ SwTextNode* pTextNd;
+ SwContentFrm *pFrm(0);
+ SwTextAttr* pTextAttr;
SwCrsrMoveState aTmpState;
aTmpState.bFieldInfo = true;
- aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos );
- aTmpState.bCntntCheck = (SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos) != 0;
+ aTmpState.bExactOnly = !( SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos );
+ aTmpState.bContentCheck = (SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos) != 0;
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
SwSpecialPos aSpecialPos;
- aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos ) ?
+ aTmpState.pSpecialPos = ( SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos ) ?
&aSpecialPos : 0;
const bool bCrsrFoundExact = GetLayout()->GetCrsrOfst( &aPos, aPt, &aTmpState );
- pTxtNd = aPos.nNode.GetNode().GetTxtNode();
+ pTextNd = aPos.nNode.GetNode().GetTextNode();
const SwNodes& rNds = GetDoc()->GetNodes();
- if( pTxtNd
- && SwContentAtPos::SW_OUTLINE & rCntntAtPos.eCntntAtPos
+ if( pTextNd
+ && SwContentAtPos::SW_OUTLINE & rContentAtPos.eContentAtPos
&& !rNds.GetOutLineNds().empty() )
{
- const SwTxtNode* pONd = pTxtNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
+ const SwTextNode* pONd = pTextNd->FindOutlineNodeOfLevel( MAXLEVEL-1);
if( pONd )
{
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_OUTLINE;
- rCntntAtPos.sStr = pONd->GetExpandTxt( 0, -1, true, true );
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_OUTLINE;
+ rContentAtPos.sStr = pONd->GetExpandText( 0, -1, true, true );
bRet = true;
}
}
- else if ( SwContentAtPos::SW_CONTENT_CHECK & rCntntAtPos.eCntntAtPos
+ else if ( SwContentAtPos::SW_CONTENT_CHECK & rContentAtPos.eContentAtPos
&& bCrsrFoundExact )
{
bRet = true;
}
- else if( pTxtNd
- && SwContentAtPos::SW_NUMLABEL & rCntntAtPos.eCntntAtPos)
+ else if( pTextNd
+ && SwContentAtPos::SW_NUMLABEL & rContentAtPos.eContentAtPos)
{
bRet = aTmpState.bInNumPortion;
- rCntntAtPos.aFnd.pNode = pTxtNd;
+ rContentAtPos.aFnd.pNode = pTextNd;
Size aSizeLogic(aTmpState.nInNumPostionOffset, 0);
Size aSizePixel = GetWin()->LogicToPixel(aSizeLogic);
- rCntntAtPos.nDist = aSizePixel.Width();
+ rContentAtPos.nDist = aSizePixel.Width();
}
- else if( bCrsrFoundExact && pTxtNd )
+ else if( bCrsrFoundExact && pTextNd )
{
if( !aTmpState.bPosCorr )
{
if ( !bRet
- && SwContentAtPos::SW_SMARTTAG & rCntntAtPos.eCntntAtPos
- && !aTmpState.bFtnNoInfo )
+ && SwContentAtPos::SW_SMARTTAG & rContentAtPos.eContentAtPos
+ && !aTmpState.bFootnoteNoInfo )
{
- const SwWrongList* pSmartTagList = pTxtNd->GetSmartTags();
+ const SwWrongList* pSmartTagList = pTextNd->GetSmartTags();
sal_Int32 nCurrent = aPos.nContent.GetIndex();
const sal_Int32 nBegin = nCurrent;
sal_Int32 nLen = 1;
- if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTxtNd->IsSymbol(nBegin) )
+ if ( pSmartTagList && pSmartTagList->InWrongWord( nCurrent, nLen ) && !pTextNd->IsSymbol(nBegin) )
{
const sal_uInt16 nIndex = pSmartTagList->GetWrongPos( nBegin );
const SwWrongList* pSubList = pSmartTagList->SubList( nIndex );
@@ -1208,32 +1208,32 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
}
if( bRet )
{
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_SMARTTAG;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_SMARTTAG;
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
}
}
}
if ( !bRet
- && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rCntntAtPos.eCntntAtPos
- && !aTmpState.bFtnNoInfo )
+ && ( SwContentAtPos::SW_FIELD | SwContentAtPos::SW_CLICKFIELD ) & rContentAtPos.eContentAtPos
+ && !aTmpState.bFootnoteNoInfo )
{
- pTxtAttr = pTxtNd->GetFldTxtAttrAt( aPos.nContent.GetIndex() );
- const SwField* pFld = pTxtAttr != NULL
- ? pTxtAttr->GetFmtFld().GetField()
+ pTextAttr = pTextNd->GetFieldTextAttrAt( aPos.nContent.GetIndex() );
+ const SwField* pField = pTextAttr != NULL
+ ? pTextAttr->GetFormatField().GetField()
: 0;
- if ( SwContentAtPos::SW_CLICKFIELD & rCntntAtPos.eCntntAtPos
- && pFld && !pFld->HasClickHdl() )
+ if ( SwContentAtPos::SW_CLICKFIELD & rContentAtPos.eContentAtPos
+ && pField && !pField->HasClickHdl() )
{
- pFld = 0;
+ pField = 0;
}
- if ( pFld )
+ if ( pField )
{
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
if( bSetCrsr )
{
@@ -1245,60 +1245,60 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
{
// allow click fields in protected sections
// only placeholder is not possible
- if( SwContentAtPos::SW_FIELD & rCntntAtPos.eCntntAtPos
- || RES_JUMPEDITFLD == pFld->Which() )
- pFld = 0;
+ if( SwContentAtPos::SW_FIELD & rContentAtPos.eContentAtPos
+ || RES_JUMPEDITFLD == pField->Which() )
+ pField = 0;
}
else
UpdateCrsr();
}
- else if( RES_TABLEFLD == pFld->Which() &&
- static_cast<const SwTblField*>(pFld)->IsIntrnlName() )
+ else if( RES_TABLEFLD == pField->Which() &&
+ static_cast<const SwTableField*>(pField)->IsIntrnlName() )
{
// create from internal (for CORE) the external
// (for UI) formula
- const SwTableNode* pTblNd = pTxtNd->FindTableNode();
- if( pTblNd ) // steht in einer Tabelle
- const_cast<SwTblField*>(static_cast<const SwTblField*>(pFld))->PtrToBoxNm( &pTblNd->GetTable() );
+ const SwTableNode* pTableNd = pTextNd->FindTableNode();
+ if( pTableNd ) // steht in einer Tabelle
+ const_cast<SwTableField*>(static_cast<const SwTableField*>(pField))->PtrToBoxNm( &pTableNd->GetTable() );
}
}
- if( pFld )
+ if( pField )
{
- rCntntAtPos.aFnd.pFld = pFld;
- rCntntAtPos.pFndTxtAttr = pTxtAttr;
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FIELD;
+ rContentAtPos.aFnd.pField = pField;
+ rContentAtPos.pFndTextAttr = pTextAttr;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_FIELD;
bRet = true;
}
}
- if( !bRet && SwContentAtPos::SW_FORMCTRL & rCntntAtPos.eCntntAtPos )
+ if( !bRet && SwContentAtPos::SW_FORMCTRL & rContentAtPos.eContentAtPos )
{
IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
- sw::mark::IFieldmark* pFldBookmark = pMarksAccess->getFieldmarkFor( aPos );
- if( bCrsrFoundExact && pTxtNd && pFldBookmark) {
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FORMCTRL;
- rCntntAtPos.aFnd.pFldmark = pFldBookmark;
+ sw::mark::IFieldmark* pFieldBookmark = pMarksAccess->getFieldmarkFor( aPos );
+ if( bCrsrFoundExact && pTextNd && pFieldBookmark) {
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_FORMCTRL;
+ rContentAtPos.aFnd.pFieldmark = pFieldBookmark;
bRet=true;
}
}
- if( !bRet && SwContentAtPos::SW_FTN & rCntntAtPos.eCntntAtPos )
+ if( !bRet && SwContentAtPos::SW_FTN & rContentAtPos.eContentAtPos )
{
- if( aTmpState.bFtnNoInfo )
+ if( aTmpState.bFootnoteNoInfo )
{
// over the footnote's char
bRet = true;
if( bSetCrsr )
{
*m_pCurCrsr->GetPoint() = aPos;
- if( !GotoFtnAnchor() )
+ if( !GotoFootnoteAnchor() )
bRet = false;
}
if( bRet )
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
}
- else if ( 0 != ( pTxtAttr = pTxtNd->GetTxtAttrForCharAt(
+ else if ( 0 != ( pTextAttr = pTextNd->GetTextAttrForCharAt(
aPos.nContent.GetIndex(), RES_TXTATR_FTN )) )
{
bRet = true;
@@ -1306,8 +1306,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
{
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *m_pCurCrsr );
- m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTxtFtn*>(pTxtAttr)->GetStartNode();
- SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+ m_pCurCrsr->GetPoint()->nNode = *static_cast<SwTextFootnote*>(pTextAttr)->GetStartNode();
+ SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
&m_pCurCrsr->GetPoint()->nNode,
true, !IsReadOnlyAvailable() );
@@ -1326,45 +1326,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
if( bRet )
{
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_FTN;
- rCntntAtPos.pFndTxtAttr = pTxtAttr;
- rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_FTN;
+ rContentAtPos.pFndTextAttr = pTextAttr;
+ rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
}
}
}
if( !bRet
- && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rCntntAtPos.eCntntAtPos
- && !aTmpState.bFtnNoInfo )
+ && ( SwContentAtPos::SW_TOXMARK | SwContentAtPos::SW_REFMARK ) & rContentAtPos.eContentAtPos
+ && !aTmpState.bFootnoteNoInfo )
{
- pTxtAttr = 0;
- if( SwContentAtPos::SW_TOXMARK & rCntntAtPos.eCntntAtPos )
+ pTextAttr = 0;
+ if( SwContentAtPos::SW_TOXMARK & rContentAtPos.eContentAtPos )
{
- ::std::vector<SwTxtAttr *> const marks(
- pTxtNd->GetTxtAttrsAt(
+ ::std::vector<SwTextAttr *> const marks(
+ pTextNd->GetTextAttrsAt(
aPos.nContent.GetIndex(), RES_TXTATR_TOXMARK));
if (marks.size())
{ // hmm... can only return 1 here
- pTxtAttr = *marks.begin();
+ pTextAttr = *marks.begin();
}
}
- if( !pTxtAttr &&
- SwContentAtPos::SW_REFMARK & rCntntAtPos.eCntntAtPos )
+ if( !pTextAttr &&
+ SwContentAtPos::SW_REFMARK & rContentAtPos.eContentAtPos )
{
- ::std::vector<SwTxtAttr *> const marks(
- pTxtNd->GetTxtAttrsAt(
+ ::std::vector<SwTextAttr *> const marks(
+ pTextNd->GetTextAttrsAt(
aPos.nContent.GetIndex(), RES_TXTATR_REFMARK));
if (marks.size())
{ // hmm... can only return 1 here
- pTxtAttr = *marks.begin();
+ pTextAttr = *marks.begin();
}
}
- if( pTxtAttr )
+ if( pTextAttr )
{
bRet = true;
if( bSetCrsr )
@@ -1381,35 +1381,35 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
if( bRet )
{
- const sal_Int32* pEnd = pTxtAttr->GetEnd();
+ const sal_Int32* pEnd = pTextAttr->GetEnd();
if( pEnd )
- rCntntAtPos.sStr =
- pTxtNd->GetExpandTxt( pTxtAttr->GetStart(), *pEnd - pTxtAttr->GetStart() );
- else if( RES_TXTATR_TOXMARK == pTxtAttr->Which())
- rCntntAtPos.sStr =
- pTxtAttr->GetTOXMark().GetAlternativeText();
-
- rCntntAtPos.eCntntAtPos =
- RES_TXTATR_TOXMARK == pTxtAttr->Which()
+ rContentAtPos.sStr =
+ pTextNd->GetExpandText( pTextAttr->GetStart(), *pEnd - pTextAttr->GetStart() );
+ else if( RES_TXTATR_TOXMARK == pTextAttr->Which())
+ rContentAtPos.sStr =
+ pTextAttr->GetTOXMark().GetAlternativeText();
+
+ rContentAtPos.eContentAtPos =
+ RES_TXTATR_TOXMARK == pTextAttr->Which()
? SwContentAtPos::SW_TOXMARK
: SwContentAtPos::SW_REFMARK;
- rCntntAtPos.pFndTxtAttr = pTxtAttr;
- rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
+ rContentAtPos.pFndTextAttr = pTextAttr;
+ rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
}
}
}
if ( !bRet
- && SwContentAtPos::SW_INETATTR & rCntntAtPos.eCntntAtPos
- && !aTmpState.bFtnNoInfo )
+ && SwContentAtPos::SW_INETATTR & rContentAtPos.eContentAtPos
+ && !aTmpState.bFootnoteNoInfo )
{
- pTxtAttr = pTxtNd->GetTxtAttrAt(
+ pTextAttr = pTextNd->GetTextAttrAt(
aPos.nContent.GetIndex(), RES_TXTATR_INETFMT);
// "detect" only INetAttrs with URLs
- if( pTxtAttr && !pTxtAttr->GetINetFmt().GetValue().isEmpty() )
+ if( pTextAttr && !pTextAttr->GetINetFormat().GetValue().isEmpty() )
{
bRet = true;
if( bSetCrsr )
@@ -1426,66 +1426,66 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
}
if( bRet )
{
- rCntntAtPos.sStr = pTxtNd->GetExpandTxt(
- pTxtAttr->GetStart(),
- *pTxtAttr->GetEnd() - pTxtAttr->GetStart() );
+ rContentAtPos.sStr = pTextNd->GetExpandText(
+ pTextAttr->GetStart(),
+ *pTextAttr->GetEnd() - pTextAttr->GetStart() );
- rCntntAtPos.aFnd.pAttr = &pTxtAttr->GetAttr();
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_INETATTR;
- rCntntAtPos.pFndTxtAttr = pTxtAttr;
+ rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_INETATTR;
+ rContentAtPos.pFndTextAttr = pTextAttr;
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
}
}
}
- if( !bRet && SwContentAtPos::SW_REDLINE & rCntntAtPos.eCntntAtPos )
+ if( !bRet && SwContentAtPos::SW_REDLINE & rContentAtPos.eContentAtPos )
{
const SwRangeRedline* pRedl = GetDoc()->getIDocumentRedlineAccess().GetRedline(aPos, NULL);
if( pRedl )
{
- rCntntAtPos.aFnd.pRedl = pRedl;
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_REDLINE;
- rCntntAtPos.pFndTxtAttr = 0;
+ rContentAtPos.aFnd.pRedl = pRedl;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_REDLINE;
+ rContentAtPos.pFndTextAttr = 0;
bRet = true;
- if( pFldRect && 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt ) ) )
- pFrm->GetCharRect( *pFldRect, aPos, &aTmpState );
+ if( pFieldRect && 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt ) ) )
+ pFrm->GetCharRect( *pFieldRect, aPos, &aTmpState );
}
}
}
if( !bRet
- && ( SwContentAtPos::SW_TABLEBOXFML & rCntntAtPos.eCntntAtPos
+ && ( SwContentAtPos::SW_TABLEBOXFML & rContentAtPos.eContentAtPos
#ifdef DBG_UTIL
- || SwContentAtPos::SW_TABLEBOXVALUE & rCntntAtPos.eCntntAtPos
+ || SwContentAtPos::SW_TABLEBOXVALUE & rContentAtPos.eContentAtPos
#endif
) )
{
- const SwTableNode* pTblNd;
+ const SwTableNode* pTableNd;
const SwTableBox* pBox;
- const SwStartNode* pSttNd = pTxtNd->FindTableBoxStartNode();
+ const SwStartNode* pSttNd = pTextNd->FindTableBoxStartNode();
const SfxPoolItem* pItem;
- if( pSttNd && 0 != ( pTblNd = pTxtNd->FindTableNode()) &&
- 0 != ( pBox = pTblNd->GetTable().GetTblBox(
+ if( pSttNd && 0 != ( pTableNd = pTextNd->FindTableNode()) &&
+ 0 != ( pBox = pTableNd->GetTable().GetTableBox(
pSttNd->GetIndex() )) &&
#ifdef DBG_UTIL
- ( SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+ ( SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
RES_BOXATR_FORMULA, false, &pItem ) ||
- SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+ SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
RES_BOXATR_VALUE, false, &pItem ))
#else
- SfxItemState::SET == pBox->GetFrmFmt()->GetItemState(
+ SfxItemState::SET == pBox->GetFrameFormat()->GetItemState(
RES_BOXATR_FORMULA, false, &pItem )
#endif
)
{
- SwFrm* pF = pTxtNd->getLayoutFrm( GetLayout(), &aPt );
+ SwFrm* pF = pTextNd->getLayoutFrm( GetLayout(), &aPt );
if( pF )
{
// then the CellFrame
- pFrm = static_cast<SwCntntFrm*>(pF);
+ pFrm = static_cast<SwContentFrm*>(pF);
while( pF && !pF->IsCellFrm() )
pF = pF->GetUpper();
}
@@ -1502,13 +1502,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
{
// create from internal (for CORE) the external
// (for UI) formula
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXFML;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXFML;
#ifdef DBG_UTIL
if( RES_BOXATR_VALUE == pItem->Which() )
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_TABLEBOXVALUE;
else
#endif
- const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->PtrToBoxNm( &pTblNd->GetTable() );
+ const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->PtrToBoxNm( &pTableNd->GetTable() );
bRet = true;
if( bSetCrsr )
@@ -1525,29 +1525,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
if( bRet )
{
- if( pFldRect )
+ if( pFieldRect )
{
- *pFldRect = pF->Prt();
- *pFldRect += pF->Frm().Pos();
+ *pFieldRect = pF->Prt();
+ *pFieldRect += pF->Frm().Pos();
}
- rCntntAtPos.pFndTxtAttr = 0;
- rCntntAtPos.aFnd.pAttr = pItem;
+ rContentAtPos.pFndTextAttr = 0;
+ rContentAtPos.aFnd.pAttr = pItem;
}
}
}
}
#ifdef DBG_UTIL
- if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rCntntAtPos.eCntntAtPos )
+ if( !bRet && SwContentAtPos::SW_CURR_ATTRS & rContentAtPos.eContentAtPos )
{
const sal_Int32 n = aPos.nContent.GetIndex();
SfxItemSet aSet( GetDoc()->GetAttrPool(), POOLATTR_BEGIN,
POOLATTR_END - 1 );
- if( pTxtNd->GetpSwpHints() )
+ if( pTextNd->GetpSwpHints() )
{
- for( size_t i = 0; i < pTxtNd->GetSwpHints().Count(); ++i )
+ for( size_t i = 0; i < pTextNd->GetSwpHints().Count(); ++i )
{
- const SwTxtAttr* pHt = pTxtNd->GetSwpHints()[i];
+ const SwTextAttr* pHt = pTextNd->GetSwpHints()[i];
const sal_Int32 nAttrStart = pHt->GetStart();
if( nAttrStart > n ) // over the section
break;
@@ -1562,29 +1562,29 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
aSet.Put( pHt->GetAttr() );
}
}
- if( pTxtNd->HasSwAttrSet() &&
- pTxtNd->GetpSwAttrSet()->Count() )
+ if( pTextNd->HasSwAttrSet() &&
+ pTextNd->GetpSwAttrSet()->Count() )
{
- SfxItemSet aFmtSet( pTxtNd->GetSwAttrSet() );
+ SfxItemSet aFormatSet( pTextNd->GetSwAttrSet() );
// remove all from format set that are also in TextSet
- aFmtSet.Differentiate( aSet );
+ aFormatSet.Differentiate( aSet );
// now merge all together
- aSet.Put( aFmtSet );
+ aSet.Put( aFormatSet );
}
}
else
- pTxtNd->SwCntntNode::GetAttr( aSet );
-
- rCntntAtPos.sStr = "Pos: (";
- rCntntAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
- rCntntAtPos.sStr += ":";
- rCntntAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
- rCntntAtPos.sStr += ")";
- rCntntAtPos.sStr += "\nParagraph Style: ";
- rCntntAtPos.sStr += pTxtNd->GetFmtColl()->GetName();
- if( pTxtNd->GetCondFmtColl() )
+ pTextNd->SwContentNode::GetAttr( aSet );
+
+ rContentAtPos.sStr = "Pos: (";
+ rContentAtPos.sStr += OUString::number( aPos.nNode.GetIndex());
+ rContentAtPos.sStr += ":";
+ rContentAtPos.sStr += OUString::number( aPos.nContent.GetIndex());
+ rContentAtPos.sStr += ")";
+ rContentAtPos.sStr += "\nParagraph Style: ";
+ rContentAtPos.sStr += pTextNd->GetFormatColl()->GetName();
+ if( pTextNd->GetCondFormatColl() )
{
- rCntntAtPos.sStr += "\nConditional Style: " + pTxtNd->GetCondFmtColl()->GetName();
+ rContentAtPos.sStr += "\nConditional Style: " + pTextNd->GetCondFormatColl()->GetName();
}
if( aSet.Count() )
@@ -1609,13 +1609,13 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
}
if (!sAttrs.isEmpty())
{
- if( !rCntntAtPos.sStr.isEmpty() )
- rCntntAtPos.sStr += "\n";
- rCntntAtPos.sStr += "Attr: " + sAttrs;
+ if( !rContentAtPos.sStr.isEmpty() )
+ rContentAtPos.sStr += "\n";
+ rContentAtPos.sStr += "Attr: " + sAttrs;
}
}
bRet = true;
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_CURR_ATTRS;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_CURR_ATTRS;
}
#endif
}
@@ -1623,8 +1623,8 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
if( !bRet )
{
- rCntntAtPos.eCntntAtPos = SwContentAtPos::SW_NOTHING;
- rCntntAtPos.aFnd.pFld = 0;
+ rContentAtPos.eContentAtPos = SwContentAtPos::SW_NOTHING;
+ rContentAtPos.aFnd.pField = 0;
}
return bRet;
}
@@ -1632,45 +1632,45 @@ bool SwCrsrShell::GetContentAtPos( const Point& rPt,
// #i90516#
const SwPostItField* SwCrsrShell::GetPostItFieldAtCursor() const
{
- const SwPostItField* pPostItFld = 0;
+ const SwPostItField* pPostItField = 0;
if ( !IsTableMode() )
{
const SwPosition* pCursorPos = _GetCrsr()->GetPoint();
- const SwTxtNode* pTxtNd = pCursorPos->nNode.GetNode().GetTxtNode();
- if ( pTxtNd )
+ const SwTextNode* pTextNd = pCursorPos->nNode.GetNode().GetTextNode();
+ if ( pTextNd )
{
- SwTxtAttr* pTxtAttr = pTxtNd->GetFldTxtAttrAt( pCursorPos->nContent.GetIndex() );
- const SwField* pFld = pTxtAttr != NULL ? pTxtAttr->GetFmtFld().GetField() : 0;
- if ( pFld && pFld->Which()== RES_POSTITFLD )
+ SwTextAttr* pTextAttr = pTextNd->GetFieldTextAttrAt( pCursorPos->nContent.GetIndex() );
+ const SwField* pField = pTextAttr != NULL ? pTextAttr->GetFormatField().GetField() : 0;
+ if ( pField && pField->Which()== RES_POSTITFLD )
{
- pPostItFld = static_cast<const SwPostItField*>(pFld);
+ pPostItField = static_cast<const SwPostItField*>(pField);
}
}
}
- return pPostItFld;
+ return pPostItField;
}
/// is the node in a protected section?
bool SwContentAtPos::IsInProtectSect() const
{
- const SwTxtNode* pNd = 0;
- if( pFndTxtAttr )
+ const SwTextNode* pNd = 0;
+ if( pFndTextAttr )
{
- switch( eCntntAtPos )
+ switch( eContentAtPos )
{
case SW_FIELD:
case SW_CLICKFIELD:
- pNd = static_txtattr_cast<SwTxtFld const*>(pFndTxtAttr)->GetpTxtNode();
+ pNd = static_txtattr_cast<SwTextField const*>(pFndTextAttr)->GetpTextNode();
break;
case SW_FTN:
- pNd = &static_cast<const SwTxtFtn*>(pFndTxtAttr)->GetTxtNode();
+ pNd = &static_cast<const SwTextFootnote*>(pFndTextAttr)->GetTextNode();
break;
case SW_INETATTR:
- pNd = static_txtattr_cast<SwTxtINetFmt const*>(pFndTxtAttr)->GetpTxtNode();
+ pNd = static_txtattr_cast<SwTextINetFormat const*>(pFndTextAttr)->GetpTextNode();
break;
default:
@@ -1678,7 +1678,7 @@ bool SwContentAtPos::IsInProtectSect() const
}
}
- const SwCntntFrm* pFrm;
+ const SwContentFrm* pFrm;
return pNd && ( pNd->IsInProtectSect() ||
( 0 != ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), 0, 0, false)) &&
pFrm->IsProtected() ));
@@ -1687,24 +1687,24 @@ bool SwContentAtPos::IsInProtectSect() const
bool SwContentAtPos::IsInRTLText()const
{
bool bRet = false;
- const SwTxtNode* pNd = 0;
- if (pFndTxtAttr && (eCntntAtPos == SW_FTN))
+ const SwTextNode* pNd = 0;
+ if (pFndTextAttr && (eContentAtPos == SW_FTN))
{
- const SwTxtFtn* pTxtFtn = static_cast<const SwTxtFtn*>(pFndTxtAttr);
- if(pTxtFtn->GetStartNode())
+ const SwTextFootnote* pTextFootnote = static_cast<const SwTextFootnote*>(pFndTextAttr);
+ if(pTextFootnote->GetStartNode())
{
- SwStartNode* pSttNd = pTxtFtn->GetStartNode()->GetNode().GetStartNode();
+ SwStartNode* pSttNd = pTextFootnote->GetStartNode()->GetNode().GetStartNode();
SwPaM aTemp( *pSttNd );
aTemp.Move(fnMoveForward, fnGoNode);
- SwCntntNode* pCntntNode = aTemp.GetCntntNode();
- if(pCntntNode && pCntntNode->IsTxtNode())
- pNd = pCntntNode->GetTxtNode();
+ SwContentNode* pContentNode = aTemp.GetContentNode();
+ if(pContentNode && pContentNode->IsTextNode())
+ pNd = pContentNode->GetTextNode();
}
}
if(pNd)
{
- SwIterator<SwTxtFrm,SwTxtNode> aIter(*pNd);
- SwTxtFrm* pTmpFrm = aIter.First();
+ SwIterator<SwTextFrm,SwTextNode> aIter(*pNd);
+ SwTextFrm* pTmpFrm = aIter.First();
while( pTmpFrm )
{
if ( !pTmpFrm->IsFollow())
@@ -1718,7 +1718,7 @@ bool SwContentAtPos::IsInRTLText()const
return bRet;
}
-bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
+bool SwCrsrShell::SelectText( const sal_Int32 nStart,
const sal_Int32 nEnd )
{
SET_CURR_SHELL( this );
@@ -1742,39 +1742,39 @@ bool SwCrsrShell::SelectTxt( const sal_Int32 nStart,
return bRet;
}
-bool SwCrsrShell::SelectTxtAttr( sal_uInt16 nWhich,
+bool SwCrsrShell::SelectTextAttr( sal_uInt16 nWhich,
bool bExpand,
- const SwTxtAttr* pTxtAttr )
+ const SwTextAttr* pTextAttr )
{
SET_CURR_SHELL( this );
bool bRet = false;
if( !IsTableMode() )
{
- if( !pTxtAttr )
+ if( !pTextAttr )
{
SwPosition& rPos = *m_pCurCrsr->GetPoint();
- SwTxtNode* pTxtNd = rPos.nNode.GetNode().GetTxtNode();
- pTxtAttr = (pTxtNd)
- ? pTxtNd->GetTxtAttrAt(rPos.nContent.GetIndex(),
+ SwTextNode* pTextNd = rPos.nNode.GetNode().GetTextNode();
+ pTextAttr = (pTextNd)
+ ? pTextNd->GetTextAttrAt(rPos.nContent.GetIndex(),
static_cast<RES_TXTATR>(nWhich),
- (bExpand) ? SwTxtNode::EXPAND : SwTxtNode::DEFAULT)
+ (bExpand) ? SwTextNode::EXPAND : SwTextNode::DEFAULT)
: 0;
}
- if( pTxtAttr )
+ if( pTextAttr )
{
- const sal_Int32* pEnd = pTxtAttr->End();
- bRet = SelectTxt( pTxtAttr->GetStart(), ( pEnd ? *pEnd : pTxtAttr->GetStart() + 1 ) );
+ const sal_Int32* pEnd = pTextAttr->End();
+ bRet = SelectText( pTextAttr->GetStart(), ( pEnd ? *pEnd : pTextAttr->GetStart() + 1 ) );
}
}
return bRet;
}
-bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
+bool SwCrsrShell::GotoINetAttr( const SwTextINetFormat& rAttr )
{
bool bRet = false;
- if( rAttr.GetpTxtNode() )
+ if( rAttr.GetpTextNode() )
{
SwCursor* pCrsr = getShellCrsr( true );
@@ -1782,8 +1782,8 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *pCrsr );
- pCrsr->GetPoint()->nNode = *rAttr.GetpTxtNode();
- pCrsr->GetPoint()->nContent.Assign( const_cast<SwTxtNode*>(rAttr.GetpTxtNode()),
+ pCrsr->GetPoint()->nNode = *rAttr.GetpTextNode();
+ pCrsr->GetPoint()->nContent.Assign( const_cast<SwTextNode*>(rAttr.GetpTextNode()),
rAttr.GetStart() );
bRet = !pCrsr->IsSelOvr();
if( bRet )
@@ -1792,7 +1792,7 @@ bool SwCrsrShell::GotoINetAttr( const SwTxtINetFmt& rAttr )
return bRet;
}
-const SwFmtINetFmt* SwCrsrShell::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwCrsrShell::FindINetAttr( const OUString& rName ) const
{
return mpDoc->FindINetAttr( rName );
}
@@ -1844,7 +1844,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
SwCallLink aLk( *this ); // watch Crsr-Moves
StartAction();
- SwCntntNode* pCNd = aPos.nNode.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aPos.nNode.GetNode().GetContentNode();
SwUndoId nUndoId = UNDO_INS_FROM_SHADOWCRSR;
// If only the paragraph attributes "Adjust" or "LRSpace" are set,
// then the following should not delete those again.
@@ -1857,10 +1857,10 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
GetDoc()->GetIDocumentUndoRedo().StartUndo( nUndoId, NULL );
- SwTxtFmtColl* pNextFmt = 0;
- SwTxtNode* pTNd = pCNd ? pCNd->GetTxtNode() : NULL;
+ SwTextFormatColl* pNextFormat = 0;
+ SwTextNode* pTNd = pCNd ? pCNd->GetTextNode() : NULL;
if( pTNd )
- pNextFmt = &pTNd->GetTxtColl()->GetNextTxtFmtColl();
+ pNextFormat = &pTNd->GetTextColl()->GetNextTextFormatColl();
const SwSectionNode* pSectNd = pCNd ? pCNd->FindSectionNode() : NULL;
if( pSectNd && aFPos.nParaCnt )
@@ -1878,17 +1878,17 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
for( sal_uInt16 n = 0; n < aFPos.nParaCnt + aFPos.nColumnCnt; ++n )
{
- GetDoc()->getIDocumentContentOperations().AppendTxtNode( aPos );
- if( !n && pNextFmt )
+ GetDoc()->getIDocumentContentOperations().AppendTextNode( aPos );
+ if( !n && pNextFormat )
{
*m_pCurCrsr->GetPoint() = aPos;
- GetDoc()->SetTxtFmtColl( *m_pCurCrsr, pNextFmt, false );
+ GetDoc()->SetTextFormatColl( *m_pCurCrsr, pNextFormat, false );
}
if( n < aFPos.nColumnCnt )
{
*m_pCurCrsr->GetPoint() = aPos;
GetDoc()->getIDocumentContentOperations().InsertPoolItem( *m_pCurCrsr,
- SvxFmtBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
+ SvxFormatBreakItem( SVX_BREAK_COLUMN_BEFORE, RES_BREAK ) );
}
}
@@ -1896,7 +1896,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
switch( aFPos.eMode )
{
case FILL_INDENT:
- if( 0 != (pCNd = aPos.nNode.GetNode().GetCntntNode() ))
+ if( 0 != (pCNd = aPos.nNode.GetNode().GetContentNode() ))
{
SfxItemSet aSet( GetDoc()->GetAttrPool(),
RES_LR_SPACE, RES_LR_SPACE,
@@ -1904,8 +1904,8 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
0 );
SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(
pCNd->GetAttr( RES_LR_SPACE ) ) );
- aLR.SetTxtLeft( aFPos.nTabCnt );
- aLR.SetTxtFirstLineOfst( 0 );
+ aLR.SetTextLeft( aFPos.nTabCnt );
+ aLR.SetTextFirstLineOfst( 0 );
aSet.Put( aLR );
const SvxAdjustItem& rAdj = static_cast<const SvxAdjustItem&>(pCNd->
@@ -1916,7 +1916,7 @@ bool SwCrsrShell::SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode )
GetDoc()->getIDocumentContentOperations().InsertItemSet( *m_pCurCrsr, aSet );
}
else {
- OSL_ENSURE( false, "No CntntNode" );
+ OSL_ENSURE( false, "No ContentNode" );
}
break;
@@ -2003,14 +2003,14 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCrsrSaveState aSaveState( *m_pCurCrsr );
- pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl()[ nArrPos ];
+ pFnd = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable()[ nArrPos ];
if( pFnd )
{
*m_pCurCrsr->GetPoint() = *pFnd->Start();
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
SwNodeIndex* pIdx = &m_pCurCrsr->GetPoint()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = GetDoc()->GetNodes().GoNextSection( pIdx,
true, IsReadOnlyAvailable() )) )
{
@@ -2025,7 +2025,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
m_pCurCrsr->SetMark();
if( nsRedlineType_t::REDLINE_FMTCOLL == pFnd->GetType() )
{
- pCNd = pIdx->GetNode().GetCntntNode();
+ pCNd = pIdx->GetNode().GetContentNode();
m_pCurCrsr->GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
m_pCurCrsr->GetMark()->nContent.Assign( pCNd, 0 );
}
@@ -2033,7 +2033,7 @@ const SwRangeRedline* SwCrsrShell::_GotoRedline( sal_uInt16 nArrPos, bool bSelec
*m_pCurCrsr->GetPoint() = *pFnd->End();
pIdx = &m_pCurCrsr->GetPoint()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = SwNodes::GoPrevSection( pIdx,
true, IsReadOnlyAvailable() )) )
{
@@ -2072,8 +2072,8 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
{
SET_CURR_SHELL( this );
- const SwRedlineTbl& rTbl = GetDoc()->getIDocumentRedlineAccess().GetRedlineTbl();
- const SwRangeRedline* pTmp = rTbl[ nArrPos ];
+ const SwRedlineTable& rTable = GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+ const SwRangeRedline* pTmp = rTable[ nArrPos ];
sal_uInt16 nSeqNo = pTmp->GetSeqNo();
if( nSeqNo && bSelect )
{
@@ -2089,7 +2089,7 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
if( pTmp && bCheck )
{
- // Check for overlaps. These can happen when FmtColl-
+ // Check for overlaps. These can happen when FormatColl-
// Redlines were stretched over a whole paragraph
SwPaM* pCur = m_pCurCrsr;
SwPaM* pNextPam = pCur->GetNext();
@@ -2149,11 +2149,11 @@ const SwRangeRedline* SwCrsrShell::GotoRedline( sal_uInt16 nArrPos, bool bSelect
}
sal_uInt16 nFndPos = 2 == nLoopCnt
- ? rTbl.FindNextOfSeqNo( nArrPos )
- : rTbl.FindPrevOfSeqNo( nArrPos );
+ ? rTable.FindNextOfSeqNo( nArrPos )
+ : rTable.FindPrevOfSeqNo( nArrPos );
if( USHRT_MAX != nFndPos ||
( 0 != ( --nLoopCnt ) && USHRT_MAX != (
- nFndPos = rTbl.FindPrevOfSeqNo( nArrSavPos ))) )
+ nFndPos = rTable.FindPrevOfSeqNo( nArrSavPos ))) )
{
if( pTmp )
{
@@ -2182,47 +2182,47 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
sal_uLong nBodySttNdIdx = pBodySttNd->GetIndex();
Point aPt;
- _SetGetExpFld aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
- _SetGetExpFld aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
+ _SetGetExpField aCmpPos( SwPosition( bNext ? *pBodyEndNd : *pBodySttNd ) );
+ _SetGetExpField aCurPos( bNext ? *m_pCurCrsr->End() : *m_pCurCrsr->Start() );
if( aCurPos.GetNode() < nBodySttNdIdx )
{
- const SwCntntNode* pCNd = aCurPos.GetNodeFromCntnt()->GetCntntNode();
- SwCntntFrm* pFrm;
+ const SwContentNode* pCNd = aCurPos.GetNodeFromContent()->GetContentNode();
+ SwContentFrm* pFrm;
if( pCNd && 0 != ( pFrm = pCNd->getLayoutFrm( GetLayout(), &aPt )) )
aCurPos.SetBodyPos( *pFrm );
}
// check first all the hyperlink fields
{
- const SwTxtNode* pTxtNd;
- const SwCharFmts* pFmts = GetDoc()->GetCharFmts();
- for( SwCharFmts::size_type n = pFmts->size(); 1 < n; )
+ const SwTextNode* pTextNd;
+ const SwCharFormats* pFormats = GetDoc()->GetCharFormats();
+ for( SwCharFormats::size_type n = pFormats->size(); 1 < n; )
{
- SwIterator<SwTxtINetFmt,SwCharFmt> aIter(*(*pFmts)[--n]);
+ SwIterator<SwTextINetFormat,SwCharFormat> aIter(*(*pFormats)[--n]);
- for( SwTxtINetFmt* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
- if( 0 != ( pTxtNd = pFnd->GetpTxtNode()) &&
- pTxtNd->GetNodes().IsDocNodes() )
+ for( SwTextINetFormat* pFnd = aIter.First(); pFnd; pFnd = aIter.Next() )
+ if( 0 != ( pTextNd = pFnd->GetpTextNode()) &&
+ pTextNd->GetNodes().IsDocNodes() )
{
- SwTxtINetFmt& rAttr = *pFnd;
- SwPosition aTmpPos( *pTxtNd );
- _SetGetExpFld aPos( aTmpPos.nNode, rAttr );
- SwCntntFrm* pFrm;
- if( pTxtNd->GetIndex() < nBodySttNdIdx &&
- 0 != ( pFrm = pTxtNd->getLayoutFrm( GetLayout(), &aPt )) )
+ SwTextINetFormat& rAttr = *pFnd;
+ SwPosition aTmpPos( *pTextNd );
+ _SetGetExpField aPos( aTmpPos.nNode, rAttr );
+ SwContentFrm* pFrm;
+ if( pTextNd->GetIndex() < nBodySttNdIdx &&
+ 0 != ( pFrm = pTextNd->getLayoutFrm( GetLayout(), &aPt )) )
aPos.SetBodyPos( *pFrm );
if( bNext
? ( aPos < aCmpPos && aCurPos < aPos )
: ( aCmpPos < aPos && aPos < aCurPos ))
{
- OUString sTxt( pTxtNd->GetExpandTxt( rAttr.GetStart(),
+ OUString sText( pTextNd->GetExpandText( rAttr.GetStart(),
*rAttr.GetEnd() - rAttr.GetStart() ) );
- sTxt = comphelper::string::remove(sTxt, 0x0a);
- sTxt = comphelper::string::strip(sTxt, ' ');
+ sText = comphelper::string::remove(sText, 0x0a);
+ sText = comphelper::string::strip(sText, ' ');
- if( !sTxt.isEmpty() )
+ if( !sText.isEmpty() )
aCmpPos = aPos;
}
}
@@ -2231,19 +2231,19 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
// then check all the Flys with a URL or imapge map
{
- const SwFrmFmts* pFmts = GetDoc()->GetSpzFrmFmts();
- for( SwFrmFmts::size_type n = 0, nEnd = pFmts->size(); n < nEnd; ++n )
+ const SwFrameFormats* pFormats = GetDoc()->GetSpzFrameFormats();
+ for( SwFrameFormats::size_type n = 0, nEnd = pFormats->size(); n < nEnd; ++n )
{
- SwFlyFrmFmt* pFmt = static_cast<SwFlyFrmFmt*>((*pFmts)[ n ]);
- const SwFmtURL& rURLItem = pFmt->GetURL();
+ SwFlyFrameFormat* pFormat = static_cast<SwFlyFrameFormat*>((*pFormats)[ n ]);
+ const SwFormatURL& rURLItem = pFormat->GetURL();
if( rURLItem.GetMap() || !rURLItem.GetURL().isEmpty() )
{
- SwFlyFrm* pFly = pFmt->GetFrm( &aPt, false );
+ SwFlyFrm* pFly = pFormat->GetFrm( &aPt, false );
SwPosition aTmpPos( *pBodySttNd );
if( pFly &&
- GetBodyTxtNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
+ GetBodyTextNode( *GetDoc(), aTmpPos, *pFly->GetLower() ) )
{
- _SetGetExpFld aPos( *pFmt, &aTmpPos );
+ _SetGetExpField aPos( *pFormat, &aTmpPos );
if( bNext
? ( aPos < aCmpPos && aCurPos < aPos )
@@ -2256,9 +2256,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
// found any URL ?
bool bRet = false;
- const SwTxtINetFmt* pFndAttr = aCmpPos.GetINetFmt();
- const SwFlyFrmFmt* pFndFmt = aCmpPos.GetFlyFmt();
- if( pFndAttr || pFndFmt )
+ const SwTextINetFormat* pFndAttr = aCmpPos.GetINetFormat();
+ const SwFlyFrameFormat* pFndFormat = aCmpPos.GetFlyFormat();
+ if( pFndAttr || pFndFormat )
{
SET_CURR_SHELL( this );
SwCallLink aLk( *this );
@@ -2281,9 +2281,9 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
}
}
// found a draw object ?
- else if( RES_DRAWFRMFMT == pFndFmt->Which() )
+ else if( RES_DRAWFRMFMT == pFndFormat->Which() )
{
- const SdrObject* pSObj = pFndFmt->FindSdrObject();
+ const SdrObject* pSObj = pFndFormat->FindSdrObject();
if (pSObj)
{
static_cast<SwFEShell*>(this)->SelectObj( pSObj->GetCurrentBoundRect().Center() );
@@ -2293,7 +2293,7 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext )
}
else // then is it a fly
{
- SwFlyFrm* pFly = pFndFmt->GetFrm(&aPt, false );
+ SwFlyFrm* pFly = pFndFormat->GetFrm(&aPt, false );
if( pFly )
{
static_cast<SwFEShell*>(this)->SelectFlyFrm( *pFly, true );
diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx
index d0cdeaa50b6c..9ff5944d7e5c 100644
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::util;
-typedef std::set<SwFmt*> SwpFmts;
+typedef std::set<SwFormat*> SwpFormats;
// Special case for SvxFontItem: only compare the name
bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
@@ -66,9 +66,9 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
case RES_PAGEDESC:
bool bNumOffsetEqual = false;
::boost::optional<sal_uInt16> const oNumOffset1 =
- static_cast<const SwFmtPageDesc&>(rItem1).GetNumOffset();
+ static_cast<const SwFormatPageDesc&>(rItem1).GetNumOffset();
::boost::optional<sal_uInt16> const oNumOffset2 =
- static_cast<const SwFmtPageDesc&>(rItem2).GetNumOffset();
+ static_cast<const SwFormatPageDesc&>(rItem2).GetNumOffset();
if (!oNumOffset1 && !oNumOffset2)
{
bNumOffsetEqual = true;
@@ -85,33 +85,33 @@ bool CmpAttr( const SfxPoolItem& rItem1, const SfxPoolItem& rItem2 )
if (!bNumOffsetEqual)
return false;
- return static_cast<const SwFmtPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFmtPageDesc&>(rItem2).GetPageDesc();
+ return static_cast<const SwFormatPageDesc&>(rItem1).GetPageDesc() == static_cast<const SwFormatPageDesc&>(rItem2).GetPageDesc();
}
return rItem1 == rItem2;
}
-const SwTxtAttr* GetFrwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
- sal_Int32 nCntntPos )
+const SwTextAttr* GetFrwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+ sal_Int32 nContentPos )
{
while( rPos < rHtsArr.Count() )
{
- const SwTxtAttr *pTxtHt = rHtsArr.GetStart( rPos++ );
+ const SwTextAttr *pTextHt = rHtsArr.GetStart( rPos++ );
// the start of an attribute has to be in the section
- if( pTxtHt->GetStart() >= nCntntPos )
- return pTxtHt; // valid text attribute
+ if( pTextHt->GetStart() >= nContentPos )
+ return pTextHt; // valid text attribute
}
return 0; // invalid text attribute
}
-const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
- sal_Int32 nCntntPos )
+const SwTextAttr* GetBkwrdTextHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
+ sal_Int32 nContentPos )
{
while( rPos > 0 )
{
- const SwTxtAttr *pTxtHt = rHtsArr.GetStart( --rPos );
+ const SwTextAttr *pTextHt = rHtsArr.GetStart( --rPos );
// the start of an attribute has to be in the section
- if( pTxtHt->GetStart() < nCntntPos )
- return pTxtHt; // valid text attribute
+ if( pTextHt->GetStart() < nContentPos )
+ return pTextHt; // valid text attribute
}
return 0; // invalid text attribute
}
@@ -119,22 +119,22 @@ const SwTxtAttr* GetBkwrdTxtHint( const SwpHints& rHtsArr, sal_uInt16& rPos,
static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd,
const bool bSaveMark )
{
- sal_Int32 nCntntPos;
+ sal_Int32 nContentPos;
if( bSaveMark )
- nCntntPos = rPam.GetMark()->nContent.GetIndex();
+ nContentPos = rPam.GetMark()->nContent.GetIndex();
else
- nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+ nContentPos = rPam.GetPoint()->nContent.GetIndex();
bool bTstEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode;
- SwCntntNode* pCNd = rPam.GetCntntNode();
+ SwContentNode* pCNd = rPam.GetContentNode();
rPam.GetPoint()->nContent.Assign( pCNd, nStart );
rPam.SetMark(); // Point == GetMark
// Point points to end of search area or end of attribute
if( pEnd )
{
- if( bTstEnd && *pEnd > nCntntPos )
- rPam.GetPoint()->nContent = nCntntPos;
+ if( bTstEnd && *pEnd > nContentPos )
+ rPam.GetPoint()->nContent = nContentPos;
else
rPam.GetPoint()->nContent = *pEnd;
}
@@ -147,30 +147,30 @@ static void lcl_SetAttrPam( SwPaM& rPam, sal_Int32 nStart, const sal_Int32* pEnd
If that is found then the SwPaM contains the section that surrounds the
attribute (w.r.t. the search area).
- @param rTxtNd Text node to search in.
+ @param rTextNd Text node to search in.
@param rPam ???
@param rCmpItem ???
@param fnMove ???
@param bValue ???
@return Returns <true> if found, <false> otherwise.
*/
-static bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam,
+static bool lcl_Search( const SwTextNode& rTextNd, SwPaM& rPam,
const SfxPoolItem& rCmpItem,
SwMoveFn fnMove, bool bValue )
{
- if ( !rTxtNd.HasHints() )
+ if ( !rTextNd.HasHints() )
return false;
- const SwTxtAttr *pTxtHt = 0;
+ const SwTextAttr *pTextHt = 0;
bool bForward = fnMove == fnMoveForward;
- sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count();
- sal_Int32 nCntntPos = rPam.GetPoint()->nContent.GetIndex();
+ sal_uInt16 nPos = bForward ? 0 : rTextNd.GetSwpHints().Count();
+ sal_Int32 nContentPos = rPam.GetPoint()->nContent.GetIndex();
- while( 0 != ( pTxtHt=(*fnMove->fnGetHint)(rTxtNd.GetSwpHints(),nPos,nCntntPos)))
- if( pTxtHt->Which() == rCmpItem.Which() &&
- ( !bValue || CmpAttr( pTxtHt->GetAttr(), rCmpItem )))
+ while( 0 != ( pTextHt=(*fnMove->fnGetHint)(rTextNd.GetSwpHints(),nPos,nContentPos)))
+ if( pTextHt->Which() == rCmpItem.Which() &&
+ ( !bValue || CmpAttr( pTextHt->GetAttr(), rCmpItem )))
{
- lcl_SetAttrPam( rPam, pTxtHt->GetStart(), pTxtHt->End(), bForward );
+ lcl_SetAttrPam( rPam, pTextHt->GetStart(), pTextHt->End(), bForward );
return true;
}
return false;
@@ -204,7 +204,7 @@ public:
SwAttrCheckArr( const SfxItemSet& rSet, bool bForward, bool bNoCollections );
~SwAttrCheckArr();
- void SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam );
+ void SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam );
/// how many attributes are there in total?
sal_uInt16 Count() const { return aCmpSet.Count(); }
@@ -217,8 +217,8 @@ public:
sal_Int32 GetNdStt() const { return nNdStt; }
sal_Int32 GetNdEnd() const { return nNdEnd; }
- bool SetAttrFwd( const SwTxtAttr& rAttr );
- bool SetAttrBwd( const SwTxtAttr& rAttr );
+ bool SetAttrFwd( const SwTextAttr& rAttr );
+ bool SetAttrBwd( const SwTextAttr& rAttr );
};
SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, bool bFwd,
@@ -251,7 +251,7 @@ SwAttrCheckArr::~SwAttrCheckArr()
delete[] reinterpret_cast<char*>(pStackArr);
}
-void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
+void SwAttrCheckArr::SetNewSet( const SwTextNode& rTextNd, const SwPaM& rPam )
{
memset( pFndArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
memset( pStackArr, 0, nArrLen * sizeof(_SwSrchChrAttr) );
@@ -263,7 +263,7 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
nNdStt = rPam.GetPoint()->nContent.GetIndex();
nNdEnd = rPam.GetPoint()->nNode == rPam.GetMark()->nNode
? rPam.GetMark()->nContent.GetIndex()
- : rTxtNd.GetTxt().getLength();
+ : rTextNd.GetText().getLength();
}
else
{
@@ -273,10 +273,10 @@ void SwAttrCheckArr::SetNewSet( const SwTxtNode& rTxtNd, const SwPaM& rPam )
: 0;
}
- if( bNoColls && !rTxtNd.HasSwAttrSet() )
+ if( bNoColls && !rTextNd.HasSwAttrSet() )
return ;
- const SfxItemSet& rSet = rTxtNd.GetSwAttrSet();
+ const SfxItemSet& rSet = rTextNd.GetSwAttrSet();
SfxItemIter aIter( aCmpSet );
const SfxPoolItem* pItem = aIter.GetCurItem();
@@ -333,7 +333,7 @@ lcl_IsAttributeIgnorable(sal_Int32 const nNdStart, sal_Int32 const nNdEnd,
: ((rTmp.nEnd <= nNdStart) || (nNdEnd <= rTmp.nStt)));
}
-bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrFwd( const SwTextAttr& rAttr )
{
_SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
@@ -354,7 +354,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
return Found();
pTmpItem = NULL;
- pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+ pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
if ( pSet )
{
pIter = new SfxWhichIter( *pSet );
@@ -486,7 +486,7 @@ bool SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr )
return Found();
}
-bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
+bool SwAttrCheckArr::SetAttrBwd( const SwTextAttr& rAttr )
{
_SwSrchChrAttr aTmp( rAttr.GetAttr(), rAttr.GetStart(), *rAttr.GetAnyEnd() );
@@ -507,7 +507,7 @@ bool SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr )
if( bNoColls && RES_TXTATR_CHARFMT == nWhch )
return Found();
- pSet = CharFmt::GetItemSet( rAttr.GetAttr() );
+ pSet = CharFormat::GetItemSet( rAttr.GetAttr() );
if ( pSet )
{
pIter = new SfxWhichIter( *pSet );
@@ -693,12 +693,12 @@ bool SwAttrCheckArr::CheckStack()
return nFound == aCmpSet.Count();
}
-static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchForward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
sal_Int32 nEndPos;
- rCmpArr.SetNewSet( rTxtNd, rPam );
- if( !rTxtNd.HasHints() )
+ rCmpArr.SetNewSet( rTextNd, rPam );
+ if( !rTextNd.HasHints() )
{
if( !rCmpArr.Found() )
return false;
@@ -707,8 +707,8 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
return true;
}
- const SwpHints& rHtArr = rTxtNd.GetSwpHints();
- const SwTxtAttr* pAttr;
+ const SwpHints& rHtArr = rTextNd.GetSwpHints();
+ const SwTextAttr* pAttr;
size_t nPos = 0;
// if everything is already there then check with which it will be ended
@@ -767,12 +767,12 @@ static bool lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
return true;
}
-static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr,
+static bool lcl_SearchBackward( const SwTextNode& rTextNd, SwAttrCheckArr& rCmpArr,
SwPaM& rPam )
{
sal_Int32 nEndPos;
- rCmpArr.SetNewSet( rTxtNd, rPam );
- if( !rTxtNd.HasHints() )
+ rCmpArr.SetNewSet( rTextNd, rPam );
+ if( !rTextNd.HasHints() )
{
if( !rCmpArr.Found() )
return false;
@@ -781,8 +781,8 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
return true;
}
- const SwpHints& rHtArr = rTxtNd.GetSwpHints();
- const SwTxtAttr* pAttr;
+ const SwpHints& rHtArr = rTextNd.GetSwpHints();
+ const SwTextAttr* pAttr;
size_t nPos = rHtArr.Count();
sal_Int32 nSttPos;
@@ -845,7 +845,7 @@ static bool lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr
return true;
}
-static bool lcl_Search( const SwCntntNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
+static bool lcl_Search( const SwContentNode& rCNd, const SfxItemSet& rCmpSet, bool bNoColls )
{
// search only hard attribution?
if( bNoColls && !rCNd.HasSwAttrSet() )
@@ -893,20 +893,20 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
bool bFound = false;
bool bFirst = true;
const bool bSrchForward = fnMove == fnMoveForward;
- SwCntntNode * pNode;
+ SwContentNode * pNode;
const SfxPoolItem* pItem;
- SwpFmts aFmtArr;
+ SwpFormats aFormatArr;
// if at beginning/end then move it out of the node
if( bSrchForward
- ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+ ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
: !pPam->GetPoint()->nContent.GetIndex() )
{
if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
{
return false;
}
- SwCntntNode *pNd = pPam->GetCntntNode();
+ SwContentNode *pNd = pPam->GetContentNode();
pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
}
@@ -914,11 +914,11 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
{
if( bCharAttr )
{
- if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+ if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
continue;
- if( pNode->GetTxtNode()->HasHints() &&
- lcl_Search( *pNode->GetTxtNode(), *pPam, rAttr, fnMove, bValue ))
+ if( pNode->GetTextNode()->HasHints() &&
+ lcl_Search( *pNode->GetTextNode(), *pPam, rAttr, fnMove, bValue ))
{
// set to the values of the attribute
SetMark();
@@ -934,10 +934,10 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
// no hard attribution, so check if node was asked for this attr before
if( !pNode->HasSwAttrSet() )
{
- SwFmt* pTmpFmt = pNode->GetFmtColl();
- if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+ SwFormat* pTmpFormat = pNode->GetFormatColl();
+ if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
continue; // collection was requested earlier
- aFmtArr.insert( pTmpFmt );
+ aFormatArr.insert( pTmpFormat );
}
if( SfxItemState::SET == pNode->GetSwAttrSet().GetItemState( nWhich,
@@ -961,7 +961,7 @@ bool SwPaM::Find( const SfxPoolItem& rAttr, bool bValue, SwMoveFn fnMove,
return bFound;
}
-typedef bool (*FnSearchAttr)( const SwTxtNode&, SwAttrCheckArr&, SwPaM& );
+typedef bool (*FnSearchAttr)( const SwTextNode&, SwAttrCheckArr&, SwPaM& );
bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
const SwPaM *pRegion, bool bInReadOnly, bool bMoveFirst )
@@ -971,8 +971,8 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
bool bFound = false;
bool bFirst = true;
const bool bSrchForward = fnMove == fnMoveForward;
- SwCntntNode * pNode;
- SwpFmts aFmtArr;
+ SwContentNode * pNode;
+ SwpFormats aFormatArr;
// check which text/char attributes are searched
SwAttrCheckArr aCmpArr( rSet, bSrchForward, bNoColls );
@@ -987,14 +987,14 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
// if at beginning/end then move it out of the node
if( bMoveFirst &&
( bSrchForward
- ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+ ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
: !pPam->GetPoint()->nContent.GetIndex() ) )
{
if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
{
return false;
}
- SwCntntNode *pNd = pPam->GetCntntNode();
+ SwContentNode *pNd = pPam->GetContentNode();
pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
}
@@ -1002,12 +1002,12 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
{
if( aCmpArr.Count() )
{
- if( !pNode->IsTxtNode() ) // CharAttr are only in text nodes
+ if( !pNode->IsTextNode() ) // CharAttr are only in text nodes
continue;
if( (!aOtherSet.Count() ||
lcl_Search( *pNode, aOtherSet, bNoColls )) &&
- (*fnSearch)( *pNode->GetTxtNode(), aCmpArr, *pPam ))
+ (*fnSearch)( *pNode->GetTextNode(), aCmpArr, *pPam ))
{
// set to the values of the attribute
SetMark();
@@ -1025,10 +1025,10 @@ bool SwPaM::Find( const SfxItemSet& rSet, bool bNoColls, SwMoveFn fnMove,
// no hard attribution, so check if node was asked for this attr before
if( !pNode->HasSwAttrSet() )
{
- SwFmt* pTmpFmt = pNode->GetFmtColl();
- if( aFmtArr.find( pTmpFmt ) != aFmtArr.end() )
+ SwFormat* pTmpFormat = pNode->GetFormatColl();
+ if( aFormatArr.find( pTmpFormat ) != aFormatArr.end() )
continue; // collection was requested earlier
- aFmtArr.insert( pTmpFmt );
+ aFormatArr.insert( pTmpFormat );
}
if( lcl_Search( *pNode, aOtherSet, bNoColls ))
@@ -1058,15 +1058,15 @@ struct SwFindParaAttr : public SwFindParas
const SfxItemSet *pSet, *pReplSet;
const SearchOptions *pSearchOpt;
SwCursor& rCursor;
- utl::TextSearch* pSTxt;
+ utl::TextSearch* pSText;
SwFindParaAttr( const SfxItemSet& rSet, bool bNoCollection,
const SearchOptions* pOpt, const SfxItemSet* pRSet,
SwCursor& rCrsr )
: bValue( bNoCollection ), pSet( &rSet ), pReplSet( pRSet ),
- pSearchOpt( pOpt ), rCursor( rCrsr ),pSTxt( 0 ) {}
+ pSearchOpt( pOpt ), rCursor( rCrsr ),pSText( 0 ) {}
- virtual ~SwFindParaAttr() { delete pSTxt; }
+ virtual ~SwFindParaAttr() { delete pSText; }
virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -1076,11 +1076,11 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
bool bInReadOnly )
{
// replace string (only if text given and search is not parameterized)?
- bool bReplaceTxt = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
+ bool bReplaceText = pSearchOpt && ( !pSearchOpt->replaceString.isEmpty() ||
!pSet->Count() );
bool bReplaceAttr = pReplSet && pReplSet->Count();
bool bMoveFirst = !bReplaceAttr;
- if( bInReadOnly && (bReplaceAttr || bReplaceTxt ))
+ if( bInReadOnly && (bReplaceAttr || bReplaceText ))
bInReadOnly = false;
// We search for attributes, should we search for text as well?
@@ -1107,7 +1107,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
return FIND_NOT_FOUND;
// then search in text of it
- if( !pSTxt )
+ if( !pSText )
{
SearchOptions aTmp( *pSearchOpt );
@@ -1117,14 +1117,14 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
aTmp.Locale = SvtSysLocale().GetLanguageTag().getLocale();
- pSTxt = new utl::TextSearch( aTmp );
+ pSText = new utl::TextSearch( aTmp );
}
// TODO: searching for attributes in Outliner text?!
bool bSearchInNotes = false;
// continue search in correct section (pTextRegion)
- if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSTxt, fnMove, pTextRegion, bInReadOnly ) &&
+ if( aSrchPam.Find( *pSearchOpt, bSearchInNotes, *pSText, fnMove, pTextRegion, bInReadOnly ) &&
*aSrchPam.GetMark() != *aSrchPam.GetPoint() )
break; // found
else if( !pSet->Count() )
@@ -1138,7 +1138,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
*pCrsr->GetMark() = *aSrchPam.GetMark();
}
- if( bReplaceTxt )
+ if( bReplaceText )
{
const bool bRegExp(
SearchAlgorithms_REGEXP == pSearchOpt->algorithmType);
@@ -1158,7 +1158,7 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
rCursor.GetDoc()->getIDocumentContentOperations().ReplaceRange( *pCrsr,
(pRepl.get()) ? *pRepl : pSearchOpt->replaceString,
bRegExp );
- rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+ rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
if( bRegExp )
{
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx
index 62e9e799fb18..762e53309f18 100644
--- a/sw/source/core/crsr/findcoll.cxx
+++ b/sw/source/core/crsr/findcoll.cxx
@@ -28,45 +28,45 @@
#include <comcore.hrc>
/// parameters for a search for FormatCollections
-struct SwFindParaFmtColl : public SwFindParas
+struct SwFindParaFormatColl : public SwFindParas
{
- const SwTxtFmtColl *pFmtColl, *pReplColl;
+ const SwTextFormatColl *pFormatColl, *pReplColl;
SwCursor& rCursor;
- SwFindParaFmtColl( const SwTxtFmtColl& rFmtColl,
- const SwTxtFmtColl* pRpColl, SwCursor& rCrsr )
- : pFmtColl( &rFmtColl ), pReplColl( pRpColl ), rCursor( rCrsr )
+ SwFindParaFormatColl( const SwTextFormatColl& rFormatColl,
+ const SwTextFormatColl* pRpColl, SwCursor& rCrsr )
+ : pFormatColl( &rFormatColl ), pReplColl( pRpColl ), rCursor( rCrsr )
{}
- virtual ~SwFindParaFmtColl() {}
+ virtual ~SwFindParaFormatColl() {}
virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
virtual bool IsReplaceMode() const SAL_OVERRIDE;
};
-int SwFindParaFmtColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
+int SwFindParaFormatColl::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion,
bool bInReadOnly )
{
int nRet = FIND_FOUND;
if( bInReadOnly && pReplColl )
bInReadOnly = false;
- if( !pCrsr->Find( *pFmtColl, fnMove, pRegion, bInReadOnly ) )
+ if( !pCrsr->Find( *pFormatColl, fnMove, pRegion, bInReadOnly ) )
nRet = FIND_NOT_FOUND;
else if( pReplColl )
{
- pCrsr->GetDoc()->SetTxtFmtColl( *pCrsr, const_cast<SwTxtFmtColl*>(pReplColl) );
+ pCrsr->GetDoc()->SetTextFormatColl( *pCrsr, const_cast<SwTextFormatColl*>(pReplColl) );
nRet = FIND_NO_RING;
}
return nRet;
}
-bool SwFindParaFmtColl::IsReplaceMode() const
+bool SwFindParaFormatColl::IsReplaceMode() const
{
return 0 != pReplColl;
}
/// search for Format-Collections
-sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
+sal_uLong SwCursor::Find( const SwTextFormatColl& rFormatColl, SwDocPositions nStart,
SwDocPositions nEnd, bool& bCancel,
- FindRanges eFndRngs, const SwTxtFmtColl* pReplFmtColl )
+ FindRanges eFndRngs, const SwTextFormatColl* pReplFormatColl )
{
// switch off OLE-notifications
SwDoc* pDoc = GetDoc();
@@ -74,24 +74,24 @@ sal_uLong SwCursor::Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart,
pDoc->SetOle2Link( Link<>() );
bool const bStartUndo =
- pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFmtColl;
+ pDoc->GetIDocumentUndoRedo().DoesUndo() && pReplFormatColl;
if (bStartUndo)
{
SwRewriter aRewriter;
- aRewriter.AddRule(UndoArg1, rFmtColl.GetName());
+ aRewriter.AddRule(UndoArg1, rFormatColl.GetName());
aRewriter.AddRule(UndoArg2, SW_RES(STR_YIELDS));
- aRewriter.AddRule(UndoArg3, pReplFmtColl->GetName());
+ aRewriter.AddRule(UndoArg3, pReplFormatColl->GetName());
pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE_STYLE,
&aRewriter );
}
- SwFindParaFmtColl aSwFindParaFmtColl( rFmtColl, pReplFmtColl, *this );
+ SwFindParaFormatColl aSwFindParaFormatColl( rFormatColl, pReplFormatColl, *this );
- sal_uLong nRet = FindAll( aSwFindParaFmtColl, nStart, nEnd, eFndRngs, bCancel );
+ sal_uLong nRet = FindAll( aSwFindParaFormatColl, nStart, nEnd, eFndRngs, bCancel );
pDoc->SetOle2Link( aLnk );
- if( nRet && pReplFmtColl )
+ if( nRet && pReplFormatColl )
pDoc->getIDocumentState().SetModified();
if (bStartUndo)
diff --git a/sw/source/core/crsr/findfmt.cxx b/sw/source/core/crsr/findfmt.cxx
index 8ffc5b307b06..e9e745514557 100644
--- a/sw/source/core/crsr/findfmt.cxx
+++ b/sw/source/core/crsr/findfmt.cxx
@@ -21,7 +21,7 @@
#include <pamtyp.hxx>
#include <boost/scoped_ptr.hpp>
-bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
+bool SwPaM::Find( const SwFormat& rFormat, SwMoveFn fnMove,
const SwPaM *pRegion, bool bInReadOnly )
{
bool bFound = false;
@@ -30,24 +30,24 @@ bool SwPaM::Find( const SwFmt& rFmt, SwMoveFn fnMove,
// if at beginning/end then move it out of the node
if( bSrchForward
- ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetCntntNode()->Len()
+ ? pPam->GetPoint()->nContent.GetIndex() == pPam->GetContentNode()->Len()
: !pPam->GetPoint()->nContent.GetIndex() )
{
if( !(*fnMove->fnNds)( &pPam->GetPoint()->nNode, false ))
{
return false;
}
- SwCntntNode *pNd = pPam->GetPoint()->nNode.GetNode().GetCntntNode();
+ SwContentNode *pNd = pPam->GetPoint()->nNode.GetNode().GetContentNode();
pPam->GetPoint()->nContent.Assign( pNd, bSrchForward ? 0 : pNd->Len() );
}
bool bFirst = true;
- SwCntntNode* pNode;
+ SwContentNode* pNode;
while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly )))
{
- if ( pNode->GetFmtColl() == &rFmt )
+ if ( pNode->GetFormatColl() == &rFormat )
{
- // if a FormatCollection is found then it is definitely a SwCntntNode
+ // if a FormatCollection is found then it is definitely a SwContentNode
// FORWARD: SPoint at the end, GetMark at the beginning of the node
// BACKWARD: SPoint at the beginning, GetMark at the end of the node
diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx
index ba7dcbdefe01..9a2a8a1e7060 100644
--- a/sw/source/core/crsr/findtxt.cxx
+++ b/sw/source/core/crsr/findtxt.cxx
@@ -51,10 +51,10 @@ using namespace ::com::sun::star;
using namespace util;
static OUString
-lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
+lcl_CleanStr(const SwTextNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
std::vector<sal_Int32> &rArr, bool const bRemoveSoftHyphen)
{
- OUStringBuffer buf(rNd.GetTxt());
+ OUStringBuffer buf(rNd.GetText());
rArr.clear();
const SwpHints *pHts = rNd.GetpSwpHints();
@@ -77,7 +77,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
if ( bNewSoftHyphen )
{
nSoftHyphen = (bRemoveSoftHyphen)
- ? rNd.GetTxt().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
+ ? rNd.GetText().indexOf(CHAR_SOFTHYPHEN, nSoftHyphen)
: -1;
}
@@ -115,7 +115,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
if ( bNewHint )
{
- const SwTxtAttr* pHt = (*pHts)[n];
+ const SwTextAttr* pHt = (*pHts)[n];
if ( pHt->HasDummyChar() && (nStt >= nStart) )
{
switch( pHt->Which() )
@@ -139,7 +139,7 @@ lcl_CleanStr(const SwTxtNode& rNd, sal_Int32 const nStart, sal_Int32& rEnd,
const bool bEmpty =
( pHt->Which() != RES_TXTATR_FIELD
&& pHt->Which() != RES_TXTATR_ANNOTATION )
- || (static_txtattr_cast<SwTxtFld const*>(pHt)->GetFmtFld().GetField()->ExpandField(true).isEmpty());;
+ || (static_txtattr_cast<SwTextField const*>(pHt)->GetFormatField().GetField()->ExpandField(true).isEmpty());;
if ( bEmpty && nStart == nAkt )
{
rArr.push_back( nAkt );
@@ -195,8 +195,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
for (size_t i = 0; i < pHts->Count(); ++i )
{
aIndex++;
- const SwTxtAttr* pTxtAttr = (*pHts)[i];
- if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+ const SwTextAttr* pTextAttr = (*pHts)[i];
+ if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
{
aCount--;
if (!aCount)
@@ -207,8 +207,8 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
// throw away all following non postits
for( size_t i = aIndex; i < pHts->Count(); ++i )
{
- const SwTxtAttr* pTxtAttr = (*pHts)[i];
- if ( pTxtAttr->Which() == RES_TXTATR_ANNOTATION )
+ const SwTextAttr* pTextAttr = (*pHts)[i];
+ if ( pTextAttr->Which() == RES_TXTATR_ANNOTATION )
break;
else
aIndex++;
@@ -216,7 +216,7 @@ size_t GetPostIt(sal_Int32 aCount,const SwpHints *pHts)
return aIndex;
}
-bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSTxt,
+bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::TextSearch& rSText,
SwMoveFn fnMove, const SwPaM * pRegion,
bool bInReadOnly )
{
@@ -226,13 +226,13 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
SwPaM* pPam = MakeRegion( fnMove, pRegion );
const bool bSrchForward = fnMove == fnMoveForward;
SwNodeIndex& rNdIdx = pPam->GetPoint()->nNode;
- SwIndex& rCntntIdx = pPam->GetPoint()->nContent;
+ SwIndex& rContentIdx = pPam->GetPoint()->nContent;
// If bFound is true then the string was found and is between nStart and nEnd
bool bFound = false;
// start position in text or initial position
bool bFirst = true;
- SwCntntNode * pNode;
+ SwContentNode * pNode;
const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType;
const bool bChkEmptyPara = bRegSearch && 2 == rSearchOpt.searchString.getLength() &&
@@ -243,22 +243,22 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
// LanguageType eLastLang = 0;
while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) ))
{
- if( pNode->IsTxtNode() )
+ if( pNode->IsTextNode() )
{
- SwTxtNode& rTxtNode = *pNode->GetTxtNode();
- sal_Int32 nTxtLen = rTxtNode.GetTxt().getLength();
+ SwTextNode& rTextNode = *pNode->GetTextNode();
+ sal_Int32 nTextLen = rTextNode.GetText().getLength();
sal_Int32 nEnd;
if( rNdIdx == pPam->GetMark()->nNode )
nEnd = pPam->GetMark()->nContent.GetIndex();
else
- nEnd = bSrchForward ? nTxtLen : 0;
- sal_Int32 nStart = rCntntIdx.GetIndex();
+ nEnd = bSrchForward ? nTextLen : 0;
+ sal_Int32 nStart = rContentIdx.GetIndex();
/* #i80135# */
// if there are SwPostItFields inside our current node text, we
// split the text into separate pieces and search for text inside
// the pieces as well as inside the fields
- const SwpHints *pHts = rTxtNode.GetpSwpHints();
+ const SwpHints *pHts = rTextNode.GetpSwpHints();
// count PostItFields by looping over all fields
sal_Int32 aNumberPostits = 0;
@@ -272,10 +272,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
for( size_t i = 0; i < pHts->Count(); ++i )
{
- const SwTxtAttr* pTxtAttr = (*pHts)[i];
- if ( pTxtAttr->Which()==RES_TXTATR_ANNOTATION )
+ const SwTextAttr* pTextAttr = (*pHts)[i];
+ if ( pTextAttr->Which()==RES_TXTATR_ANNOTATION )
{
- const sal_Int32 aPos = pTxtAttr->GetStart();
+ const sal_Int32 aPos = pTextAttr->GetStart();
if ( (aPos >= nStart) && (aPos <= nEnd) )
aNumberPostits++;
else
@@ -323,11 +323,11 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
// If there are any shapes anchored to this node, search there.
SwPaM aPaM(pNode->GetDoc()->GetNodes().GetEndOfContent());
- aPaM.GetPoint()->nNode = rTxtNode;
- aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTxtNode(), nStart);
+ aPaM.GetPoint()->nNode = rTextNode;
+ aPaM.GetPoint()->nContent.Assign(aPaM.GetPoint()->nNode.GetNode().GetTextNode(), nStart);
aPaM.SetMark();
- aPaM.GetMark()->nNode = rTxtNode.GetIndex() + 1;
- aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTxtNode(), 0);
+ aPaM.GetMark()->nNode = rTextNode.GetIndex() + 1;
+ aPaM.GetMark()->nContent.Assign(aPaM.GetMark()->nNode.GetNode().GetTextNode(), 0);
if (pNode->GetDoc()->getIDocumentDrawModelAccess().Search(aPaM, aSearchItem))
{
bFound = true;
@@ -373,18 +373,18 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
{
nStartInside = aLoop==0 ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
nEndInside = aLoop==aNumberPostits ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
- nTxtLen = nEndInside - nStartInside;
+ nTextLen = nEndInside - nStartInside;
}
else
{
nStartInside = aLoop==aNumberPostits ? nStart : (*pHts)[GetPostIt(aLoop+aIgnore,pHts)]->GetStart();
nEndInside = aLoop==0 ? nEnd : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)]->GetStart()+1;
- nTxtLen = nStartInside - nEndInside;
+ nTextLen = nStartInside - nEndInside;
}
// search inside the text between a note
- bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+ bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
bRegSearch, bChkEmptyPara, bChkParaEnd,
- nStartInside, nEndInside, nTxtLen, pNode,
+ nStartInside, nEndInside, nTextLen, pNode,
pPam );
if ( bFound )
break;
@@ -393,9 +393,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
// we should now be right in front of a note, search inside
if ( (bSrchForward && (GetPostIt(aLoop + aIgnore,pHts) < pHts->Count()) ) || ( !bSrchForward && (aLoop!=0) ))
{
- const SwTxtAttr* pTxtAttr = bSrchForward ? (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
+ const SwTextAttr* pTextAttr = bSrchForward ? (*pHts)[GetPostIt(aLoop+aIgnore,pHts)] : (*pHts)[GetPostIt(aLoop+aIgnore-1,pHts)];
if (pPostItMgr && pPostItMgr->SearchReplace(
- static_txtattr_cast<SwTxtFld const*>(pTxtAttr)->GetFmtFld(),rSearchOpt,bSrchForward))
+ static_txtattr_cast<SwTextField const*>(pTextAttr)->GetFormatField(),rSearchOpt,bSrchForward))
{
bFound = true ;
break;
@@ -409,9 +409,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
{
// if there is no SwPostItField inside or searching inside notes
// is disabled, we search the whole length just like before
- bFound = DoSearch( rSearchOpt, rSTxt, fnMove, bSrchForward,
+ bFound = DoSearch( rSearchOpt, rSText, fnMove, bSrchForward,
bRegSearch, bChkEmptyPara, bChkParaEnd,
- nStart, nEnd, nTxtLen, pNode, pPam );
+ nStart, nEnd, nTextLen, pNode, pPam );
}
if (bFound)
break;
@@ -421,10 +421,10 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te
return bFound;
}
-bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
+bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSText,
SwMoveFn fnMove, bool bSrchForward, bool bRegSearch,
bool bChkEmptyPara, bool bChkParaEnd,
- sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTxtLen,
+ sal_Int32 &nStart, sal_Int32 &nEnd, sal_Int32 nTextLen,
SwNode* pNode, SwPaM* pPam)
{
bool bFound = false;
@@ -456,10 +456,10 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
}
if( bSrchForward )
- sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nStart, nEnd,
+ sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nStart, nEnd,
aFltArr, bRemoveSoftHyphens);
else
- sCleanStr = lcl_CleanStr(*pNode->GetTxtNode(), nEnd, nStart,
+ sCleanStr = lcl_CleanStr(*pNode->GetTextNode(), nEnd, nStart,
aFltArr, bRemoveSoftHyphens);
SwScriptIterator* pScriptIter = 0;
@@ -488,7 +488,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
if ( nSearchScript == nCurrScript )
{
const LanguageType eCurrLang =
- pNode->GetTxtNode()->GetLang( bSrchForward ?
+ pNode->GetTextNode()->GetLang( bSrchForward ?
nStart :
nEnd );
@@ -496,7 +496,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
{
const lang::Locale aLocale(
g_pBreakIt->GetLocale( eCurrLang ) );
- rSTxt.SetLocale( rSearchOpt, aLocale );
+ rSText.SetLocale( rSearchOpt, aLocale );
eLastLang = eCurrLang;
}
}
@@ -505,7 +505,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
sal_Int32 nProxyStart = nStart;
sal_Int32 nProxyEnd = nEnd;
if( nSearchScript == nCurrScript &&
- (rSTxt.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
+ (rSText.*fnMove->fnSearch)( sCleanStr, &nProxyStart, &nProxyEnd, 0 ) &&
!(bZeroMatch = (nProxyStart == nProxyEnd)))
{
nStart = nProxyStart;
@@ -558,16 +558,16 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt,
if ( bFound )
return true;
- else if( ( bChkEmptyPara && !nStart && !nTxtLen ) || bChkParaEnd)
+ else if( ( bChkEmptyPara && !nStart && !nTextLen ) || bChkParaEnd)
{
*GetPoint() = *pPam->GetPoint();
- GetPoint()->nContent = bChkParaEnd ? nTxtLen : 0;
+ GetPoint()->nContent = bChkParaEnd ? nTextLen : 0;
SetMark();
/* FIXME: this condition does not work for !bSrchForward backward
* search, it probably never did. (pSttNd != &rNdIdx.GetNode())
* is never true in this case. */
if( (bSrchForward || pSttNd != &rNdIdx.GetNode()) &&
- Move( fnMoveForward, fnGoCntnt ) &&
+ Move( fnMoveForward, fnGoContent ) &&
(!bSrchForward || pSttNd != &GetPoint()->nNode.GetNode()) &&
1 == std::abs( (int)( GetPoint()->nNode.GetIndex() -
GetMark()->nNode.GetIndex()) ) )
@@ -586,12 +586,12 @@ struct SwFindParaText : public SwFindParas
{
const SearchOptions& rSearchOpt;
SwCursor& rCursor;
- utl::TextSearch aSTxt;
+ utl::TextSearch aSText;
bool bReplace;
bool bSearchInNotes;
SwFindParaText( const SearchOptions& rOpt, bool bSearchNotes, bool bRepl, SwCursor& rCrsr )
- : rSearchOpt( rOpt ), rCursor( rCrsr ), aSTxt( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
+ : rSearchOpt( rOpt ), rCursor( rCrsr ), aSText( rOpt ), bReplace( bRepl ), bSearchInNotes( bSearchNotes )
{}
virtual int Find( SwPaM* , SwMoveFn , const SwPaM*, bool bInReadOnly ) SAL_OVERRIDE;
virtual bool IsReplaceMode() const SAL_OVERRIDE;
@@ -608,7 +608,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
if( bInReadOnly && bReplace )
bInReadOnly = false;
- const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSTxt, fnMove, pRegion, bInReadOnly );
+ const bool bFnd = pCrsr->Find( rSearchOpt, bSearchInNotes, aSText, fnMove, pRegion, bInReadOnly );
if( bFnd && bReplace ) // replace string
{
@@ -631,7 +631,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
*pCrsr,
(pRepl.get()) ? *pRepl : rSearchOpt.replaceString,
bRegExp );
- rCursor.SaveTblBoxCntnt( pCrsr->GetPoint() );
+ rCursor.SaveTableBoxContent( pCrsr->GetPoint() );
if( bRegExp )
{
@@ -649,7 +649,7 @@ int SwFindParaText::Find( SwPaM* pCrsr, SwMoveFn fnMove,
bool bRet = ((fnMoveForward == fnMove) ? &GoNextPara : &GoPrevPara)
(*pCrsr, fnMove);
(void) bRet;
- assert(bRet); // if join failed, next node must be SwTxtNode
+ assert(bRet); // if join failed, next node must be SwTextNode
}
else
pCrsr->Start()->nContent = nSttCnt;
@@ -702,18 +702,18 @@ OUString *ReplaceBackReferences( const SearchOptions& rSearchOpt, SwPaM* pPam )
if( pPam && pPam->HasMark() &&
SearchAlgorithms_REGEXP == rSearchOpt.algorithmType )
{
- const SwCntntNode* pTxtNode = pPam->GetCntntNode( true );
- if( pTxtNode && pTxtNode->IsTxtNode() && pTxtNode == pPam->GetCntntNode( false ) )
+ const SwContentNode* pTextNode = pPam->GetContentNode( true );
+ if( pTextNode && pTextNode->IsTextNode() && pTextNode == pPam->GetContentNode( false ) )
{
- utl::TextSearch aSTxt( rSearchOpt );
- const OUString& rStr = pTxtNode->GetTxtNode()->GetTxt();
+ utl::TextSearch aSText( rSearchOpt );
+ const OUString& rStr = pTextNode->GetTextNode()->GetText();
sal_Int32 nStart = pPam->Start()->nContent.GetIndex();
sal_Int32 nEnd = pPam->End()->nContent.GetIndex();
SearchResult aResult;
- if( aSTxt.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
+ if( aSText.SearchForward( rStr, &nStart, &nEnd, &aResult ) )
{
OUString aReplaceStr( rSearchOpt.replaceString );
- aSTxt.ReplaceBackReferences( aReplaceStr, rStr, aResult );
+ aSText.ReplaceBackReferences( aReplaceStr, rStr, aResult );
pRet = new OUString( aReplaceStr );
}
}
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index 95794338782f..a1cbabf2f112 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -44,27 +44,27 @@
#include <xmloff/odffields.hxx>
// for the dump "MSC-" compiler
-inline sal_Int32 GetSttOrEnd( bool bCondition, const SwCntntNode& rNd )
+inline sal_Int32 GetSttOrEnd( bool bCondition, const SwContentNode& rNd )
{
return bCondition ? 0 : rNd.Len();
}
-SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rCntnt )
- : nNode( rNodeIndex ), nContent( rCntnt )
+SwPosition::SwPosition( const SwNodeIndex & rNodeIndex, const SwIndex & rContent )
+ : nNode( rNodeIndex ), nContent( rContent )
{
}
SwPosition::SwPosition( const SwNodeIndex & rNodeIndex )
- : nNode( rNodeIndex ), nContent( nNode.GetNode().GetCntntNode() )
+ : nNode( rNodeIndex ), nContent( nNode.GetNode().GetContentNode() )
{
}
SwPosition::SwPosition( const SwNode& rNode )
- : nNode( rNode ), nContent( nNode.GetNode().GetCntntNode() )
+ : nNode( rNode ), nContent( nNode.GetNode().GetContentNode() )
{
}
-SwPosition::SwPosition( SwCntntNode & rNode, const sal_Int32 nOffset )
+SwPosition::SwPosition( SwContentNode & rNode, const sal_Int32 nOffset )
: nNode( rNode ), nContent( &rNode, nOffset )
{
}
@@ -279,22 +279,22 @@ bool CheckNodesRange( const SwNodeIndex& rStt,
bool GoNext(SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
- if( pNd->IsCntntNode() )
- return static_cast<SwCntntNode*>(pNd)->GoNext( pIdx, nMode );
+ if( pNd->IsContentNode() )
+ return static_cast<SwContentNode*>(pNd)->GoNext( pIdx, nMode );
return false;
}
bool GoPrevious( SwNode* pNd, SwIndex * pIdx, sal_uInt16 nMode )
{
- if( pNd->IsCntntNode() )
- return static_cast<SwCntntNode*>(pNd)->GoPrevious( pIdx, nMode );
+ if( pNd->IsContentNode() )
+ return static_cast<SwContentNode*>(pNd)->GoPrevious( pIdx, nMode );
return false;
}
-SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
+SwContentNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
{
SwNodeIndex aIdx( *pIdx );
- SwCntntNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
+ SwContentNode* pNd = aIdx.GetNodes().GoNext( &aIdx );
if( pNd )
{
if( bChk && 1 != aIdx.GetIndex() - pIdx->GetIndex() &&
@@ -306,10 +306,10 @@ SwCntntNode* GoNextNds( SwNodeIndex* pIdx, bool bChk )
return pNd;
}
-SwCntntNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
+SwContentNode* GoPreviousNds( SwNodeIndex * pIdx, bool bChk )
{
SwNodeIndex aIdx( *pIdx );
- SwCntntNode* pNd = SwNodes::GoPrevious( &aIdx );
+ SwContentNode* pNd = SwNodes::GoPrevious( &aIdx );
if( pNd )
{
if( bChk && 1 != pIdx->GetIndex() - aIdx.GetIndex() &&
@@ -358,8 +358,8 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex& rPoint,
{
m_pPoint->nNode += nPointOffset;
}
- m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
- m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+ m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+ m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
}
SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
@@ -379,12 +379,12 @@ SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
{
m_pPoint->nNode += nPointOffset;
}
- m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 );
- m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 );
+ m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetContentNode(), 0 );
+ m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetContentNode(), 0 );
}
-SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
- const SwNodeIndex& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkContent,
+ const SwNodeIndex& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rMark )
, m_Bound2( rPoint )
@@ -392,12 +392,12 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, sal_Int32 nMarkCntnt,
, m_pMark( &m_Bound1 )
, m_bIsInFrontOfLabel( false )
{
- m_pPoint->nContent.Assign( rPoint.GetNode().GetCntntNode(), nPointCntnt);
- m_pMark ->nContent.Assign( rMark .GetNode().GetCntntNode(), nMarkCntnt );
+ m_pPoint->nContent.Assign( rPoint.GetNode().GetContentNode(), nPointContent);
+ m_pMark ->nContent.Assign( rMark .GetNode().GetContentNode(), nMarkContent );
}
-SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
- const SwNode& rPoint, sal_Int32 nPointCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkContent,
+ const SwNode& rPoint, sal_Int32 nPointContent, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rMark )
, m_Bound2( rPoint )
@@ -405,13 +405,13 @@ SwPaM::SwPaM( const SwNode& rMark, sal_Int32 nMarkCntnt,
, m_pMark( &m_Bound1 )
, m_bIsInFrontOfLabel( false )
{
- m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
- nPointCntnt);
- m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetCntntNode(),
- nMarkCntnt );
+ m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+ nPointContent);
+ m_pMark ->nContent.Assign( m_pMark ->nNode.GetNode().GetContentNode(),
+ nMarkContent );
}
-SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nContent, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rNode )
, m_Bound2( m_Bound1.nNode.GetNode().GetNodes() ) // default initialize
@@ -419,11 +419,11 @@ SwPaM::SwPaM( const SwNode& rNode, sal_Int32 nCntnt, SwPaM* pRing )
, m_pMark( &m_Bound1 )
, m_bIsInFrontOfLabel( false )
{
- m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetCntntNode(),
- nCntnt );
+ m_pPoint->nContent.Assign( m_pPoint->nNode.GetNode().GetContentNode(),
+ nContent );
}
-SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
+SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nContent, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rNodeIdx )
, m_Bound2( rNodeIdx.GetNode().GetNodes() ) // default initialize
@@ -431,7 +431,7 @@ SwPaM::SwPaM( const SwNodeIndex& rNodeIdx, sal_Int32 nCntnt, SwPaM* pRing )
, m_pMark( &m_Bound1 )
, m_bIsInFrontOfLabel( false )
{
- m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetCntntNode(), nCntnt );
+ m_pPoint->nContent.Assign( rNodeIdx.GetNode().GetContentNode(), nContent );
}
SwPaM::~SwPaM() {}
@@ -543,12 +543,12 @@ SwPaM & SwPaM::Normalize(bool bPointFirst)
/// return page number at cursor (for reader and page bound frames)
sal_uInt16 SwPaM::GetPageNum( bool bAtPoint, const Point* pLayPos )
{
- const SwCntntFrm* pCFrm;
+ const SwContentFrm* pCFrm;
const SwPageFrm *pPg;
- const SwCntntNode *pNd ;
+ const SwContentNode *pNd ;
const SwPosition* pPos = bAtPoint ? m_pPoint : m_pMark;
- if( 0 != ( pNd = pPos->nNode.GetNode().GetCntntNode() ) &&
+ if( 0 != ( pNd = pPos->nNode.GetNode().GetContentNode() ) &&
0 != ( pCFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), pLayPos, pPos, false )) &&
0 != ( pPg = pCFrm->FindPageFrm() ))
return pPg->GetPhyPageNum();
@@ -564,9 +564,9 @@ static const SwFrm* lcl_FindEditInReadonlyFrm( const SwFrm& rFrm )
const SwSectionFrm* pSectionFrm;
if( rFrm.IsInFly() &&
- (pFly = rFrm.FindFlyFrm())->GetFmt()->GetEditInReadonly().GetValue() &&
+ (pFly = rFrm.FindFlyFrm())->GetFormat()->GetEditInReadonly().GetValue() &&
pFly->Lower() &&
- !pFly->Lower()->IsNoTxtFrm() )
+ !pFly->Lower()->IsNoTextFrm() )
{
pRet = pFly;
}
@@ -585,8 +585,8 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
{
bool bRet = false;
- const SwCntntNode* pNd = GetPoint()->nNode.GetNode().GetCntntNode();
- const SwCntntFrm *pFrm = NULL;
+ const SwContentNode* pNd = GetPoint()->nNode.GetNode().GetContentNode();
+ const SwContentFrm *pFrm = NULL;
if ( pNd != NULL )
{
Point aTmpPt;
@@ -618,7 +618,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
&& HasMark()
&& GetPoint()->nNode != GetMark()->nNode )
{
- pNd = GetMark()->nNode.GetNode().GetCntntNode();
+ pNd = GetMark()->nNode.GetNode().GetContentNode();
pFrm = NULL;
if ( pNd != NULL )
{
@@ -668,20 +668,20 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
// If a protected section should be between nodes, then the
// selection needs to contain already x nodes.
- // (TxtNd, SectNd, TxtNd, EndNd, TxtNd )
+ // (TextNd, SectNd, TextNd, EndNd, TextNd )
if( nSttIdx + 3 < nEndIdx )
{
- const SwSectionFmts& rFmts = GetDoc()->GetSections();
- for( SwSectionFmts::size_type n = rFmts.size(); n; )
+ const SwSectionFormats& rFormats = GetDoc()->GetSections();
+ for( SwSectionFormats::size_type n = rFormats.size(); n; )
{
- const SwSectionFmt* pFmt = rFmts[ --n ];
- if( pFmt->GetProtect().IsCntntProtected() )
+ const SwSectionFormat* pFormat = rFormats[ --n ];
+ if( pFormat->GetProtect().IsContentProtected() )
{
- const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
- OSL_ENSURE( rCntnt.GetCntntIdx(), "where is the SectionNode?" );
- sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+ const SwFormatContent& rContent = pFormat->GetContent(false);
+ OSL_ENSURE( rContent.GetContentIdx(), "where is the SectionNode?" );
+ sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
if( nSttIdx <= nIdx && nEndIdx >= nIdx &&
- rCntnt.GetCntntIdx()->GetNode().GetNodes().IsDocNodes() )
+ rContent.GetContentIdx()->GetNode().GetNodes().IsDocNodes() )
{
bRet = true;
break;
@@ -729,7 +729,7 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
// the 'comment anchor', unless the cursor is inside the annotation.
if (!bRet && !bAnnotationMode)
{
- if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTxtNode() && GetPoint()->nContent.GetIndex() > 0)
+ if (!pA && GetPoint() && GetPoint()->nNode.GetNode().IsTextNode() && GetPoint()->nContent.GetIndex() > 0)
{
// getFieldmarkFor() searches for >= start and < end, so check for
// the previous character, to also get the fieldmark, if we're
@@ -749,25 +749,25 @@ bool SwPaM::HasReadonlySel( bool bFormView, bool bAnnotationMode ) const
/// left or the next is out of the area, then a null-pointer is returned.
/// @param rbFirst If <true> than first time request. If so than the position of
/// the PaM must not be changed!
-SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
+SwContentNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
bool bInReadOnly )
{
- SwCntntNode * pNd = 0;
- SwCntntFrm* pFrm;
+ SwContentNode * pNd = 0;
+ SwContentFrm* pFrm;
if( ((*rPam.GetPoint()).*fnMove->fnCmpOp)( *rPam.GetMark() ) ||
( *rPam.GetPoint() == *rPam.GetMark() && rbFirst ) )
{
if( rbFirst )
{
rbFirst = false;
- pNd = rPam.GetCntntNode();
+ pNd = rPam.GetContentNode();
if( pNd )
{
if(
(
0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
( !bInReadOnly && pFrm->IsProtected() ) ||
- (pFrm->IsTxtFrm() && static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow())
+ (pFrm->IsTextFrm() && static_cast<SwTextFrm*>(pFrm)->IsHiddenNow())
) ||
( !bInReadOnly && pNd->FindSectionNode() &&
pNd->FindSectionNode()->GetSection().IsProtect()
@@ -779,13 +779,13 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
}
}
- if( !pNd ) // is the cursor not on a CntntNode?
+ if( !pNd ) // is the cursor not on a ContentNode?
{
SwPosition aPos( *rPam.GetPoint() );
bool bSrchForward = fnMove == fnMoveForward;
SwNodes& rNodes = aPos.nNode.GetNodes();
- // go to next/previous CntntNode
+ // go to next/previous ContentNode
while( true )
{
pNd = bSrchForward
@@ -800,8 +800,8 @@ SwCntntNode* GetNode( SwPaM & rPam, bool& rbFirst, SwMoveFn fnMove,
// only in AutoTextSection can be nodes that are hidden
if( 0 == ( pFrm = pNd->getLayoutFrm( pNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() ) ) ||
( !bInReadOnly && pFrm->IsProtected() ) ||
- ( pFrm->IsTxtFrm() &&
- static_cast<SwTxtFrm*>(pFrm)->IsHiddenNow() ) )
+ ( pFrm->IsTextFrm() &&
+ static_cast<SwTextFrm*>(pFrm)->IsHiddenNow() ) )
{
pNd = 0;
continue;
@@ -824,7 +824,7 @@ void GoStartDoc( SwPosition * pPos )
SwNodes& rNodes = pPos->nNode.GetNodes();
pPos->nNode = *rNodes.GetEndOfContent().StartOfSectionNode();
// we always need to find a ContentNode!
- SwCntntNode* pCNd = rNodes.GoNext( &pPos->nNode );
+ SwContentNode* pCNd = rNodes.GoNext( &pPos->nNode );
if( pCNd )
pCNd->MakeStartIndex( &pPos->nContent );
}
@@ -833,7 +833,7 @@ void GoEndDoc( SwPosition * pPos )
{
SwNodes& rNodes = pPos->nNode.GetNodes();
pPos->nNode = rNodes.GetEndOfContent();
- SwCntntNode* pCNd = GoPreviousNds( &pPos->nNode, true );
+ SwContentNode* pCNd = GoPreviousNds( &pPos->nNode, true );
if( pCNd )
pCNd->MakeEndIndex( &pPos->nContent );
}
@@ -847,8 +847,8 @@ void GoStartSection( SwPosition * pPos )
nLevel--;
do { SwNodes::GoStartOfSection( &pPos->nNode ); } while( nLevel-- );
- // already on a CntntNode
- pPos->nNode.GetNode().GetCntntNode()->MakeStartIndex( &pPos->nContent );
+ // already on a ContentNode
+ pPos->nNode.GetNode().GetContentNode()->MakeStartIndex( &pPos->nContent );
}
/// go to the end of the current base section
@@ -861,9 +861,9 @@ void GoEndSection( SwPosition * pPos )
nLevel--;
do { SwNodes::GoEndOfSection( &pPos->nNode ); } while( nLevel-- );
- // now on a EndNode, thus to the previous CntntNode
+ // now on a EndNode, thus to the previous ContentNode
if( GoPreviousNds( &pPos->nNode, true ) )
- pPos->nNode.GetNode().GetCntntNode()->MakeEndIndex( &pPos->nContent );
+ pPos->nNode.GetNode().GetContentNode()->MakeEndIndex( &pPos->nContent );
}
bool GoInDoc( SwPaM & rPam, SwMoveFn fnMove )
@@ -880,14 +880,14 @@ bool GoInSection( SwPaM & rPam, SwMoveFn fnMove )
bool GoInNode( SwPaM & rPam, SwMoveFn fnMove )
{
- SwCntntNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
+ SwContentNode *pNd = (*fnMove->fnNds)( &rPam.GetPoint()->nNode, true );
if( pNd )
rPam.GetPoint()->nContent.Assign( pNd,
::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
return pNd;
}
-bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContent( SwPaM & rPam, SwMoveFn fnMove )
{
if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
&rPam.GetPoint()->nContent, CRSR_SKIP_CHARS ))
@@ -895,7 +895,7 @@ bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove )
return GoInNode( rPam, fnMove );
}
-bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCells( SwPaM & rPam, SwMoveFn fnMove )
{
if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
&rPam.GetPoint()->nContent, CRSR_SKIP_CELLS ))
@@ -903,7 +903,7 @@ bool GoInCntntCells( SwPaM & rPam, SwMoveFn fnMove )
return GoInNode( rPam, fnMove );
}
-bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
{
if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
&rPam.GetPoint()->nContent, CRSR_SKIP_CHARS | CRSR_SKIP_HIDDEN ) )
@@ -911,7 +911,7 @@ bool GoInCntntSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
return GoInNode( rPam, fnMove );
}
-bool GoInCntntCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
+bool GoInContentCellsSkipHidden( SwPaM & rPam, SwMoveFn fnMove )
{
if( (*fnMove->fnNd)( &rPam.GetPoint()->nNode.GetNode(),
&rPam.GetPoint()->nContent, CRSR_SKIP_CELLS | CRSR_SKIP_HIDDEN ) )
@@ -923,9 +923,9 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveBackward, fnGoNode ) )
{
- // always on a CntntNode
+ // always on a ContentNode
SwPosition& rPos = *rPam.GetPoint();
- SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
rPos.nContent.Assign( pNd,
::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
return true;
@@ -936,7 +936,7 @@ bool GoPrevPara( SwPaM & rPam, SwPosPara aPosPara )
bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
{
SwPosition& rPos = *rPam.GetPoint();
- SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
if( pNd )
{
const sal_Int32 nOld = rPos.nContent.GetIndex();
@@ -948,7 +948,7 @@ bool GoCurrPara( SwPaM & rPam, SwPosPara aPosPara )
return true;
}
}
- // move node to next/previous CntntNode
+ // move node to next/previous ContentNode
if( ( aPosPara==fnParaStart && 0 != ( pNd =
GoPreviousNds( &rPos.nNode, true ))) ||
( aPosPara==fnParaEnd && 0 != ( pNd =
@@ -965,9 +965,9 @@ bool GoNextPara( SwPaM & rPam, SwPosPara aPosPara )
{
if( rPam.Move( fnMoveForward, fnGoNode ) )
{
- // always on a CntntNode
+ // always on a ContentNode
SwPosition& rPos = *rPam.GetPoint();
- SwCntntNode * pNd = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode * pNd = rPos.nNode.GetNode().GetContentNode();
rPos.nContent.Assign( pNd,
::GetSttOrEnd( aPosPara == fnMoveForward, *pNd ) );
return true;
@@ -980,8 +980,8 @@ bool GoCurrSection( SwPaM & rPam, SwMoveFn fnMove )
SwPosition& rPos = *rPam.GetPoint();
SwPosition aSavePos( rPos ); // position for comparison
(fnMove->fnSection)( &rPos.nNode );
- SwCntntNode *pNd;
- if( 0 == ( pNd = rPos.nNode.GetNode().GetCntntNode()) &&
+ SwContentNode *pNd;
+ if( 0 == ( pNd = rPos.nNode.GetNode().GetContentNode()) &&
0 == ( pNd = (*fnMove->fnNds)( &rPos.nNode, true )) )
{
rPos = aSavePos; // do not change cursor
@@ -999,14 +999,14 @@ bool GoNextSection( SwPaM & rPam, SwMoveFn fnMove )
SwPosition aSavePos( rPos ); // position for comparison
SwNodes::GoEndOfSection( &rPos.nNode );
- // no other CntntNode existent?
- if( !GoInCntnt( rPam, fnMoveForward ) )
+ // no other ContentNode existent?
+ if( !GoInContent( rPam, fnMoveForward ) )
{
rPos = aSavePos; // do not change cursor
return false;
}
(fnMove->fnSection)( &rPos.nNode );
- SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
rPos.nContent.Assign( pNd,
::GetSttOrEnd( fnMove == fnMoveForward, *pNd ) );
return true;
@@ -1018,20 +1018,20 @@ bool GoPrevSection( SwPaM & rPam, SwMoveFn fnMove )
SwPosition aSavePos( rPos ); // position for comparison
SwNodes::GoStartOfSection( &rPos.nNode );
- // no further CntntNode existent?
- if( !GoInCntnt( rPam, fnMoveBackward ))
+ // no further ContentNode existent?
+ if( !GoInContent( rPam, fnMoveBackward ))
{
rPos = aSavePos; // do not change cursor
return false;
}
(fnMove->fnSection)( &rPos.nNode );
- SwCntntNode *pNd = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode *pNd = rPos.nNode.GetNode().GetContentNode();
rPos.nContent.Assign( pNd,
::GetSttOrEnd( fnMove == fnMoveForward, *pNd ));
return true;
}
-OUString SwPaM::GetTxt() const
+OUString SwPaM::GetText() const
{
OUString aResult;
@@ -1044,11 +1044,11 @@ OUString SwPaM::GetTxt() const
for (;;)
{
const bool bIsEndNode = aNodeIndex == End()->nNode;
- SwTxtNode * pTxtNode = aNodeIndex.GetNode().GetTxtNode();
+ SwTextNode * pTextNode = aNodeIndex.GetNode().GetTextNode();
- if (pTxtNode != NULL)
+ if (pTextNode != NULL)
{
- const OUString aTmpStr = pTxtNode->GetTxt();
+ const OUString aTmpStr = pTextNode->GetText();
if (bIsStartNode || bIsEndNode)
{
@@ -1083,13 +1083,13 @@ OUString SwPaM::GetTxt() const
void SwPaM::InvalidatePaM()
{
const SwNode &_pNd = this->GetNode();
- const SwTxtNode *_pTxtNd = _pNd.GetTxtNode();
- if (_pTxtNd != NULL)
+ const SwTextNode *_pTextNd = _pNd.GetTextNode();
+ if (_pTextNd != NULL)
{
// pretend that the PaM marks inserted text to recalc the portion...
- SwInsTxt aHint( Start()->nContent.GetIndex(),
+ SwInsText aHint( Start()->nContent.GetIndex(),
End()->nContent.GetIndex() - Start()->nContent.GetIndex() + 1 );
- SwModify *_pModify=(SwModify*)_pTxtNd;
+ SwModify *_pModify=(SwModify*)_pTextNd;
_pModify->ModifyNotification( 0, &aHint);
}
}
diff --git a/sw/source/core/crsr/paminit.cxx b/sw/source/core/crsr/paminit.cxx
index 4069a1225ce9..479fa12745d4 100644
--- a/sw/source/core/crsr/paminit.cxx
+++ b/sw/source/core/crsr/paminit.cxx
@@ -28,7 +28,7 @@ static SwMoveFnCollection aFwrd = {
/* fnDoc */ &GoEndDoc,
/* fnSections */ &GoEndSection,
/* fnCmpOp */ &SwPosition::operator<,
- /* fnGetHint */ &GetFrwrdTxtHint,
+ /* fnGetHint */ &GetFrwrdTextHint,
/* fnSearch */ &utl::TextSearch::SearchForward,
/* fnSection */ &SwNodes::GoStartOfSection
};
@@ -39,7 +39,7 @@ static SwMoveFnCollection aBwrd = {
/* fnDoc */ &GoStartDoc,
/* fnSections */ &GoStartSection,
/* fnCmpOp */ &SwPosition::operator>,
- /* fnGetHint */ &GetBkwrdTxtHint,
+ /* fnGetHint */ &GetBkwrdTextHint,
/* fnSearch */ &utl::TextSearch::SearchBackward,
/* fnSection */ &SwNodes::GoEndOfSection
};
@@ -47,10 +47,10 @@ static SwMoveFnCollection aBwrd = {
SwGoInDoc fnGoDoc = &GoInDoc;
SwGoInDoc fnGoSection = &GoInSection;
SwGoInDoc fnGoNode = &GoInNode;
-SwGoInDoc fnGoCntnt = &GoInCntnt;
-SwGoInDoc fnGoCntntCells = &GoInCntntCells;
-SwGoInDoc fnGoCntntSkipHidden = &GoInCntntSkipHidden;
-SwGoInDoc fnGoCntntCellsSkipHidden = &GoInCntntCellsSkipHidden;
+SwGoInDoc fnGoContent = &GoInContent;
+SwGoInDoc fnGoContentCells = &GoInContentCells;
+SwGoInDoc fnGoContentSkipHidden = &GoInContentSkipHidden;
+SwGoInDoc fnGoContentCellsSkipHidden = &GoInContentCellsSkipHidden;
SwWhichPara fnParaPrev = &GoPrevPara;
SwWhichPara fnParaCurr = &GoCurrPara;
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 1df0894774ed..9baa90101297 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -187,7 +187,7 @@ _SwCursor_SavePos* SwCursor::CreateNewSavePos() const
}
/// determine if point is outside of the node-array's content area
-bool SwCursor::IsNoCntnt() const
+bool SwCursor::IsNoContent() const
{
return GetPoint()->nNode.GetIndex() <
GetDoc()->GetNodes().GetEndOfExtras().GetIndex();
@@ -210,7 +210,7 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
if( !CheckNodesRange( aOldPos, GetPoint()->nNode, true ))
{
GetPoint()->nNode = aOldPos;
- GetPoint()->nContent.Assign( GetCntntNode(), GetSavePos()->nCntnt );
+ GetPoint()->nContent.Assign( GetContentNode(), GetSavePos()->nContent );
return true;
}
}
@@ -219,12 +219,12 @@ bool SwTableCursor::IsSelOvrCheck(int eFlags)
namespace
{
- const SwTxtAttr* InputFieldAtPos(SwPosition *pPos)
+ const SwTextAttr* InputFieldAtPos(SwPosition *pPos)
{
- SwTxtNode* pTxtNd = pPos->nNode.GetNode().GetTxtNode();
- if (!pTxtNd)
+ SwTextNode* pTextNd = pPos->nNode.GetNode().GetTextNode();
+ if (!pTextNd)
return NULL;
- return pTxtNd->GetTxtAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTxtNode::PARENT);
+ return pTextNd->GetTextAttrAt(pPos->nContent.GetIndex(), RES_TXTATR_INPUTFIELD, SwTextNode::PARENT);
}
}
@@ -261,9 +261,9 @@ bool SwCursor::IsSelOvr( int eFlags )
// set cursor to new position:
SwNodeIndex aIdx( rPtIdx );
- sal_Int32 nCntntPos = m_pSavePos->nCntnt;
+ sal_Int32 nContentPos = m_pSavePos->nContent;
bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
- SwCntntNode* pCNd = bGoNxt
+ SwContentNode* pCNd = bGoNxt
? rNds.GoNextSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections)
: SwNodes::GoPrevSection( &rPtIdx, bSkipOverHiddenSections, bSkipOverProtectSections);
if( !pCNd && ( nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION & eFlags ))
@@ -279,12 +279,12 @@ bool SwCursor::IsSelOvr( int eFlags )
if( !bValidNodesRange )
{
rPtIdx = m_pSavePos->nNode;
- if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+ if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
{
bIsValidPos = false;
- nCntntPos = 0;
+ nContentPos = 0;
rPtIdx = aIdx;
- if( 0 == ( pCNd = rPtIdx.GetNode().GetCntntNode() ) )
+ if( 0 == ( pCNd = rPtIdx.GetNode().GetContentNode() ) )
{
// then to the beginning of the document
rPtIdx = rNds.GetEndOfExtras();
@@ -294,7 +294,7 @@ bool SwCursor::IsSelOvr( int eFlags )
}
// register ContentIndex:
- const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nCntntPos;
+ const sal_Int32 nTmpPos = bIsValidPos ? (bGoNxt ? 0 : pCNd->Len()) : nContentPos;
GetPoint()->nContent.Assign( pCNd, nTmpPos );
if( !bIsValidPos || !bValidNodesRange ||
IsInProtectTable( true ) )
@@ -313,20 +313,20 @@ bool SwCursor::IsSelOvr( int eFlags )
nEndIdx = nTmp;
}
- const SwSectionFmts& rFmts = pDoc->GetSections();
- for( SwSectionFmts::size_type n = 0; n < rFmts.size(); ++n )
+ const SwSectionFormats& rFormats = pDoc->GetSections();
+ for( SwSectionFormats::size_type n = 0; n < rFormats.size(); ++n )
{
- const SwSectionFmt* pFmt = rFmts[n];
- const SvxProtectItem& rProtect = pFmt->GetProtect();
- if( rProtect.IsCntntProtected() )
+ const SwSectionFormat* pFormat = rFormats[n];
+ const SvxProtectItem& rProtect = pFormat->GetProtect();
+ if( rProtect.IsContentProtected() )
{
- const SwFmtCntnt& rCntnt = pFmt->GetCntnt(false);
- OSL_ENSURE( rCntnt.GetCntntIdx(), "No SectionNode?" );
- sal_uLong nIdx = rCntnt.GetCntntIdx()->GetIndex();
+ const SwFormatContent& rContent = pFormat->GetContent(false);
+ OSL_ENSURE( rContent.GetContentIdx(), "No SectionNode?" );
+ sal_uLong nIdx = rContent.GetContentIdx()->GetIndex();
if( nSttIdx <= nIdx && nEndIdx >= nIdx )
{
// if it is no linked section then we cannot select it
- const SwSection& rSect = *pFmt->GetSection();
+ const SwSection& rSect = *pFormat->GetSection();
if( CONTENT_SECTION == rSect.GetType() )
{
RestoreSavePos();
@@ -339,9 +339,9 @@ bool SwCursor::IsSelOvr( int eFlags )
}
const SwNode* pNd = &GetPoint()->nNode.GetNode();
- if( pNd->IsCntntNode() && !dynamic_cast<SwUnoCrsr*>(this) )
+ if( pNd->IsContentNode() && !dynamic_cast<SwUnoCrsr*>(this) )
{
- const SwCntntFrm* pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+ const SwContentFrm* pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
if ( (nsSwCursorSelOverFlags::SELOVER_CHANGEPOS & eFlags) //allowed to change position if it's a bad one
&& pFrm && pFrm->IsValid() && !pFrm->Frm().Height() //a bad zero height position
&& !InputFieldAtPos(GetPoint()) ) //unless it's a (vertical) input field
@@ -349,7 +349,7 @@ bool SwCursor::IsSelOvr( int eFlags )
// skip to the next/prev valid paragraph with a layout
SwNodeIndex& rPtIdx = GetPoint()->nNode;
bool bGoNxt = m_pSavePos->nNode < rPtIdx.GetIndex();
- while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextCntntFrm() : pFrm->GetPrevCntntFrm() ))
+ while( 0 != ( pFrm = ( bGoNxt ? pFrm->GetNextContentFrm() : pFrm->GetPrevContentFrm() ))
&& 0 == pFrm->Frm().Height() )
;
@@ -358,18 +358,18 @@ bool SwCursor::IsSelOvr( int eFlags )
if( !pFrm )
{
bGoNxt = !bGoNxt;
- pFrm = static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
+ pFrm = static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
while ( pFrm && 0 == pFrm->Frm().Height() )
{
- pFrm = bGoNxt ? pFrm->GetNextCntntFrm()
- : pFrm->GetPrevCntntFrm();
+ pFrm = bGoNxt ? pFrm->GetNextContentFrm()
+ : pFrm->GetPrevContentFrm();
}
}
- SwCntntNode* pCNd = (pFrm != NULL) ? const_cast<SwCntntNode*>(pFrm->GetNode()) : NULL;
+ SwContentNode* pCNd = (pFrm != NULL) ? const_cast<SwContentNode*>(pFrm->GetNode()) : NULL;
if ( pCNd != NULL )
{
- // set this CntntNode as new position
+ // set this ContentNode as new position
rPtIdx = *pCNd;
// assign corresponding ContentIndex
@@ -377,7 +377,7 @@ bool SwCursor::IsSelOvr( int eFlags )
GetPoint()->nContent.Assign( pCNd, nTmpPos );
if (rPtIdx.GetIndex() == m_pSavePos->nNode
- && nTmpPos == m_pSavePos->nCntnt)
+ && nTmpPos == m_pSavePos->nContent)
{
// new position equals saved one
// --> trigger restore of saved pos by setting <pFrm> to NULL - see below
@@ -420,8 +420,8 @@ bool SwCursor::IsSelOvr( int eFlags )
return true; // we need a frame
}
- if( (pNd = &GetMark()->nNode.GetNode())->IsCntntNode()
- && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
+ if( (pNd = &GetMark()->nNode.GetNode())->IsContentNode()
+ && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() )
&& !dynamic_cast<SwUnoCrsr*>(this) )
{
DeleteMark();
@@ -431,10 +431,10 @@ bool SwCursor::IsSelOvr( int eFlags )
// ensure that selection is only inside an InputField or contains the InputField completely
{
- const SwTxtAttr* pInputFldTxtAttrAtPoint = InputFieldAtPos(GetPoint());
- const SwTxtAttr* pInputFldTxtAttrAtMark = InputFieldAtPos(GetMark());
+ const SwTextAttr* pInputFieldTextAttrAtPoint = InputFieldAtPos(GetPoint());
+ const SwTextAttr* pInputFieldTextAttrAtMark = InputFieldAtPos(GetMark());
- if ( pInputFldTxtAttrAtPoint != pInputFldTxtAttrAtMark )
+ if ( pInputFieldTextAttrAtPoint != pInputFieldTextAttrAtMark )
{
const sal_uLong nRefNodeIdx =
( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
@@ -442,27 +442,27 @@ bool SwCursor::IsSelOvr( int eFlags )
: GetMark()->nNode.GetIndex();
const sal_Int32 nRefContentIdx =
( nsSwCursorSelOverFlags::SELOVER_TOGGLE & eFlags )
- ? m_pSavePos->nCntnt
+ ? m_pSavePos->nContent
: GetMark()->nContent.GetIndex();
const bool bIsForwardSelection =
nRefNodeIdx < GetPoint()->nNode.GetIndex()
|| ( nRefNodeIdx == GetPoint()->nNode.GetIndex()
&& nRefContentIdx < GetPoint()->nContent.GetIndex() );
- if ( pInputFldTxtAttrAtPoint != NULL )
+ if ( pInputFieldTextAttrAtPoint != NULL )
{
const sal_Int32 nNewPointPos =
- bIsForwardSelection ? *(pInputFldTxtAttrAtPoint->End()) : pInputFldTxtAttrAtPoint->GetStart();
- SwTxtNode* pTxtNdAtPoint = GetPoint()->nNode.GetNode().GetTxtNode();
- GetPoint()->nContent.Assign( pTxtNdAtPoint, nNewPointPos );
+ bIsForwardSelection ? *(pInputFieldTextAttrAtPoint->End()) : pInputFieldTextAttrAtPoint->GetStart();
+ SwTextNode* pTextNdAtPoint = GetPoint()->nNode.GetNode().GetTextNode();
+ GetPoint()->nContent.Assign( pTextNdAtPoint, nNewPointPos );
}
- if ( pInputFldTxtAttrAtMark != NULL )
+ if ( pInputFieldTextAttrAtMark != NULL )
{
const sal_Int32 nNewMarkPos =
- bIsForwardSelection ? pInputFldTxtAttrAtMark->GetStart() : *(pInputFldTxtAttrAtMark->End());
- SwTxtNode* pTxtNdAtMark = GetMark()->nNode.GetNode().GetTxtNode();
- GetMark()->nContent.Assign( pTxtNdAtMark, nNewMarkPos );
+ bIsForwardSelection ? pInputFieldTextAttrAtMark->GetStart() : *(pInputFieldTextAttrAtMark->End());
+ SwTextNode* pTextNdAtMark = GetMark()->nNode.GetNode().GetTextNode();
+ GetMark()->nContent.Assign( pTextNdAtMark, nNewMarkPos );
}
}
}
@@ -492,12 +492,12 @@ bool SwCursor::IsSelOvr( int eFlags )
do { // loop for table after table
sal_uLong nSEIdx = pPtNd->EndOfSectionIndex();
- sal_uLong nSttEndTbl = nSEIdx + 1;
+ sal_uLong nSttEndTable = nSEIdx + 1;
if( bSelTop )
- nSttEndTbl = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
+ nSttEndTable = rNds[ nSEIdx ]->StartOfSectionIndex() - 1;
- GetPoint()->nNode = nSttEndTbl;
+ GetPoint()->nNode = nSttEndTable;
const SwNode* pMyNd = &(GetNode());
if( pMyNd->IsSectionNode() || ( pMyNd->IsEndNode() &&
@@ -516,7 +516,7 @@ bool SwCursor::IsSelOvr( int eFlags )
}
// we permit these
- if( pMyNd->IsCntntNode() &&
+ if( pMyNd->IsContentNode() &&
::CheckNodesRange( GetMark()->nNode,
GetPoint()->nNode, true ))
{
@@ -526,7 +526,7 @@ bool SwCursor::IsSelOvr( int eFlags )
pMyNd = pOuterTableNd;
else
{
- SwCntntNode* pCNd = const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pMyNd));
+ SwContentNode* pCNd = const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pMyNd));
GetPoint()->nContent.Assign( pCNd, bSelTop ? pCNd->Len() : 0 );
return false;
}
@@ -545,7 +545,7 @@ bool SwCursor::IsSelOvr( int eFlags )
bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
{
- SwCntntNode* pCNd = GetCntntNode();
+ SwContentNode* pCNd = GetContentNode();
if( !pCNd )
return false;
@@ -562,7 +562,7 @@ bool SwCursor::IsInProtectTable( bool bMove, bool bChgCrsr )
bool bInCoveredCell = false;
const SwStartNode* pTmpSttNode = pCNd->FindTableBoxStartNode();
OSL_ENSURE( pTmpSttNode, "In table, therefore I expect to get a SwTableBoxStartNode" );
- const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTblBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
+ const SwTableBox* pBox = pTmpSttNode ? pTableNode->GetTable().GetTableBox( pTmpSttNode->GetIndex() ) : 0; //Robust #151355
if ( pBox && pBox->getRowSpan() < 1 ) // Robust #151270
bInCoveredCell = true;
@@ -602,7 +602,7 @@ GoNextCell:
if( !aCellStt.GetNode().IsStartNode() )
break;
++aCellStt;
- if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+ if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
pCNd = aCellStt.GetNodes().GoNext( &aCellStt );
if( !( bProt = pCNd->IsProtect() ))
break;
@@ -613,7 +613,7 @@ SetNextCrsr:
if( !bProt ) // found free cell
{
GetPoint()->nNode = aCellStt;
- SwCntntNode* pTmpCNd = GetCntntNode();
+ SwContentNode* pTmpCNd = GetContentNode();
if( pTmpCNd )
{
GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -651,7 +651,7 @@ GoPrevCell:
if( !( pNd = &aCellStt.GetNode())->IsEndNode() )
break;
aCellStt.Assign( *pNd->StartOfSectionNode(), +1 );
- if( 0 == ( pCNd = aCellStt.GetNode().GetCntntNode() ))
+ if( 0 == ( pCNd = aCellStt.GetNode().GetContentNode() ))
pCNd = pNd->GetNodes().GoNext( &aCellStt );
if( !( bProt = pCNd->IsProtect() ))
break;
@@ -662,7 +662,7 @@ SetPrevCrsr:
if( !bProt ) // found free cell
{
GetPoint()->nNode = aCellStt;
- SwCntntNode* pTmpCNd = GetCntntNode();
+ SwContentNode* pTmpCNd = GetContentNode();
if( pTmpCNd )
{
GetPoint()->nContent.Assign( pTmpCNd, 0 );
@@ -695,7 +695,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
const SwPosition* pPos = bPoint ? GetPoint() : GetMark();
const SwNode* pNd = &pPos->nNode.GetNode();
- if( pNd->IsCntntNode() && !static_cast<const SwCntntNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
+ if( pNd->IsContentNode() && !static_cast<const SwContentNode*>(pNd)->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() ) &&
!dynamic_cast<const SwUnoCrsr*>(this) )
{
return false;
@@ -717,7 +717,7 @@ bool SwCursor::IsAtValidPos( bool bPoint ) const
return true;
}
-void SwCursor::SaveTblBoxCntnt( const SwPosition* ) {}
+void SwCursor::SaveTableBoxContent( const SwPosition* ) {}
/// set range for search in document
SwMoveFnCollection* SwCursor::MakeFindRange( SwDocPositions nStart,
@@ -867,7 +867,7 @@ static bool lcl_MakeSelFwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwNodes& rNds = rPam.GetDoc()->GetNodes();
rPam.DeleteMark();
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
if( !bFirst )
{
rPam.GetPoint()->nNode = rSttNd;
@@ -899,7 +899,7 @@ static bool lcl_MakeSelBkwrd( const SwNode& rSttNd, const SwNode& rEndNd,
SwNodes& rNds = rPam.GetDoc()->GetNodes();
rPam.DeleteMark();
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
if( !bFirst )
{
rPam.GetPoint()->nNode = rSttNd;
@@ -1081,7 +1081,7 @@ sal_uLong SwCursor::FindAll( SwFindParas& rParas,
void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const
{
bool bIsStart = true;
- SwCntntNode* pCNd = 0;
+ SwContentNode* pCNd = 0;
SwNodes& rNds = GetDoc()->GetNodes();
switch( ePos )
@@ -1162,13 +1162,13 @@ bool SwCursor::SelectWord( SwViewShell* pViewShell, const Point* pPt )
bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
bRet = g_pBreakIt->GetBreakIter()->isBeginWord(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos )),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos )),
nWordType );
}
return bRet;
@@ -1177,13 +1177,13 @@ bool SwCursor::IsStartWordWT( sal_Int16 nWordType ) const
bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
bRet = g_pBreakIt->GetBreakIter()->isEndWord(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType );
}
@@ -1193,13 +1193,13 @@ bool SwCursor::IsEndWordWT( sal_Int16 nWordType ) const
bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
const sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
Boundary aBoundary = g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType,
true );
@@ -1209,7 +1209,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
if(bRet)
{
const CharClass& rCC = GetAppCharClass();
- bRet = rCC.isLetterNumeric( pTxtNd->GetTxt(), aBoundary.startPos );
+ bRet = rCC.isLetterNumeric( pTextNd->GetText(), aBoundary.startPos );
}
}
return bRet;
@@ -1218,7 +1218,7 @@ bool SwCursor::IsInWordWT( sal_Int16 nWordType ) const
bool SwCursor::IsStartEndSentence( bool bEnd ) const
{
bool bRet = bEnd ?
- GetCntntNode() && GetPoint()->nContent == GetCntntNode()->Len() :
+ GetContentNode() && GetPoint()->nContent == GetContentNode()->Len() :
GetPoint()->nContent.GetIndex() == 0;
if( !bRet )
@@ -1234,18 +1234,18 @@ bool SwCursor::IsStartEndSentence( bool bEnd ) const
bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
SwCrsrSaveState aSave( *this );
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType,
false ).startPos;
- if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+ if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
{
GetPoint()->nContent = nPtPos;
if( !IsSelOvr() )
@@ -1258,18 +1258,18 @@ bool SwCursor::GoStartWordWT( sal_Int16 nWordType )
bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
SwCrsrSaveState aSave( *this );
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
nPtPos = g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType,
true ).endPos;
- if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0 &&
+ if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0 &&
GetPoint()->nContent.GetIndex() != nPtPos )
{
GetPoint()->nContent = nPtPos;
@@ -1283,18 +1283,18 @@ bool SwCursor::GoEndWordWT( sal_Int16 nWordType )
bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
SwCrsrSaveState aSave( *this );
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
nPtPos = g_pBreakIt->GetBreakIter()->nextWord(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
nWordType ).startPos;
- if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+ if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
{
GetPoint()->nContent = nPtPos;
if( !IsSelOvr() )
@@ -1307,8 +1307,8 @@ bool SwCursor::GoNextWordWT( sal_Int16 nWordType )
bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
SwCrsrSaveState aSave( *this );
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1317,11 +1317,11 @@ bool SwCursor::GoPrevWordWT( sal_Int16 nWordType )
if( nPtPos )
--nPtPos;
nPtPos = g_pBreakIt->GetBreakIter()->previousWord(
- pTxtNd->GetTxt(), nPtStart,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos, 1 ) ),
+ pTextNd->GetText(), nPtStart,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos, 1 ) ),
nWordType ).startPos;
- if (nPtPos < pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+ if (nPtPos < pTextNd->GetText().getLength() && nPtPos >= 0)
{
GetPoint()->nContent = nPtPos;
if( !IsSelOvr() )
@@ -1346,8 +1346,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
pLayout->GetCrsrOfst( GetPoint(), aPt );
}
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
// Should we select the whole fieldmark?
const IDocumentMarkAccess* pMarksAccess = GetDoc()->getIDocumentMarkAccess( );
@@ -1374,8 +1374,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
{
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
Boundary aBndry( g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType,
bForward ));
@@ -1384,8 +1384,8 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
// nPtPos is the end of the paragraph, select the last word then.
--nPtPos;
aBndry = Boundary( g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
nWordType,
bForward ));
}
@@ -1424,28 +1424,28 @@ bool SwCursor::SelectWordWT( SwViewShell* pViewShell, sal_Int16 nWordType, const
return bRet;
}
-static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
+static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd )
{
OUString aRes;
- if (pTxtNd)
+ if (pTextNd)
{
//mask deleted redlines
- OUString sNodeText(pTxtNd->GetTxt());
- const SwDoc& rDoc = *pTxtNd->GetDoc();
+ OUString sNodeText(pTextNd->GetText());
+ const SwDoc& rDoc = *pTextNd->GetDoc();
const bool nShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
if ( nShowChg )
{
- sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTxtNd, USHRT_MAX );
- for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size(); nAct++ )
+ sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX );
+ for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
{
- const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nAct ];
- if ( pRed->Start()->nNode > pTxtNd->GetIndex() )
+ const SwRangeRedline* pRed = rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nAct ];
+ if ( pRed->Start()->nNode > pTextNd->GetIndex() )
break;
if( nsRedlineType_t::REDLINE_DELETE == pRed->GetType() )
{
sal_Int32 nStart, nEnd;
- pRed->CalcStartEnd( pTxtNd->GetIndex(), nStart, nEnd );
+ pRed->CalcStartEnd( pTextNd->GetIndex(), nStart, nEnd );
while ( nStart < nEnd && nStart < sNodeText.getLength() )
sNodeText = sNodeText.replaceAt( nStart++, 1, OUString(CH_TXTATR_INWORD) );
@@ -1460,10 +1460,10 @@ static OUString lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd )
bool SwCursor::GoSentence( SentenceMoveType eMoveType )
{
bool bRet = false;
- const SwTxtNode* pTxtNd = GetNode().GetTxtNode();
- if( pTxtNd && g_pBreakIt->GetBreakIter().is() )
+ const SwTextNode* pTextNd = GetNode().GetTextNode();
+ if( pTextNd && g_pBreakIt->GetBreakIter().is() )
{
- OUString sNodeText( lcl_MaskDeletedRedlines( pTxtNd ) );
+ OUString sNodeText( lcl_MaskDeletedRedlines( pTextNd ) );
SwCrsrSaveState aSave( *this );
sal_Int32 nPtPos = GetPoint()->nContent.GetIndex();
@@ -1473,22 +1473,22 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
sNodeText,
nPtPos, g_pBreakIt->GetLocale(
- pTxtNd->GetLang( nPtPos ) ));
+ pTextNd->GetLang( nPtPos ) ));
break;
case END_SENT: /* when modifying: see also ExpandToSentenceBorders below! */
nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
sNodeText,
nPtPos, g_pBreakIt->GetLocale(
- pTxtNd->GetLang( nPtPos ) ));
+ pTextNd->GetLang( nPtPos ) ));
break;
case NEXT_SENT:
{
nPtPos = g_pBreakIt->GetBreakIter()->endOfSentence(
sNodeText,
nPtPos, g_pBreakIt->GetLocale(
- pTxtNd->GetLang( nPtPos ) ));
+ pTextNd->GetLang( nPtPos ) ));
while (nPtPos>=0 && ++nPtPos < sNodeText.getLength()
- && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aTxt.GetChar(nPtPos)*/ )
+ && sNodeText[nPtPos] == ' ' /*isWhiteSpace( aText.GetChar(nPtPos)*/ )
;
break;
}
@@ -1496,20 +1496,20 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
sNodeText,
nPtPos, g_pBreakIt->GetLocale(
- pTxtNd->GetLang( nPtPos ) ));
+ pTextNd->GetLang( nPtPos ) ));
if (nPtPos == 0)
return false; // the previous sentence is not in this paragraph
if (nPtPos > 0)
nPtPos = g_pBreakIt->GetBreakIter()->beginOfSentence(
sNodeText,
nPtPos - 1, g_pBreakIt->GetLocale(
- pTxtNd->GetLang( nPtPos ) ));
+ pTextNd->GetLang( nPtPos ) ));
break;
}
// it is allowed to place the PaM just behind the last
// character in the text thus <= ...Len
- if (nPtPos <= pTxtNd->GetTxt().getLength() && nPtPos >= 0)
+ if (nPtPos <= pTextNd->GetText().getLength() && nPtPos >= 0)
{
GetPoint()->nContent = nPtPos;
if( !IsSelOvr() )
@@ -1522,8 +1522,8 @@ bool SwCursor::GoSentence( SentenceMoveType eMoveType )
bool SwCursor::ExpandToSentenceBorders()
{
bool bRes = false;
- const SwTxtNode* pStartNd = Start()->nNode.GetNode().GetTxtNode();
- const SwTxtNode* pEndNd = End()->nNode.GetNode().GetTxtNode();
+ const SwTextNode* pStartNd = Start()->nNode.GetNode().GetTextNode();
+ const SwTextNode* pEndNd = End()->nNode.GetNode().GetTextNode();
if (pStartNd && pEndNd && g_pBreakIt->GetBreakIter().is())
{
if (!HasMark())
@@ -1546,12 +1546,12 @@ bool SwCursor::ExpandToSentenceBorders()
// it is allowed to place the PaM just behind the last
// character in the text thus <= ...Len
bool bChanged = false;
- if (nStartPos <= pStartNd->GetTxt().getLength() && nStartPos >= 0)
+ if (nStartPos <= pStartNd->GetText().getLength() && nStartPos >= 0)
{
GetMark()->nContent = nStartPos;
bChanged = true;
}
- if (nEndPos <= pEndNd->GetTxt().getLength() && nEndPos >= 0)
+ if (nEndPos <= pEndNd->GetText().getLength() && nEndPos >= 0)
{
GetPoint()->nContent = nEndPos;
bChanged = true;
@@ -1570,17 +1570,17 @@ bool SwTableCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 /*nMode*/
}
// calculate cursor bidi level: extracted from LeftRight()
-const SwCntntFrm*
+const SwContentFrm*
SwCursor::DoSetBidiLevelLeftRight(
bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr)
{
// calculate cursor bidi level
- const SwCntntFrm* pSttFrm = NULL;
+ const SwContentFrm* pSttFrm = NULL;
SwNode& rNode = GetPoint()->nNode.GetNode();
- if( rNode.IsTxtNode() )
+ if( rNode.IsTextNode() )
{
- const SwTxtNode& rTNd = *rNode.GetTxtNode();
+ const SwTextNode& rTNd = *rNode.GetTextNode();
SwIndex& rIdx = GetPoint()->nContent;
sal_Int32 nPos = rIdx.GetIndex();
@@ -1597,7 +1597,7 @@ SwCursor::DoSetBidiLevelLeftRight(
{
sal_uInt8 nCrsrLevel = GetCrsrBidiLevel();
bool bForward = ! io_rbLeft;
- const_cast<SwTxtFrm*>(static_cast<const SwTxtFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
+ const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSttFrm))->PrepareVisualMove( nPos, nCrsrLevel,
bForward, bInsertCrsr );
rIdx = nPos;
SetCrsrBidiLevel( nCrsrLevel );
@@ -1624,7 +1624,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
{
// calculate cursor bidi level
SwNode& rNode = GetPoint()->nNode.GetNode();
- const SwCntntFrm* pSttFrm = // may side-effect bLeft!
+ const SwContentFrm* pSttFrm = // may side-effect bLeft!
DoSetBidiLevelLeftRight(bLeft, bVisualAllowed, bInsertCrsr);
// can the cursor be moved n times?
@@ -1633,9 +1633,9 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
SwGoInDoc fnGo;
if ( bSkipHidden )
- fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCellsSkipHidden : fnGoCntntSkipHidden;
+ fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCellsSkipHidden : fnGoContentSkipHidden;
else
- fnGo = CRSR_SKIP_CELLS == nMode ? fnGoCntntCells : fnGoCntnt;
+ fnGo = CRSR_SKIP_CELLS == nMode ? fnGoContentCells : fnGoContent;
while( nCnt )
{
@@ -1663,7 +1663,7 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
if ( bCellChanged )
{
// Set cursor to start/end of covered cell:
- SwTableBox* pTableBox = pOldTabBoxSttNode->GetTblBox();
+ SwTableBox* pTableBox = pOldTabBoxSttNode->GetTableBox();
if ( pTableBox && pTableBox->getRowSpan() > 1 )
{
pTableBox = & pTableBox->FindEndOfRowSpan(
@@ -1674,10 +1674,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
rPtIdx = aNewIdx;
GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
- SwCntntNode* pCntntNode = GetCntntNode();
- if ( pCntntNode )
+ SwContentNode* pContentNode = GetContentNode();
+ if ( pContentNode )
{
- GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+ GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
// Redo the move:
if ( !Move( fnMove, fnGo ) )
@@ -1693,24 +1693,24 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
const SwNode* pTableBoxStartNode = GetPoint()->nNode.GetNode().FindTableBoxStartNode();
if ( pTableBoxStartNode )
{
- const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+ const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
if ( pTableBox && pTableBox->getRowSpan() < 1 )
{
// Store the row span offset:
m_nRowSpanOffset = pTableBox->getRowSpan();
// Move cursor to non-covered cell:
- const SwTableNode* pTblNd = pTableBoxStartNode->FindTableNode();
- pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+ const SwTableNode* pTableNd = pTableBoxStartNode->FindTableNode();
+ pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
SwNodeIndex& rPtIdx = GetPoint()->nNode;
SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
rPtIdx = aNewIdx;
GetDoc()->GetNodes().GoNextSection( &rPtIdx, false, false );
- SwCntntNode* pCntntNode = GetCntntNode();
- if ( pCntntNode )
+ SwContentNode* pContentNode = GetContentNode();
+ if ( pContentNode )
{
- GetPoint()->nContent.Assign( pCntntNode, bLeft ? pCntntNode->Len() : 0 );
+ GetPoint()->nContent.Assign( pContentNode, bLeft ? pContentNode->Len() : 0 );
}
}
}
@@ -1721,10 +1721,10 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
if ( pSttFrm )
{
SwNode& rTmpNode = GetPoint()->nNode.GetNode();
- if ( &rTmpNode != &rNode && rTmpNode.IsTxtNode() )
+ if ( &rTmpNode != &rNode && rTmpNode.IsTextNode() )
{
Point aPt;
- const SwCntntFrm* pEndFrm = rTmpNode.GetTxtNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ const SwContentFrm* pEndFrm = rTmpNode.GetTextNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
if ( pEndFrm )
{
if ( ! pEndFrm->IsRightToLeft() != ! pSttFrm->IsRightToLeft() )
@@ -1747,16 +1747,16 @@ bool SwCursor::LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
void SwCursor::DoSetBidiLevelUpDown()
{
SwNode& rNode = GetPoint()->nNode.GetNode();
- if ( rNode.IsTxtNode() )
+ if ( rNode.IsTextNode() )
{
const SwScriptInfo* pSI =
- SwScriptInfo::GetScriptInfo( *rNode.GetTxtNode() );
+ SwScriptInfo::GetScriptInfo( *rNode.GetTextNode() );
if ( pSI )
{
SwIndex& rIdx = GetPoint()->nContent;
const sal_Int32 nPos = rIdx.GetIndex();
- if (nPos && nPos < rNode.GetTxtNode()->GetTxt().getLength())
+ if (nPos && nPos < rNode.GetTextNode()->GetText().getLength())
{
const sal_uInt8 nCurrLevel = pSI->DirType( nPos );
const sal_uInt8 nPrevLevel = pSI->DirType( nPos - 1 );
@@ -1776,12 +1776,12 @@ void SwCursor::DoSetBidiLevelUpDown()
bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
Point* pPt, long nUpDownX )
{
- SwTableCursor* pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+ SwTableCursor* pTableCrsr = dynamic_cast<SwTableCursor*>(this);
bool bAdjustTableCrsr = false;
// If the point/mark of the table cursor in the same box then set cursor to
// beginning of the box
- if( pTblCrsr && GetNode( true ).StartOfSectionNode() ==
+ if( pTableCrsr && GetNode( true ).StartOfSectionNode() ==
GetNode( false ).StartOfSectionNode() )
{
if ( End() != GetPoint() )
@@ -1793,7 +1793,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
Point aPt;
if( pPt )
aPt = *pPt;
- SwCntntFrm* pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ SwContentFrm* pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
if( pFrm )
{
@@ -1811,7 +1811,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
}
// It is allowed to move footnotes in other footnotes but not sections
- const bool bChkRange = !pFrm->IsInFtn() || HasMark();
+ const bool bChkRange = !pFrm->IsInFootnote() || HasMark();
const SwPosition aOldPos( *GetPoint() );
const bool bInReadOnly = IsReadOnlyAvailable();
@@ -1821,15 +1821,15 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
// than one paragraph. If we want to go down, we have to set the
// point to the last frame in the table box. This is only necessary
// if we do not already have a table selection
- const SwStartNode* pTblNd = GetNode( true ).FindTableBoxStartNode();
- OSL_ENSURE( pTblNd, "pTblCrsr without SwTableNode?" );
+ const SwStartNode* pTableNd = GetNode( true ).FindTableBoxStartNode();
+ OSL_ENSURE( pTableNd, "pTableCrsr without SwTableNode?" );
- if ( pTblNd ) // safety first
+ if ( pTableNd ) // safety first
{
- const SwNode* pEndNd = pTblNd->EndOfSectionNode();
+ const SwNode* pEndNd = pTableNd->EndOfSectionNode();
GetPoint()->nNode = *pEndNd;
- pTblCrsr->Move( fnMoveBackward, fnGoNode );
- pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ pTableCrsr->Move( fnMoveBackward, fnGoNode );
+ pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
}
}
@@ -1838,7 +1838,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
: pFrm->UnitDown( this, nUpDownX, bInReadOnly ) ) &&
CheckNodesRange( aOldPos.nNode, GetPoint()->nNode, bChkRange ))
{
- pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
--nCnt;
}
@@ -1846,10 +1846,10 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
if( !nCnt && !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ) )
{
- if( !pTblCrsr )
+ if( !pTableCrsr )
{
// try to position the cursor at half of the char-rect's height
- pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
SwCrsrMoveState eTmpState( MV_UPDOWN );
eTmpState.bSetInReadOnly = bInReadOnly;
SwRect aTmpRect;
@@ -1881,7 +1881,7 @@ bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
bool SwCursor::LeftRightMargin( bool bLeft, bool bAPI )
{
Point aPt;
- SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
// calculate cursor bidi level
if ( pFrm )
@@ -1897,7 +1897,7 @@ bool SwCursor::IsAtLeftRightMargin( bool bLeft, bool bAPI ) const
{
bool bRet = false;
Point aPt;
- SwCntntFrm * pFrm = GetCntntNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
+ SwContentFrm * pFrm = GetContentNode()->getLayoutFrm( GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &aPt, GetPoint() );
if( pFrm )
{
SwPaM aPam( *GetPoint() );
@@ -1916,7 +1916,7 @@ bool SwCursor::SttEndDoc( bool bStt )
// Never jump over section boundaries during selection!
// Can the cursor still moved on?
SwMoveFn fnMove = bStt ? fnMoveBackward : fnMoveForward;
- bool bRet = (!HasMark() || !IsNoCntnt() ) &&
+ bool bRet = (!HasMark() || !IsNoContent() ) &&
Move( fnMove, fnGoDoc ) &&
!IsInProtectTable( true ) &&
!IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@ -1927,8 +1927,8 @@ bool SwCursor::SttEndDoc( bool bStt )
bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
{
- const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
- if( !pTblNd )
+ const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+ if( !pTableNd )
return false;
// If there is another EndNode in front of the cell's StartNode then there
@@ -1939,7 +1939,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
while( nCnt-- )
{
const SwNode* pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
- const SwTableBox* pTableBox = pTableBoxStartNode->GetTblBox();
+ const SwTableBox* pTableBox = pTableBoxStartNode->GetTableBox();
// Check if we have to move the cursor to a covered cell before
// proceeding:
@@ -1947,7 +1947,7 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
{
if ( pTableBox && pTableBox->getRowSpan() > 1 )
{
- pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+ pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
static_cast<sal_uInt16>(pTableBox->getRowSpan() + m_nRowSpanOffset));
SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
rPtIdx = aNewIdx;
@@ -1968,21 +1968,21 @@ bool SwCursor::GoPrevNextCell( bool bNext, sal_uInt16 nCnt )
rPtIdx = bNext ? aCellIdx : SwNodeIndex(*aCellIdx.GetNode().StartOfSectionNode());
pTableBoxStartNode = rPtIdx.GetNode().FindTableBoxStartNode();
- pTableBox = pTableBoxStartNode->GetTblBox();
+ pTableBox = pTableBoxStartNode->GetTableBox();
if ( pTableBox && pTableBox->getRowSpan() < 1 )
{
m_nRowSpanOffset = pTableBox->getRowSpan();
// move cursor to non-covered cell:
- pTableBox = & pTableBox->FindStartOfRowSpan( pTblNd->GetTable(), USHRT_MAX );
+ pTableBox = & pTableBox->FindStartOfRowSpan( pTableNd->GetTable(), USHRT_MAX );
SwNodeIndex aNewIdx( *pTableBox->GetSttNd() );
rPtIdx = aNewIdx;
}
}
++rPtIdx;
- if( !rPtIdx.GetNode().IsCntntNode() )
+ if( !rPtIdx.GetNode().IsContentNode() )
GetDoc()->GetNodes().GoNextSection( &rPtIdx, true, false );
- GetPoint()->nContent.Assign( GetCntntNode(), 0 );
+ GetPoint()->nContent.Assign( GetContentNode(), 0 );
return !IsInProtectTable( true );
}
@@ -1997,35 +1997,35 @@ bool SwCursor::GotoTable( const OUString& rName )
bool bRet = false;
if ( !HasMark() )
{
- SwTable* pTmpTbl = SwTable::FindTable( GetDoc()->FindTblFmtByName( rName ) );
- if( pTmpTbl )
+ SwTable* pTmpTable = SwTable::FindTable( GetDoc()->FindTableFormatByName( rName ) );
+ if( pTmpTable )
{
// a table in a normal nodes array
SwCrsrSaveState aSave( *this );
- GetPoint()->nNode = *pTmpTbl->GetTabSortBoxes()[ 0 ]->
+ GetPoint()->nNode = *pTmpTable->GetTabSortBoxes()[ 0 ]->
GetSttNd()->FindTableNode();
- Move( fnMoveForward, fnGoCntnt );
+ Move( fnMoveForward, fnGoContent );
bRet = !IsSelOvr();
}
}
return bRet;
}
-bool SwCursor::GotoTblBox( const OUString& rName )
+bool SwCursor::GotoTableBox( const OUString& rName )
{
bool bRet = false;
- const SwTableNode* pTblNd = GetPoint()->nNode.GetNode().FindTableNode();
- if( pTblNd )
+ const SwTableNode* pTableNd = GetPoint()->nNode.GetNode().FindTableNode();
+ if( pTableNd )
{
// retrieve box by name
- const SwTableBox* pTblBox = pTblNd->GetTable().GetTblBox( rName );
- if( pTblBox && pTblBox->GetSttNd() &&
- ( !pTblBox->GetFrmFmt()->GetProtect().IsCntntProtected() ||
+ const SwTableBox* pTableBox = pTableNd->GetTable().GetTableBox( rName );
+ if( pTableBox && pTableBox->GetSttNd() &&
+ ( !pTableBox->GetFrameFormat()->GetProtect().IsContentProtected() ||
IsReadOnlyAvailable() ) )
{
SwCrsrSaveState aSave( *this );
- GetPoint()->nNode = *pTblBox->GetSttNd();
- Move( fnMoveForward, fnGoCntnt );
+ GetPoint()->nNode = *pTableBox->GetSttNd();
+ Move( fnMoveForward, fnGoContent );
bRet = !IsSelOvr();
}
}
@@ -2043,19 +2043,19 @@ bool SwCursor::MovePara(SwWhichPara fnWhichPara, SwPosPara fnPosPara )
// If fnWhichPara == fnParaCurr then (*fnWhichPara)( *this, fnPosPara )
// can already move the cursor to a different text node. In this case
// we better check if IsSelOvr().
- const SwCntntNode* pCntntNd = pNd->GetCntntNode();
- if ( pCntntNd )
+ const SwContentNode* pContentNd = pNd->GetContentNode();
+ if ( pContentNd )
{
- const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pCntntNd->Len();
+ const sal_Int32 nSttEnd = fnPosPara == fnMoveForward ? 0 : pContentNd->Len();
if ( GetPoint()->nContent.GetIndex() != nSttEnd )
bShortCut = true;
}
}
else
{
- if ( pNd->IsTxtNode() &&
+ if ( pNd->IsTextNode() &&
pNd->GetNodes()[ pNd->GetIndex() +
- (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTxtNode() )
+ (fnWhichPara == fnParaNext ? 1 : -1 ) ]->IsTextNode() )
bShortCut = true;
}
@@ -2094,17 +2094,17 @@ void SwCursor::RestoreSavePos()
GetPoint()->nNode = m_pSavePos->nNode;
sal_Int32 nIdx = 0;
- if ( GetCntntNode() )
+ if ( GetContentNode() )
{
- if (m_pSavePos->nCntnt <= GetCntntNode()->Len())
- nIdx = m_pSavePos->nCntnt;
+ if (m_pSavePos->nContent <= GetContentNode()->Len())
+ nIdx = m_pSavePos->nContent;
else
{
- nIdx = GetCntntNode()->Len();
+ nIdx = GetContentNode()->Len();
OSL_FAIL("SwCursor::RestoreSavePos: invalid content index");
}
}
- GetPoint()->nContent.Assign( GetCntntNode(), nIdx );
+ GetPoint()->nContent.Assign( GetContentNode(), nIdx );
}
}
@@ -2113,8 +2113,8 @@ SwTableCursor::SwTableCursor( const SwPosition &rPos, SwPaM* pRing )
{
m_bParked = false;
m_bChanged = false;
- m_nTblPtNd = 0, m_nTblMkNd = 0;
- m_nTblPtCnt = 0, m_nTblMkCnt = 0;
+ m_nTablePtNd = 0, m_nTableMkNd = 0;
+ m_nTablePtCnt = 0, m_nTableMkCnt = 0;
}
SwTableCursor::~SwTableCursor() {}
@@ -2185,22 +2185,22 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
{
SwNodeIndex aIdx( *pSttNd, 1 );
const SwNode* pNd = &aIdx.GetNode();
- if( !pNd->IsCntntNode() )
+ if( !pNd->IsContentNode() )
pNd = rNds.GoNextSection( &aIdx, true, false );
SwPosition* pPos = pCur->GetMark();
if( pNd != &pPos->nNode.GetNode() )
pPos->nNode = *pNd;
- pPos->nContent.Assign( const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), 0 );
+ pPos->nContent.Assign( const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), 0 );
aIdx.Assign( *pSttNd->EndOfSectionNode(), - 1 );
- if( !( pNd = &aIdx.GetNode())->IsCntntNode() )
+ if( !( pNd = &aIdx.GetNode())->IsContentNode() )
pNd = SwNodes::GoPrevSection( &aIdx, true, false );
pPos = pCur->GetPoint();
if (pNd && pNd != &pPos->nNode.GetNode())
pPos->nNode = *pNd;
- pPos->nContent.Assign(const_cast<SwCntntNode*>(static_cast<const SwCntntNode*>(pNd)), pNd ? static_cast<const SwCntntNode*>(pNd)->Len() : 0);
+ pPos->nContent.Assign(const_cast<SwContentNode*>(static_cast<const SwContentNode*>(pNd)), pNd ? static_cast<const SwContentNode*>(pNd)->Len() : 0);
aTmp.erase( aTmp.begin() + nPos );
}
@@ -2227,30 +2227,30 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCrsr )
if( &aIdx.GetNodes() != &rNds )
break;
SwNode* pNd = &aIdx.GetNode();
- if( !pNd->IsCntntNode() )
+ if( !pNd->IsContentNode() )
pNd = rNds.GoNextSection( &aIdx, true, false );
SwPaM *const pNew = (!pAktCrsr->IsMultiSelection() && !pAktCrsr->HasMark())
? pAktCrsr
: pAktCrsr->Create( pAktCrsr );
pNew->GetPoint()->nNode = *pNd;
- pNew->GetPoint()->nContent.Assign( static_cast<SwCntntNode*>(pNd), 0 );
+ pNew->GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pNd), 0 );
pNew->SetMark();
SwPosition* pPos = pNew->GetPoint();
pPos->nNode.Assign( *pSttNd->EndOfSectionNode(), - 1 );
- if( !( pNd = &pPos->nNode.GetNode())->IsCntntNode() )
+ if( !( pNd = &pPos->nNode.GetNode())->IsContentNode() )
pNd = SwNodes::GoPrevSection( &pPos->nNode, true, false );
- pPos->nContent.Assign(static_cast<SwCntntNode*>(pNd), pNd ? static_cast<SwCntntNode*>(pNd)->Len() : 0);
+ pPos->nContent.Assign(static_cast<SwContentNode*>(pNd), pNd ? static_cast<SwContentNode*>(pNd)->Len() : 0);
}
}
return pAktCrsr;
}
-void SwTableCursor::InsertBox( const SwTableBox& rTblBox )
+void SwTableCursor::InsertBox( const SwTableBox& rTableBox )
{
- SwTableBox* pBox = const_cast<SwTableBox*>(&rTblBox);
+ SwTableBox* pBox = const_cast<SwTableBox*>(&rTableBox);
m_SelectedBoxes.insert(pBox);
m_bChanged = true;
}
@@ -2264,8 +2264,8 @@ void SwTableCursor::DeleteBox(size_t const nPos)
bool SwTableCursor::NewTableSelection()
{
bool bRet = false;
- const SwNode *pStart = GetCntntNode()->FindTableBoxStartNode();
- const SwNode *pEnd = GetCntntNode(false)->FindTableBoxStartNode();
+ const SwNode *pStart = GetContentNode()->FindTableBoxStartNode();
+ const SwNode *pEnd = GetContentNode(false)->FindTableBoxStartNode();
if( pStart && pEnd )
{
const SwTableNode *pTableNode = pStart->FindTableNode();
@@ -2317,15 +2317,15 @@ void SwTableCursor::ActualizeSelection( const SwSelBoxes &rNew )
}
}
-bool SwTableCursor::IsCrsrMovedUpdt()
+bool SwTableCursor::IsCrsrMovedUpdate()
{
if( !IsCrsrMoved() )
return false;
- m_nTblMkNd = GetMark()->nNode.GetIndex();
- m_nTblPtNd = GetPoint()->nNode.GetIndex();
- m_nTblMkCnt = GetMark()->nContent.GetIndex();
- m_nTblPtCnt = GetPoint()->nContent.GetIndex();
+ m_nTableMkNd = GetMark()->nNode.GetIndex();
+ m_nTablePtNd = GetPoint()->nNode.GetIndex();
+ m_nTableMkCnt = GetMark()->nContent.GetIndex();
+ m_nTablePtCnt = GetPoint()->nContent.GetIndex();
return true;
}
@@ -2354,7 +2354,7 @@ bool SwTableCursor::HasReadOnlyBoxSel() const
bool bRet = false;
for (size_t n = m_SelectedBoxes.size(); n; )
{
- if (m_SelectedBoxes[--n]->GetFrmFmt()->GetProtect().IsCntntProtected())
+ if (m_SelectedBoxes[--n]->GetFrameFormat()->GetProtect().IsContentProtected())
{
bRet = true;
break;
diff --git a/sw/source/core/crsr/trvlcol.cxx b/sw/source/core/crsr/trvlcol.cxx
index ffd22a28cd78..e5b5c865fdb5 100644
--- a/sw/source/core/crsr/trvlcol.cxx
+++ b/sw/source/core/crsr/trvlcol.cxx
@@ -44,22 +44,22 @@ SwLayoutFrm* GetPrevColumn( const SwLayoutFrm* pLayFrm )
return pActCol ? static_cast<SwLayoutFrm*>(pActCol->GetPrev()) : 0;
}
-SwCntntFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnStt( const SwLayoutFrm* pColFrm )
{
- return pColFrm ? const_cast<SwCntntFrm*>(pColFrm->ContainsCntnt()) : 0;
+ return pColFrm ? const_cast<SwContentFrm*>(pColFrm->ContainsContent()) : 0;
}
-SwCntntFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
+SwContentFrm* GetColumnEnd( const SwLayoutFrm* pColFrm )
{
- SwCntntFrm *pRet = GetColumnStt( pColFrm );
+ SwContentFrm *pRet = GetColumnStt( pColFrm );
if( !pRet )
return 0;
- SwCntntFrm *pNxt = pRet->GetNextCntntFrm();
+ SwContentFrm *pNxt = pRet->GetNextContentFrm();
while( pNxt && pColFrm->IsAnLower( pNxt ) )
{
pRet = pNxt;
- pNxt = pNxt->GetNextCntntFrm();
+ pNxt = pNxt->GetNextContentFrm();
}
return pRet;
}
@@ -73,12 +73,12 @@ SwPosColumn fnColumnEnd = &GetColumnEnd;
bool SwCrsrShell::MoveColumn( SwWhichColumn fnWhichCol, SwPosColumn fnPosCol )
{
bool bRet = false;
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
{
SwLayoutFrm* pLayFrm = GetCurrFrm()->GetUpper();
if( pLayFrm && 0 != ( pLayFrm = (*fnWhichCol)( pLayFrm )) )
{
- SwCntntFrm* pCnt = (*fnPosCol)( pLayFrm );
+ SwContentFrm* pCnt = (*fnPosCol)( pLayFrm );
if( pCnt )
{
SET_CURR_SHELL( this );
diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx
index 62cdca2b27e2..31fe101dd889 100644
--- a/sw/source/core/crsr/trvlfnfl.cxx
+++ b/sw/source/core/crsr/trvlfnfl.cxx
@@ -46,22 +46,22 @@ bool SwCrsrShell::CallCrsrFN( FNCrsr fnCrsr )
return bRet;
}
-bool SwCursor::GotoFtnTxt()
+bool SwCursor::GotoFootnoteText()
{
// jump from content to footnote
bool bRet = false;
- SwTxtNode* pTxtNd = GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTextNd = GetPoint()->nNode.GetNode().GetTextNode();
- SwTxtAttr *const pFtn( (pTxtNd)
- ? pTxtNd->GetTxtAttrForCharAt(
+ SwTextAttr *const pFootnote( (pTextNd)
+ ? pTextNd->GetTextAttrForCharAt(
GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN)
: 0);
- if (pFtn)
+ if (pFootnote)
{
SwCrsrSaveState aSaveState( *this );
- GetPoint()->nNode = *static_cast<SwTxtFtn*>(pFtn)->GetStartNode();
+ GetPoint()->nNode = *static_cast<SwTextFootnote*>(pFootnote)->GetStartNode();
- SwCntntNode* pCNd = GetDoc()->GetNodes().GoNextSection(
+ SwContentNode* pCNd = GetDoc()->GetNodes().GoNextSection(
&GetPoint()->nNode,
true, !IsReadOnlyAvailable() );
if( pCNd )
@@ -74,36 +74,36 @@ bool SwCursor::GotoFtnTxt()
return bRet;
}
-bool SwCrsrShell::GotoFtnTxt()
+bool SwCrsrShell::GotoFootnoteText()
{
- bool bRet = CallCrsrFN( &SwCursor::GotoFtnTxt );
+ bool bRet = CallCrsrFN( &SwCursor::GotoFootnoteText );
if( !bRet )
{
- SwTxtNode* pTxtNd = _GetCrsr() ?
- _GetCrsr()->GetPoint()->nNode.GetNode().GetTxtNode() : NULL;
- if( pTxtNd )
+ SwTextNode* pTextNd = _GetCrsr() ?
+ _GetCrsr()->GetPoint()->nNode.GetNode().GetTextNode() : NULL;
+ if( pTextNd )
{
- const SwFrm *pFrm = pTxtNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
+ const SwFrm *pFrm = pTextNd->getLayoutFrm( GetLayout(), &_GetCrsr()->GetSttPos(),
_GetCrsr()->Start() );
- const SwFtnBossFrm* pFtnBoss;
- bool bSkip = pFrm && pFrm->IsInFtn();
- while( pFrm && 0 != ( pFtnBoss = pFrm->FindFtnBossFrm() ) )
+ const SwFootnoteBossFrm* pFootnoteBoss;
+ bool bSkip = pFrm && pFrm->IsInFootnote();
+ while( pFrm && 0 != ( pFootnoteBoss = pFrm->FindFootnoteBossFrm() ) )
{
- if( 0 != ( pFrm = pFtnBoss->FindFtnCont() ) )
+ if( 0 != ( pFrm = pFootnoteBoss->FindFootnoteCont() ) )
{
if( bSkip )
bSkip = false;
else
{
- const SwCntntFrm* pCnt = static_cast<const SwLayoutFrm*>
- (pFrm)->ContainsCntnt();
+ const SwContentFrm* pCnt = static_cast<const SwLayoutFrm*>
+ (pFrm)->ContainsContent();
if( pCnt )
{
- const SwCntntNode* pNode = pCnt->GetNode();
+ const SwContentNode* pNode = pCnt->GetNode();
_GetCrsr()->GetPoint()->nNode = *pNode;
_GetCrsr()->GetPoint()->nContent.Assign(
- const_cast<SwCntntNode*>(pNode),
- static_cast<const SwTxtFrm*>(pCnt)->GetOfst() );
+ const_cast<SwContentNode*>(pNode),
+ static_cast<const SwTextFrm*>(pCnt)->GetOfst() );
UpdateCrsr( SwCrsrShell::SCROLLWIN |
SwCrsrShell::CHKRANGE | SwCrsrShell::READONLY );
bRet = true;
@@ -111,34 +111,34 @@ bool SwCrsrShell::GotoFtnTxt()
}
}
}
- if( pFtnBoss->GetNext() && !pFtnBoss->IsPageFrm() )
- pFrm = pFtnBoss->GetNext();
+ if( pFootnoteBoss->GetNext() && !pFootnoteBoss->IsPageFrm() )
+ pFrm = pFootnoteBoss->GetNext();
else
- pFrm = pFtnBoss->GetUpper();
+ pFrm = pFootnoteBoss->GetUpper();
}
}
}
return bRet;
}
-bool SwCursor::GotoFtnAnchor()
+bool SwCursor::GotoFootnoteAnchor()
{
// jump from footnote to anchor
const SwNode* pSttNd = GetNode().FindFootnoteStartNode();
if( pSttNd )
{
// search in all footnotes in document for this StartIndex
- const SwTxtFtn* pTxtFtn;
- const SwFtnIdxs& rFtnArr = pSttNd->GetDoc()->GetFtnIdxs();
- for( size_t n = 0; n < rFtnArr.size(); ++n )
- if( 0 != ( pTxtFtn = rFtnArr[ n ])->GetStartNode() &&
- pSttNd == &pTxtFtn->GetStartNode()->GetNode() )
+ const SwTextFootnote* pTextFootnote;
+ const SwFootnoteIdxs& rFootnoteArr = pSttNd->GetDoc()->GetFootnoteIdxs();
+ for( size_t n = 0; n < rFootnoteArr.size(); ++n )
+ if( 0 != ( pTextFootnote = rFootnoteArr[ n ])->GetStartNode() &&
+ pSttNd == &pTextFootnote->GetStartNode()->GetNode() )
{
SwCrsrSaveState aSaveState( *this );
- SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+ SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
GetPoint()->nNode = rTNd;
- GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+ GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
return !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE );
@@ -147,11 +147,11 @@ bool SwCursor::GotoFtnAnchor()
return false;
}
-bool SwCrsrShell::GotoFtnAnchor()
+bool SwCrsrShell::GotoFootnoteAnchor()
{
// jump from footnote to anchor
SwCallLink aLk( *this ); // watch Crsr-Moves
- bool bRet = m_pCurCrsr->GotoFtnAnchor();
+ bool bRet = m_pCurCrsr->GotoFootnoteAnchor();
if( bRet )
{
// special treatment for table header row
@@ -162,99 +162,99 @@ bool SwCrsrShell::GotoFtnAnchor()
return bRet;
}
-inline bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpLE( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
{
- const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
- return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() <= nCnt );
+ const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+ return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() <= nCnt );
}
-inline bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, sal_Int32 nCnt )
+inline bool CmpL( const SwTextFootnote& rFootnote, sal_uLong nNd, sal_Int32 nCnt )
{
- const sal_uLong nTNd = rFtn.GetTxtNode().GetIndex();
- return nTNd < nNd || ( nTNd == nNd && rFtn.GetStart() < nCnt );
+ const sal_uLong nTNd = rFootnote.GetTextNode().GetIndex();
+ return nTNd < nNd || ( nTNd == nNd && rFootnote.GetStart() < nCnt );
}
-bool SwCursor::GotoNextFtnAnchor()
+bool SwCursor::GotoNextFootnoteAnchor()
{
- const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
- const SwTxtFtn* pTxtFtn = 0;
+ const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+ const SwTextFootnote* pTextFootnote = 0;
size_t nPos = 0;
- if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ))
+ if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ))
{
// there is a footnote with this index, so search also for the next one
- if( nPos < rFtnArr.size() )
+ if( nPos < rFootnoteArr.size() )
{
sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
- pTxtFtn = rFtnArr[ nPos ];
+ pTextFootnote = rFootnoteArr[ nPos ];
// search forwards
- if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+ if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
{
- pTxtFtn = 0;
- for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+ pTextFootnote = 0;
+ for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
{
- pTxtFtn = rFtnArr[ nPos ];
- if( !CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+ pTextFootnote = rFootnoteArr[ nPos ];
+ if( !CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
break; // found
- pTxtFtn = 0;
+ pTextFootnote = 0;
}
}
else if( nPos )
{
// search backwards
- pTxtFtn = 0;
+ pTextFootnote = 0;
while( nPos )
{
- pTxtFtn = rFtnArr[ --nPos ];
- if( CmpLE( *pTxtFtn, nNdPos, nCntPos ) )
+ pTextFootnote = rFootnoteArr[ --nPos ];
+ if( CmpLE( *pTextFootnote, nNdPos, nCntPos ) )
{
- pTxtFtn = rFtnArr[ ++nPos ];
+ pTextFootnote = rFootnoteArr[ ++nPos ];
break; // found
}
}
}
}
}
- else if( nPos < rFtnArr.size() )
- pTxtFtn = rFtnArr[ nPos ];
+ else if( nPos < rFootnoteArr.size() )
+ pTextFootnote = rFootnoteArr[ nPos ];
- bool bRet = 0 != pTxtFtn;
+ bool bRet = 0 != pTextFootnote;
if( bRet )
{
SwCrsrSaveState aSaveState( *this );
- SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+ SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
GetPoint()->nNode = rTNd;
- GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+ GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
bRet = !IsSelOvr();
}
return bRet;
}
-bool SwCursor::GotoPrevFtnAnchor()
+bool SwCursor::GotoPrevFootnoteAnchor()
{
- const SwFtnIdxs& rFtnArr = GetDoc()->GetFtnIdxs();
- const SwTxtFtn* pTxtFtn = 0;
+ const SwFootnoteIdxs& rFootnoteArr = GetDoc()->GetFootnoteIdxs();
+ const SwTextFootnote* pTextFootnote = 0;
size_t nPos = 0;
- if( rFtnArr.SeekEntry( GetPoint()->nNode, &nPos ) )
+ if( rFootnoteArr.SeekEntry( GetPoint()->nNode, &nPos ) )
{
// there is a footnote with this index, so search also for the next one
sal_uLong nNdPos = GetPoint()->nNode.GetIndex();
const sal_Int32 nCntPos = GetPoint()->nContent.GetIndex();
- pTxtFtn = rFtnArr[ nPos ];
+ pTextFootnote = rFootnoteArr[ nPos ];
// search forwards
- if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+ if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
{
- for( ++nPos; nPos < rFtnArr.size(); ++nPos )
+ for( ++nPos; nPos < rFootnoteArr.size(); ++nPos )
{
- pTxtFtn = rFtnArr[ nPos ];
- if( !CmpL( *pTxtFtn, nNdPos, nCntPos ) )
+ pTextFootnote = rFootnoteArr[ nPos ];
+ if( !CmpL( *pTextFootnote, nNdPos, nCntPos ) )
{
- pTxtFtn = rFtnArr[ nPos-1 ];
+ pTextFootnote = rFootnoteArr[ nPos-1 ];
break;
}
}
@@ -262,42 +262,42 @@ bool SwCursor::GotoPrevFtnAnchor()
else if( nPos )
{
// search backwards
- pTxtFtn = 0;
+ pTextFootnote = 0;
while( nPos )
{
- pTxtFtn = rFtnArr[ --nPos ];
- if( CmpL( *pTxtFtn, nNdPos, nCntPos ))
+ pTextFootnote = rFootnoteArr[ --nPos ];
+ if( CmpL( *pTextFootnote, nNdPos, nCntPos ))
break; // found
- pTxtFtn = 0;
+ pTextFootnote = 0;
}
}
else
- pTxtFtn = 0;
+ pTextFootnote = 0;
}
else if( nPos )
- pTxtFtn = rFtnArr[ nPos-1 ];
+ pTextFootnote = rFootnoteArr[ nPos-1 ];
- bool bRet = 0 != pTxtFtn;
+ bool bRet = 0 != pTextFootnote;
if( bRet )
{
SwCrsrSaveState aSaveState( *this );
- SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode();
+ SwTextNode& rTNd = (SwTextNode&)pTextFootnote->GetTextNode();
GetPoint()->nNode = rTNd;
- GetPoint()->nContent.Assign( &rTNd, pTxtFtn->GetStart() );
+ GetPoint()->nContent.Assign( &rTNd, pTextFootnote->GetStart() );
bRet = !IsSelOvr();
}
return bRet;
}
-bool SwCrsrShell::GotoNextFtnAnchor()
+bool SwCrsrShell::GotoNextFootnoteAnchor()
{
- return CallCrsrFN( &SwCursor::GotoNextFtnAnchor );
+ return CallCrsrFN( &SwCursor::GotoNextFootnoteAnchor );
}
-bool SwCrsrShell::GotoPrevFtnAnchor()
+bool SwCrsrShell::GotoPrevFootnoteAnchor()
{
- return CallCrsrFN( &SwCursor::GotoPrevFtnAnchor );
+ return CallCrsrFN( &SwCursor::GotoPrevFootnoteAnchor );
}
/// jump from border to anchor
@@ -326,7 +326,7 @@ bool SwCrsrShell::GotoFlyAnchor()
: pFrm->Frm().Left());
const SwPageFrm* pPageFrm = pFrm->FindPageFrm();
- const SwCntntFrm* pFndFrm = pPageFrm->GetCntntPos( aPt, false, true );
+ const SwContentFrm* pFndFrm = pPageFrm->GetContentPos( aPt, false, true );
pFndFrm->GetCrsrOfst( m_pCurCrsr->GetPoint(), aPt );
bool bRet = !m_pCurCrsr->IsInProtectTable() && !m_pCurCrsr->IsSelOvr();
diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx
index 92d40ed3e3a5..8c2ba4e36b2e 100644
--- a/sw/source/core/crsr/trvlreg.cxx
+++ b/sw/source/core/crsr/trvlreg.cxx
@@ -53,7 +53,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
else if( fnPosRegion == fnMoveForward )
{
aIdx = *pNd;
- SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+ SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
true, !bInReadOnly );
if( !pCNd )
{
@@ -65,7 +65,7 @@ bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
else
{
aIdx = *pNd->EndOfSectionNode();
- SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+ SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
true, !bInReadOnly );
if( !pCNd )
{
@@ -107,7 +107,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
else if( fnPosRegion == fnMoveForward )
{
aIdx = *pNd;
- SwCntntNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
+ SwContentNode* pCNd = pNd->GetNodes().GoNextSection( &aIdx,
true, !bInReadOnly );
if( !pCNd )
{
@@ -119,7 +119,7 @@ bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
else
{
aIdx = *pNd->EndOfSectionNode();
- SwCntntNode* pCNd = SwNodes::GoPrevSection( &aIdx,
+ SwContentNode* pCNd = SwNodes::GoPrevSection( &aIdx,
true, !bInReadOnly );
if( !pCNd )
{
@@ -145,7 +145,7 @@ bool GotoCurrRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
SwPosition* pPos = rCurCrsr.GetPoint();
bool bMoveBackward = fnPosRegion == fnMoveBackward;
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
if( bMoveBackward )
{
SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -178,7 +178,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
bool bMoveBackward = fnPosRegion == fnMoveBackward;
do {
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
if( bMoveBackward ) // to the end of the section
{
SwNodeIndex aIdx( *pNd->EndOfSectionNode() );
@@ -205,7 +205,7 @@ bool GotoCurrRegionAndSkip( SwPaM& rCurCrsr, SwPosRegion fnPosRegion,
// try also the parent of this section
SwSection* pParent = pNd->GetSection().GetParent();
- pNd = pParent ? pParent->GetFmt()->GetSectionNode() : 0;
+ pNd = pParent ? pParent->GetFormat()->GetSectionNode() : 0;
} while( pNd );
return false;
}
@@ -217,13 +217,13 @@ bool SwCursor::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion
(*fnWhichRegion)( *this, fnPosRegion, IsReadOnlyAvailable() ) &&
!IsSelOvr() &&
(GetPoint()->nNode.GetIndex() != m_pSavePos->nNode ||
- GetPoint()->nContent.GetIndex() != m_pSavePos->nCntnt);
+ GetPoint()->nContent.GetIndex() != m_pSavePos->nContent);
}
bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegion )
{
SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
- bool bRet = !m_pTblCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
+ bool bRet = !m_pTableCrsr && m_pCurCrsr->MoveRegion( fnWhichRegion, fnPosRegion );
if( bRet )
UpdateCrsr();
return bRet;
@@ -232,22 +232,22 @@ bool SwCrsrShell::MoveRegion( SwWhichRegion fnWhichRegion, SwPosRegion fnPosRegi
bool SwCursor::GotoRegion( const OUString& rName )
{
bool bRet = false;
- const SwSectionFmts& rFmts = GetDoc()->GetSections();
- for( SwSectionFmts::size_type n = rFmts.size(); n; )
+ const SwSectionFormats& rFormats = GetDoc()->GetSections();
+ for( SwSectionFormats::size_type n = rFormats.size(); n; )
{
- const SwSectionFmt* pFmt = rFmts[ --n ];
+ const SwSectionFormat* pFormat = rFormats[ --n ];
const SwNodeIndex* pIdx = 0;
const SwSection* pSect;
- if( 0 != ( pSect = pFmt->GetSection() ) &&
+ if( 0 != ( pSect = pFormat->GetSection() ) &&
pSect->GetSectionName() == rName &&
- 0 != ( pIdx = pFmt->GetCntnt().GetCntntIdx() ) &&
+ 0 != ( pIdx = pFormat->GetContent().GetContentIdx() ) &&
pIdx->GetNode().GetNodes().IsDocNodes() )
{
// area in normal nodes array
SwCrsrSaveState aSaveState( *this );
GetPoint()->nNode = *pIdx;
- Move( fnMoveForward, fnGoCntnt );
+ Move( fnMoveForward, fnGoContent );
bRet = !IsSelOvr();
}
}
@@ -257,7 +257,7 @@ bool SwCursor::GotoRegion( const OUString& rName )
bool SwCrsrShell::GotoRegion( const OUString& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves;call Link if needed
- bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoRegion( rName );
+ bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoRegion( rName );
if( bRet )
UpdateCrsr( SwCrsrShell::SCROLLWIN | SwCrsrShell::CHKRANGE |
SwCrsrShell::READONLY );
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 33d29140a431..6c7ae407b910 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -44,11 +44,11 @@
bool SwCrsrShell::GoNextCell( bool bAppendLine )
{
bool bRet = false;
- const SwTableNode* pTblNd = 0;
+ const SwTableNode* pTableNd = 0;
- if( IsTableMode() || 0 != ( pTblNd = IsCrsrInTbl() ))
+ if( IsTableMode() || 0 != ( pTableNd = IsCrsrInTable() ))
{
- SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
SwCallLink aLk( *this ); // watch Crsr-Moves
bRet = true;
@@ -59,13 +59,13 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
if ( pCrsr->GetCrsrRowSpanOffset() )
{
- pTableBox = pTableBoxStartNode->GetTblBox();
+ pTableBox = pTableBoxStartNode->GetTableBox();
if ( pTableBox->getRowSpan() > 1 )
{
- if ( !pTblNd )
- pTblNd = IsCrsrInTbl();
- assert (pTblNd);
- pTableBox = & pTableBox->FindEndOfRowSpan( pTblNd->GetTable(),
+ if ( !pTableNd )
+ pTableNd = IsCrsrInTable();
+ assert (pTableNd);
+ pTableBox = & pTableBox->FindEndOfRowSpan( pTableNd->GetTable(),
(sal_uInt16)(pTableBox->getRowSpan() + pCrsr->GetCrsrRowSpanOffset() ) );
pTableBoxStartNode = pTableBox->GetSttNd();
}
@@ -79,11 +79,11 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
{
if( pCrsr->HasMark() || !bAppendLine )
bRet = false;
- else if (pTblNd)
+ else if (pTableNd)
{
// if there is no list anymore then create new one
if ( !pTableBox )
- pTableBox = pTblNd->GetTable().GetTblBox(
+ pTableBox = pTableNd->GetTable().GetTableBox(
pCrsr->GetPoint()->nNode.GetNode().
StartOfSectionIndex() );
@@ -105,9 +105,9 @@ bool SwCrsrShell::GoNextCell( bool bAppendLine )
bool SwCrsrShell::GoPrevCell()
{
bool bRet = false;
- if( IsTableMode() || IsCrsrInTbl() )
+ if( IsTableMode() || IsCrsrInTable() )
{
- SwCursor* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwCursor* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
SwCallLink aLk( *this ); // watch Crsr-Moves
bRet = pCrsr->GoPrevCell();
if( bRet )
@@ -128,7 +128,7 @@ static const SwFrm* lcl_FindMostUpperCellFrm( const SwFrm* pFrm )
return pFrm;
}
-bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
+bool SwCrsrShell::_SelTableRowOrCol( bool bRow, bool bRowSimple )
{
// check if the current cursor's SPoint/Mark are in a table
SwFrm *pFrm = GetCurrFrm();
@@ -146,15 +146,15 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
// search box based on layout
SwSelBoxes aBoxes;
- SwTblSearchType eType = bRow ? nsSwTblSearchType::TBLSEARCH_ROW : nsSwTblSearchType::TBLSEARCH_COL;
+ SwTableSearchType eType = bRow ? nsSwTableSearchType::TBLSEARCH_ROW : nsSwTableSearchType::TBLSEARCH_COL;
const bool bCheckProtected = !IsReadOnlyAvailable();
if( bCheckProtected )
- eType = (SwTblSearchType)(eType | nsSwTblSearchType::TBLSEARCH_PROTECT);
+ eType = (SwTableSearchType)(eType | nsSwTableSearchType::TBLSEARCH_PROTECT);
if ( !bRowSimple )
{
- GetTblSel( *this, aBoxes, eType );
+ GetTableSel( *this, aBoxes, eType );
if( aBoxes.empty() )
return false;
@@ -178,7 +178,7 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
{
const SwShellCrsr *pCrsr = _GetCrsr();
const SwFrm* pStartFrm = pFrm;
- const SwCntntNode *pCNd = pCrsr->GetCntntNode( false );
+ const SwContentNode *pCNd = pCrsr->GetContentNode( false );
const SwFrm* pEndFrm = pCNd ? pCNd->getLayoutFrm( GetLayout(), &pCrsr->GetMkPos() ) : 0;
if ( bRow )
@@ -194,13 +194,13 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
// If we select upwards it is sufficient to set pStt and pEnd
// to the first resp. last box of the selection obtained from
- // GetTblSel. However, selecting downwards requires the frames
+ // GetTableSel. However, selecting downwards requires the frames
// located at the corners of the selection. This does not work
// for column selections in vertical tables:
const bool bSelectUp = ( bVert && !bRow ) ||
*pCrsr->GetPoint() <= *pCrsr->GetMark();
SwCellFrms aCells;
- GetTblSel( static_cast<const SwCellFrm*>(pStartFrm),
+ GetTableSel( static_cast<const SwCellFrm*>(pStartFrm),
static_cast<const SwCellFrm*>(pEndFrm),
aBoxes, bSelectUp ? 0 : &aCells, eType );
@@ -222,26 +222,26 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
}
// if no table cursor exists, create one
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
{
- m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+ m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
m_pCurCrsr->DeleteMark();
m_pCurCrsr->SwSelPaintRects::Hide();
}
- m_pTblCrsr->DeleteMark();
+ m_pTableCrsr->DeleteMark();
// set start and end of a column
- m_pTblCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
- m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
- m_pTblCrsr->SetMark();
- m_pTblCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
- m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+ m_pTableCrsr->GetPoint()->nNode = *pEnd->GetSttNd();
+ m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+ m_pTableCrsr->SetMark();
+ m_pTableCrsr->GetPoint()->nNode = *pStt->GetSttNd()->EndOfSectionNode();
+ m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
// set PtPos 'close' to the reference table, otherwise we might get problems
// with the repeated headlines check in UpdateCrsr():
if ( !bRow )
- m_pTblCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
+ m_pTableCrsr->GetPtPos() = pMasterTabFrm->IsVertical()
? pMasterTabFrm->Frm().TopRight()
: pMasterTabFrm->Frm().TopLeft();
@@ -249,40 +249,40 @@ bool SwCrsrShell::_SelTblRowOrCol( bool bRow, bool bRowSimple )
return true;
}
-bool SwCrsrShell::SelTbl()
+bool SwCrsrShell::SelTable()
{
// check if the current cursor's SPoint/Mark are in a table
SwFrm *pFrm = GetCurrFrm();
if( !pFrm->IsInTab() )
return false;
- const SwTabFrm *pTblFrm = pFrm->ImplFindTabFrm();
- const SwTabFrm* pMasterTabFrm = pTblFrm->IsFollow() ? pTblFrm->FindMaster( true ) : pTblFrm;
- const SwTableNode* pTblNd = pTblFrm->GetTable()->GetTableNode();
+ const SwTabFrm *pTableFrm = pFrm->ImplFindTabFrm();
+ const SwTabFrm* pMasterTabFrm = pTableFrm->IsFollow() ? pTableFrm->FindMaster( true ) : pTableFrm;
+ const SwTableNode* pTableNd = pTableFrm->GetTable()->GetTableNode();
SET_CURR_SHELL( this );
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
{
- m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+ m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
m_pCurCrsr->DeleteMark();
m_pCurCrsr->SwSelPaintRects::Hide();
}
- m_pTblCrsr->DeleteMark();
- m_pTblCrsr->GetPoint()->nNode = *pTblNd;
- m_pTblCrsr->Move( fnMoveForward, fnGoCntnt );
- m_pTblCrsr->SetMark();
+ m_pTableCrsr->DeleteMark();
+ m_pTableCrsr->GetPoint()->nNode = *pTableNd;
+ m_pTableCrsr->Move( fnMoveForward, fnGoContent );
+ m_pTableCrsr->SetMark();
// set MkPos 'close' to the master table, otherwise we might get problems
// with the repeated headlines check in UpdateCrsr():
- m_pTblCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
- m_pTblCrsr->GetPoint()->nNode = *pTblNd->EndOfSectionNode();
- m_pTblCrsr->Move( fnMoveBackward, fnGoCntnt );
+ m_pTableCrsr->GetMkPos() = pMasterTabFrm->IsVertical() ? pMasterTabFrm->Frm().TopRight() : pMasterTabFrm->Frm().TopLeft();
+ m_pTableCrsr->GetPoint()->nNode = *pTableNd->EndOfSectionNode();
+ m_pTableCrsr->Move( fnMoveBackward, fnGoContent );
UpdateCrsr();
return true;
}
-bool SwCrsrShell::SelTblBox()
+bool SwCrsrShell::SelTableBox()
{
// if we're in a table, create a table cursor, and select the cell
// that the current cursor's point resides in
@@ -305,26 +305,26 @@ bool SwCrsrShell::SelTblBox()
SET_CURR_SHELL( this );
// create a table cursor, if there isn't one already
- if( !m_pTblCrsr )
+ if( !m_pTableCrsr )
{
- m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+ m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
m_pCurCrsr->DeleteMark();
m_pCurCrsr->SwSelPaintRects::Hide();
}
- // select the complete box with our shiny new m_pTblCrsr
+ // select the complete box with our shiny new m_pTableCrsr
// 1. delete mark, and move point to first content node in box
- m_pTblCrsr->DeleteMark();
- *(m_pTblCrsr->GetPoint()) = SwPosition( *pStartNode );
- m_pTblCrsr->Move( fnMoveForward, fnGoNode );
+ m_pTableCrsr->DeleteMark();
+ *(m_pTableCrsr->GetPoint()) = SwPosition( *pStartNode );
+ m_pTableCrsr->Move( fnMoveForward, fnGoNode );
// 2. set mark, and move point to last content node in box
- m_pTblCrsr->SetMark();
- *(m_pTblCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
- m_pTblCrsr->Move( fnMoveBackward, fnGoNode );
+ m_pTableCrsr->SetMark();
+ *(m_pTableCrsr->GetPoint()) = SwPosition( *(pStartNode->EndOfSectionNode()) );
+ m_pTableCrsr->Move( fnMoveBackward, fnGoNode );
// 3. exchange
- m_pTblCrsr->Exchange();
+ m_pTableCrsr->Exchange();
// with some luck, UpdateCrsr() will now update everything that
// needs updating
@@ -348,18 +348,18 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
SwNodeIndex aTmp( rIdx, 2 ); // TableNode + StartNode
// the resulting cell should be in that table:
- const SwTableNode* pTblNd = rIdx.GetNode().GetTableNode();
+ const SwTableNode* pTableNd = rIdx.GetNode().GetTableNode();
- if ( !pTblNd )
+ if ( !pTableNd )
{
OSL_FAIL( "lcl_FindNextCell not celled with table start node!" );
return false;
}
- const SwNode* pTableEndNode = pTblNd->EndOfSectionNode();
+ const SwNode* pTableEndNode = pTableNd->EndOfSectionNode();
SwNodes& rNds = aTmp.GetNode().GetNodes();
- SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
// no content node => go to next content node
if( !pCNd )
@@ -369,9 +369,9 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
if ( !pCNd )
return false;
- SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+ SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
- if ( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+ if ( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
(!bInReadOnly && pFrm->IsProtected() ) )
{
// we are not located inside a 'valid' cell. We have to continue searching...
@@ -392,7 +392,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
return false;
// ok, get the next content node:
- pCNd = aTmp.GetNode().GetCntntNode();
+ pCNd = aTmp.GetNode().GetContentNode();
if( 0 == pCNd )
pCNd = rNds.GoNext( &aTmp );
@@ -403,7 +403,7 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, bool bInReadOnly )
// check if we have found a suitable table cell:
pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
- if ( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+ if ( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
(bInReadOnly || !pFrm->IsProtected() ) )
{
// finally, we have found a suitable table cell => set index and return
@@ -425,15 +425,15 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly )
SwNodeIndex aTmp( rIdx, -2 ); // TableNode + EndNode
const SwNode* pTableEndNode = &rIdx.GetNode();
- const SwTableNode* pTblNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
+ const SwTableNode* pTableNd = pTableEndNode->StartOfSectionNode()->GetTableNode();
- if ( !pTblNd )
+ if ( !pTableNd )
{
OSL_FAIL( "lcl_FindPrevCell not celled with table start node!" );
return false;
}
- SwCntntNode* pCNd = aTmp.GetNode().GetCntntNode();
+ SwContentNode* pCNd = aTmp.GetNode().GetContentNode();
if( !pCNd )
pCNd = SwNodes::GoPrevious( &aTmp );
@@ -441,9 +441,9 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly )
if ( !pCNd )
return false;
- SwCntntFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
+ SwContentFrm* pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
- if( 0 == pFrm || pCNd->FindTableNode() != pTblNd ||
+ if( 0 == pFrm || pCNd->FindTableNode() != pTableNd ||
(!bInReadOnly && pFrm->IsProtected() ))
{
// skip before current section
@@ -452,10 +452,10 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly )
{
SwNode* pNd = &aTmp.GetNode();
- if( pNd == pTblNd || pNd->GetIndex() < pTblNd->GetIndex() )
+ if( pNd == pTableNd || pNd->GetIndex() < pTableNd->GetIndex() )
return false;
- pCNd = aTmp.GetNode().GetCntntNode();
+ pCNd = aTmp.GetNode().GetContentNode();
if( 0 == pCNd )
pCNd = SwNodes::GoPrevious( &aTmp );
@@ -464,7 +464,7 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly )
pFrm = pCNd->getLayoutFrm( pCNd->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout() );
- if( 0 != pFrm && pCNd->FindTableNode() == pTblNd &&
+ if( 0 != pFrm && pCNd->FindTableNode() == pTableNd &&
(bInReadOnly || !pFrm->IsProtected() ) )
{
rIdx = *pCNd;
@@ -477,40 +477,40 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, bool bInReadOnly )
return true;
}
-bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
bool bInReadOnly )
{
SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
- SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
- if( pTblNd )
+ SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
+ if( pTableNd )
{
// #i26532#: If we are inside a table, we may not go backward to the
// table start node, because we would miss any tables inside this table.
- SwTableNode* pInnerTblNd = 0;
+ SwTableNode* pInnerTableNd = 0;
SwNodeIndex aTmpIdx( aIdx );
while( aTmpIdx.GetIndex() &&
- 0 == ( pInnerTblNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+ 0 == ( pInnerTableNd = aTmpIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
--aTmpIdx;
- if( pInnerTblNd == pTblNd )
- aIdx.Assign( *pTblNd, - 1 );
+ if( pInnerTableNd == pTableNd )
+ aIdx.Assign( *pTableNd, - 1 );
}
do {
while( aIdx.GetIndex() &&
- 0 == ( pTblNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
+ 0 == ( pTableNd = aIdx.GetNode().StartOfSectionNode()->GetTableNode()) )
--aIdx;
- if( pTblNd ) // any further table node?
+ if( pTableNd ) // any further table node?
{
- if( fnPosTbl == fnMoveForward ) // at the beginning?
+ if( fnPosTable == fnMoveForward ) // at the beginning?
{
aIdx = *aIdx.GetNode().StartOfSectionNode();
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
{
// skip table
- aIdx.Assign( *pTblNd, -1 );
+ aIdx.Assign( *pTableNd, -1 );
continue;
}
}
@@ -520,48 +520,48 @@ bool GotoPrevTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
{
// skip table
- aIdx.Assign( *pTblNd, -1 );
+ aIdx.Assign( *pTableNd, -1 );
continue;
}
}
- SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
- if ( pTxtNode )
+ SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+ if ( pTextNode )
{
- rCurCrsr.GetPoint()->nNode = *pTxtNode;
- rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
- pTxtNode->Len() :
+ rCurCrsr.GetPoint()->nNode = *pTextNode;
+ rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+ pTextNode->Len() :
0 );
}
return true;
}
- } while( pTblNd );
+ } while( pTableNd );
return false;
}
-bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
bool bInReadOnly )
{
SwNodeIndex aIdx( rCurCrsr.GetPoint()->nNode );
- SwTableNode* pTblNd = aIdx.GetNode().FindTableNode();
+ SwTableNode* pTableNd = aIdx.GetNode().FindTableNode();
- if( pTblNd )
- aIdx.Assign( *pTblNd->EndOfSectionNode(), 1 );
+ if( pTableNd )
+ aIdx.Assign( *pTableNd->EndOfSectionNode(), 1 );
sal_uLong nLastNd = rCurCrsr.GetDoc()->GetNodes().Count() - 1;
do {
while( aIdx.GetIndex() < nLastNd &&
- 0 == ( pTblNd = aIdx.GetNode().GetTableNode()) )
+ 0 == ( pTableNd = aIdx.GetNode().GetTableNode()) )
++aIdx;
- if( pTblNd ) // any further table node?
+ if( pTableNd ) // any further table node?
{
- if( fnPosTbl == fnMoveForward ) // at the beginning?
+ if( fnPosTable == fnMoveForward ) // at the beginning?
{
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
{
// skip table
- aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+ aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
continue;
}
}
@@ -572,93 +572,93 @@ bool GotoNextTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
{
// skip table
- aIdx.Assign( *pTblNd->EndOfSectionNode(), + 1 );
+ aIdx.Assign( *pTableNd->EndOfSectionNode(), + 1 );
continue;
}
}
- SwTxtNode* pTxtNode = aIdx.GetNode().GetTxtNode();
- if ( pTxtNode )
+ SwTextNode* pTextNode = aIdx.GetNode().GetTextNode();
+ if ( pTextNode )
{
- rCurCrsr.GetPoint()->nNode = *pTxtNode;
- rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
- pTxtNode->Len() :
+ rCurCrsr.GetPoint()->nNode = *pTextNode;
+ rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+ pTextNode->Len() :
0 );
}
return true;
}
- } while( pTblNd );
+ } while( pTableNd );
return false;
}
-bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTbl,
+bool GotoCurrTable( SwPaM& rCurCrsr, SwPosTable fnPosTable,
bool bInReadOnly )
{
- SwTableNode* pTblNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
- if( !pTblNd )
+ SwTableNode* pTableNd = rCurCrsr.GetPoint()->nNode.GetNode().FindTableNode();
+ if( !pTableNd )
return false;
- SwTxtNode* pTxtNode = 0;
- if( fnPosTbl == fnMoveBackward ) // to the end of the table
+ SwTextNode* pTextNode = 0;
+ if( fnPosTable == fnMoveBackward ) // to the end of the table
{
- SwNodeIndex aIdx( *pTblNd->EndOfSectionNode() );
+ SwNodeIndex aIdx( *pTableNd->EndOfSectionNode() );
if( !lcl_FindPrevCell( aIdx, bInReadOnly ))
return false;
- pTxtNode = aIdx.GetNode().GetTxtNode();
+ pTextNode = aIdx.GetNode().GetTextNode();
}
else
{
- SwNodeIndex aIdx( *pTblNd );
+ SwNodeIndex aIdx( *pTableNd );
if( !lcl_FindNextCell( aIdx, bInReadOnly ))
return false;
- pTxtNode = aIdx.GetNode().GetTxtNode();
+ pTextNode = aIdx.GetNode().GetTextNode();
}
- if ( pTxtNode )
+ if ( pTextNode )
{
- rCurCrsr.GetPoint()->nNode = *pTxtNode;
- rCurCrsr.GetPoint()->nContent.Assign( pTxtNode, fnPosTbl == fnMoveBackward ?
- pTxtNode->Len() :
+ rCurCrsr.GetPoint()->nNode = *pTextNode;
+ rCurCrsr.GetPoint()->nContent.Assign( pTextNode, fnPosTable == fnMoveBackward ?
+ pTextNode->Len() :
0 );
}
return true;
}
-bool SwCursor::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCursor::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
{
bool bRet = false;
- SwTableCursor* m_pTblCrsr = dynamic_cast<SwTableCursor*>(this);
+ SwTableCursor* m_pTableCrsr = dynamic_cast<SwTableCursor*>(this);
- if( m_pTblCrsr || !HasMark() )
+ if( m_pTableCrsr || !HasMark() )
{
SwCrsrSaveState aSaveState( *this );
- bRet = (*fnWhichTbl)( *this, fnPosTbl, IsReadOnlyAvailable() ) &&
+ bRet = (*fnWhichTable)( *this, fnPosTable, IsReadOnlyAvailable() ) &&
!IsSelOvr( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE );
}
return bRet;
}
-bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
+bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTable, SwPosTable fnPosTable )
{
SwCallLink aLk( *this ); // watch Crsr-Moves; call Link if needed
- SwShellCrsr* pCrsr = m_pTblCrsr ? m_pTblCrsr : m_pCurCrsr;
+ SwShellCrsr* pCrsr = m_pTableCrsr ? m_pTableCrsr : m_pCurCrsr;
bool bCheckPos;
bool bRet;
sal_uLong nPtNd = 0;
sal_Int32 nPtCnt = 0;
- if ( !m_pTblCrsr && m_pCurCrsr->HasMark() )
+ if ( !m_pTableCrsr && m_pCurCrsr->HasMark() )
{
// switch to table mode
- m_pTblCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
+ m_pTableCrsr = new SwShellTableCrsr( *this, *m_pCurCrsr->GetPoint() );
m_pCurCrsr->DeleteMark();
m_pCurCrsr->SwSelPaintRects::Hide();
- m_pTblCrsr->SetMark();
- pCrsr = m_pTblCrsr;
+ m_pTableCrsr->SetMark();
+ pCrsr = m_pTableCrsr;
bCheckPos = false;
}
else
@@ -668,7 +668,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
nPtCnt = pCrsr->GetPoint()->nContent.GetIndex();
}
- bRet = pCrsr->MoveTable( fnWhichTbl, fnPosTbl );
+ bRet = pCrsr->MoveTable( fnWhichTable, fnPosTable );
if( bRet )
{
@@ -685,7 +685,7 @@ bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl, SwPosTable fnPosTbl )
return bRet;
}
-bool SwCrsrShell::IsTblComplexForChart()
+bool SwCrsrShell::IsTableComplexForChart()
{
bool bRet = false;
@@ -696,9 +696,9 @@ bool SwCrsrShell::IsTblComplexForChart()
{
// in a table; check if table or section is balanced
OUString sSel;
- if( m_pTblCrsr )
+ if( m_pTableCrsr )
sSel = GetBoxNms();
- bRet = pTNd->GetTable().IsTblComplexForChart( sSel );
+ bRet = pTNd->GetTable().IsTableComplexForChart( sSel );
}
EndAction();
@@ -713,7 +713,7 @@ OUString SwCrsrShell::GetBoxNms() const
if( IsTableMode() )
{
- SwCntntNode *pCNd = m_pTblCrsr->Start()->nNode.GetNode().GetCntntNode();
+ SwContentNode *pCNd = m_pTableCrsr->Start()->nNode.GetNode().GetContentNode();
pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
if( !pFrm )
return sNm;
@@ -729,17 +729,17 @@ OUString SwCrsrShell::GetBoxNms() const
sNm = static_cast<SwCellFrm*>(pFrm)->GetTabBox()->GetName();
sNm += ":";
- pPos = m_pTblCrsr->End();
+ pPos = m_pTableCrsr->End();
}
else
{
- const SwTableNode* pTblNd = IsCrsrInTbl();
- if( !pTblNd )
+ const SwTableNode* pTableNd = IsCrsrInTable();
+ if( !pTableNd )
return sNm;
pPos = GetCrsr()->GetPoint();
}
- SwCntntNode* pCNd = pPos->nNode.GetNode().GetCntntNode();
+ SwContentNode* pCNd = pPos->nNode.GetNode().GetContentNode();
pFrm = pCNd ? pCNd->getLayoutFrm( GetLayout() ) : 0;
if( pFrm )
@@ -757,7 +757,7 @@ OUString SwCrsrShell::GetBoxNms() const
bool SwCrsrShell::GotoTable( const OUString& rName )
{
SwCallLink aLk( *this ); // watch Crsr-Moves
- bool bRet = !m_pTblCrsr && m_pCurCrsr->GotoTable( rName );
+ bool bRet = !m_pTableCrsr && m_pCurCrsr->GotoTable( rName );
if( bRet )
{
m_pCurCrsr->GetPtPos() = Point();
@@ -767,9 +767,9 @@ bool SwCrsrShell::GotoTable( const OUString& rName )
return bRet;
}
-bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
+bool SwCrsrShell::CheckTableBoxContent( const SwPosition* pPos )
{
- if( !m_pBoxIdx || !m_pBoxPtr || IsSelTblCells() || !IsAutoUpdateCells() )
+ if( !m_pBoxIdx || !m_pBoxPtr || IsSelTableCells() || !IsAutoUpdateCells() )
return false;
// check if box content is consistent with given box format, reset if not
@@ -782,13 +782,13 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
0 != ( pSttNd = m_pBoxIdx->GetNode().GetStartNode() ) &&
SwTableBoxStartNode == pSttNd->GetStartNodeType() &&
m_pBoxPtr == pSttNd->FindTableNode()->GetTable().
- GetTblBox( m_pBoxIdx->GetIndex() ) )
+ GetTableBox( m_pBoxIdx->GetIndex() ) )
pChkBox = m_pBoxPtr;
}
else if( 0 != ( pSttNd = pPos->nNode.GetNode().
FindSttNodeByType( SwTableBoxStartNode )) )
{
- pChkBox = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+ pChkBox = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
}
// box has more than one paragraph
@@ -797,7 +797,7 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
// destroy pointer before next action starts
if( !pPos && !pChkBox )
- ClearTblBoxCntnt();
+ ClearTableBoxContent();
// cursor not anymore in this section?
if( pChkBox && !pPos &&
@@ -809,11 +809,11 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
// could not restore the content properly.
if( pChkBox )
{
- const SwTxtNode* pNd = GetDoc()->GetNodes()[
- pSttNd->GetIndex() + 1 ]->GetTxtNode();
+ const SwTextNode* pNd = GetDoc()->GetNodes()[
+ pSttNd->GetIndex() + 1 ]->GetTextNode();
if( !pNd ||
- ( pNd->GetTxt() == SwViewShell::GetShellRes()->aCalc_Error &&
- SfxItemState::SET == pChkBox->GetFrmFmt()->
+ ( pNd->GetText() == SwViewShell::GetShellRes()->aCalc_Error &&
+ SfxItemState::SET == pChkBox->GetFrameFormat()->
GetItemState( RES_BOXATR_FORMULA )) )
pChkBox = 0;
}
@@ -821,18 +821,18 @@ bool SwCrsrShell::CheckTblBoxCntnt( const SwPosition* pPos )
if( pChkBox )
{
// destroy pointer before next action starts
- ClearTblBoxCntnt();
+ ClearTableBoxContent();
StartAction();
- GetDoc()->ChkBoxNumFmt( *pChkBox, true );
+ GetDoc()->ChkBoxNumFormat( *pChkBox, true );
EndAction();
}
return 0 != pChkBox;
}
-void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwCrsrShell::SaveTableBoxContent( const SwPosition* pPos )
{
- if( IsSelTblCells() || !IsAutoUpdateCells() )
+ if( IsSelTableCells() || !IsAutoUpdateCells() )
return ;
if( !pPos )
@@ -855,12 +855,12 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
{
// check m_pBoxIdx
SwPosition aPos( *m_pBoxIdx );
- CheckTblBoxCntnt( &aPos );
+ CheckTableBoxContent( &aPos );
}
if( pSttNd )
{
- m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTblBox( pSttNd->GetIndex() );
+ m_pBoxPtr = pSttNd->FindTableNode()->GetTable().GetTableBox( pSttNd->GetIndex() );
if( m_pBoxIdx )
*m_pBoxIdx = *pSttNd;
@@ -869,19 +869,19 @@ void SwCrsrShell::SaveTblBoxCntnt( const SwPosition* pPos )
}
}
-void SwCrsrShell::ClearTblBoxCntnt()
+void SwCrsrShell::ClearTableBoxContent()
{
delete m_pBoxIdx, m_pBoxIdx = 0;
m_pBoxPtr = 0;
}
-bool SwCrsrShell::EndAllTblBoxEdit()
+bool SwCrsrShell::EndAllTableBoxEdit()
{
bool bRet = false;
for(SwViewShell& rSh : GetRingContainer())
{
if( rSh.IsA( TYPE( SwCrsrShell ) ) )
- bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTblBoxCntnt(
+ bRet |= static_cast<SwCrsrShell*>(&rSh)->CheckTableBoxContent(
static_cast<SwCrsrShell*>(&rSh)->m_pCurCrsr->GetPoint() );
}
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 991c5548612b..1366935e485c 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -68,16 +68,16 @@ MapMode* SwSelPaintRects::s_pMapMode = 0;
SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
: m_pCrsrShell( pCShell )
{
- pCShell->GetWin()->SetCursor( &m_aTxtCrsr );
- m_bIsVisible = m_aTxtCrsr.IsVisible();
+ pCShell->GetWin()->SetCursor( &m_aTextCrsr );
+ m_bIsVisible = m_aTextCrsr.IsVisible();
m_bIsDragCrsr = false;
- m_aTxtCrsr.SetWidth( 0 );
+ m_aTextCrsr.SetWidth( 0 );
}
SwVisCrsr::~SwVisCrsr()
{
- if( m_bIsVisible && m_aTxtCrsr.IsVisible() )
- m_aTxtCrsr.Hide();
+ if( m_bIsVisible && m_aTextCrsr.IsVisible() )
+ m_aTextCrsr.Hide();
m_pCrsrShell->GetWin()->SetCursor( 0 );
}
@@ -100,8 +100,8 @@ void SwVisCrsr::Hide()
{
m_bIsVisible = false;
- if( m_aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect?
- m_aTxtCrsr.Hide();
+ if( m_aTextCrsr.IsVisible() ) // Shouldn't the flags be in effect?
+ m_aTextCrsr.Hide();
}
}
@@ -112,7 +112,7 @@ void SwVisCrsr::_SetPosAndShow()
if( 0 > nTmpY )
{
nTmpY = -nTmpY;
- m_aTxtCrsr.SetOrientation( 900 );
+ m_aTextCrsr.SetOrientation( 900 );
aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
Size( m_pCrsrShell->m_aCharRect.Height(), nTmpY ) );
aRect.Pos().setX(aRect.Pos().getX() + m_pCrsrShell->m_aCrsrHeight.getX());
@@ -121,30 +121,30 @@ void SwVisCrsr::_SetPosAndShow()
}
else
{
- m_aTxtCrsr.SetOrientation( 0 );
+ m_aTextCrsr.SetOrientation( 0 );
aRect = SwRect( m_pCrsrShell->m_aCharRect.Pos(),
Size( m_pCrsrShell->m_aCharRect.Width(), nTmpY ) );
aRect.Pos().setY(aRect.Pos().getY() + m_pCrsrShell->m_aCrsrHeight.getX());
}
// check if cursor should show the current cursor bidi level
- m_aTxtCrsr.SetDirection( CursorDirection::NONE );
+ m_aTextCrsr.SetDirection( CursorDirection::NONE );
const SwCursor* pTmpCrsr = m_pCrsrShell->_GetCrsr();
if ( pTmpCrsr && !m_pCrsrShell->IsOverwriteCrsr() )
{
SwNode& rNode = pTmpCrsr->GetPoint()->nNode.GetNode();
- if( rNode.IsTxtNode() )
+ if( rNode.IsTextNode() )
{
- const SwTxtNode& rTNd = *rNode.GetTxtNode();
+ const SwTextNode& rTNd = *rNode.GetTextNode();
const SwFrm* pFrm = rTNd.getLayoutFrm( m_pCrsrShell->GetLayout(), 0, 0, false );
if ( pFrm )
{
- const SwScriptInfo* pSI = static_cast<const SwTxtFrm*>(pFrm)->GetScriptInfo();
+ const SwScriptInfo* pSI = static_cast<const SwTextFrm*>(pFrm)->GetScriptInfo();
// cursor level has to be shown
if ( pSI && pSI->CountDirChg() > 1 )
{
- m_aTxtCrsr.SetDirection(
+ m_aTextCrsr.SetDirection(
( pTmpCrsr->GetCrsrBidiLevel() % 2 ) ?
CursorDirection::RTL :
CursorDirection::LTR );
@@ -173,9 +173,9 @@ void SwVisCrsr::_SetPosAndShow()
m_pCrsrShell->IsSelection() )
aRect.Width( 0 );
- m_aTxtCrsr.SetSize( aRect.SSize() );
+ m_aTextCrsr.SetSize( aRect.SSize() );
- m_aTxtCrsr.SetPos( aRect.Pos() );
+ m_aTextCrsr.SetPos( aRect.Pos() );
if (m_pCrsrShell->isTiledRendering())
{
@@ -191,13 +191,13 @@ void SwVisCrsr::_SetPosAndShow()
!m_pCrsrShell->IsSelection() );
sal_uInt16 nStyle = m_bIsDragCrsr ? CURSOR_SHADOW : 0;
- if( nStyle != m_aTxtCrsr.GetStyle() )
+ if( nStyle != m_aTextCrsr.GetStyle() )
{
- m_aTxtCrsr.SetStyle( nStyle );
- m_aTxtCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
+ m_aTextCrsr.SetStyle( nStyle );
+ m_aTextCrsr.SetWindow( m_bIsDragCrsr ? m_pCrsrShell->GetWin() : 0 );
}
- m_aTxtCrsr.Show();
+ m_aTextCrsr.Show();
}
}
@@ -206,8 +206,8 @@ SwSelPaintRects::SwSelPaintRects( const SwCrsrShell& rCSh )
, m_pCursorShell( &rCSh )
#if HAVE_FEATURE_DESKTOP
, m_pCursorOverlay(nullptr)
- , m_bShowTxtInputFldOverlay(true)
- , m_pTxtInputFldOverlay(nullptr)
+ , m_bShowTextInputFieldOverlay(true)
+ , m_pTextInputFieldOverlay(nullptr)
#endif
{
}
@@ -227,13 +227,13 @@ void SwSelPaintRects::swapContent(SwSelPaintRects& rSwap)
setCursorOverlay(rSwap.getCursorOverlay());
rSwap.setCursorOverlay(pTempOverlay);
- const bool bTempShowTxtInputFldOverlay = m_bShowTxtInputFldOverlay;
- m_bShowTxtInputFldOverlay = rSwap.m_bShowTxtInputFldOverlay;
- rSwap.m_bShowTxtInputFldOverlay = bTempShowTxtInputFldOverlay;
+ const bool bTempShowTextInputFieldOverlay = m_bShowTextInputFieldOverlay;
+ m_bShowTextInputFieldOverlay = rSwap.m_bShowTextInputFieldOverlay;
+ rSwap.m_bShowTextInputFieldOverlay = bTempShowTextInputFieldOverlay;
- sw::overlay::OverlayRangesOutline* pTempTxtInputFldOverlay = m_pTxtInputFldOverlay;
- m_pTxtInputFldOverlay = rSwap.m_pTxtInputFldOverlay;
- rSwap.m_pTxtInputFldOverlay = pTempTxtInputFldOverlay;
+ sw::overlay::OverlayRangesOutline* pTempTextInputFieldOverlay = m_pTextInputFieldOverlay;
+ m_pTextInputFieldOverlay = rSwap.m_pTextInputFieldOverlay;
+ rSwap.m_pTextInputFieldOverlay = pTempTextInputFieldOverlay;
#endif
}
@@ -246,10 +246,10 @@ void SwSelPaintRects::Hide()
m_pCursorOverlay = nullptr;
}
- if (m_pTxtInputFldOverlay != nullptr)
+ if (m_pTextInputFieldOverlay != nullptr)
{
- delete m_pTxtInputFldOverlay;
- m_pTxtInputFldOverlay = nullptr;
+ delete m_pTextInputFieldOverlay;
+ m_pTextInputFieldOverlay = nullptr;
}
#endif
@@ -266,8 +266,8 @@ void SwSelPaintRects::Hide()
*/
static SwRect lcl_getLayoutRect(const Point& rPoint, const SwPosition& rPosition)
{
- const SwCntntNode* pNode = rPosition.nNode.GetNode().GetCntntNode();
- const SwCntntFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
+ const SwContentNode* pNode = rPosition.nNode.GetNode().GetContentNode();
+ const SwContentFrm* pFrm = pNode->getLayoutFrm(pNode->GetDoc()->getIDocumentLayoutAccess().GetCurrentLayout(), &rPoint, &rPosition);
SwRect aRect;
pFrm->GetCharRect(aRect, rPosition);
return aRect;
@@ -338,7 +338,7 @@ void SwSelPaintRects::Show()
}
}
- HighlightInputFld();
+ HighlightInputField();
#endif
// Tiled editing does not expose the draw and writer cursor, it just
@@ -384,42 +384,42 @@ void SwSelPaintRects::Show()
}
}
-void SwSelPaintRects::HighlightInputFld()
+void SwSelPaintRects::HighlightInputField()
{
- std::vector< basegfx::B2DRange > aInputFldRanges;
+ std::vector< basegfx::B2DRange > aInputFieldRanges;
- if (m_bShowTxtInputFldOverlay)
+ if (m_bShowTextInputFieldOverlay)
{
- SwTxtInputFld* pCurTxtInputFldAtCrsr =
- dynamic_cast<SwTxtInputFld*>(SwCrsrShell::GetTxtFldAtPos( GetShell()->GetCrsr()->Start(), false ));
- if ( pCurTxtInputFldAtCrsr != NULL )
+ SwTextInputField* pCurTextInputFieldAtCrsr =
+ dynamic_cast<SwTextInputField*>(SwCrsrShell::GetTextFieldAtPos( GetShell()->GetCrsr()->Start(), false ));
+ if ( pCurTextInputFieldAtCrsr != NULL )
{
- SwTxtNode* pTxtNode = pCurTxtInputFldAtCrsr->GetpTxtNode();
- ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTxtFld(
- new SwShellCrsr( *GetShell(), SwPosition( *pTxtNode, pCurTxtInputFldAtCrsr->GetStart() ) ) );
- pCrsrForInputTxtFld->SetMark();
- pCrsrForInputTxtFld->GetMark()->nNode = *pTxtNode;
- pCrsrForInputTxtFld->GetMark()->nContent.Assign( pTxtNode, *(pCurTxtInputFldAtCrsr->End()) );
-
- pCrsrForInputTxtFld->FillRects();
- SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTxtFld.get());
+ SwTextNode* pTextNode = pCurTextInputFieldAtCrsr->GetpTextNode();
+ ::boost::scoped_ptr<SwShellCrsr> pCrsrForInputTextField(
+ new SwShellCrsr( *GetShell(), SwPosition( *pTextNode, pCurTextInputFieldAtCrsr->GetStart() ) ) );
+ pCrsrForInputTextField->SetMark();
+ pCrsrForInputTextField->GetMark()->nNode = *pTextNode;
+ pCrsrForInputTextField->GetMark()->nContent.Assign( pTextNode, *(pCurTextInputFieldAtCrsr->End()) );
+
+ pCrsrForInputTextField->FillRects();
+ SwRects* pRects = static_cast<SwRects*>(pCrsrForInputTextField.get());
for (size_t a(0); a < pRects->size(); ++a)
{
const SwRect aNextRect((*pRects)[a]);
const Rectangle aPntRect(aNextRect.SVRect());
- aInputFldRanges.push_back(basegfx::B2DRange(
+ aInputFieldRanges.push_back(basegfx::B2DRange(
aPntRect.Left(), aPntRect.Top(),
aPntRect.Right() + 1, aPntRect.Bottom() + 1));
}
}
}
- if ( aInputFldRanges.size() > 0 )
+ if ( aInputFieldRanges.size() > 0 )
{
- if (m_pTxtInputFldOverlay != nullptr)
+ if (m_pTextInputFieldOverlay != nullptr)
{
- m_pTxtInputFldOverlay->setRanges( aInputFldRanges );
+ m_pTextInputFieldOverlay->setRanges( aInputFieldRanges );
}
else
{
@@ -434,18 +434,18 @@ void SwSelPaintRects::HighlightInputFld()
Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
aHighlight.DecreaseLuminance( 128 );
- m_pTxtInputFldOverlay = new sw::overlay::OverlayRangesOutline(
- aHighlight, aInputFldRanges );
- xTargetOverlay->add( *m_pTxtInputFldOverlay );
+ m_pTextInputFieldOverlay = new sw::overlay::OverlayRangesOutline(
+ aHighlight, aInputFieldRanges );
+ xTargetOverlay->add( *m_pTextInputFieldOverlay );
}
}
}
else
{
- if (m_pTxtInputFldOverlay != nullptr)
+ if (m_pTextInputFieldOverlay != nullptr)
{
- delete m_pTxtInputFldOverlay;
- m_pTxtInputFldOverlay = nullptr;
+ delete m_pTextInputFieldOverlay;
+ m_pTextInputFieldOverlay = nullptr;
}
}
}
@@ -556,11 +556,11 @@ void SwShellCrsr::FillRects()
{
// calculate the new rectangles
if( HasMark() &&
- GetPoint()->nNode.GetNode().IsCntntNode() &&
- GetPoint()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
+ GetPoint()->nNode.GetNode().IsContentNode() &&
+ GetPoint()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) &&
(GetMark()->nNode == GetPoint()->nNode ||
- (GetMark()->nNode.GetNode().IsCntntNode() &&
- GetMark()->nNode.GetNode().GetCntntNode()->getLayoutFrm( GetShell()->GetLayout() ) ) ))
+ (GetMark()->nNode.GetNode().IsContentNode() &&
+ GetMark()->nNode.GetNode().GetContentNode()->getLayoutFrm( GetShell()->GetLayout() ) ) ))
GetShell()->GetLayout()->CalcFrmRects( *this );
}
@@ -642,9 +642,9 @@ short SwShellCrsr::MaxReplaceArived()
return nRet;
}
-void SwShellCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellCrsr::SaveTableBoxContent( const SwPosition* pPos )
{
- const_cast<SwCrsrShell*>(GetShell())->SaveTblBoxCntnt( pPos );
+ const_cast<SwCrsrShell*>(GetShell())->SaveTableBoxContent( pPos );
}
bool SwShellCrsr::UpDown( bool bUp, sal_uInt16 nCnt )
@@ -696,9 +696,9 @@ short SwShellTableCrsr::MaxReplaceArived()
return SwShellCrsr::MaxReplaceArived();
}
-void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos )
+void SwShellTableCrsr::SaveTableBoxContent( const SwPosition* pPos )
{
- SwShellCrsr::SaveTblBoxCntnt( pPos );
+ SwShellCrsr::SaveTableBoxContent( pPos );
}
void SwShellTableCrsr::FillRects()
@@ -716,20 +716,20 @@ void SwShellTableCrsr::FillRects()
for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
{
const SwStartNode* pSttNd = m_SelectedBoxes[n]->GetSttNd();
- const SwTableNode* pSelTblNd = pSttNd->FindTableNode();
+ const SwTableNode* pSelTableNd = pSttNd->FindTableNode();
SwNodeIndex aIdx( *pSttNd );
- SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+ SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
// table in table
// (see also lcl_FindTopLevelTable in unoobj2.cxx for a different
// version to do this)
- const SwTableNode* pCurTblNd = pCNd ? pCNd->FindTableNode() : NULL;
- while ( pSelTblNd != pCurTblNd && pCurTblNd )
+ const SwTableNode* pCurTableNd = pCNd ? pCNd->FindTableNode() : NULL;
+ while ( pSelTableNd != pCurTableNd && pCurTableNd )
{
- aIdx = pCurTblNd->EndOfSectionIndex();
+ aIdx = pCurTableNd->EndOfSectionIndex();
pCNd = rNds.GoNextSection( &aIdx, true, false );
- pCurTblNd = pCNd->FindTableNode();
+ pCurTableNd = pCNd->FindTableNode();
}
if( !pCNd )
@@ -780,7 +780,7 @@ bool SwShellTableCrsr::IsInside( const Point& rPt ) const
for (size_t n = 0; n < m_SelectedBoxes.size(); ++n)
{
SwNodeIndex aIdx( *m_SelectedBoxes[n]->GetSttNd() );
- SwCntntNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
+ SwContentNode* pCNd = rNds.GoNextSection( &aIdx, true, false );
if( !pCNd )
continue;
diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 1f0260e1c1d0..119376d84e3d 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -54,16 +54,16 @@ namespace
static const int BEHIND_SAME_NODE = 3; // Same node index but content index behind given content index
static const int BEHIND_NODE = 4; // Position behind the given node index
- static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nCntnt )
+ static int lcl_RelativePosition( const SwPosition& rPos, sal_uLong nNode, sal_Int32 nContent )
{
sal_uLong nIndex = rPos.nNode.GetIndex();
int nReturn = BEFORE_NODE;
if( nIndex == nNode )
{
const sal_Int32 nCntIdx = rPos.nContent.GetIndex();
- if( nCntIdx < nCntnt )
+ if( nCntIdx < nContent )
nReturn = BEFORE_SAME_NODE;
- else if( nCntIdx == nCntnt )
+ else if( nCntIdx == nContent )
nReturn = SAME_POSITION;
else
nReturn = BEHIND_SAME_NODE;
@@ -76,11 +76,11 @@ namespace
{
long int m_nIdx;
bool m_bOther;
- sal_Int32 m_nCntnt;
+ sal_Int32 m_nContent;
#if 0
void Dump()
{
- SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nCntnt);
+ SAL_INFO("sw.core", "Index: " << m_nIdx << "\tOther: " << m_bOther << "\tContent: " << m_nContent);
}
#endif
};
@@ -88,33 +88,33 @@ namespace
{
SwPaM* m_pPaM;
bool m_isMark;
- sal_Int32 m_nCntnt;
+ sal_Int32 m_nContent;
};
struct OffsetUpdater
{
- const SwCntntNode* m_pNewCntntNode;
+ const SwContentNode* m_pNewContentNode;
const sal_Int32 m_nOffset;
- OffsetUpdater(SwCntntNode* pNewCntntNode, sal_Int32 nOffset)
- : m_pNewCntntNode(pNewCntntNode), m_nOffset(nOffset) {};
- void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+ OffsetUpdater(SwContentNode* pNewContentNode, sal_Int32 nOffset)
+ : m_pNewContentNode(pNewContentNode), m_nOffset(nOffset) {};
+ void operator()(SwPosition& rPos, sal_Int32 nContent) const
{
- rPos.nNode = *m_pNewCntntNode;
- rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), nCntnt + m_nOffset);
+ rPos.nNode = *m_pNewContentNode;
+ rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), nContent + m_nOffset);
};
};
struct LimitUpdater
{
- const SwCntntNode* m_pNewCntntNode;
+ const SwContentNode* m_pNewContentNode;
const sal_uLong m_nLen;
const sal_Int32 m_nCorrLen;
- LimitUpdater(SwCntntNode* pNewCntntNode, sal_uLong nLen, sal_Int32 nCorrLen)
- : m_pNewCntntNode(pNewCntntNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
- void operator()(SwPosition& rPos, sal_Int32 nCntnt) const
+ LimitUpdater(SwContentNode* pNewContentNode, sal_uLong nLen, sal_Int32 nCorrLen)
+ : m_pNewContentNode(pNewContentNode), m_nLen(nLen), m_nCorrLen(nCorrLen) {};
+ void operator()(SwPosition& rPos, sal_Int32 nContent) const
{
- rPos.nNode = *m_pNewCntntNode;
- if( nCntnt < m_nCorrLen )
+ rPos.nNode = *m_pNewContentNode;
+ if( nContent < m_nCorrLen )
{
- rPos.nContent.Assign(const_cast<SwCntntNode*>(m_pNewCntntNode), std::min( nCntnt, static_cast<sal_Int32>(m_nLen) ) );
+ rPos.nContent.Assign(const_cast<SwContentNode*>(m_pNewContentNode), std::min( nContent, static_cast<sal_Int32>(m_nLen) ) );
}
else
{
@@ -122,14 +122,14 @@ namespace
}
};
};
- struct CntntIdxStoreImpl : sw::mark::CntntIdxStore
+ struct ContentIdxStoreImpl : sw::mark::ContentIdxStore
{
std::vector<MarkEntry> m_aBkmkEntries;
std::vector<MarkEntry> m_aRedlineEntries;
std::vector<MarkEntry> m_aFlyEntries;
std::vector<PaMEntry> m_aUnoCrsrEntries;
std::vector<PaMEntry> m_aShellCrsrEntries;
- typedef boost::function<void (SwPosition& rPos, sal_Int32 nCntnt)> updater_t;
+ typedef boost::function<void (SwPosition& rPos, sal_Int32 nContent)> updater_t;
virtual void Clear() SAL_OVERRIDE
{
m_aBkmkEntries.clear();
@@ -142,17 +142,17 @@ namespace
{
return m_aBkmkEntries.empty() && m_aRedlineEntries.empty() && m_aFlyEntries.empty() && m_aUnoCrsrEntries.empty() && m_aShellCrsrEntries.empty();
}
- virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit=false) SAL_OVERRIDE
+ virtual void Save(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit=false) SAL_OVERRIDE
{
- SaveBkmks(pDoc, nNode, nCntnt);
- SaveRedlines(pDoc, nNode, nCntnt);
- SaveFlys(pDoc, nNode, nCntnt, bSaveFlySplit);
- SaveUnoCrsrs(pDoc, nNode, nCntnt);
- SaveShellCrsrs(pDoc, nNode, nCntnt);
+ SaveBkmks(pDoc, nNode, nContent);
+ SaveRedlines(pDoc, nNode, nContent);
+ SaveFlys(pDoc, nNode, nContent, bSaveFlySplit);
+ SaveUnoCrsrs(pDoc, nNode, nContent);
+ SaveShellCrsrs(pDoc, nNode, nContent);
}
virtual void Restore(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nOffset=0, bool bAuto = false) SAL_OVERRIDE
{
- SwCntntNode* pCNd = pDoc->GetNodes()[ nNode ]->GetCntntNode();
+ SwContentNode* pCNd = pDoc->GetNodes()[ nNode ]->GetContentNode();
updater_t aUpdater = OffsetUpdater(pCNd, nOffset);
RestoreBkmks(pDoc, aUpdater);
RestoreRedlines(pDoc, aUpdater);
@@ -162,7 +162,7 @@ namespace
}
virtual void Restore(SwNode& rNd, sal_Int32 nLen, sal_Int32 nCorrLen) SAL_OVERRIDE
{
- SwCntntNode* pCNd = rNd.GetCntntNode();
+ SwContentNode* pCNd = rNd.GetContentNode();
SwDoc* pDoc = rNd.GetDoc();
updater_t aUpdater = LimitUpdater(pCNd, nLen, nCorrLen);
RestoreBkmks(pDoc, aUpdater);
@@ -171,36 +171,36 @@ namespace
RestoreUnoCrsrs(aUpdater);
RestoreShellCrsrs(aUpdater);
}
- virtual ~CntntIdxStoreImpl(){};
+ virtual ~ContentIdxStoreImpl(){};
private:
- inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+ inline void SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
inline void RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater);
- inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+ inline void SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
inline void RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater);
- inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit);
+ inline void SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit);
inline void RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto);
- inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+ inline void SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
inline void RestoreUnoCrsrs(updater_t& rUpdater);
- inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
+ inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent);
inline void RestoreShellCrsrs(updater_t& rUpdater);
static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
{ return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
{ bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
};
- static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM, const bool bPoint)
+ static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM, const bool bPoint)
{
const SwPosition* pPos = &rPaM.GetBound( bPoint );
- if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nCntnt )
+ if( pPos->nNode.GetIndex() == nNode && pPos->nContent.GetIndex() < nContent )
{
const PaMEntry aEntry = { &rPaM, bPoint, pPos->nContent.GetIndex() };
rPaMEntries.push_back(aEntry);
}
}
- static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM)
+ static inline void lcl_ChkPaMBoth( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nContent, SwPaM& rPaM)
{
- lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, true);
- lcl_ChkPaM(rPaMEntries, nNode, nCntnt, rPaM, false);
+ lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, true);
+ lcl_ChkPaM(rPaMEntries, nNode, nContent, rPaM, false);
}
#if 0
@@ -212,7 +212,7 @@ namespace
#endif
}
-void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
{
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
const IDocumentMarkAccess::const_iterator_t ppBkmkEnd = pMarkAccess->getAllMarksEnd();
@@ -224,19 +224,19 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
const ::sw::mark::IMark* pBkmk = ppBkmk->get();
bool bMarkPosEqual = false;
if(pBkmk->GetMarkPos().nNode.GetIndex() == nNode
- && pBkmk->GetMarkPos().nContent.GetIndex() <= nCntnt)
+ && pBkmk->GetMarkPos().nContent.GetIndex() <= nContent)
{
- if(pBkmk->GetMarkPos().nContent.GetIndex() < nCntnt)
+ if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent)
{
const MarkEntry aEntry = { ppBkmk - pMarkAccess->getAllMarksBegin(), false, pBkmk->GetMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
- else // if a bookmark position is equal nCntnt, the other position
+ else // if a bookmark position is equal nContent, the other position
bMarkPosEqual = true; // has to decide if it is added to the array
}
if(pBkmk->IsExpanded()
&& pBkmk->GetOtherMarkPos().nNode.GetIndex() == nNode
- && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nCntnt)
+ && pBkmk->GetOtherMarkPos().nContent.GetIndex() <= nContent)
{
if(bMarkPosEqual)
{ // the other position is before, the (main) position is equal
@@ -249,7 +249,7 @@ void CntntIdxStoreImpl::SaveBkmks(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt
}
}
-void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
{
IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess();
for (const MarkEntry& aEntry : m_aBkmkEntries)
@@ -257,20 +257,20 @@ void CntntIdxStoreImpl::RestoreBkmks(SwDoc* pDoc, updater_t& rUpdater)
if (MarkBase* pMark = dynamic_cast<MarkBase*>(pMarkAccess->getAllMarksBegin()[aEntry.m_nIdx].get()))
{
SwPosition aNewPos(GetRightMarkPos(pMark, aEntry.m_bOther));
- rUpdater(aNewPos, aEntry.m_nCntnt);
+ rUpdater(aNewPos, aEntry.m_nContent);
SetRightMarkPos(pMark, aEntry.m_bOther, &aNewPos);
}
}
}
-void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
{
- SwRedlineTbl const & pRedlineTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+ SwRedlineTable const & pRedlineTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
long int nIdx = 0;
- for (const SwRangeRedline* pRdl : pRedlineTbl)
+ for (const SwRangeRedline* pRdl : pRedlineTable)
{
- int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nCntnt );
- int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nCntnt ) :
+ int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode, nContent );
+ int nMarkPos = pRdl->HasMark() ? lcl_RelativePosition( *pRdl->GetMark(), nNode, nContent ) :
nPointPos;
// #i59534: We have to store the positions inside the same node before the insert position
// and the one at the insert position if the corresponding Point/Mark position is before
@@ -291,21 +291,21 @@ void CntntIdxStoreImpl::SaveRedlines(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCn
}
}
-void CntntIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreRedlines(SwDoc* pDoc, updater_t& rUpdater)
{
- const SwRedlineTbl& rRedlTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+ const SwRedlineTable& rRedlTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
for (const MarkEntry& aEntry : m_aRedlineEntries)
{
SwPosition* const pPos = aEntry.m_bOther
- ? rRedlTbl[ aEntry.m_nIdx ]->GetMark()
- : rRedlTbl[ aEntry.m_nIdx ]->GetPoint();
- rUpdater(*pPos, aEntry.m_nCntnt);
+ ? rRedlTable[ aEntry.m_nIdx ]->GetMark()
+ : rRedlTable[ aEntry.m_nIdx ]->GetPoint();
+ rUpdater(*pPos, aEntry.m_nContent);
}
}
-void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt, bool bSaveFlySplit)
+void ContentIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent, bool bSaveFlySplit)
{
- SwCntntNode *pNode = pDoc->GetNodes()[nNode]->GetCntntNode();
+ SwContentNode *pNode = pDoc->GetNodes()[nNode]->GetContentNode();
if( !pNode )
return;
SwFrm* pFrm = pNode->getLayoutFrm( pDoc->getIDocumentLayoutAccess().GetCurrentLayout() );
@@ -315,22 +315,22 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
return; // if we have a layout and no DrawObjs, we can skip this
}
MarkEntry aSave = { 0, false, 0 };
- for (const SwFrmFmt* pFrmFmt : *pDoc->GetSpzFrmFmts())
+ for (const SwFrameFormat* pFrameFormat : *pDoc->GetSpzFrameFormats())
{
- if ( RES_FLYFRMFMT == pFrmFmt->Which() || RES_DRAWFRMFMT == pFrmFmt->Which() )
+ if ( RES_FLYFRMFMT == pFrameFormat->Which() || RES_DRAWFRMFMT == pFrameFormat->Which() )
{
- const SwFmtAnchor& rAnchor = pFrmFmt->GetAnchor();
- SwPosition const*const pAPos = rAnchor.GetCntntAnchor();
+ const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+ SwPosition const*const pAPos = rAnchor.GetContentAnchor();
if ( pAPos && ( nNode == pAPos->nNode.GetIndex() ) &&
( FLY_AT_PARA == rAnchor.GetAnchorId() ||
FLY_AT_CHAR == rAnchor.GetAnchorId() ) )
{
bool bSkip = false;
aSave.m_bOther = false;
- aSave.m_nCntnt = pAPos->nContent.GetIndex();
+ aSave.m_nContent = pAPos->nContent.GetIndex();
if ( FLY_AT_CHAR == rAnchor.GetAnchorId() )
{
- if( nCntnt <= aSave.m_nCntnt )
+ if( nContent <= aSave.m_nContent )
{
if( bSaveFlySplit )
aSave.m_bOther = true;
@@ -346,65 +346,65 @@ void CntntIdxStoreImpl::SaveFlys(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt,
}
}
-void CntntIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
+void ContentIdxStoreImpl::RestoreFlys(SwDoc* pDoc, updater_t& rUpdater, bool bAuto)
{
- SwFrmFmts* pSpz = pDoc->GetSpzFrmFmts();
+ SwFrameFormats* pSpz = pDoc->GetSpzFrameFormats();
for (const MarkEntry& aEntry : m_aFlyEntries)
{
if(!aEntry.m_bOther)
{
- SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
- const SwFmtAnchor& rFlyAnchor = pFrmFmt->GetAnchor();
- if( rFlyAnchor.GetCntntAnchor() )
+ SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+ const SwFormatAnchor& rFlyAnchor = pFrameFormat->GetAnchor();
+ if( rFlyAnchor.GetContentAnchor() )
{
- SwFmtAnchor aNew( rFlyAnchor );
- SwPosition aNewPos( *rFlyAnchor.GetCntntAnchor() );
- rUpdater(aNewPos, aEntry.m_nCntnt);
+ SwFormatAnchor aNew( rFlyAnchor );
+ SwPosition aNewPos( *rFlyAnchor.GetContentAnchor() );
+ rUpdater(aNewPos, aEntry.m_nContent);
if ( FLY_AT_CHAR != rFlyAnchor.GetAnchorId() )
{
aNewPos.nContent.Assign( 0, 0 );
}
aNew.SetAnchor( &aNewPos );
- pFrmFmt->SetFmtAttr( aNew );
+ pFrameFormat->SetFormatAttr( aNew );
}
}
else if( bAuto )
{
- SwFrmFmt *pFrmFmt = (*pSpz)[ aEntry.m_nIdx ];
- SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrmFmt->GetAnchor();
- pFrmFmt->NotifyClients( pAnchor, pAnchor );
+ SwFrameFormat *pFrameFormat = (*pSpz)[ aEntry.m_nIdx ];
+ SfxPoolItem *pAnchor = (SfxPoolItem*)&pFrameFormat->GetAnchor();
+ pFrameFormat->NotifyClients( pAnchor, pAnchor );
}
}
}
-void CntntIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveUnoCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
{
- for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTbl())
+ for (const SwUnoCrsr* pUnoCrsr : pDoc->GetUnoCrsrTable())
{
for(SwPaM& rPaM : (const_cast<SwUnoCrsr*>(pUnoCrsr))->GetRingContainer())
{
- lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+ lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
}
- const SwUnoTableCrsr* pUnoTblCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
- if( pUnoTblCrsr )
+ const SwUnoTableCrsr* pUnoTableCrsr = dynamic_cast<const SwUnoTableCrsr*>(pUnoCrsr);
+ if( pUnoTableCrsr )
{
- for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTblCrsr))->GetSelRing())->GetRingContainer())
+ for(SwPaM& rPaM : (&(const_cast<SwUnoTableCrsr*>(pUnoTableCrsr))->GetSelRing())->GetRingContainer())
{
- lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nCntnt, rPaM);
+ lcl_ChkPaMBoth( m_aUnoCrsrEntries, nNode, nContent, rPaM);
}
}
}
}
-void CntntIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreUnoCrsrs(updater_t& rUpdater)
{
for (const PaMEntry& aEntry : m_aUnoCrsrEntries)
{
- rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nCntnt);
+ rUpdater(aEntry.m_pPaM->GetBound(!aEntry.m_isMark), aEntry.m_nContent);
}
}
-void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt)
+void ContentIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nContent)
{
SwCrsrShell* pShell = pDoc->GetEditShell();
if( !pShell )
@@ -416,30 +416,30 @@ void CntntIdxStoreImpl::SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 n
SwPaM *_pStkCrsr = static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr();
if( _pStkCrsr )
do {
- lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, *_pStkCrsr);
+ lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, *_pStkCrsr);
} while ( (_pStkCrsr != 0 ) &&
((_pStkCrsr = _pStkCrsr->GetNext()) != static_cast<SwCrsrShell*>(&rCurShell)->GetStkCrsr()) );
for(SwPaM& rPaM : (static_cast<SwCrsrShell*>(&rCurShell)->_GetCrsr())->GetRingContainer())
{
- lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nCntnt, rPaM);
+ lcl_ChkPaMBoth( m_aShellCrsrEntries, nNode, nContent, rPaM);
}
}
}
}
-void CntntIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
+void ContentIdxStoreImpl::RestoreShellCrsrs(updater_t& rUpdater)
{
for (const PaMEntry& aEntry : m_aShellCrsrEntries)
{
- rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nCntnt);
+ rUpdater(aEntry.m_pPaM->GetBound(aEntry.m_isMark), aEntry.m_nContent);
}
}
namespace sw { namespace mark {
- std::shared_ptr<CntntIdxStore> CntntIdxStore::Create()
+ std::shared_ptr<ContentIdxStore> ContentIdxStore::Create()
{
- return std::make_shared<CntntIdxStoreImpl>();
+ return std::make_shared<ContentIdxStoreImpl>();
}
}}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/DocumentChartDataProviderManager.cxx b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
index cd8d0e3352d1..a24cd7b22517 100644
--- a/sw/source/core/doc/DocumentChartDataProviderManager.cxx
+++ b/sw/source/core/doc/DocumentChartDataProviderManager.cxx
@@ -58,7 +58,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
{
if (pTable)
{
- OUString aName( pTable->GetFrmFmt()->GetName() );
+ OUString aName( pTable->GetFrameFormat()->GetName() );
SwOLENode *pONd;
SwStartNode *pStNd;
SwNodeIndex aIdx( *m_rDoc.GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -66,7 +66,7 @@ void DocumentChartDataProviderManager::CreateChartInternalDataProviders( const S
{
++aIdx;
if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
- aName == pONd->GetChartTblName() /* OLE node is chart? */ &&
+ aName == pONd->GetChartTableName() /* OLE node is chart? */ &&
0 != (pONd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout() )) /* chart frame is not hidden */ )
{
uno::Reference < embed::XEmbeddedObject > xIP = pONd->GetOLEObj().GetOleRef();
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index 349e457de7dc..06c0c4c8ad82 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -83,13 +83,13 @@ namespace
static bool lcl_ChkFlyFly( SwDoc* pDoc, sal_uLong nSttNd, sal_uLong nEndNd,
sal_uLong nInsNd )
{
- const SwFrmFmts& rFrmFmtTbl = *pDoc->GetSpzFrmFmts();
+ const SwFrameFormats& rFrameFormatTable = *pDoc->GetSpzFrameFormats();
- for( size_t n = 0; n < rFrmFmtTbl.size(); ++n )
+ for( size_t n = 0; n < rFrameFormatTable.size(); ++n )
{
- SwFrmFmt const*const pFmt = rFrmFmtTbl[n];
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ SwFrameFormat const*const pFormat = rFrameFormatTable[n];
+ SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
((FLY_AS_CHAR == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId()) ||
@@ -98,10 +98,10 @@ namespace
nSttNd <= pAPos->nNode.GetIndex() &&
pAPos->nNode.GetIndex() < nEndNd )
{
- const SwFmtCntnt& rCntnt = pFmt->GetCntnt();
+ const SwFormatContent& rContent = pFormat->GetContent();
SwStartNode* pSNd;
- if( !rCntnt.GetCntntIdx() ||
- 0 == ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ))
+ if( !rContent.GetContentIdx() ||
+ 0 == ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ))
continue;
if( pSNd->GetIndex() < nInsNd &&
@@ -169,20 +169,20 @@ namespace
sal_uLong nNdOff = rOrigPos.nNode.GetIndex();
nNdOff -= rOrigStt.nNode.GetIndex();
nNdOff -= nDelCount;
- sal_Int32 nCntntPos = rOrigPos.nContent.GetIndex();
+ sal_Int32 nContentPos = rOrigPos.nContent.GetIndex();
// Always adjust <nNode> at to be changed <SwPosition> instance <rChgPos>
rChgPos.nNode = nNdOff + rCpyStt.nNode.GetIndex();
if( !nNdOff )
{
// dann nur den Content anpassen
- if( nCntntPos > rOrigStt.nContent.GetIndex() )
- nCntntPos -= rOrigStt.nContent.GetIndex();
+ if( nContentPos > rOrigStt.nContent.GetIndex() )
+ nContentPos -= rOrigStt.nContent.GetIndex();
else
- nCntntPos = 0;
- nCntntPos += rCpyStt.nContent.GetIndex();
+ nContentPos = 0;
+ nContentPos += rCpyStt.nContent.GetIndex();
}
- rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetCntntNode(), nCntntPos );
+ rChgPos.nContent.Assign( rChgPos.nNode.GetNode().GetContentNode(), nContentPos );
}
// TODO: use SaveBookmark (from _DelBookmarks)
@@ -288,8 +288,8 @@ namespace
static void lcl_DeleteRedlines( const SwPaM& rPam, SwPaM& rCpyPam )
{
const SwDoc* pSrcDoc = rPam.GetDoc();
- const SwRedlineTbl& rTbl = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl();
- if( !rTbl.empty() )
+ const SwRedlineTable& rTable = pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable();
+ if( !rTable.empty() )
{
SwDoc* pDestDoc = rCpyPam.GetDoc();
SwPosition* pCpyStt = rCpyPam.Start(), *pCpyEnd = rCpyPam.End();
@@ -301,9 +301,9 @@ namespace
sal_uInt16 n = 0;
pSrcDoc->getIDocumentRedlineAccess().GetRedline( *pStt, &n );
- for( ; n < rTbl.size(); ++n )
+ for( ; n < rTable.size(); ++n )
{
- const SwRangeRedline* pRedl = rTbl[ n ];
+ const SwRangeRedline* pRedl = rTable[ n ];
if( nsRedlineType_t::REDLINE_DELETE == pRedl->GetType() && pRedl->IsVisible() )
{
const SwPosition *pRStt = pRedl->Start(), *pREnd = pRedl->End();
@@ -319,7 +319,7 @@ namespace
case POS_COLLIDE_START:
case POS_BEHIND:
// Pos1 is after Pos2
- n = rTbl.size();
+ n = rTable.size();
break;
default:
@@ -369,7 +369,7 @@ namespace
static void lcl_DeleteRedlines( const SwNodeRange& rRg, SwNodeRange& rCpyRg )
{
SwDoc* pSrcDoc = rRg.aStart.GetNode().GetDoc();
- if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if( !pSrcDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() )
{
SwPaM aRgTmp( rRg.aStart, rRg.aEnd );
SwPaM aCpyTmp( rCpyRg.aStart, rCpyRg.aEnd );
@@ -377,19 +377,19 @@ namespace
}
}
- static void lcl_ChainFmts( SwFlyFrmFmt *pSrc, SwFlyFrmFmt *pDest )
+ static void lcl_ChainFormats( SwFlyFrameFormat *pSrc, SwFlyFrameFormat *pDest )
{
- SwFmtChain aSrc( pSrc->GetChain() );
+ SwFormatChain aSrc( pSrc->GetChain() );
if ( !aSrc.GetNext() )
{
aSrc.SetNext( pDest );
- pSrc->SetFmtAttr( aSrc );
+ pSrc->SetFormatAttr( aSrc );
}
- SwFmtChain aDest( pDest->GetChain() );
+ SwFormatChain aDest( pDest->GetChain() );
if ( !aDest.GetPrev() )
{
aDest.SetPrev( pSrc );
- pDest->SetFmtAttr( aDest );
+ pDest->SetFormatAttr( aDest );
}
}
@@ -398,10 +398,10 @@ namespace
{
bool bRet = false;
- const SwTxtNode* pTxtNd = rPam.Start()->nNode.GetNode().GetTxtNode();
- const SwTxtNode* pEndTxtNd = rPam.End()->nNode.GetNode().GetTxtNode();
- if ( pTxtNd && pTxtNd->IsInList() &&
- pEndTxtNd && pEndTxtNd->IsInList() )
+ const SwTextNode* pTextNd = rPam.Start()->nNode.GetNode().GetTextNode();
+ const SwTextNode* pEndTextNd = rPam.End()->nNode.GetNode().GetTextNode();
+ if ( pTextNd && pTextNd->IsInList() &&
+ pEndTextNd && pEndTextNd->IsInList() )
{
bRet = true;
SwNodeIndex aIdx(rPam.Start()->nNode);
@@ -409,14 +409,14 @@ namespace
do
{
++aIdx;
- pTxtNd = aIdx.GetNode().GetTxtNode();
+ pTextNd = aIdx.GetNode().GetTextNode();
- if ( !pTxtNd || !pTxtNd->IsInList() )
+ if ( !pTextNd || !pTextNd->IsInList() )
{
bRet = false;
break;
}
- } while ( pTxtNd && pTxtNd != pEndTxtNd );
+ } while ( pTextNd && pTextNd != pEndTextNd );
}
return bRet;
@@ -430,8 +430,8 @@ namespace
if (NULL != pStt && NULL != pEnd)
{
- const SwTxtNode* pSttNd = pStt->nNode.GetNode().GetTxtNode();
- const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
+ const SwTextNode* pSttNd = pStt->nNode.GetNode().GetTextNode();
+ const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
if (NULL != pSttNd && NULL != pEndNd &&
pStt->nContent.GetIndex() == 0 &&
@@ -451,25 +451,25 @@ namespace
static void
lcl_CalcBreaks( ::std::vector<sal_Int32> & rBreaks, SwPaM const & rPam )
{
- SwTxtNode const * const pTxtNode(
- rPam.End()->nNode.GetNode().GetTxtNode() );
- if (!pTxtNode)
+ SwTextNode const * const pTextNode(
+ rPam.End()->nNode.GetNode().GetTextNode() );
+ if (!pTextNode)
return; // left-overlap only possible at end of selection...
const sal_Int32 nStart(rPam.Start()->nContent.GetIndex());
const sal_Int32 nEnd (rPam.End ()->nContent.GetIndex());
- if (nEnd == pTxtNode->Len())
+ if (nEnd == pTextNode->Len())
return; // paragraph selected until the end
for (sal_Int32 i = nStart; i < nEnd; ++i)
{
- const sal_Unicode c(pTxtNode->GetTxt()[i]);
+ const sal_Unicode c(pTextNode->GetText()[i]);
if ((CH_TXTATR_INWORD == c) || (CH_TXTATR_BREAKWORD == c))
{
- SwTxtAttr const * const pAttr( pTxtNode->GetTxtAttrForCharAt(i) );
+ SwTextAttr const * const pAttr( pTextNode->GetTextAttrForCharAt(i) );
if (pAttr && pAttr->End() && (*pAttr->End() > nEnd))
{
- OSL_ENSURE(pAttr->HasDummyChar(), "GetTxtAttrForCharAt broken?");
+ OSL_ENSURE(pAttr->HasDummyChar(), "GetTextAttrForCharAt broken?");
rBreaks.push_back(i);
}
}
@@ -529,11 +529,11 @@ namespace
if( rPam.GetPoint()->nNode != rPam.GetMark()->nNode )
{
const SwPosition* pStt = rPam.Start(), *pEnd = rPam.End();
- const SwTxtNode* pEndNd = pEnd->nNode.GetNode().GetTxtNode();
- if( (0 != pEndNd) && pStt->nNode.GetNode().IsTxtNode() )
+ const SwTextNode* pEndNd = pEnd->nNode.GetNode().GetTextNode();
+ if( (0 != pEndNd) && pStt->nNode.GetNode().IsTextNode() )
{
const sal_uInt64 nSum = pStt->nContent.GetIndex() +
- pEndNd->GetTxt().getLength() - pEnd->nContent.GetIndex();
+ pEndNd->GetText().getLength() - pEnd->nContent.GetIndex();
return nSum > static_cast<sal_uInt64>(SAL_MAX_INT32);
}
}
@@ -598,22 +598,22 @@ namespace
void SetPos( sal_uInt32 nInsPos )
{
pRedl->GetPoint()->nNode = nInsPos + nStt;
- pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt );
+ pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt );
if( pRedl->HasMark() )
{
pRedl->GetMark()->nNode = nInsPos + nEnd;
- pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt );
+ pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt );
}
}
void SetPos( const SwPosition& aPos )
{
pRedl->GetPoint()->nNode = aPos.nNode.GetIndex() + nStt;
- pRedl->GetPoint()->nContent.Assign( pRedl->GetCntntNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
+ pRedl->GetPoint()->nContent.Assign( pRedl->GetContentNode(), nSttCnt + ( nStt == 0 ? aPos.nContent.GetIndex() : 0 ) );
if( pRedl->HasMark() )
{
pRedl->GetMark()->nNode = aPos.nNode.GetIndex() + nEnd;
- pRedl->GetMark()->nContent.Assign( pRedl->GetCntntNode(false), nEndCnt + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
+ pRedl->GetMark()->nContent.Assign( pRedl->GetContentNode(false), nEndCnt + ( nEnd == 0 ? aPos.nContent.GetIndex() : 0 ) );
}
}
};
@@ -639,7 +639,7 @@ namespace
// iterate over relevant redlines and decide for each whether it should
// be saved, or split + saved
- SwRedlineTbl& rRedlineTable = const_cast<SwRedlineTbl&>( pDoc->getIDocumentRedlineAccess().GetRedlineTbl() );
+ SwRedlineTable& rRedlineTable = const_cast<SwRedlineTable&>( pDoc->getIDocumentRedlineAccess().GetRedlineTable() );
for( ; nCurrentRedline < rRedlineTable.size(); nCurrentRedline++ )
{
SwRangeRedline* pCurrent = rRedlineTable[ nCurrentRedline ];
@@ -706,18 +706,18 @@ namespace
SwDoc* pDoc = rRg.aStart.GetNode().GetDoc();
sal_uInt16 nRedlPos;
SwPosition aSrchPos( rRg.aStart ); aSrchPos.nNode--;
- aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetCntntNode(), 0 );
+ aSrchPos.nContent.Assign( aSrchPos.nNode.GetNode().GetContentNode(), 0 );
if( pDoc->getIDocumentRedlineAccess().GetRedline( aSrchPos, &nRedlPos ) && nRedlPos )
--nRedlPos;
- else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() )
+ else if( nRedlPos >= pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() )
return ;
RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( (RedlineMode_t)(( eOld & ~nsRedlineMode_t::REDLINE_IGNORE) | nsRedlineMode_t::REDLINE_ON ));
- SwRedlineTbl& rRedlTbl = (SwRedlineTbl&)pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
+ SwRedlineTable& rRedlTable = (SwRedlineTable&)pDoc->getIDocumentRedlineAccess().GetRedlineTable();
do {
- SwRangeRedline* pTmp = rRedlTbl[ nRedlPos ];
+ SwRangeRedline* pTmp = rRedlTable[ nRedlPos ];
const SwPosition* pRStt = pTmp->Start(),
* pREnd = pTmp->GetMark() == pRStt
@@ -733,7 +733,7 @@ namespace
SwPosition* pTmpPos = pNewRedl->Start();
pTmpPos->nNode = rRg.aStart;
pTmpPos->nContent.Assign(
- pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+ pTmpPos->nNode.GetNode().GetContentNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
rArr.push_back( pSave );
@@ -741,19 +741,19 @@ namespace
pTmpPos = pTmp->End();
pTmpPos->nNode = rRg.aEnd;
pTmpPos->nContent.Assign(
- pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+ pTmpPos->nNode.GetNode().GetContentNode(), 0 );
}
else if( pREnd->nNode == rRg.aStart )
{
SwPosition* pTmpPos = pTmp->End();
pTmpPos->nNode = rRg.aEnd;
pTmpPos->nContent.Assign(
- pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+ pTmpPos->nNode.GetNode().GetContentNode(), 0 );
}
}
else if( pRStt->nNode < rRg.aEnd )
{
- rRedlTbl.Remove( nRedlPos-- );
+ rRedlTable.Remove( nRedlPos-- );
if( pREnd->nNode < rRg.aEnd ||
( pREnd->nNode == rRg.aEnd && !pREnd->nContent.GetIndex()) )
{
@@ -768,7 +768,7 @@ namespace
SwPosition* pTmpPos = pNewRedl->End();
pTmpPos->nNode = rRg.aEnd;
pTmpPos->nContent.Assign(
- pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+ pTmpPos->nNode.GetNode().GetContentNode(), 0 );
_SaveRedline* pSave = new _SaveRedline( pNewRedl, rRg.aStart );
rArr.push_back( pSave );
@@ -776,14 +776,14 @@ namespace
pTmpPos = pTmp->Start();
pTmpPos->nNode = rRg.aEnd;
pTmpPos->nContent.Assign(
- pTmpPos->nNode.GetNode().GetCntntNode(), 0 );
+ pTmpPos->nNode.GetNode().GetContentNode(), 0 );
pDoc->getIDocumentRedlineAccess().AppendRedline( pTmp, true );
}
}
else
break;
- } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTbl().size() );
+ } while( ++nRedlPos < pDoc->getIDocumentRedlineAccess().GetRedlineTable().size() );
pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
}
@@ -801,110 +801,110 @@ namespace
pDoc->getIDocumentRedlineAccess().SetRedlineMode_intern( eOld );
}
- static bool lcl_SaveFtn( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
+ static bool lcl_SaveFootnote( const SwNodeIndex& rSttNd, const SwNodeIndex& rEndNd,
const SwNodeIndex& rInsPos,
- SwFtnIdxs& rFtnArr, SwFtnIdxs& rSaveArr,
+ SwFootnoteIdxs& rFootnoteArr, SwFootnoteIdxs& rSaveArr,
const SwIndex* pSttCnt = 0, const SwIndex* pEndCnt = 0 )
{
- bool bUpdateFtn = false;
+ bool bUpdateFootnote = false;
const SwNodes& rNds = rInsPos.GetNodes();
- const bool bDelFtn = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
+ const bool bDelFootnote = rInsPos.GetIndex() < rNds.GetEndOfAutotext().GetIndex() &&
rSttNd.GetIndex() >= rNds.GetEndOfAutotext().GetIndex();
- const bool bSaveFtn = !bDelFtn &&
+ const bool bSaveFootnote = !bDelFootnote &&
rInsPos.GetIndex() >= rNds.GetEndOfExtras().GetIndex();
- if( !rFtnArr.empty() )
+ if( !rFootnoteArr.empty() )
{
size_t nPos = 0;
- rFtnArr.SeekEntry( rSttNd, &nPos );
- SwTxtFtn* pSrch;
- const SwNode* pFtnNd;
+ rFootnoteArr.SeekEntry( rSttNd, &nPos );
+ SwTextFootnote* pSrch;
+ const SwNode* pFootnoteNd;
// Delete/save all that come after it
- while( nPos < rFtnArr.size() && ( pFtnNd =
- &( pSrch = rFtnArr[ nPos ] )->GetTxtNode())->GetIndex()
+ while( nPos < rFootnoteArr.size() && ( pFootnoteNd =
+ &( pSrch = rFootnoteArr[ nPos ] )->GetTextNode())->GetIndex()
<= rEndNd.GetIndex() )
{
- const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+ const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
if( ( pEndCnt && pSttCnt )
- ? (( &rSttNd.GetNode() == pFtnNd &&
- pSttCnt->GetIndex() > nFtnSttIdx) ||
- ( &rEndNd.GetNode() == pFtnNd &&
- nFtnSttIdx >= pEndCnt->GetIndex() ))
- : ( &rEndNd.GetNode() == pFtnNd ))
+ ? (( &rSttNd.GetNode() == pFootnoteNd &&
+ pSttCnt->GetIndex() > nFootnoteSttIdx) ||
+ ( &rEndNd.GetNode() == pFootnoteNd &&
+ nFootnoteSttIdx >= pEndCnt->GetIndex() ))
+ : ( &rEndNd.GetNode() == pFootnoteNd ))
{
++nPos; // continue searching
}
else
{
// delete it
- if( bDelFtn )
+ if( bDelFootnote )
{
- SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
- SwIndex aIdx( &rTxtNd, nFtnSttIdx );
- rTxtNd.EraseText( aIdx, 1 );
+ SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+ SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+ rTextNd.EraseText( aIdx, 1 );
}
else
{
pSrch->DelFrms(0);
- rFtnArr.erase( rFtnArr.begin() + nPos );
- if( bSaveFtn )
+ rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+ if( bSaveFootnote )
rSaveArr.insert( pSrch );
}
- bUpdateFtn = true;
+ bUpdateFootnote = true;
}
}
- while( nPos-- && ( pFtnNd = &( pSrch = rFtnArr[ nPos ] )->
- GetTxtNode())->GetIndex() >= rSttNd.GetIndex() )
+ while( nPos-- && ( pFootnoteNd = &( pSrch = rFootnoteArr[ nPos ] )->
+ GetTextNode())->GetIndex() >= rSttNd.GetIndex() )
{
- const sal_Int32 nFtnSttIdx = pSrch->GetStart();
+ const sal_Int32 nFootnoteSttIdx = pSrch->GetStart();
if( !pEndCnt || !pSttCnt ||
- !( (( &rSttNd.GetNode() == pFtnNd &&
- pSttCnt->GetIndex() > nFtnSttIdx ) ||
- ( &rEndNd.GetNode() == pFtnNd &&
- nFtnSttIdx >= pEndCnt->GetIndex() )) ))
+ !( (( &rSttNd.GetNode() == pFootnoteNd &&
+ pSttCnt->GetIndex() > nFootnoteSttIdx ) ||
+ ( &rEndNd.GetNode() == pFootnoteNd &&
+ nFootnoteSttIdx >= pEndCnt->GetIndex() )) ))
{
- if( bDelFtn )
+ if( bDelFootnote )
{
// delete it
- SwTxtNode& rTxtNd = (SwTxtNode&)pSrch->GetTxtNode();
- SwIndex aIdx( &rTxtNd, nFtnSttIdx );
- rTxtNd.EraseText( aIdx, 1 );
+ SwTextNode& rTextNd = (SwTextNode&)pSrch->GetTextNode();
+ SwIndex aIdx( &rTextNd, nFootnoteSttIdx );
+ rTextNd.EraseText( aIdx, 1 );
}
else
{
pSrch->DelFrms(0);
- rFtnArr.erase( rFtnArr.begin() + nPos );
- if( bSaveFtn )
+ rFootnoteArr.erase( rFootnoteArr.begin() + nPos );
+ if( bSaveFootnote )
rSaveArr.insert( pSrch );
}
- bUpdateFtn = true;
+ bUpdateFootnote = true;
}
}
}
// When moving from redline section into document content section, e.g.
// after loading a document with (delete-)redlines, the footnote array
// has to be adjusted... (#i70572)
- if( bSaveFtn )
+ if( bSaveFootnote )
{
SwNodeIndex aIdx( rSttNd );
while( aIdx < rEndNd ) // Check the moved section
{
SwNode* pNode = &aIdx.GetNode();
- if( pNode->IsTxtNode() ) // Looking for text nodes...
+ if( pNode->IsTextNode() ) // Looking for text nodes...
{
- SwpHints *pHints = pNode->GetTxtNode()->GetpSwpHints();
- if( pHints && pHints->HasFtn() ) //...with footnotes
+ SwpHints *pHints = pNode->GetTextNode()->GetpSwpHints();
+ if( pHints && pHints->HasFootnote() ) //...with footnotes
{
- bUpdateFtn = true; // Heureka
+ bUpdateFootnote = true; // Heureka
const size_t nCount = pHints->Count();
for( size_t i = 0; i < nCount; ++i )
{
- SwTxtAttr *pAttr = pHints->GetTextHint( i );
+ SwTextAttr *pAttr = pHints->GetTextHint( i );
if ( pAttr->Which() == RES_TXTATR_FTN )
{
- rSaveArr.insert( static_cast<SwTxtFtn*>(pAttr) );
+ rSaveArr.insert( static_cast<SwTextFootnote*>(pAttr) );
}
}
}
@@ -912,17 +912,17 @@ namespace
++aIdx;
}
}
- return bUpdateFtn;
+ return bUpdateFootnote;
}
- static bool lcl_MayOverwrite( const SwTxtNode *pNode, const sal_Int32 nPos )
+ static bool lcl_MayOverwrite( const SwTextNode *pNode, const sal_Int32 nPos )
{
- sal_Unicode const cChr = pNode->GetTxt()[nPos];
+ sal_Unicode const cChr = pNode->GetText()[nPos];
switch (cChr)
{
case CH_TXTATR_BREAKWORD:
case CH_TXTATR_INWORD:
- return !pNode->GetTxtAttrForCharAt(nPos);// how could there be none?
+ return !pNode->GetTextAttrForCharAt(nPos);// how could there be none?
case CH_TXT_ATR_FIELDSTART:
case CH_TXT_ATR_FIELDEND:
case CH_TXT_ATR_FORMELEMENT:
@@ -932,7 +932,7 @@ namespace
}
}
- static void lcl_SkipAttr( const SwTxtNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
+ static void lcl_SkipAttr( const SwTextNode *pNode, SwIndex &rIdx, sal_Int32 &rStart )
{
if( !lcl_MayOverwrite( pNode, rStart ) )
{
@@ -940,7 +940,7 @@ namespace
do {
++rIdx;
rStart = rIdx.GetIndex();
- } while (rStart < pNode->GetTxt().getLength()
+ } while (rStart < pNode->GetText().getLength()
&& !lcl_MayOverwrite(pNode, rStart) );
}
}
@@ -986,7 +986,7 @@ namespace //local functions originally from docfmt.cxx
#define DELETECHARSETS if ( bDelete ) { delete pCharSet; delete pOtherSet; }
/// Insert Hints according to content types;
- // Is used in SwDoc::Insert(..., SwFmtHint &rHt)
+ // Is used in SwDoc::Insert(..., SwFormatHint &rHt)
static bool lcl_InsAttr(
SwDoc *const pDoc,
@@ -1072,15 +1072,15 @@ namespace //local functions originally from docfmt.cxx
SwHistory* pHistory = pUndo ? &pUndo->GetHistory() : 0;
bool bRet = false;
const SwPosition *pStt = rRg.Start(), *pEnd = rRg.End();
- SwCntntNode* pNode = pStt->nNode.GetNode().GetCntntNode();
+ SwContentNode* pNode = pStt->nNode.GetNode().GetContentNode();
- if( pNode && pNode->IsTxtNode() )
+ if( pNode && pNode->IsTextNode() )
{
// #i27615#
if (rRg.IsInFrontOfLabel())
{
- SwTxtNode * pTxtNd = pNode->GetTxtNode();
- SwNumRule * pNumRule = pTxtNd->GetNumRule();
+ SwTextNode * pTextNd = pNode->GetTextNode();
+ SwNumRule * pNumRule = pTextNd->GetNumRule();
if ( !pNumRule )
{
@@ -1089,7 +1089,7 @@ namespace //local functions originally from docfmt.cxx
return false;
}
- int nLevel = pTxtNd->GetActualListLevel();
+ int nLevel = pTextNd->GetActualListLevel();
if (nLevel < 0)
nLevel = 0;
@@ -1097,17 +1097,17 @@ namespace //local functions originally from docfmt.cxx
if (nLevel >= MAXLEVEL)
nLevel = MAXLEVEL - 1;
- SwNumFmt aNumFmt = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
- SwCharFmt * pCharFmt =
- pDoc->FindCharFmtByName(aNumFmt.GetCharFmtName());
+ SwNumFormat aNumFormat = pNumRule->Get(static_cast<sal_uInt16>(nLevel));
+ SwCharFormat * pCharFormat =
+ pDoc->FindCharFormatByName(aNumFormat.GetCharFormatName());
- if (pCharFmt)
+ if (pCharFormat)
{
if (pHistory)
- pHistory->Add(pCharFmt->GetAttrSet(), *pCharFmt);
+ pHistory->Add(pCharFormat->GetAttrSet(), *pCharFormat);
if ( pCharSet )
- pCharFmt->SetFmtAttr(*pCharSet);
+ pCharFormat->SetFormatAttr(*pCharSet);
}
DELETECHARSETS
@@ -1119,17 +1119,17 @@ namespace //local functions originally from docfmt.cxx
// Attributes without an end do not have a range
if ( !bCharAttr && !bOtherAttr )
{
- SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+ SfxItemSet aTextSet( pDoc->GetAttrPool(),
RES_TXTATR_NOEND_BEGIN, RES_TXTATR_NOEND_END-1 );
- aTxtSet.Put( rChgSet );
- if( aTxtSet.Count() )
+ aTextSet.Put( rChgSet );
+ if( aTextSet.Count() )
{
SwRegHistory history( pNode, *pNode, pHistory );
bRet = history.InsertItems(
- aTxtSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
+ aTextSet, rSt.GetIndex(), rSt.GetIndex(), nFlags ) || bRet;
if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
- && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+ && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
{
SwPaM aPam( pStt->nNode, pStt->nContent.GetIndex()-1,
pStt->nNode, pStt->nContent.GetIndex() );
@@ -1148,43 +1148,43 @@ namespace //local functions originally from docfmt.cxx
// TextAttributes with an end never expand their range
if ( !bCharAttr && !bOtherAttr )
{
- // CharFmt and URL attributes are treated separately!
- // TEST_TEMP ToDo: AutoFmt!
- SfxItemSet aTxtSet( pDoc->GetAttrPool(),
+ // CharFormat and URL attributes are treated separately!
+ // TEST_TEMP ToDo: AutoFormat!
+ SfxItemSet aTextSet( pDoc->GetAttrPool(),
RES_TXTATR_REFMARK, RES_TXTATR_TOXMARK,
RES_TXTATR_META, RES_TXTATR_METAFIELD,
RES_TXTATR_CJK_RUBY, RES_TXTATR_CJK_RUBY,
RES_TXTATR_INPUTFIELD, RES_TXTATR_INPUTFIELD,
0 );
- aTxtSet.Put( rChgSet );
- if( aTxtSet.Count() )
+ aTextSet.Put( rChgSet );
+ if( aTextSet.Count() )
{
const sal_Int32 nInsCnt = rSt.GetIndex();
const sal_Int32 nEnd = pStt->nNode == pEnd->nNode
? pEnd->nContent.GetIndex()
: pNode->Len();
SwRegHistory history( pNode, *pNode, pHistory );
- bRet = history.InsertItems( aTxtSet, nInsCnt, nEnd, nFlags )
+ bRet = history.InsertItems( aTextSet, nInsCnt, nEnd, nFlags )
|| bRet;
if (bRet && (pDoc->getIDocumentRedlineAccess().IsRedlineOn() || (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline()
- && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty())))
+ && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty())))
{
// Was text content inserted? (RefMark/TOXMarks without an end)
- bool bTxtIns = nInsCnt != rSt.GetIndex();
+ bool bTextIns = nInsCnt != rSt.GetIndex();
// Was content inserted or set over the selection?
- SwPaM aPam( pStt->nNode, bTxtIns ? nInsCnt + 1 : nEnd,
+ SwPaM aPam( pStt->nNode, bTextIns ? nInsCnt + 1 : nEnd,
pStt->nNode, nInsCnt );
if( pUndo )
- pUndo->SaveRedlineData( aPam, bTxtIns );
+ pUndo->SaveRedlineData( aPam, bTextIns );
if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() )
pDoc->getIDocumentRedlineAccess().AppendRedline(
new SwRangeRedline(
- bTxtIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
+ bTextIns ? nsRedlineType_t::REDLINE_INSERT : nsRedlineType_t::REDLINE_FORMAT, aPam ),
true);
- else if( bTxtIns )
+ else if( bTextIns )
pDoc->getIDocumentRedlineAccess().SplitRedline( aPam );
}
}
@@ -1194,28 +1194,28 @@ namespace //local functions originally from docfmt.cxx
// We always have to set the auto flag for PageDescs that are set at the Node!
if( pOtherSet && pOtherSet->Count() )
{
- SwTableNode* pTblNd;
- const SwFmtPageDesc* pDesc;
+ SwTableNode* pTableNd;
+ const SwFormatPageDesc* pDesc;
if( SfxItemState::SET == pOtherSet->GetItemState( RES_PAGEDESC,
false, reinterpret_cast<const SfxPoolItem**>(&pDesc) ))
{
if( pNode )
{
// Set auto flag. Only in the template it's without auto!
- SwFmtPageDesc aNew( *pDesc );
+ SwFormatPageDesc aNew( *pDesc );
// Tables now also know line breaks
if( !(nFlags & SetAttrMode::APICALL) &&
- 0 != ( pTblNd = pNode->FindTableNode() ) )
+ 0 != ( pTableNd = pNode->FindTableNode() ) )
{
- SwTableNode* pCurTblNd = pTblNd;
- while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
- pTblNd = pCurTblNd;
+ SwTableNode* pCurTableNd = pTableNd;
+ while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+ pTableNd = pCurTableNd;
// set the table format
- SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
- SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
- pFmt->SetFmtAttr( aNew );
+ SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+ SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+ pFormat->SetFormatAttr( aNew );
bRet = true;
}
else
@@ -1240,20 +1240,20 @@ namespace //local functions originally from docfmt.cxx
}
// Tables now also know line breaks
- const SvxFmtBreakItem* pBreak;
+ const SvxFormatBreakItem* pBreak;
if( pNode && !(nFlags & SetAttrMode::APICALL) &&
- 0 != (pTblNd = pNode->FindTableNode() ) &&
+ 0 != (pTableNd = pNode->FindTableNode() ) &&
SfxItemState::SET == pOtherSet->GetItemState( RES_BREAK,
false, reinterpret_cast<const SfxPoolItem**>(&pBreak) ) )
{
- SwTableNode* pCurTblNd = pTblNd;
- while ( 0 != ( pCurTblNd = pCurTblNd->StartOfSectionNode()->FindTableNode() ) )
- pTblNd = pCurTblNd;
+ SwTableNode* pCurTableNd = pTableNd;
+ while ( 0 != ( pCurTableNd = pCurTableNd->StartOfSectionNode()->FindTableNode() ) )
+ pTableNd = pCurTableNd;
// set the table format
- SwFrmFmt* pFmt = pTblNd->GetTable().GetFrmFmt();
- SwRegHistory aRegH( pFmt, *pTblNd, pHistory );
- pFmt->SetFmtAttr( *pBreak );
+ SwFrameFormat* pFormat = pTableNd->GetTable().GetFrameFormat();
+ SwRegHistory aRegH( pFormat, *pTableNd, pHistory );
+ pFormat->SetFormatAttr( *pBreak );
bRet = true;
// bOtherAttr = true means that pOtherSet == rChgSet. In this case
@@ -1291,17 +1291,17 @@ namespace //local functions originally from docfmt.cxx
return bRet;
}
- if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+ if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
{
- SwTxtNode* pTxtNd = pNode->GetTxtNode();
+ SwTextNode* pTextNd = pNode->GetTextNode();
const SwIndex& rSt = pStt->nContent;
sal_Int32 nMkPos, nPtPos = rSt.GetIndex();
- const OUString& rStr = pTxtNd->GetTxt();
+ const OUString& rStr = pTextNd->GetText();
// Special case: if the Crsr is located within a URL attribute, we take over it's area
- SwTxtAttr const*const pURLAttr(
- pTxtNd->GetTxtAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
- if (pURLAttr && !pURLAttr->GetINetFmt().GetValue().isEmpty())
+ SwTextAttr const*const pURLAttr(
+ pTextNd->GetTextAttrAt(rSt.GetIndex(), RES_TXTATR_INETFMT));
+ if (pURLAttr && !pURLAttr->GetINetFormat().GetValue().isEmpty())
{
nMkPos = pURLAttr->GetStart();
nPtPos = *pURLAttr->End();
@@ -1311,8 +1311,8 @@ namespace //local functions originally from docfmt.cxx
Boundary aBndry;
if( g_pBreakIt->GetBreakIter().is() )
aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTxtNd->GetTxt(), nPtPos,
- g_pBreakIt->GetLocale( pTxtNd->GetLang( nPtPos ) ),
+ pTextNd->GetText(), nPtPos,
+ g_pBreakIt->GetLocale( pTextNd->GetLang( nPtPos ) ),
WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
true );
@@ -1330,23 +1330,23 @@ namespace //local functions originally from docfmt.cxx
// These attributes are inserted as FormatAttributes and
// never override the TextAttributes!
if( !(nFlags & SetAttrMode::DONTREPLACE ) &&
- pTxtNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
+ pTextNd->HasHints() && !nMkPos && nPtPos == rStr.getLength())
{
- SwIndex aSt( pTxtNd );
+ SwIndex aSt( pTextNd );
if( pHistory )
{
// Save all attributes for the Undo.
- SwRegHistory aRHst( *pTxtNd, pHistory );
- pTxtNd->GetpSwpHints()->Register( &aRHst );
- pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
- if( pTxtNd->GetpSwpHints() )
- pTxtNd->GetpSwpHints()->DeRegister();
+ SwRegHistory aRHst( *pTextNd, pHistory );
+ pTextNd->GetpSwpHints()->Register( &aRHst );
+ pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
+ if( pTextNd->GetpSwpHints() )
+ pTextNd->GetpSwpHints()->DeRegister();
}
else
- pTxtNd->RstTxtAttr( aSt, nPtPos, 0, pCharSet );
+ pTextNd->RstTextAttr( aSt, nPtPos, 0, pCharSet );
}
- // the SwRegHistory inserts the attribute into the TxtNode!
+ // the SwRegHistory inserts the attribute into the TextNode!
SwRegHistory history( pNode, *pNode, pHistory );
bRet = history.InsertItems( *pCharSet, nMkPos, nPtPos, nFlags )
|| bRet;
@@ -1399,8 +1399,8 @@ namespace //local functions originally from docfmt.cxx
if( pStt->nContent.GetIndex() != 0 || aCntEnd.GetIndex() != nLen )
{
- // the SwRegHistory inserts the attribute into the TxtNode!
- if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+ // the SwRegHistory inserts the attribute into the TextNode!
+ if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
{
SwRegHistory history( pNode, *pNode, pHistory );
bRet = history.InsertItems(*pCharSet,
@@ -1427,7 +1427,7 @@ namespace //local functions originally from docfmt.cxx
if (bExpandCharToPara && pCharSet && pCharSet->Count() ==1 )
{
- SwTxtNode* pCurrentNd = pStt->nNode.GetNode().GetTxtNode();
+ SwTextNode* pCurrentNd = pStt->nNode.GetNode().GetTextNode();
if (pCurrentNd)
{
@@ -1455,13 +1455,13 @@ namespace //local functions originally from docfmt.cxx
*/
if( pStt->nNode < pEnd->nNode )
{
- pNode = pEnd->nNode.GetNode().GetCntntNode();
+ pNode = pEnd->nNode.GetNode().GetContentNode();
if(pNode)
{
if( aCntEnd.GetIndex() != pNode->Len() )
{
- // the SwRegHistory inserts the attribute into the TxtNode!
- if( pNode->IsTxtNode() && pCharSet && pCharSet->Count() )
+ // the SwRegHistory inserts the attribute into the TextNode!
+ if( pNode->IsTextNode() && pCharSet && pCharSet->Count() )
{
SwRegHistory history( pNode, *pNode, pHistory );
(void)history.InsertItems(*pCharSet,
@@ -1492,8 +1492,8 @@ namespace //local functions originally from docfmt.cxx
// Reset all attributes from the set!
if( pCharSet && pCharSet->Count() && !( SetAttrMode::DONTREPLACE & nFlags ) )
{
- ::sw::DocumentContentOperationsManager::ParaRstFmt aPara( pStt, pEnd, pHistory, 0, pCharSet );
- pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTxtAttr, &aPara );
+ ::sw::DocumentContentOperationsManager::ParaRstFormat aPara( pStt, pEnd, pHistory, 0, pCharSet );
+ pDoc->GetNodes().ForEach( aSt, aEnd, ::sw::DocumentContentOperationsManager::lcl_RstTextAttr, &aPara );
}
bool bCreateSwpHints = pCharSet && (
@@ -1502,11 +1502,11 @@ namespace //local functions originally from docfmt.cxx
for(; aSt < aEnd; ++aSt )
{
- pNode = aSt.GetNode().GetCntntNode();
+ pNode = aSt.GetNode().GetContentNode();
if( !pNode )
continue;
- SwTxtNode* pTNd = pNode->GetTxtNode();
+ SwTextNode* pTNd = pNode->GetTextNode();
if( pHistory )
{
SwRegHistory aRegH( pNode, *pNode, pHistory );
@@ -1518,7 +1518,7 @@ namespace //local functions originally from docfmt.cxx
if( pSwpHints )
pSwpHints->Register( &aRegH );
- pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+ pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
if( pSwpHints )
pSwpHints->DeRegister();
}
@@ -1528,7 +1528,7 @@ namespace //local functions originally from docfmt.cxx
else
{
if( pTNd && pCharSet && pCharSet->Count() )
- pTNd->SetAttr(*pCharSet, 0, pTNd->GetTxt().getLength(), nFlags);
+ pTNd->SetAttr(*pCharSet, 0, pTNd->GetText().getLength(), nFlags);
if( pOtherSet && pOtherSet->Count() )
pNode->SetAttr( *pOtherSet );
}
@@ -1547,7 +1547,7 @@ namespace //local functions originally from docfmt.cxx
SwPosition aStartPos (*rRg.Start());
SwPosition aEndPos (*rRg.End());
- if (aEndPos.nNode.GetNode().GetTxtNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTxtNode()->Len())
+ if (aEndPos.nNode.GetNode().GetTextNode() && aEndPos.nContent != aEndPos.nNode.GetNode().GetTextNode()->Len())
aEndPos.nNode--;
sal_uLong nStart = aStartPos.nNode.GetIndex();
@@ -1555,9 +1555,9 @@ namespace //local functions originally from docfmt.cxx
for(; nStart <= nEnd; ++nStart)
{
SwNode* pNd = pDoc->GetNodes()[ nStart ];
- if (!pNd || !pNd->IsTxtNode())
+ if (!pNd || !pNd->IsTextNode())
continue;
- SwTxtNode *pCurrentNd = pNd->GetTxtNode();
+ SwTextNode *pCurrentNd = pNd->GetTextNode();
pCurrentNd->TryCharSetExpandToNum(*pCharSet);
}
}
@@ -1595,10 +1595,10 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
nEnd = pEnd->nNode.GetIndex(),
nDiff = nEnd - nStt +1;
SwNode* pNd = m_rDoc.GetNodes()[ nStt ];
- if( pNd->IsCntntNode() && pStt->nContent.GetIndex() )
+ if( pNd->IsContentNode() && pStt->nContent.GetIndex() )
++nStt, --nDiff;
- if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsCntntNode() &&
- static_cast<SwCntntNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
+ if( (pNd = m_rDoc.GetNodes()[ nEnd ])->IsContentNode() &&
+ static_cast<SwContentNode*>(pNd)->Len() != pEnd->nContent.GetIndex() )
--nEnd, --nDiff;
if( nDiff &&
lcl_ChkFlyFly( pDoc, nStt, nEnd, rPos.nNode.GetIndex() ) )
@@ -1609,7 +1609,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
SwPaM* pRedlineRange = 0;
if( pDoc->getIDocumentRedlineAccess().IsRedlineOn() ||
- (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTbl().empty() ) )
+ (!pDoc->getIDocumentRedlineAccess().IsIgnoreRedline() && !pDoc->getIDocumentRedlineAccess().GetRedlineTable().empty() ) )
pRedlineRange = new SwPaM( rPos );
RedlineMode_t eOld = pDoc->getIDocumentRedlineAccess().GetRedlineMode();
@@ -1622,7 +1622,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
}
else if( ! ( *pStt <= rPos && rPos < *pEnd &&
( pStt->nNode != pEnd->nNode ||
- !pStt->nNode.GetNode().IsTxtNode() )) )
+ !pStt->nNode.GetNode().IsTextNode() )) )
{
// Copy to a position outside of the area, or copy a single TextNode
// Do an ordinary copy
@@ -1661,7 +1661,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
aPam.SetMark();
- SwCntntNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
+ SwContentNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
pNode->MakeEndIndex( &aPam.GetMark()->nContent );
aPam.GetPoint()->nNode = *aPam.GetNode().StartOfSectionNode();
@@ -1670,7 +1670,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
// move to desired position
pDoc->getIDocumentContentOperations().MoveRange( aPam, rPos, SwMoveFlags::DEFAULT );
- pNode = aPam.GetCntntNode();
+ pNode = aPam.GetContentNode();
*aPam.GetPoint() = rPos; // Move the cursor for Undo
aPam.SetMark(); // also move the Mark
aPam.DeleteMark(); // But don't mark any area
@@ -1757,26 +1757,26 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
/* #i9185# This whould lead to a segmentation fault if not caught above. */
sal_uLong nNextNd = rEnd.nNode.GetIndex() + 1;
- SwTableNode *const pTblNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
+ SwTableNode *const pTableNd = m_rDoc.GetNodes()[ nNextNd ]->GetTableNode();
- if( pTblNd && pNd->IsCntntNode() )
+ if( pTableNd && pNd->IsContentNode() )
{
- SwFrmFmt* pTableFmt = pTblNd->GetTable().GetFrmFmt();
+ SwFrameFormat* pTableFormat = pTableNd->GetTable().GetFrameFormat();
{
const SfxPoolItem *pItem;
- const SfxItemSet* pSet = static_cast<const SwCntntNode*>(pNd)->GetpSwAttrSet();
+ const SfxItemSet* pSet = static_cast<const SwContentNode*>(pNd)->GetpSwAttrSet();
if( pSet && SfxItemState::SET == pSet->GetItemState( RES_PAGEDESC,
false, &pItem ) )
{
- pTableFmt->SetFmtAttr( *pItem );
+ pTableFormat->SetFormatAttr( *pItem );
bSavePageDesc = true;
}
if( pSet && SfxItemState::SET == pSet->GetItemState( RES_BREAK,
false, &pItem ) )
{
- pTableFmt->SetFmtAttr( *pItem );
+ pTableFormat->SetFormatAttr( *pItem );
bSavePageBreak = true;
}
}
@@ -1791,10 +1791,10 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
rPam.Exchange();
rPam.GetPoint()->nNode++;
- SwCntntNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetCntntNode();
+ SwContentNode *pTmpNode = rPam.GetPoint()->nNode.GetNode().GetContentNode();
rPam.GetPoint()->nContent.Assign( pTmpNode, 0 );
bool bGoNext = (0 == pTmpNode);
- pTmpNode = rPam.GetMark()->nNode.GetNode().GetCntntNode();
+ pTmpNode = rPam.GetMark()->nNode.GetNode().GetContentNode();
rPam.GetMark()->nContent.Assign( pTmpNode, 0 );
m_rDoc.GetIDocumentUndoRedo().ClearRedo();
@@ -1846,25 +1846,25 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
// What's with Flys?
{
// If there are FlyFrames left, delete these too
- for( size_t n = 0; n < m_rDoc.GetSpzFrmFmts()->size(); ++n )
+ for( size_t n = 0; n < m_rDoc.GetSpzFrameFormats()->size(); ++n )
{
- SwFrmFmt* pFly = (*m_rDoc.GetSpzFrmFmts())[n];
- const SwFmtAnchor* pAnchor = &pFly->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
+ SwFrameFormat* pFly = (*m_rDoc.GetSpzFrameFormats())[n];
+ const SwFormatAnchor* pAnchor = &pFly->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
if (pAPos &&
((FLY_AT_PARA == pAnchor->GetAnchorId()) ||
(FLY_AT_CHAR == pAnchor->GetAnchorId())) &&
aRg.aStart <= pAPos->nNode && pAPos->nNode <= aRg.aEnd )
{
- m_rDoc.getIDocumentLayoutAccess().DelLayoutFmt( pFly );
+ m_rDoc.getIDocumentLayoutAccess().DelLayoutFormat( pFly );
--n;
}
}
}
- SwCntntNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetCntntNode();
+ SwContentNode *pTmpNode = rPam.GetBound( true ).nNode.GetNode().GetContentNode();
rPam.GetBound( true ).nContent.Assign( pTmpNode, 0 );
- pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetCntntNode();
+ pTmpNode = rPam.GetBound( false ).nNode.GetNode().GetContentNode();
rPam.GetBound( false ).nContent.Assign( pTmpNode, 0 );
m_rDoc.GetNodes().Delete( aRg.aStart, nNodeDiff+1 );
}
@@ -1903,7 +1903,7 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
// save redlines (if DOC_MOVEREDLINES is used)
_SaveRedlines aSaveRedl;
- if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
{
lcl_SaveRedlines( rPaM, aSaveRedl );
@@ -1920,8 +1920,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
&pEnd->nContent);
}
- bool bUpdateFtn = false;
- SwFtnIdxs aTmpFntIdx;
+ bool bUpdateFootnote = false;
+ SwFootnoteIdxs aTmpFntIdx;
SwUndoMove * pUndoMove = 0;
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -1932,8 +1932,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
}
else
{
- bUpdateFtn = lcl_SaveFtn( pStt->nNode, pEnd->nNode, rPos.nNode,
- m_rDoc.GetFtnIdxs(), aTmpFntIdx,
+ bUpdateFootnote = lcl_SaveFootnote( pStt->nNode, pEnd->nNode, rPos.nNode,
+ m_rDoc.GetFootnoteIdxs(), aTmpFntIdx,
&pStt->nContent, &pEnd->nContent );
}
@@ -1945,32 +1945,32 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
rPaM.Exchange();
// If there is a TextNode before and after the Move, create a JoinNext in the EditShell.
- SwTxtNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pSrcNd = rPaM.GetPoint()->nNode.GetNode().GetTextNode();
bool bCorrSavePam = pSrcNd && pStt->nNode != pEnd->nNode;
// If one ore more TextNodes are moved, SwNodes::Move will do a SplitNode.
// However, this does not update the cursor. So we create a TextNode to keep
// updating the indices. After the Move the Node is optionally deleted.
- SwTxtNode * pTNd = rPos.nNode.GetNode().GetTxtNode();
+ SwTextNode * pTNd = rPos.nNode.GetNode().GetTextNode();
if( pTNd && rPaM.GetPoint()->nNode != rPaM.GetMark()->nNode &&
( rPos.nContent.GetIndex() || ( pTNd->Len() && bCorrSavePam )) )
{
bSplit = true;
- const sal_Int32 nMkCntnt = rPaM.GetMark()->nContent.GetIndex();
+ const sal_Int32 nMkContent = rPaM.GetMark()->nContent.GetIndex();
- const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
- pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+ const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+ pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
- pTNd = pTNd->SplitCntntNode( rPos )->GetTxtNode();
+ pTNd = pTNd->SplitContentNode( rPos )->GetTextNode();
- if( !pCntntStore->Empty() )
- pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+ if( !pContentStore->Empty() )
+ pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
// correct the PaM!
if( rPos.nNode == rPaM.GetMark()->nNode )
{
rPaM.GetMark()->nNode = rPos.nNode.GetIndex()-1;
- rPaM.GetMark()->nContent.Assign( pTNd, nMkCntnt );
+ rPaM.GetMark()->nContent.Assign( pTNd, nMkContent );
}
}
@@ -1978,8 +1978,8 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
// the manipulated range.
// If there's no content anymore, set it to the StartNode (that's
// always there).
- const bool bNullCntnt = !aSavePam.Move( fnMoveBackward, fnGoCntnt );
- if( bNullCntnt )
+ const bool bNullContent = !aSavePam.Move( fnMoveBackward, fnGoContent );
+ if( bNullContent )
{
aSavePam.GetPoint()->nNode--;
}
@@ -2012,16 +2012,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
rPaM.DeleteMark();
OSL_ENSURE( *aSavePam.GetMark() == rPos ||
- ( aSavePam.GetMark()->nNode.GetNode().GetCntntNode() == NULL ),
+ ( aSavePam.GetMark()->nNode.GetNode().GetContentNode() == NULL ),
"PaM was not moved. Aren't there ContentNodes at the beginning/end?" );
*aSavePam.GetMark() = rPos;
rPaM.SetMark(); // create a Sel. around the new range
- pTNd = aSavePam.GetNode().GetTxtNode();
+ pTNd = aSavePam.GetNode().GetTextNode();
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
// correct the SavePam's Content first
- if( bNullCntnt )
+ if( bNullContent )
{
aSavePam.GetPoint()->nContent = 0;
}
@@ -2030,16 +2030,16 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
// where the rPaM is located.
// If the Content was moved to the back and the SavePam's SPoint is
// in the next Node, we have to deal with this when saving the Undo object!
- SwTxtNode * pPamTxtNd = nullptr;
+ SwTextNode * pPamTextNd = nullptr;
// Is passed to SwUndoMove, which happens when subsequently calling Undo JoinNext.
// If it's not possible to call Undo JoinNext here.
bool bJoin = bSplit && pTNd;
if( bCorrSavePam )
{
- pPamTxtNd = rPaM.GetNode().GetTxtNode();
- bCorrSavePam = (pPamTxtNd != nullptr)
- && pPamTxtNd->CanJoinNext()
+ pPamTextNd = rPaM.GetNode().GetTextNode();
+ bCorrSavePam = (pPamTextNd != nullptr)
+ && pPamTextNd->CanJoinNext()
&& (*rPaM.GetPoint() <= *aSavePam.GetPoint());
}
@@ -2052,11 +2052,11 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
if( bCorrSavePam && rPaM.GetPoint()->nNode.GetIndex()+1 ==
aSavePam.GetPoint()->nNode.GetIndex() )
{
- aSavePam.GetPoint()->nContent += pPamTxtNd->Len();
+ aSavePam.GetPoint()->nContent += pPamTextNd->Len();
}
bJoin = false;
}
- else if ( !aSavePam.Move( fnMoveForward, fnGoCntnt ) )
+ else if ( !aSavePam.Move( fnMoveForward, fnGoContent ) )
{
aSavePam.GetPoint()->nNode++;
}
@@ -2080,14 +2080,14 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
bRemove = false;
}
}
- if( bNullCntnt )
+ if( bNullContent )
{
aSavePam.GetPoint()->nNode++;
- aSavePam.GetPoint()->nContent.Assign( aSavePam.GetCntntNode(), 0 );
+ aSavePam.GetPoint()->nContent.Assign( aSavePam.GetContentNode(), 0 );
}
else if( bRemove ) // No move forward after joining with next paragraph
{
- aSavePam.Move( fnMoveForward, fnGoCntnt );
+ aSavePam.Move( fnMoveForward, fnGoContent );
}
}
@@ -2112,15 +2112,15 @@ bool DocumentContentOperationsManager::MoveRange( SwPaM& rPaM, SwPosition& rPos,
lcl_RestoreRedlines( &m_rDoc, *aSavePam.Start(), aSaveRedl );
}
- if( bUpdateFtn )
+ if( bUpdateFootnote )
{
if( !aTmpFntIdx.empty() )
{
- m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+ m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
aTmpFntIdx.clear();
}
- m_rDoc.GetFtnIdxs().UpdateAllFtn();
+ m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
}
m_rDoc.getIDocumentState().SetModified();
@@ -2137,9 +2137,9 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
// Or else delete the Frames for all footnotes that are being moved
// and have it rebuild after the Move (footnotes can change pages).
- // Additionally we have to correct the FtnIdx array's sorting.
- bool bUpdateFtn = false;
- SwFtnIdxs aTmpFntIdx;
+ // Additionally we have to correct the FootnoteIdx array's sorting.
+ bool bUpdateFootnote = false;
+ SwFootnoteIdxs aTmpFntIdx;
SwUndoMove* pUndo = 0;
if ((SwMoveFlags::CREATEUNDOOBJ & eMvFlags ) && m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2148,13 +2148,13 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
}
else
{
- bUpdateFtn = lcl_SaveFtn( rRange.aStart, rRange.aEnd, rPos,
- m_rDoc.GetFtnIdxs(), aTmpFntIdx );
+ bUpdateFootnote = lcl_SaveFootnote( rRange.aStart, rRange.aEnd, rPos,
+ m_rDoc.GetFootnoteIdxs(), aTmpFntIdx );
}
_SaveRedlines aSaveRedl;
std::vector<SwRangeRedline*> aSavRedlInsPosArr;
- if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if( SwMoveFlags::REDLINES & eMvFlags && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
{
lcl_SaveRedlines( rRange, aSaveRedl );
@@ -2165,14 +2165,14 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
{
const SwPosition *pRStt, *pREnd;
do {
- SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl()[ nRedlPos ];
+ SwRangeRedline* pTmp = m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ nRedlPos ];
pRStt = pTmp->Start();
pREnd = pTmp->End();
if( pREnd->nNode == rPos && pRStt->nNode < rPos )
{
aSavRedlInsPosArr.push_back( pTmp );
}
- } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size());
+ } while( pRStt->nNode < rPos && ++nRedlPos < m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size());
}
}
@@ -2184,7 +2184,7 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
// Save the paragraph-bound Flys, so that they can be moved.
_SaveFlyArr aSaveFlyArr;
- if( !m_rDoc.GetSpzFrmFmts()->empty() )
+ if( !m_rDoc.GetSpzFrameFormats()->empty() )
_SaveFlyInRange( rRange, aSaveFlyArr );
// Set it to before the Position, so that it cannot be moved further.
@@ -2225,11 +2225,11 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
for( size_t n = 0; n < aSavRedlInsPosArr.size(); ++n )
{
SwRangeRedline* pTmp = aSavRedlInsPosArr[ n ];
- if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().Contains( pTmp ) )
+ if( m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().Contains( pTmp ) )
{
SwPosition* pEnd = pTmp->End();
pEnd->nNode = aIdx;
- pEnd->nContent.Assign( pNewNd->GetCntntNode(), 0 );
+ pEnd->nContent.Assign( pNewNd->GetContentNode(), 0 );
}
}
}
@@ -2245,15 +2245,15 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
delete pSaveInsPos;
- if( bUpdateFtn )
+ if( bUpdateFootnote )
{
if( !aTmpFntIdx.empty() )
{
- m_rDoc.GetFtnIdxs().insert( aTmpFntIdx );
+ m_rDoc.GetFootnoteIdxs().insert( aTmpFntIdx );
aTmpFntIdx.clear();
}
- m_rDoc.GetFtnIdxs().UpdateAllFtn();
+ m_rDoc.GetFootnoteIdxs().UpdateAllFootnote();
}
m_rDoc.getIDocumentState().SetModified();
@@ -2263,24 +2263,24 @@ bool DocumentContentOperationsManager::MoveNodeRange( SwNodeRange& rRange, SwNod
bool DocumentContentOperationsManager::MoveAndJoin( SwPaM& rPaM, SwPosition& rPos, SwMoveFlags eMvFlags )
{
SwNodeIndex aIdx( rPaM.Start()->nNode );
- bool bJoinTxt = aIdx.GetNode().IsTxtNode();
+ bool bJoinText = aIdx.GetNode().IsTextNode();
bool bOneNode = rPaM.GetPoint()->nNode == rPaM.GetMark()->nNode;
aIdx--; // in front of the move area!
bool bRet = MoveRange( rPaM, rPos, eMvFlags );
if( bRet && !bOneNode )
{
- if( bJoinTxt )
+ if( bJoinText )
++aIdx;
- SwTxtNode * pTxtNd = aIdx.GetNode().GetTxtNode();
+ SwTextNode * pTextNd = aIdx.GetNode().GetTextNode();
SwNodeIndex aNxtIdx( aIdx );
- if( pTxtNd && pTxtNd->CanJoinNext( &aNxtIdx ) )
+ if( pTextNd && pTextNd->CanJoinNext( &aNxtIdx ) )
{
{ // Block so SwIndex into node is deleted before Join
- m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTxtNd,
- pTxtNd->GetTxt().getLength()) ), 0, true );
+ m_rDoc.CorrRel( aNxtIdx, SwPosition( aIdx, SwIndex(pTextNd,
+ pTextNd->GetText().getLength()) ), 0, true );
}
- pTxtNd->JoinNext();
+ pTextNd->JoinNext();
}
}
return bRet;
@@ -2296,7 +2296,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
m_rDoc.DeleteAutoCorrExceptWord();
}
- SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
+ SwTextNode *pNode = rPt.nNode.GetNode().GetTextNode();
if (!pNode || rStr.getLength() > pNode->GetSpaceLeft()) // worst case: no erase
{
return false;
@@ -2320,7 +2320,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
{
// start behind the characters (to fix the attributes!)
nStart = rIdx.GetIndex();
- if (nStart < pNode->GetTxt().getLength())
+ if (nStart < pNode->GetText().getLength())
{
lcl_SkipAttr( pNode, rIdx, nStart );
}
@@ -2348,7 +2348,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
else
{
// start behind the characters (to fix the attributes!)
- if (nStart < pNode->GetTxt().getLength())
+ if (nStart < pNode->GetText().getLength())
++rIdx;
pNode->InsertText( OUString(c), rIdx, SwInsertFlags::EMPTYEXPAND );
if( nStart+1 < rIdx.GetIndex() )
@@ -2370,7 +2370,7 @@ bool DocumentContentOperationsManager::Overwrite( const SwPaM &rRg, const OUStri
}
if (!m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
- !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty())
+ !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty())
{
SwPaM aPam( rPt.nNode, nStart, rPt.nNode, rPt.nContent.GetIndex() );
m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aPam, true, USHRT_MAX );
@@ -2406,7 +2406,7 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
m_rDoc.DeleteAutoCorrExceptWord();
}
- SwTxtNode *const pNode = rPos.nNode.GetNode().GetTxtNode();
+ SwTextNode *const pNode = rPos.nNode.GetNode().GetTextNode();
if(!pNode)
return false;
@@ -2463,10 +2463,10 @@ bool DocumentContentOperationsManager::InsertString( const SwPaM &rRg, const OUS
}
}
- // To-Do - add 'SwExtraRedlineTbl' also ?
- if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+ // To-Do - add 'SwExtraRedlineTable' also ?
+ if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
{
- SwPaM aPam( rPos.nNode, aTmp.GetCntnt(),
+ SwPaM aPam( rPos.nNode, aTmp.GetContent(),
rPos.nNode, rPos.nContent.GetIndex());
if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() )
{
@@ -2498,7 +2498,7 @@ void DocumentContentOperationsManager::TransliterateText(
sal_Int32 nSttCnt = pStt->nContent.GetIndex();
sal_Int32 nEndCnt = pEnd->nContent.GetIndex();
- SwTxtNode* pTNd = pStt->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTNd = pStt->nNode.GetNode().GetTextNode();
if( pStt == pEnd && pTNd ) // no selection?
{
// set current word as 'area of effect'
@@ -2506,7 +2506,7 @@ void DocumentContentOperationsManager::TransliterateText(
Boundary aBndry;
if( g_pBreakIt->GetBreakIter().is() )
aBndry = g_pBreakIt->GetBreakIter()->getWordBoundary(
- pTNd->GetTxt(), nSttCnt,
+ pTNd->GetText(), nSttCnt,
g_pBreakIt->GetLocale( pTNd->GetLang( nSttCnt ) ),
WordType::ANY_WORD /*ANYWORD_IGNOREWHITESPACES*/,
true );
@@ -2529,20 +2529,20 @@ void DocumentContentOperationsManager::TransliterateText(
++aIdx;
if( pTNd )
pTNd->TransliterateText(
- rTrans, nSttCnt, pTNd->GetTxt().getLength(), pUndo);
+ rTrans, nSttCnt, pTNd->GetText().getLength(), pUndo);
}
for( ; aIdx.GetIndex() < nEndNd; ++aIdx )
{
- pTNd = aIdx.GetNode().GetTxtNode();
+ pTNd = aIdx.GetNode().GetTextNode();
if (pTNd)
{
pTNd->TransliterateText(
- rTrans, 0, pTNd->GetTxt().getLength(), pUndo);
+ rTrans, 0, pTNd->GetText().getLength(), pUndo);
}
}
- if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTxtNode() ))
+ if( nEndCnt && 0 != ( pTNd = pEnd->nNode.GetNode().GetTextNode() ))
pTNd->TransliterateText( rTrans, 0, nEndCnt, pUndo );
}
else if( pTNd && nSttCnt < nEndCnt )
@@ -2560,80 +2560,80 @@ void DocumentContentOperationsManager::TransliterateText(
m_rDoc.getIDocumentState().SetModified();
}
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
const OUString& rGrfName,
const OUString& rFltName,
const Graphic* pGraphic,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
- SwFrmFmt* pFrmFmt )
+ SwFrameFormat* pFrameFormat )
{
- if( !pFrmFmt )
- pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+ if( !pFrameFormat )
+ pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
rGrfName, rFltName, pGraphic,
- m_rDoc.GetDfltGrfFmtColl() );
- SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
- pFlyAttrSet, pGrfAttrSet, pFrmFmt );
- return pSwFlyFrmFmt;
+ m_rDoc.GetDfltGrfFormatColl() );
+ SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+ pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+ return pSwFlyFrameFormat;
}
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const GraphicObject& rGrfObj,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
- SwFrmFmt* pFrmFmt )
+ SwFrameFormat* pFrameFormat )
{
- if( !pFrmFmt )
- pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
+ if( !pFrameFormat )
+ pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_GRAPHIC );
SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
- rGrfObj, m_rDoc.GetDfltGrfFmtColl() );
- SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
- pFlyAttrSet, pGrfAttrSet, pFrmFmt );
- return pSwFlyFrmFmt;
+ rGrfObj, m_rDoc.GetDfltGrfFormatColl() );
+ SwFlyFrameFormat* pSwFlyFrameFormat = _InsNoTextNode( *rRg.GetPoint(), pSwGrfNode,
+ pFlyAttrSet, pGrfAttrSet, pFrameFormat );
+ return pSwFlyFrameFormat;
}
-SwFlyFrmFmt* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
+SwFlyFrameFormat* DocumentContentOperationsManager::Insert(const SwPaM &rRg, const svt::EmbeddedObjectRef& xObj,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
- SwFrmFmt* pFrmFmt )
+ SwFrameFormat* pFrameFormat )
{
- if( !pFrmFmt )
+ if( !pFrameFormat )
{
sal_uInt16 nId = RES_POOLFRM_OLE;
SvGlobalName aClassName( xObj->getClassID() );
if (SotExchange::IsMath(aClassName))
nId = RES_POOLFRM_FORMEL;
- pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( nId );
+ pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( nId );
}
- return _InsNoTxtNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
+ return _InsNoTextNode( *rRg.GetPoint(), m_rDoc.GetNodes().MakeOLENode(
SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
xObj,
- m_rDoc.GetDfltGrfFmtColl() ),
+ m_rDoc.GetDfltGrfFormatColl() ),
pFlyAttrSet, pGrfAttrSet,
- pFrmFmt );
+ pFrameFormat );
}
-SwFlyFrmFmt* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
+SwFlyFrameFormat* DocumentContentOperationsManager::InsertOLE(const SwPaM &rRg, const OUString& rObjName,
sal_Int64 nAspect,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
- SwFrmFmt* pFrmFmt )
+ SwFrameFormat* pFrameFormat )
{
- if( !pFrmFmt )
- pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_OLE );
+ if( !pFrameFormat )
+ pFrameFormat = m_rDoc.getIDocumentStylePoolAccess().GetFrameFormatFromPool( RES_POOLFRM_OLE );
- return _InsNoTxtNode( *rRg.GetPoint(),
+ return _InsNoTextNode( *rRg.GetPoint(),
m_rDoc.GetNodes().MakeOLENode(
SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
rObjName,
nAspect,
- m_rDoc.GetDfltGrfFmtColl(),
+ m_rDoc.GetDfltGrfFormatColl(),
0 ),
pFlyAttrSet, pGrfAttrSet,
- pFrmFmt );
+ pFrameFormat );
}
void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrfName,
@@ -2661,31 +2661,31 @@ void DocumentContentOperationsManager::ReRead( SwPaM& rPam, const OUString& rGrf
}
// Insert drawing object, which has to be already inserted in the DrawModel
-SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
+SwDrawFrameFormat* DocumentContentOperationsManager::InsertDrawObj(
const SwPaM &rRg,
SdrObject& rDrawObj,
const SfxItemSet& rFlyAttrSet )
{
- SwDrawFrmFmt* pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+ SwDrawFrameFormat* pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
- const SwFmtAnchor* pAnchor = 0;
+ const SwFormatAnchor* pAnchor = 0;
rFlyAttrSet.GetItemState( RES_ANCHOR, false, reinterpret_cast<const SfxPoolItem**>(&pAnchor) );
- pFmt->SetFmtAttr( rFlyAttrSet );
+ pFormat->SetFormatAttr( rFlyAttrSet );
// Didn't set the Anchor yet?
// DrawObjecte must never end up in the Header/Footer!
- RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFmt->GetAnchor().GetAnchorId();
- const bool bIsAtCntnt = (FLY_AT_PAGE != eAnchorId);
+ RndStdIds eAnchorId = pAnchor != NULL ? pAnchor->GetAnchorId() : pFormat->GetAnchor().GetAnchorId();
+ const bool bIsAtContent = (FLY_AT_PAGE != eAnchorId);
const SwNodeIndex* pChkIdx = 0;
if ( pAnchor == NULL )
{
pChkIdx = &rRg.GetPoint()->nNode;
}
- else if ( bIsAtCntnt )
+ else if ( bIsAtContent )
{
pChkIdx =
- pAnchor->GetCntntAnchor() ? &pAnchor->GetCntntAnchor()->nNode : &rRg.GetPoint()->nNode;
+ pAnchor->GetContentAnchor() ? &pAnchor->GetContentAnchor()->nNode : &rRg.GetPoint()->nNode;
}
// allow drawing objects in header/footer, but control objects aren't allowed in header/footer.
@@ -2695,14 +2695,14 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
{
// apply at-page anchor format
eAnchorId = FLY_AT_PAGE;
- pFmt->SetFmtAttr( SwFmtAnchor( eAnchorId ) );
+ pFormat->SetFormatAttr( SwFormatAnchor( eAnchorId ) );
}
else if( pAnchor == NULL
- || ( bIsAtCntnt
- && pAnchor->GetCntntAnchor() == NULL ) )
+ || ( bIsAtContent
+ && pAnchor->GetContentAnchor() == NULL ) )
{
// apply anchor format
- SwFmtAnchor aAnch( pAnchor != NULL ? *pAnchor : pFmt->GetAnchor() );
+ SwFormatAnchor aAnch( pAnchor != NULL ? *pAnchor : pFormat->GetAnchor() );
eAnchorId = aAnch.GetAnchorId();
if ( eAnchorId == FLY_AT_FLY )
{
@@ -2718,23 +2718,23 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
aAnch.SetType( eAnchorId );
}
}
- pFmt->SetFmtAttr( aAnch );
+ pFormat->SetFormatAttr( aAnch );
}
// insert text attribute for as-character anchored drawing object
if ( eAnchorId == FLY_AS_CHAR )
{
bool bAnchorAtPageAsFallback = true;
- const SwFmtAnchor& rDrawObjAnchorFmt = pFmt->GetAnchor();
- if ( rDrawObjAnchorFmt.GetCntntAnchor() != NULL )
+ const SwFormatAnchor& rDrawObjAnchorFormat = pFormat->GetAnchor();
+ if ( rDrawObjAnchorFormat.GetContentAnchor() != NULL )
{
- SwTxtNode* pAnchorTxtNode =
- rDrawObjAnchorFmt.GetCntntAnchor()->nNode.GetNode().GetTxtNode();
- if ( pAnchorTxtNode != NULL )
+ SwTextNode* pAnchorTextNode =
+ rDrawObjAnchorFormat.GetContentAnchor()->nNode.GetNode().GetTextNode();
+ if ( pAnchorTextNode != NULL )
{
- const sal_Int32 nStt = rDrawObjAnchorFmt.GetCntntAnchor()->nContent.GetIndex();
- SwFmtFlyCnt aFmt( pFmt );
- pAnchorTxtNode->InsertItem( aFmt, nStt, nStt );
+ const sal_Int32 nStt = rDrawObjAnchorFormat.GetContentAnchor()->nContent.GetIndex();
+ SwFormatFlyCnt aFormat( pFormat );
+ pAnchorTextNode->InsertItem( aFormat, nStt, nStt );
bAnchorAtPageAsFallback = false;
}
}
@@ -2742,17 +2742,17 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
if ( bAnchorAtPageAsFallback )
{
OSL_ENSURE( false, "DocumentContentOperationsManager::InsertDrawObj(..) - missing content anchor for as-character anchored drawing object --> anchor at-page" );
- pFmt->SetFmtAttr( SwFmtAnchor( FLY_AT_PAGE ) );
+ pFormat->SetFormatAttr( SwFormatAnchor( FLY_AT_PAGE ) );
}
}
- SwDrawContact* pContact = new SwDrawContact( pFmt, &rDrawObj );
+ SwDrawContact* pContact = new SwDrawContact( pFormat, &rDrawObj );
// Create Frames if necessary
if( m_rDoc.getIDocumentLayoutAccess().GetCurrentViewShell() )
{
// create layout representation
- pFmt->MakeFrms();
+ pFormat->MakeFrms();
// #i42319# - follow-up of #i35635#
// move object to visible layer
// #i79391#
@@ -2764,16 +2764,16 @@ SwDrawFrmFmt* DocumentContentOperationsManager::InsertDrawObj(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFmt(pFmt, 0, 0) );
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsLayFormat(pFormat, 0, 0) );
}
m_rDoc.getIDocumentState().SetModified();
- return pFmt;
+ return pFormat;
}
bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool bChkTableStart )
{
- SwCntntNode *pNode = rPos.nNode.GetNode().GetCntntNode();
+ SwContentNode *pNode = rPos.nNode.GetNode().GetContentNode();
if(0 == pNode)
return false;
@@ -2788,7 +2788,7 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
{
m_rDoc.GetIDocumentUndoRedo().ClearRedo();
// insert the Undo object (currently only for TextNode)
- if( pNode->IsTxtNode() )
+ if( pNode->IsTextNode() )
{
pUndo = new SwUndoSplitNode( &m_rDoc, rPos, bChkTableStart );
m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
@@ -2797,30 +2797,30 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
// Update the rsid of the old and the new node unless
// the old node is split at the beginning or at the end
- SwTxtNode *pTxtNode = rPos.nNode.GetNode().GetTxtNode();
+ SwTextNode *pTextNode = rPos.nNode.GetNode().GetTextNode();
const sal_Int32 nPos = rPos.nContent.GetIndex();
- if( pTxtNode && nPos && nPos != pTxtNode->Len() )
+ if( pTextNode && nPos && nPos != pTextNode->Len() )
{
- m_rDoc.UpdateParRsid( pTxtNode );
+ m_rDoc.UpdateParRsid( pTextNode );
}
//JP 28.01.97: Special case for SplitNode at table start:
// If it is at the beginning of a Doc/Fly/Footer/... or right at after a table
// then insert a paragraph before it.
- if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTxtNode() )
+ if( bChkTableStart && !rPos.nContent.GetIndex() && pNode->IsTextNode() )
{
sal_uLong nPrevPos = rPos.nNode.GetIndex() - 1;
- const SwTableNode* pTblNd;
+ const SwTableNode* pTableNd;
const SwNode* pNd = m_rDoc.GetNodes()[ nPrevPos ];
if( pNd->IsStartNode() &&
SwTableBoxStartNode == static_cast<const SwStartNode*>(pNd)->GetStartNodeType() &&
- 0 != ( pTblNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
+ 0 != ( pTableNd = m_rDoc.GetNodes()[ --nPrevPos ]->GetTableNode() ) &&
((( pNd = m_rDoc.GetNodes()[ --nPrevPos ])->IsStartNode() &&
SwTableBoxStartNode != static_cast<const SwStartNode*>(pNd)->GetStartNodeType() )
|| ( pNd->IsEndNode() && pNd->StartOfSectionNode()->IsTableNode() )
- || pNd->IsCntntNode() ))
+ || pNd->IsContentNode() ))
{
- if( pNd->IsCntntNode() )
+ if( pNd->IsContentNode() )
{
//JP 30.04.99 Bug 65660:
// There are no page breaks outside of the normal body area,
@@ -2830,44 +2830,44 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
else
{
// Only if the table has page breaks!
- const SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
- if( SfxItemState::SET != pFrmFmt->GetItemState(RES_PAGEDESC, false) &&
- SfxItemState::SET != pFrmFmt->GetItemState( RES_BREAK, false ) )
+ const SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
+ if( SfxItemState::SET != pFrameFormat->GetItemState(RES_PAGEDESC, false) &&
+ SfxItemState::SET != pFrameFormat->GetItemState( RES_BREAK, false ) )
pNd = 0;
}
}
if( pNd )
{
- SwTxtNode* pTxtNd = m_rDoc.GetNodes().MakeTxtNode(
- SwNodeIndex( *pTblNd ),
- m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
- if( pTxtNd )
+ SwTextNode* pTextNd = m_rDoc.GetNodes().MakeTextNode(
+ SwNodeIndex( *pTableNd ),
+ m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_TEXT ));
+ if( pTextNd )
{
- const_cast<SwPosition&>(rPos).nNode = pTblNd->GetIndex()-1;
- const_cast<SwPosition&>(rPos).nContent.Assign( pTxtNd, 0 );
+ const_cast<SwPosition&>(rPos).nNode = pTableNd->GetIndex()-1;
+ const_cast<SwPosition&>(rPos).nContent.Assign( pTextNd, 0 );
// only add page breaks/styles to the body area
if( nPrevPos > m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
{
- SwFrmFmt* pFrmFmt = pTblNd->GetTable().GetFrmFmt();
+ SwFrameFormat* pFrameFormat = pTableNd->GetTable().GetFrameFormat();
const SfxPoolItem *pItem;
- if( SfxItemState::SET == pFrmFmt->GetItemState( RES_PAGEDESC,
+ if( SfxItemState::SET == pFrameFormat->GetItemState( RES_PAGEDESC,
false, &pItem ) )
{
- pTxtNd->SetAttr( *pItem );
- pFrmFmt->ResetFmtAttr( RES_PAGEDESC );
+ pTextNd->SetAttr( *pItem );
+ pFrameFormat->ResetFormatAttr( RES_PAGEDESC );
}
- if( SfxItemState::SET == pFrmFmt->GetItemState( RES_BREAK,
+ if( SfxItemState::SET == pFrameFormat->GetItemState( RES_BREAK,
false, &pItem ) )
{
- pTxtNd->SetAttr( *pItem );
- pFrmFmt->ResetFmtAttr( RES_BREAK );
+ pTextNd->SetAttr( *pItem );
+ pFrameFormat->ResetFormatAttr( RES_BREAK );
}
}
if( pUndo )
- pUndo->SetTblFlag();
+ pUndo->SetTableFlag();
m_rDoc.getIDocumentState().SetModified();
return true;
}
@@ -2875,19 +2875,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
}
}
- const std::shared_ptr<sw::mark::CntntIdxStore> pCntntStore(sw::mark::CntntIdxStore::Create());
- pCntntStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
- // FIXME: only SwTxtNode has a valid implementation of SplitCntntNode!
- OSL_ENSURE(pNode->IsTxtNode(), "splitting non-text node?");
- pNode = pNode->SplitCntntNode( rPos );
+ const std::shared_ptr<sw::mark::ContentIdxStore> pContentStore(sw::mark::ContentIdxStore::Create());
+ pContentStore->Save( &m_rDoc, rPos.nNode.GetIndex(), rPos.nContent.GetIndex(), true );
+ // FIXME: only SwTextNode has a valid implementation of SplitContentNode!
+ OSL_ENSURE(pNode->IsTextNode(), "splitting non-text node?");
+ pNode = pNode->SplitContentNode( rPos );
if (pNode)
{
// move all bookmarks, TOXMarks, FlyAtCnt
- if( !pCntntStore->Empty() )
- pCntntStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
+ if( !pContentStore->Empty() )
+ pContentStore->Restore( &m_rDoc, rPos.nNode.GetIndex()-1, 0, true );
- // To-Do - add 'SwExtraRedlineTbl' also ?
- if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+ // To-Do - add 'SwExtraRedlineTable' also ?
+ if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
{
SwPaM aPam( rPos );
aPam.SetMark();
@@ -2903,19 +2903,19 @@ bool DocumentContentOperationsManager::SplitNode( const SwPosition &rPos, bool b
return true;
}
-bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
+bool DocumentContentOperationsManager::AppendTextNode( SwPosition& rPos )
{
// create new node before EndOfContent
- SwTxtNode * pCurNode = rPos.nNode.GetNode().GetTxtNode();
+ SwTextNode * pCurNode = rPos.nNode.GetNode().GetTextNode();
if( !pCurNode )
{
// so then one can be created!
SwNodeIndex aIdx( rPos.nNode, 1 );
- pCurNode = m_rDoc.GetNodes().MakeTxtNode( aIdx,
- m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool( RES_POOLCOLL_STANDARD ));
+ pCurNode = m_rDoc.GetNodes().MakeTextNode( aIdx,
+ m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool( RES_POOLCOLL_STANDARD ));
}
else
- pCurNode = pCurNode->AppendNode( rPos )->GetTxtNode();
+ pCurNode = pCurNode->AppendNode( rPos )->GetTextNode();
rPos.nNode++;
rPos.nContent.Assign( pCurNode, 0 );
@@ -2925,8 +2925,8 @@ bool DocumentContentOperationsManager::AppendTxtNode( SwPosition& rPos )
m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoInsert( rPos.nNode ) );
}
- // To-Do - add 'SwExtraRedlineTbl' also ?
- if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() ))
+ // To-Do - add 'SwExtraRedlineTable' also ?
+ if( m_rDoc.getIDocumentRedlineAccess().IsRedlineOn() || (!m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() ))
{
SwPaM aPam( rPos );
aPam.SetMark();
@@ -3073,14 +3073,14 @@ bool DocumentContentOperationsManager::InsertItemSet ( const SwPaM &rRg, const S
void DocumentContentOperationsManager::RemoveLeadingWhiteSpace(const SwPosition & rPos )
{
- const SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
+ const SwTextNode* pTNd = rPos.nNode.GetNode().GetTextNode();
if ( pTNd )
{
- const OUString& rTxt = pTNd->GetTxt();
+ const OUString& rText = pTNd->GetText();
sal_Int32 nIdx = 0;
- while (nIdx < rTxt.getLength())
+ while (nIdx < rText.getLength())
{
- sal_Unicode const cCh = rTxt[nIdx];
+ sal_Unicode const cCh = rText[nIdx];
if (('\t' != cCh) && (' ' != cCh))
{
break;
@@ -3184,18 +3184,18 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// managed in the DrawModel).
SwDoc *const pDest = rStartIdx.GetNode().GetDoc();
::std::set< _ZSortFly > aSet;
- const size_t nArrLen = m_rDoc.GetSpzFrmFmts()->size();
+ const size_t nArrLen = m_rDoc.GetSpzFrameFormats()->size();
SwTextBoxHelper::SavedLink aOldTextBoxes;
- SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrmFmts(), aOldTextBoxes);
+ SwTextBoxHelper::saveLinks(*m_rDoc.GetSpzFrameFormats(), aOldTextBoxes);
SwTextBoxHelper::SavedContent aOldContent;
for ( size_t n = 0; n < nArrLen; ++n )
{
- SwFrmFmt* pFmt = (*m_rDoc.GetSpzFrmFmts())[n];
- SwFmtAnchor const*const pAnchor = &pFmt->GetAnchor();
- SwPosition const*const pAPos = pAnchor->GetCntntAnchor();
- bool bAtCntnt = (pAnchor->GetAnchorId() == FLY_AT_PARA);
+ SwFrameFormat* pFormat = (*m_rDoc.GetSpzFrameFormats())[n];
+ SwFormatAnchor const*const pAnchor = &pFormat->GetAnchor();
+ SwPosition const*const pAPos = pAnchor->GetContentAnchor();
+ bool bAtContent = (pAnchor->GetAnchorId() == FLY_AT_PARA);
if ( !pAPos )
continue;
switch ( pAnchor->GetAnchorId() )
@@ -3231,10 +3231,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
bool bLastNode = false;
// is the node empty?
const SwNodes& rNodes = pAPos->nNode.GetNodes();
- SwTxtNode* pTxtNode;
- if( 0 != ( pTxtNode = pAPos->nNode.GetNode().GetTxtNode() ))
+ SwTextNode* pTextNode;
+ if( 0 != ( pTextNode = pAPos->nNode.GetNode().GetTextNode() ))
{
- bEmptyNode = pTxtNode->GetTxt().isEmpty();
+ bEmptyNode = pTextNode->GetText().isEmpty();
if( bEmptyNode )
{
//last node information is only necessary to know for the last TextNode
@@ -3254,7 +3254,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
bAdd = bLastNode && bEmptyNode;
if( !bAdd )
{
- if( bAtCntnt )
+ if( bAtContent )
bAdd = nEndContentIndex > 0;
else
bAdd = pAPos->nContent <= nEndContentIndex;
@@ -3264,24 +3264,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
{
// Make sure draw formats don't refer to content, so that such
// content can be removed without problems.
- SwTextBoxHelper::resetLink(pFmt, aOldContent);
- aSet.insert( _ZSortFly( pFmt, pAnchor, nArrLen + aSet.size() ));
+ SwTextBoxHelper::resetLink(pFormat, aOldContent);
+ aSet.insert( _ZSortFly( pFormat, pAnchor, nArrLen + aSet.size() ));
}
}
// Store all copied (and also the newly created) frames in another array.
// They are stored as matching the originals, so that we will be later
// able to build the chains accordingly.
- ::std::vector< SwFrmFmt* > aVecSwFrmFmt;
+ ::std::vector< SwFrameFormat* > aVecSwFrameFormat;
::std::set< _ZSortFly >::const_iterator it=aSet.begin();
while (it != aSet.end())
{
// #i59964#
// correct determination of new anchor position
- SwFmtAnchor aAnchor( *(*it).GetAnchor() );
- assert( aAnchor.GetCntntAnchor() != NULL );
- SwPosition newPos = *aAnchor.GetCntntAnchor();
+ SwFormatAnchor aAnchor( *(*it).GetAnchor() );
+ assert( aAnchor.GetContentAnchor() != NULL );
+ SwPosition newPos = *aAnchor.GetContentAnchor();
// for at-paragraph and at-character anchored objects the new anchor
// position can *not* be determined by the difference of the current
// anchor position to the start of the copied range, because not
@@ -3294,28 +3294,28 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
{
// First, determine number of anchor text node in the copied range.
// Note: The anchor text node *have* to be inside the copied range.
- sal_uLong nAnchorTxtNdNumInRange( 0L );
- bool bAnchorTxtNdFound( false );
+ sal_uLong nAnchorTextNdNumInRange( 0L );
+ bool bAnchorTextNdFound( false );
SwNodeIndex aIdx( rRg.aStart );
- while ( !bAnchorTxtNdFound && aIdx <= rRg.aEnd )
+ while ( !bAnchorTextNdFound && aIdx <= rRg.aEnd )
{
- if ( aIdx.GetNode().IsTxtNode() )
+ if ( aIdx.GetNode().IsTextNode() )
{
- ++nAnchorTxtNdNumInRange;
- bAnchorTxtNdFound = aAnchor.GetCntntAnchor()->nNode == aIdx;
+ ++nAnchorTextNdNumInRange;
+ bAnchorTextNdFound = aAnchor.GetContentAnchor()->nNode == aIdx;
}
++aIdx;
}
if ( bMergedFirstNode )
- nAnchorTxtNdNumInRange--;
+ nAnchorTextNdNumInRange--;
- if ( !bAnchorTxtNdFound )
+ if ( !bAnchorTextNdFound )
{
// This case can *not* happen, but to be robust take the first
// text node in the destination document.
OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - anchor text node in copied range not found" );
- nAnchorTxtNdNumInRange = 1;
+ nAnchorTextNdNumInRange = 1;
}
// Second, search corresponding text node in destination document
// by counting forward from start insert position <rStartIdx> the
@@ -3324,24 +3324,24 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
SwNodeIndex aAnchorNdIdx( rStartIdx );
const SwNode& aEndOfContentNd =
aIdx.GetNode().GetNodes().GetEndOfContent();
- while ( nAnchorTxtNdNumInRange > 0 &&
+ while ( nAnchorTextNdNumInRange > 0 &&
&(aIdx.GetNode()) != &aEndOfContentNd )
{
- if ( aIdx.GetNode().IsTxtNode() )
+ if ( aIdx.GetNode().IsTextNode() )
{
- --nAnchorTxtNdNumInRange;
+ --nAnchorTextNdNumInRange;
aAnchorNdIdx = aIdx;
}
++aIdx;
}
- if ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+ if ( !aAnchorNdIdx.GetNode().IsTextNode() )
{
// This case can *not* happen, but to be robust take the first
// text node in the destination document.
OSL_FAIL( "<SwDoc::_CopyFlyInFly(..)> - found anchor node index isn't a text node" );
aAnchorNdIdx = rStartIdx;
- while ( !aAnchorNdIdx.GetNode().IsTxtNode() )
+ while ( !aAnchorNdIdx.GetNode().IsTextNode() )
{
++aAnchorNdIdx;
}
@@ -3357,9 +3357,9 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
}
// Set the character bound Flys back at the original character
if ((FLY_AT_CHAR == aAnchor.GetAnchorId()) &&
- newPos.nNode.GetNode().IsTxtNode() )
+ newPos.nNode.GetNode().IsTextNode() )
{
- newPos.nContent.Assign( newPos.nNode.GetNode().GetTxtNode(), newPos.nContent.GetIndex() );
+ newPos.nContent.Assign( newPos.nNode.GetNode().GetTextNode(), newPos.nContent.GetIndex() );
}
else
{
@@ -3370,10 +3370,10 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// Check recursion: copy content in its own frame, then don't copy it.
if( pDest == &m_rDoc )
{
- const SwFmtCntnt& rCntnt = (*it).GetFmt()->GetCntnt();
+ const SwFormatContent& rContent = (*it).GetFormat()->GetContent();
const SwStartNode* pSNd;
- if( rCntnt.GetCntntIdx() &&
- 0 != ( pSNd = rCntnt.GetCntntIdx()->GetNode().GetStartNode() ) &&
+ if( rContent.GetContentIdx() &&
+ 0 != ( pSNd = rContent.GetContentIdx()->GetNode().GetStartNode() ) &&
pSNd->GetIndex() < rStartIdx.GetIndex() &&
rStartIdx.GetIndex() < pSNd->EndOfSectionIndex() )
{
@@ -3383,36 +3383,36 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
}
// Copy the format and set the new anchor
- aVecSwFrmFmt.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFmt( *(*it).GetFmt(),
+ aVecSwFrameFormat.push_back( pDest->getIDocumentLayoutAccess().CopyLayoutFormat( *(*it).GetFormat(),
aAnchor, false, true ) );
++it;
}
// Rebuild as much as possible of all chains that are available in the original,
- OSL_ENSURE( aSet.size() == aVecSwFrmFmt.size(), "Missing new Flys" );
- if ( aSet.size() == aVecSwFrmFmt.size() )
+ OSL_ENSURE( aSet.size() == aVecSwFrameFormat.size(), "Missing new Flys" );
+ if ( aSet.size() == aVecSwFrameFormat.size() )
{
size_t n = 0;
for (::std::set< _ZSortFly >::const_iterator nIt=aSet.begin() ; nIt != aSet.end(); ++nIt, ++n )
{
- const SwFrmFmt *pFmtN = (*nIt).GetFmt();
- const SwFmtChain &rChain = pFmtN->GetChain();
+ const SwFrameFormat *pFormatN = (*nIt).GetFormat();
+ const SwFormatChain &rChain = pFormatN->GetChain();
int nCnt = int(0 != rChain.GetPrev());
nCnt += rChain.GetNext() ? 1: 0;
size_t k = 0;
for (::std::set< _ZSortFly >::const_iterator kIt=aSet.begin() ; kIt != aSet.end(); ++kIt, ++k )
{
- const SwFrmFmt *pFmtK = (*kIt).GetFmt();
- if ( rChain.GetPrev() == pFmtK )
+ const SwFrameFormat *pFormatK = (*kIt).GetFormat();
+ if ( rChain.GetPrev() == pFormatK )
{
- ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]),
- static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]) );
+ ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]),
+ static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]) );
--nCnt;
}
- else if ( rChain.GetNext() == pFmtK )
+ else if ( rChain.GetNext() == pFormatK )
{
- ::lcl_ChainFmts( static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[n]),
- static_cast< SwFlyFrmFmt* >(aVecSwFrmFmt[k]) );
+ ::lcl_ChainFormats( static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[n]),
+ static_cast< SwFlyFrameFormat* >(aVecSwFrameFormat[k]) );
--nCnt;
}
}
@@ -3420,27 +3420,27 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
// Re-create content property of draw formats, knowing how old shapes
// were paired with old fly formats (aOldTextBoxes) and that aSet is
- // parallel with aVecSwFrmFmt.
- SwTextBoxHelper::restoreLinks(aSet, aVecSwFrmFmt, aOldTextBoxes, aOldContent);
+ // parallel with aVecSwFrameFormat.
+ SwTextBoxHelper::restoreLinks(aSet, aVecSwFrameFormat, aOldTextBoxes, aOldContent);
}
}
/*
* Reset the text's hard formatting
*/
-/** @params pArgs contains the document's ChrFmtTable
+/** @params pArgs contains the document's ChrFormatTable
* Is need for selections at the beginning/end and with no SSelection.
*/
-bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, void* pArgs )
+bool DocumentContentOperationsManager::lcl_RstTextAttr( const SwNodePtr& rpNd, void* pArgs )
{
- ParaRstFmt* pPara = static_cast<ParaRstFmt*>(pArgs);
- SwTxtNode * pTxtNode = rpNd->GetTxtNode();
- if( pTxtNode && pTxtNode->GetpSwpHints() )
+ ParaRstFormat* pPara = static_cast<ParaRstFormat*>(pArgs);
+ SwTextNode * pTextNode = rpNd->GetTextNode();
+ if( pTextNode && pTextNode->GetpSwpHints() )
{
- SwIndex aSt( pTxtNode, 0 );
- sal_Int32 nEnd = pTxtNode->Len();
+ SwIndex aSt( pTextNode, 0 );
+ sal_Int32 nEnd = pTextNode->Len();
- if( &pPara->pSttNd->nNode.GetNode() == pTxtNode &&
+ if( &pPara->pSttNd->nNode.GetNode() == pTextNode &&
pPara->pSttNd->nContent.GetIndex() )
aSt = pPara->pSttNd->nContent.GetIndex();
@@ -3450,15 +3450,15 @@ bool DocumentContentOperationsManager::lcl_RstTxtAttr( const SwNodePtr& rpNd, vo
if( pPara->pHistory )
{
// Save all attributes for the Undo.
- SwRegHistory aRHst( *pTxtNode, pPara->pHistory );
- pTxtNode->GetpSwpHints()->Register( &aRHst );
- pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+ SwRegHistory aRHst( *pTextNode, pPara->pHistory );
+ pTextNode->GetpSwpHints()->Register( &aRHst );
+ pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
- if( pTxtNode->GetpSwpHints() )
- pTxtNode->GetpSwpHints()->DeRegister();
+ if( pTextNode->GetpSwpHints() )
+ pTextNode->GetpSwpHints()->DeRegister();
}
else
- pTxtNode->RstTxtAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
+ pTextNode->RstTextAttr( aSt, nEnd - aSt.GetIndex(), pPara->nWhich,
pPara->pDelSet, pPara->bInclRefToxMark, pPara->bExactRange );
}
return true;
@@ -3528,8 +3528,8 @@ bool DocumentContentOperationsManager::DeleteAndJoinWithRedlineImpl( SwPaM & rPa
bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
const bool bForceJoinNext )
{
- bool bJoinTxt, bJoinPrev;
- ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+ bool bJoinText, bJoinPrev;
+ ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
// #i100466#
if ( bForceJoinNext )
{
@@ -3542,7 +3542,7 @@ bool DocumentContentOperationsManager::DeleteAndJoinImpl( SwPaM & rPam,
return false;
}
- if( bJoinTxt )
+ if( bJoinText )
{
::sw_JoinText( rPam, bJoinPrev );
}
@@ -3584,22 +3584,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
{
// Delete all empty TextHints at the Mark's position
- SwTxtNode* pTxtNd = rPam.GetMark()->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTextNd = rPam.GetMark()->nNode.GetNode().GetTextNode();
SwpHints* pHts;
- if( pTxtNd && 0 != ( pHts = pTxtNd->GetpSwpHints()) && pHts->Count() )
+ if( pTextNd && 0 != ( pHts = pTextNd->GetpSwpHints()) && pHts->Count() )
{
const sal_Int32 *pEndIdx;
const sal_Int32 nMkCntPos = rPam.GetMark()->nContent.GetIndex();
for( size_t n = pHts->Count(); n; )
{
- const SwTxtAttr* pAttr = (*pHts)[ --n ];
+ const SwTextAttr* pAttr = (*pHts)[ --n ];
if( nMkCntPos > pAttr->GetStart() )
break;
if( nMkCntPos == pAttr->GetStart() &&
0 != (pEndIdx = pAttr->End()) &&
*pEndIdx == pAttr->GetStart() )
- pTxtNd->DestroyAttr( pHts->Cut( n ) );
+ pTextNd->DestroyAttr( pHts->Cut( n ) );
}
}
}
@@ -3636,7 +3636,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
return true;
}
- if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
m_rDoc.getIDocumentRedlineAccess().DeleteRedline( rPam, true, USHRT_MAX );
// Delete and move all "Flys at the paragraph", which are within the Selection
@@ -3649,13 +3649,13 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
&pEnd->nContent);
SwNodeIndex aSttIdx( pStt->nNode );
- SwCntntNode * pCNd = aSttIdx.GetNode().GetCntntNode();
+ SwContentNode * pCNd = aSttIdx.GetNode().GetContentNode();
do { // middle checked loop!
if( pCNd )
{
- SwTxtNode * pStartTxtNode( pCNd->GetTxtNode() );
- if ( pStartTxtNode )
+ SwTextNode * pStartTextNode( pCNd->GetTextNode() );
+ if ( pStartTextNode )
{
// now move the Content to the new Node
bool bOneNd = pStt->nNode == pEnd->nNode;
@@ -3666,12 +3666,12 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
// Don't call again, if already empty
if( nLen )
{
- pStartTxtNode->EraseText( pStt->nContent, nLen );
+ pStartTextNode->EraseText( pStt->nContent, nLen );
- if( !pStartTxtNode->Len() )
+ if( !pStartTextNode->Len() )
{
// METADATA: remove reference if empty (consider node deleted)
- pStartTxtNode->RemoveMetadataReference();
+ pStartTextNode->RemoveMetadataReference();
}
}
@@ -3688,22 +3688,22 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
}
}
- pCNd = pEnd->nNode.GetNode().GetCntntNode();
+ pCNd = pEnd->nNode.GetNode().GetContentNode();
if( pCNd )
{
- SwTxtNode * pEndTxtNode( pCNd->GetTxtNode() );
- if( pEndTxtNode )
+ SwTextNode * pEndTextNode( pCNd->GetTextNode() );
+ if( pEndTextNode )
{
// if already empty, don't call again
if( pEnd->nContent.GetIndex() )
{
SwIndex aIdx( pCNd, 0 );
- pEndTxtNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
+ pEndTextNode->EraseText( aIdx, pEnd->nContent.GetIndex() );
- if( !pEndTxtNode->Len() )
+ if( !pEndTextNode->Len() )
{
// METADATA: remove reference if empty (consider node deleted)
- pEndTxtNode->RemoveMetadataReference();
+ pEndTextNode->RemoveMetadataReference();
}
}
}
@@ -3728,7 +3728,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
// If the Node that contained the Cursor has been deleted,
// the Content has to be assigned to the current Content.
- pStt->nContent.Assign( pStt->nNode.GetNode().GetCntntNode(),
+ pStt->nContent.Assign( pStt->nNode.GetNode().GetContentNode(),
pStt->nContent.GetIndex() );
// If we deleted across Node boundaries we have to correct the PaM,
@@ -3739,7 +3739,7 @@ bool DocumentContentOperationsManager::DeleteRangeImplImpl(SwPaM & rPam)
} while( false );
- if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().empty() )
+ if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && !m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().empty() )
m_rDoc.getIDocumentRedlineAccess().CompressRedlines();
m_rDoc.getIDocumentState().SetModified();
@@ -3754,8 +3754,8 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
if( !rPam.HasMark() || *rPam.GetPoint() == *rPam.GetMark() )
return false;
- bool bJoinTxt, bJoinPrev;
- ::sw_GetJoinFlags( rPam, bJoinTxt, bJoinPrev );
+ bool bJoinText, bJoinPrev;
+ ::sw_GetJoinFlags( rPam, bJoinText, bJoinPrev );
{
// Create a copy of the Cursor in order to move all Pams from
@@ -3774,7 +3774,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
// Own Undo?
OUString sRepl( rStr );
- SwTxtNode* pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+ SwTextNode* pTextNd = pStt->nNode.GetNode().GetTextNode();
sal_Int32 nStt = pStt->nContent.GetIndex();
sal_Int32 nEnd;
@@ -3800,7 +3800,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
*aDelPam.GetMark() = pBkmk->GetOtherMarkPos();
m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
pStt = aDelPam.Start();
- pTxtNd = pStt->nNode.GetNode().GetTxtNode();
+ pTextNd = pStt->nNode.GetNode().GetTextNode();
nStt = pStt->nContent.GetIndex();
}
@@ -3811,7 +3811,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
RES_CHRATR_BEGIN, RES_TXTATR_WITHEND_END - 1,
RES_UNKNOWNATR_BEGIN, RES_UNKNOWNATR_END-1,
0 );
- pTxtNd->GetAttr( aSet, nStt+1, nStt+1 );
+ pTextNd->GetAttr( aSet, nStt+1, nStt+1 );
aSet.ClearItem( RES_TXTATR_REFMARK );
aSet.ClearItem( RES_TXTATR_TOXMARK );
@@ -3842,7 +3842,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
++aMkNd;
aDelPam.GetMark()->nNode = aMkNd;
aDelPam.GetMark()->nContent.Assign(
- aMkNd.GetNode().GetCntntNode(), nMkCnt );
+ aMkNd.GetNode().GetContentNode(), nMkCnt );
bFirst = false;
}
else
@@ -3858,11 +3858,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
++aPtNd;
aDelPam.GetPoint()->nNode = aPtNd;
- aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+ aDelPam.GetPoint()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
nPtCnt);
*aTmpRange.GetMark() = *aDelPam.GetPoint();
- m_rDoc.RstTxtAttrs( aTmpRange );
+ m_rDoc.RstTextAttrs( aTmpRange );
InsertItemSet( aTmpRange, aSet );
}
@@ -3897,11 +3897,11 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
*rPam.GetMark() = pBkmk->GetOtherMarkPos();
m_rDoc.getIDocumentMarkAccess()->deleteMark(pBkmk);
}
- bJoinTxt = false;
+ bJoinText = false;
}
else
{
- if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTbl().size() )
+ if( !m_rDoc.getIDocumentRedlineAccess().IsIgnoreRedline() && m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() )
m_rDoc.getIDocumentRedlineAccess().DeleteRedline( aDelPam, true, USHRT_MAX );
SwUndoReplace* pUndoRpl = 0;
@@ -3922,19 +3922,19 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
// Set the values again, if Frames or footnotes on the Text have been removed.
nStt = nPtCnt;
nEnd = bOneNode ? pEnd->nContent.GetIndex()
- : pTxtNd->GetTxt().getLength();
+ : pTextNd->GetText().getLength();
bool bFirst = true;
OUString sIns;
while ( lcl_GetTokenToParaBreak( sRepl, sIns, bRegExReplace ) )
{
- if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+ if (!bFirst || nStt == pTextNd->GetText().getLength())
{
InsertString( aDelPam, sIns );
}
else if( nStt < nEnd || !sIns.isEmpty() )
{
- pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+ pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
}
SplitNode( *pStt, false);
bFirst = false;
@@ -3942,23 +3942,23 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
if( bFirst || !sIns.isEmpty() )
{
- if (!bFirst || nStt == pTxtNd->GetTxt().getLength())
+ if (!bFirst || nStt == pTextNd->GetText().getLength())
{
InsertString( aDelPam, sIns );
}
else if( nStt < nEnd || !sIns.isEmpty() )
{
- pTxtNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
+ pTextNd->ReplaceText( pStt->nContent, nEnd - nStt, sIns );
}
}
*rPam.GetPoint() = *aDelPam.GetMark();
++aPtNd;
rPam.GetMark()->nNode = aPtNd;
- rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetCntntNode(),
+ rPam.GetMark()->nContent.Assign( aPtNd.GetNode().GetContentNode(),
nPtCnt );
- if (bJoinTxt)
+ if (bJoinText)
{
assert(rPam.GetPoint() == rPam.End());
// move so that SetEnd remembers position after sw_JoinText
@@ -3978,7 +3978,7 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
}
bool bRet(true);
- if (bJoinTxt)
+ if (bJoinText)
{
bRet = ::sw_JoinText(rPam, bJoinPrev);
}
@@ -3987,20 +3987,20 @@ bool DocumentContentOperationsManager::ReplaceRangeImpl( SwPaM& rPam, const OUSt
return bRet;
}
-SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition& rPos, SwNoTxtNode* pNode,
+SwFlyFrameFormat* DocumentContentOperationsManager::_InsNoTextNode( const SwPosition& rPos, SwNoTextNode* pNode,
const SfxItemSet* pFlyAttrSet,
const SfxItemSet* pGrfAttrSet,
- SwFrmFmt* pFrmFmt)
+ SwFrameFormat* pFrameFormat)
{
- SwFlyFrmFmt *pFmt = 0;
+ SwFlyFrameFormat *pFormat = 0;
if( pNode )
{
- pFmt = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
- pFlyAttrSet, pFrmFmt );
+ pFormat = m_rDoc._MakeFlySection( rPos, *pNode, FLY_AT_PARA,
+ pFlyAttrSet, pFrameFormat );
if( pGrfAttrSet )
pNode->SetAttr( *pGrfAttrSet );
}
- return pFmt;
+ return pFormat;
}
#define NUMRULE_STATE \
@@ -4010,18 +4010,18 @@ SwFlyFrmFmt* DocumentContentOperationsManager::_InsNoTxtNode( const SwPosition&
SfxStringItem aListIdItem( RES_PARATR_LIST_ID, OUString() ); \
#define PUSH_NUMRULE_STATE \
- lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd );
+ lcl_PushNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd );
#define POP_NUMRULE_STATE \
- lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTxtNd, rPam );
+ lcl_PopNumruleState( aNumRuleState, aNumRuleItem, aListIdState, aListIdItem, pDestTextNd, rPam );
static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aNumRuleItem,
SfxItemState &aListIdState, SfxStringItem &aListIdItem,
- const SwTxtNode *pDestTxtNd )
+ const SwTextNode *pDestTextNd )
{
// Safe numrule item at destination.
// #i86492# - Safe also <ListId> item of destination.
- const SfxItemSet * pAttrSet = pDestTxtNd->GetpSwAttrSet();
+ const SfxItemSet * pAttrSet = pDestTextNd->GetpSwAttrSet();
if (pAttrSet != NULL)
{
const SfxPoolItem * pItem = NULL;
@@ -4040,7 +4040,7 @@ static void lcl_PushNumruleState( SfxItemState &aNumRuleState, SwNumRuleItem &aN
static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem &aNumRuleItem,
SfxItemState aListIdState, const SfxStringItem &aListIdItem,
- SwTxtNode *pDestTxtNd, const SwPaM& rPam )
+ SwTextNode *pDestTextNd, const SwPaM& rPam )
{
/* If only a part of one paragraph is copied
restore the numrule at the destination. */
@@ -4049,19 +4049,19 @@ static void lcl_PopNumruleState( SfxItemState aNumRuleState, const SwNumRuleItem
{
if (SfxItemState::SET == aNumRuleState)
{
- pDestTxtNd->SetAttr(aNumRuleItem);
+ pDestTextNd->SetAttr(aNumRuleItem);
}
else
{
- pDestTxtNd->ResetAttr(RES_PARATR_NUMRULE);
+ pDestTextNd->ResetAttr(RES_PARATR_NUMRULE);
}
if (SfxItemState::SET == aListIdState)
{
- pDestTxtNd->SetAttr(aListIdItem);
+ pDestTextNd->SetAttr(aListIdItem);
}
else
{
- pDestTxtNd->ResetAttr(RES_PARATR_LIST_ID);
+ pDestTextNd->ResetAttr(RES_PARATR_LIST_ID);
}
}
}
@@ -4093,7 +4093,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// removing the redlines so use cursor that is corrected by PaMCorrAbs
std::unique_ptr<SwUnoCrsr> const pCopyPam(pDoc->CreateUnoCrsr(rPos));
- SwTblNumFmtMerge aTNFM( m_rDoc, *pDoc );
+ SwTableNumFormatMerge aTNFM( m_rDoc, *pDoc );
if (pDoc->GetIDocumentUndoRedo().DoesUndo())
{
@@ -4107,7 +4107,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// Move the PaM one node back from the insert position, so that
// the position doesn't get moved
pCopyPam->SetMark();
- bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoCntnt);
+ bool bCanMoveBack = pCopyPam->Move(fnMoveBackward, fnGoContent);
// If the position was shifted from more than one node, an end node has been skipped
bool bAfterTable = false;
if ((rPos.nNode.GetIndex() - pCopyPam->GetPoint()->nNode.GetIndex()) > 1)
@@ -4125,14 +4125,14 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
SwNodeRange aRg( pStt->nNode, pEnd->nNode );
SwNodeIndex aInsPos( rPos.nNode );
const bool bOneNode = pStt->nNode == pEnd->nNode;
- SwTxtNode* pSttTxtNd = pStt->nNode.GetNode().GetTxtNode();
- SwTxtNode* pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
- SwTxtNode* pDestTxtNd = aInsPos.GetNode().GetTxtNode();
- bool bCopyCollFmt = !pDoc->IsInsOnlyTextGlossary() &&
- ( (pDestTxtNd && !pDestTxtNd->GetTxt().getLength()) ||
+ SwTextNode* pSttTextNd = pStt->nNode.GetNode().GetTextNode();
+ SwTextNode* pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
+ SwTextNode* pDestTextNd = aInsPos.GetNode().GetTextNode();
+ bool bCopyCollFormat = !pDoc->IsInsOnlyTextGlossary() &&
+ ( (pDestTextNd && !pDestTextNd->GetText().getLength()) ||
( !bOneNode && !rPos.nContent.GetIndex() ) );
bool bCopyBookmarks = true;
- bool bStartIsTxtNode = 0 != pSttTxtNd;
+ bool bStartIsTextNode = 0 != pSttTextNd;
// #i104585# copy outline num rule to clipboard (for ASCII filter)
if (pDoc->IsClipBoard() && m_rDoc.GetOutlineNumRule())
@@ -4158,8 +4158,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// - destination is an empty paragraph which is not in a list and
// - source contains at least one paragraph which is not in a list
if ( pNumRuleToPropagate &&
- pDestTxtNd && !pDestTxtNd->GetTxt().getLength() &&
- !pDestTxtNd->IsInList() &&
+ pDestTextNd && !pDestTextNd->GetText().getLength() &&
+ !pDestTextNd->IsInList() &&
!lcl_ContainsOnlyParagraphsInList( rPam ) )
{
pNumRuleToPropagate = 0;
@@ -4169,31 +4169,31 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// This do/while block is only there so that we can break out of it!
do {
- if( pSttTxtNd )
+ if( pSttTextNd )
{
// Don't copy the beginning completely?
- if( !bCopyCollFmt || bColumnSel || pStt->nContent.GetIndex() )
+ if( !bCopyCollFormat || bColumnSel || pStt->nContent.GetIndex() )
{
bHandledStartNode = true;
SwIndex aDestIdx( rPos.nContent );
bool bCopyOk = false;
- if( !pDestTxtNd )
+ if( !pDestTextNd )
{
if( pStt->nContent.GetIndex() || bOneNode )
- pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
- pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
+ pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+ pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
else
{
- pDestTxtNd = pSttTxtNd->MakeCopy( pDoc, aInsPos )->GetTxtNode();
+ pDestTextNd = pSttTextNd->MakeCopy( pDoc, aInsPos )->GetTextNode();
bCopyOk = true;
}
- aDestIdx.Assign( pDestTxtNd, 0 );
- bCopyCollFmt = true;
+ aDestIdx.Assign( pDestTextNd, 0 );
+ bCopyCollFormat = true;
}
else if( !bOneNode || bColumnSel )
{
- const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+ const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
{
::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4202,13 +4202,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
{
// after the SplitNode, span the CpyPam correctly again
- pCopyPam->Move( fnMoveBackward, fnGoCntnt );
- pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+ pCopyPam->Move( fnMoveBackward, fnGoContent );
+ pCopyPam->Move( fnMoveBackward, fnGoContent );
}
- pDestTxtNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTxtNode();
+ pDestTextNd = pDoc->GetNodes()[ aInsPos.GetIndex()-1 ]->GetTextNode();
aDestIdx.Assign(
- pDestTxtNd, pDestTxtNd->GetTxt().getLength());
+ pDestTextNd, pDestTextNd->GetText().getLength());
// Correct the area again
if( bEndEqualIns )
@@ -4216,25 +4216,25 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
bool bChg = pEnd != rPam.GetPoint();
if( bChg )
rPam.Exchange();
- rPam.Move( fnMoveBackward, fnGoCntnt );
+ rPam.Move( fnMoveBackward, fnGoContent );
if( bChg )
rPam.Exchange();
aRg.aEnd = pEnd->nNode;
- pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+ pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
else if( rPos == *pEnd )
{
// The end was also moved
pEnd->nNode--;
- pEnd->nContent.Assign( pDestTxtNd, nCntntEnd );
+ pEnd->nContent.Assign( pDestTextNd, nContentEnd );
aRg.aEnd = pEnd->nNode;
- pEndTxtNd = pEnd->nNode.GetNode().GetTxtNode();
+ pEndTextNd = pEnd->nNode.GetNode().GetTextNode();
}
}
NUMRULE_STATE
- if( bCopyCollFmt && bOneNode )
+ if( bCopyCollFormat && bOneNode )
{
PUSH_NUMRULE_STATE
}
@@ -4243,37 +4243,37 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
{
const sal_Int32 nCpyLen = ( (bOneNode)
? pEnd->nContent.GetIndex()
- : pSttTxtNd->GetTxt().getLength())
+ : pSttTextNd->GetText().getLength())
- pStt->nContent.GetIndex();
- pSttTxtNd->CopyText( pDestTxtNd, aDestIdx,
+ pSttTextNd->CopyText( pDestTextNd, aDestIdx,
pStt->nContent, nCpyLen );
if( bEndEqualIns )
pEnd->nContent -= nCpyLen;
}
- if( bCopyCollFmt && bOneNode )
+ if( bCopyCollFormat && bOneNode )
{
- pSttTxtNd->CopyCollFmt( *pDestTxtNd );
+ pSttTextNd->CopyCollFormat( *pDestTextNd );
POP_NUMRULE_STATE
}
}
}
- else if( pDestTxtNd )
+ else if( pDestTextNd )
{
// Problems with insertion of table selections into "normal" text solved.
// We have to set the correct PaM for Undo, if this PaM starts in a textnode,
// the undo operation will try to merge this node after removing the table.
// If we didn't split a textnode, the PaM should start at the inserted table node
- if( rPos.nContent.GetIndex() == pDestTxtNd->Len() )
+ if( rPos.nContent.GetIndex() == pDestTextNd->Len() )
{ // Insertion at the last position of a textnode (empty or not)
++aInsPos; // The table will be inserted behind the text node
}
else if( rPos.nContent.GetIndex() )
{ // Insertion in the middle of a text node, it has to be split
// (and joined from undo)
- bStartIsTxtNode = true;
+ bStartIsTextNode = true;
- const sal_Int32 nCntntEnd = pEnd->nContent.GetIndex();
+ const sal_Int32 nContentEnd = pEnd->nContent.GetIndex();
{
::sw::UndoGuard const ug(pDoc->GetIDocumentUndoRedo());
pDoc->getIDocumentContentOperations().SplitNode( rPos, false );
@@ -4282,8 +4282,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if (bCanMoveBack && rPos == *pCopyPam->GetPoint())
{
// after the SplitNode, span the CpyPam correctly again
- pCopyPam->Move( fnMoveBackward, fnGoCntnt );
- pCopyPam->Move( fnMoveBackward, fnGoCntnt );
+ pCopyPam->Move( fnMoveBackward, fnGoContent );
+ pCopyPam->Move( fnMoveBackward, fnGoContent );
}
// Correct the area again
@@ -4293,8 +4293,8 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
else if( rPos == *pEnd )
{
rPos.nNode-=2;
- rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
- nCntntEnd );
+ rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
+ nContentEnd );
rPos.nNode++;
aRg.aEnd--;
}
@@ -4311,41 +4311,41 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
}
}
- pDestTxtNd = aInsPos.GetNode().GetTxtNode();
- if( pEndTxtNd && (!bOneNode || !bHandledStartNode) )
+ pDestTextNd = aInsPos.GetNode().GetTextNode();
+ if( pEndTextNd && (!bOneNode || !bHandledStartNode) )
{
SwIndex aDestIdx( rPos.nContent );
- if( !pDestTxtNd )
+ if( !pDestTextNd )
{
- pDestTxtNd = pDoc->GetNodes().MakeTxtNode( aInsPos,
- pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(RES_POOLCOLL_STANDARD));
- aDestIdx.Assign( pDestTxtNd, 0 );
+ pDestTextNd = pDoc->GetNodes().MakeTextNode( aInsPos,
+ pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(RES_POOLCOLL_STANDARD));
+ aDestIdx.Assign( pDestTextNd, 0 );
aInsPos--;
// if we have to insert an extra text node
// at the destination, this node will be our new destination
- // (text) node, and thus we set bStartisTxtNode to true. This
+ // (text) node, and thus we set bStartisTextNode to true. This
// will ensure that this node will be deleted during Undo
// using JoinNext.
- OSL_ENSURE( !bStartIsTxtNode, "Oops, undo may be instable now." );
- bStartIsTxtNode = true;
+ OSL_ENSURE( !bStartIsTextNode, "Oops, undo may be instable now." );
+ bStartIsTextNode = true;
}
- const bool bEmptyDestNd = pDestTxtNd->GetTxt().isEmpty();
+ const bool bEmptyDestNd = pDestTextNd->GetText().isEmpty();
NUMRULE_STATE
- if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+ if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
{
PUSH_NUMRULE_STATE
}
- pEndTxtNd->CopyText( pDestTxtNd, aDestIdx, SwIndex( pEndTxtNd ),
+ pEndTextNd->CopyText( pDestTextNd, aDestIdx, SwIndex( pEndTextNd ),
pEnd->nContent.GetIndex() );
// Also copy all format templates
- if( bCopyCollFmt && ( bOneNode || bEmptyDestNd ))
+ if( bCopyCollFormat && ( bOneNode || bEmptyDestNd ))
{
- pEndTxtNd->CopyCollFmt( *pDestTxtNd );
+ pEndTextNd->CopyCollFormat( *pDestTextNd );
if ( bOneNode )
{
POP_NUMRULE_STATE
@@ -4356,13 +4356,13 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
if( bCopyAll || aRg.aStart != aRg.aEnd )
{
SfxItemSet aBrkSet( pDoc->GetAttrPool(), aBreakSetRange );
- if( !bOneNode && pSttTxtNd && bCopyCollFmt && pDestTxtNd->HasSwAttrSet() )
+ if( !bOneNode && pSttTextNd && bCopyCollFormat && pDestTextNd->HasSwAttrSet() )
{
- aBrkSet.Put( *pDestTxtNd->GetpSwAttrSet() );
+ aBrkSet.Put( *pDestTextNd->GetpSwAttrSet() );
if( SfxItemState::SET == aBrkSet.GetItemState( RES_BREAK, false ) )
- pDestTxtNd->ResetAttr( RES_BREAK );
+ pDestTextNd->ResetAttr( RES_BREAK );
if( SfxItemState::SET == aBrkSet.GetItemState( RES_PAGEDESC, false ) )
- pDestTxtNd->ResetAttr( RES_PAGEDESC );
+ pDestTextNd->ResetAttr( RES_PAGEDESC );
}
if( aInsPos == pEnd->nNode )
@@ -4372,7 +4372,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
false, false, bHandledStartNode );
++aSaveIdx;
pEnd->nNode = aSaveIdx;
- pEnd->nContent.Assign( aSaveIdx.GetNode().GetTxtNode(), 0 );
+ pEnd->nContent.Assign( aSaveIdx.GetNode().GetTextNode(), 0 );
}
else
CopyWithFlyInFly( aRg, pEnd->nContent.GetIndex(), aInsPos, &rPam,
@@ -4381,29 +4381,29 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
bCopyBookmarks = false;
// Put the breaks back into the first node
- if( aBrkSet.Count() && 0 != ( pDestTxtNd = pDoc->GetNodes()[
- pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTxtNode()))
+ if( aBrkSet.Count() && 0 != ( pDestTextNd = pDoc->GetNodes()[
+ pCopyPam->GetPoint()->nNode.GetIndex()+1 ]->GetTextNode()))
{
- pDestTxtNd->SetAttr( aBrkSet );
+ pDestTextNd->SetAttr( aBrkSet );
}
}
} while( false );
// Adjust position (in case it was moved / in another node)
- rPos.nContent.Assign( rPos.nNode.GetNode().GetCntntNode(),
+ rPos.nContent.Assign( rPos.nNode.GetNode().GetContentNode(),
rPos.nContent.GetIndex() );
if( rPos.nNode != aInsPos )
{
pCopyPam->GetMark()->nNode = aInsPos;
- pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetCntntNode(false), 0);
+ pCopyPam->GetMark()->nContent.Assign(pCopyPam->GetContentNode(false), 0);
rPos = *pCopyPam->GetMark();
}
else
*pCopyPam->GetMark() = rPos;
if ( !bAfterTable )
- pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoCntnt : fnGoNode );
+ pCopyPam->Move( fnMoveForward, bCanMoveBack ? fnGoContent : fnGoNode );
else
{
// Reset the offset to 0 as it was before the insertion
@@ -4434,7 +4434,7 @@ bool DocumentContentOperationsManager::CopyImpl( SwPaM& rPam, SwPosition& rPos,
// If Undo is enabled, store the inserted area
if (pDoc->GetIDocumentUndoRedo().DoesUndo())
{
- pUndo->SetInsertRange( *pCopyPam, true, bStartIsTxtNode );
+ pUndo->SetInsertRange( *pCopyPam, true, bStartIsTextNode );
}
if( pCpyRange )
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index 6dd362a19b82..fc1f86b79c09 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -340,7 +340,7 @@ void DocumentDeviceManager::PrtDataChanged()
pFntCache->Flush();
std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
for(SwViewShell& rShell : pSh->GetRingContainer())
rShell.InitPrt(getPrinter(false));
diff --git a/sw/source/core/doc/DocumentDrawModelManager.cxx b/sw/source/core/doc/DocumentDrawModelManager.cxx
index bed970f0d55e..50a3ab13af53 100644
--- a/sw/source/core/doc/DocumentDrawModelManager.cxx
+++ b/sw/source/core/doc/DocumentDrawModelManager.cxx
@@ -226,8 +226,8 @@ SwDrawModel* DocumentDrawModelManager::_MakeDrawModel()
// Broadcast, so that the FormShell can be connected to the DrawView
if( m_rDoc.GetDocShell() )
{
- SfxSimpleHint aHnt( SW_BROADCAST_DRAWVIEWS_CREATED );
- m_rDoc.GetDocShell()->Broadcast( aHnt );
+ SfxSimpleHint aHint( SW_BROADCAST_DRAWVIEWS_CREATED );
+ m_rDoc.GetDocShell()->Broadcast( aHint );
}
}
return mpDrawModel;
@@ -372,19 +372,19 @@ SdrLayerID DocumentDrawModelManager::GetInvisibleLayerIdByVisibleOne( const SdrL
bool DocumentDrawModelManager::Search(const SwPaM& rPaM, const SvxSearchItem& rSearchItem)
{
- SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFmts(&rPaM, /*bDrawAlso=*/true);
+ SwPosFlyFrms aFrames = m_rDoc.GetAllFlyFormats(&rPaM, /*bDrawAlso=*/true);
for (const SwPosFlyFrmPtr& pPosFlyFrm : aFrames)
{
// Filter for at-paragraph anchored draw frames.
- const SwFrmFmt& rFrmFmt = pPosFlyFrm->GetFmt();
- const SwFmtAnchor& rAnchor = rFrmFmt.GetAnchor();
- if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrmFmt.Which() != RES_DRAWFRMFMT)
+ const SwFrameFormat& rFrameFormat = pPosFlyFrm->GetFormat();
+ const SwFormatAnchor& rAnchor = rFrameFormat.GetAnchor();
+ if (rAnchor.GetAnchorId() != FLY_AT_PARA || rFrameFormat.Which() != RES_DRAWFRMFMT)
continue;
// Does the shape have matching text?
SdrOutliner& rOutliner = GetDrawModel()->GetDrawOutliner();
- SdrObject* pObject = const_cast<SdrObject*>(rFrmFmt.FindSdrObject());
+ SdrObject* pObject = const_cast<SdrObject*>(rFrameFormat.FindSdrObject());
SdrTextObj* pTextObj = dynamic_cast<SdrTextObj*>(pObject);
if (!pTextObj)
continue;
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index a3fe65064e19..dc6122b0a181 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -57,9 +57,9 @@ namespace
{
#if HAVE_FEATURE_DBCONNECTIVITY
- static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBFld )
+ static OUString lcl_GetDBVarName( SwDoc& rDoc, SwDBNameInfField& rDBField )
{
- SwDBData aDBData( rDBFld.GetDBData( &rDoc ));
+ SwDBData aDBData( rDBField.GetDBData( &rDoc ));
OUString sDBNumNm;
SwDBData aDocData = rDoc.GetDBData();
@@ -77,56 +77,56 @@ namespace
#endif
- static void lcl_CalcFld( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpFld& rSGEFld,
+ static void lcl_CalcField( SwDoc& rDoc, SwCalc& rCalc, const _SetGetExpField& rSGEField,
SwDBManager* pMgr )
{
- const SwTxtFld* pTxtFld = rSGEFld.GetTxtFld();
- if( !pTxtFld )
+ const SwTextField* pTextField = rSGEField.GetTextField();
+ if( !pTextField )
return ;
- const SwField* pFld = pTxtFld->GetFmtFld().GetField();
- const sal_uInt16 nFldWhich = pFld->GetTyp()->Which();
+ const SwField* pField = pTextField->GetFormatField().GetField();
+ const sal_uInt16 nFieldWhich = pField->GetTyp()->Which();
- if( RES_SETEXPFLD == nFldWhich )
+ if( RES_SETEXPFLD == nFieldWhich )
{
SwSbxValue aValue;
- if( nsSwGetSetExpType::GSE_EXPR & pFld->GetSubType() )
- aValue.PutDouble( static_cast<const SwSetExpField*>(pFld)->GetValue() );
+ if( nsSwGetSetExpType::GSE_EXPR & pField->GetSubType() )
+ aValue.PutDouble( static_cast<const SwSetExpField*>(pField)->GetValue() );
else
// Extension to calculate with Strings
- aValue.PutString( static_cast<const SwSetExpField*>(pFld)->GetExpStr() );
+ aValue.PutString( static_cast<const SwSetExpField*>(pField)->GetExpStr() );
// set the new value in Calculator
- rCalc.VarChange( pFld->GetTyp()->GetName(), aValue );
+ rCalc.VarChange( pField->GetTyp()->GetName(), aValue );
}
else if( pMgr )
{
#if !HAVE_FEATURE_DBCONNECTIVITY
(void) rDoc;
#else
- switch( nFldWhich )
+ switch( nFieldWhich )
{
case RES_DBNUMSETFLD:
{
- SwDBNumSetField* pDBFld = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pFld));
+ SwDBNumSetField* pDBField = const_cast<SwDBNumSetField*>(static_cast<const SwDBNumSetField*>(pField));
- SwDBData aDBData(pDBFld->GetDBData(&rDoc));
+ SwDBData aDBData(pDBField->GetDBData(&rDoc));
- if( pDBFld->IsCondValid() &&
+ if( pDBField->IsCondValid() &&
pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
- rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBFld),
- pDBFld->GetFormat() );
+ rCalc.VarChange( lcl_GetDBVarName( rDoc, *pDBField),
+ pDBField->GetFormat() );
}
break;
case RES_DBNEXTSETFLD:
{
- SwDBNextSetField* pDBFld = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pFld));
- SwDBData aDBData(pDBFld->GetDBData(&rDoc));
- if( !pDBFld->IsCondValid() ||
+ SwDBNextSetField* pDBField = const_cast<SwDBNextSetField*>(static_cast<const SwDBNextSetField*>(pField));
+ SwDBData aDBData(pDBField->GetDBData(&rDoc));
+ if( !pDBField->IsCondValid() ||
!pMgr->OpenDataSource( aDBData.sDataSource, aDBData.sCommand ))
break;
- OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBFld));
+ OUString sDBNumNm(lcl_GetDBVarName( rDoc, *pDBField));
SwCalcExp* pExp = rCalc.VarLook( sDBNumNm );
if( pExp )
rCalc.VarChange( sDBNumNm, pExp->nValue.GetLong() + 1 );
@@ -143,38 +143,38 @@ namespace sw
{
DocumentFieldsManager::DocumentFieldsManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
- mbNewFldLst(true),
- mpUpdtFlds( new SwDocUpdtFld( &m_rDoc ) ),
- mpFldTypes( new SwFldTypes() ),
- mnLockExpFld( 0 )
+ mbNewFieldLst(true),
+ mpUpdateFields( new SwDocUpdateField( &m_rDoc ) ),
+ mpFieldTypes( new SwFieldTypes() ),
+ mnLockExpField( 0 )
{
}
-const SwFldTypes* DocumentFieldsManager::GetFldTypes() const
+const SwFieldTypes* DocumentFieldsManager::GetFieldTypes() const
{
- return mpFldTypes;
+ return mpFieldTypes;
}
/** Insert field types
*
- * @param rFldTyp ???
+ * @param rFieldTyp ???
* @return Always returns a pointer to the type, if it's new or already added.
*/
-SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
+SwFieldType* DocumentFieldsManager::InsertFieldType(const SwFieldType &rFieldTyp)
{
- sal_uInt16 nSize = mpFldTypes->size(),
- nFldWhich = rFldTyp.Which();
+ sal_uInt16 nSize = mpFieldTypes->size(),
+ nFieldWhich = rFieldTyp.Which();
sal_uInt16 i = INIT_FLDTYPES;
- switch( nFldWhich )
+ switch( nFieldWhich )
{
case RES_SETEXPFLD:
//JP 29.01.96: SequenceFields start at INIT_FLDTYPES - 3!!
// Or we get doubble number circles!!
//MIB 14.03.95: From now on also the SW3-Reader relies on &m_rDoc, when
//constructing string pools and when reading SetExp fields
- if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFldTyp).GetType() )
+ if( nsSwGetSetExpType::GSE_SEQ & static_cast<const SwSetExpFieldType&>(rFieldTyp).GetType() )
i -= INIT_SEQ_FLDTYPES;
// no break;
case RES_DBFLD:
@@ -182,28 +182,28 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
case RES_DDEFLD:
{
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
- OUString sFldNm( rFldTyp.GetName() );
+ OUString sFieldNm( rFieldTyp.GetName() );
for( ; i < nSize; ++i )
- if( nFldWhich == (*mpFldTypes)[i]->Which() &&
- rSCmp.isEqual( sFldNm, (*mpFldTypes)[i]->GetName() ))
- return (*mpFldTypes)[i];
+ if( nFieldWhich == (*mpFieldTypes)[i]->Which() &&
+ rSCmp.isEqual( sFieldNm, (*mpFieldTypes)[i]->GetName() ))
+ return (*mpFieldTypes)[i];
}
break;
case RES_AUTHORITY:
for( ; i < nSize; ++i )
- if( nFldWhich == (*mpFldTypes)[i]->Which() )
- return (*mpFldTypes)[i];
+ if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+ return (*mpFieldTypes)[i];
break;
default:
for( i = 0; i < nSize; ++i )
- if( nFldWhich == (*mpFldTypes)[i]->Which() )
- return (*mpFldTypes)[i];
+ if( nFieldWhich == (*mpFieldTypes)[i]->Which() )
+ return (*mpFieldTypes)[i];
}
- SwFieldType* pNew = rFldTyp.Copy();
- switch( nFldWhich )
+ SwFieldType* pNew = rFieldTyp.Copy();
+ switch( nFieldWhich )
{
case RES_DDEFLD:
static_cast<SwDDEFieldType*>(pNew)->SetDoc( &m_rDoc );
@@ -220,36 +220,36 @@ SwFieldType* DocumentFieldsManager::InsertFldType(const SwFieldType &rFldTyp)
case RES_SETEXPFLD:
static_cast<SwValueFieldType*>(pNew)->SetDoc( &m_rDoc );
// JP 29.07.96: Optionally prepare FieldList for Calculator:
- mpUpdtFlds->InsertFldType( *pNew );
+ mpUpdateFields->InsertFieldType( *pNew );
break;
case RES_AUTHORITY :
static_cast<SwAuthorityFieldType*>(pNew)->SetDoc( &m_rDoc );
break;
}
- mpFldTypes->insert( mpFldTypes->begin() + nSize, pNew );
+ mpFieldTypes->insert( mpFieldTypes->begin() + nSize, pNew );
m_rDoc.getIDocumentState().SetModified();
- return (*mpFldTypes)[ nSize ];
+ return (*mpFieldTypes)[ nSize ];
}
/// @returns the field type of the Doc
-SwFieldType *DocumentFieldsManager::GetSysFldType( const sal_uInt16 eWhich ) const
+SwFieldType *DocumentFieldsManager::GetSysFieldType( const sal_uInt16 eWhich ) const
{
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
- if( eWhich == (*mpFldTypes)[i]->Which() )
- return (*mpFldTypes)[i];
+ if( eWhich == (*mpFieldTypes)[i]->Which() )
+ return (*mpFieldTypes)[i];
return 0;
}
/// Find first type with ResId and name
-SwFieldType* DocumentFieldsManager::GetFldType(
+SwFieldType* DocumentFieldsManager::GetFieldType(
sal_uInt16 nResId,
const OUString& rName,
bool bDbFieldMatching // used in some UNO calls for RES_DBFLD to use different string matching code #i51815#
) const
{
- sal_uInt16 nSize = mpFldTypes->size(), i = 0;
+ sal_uInt16 nSize = mpFieldTypes->size(), i = 0;
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
switch( nResId )
@@ -273,16 +273,16 @@ SwFieldType* DocumentFieldsManager::GetFldType(
SwFieldType* pRet = 0;
for( ; i < nSize; ++i )
{
- SwFieldType* pFldType = (*mpFldTypes)[i];
+ SwFieldType* pFieldType = (*mpFieldTypes)[i];
- OUString aFldName( pFldType->GetName() );
+ OUString aFieldName( pFieldType->GetName() );
if (bDbFieldMatching && nResId == RES_DBFLD) // #i51815#
- aFldName = aFldName.replace(DB_DELIM, '.');
+ aFieldName = aFieldName.replace(DB_DELIM, '.');
- if( nResId == pFldType->Which() &&
- rSCmp.isEqual( rName, aFldName ))
+ if( nResId == pFieldType->Which() &&
+ rSCmp.isEqual( rName, aFieldName ))
{
- pRet = pFldType;
+ pRet = pFieldType;
break;
}
}
@@ -290,24 +290,24 @@ SwFieldType* DocumentFieldsManager::GetFldType(
}
/// Remove field type
-void DocumentFieldsManager::RemoveFldType(size_t nFld)
+void DocumentFieldsManager::RemoveFieldType(size_t nField)
{
- OSL_ENSURE( INIT_FLDTYPES <= nFld, "don't remove InitFlds" );
+ OSL_ENSURE( INIT_FLDTYPES <= nField, "don't remove InitFields" );
/*
* Dependent fields present -> ErrRaise
*/
- size_t nSize = mpFldTypes->size();
- if(nFld < nSize)
+ size_t nSize = mpFieldTypes->size();
+ if(nField < nSize)
{
- SwFieldType* pTmp = (*mpFldTypes)[nFld];
+ SwFieldType* pTmp = (*mpFieldTypes)[nField];
- // JP 29.07.96: Optionally prepare FldLst for Calculator
+ // JP 29.07.96: Optionally prepare FieldLst for Calculator
sal_uInt16 nWhich = pTmp->Which();
switch( nWhich )
{
case RES_SETEXPFLD:
case RES_USERFLD:
- mpUpdtFlds->RemoveFldType( *pTmp );
+ mpUpdateFields->RemoveFieldType( *pTmp );
// no break;
case RES_DDEFLD:
if( pTmp->HasWriterListeners() && !m_rDoc.IsUsed( *pTmp ) )
@@ -329,20 +329,20 @@ void DocumentFieldsManager::RemoveFldType(size_t nFld)
// delete field type
delete pTmp;
}
- mpFldTypes->erase( mpFldTypes->begin() + nFld );
+ mpFieldTypes->erase( mpFieldTypes->begin() + nField );
m_rDoc.getIDocumentState().SetModified();
}
}
// All have to be re-evaluated.
-void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
+void DocumentFieldsManager::UpdateFields( SfxPoolItem *pNewHt, bool bCloseDB )
{
// Call Modify() for every field type,
- // dependent SwTxtFld get notified ...
+ // dependent SwTextField get notified ...
- for( sal_uInt16 i=0; i < mpFldTypes->size(); ++i)
+ for( sal_uInt16 i=0; i < mpFieldTypes->size(); ++i)
{
- switch( (*mpFldTypes)[i]->Which() )
+ switch( (*mpFieldTypes)[i]->Which() )
{
// Update table fields second to last
// Update references last
@@ -358,10 +358,10 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
if( !pNewHt )
{
SwMsgPoolItem aUpdateDDE( RES_UPDATEDDETBL );
- (*mpFldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
+ (*mpFieldTypes)[i]->ModifyNotification( 0, &aUpdateDDE );
}
else
- (*mpFldTypes)[i]->ModifyNotification( 0, pNewHt );
+ (*mpFieldTypes)[i]->ModifyNotification( 0, pNewHt );
break;
}
case RES_GETEXPFLD:
@@ -372,18 +372,18 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
if( !pNewHt )
break;
default:
- (*mpFldTypes)[i]->ModifyNotification ( 0, pNewHt );
+ (*mpFieldTypes)[i]->ModifyNotification ( 0, pNewHt );
}
}
- if( !IsExpFldsLocked() )
- UpdateExpFlds( 0, false ); // update expression fields
+ if( !IsExpFieldsLocked() )
+ UpdateExpFields( 0, false ); // update expression fields
// Tables
- UpdateTblFlds(pNewHt);
+ UpdateTableFields(pNewHt);
// References
- UpdateRefFlds(pNewHt);
+ UpdateRefFields(pNewHt);
if( bCloseDB )
{
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -394,40 +394,40 @@ void DocumentFieldsManager::UpdateFlds( SfxPoolItem *pNewHt, bool bCloseDB )
m_rDoc.getIDocumentState().SetModified();
}
-void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
+void DocumentFieldsManager::InsDeletedFieldType( SwFieldType& rFieldTyp )
{
- // The FldType was marked as deleted and removed from the array.
+ // The FieldType was marked as deleted and removed from the array.
// One has to look &m_rDoc up again, now.
// - If it's not present, it can be re-inserted.
// - If the same type is found, the deleted one has to be renamed.
- sal_uInt16 nSize = mpFldTypes->size(), nFldWhich = rFldTyp.Which();
+ sal_uInt16 nSize = mpFieldTypes->size(), nFieldWhich = rFieldTyp.Which();
sal_uInt16 i = INIT_FLDTYPES;
- OSL_ENSURE( RES_SETEXPFLD == nFldWhich ||
- RES_USERFLD == nFldWhich ||
- RES_DDEFLD == nFldWhich, "Wrong FldType" );
+ OSL_ENSURE( RES_SETEXPFLD == nFieldWhich ||
+ RES_USERFLD == nFieldWhich ||
+ RES_DDEFLD == nFieldWhich, "Wrong FieldType" );
const ::utl::TransliterationWrapper& rSCmp = GetAppCmpStrIgnore();
- const OUString& rFldNm = rFldTyp.GetName();
+ const OUString& rFieldNm = rFieldTyp.GetName();
SwFieldType* pFnd;
for( ; i < nSize; ++i )
- if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
- rSCmp.isEqual( rFldNm, pFnd->GetName() ) )
+ if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
+ rSCmp.isEqual( rFieldNm, pFnd->GetName() ) )
{
// find new name
sal_uInt16 nNum = 1;
do {
- OUString sSrch = rFldNm + OUString::number( nNum );
+ OUString sSrch = rFieldNm + OUString::number( nNum );
for( i = INIT_FLDTYPES; i < nSize; ++i )
- if( nFldWhich == (pFnd = (*mpFldTypes)[i])->Which() &&
+ if( nFieldWhich == (pFnd = (*mpFieldTypes)[i])->Which() &&
rSCmp.isEqual( sSrch, pFnd->GetName() ) )
break;
if( i >= nSize ) // not found
{
- const_cast<OUString&>(rFldNm) = sSrch;
+ const_cast<OUString&>(rFieldNm) = sSrch;
break; // exit while loop
}
++nNum;
@@ -436,17 +436,17 @@ void DocumentFieldsManager::InsDeletedFldType( SwFieldType& rFldTyp )
}
// not found, so insert and delete flag
- mpFldTypes->insert( mpFldTypes->begin() + nSize, &rFldTyp );
- switch( nFldWhich )
+ mpFieldTypes->insert( mpFieldTypes->begin() + nSize, &rFieldTyp );
+ switch( nFieldWhich )
{
case RES_SETEXPFLD:
- static_cast<SwSetExpFieldType&>(rFldTyp).SetDeleted( false );
+ static_cast<SwSetExpFieldType&>(rFieldTyp).SetDeleted( false );
break;
case RES_USERFLD:
- static_cast<SwUserFieldType&>(rFldTyp).SetDeleted( false );
+ static_cast<SwUserFieldType&>(rFieldTyp).SetDeleted( false );
break;
case RES_DDEFLD:
- static_cast<SwDDEFieldType&>(rFldTyp).SetDeleted( false );
+ static_cast<SwDDEFieldType&>(rFieldTyp).SetDeleted( false );
break;
}
}
@@ -467,74 +467,74 @@ bool DocumentFieldsManager::PutValueToField(const SwPosition & rPos,
return pField->PutValue(rVal, nWhich);
}
-bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
- SwMsgPoolItem * pMsgHnt,
- bool bUpdateFlds)
+bool DocumentFieldsManager::UpdateField(SwTextField * pDstTextField, SwField & rSrcField,
+ SwMsgPoolItem * pMsgHint,
+ bool bUpdateFields)
{
- OSL_ENSURE(pDstTxtFld, "no field to update!");
+ OSL_ENSURE(pDstTextField, "no field to update!");
- bool bTblSelBreak = false;
+ bool bTableSelBreak = false;
- SwFmtFld * pDstFmtFld = const_cast<SwFmtFld*>(&pDstTxtFld->GetFmtFld());
- SwField * pDstFld = pDstFmtFld->GetField();
- sal_uInt16 nFldWhich = rSrcFld.GetTyp()->Which();
- SwNodeIndex aTblNdIdx(pDstTxtFld->GetTxtNode());
+ SwFormatField * pDstFormatField = const_cast<SwFormatField*>(&pDstTextField->GetFormatField());
+ SwField * pDstField = pDstFormatField->GetField();
+ sal_uInt16 nFieldWhich = rSrcField.GetTyp()->Which();
+ SwNodeIndex aTableNdIdx(pDstTextField->GetTextNode());
- if (pDstFld->GetTyp()->Which() ==
- rSrcFld.GetTyp()->Which())
+ if (pDstField->GetTyp()->Which() ==
+ rSrcField.GetTyp()->Which())
{
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- SwPosition aPosition( pDstTxtFld->GetTxtNode() );
- aPosition.nContent = pDstTxtFld->GetStart();
+ SwPosition aPosition( pDstTextField->GetTextNode() );
+ aPosition.nContent = pDstTextField->GetStart();
- SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstFld, rSrcFld, pMsgHnt, bUpdateFlds) );
+ SwUndo *const pUndo( new SwUndoFieldFromDoc( aPosition, *pDstField, rSrcField, pMsgHint, bUpdateFields) );
m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
}
- SwField * pNewFld = rSrcFld.CopyField();
- pDstFmtFld->SetField(pNewFld);
+ SwField * pNewField = rSrcField.CopyField();
+ pDstFormatField->SetField(pNewField);
- switch( nFldWhich )
+ switch( nFieldWhich )
{
case RES_SETEXPFLD:
case RES_GETEXPFLD:
case RES_HIDDENTXTFLD:
case RES_HIDDENPARAFLD:
- UpdateExpFlds( pDstTxtFld, true );
+ UpdateExpFields( pDstTextField, true );
break;
case RES_TABLEFLD:
{
- const SwTableNode* pTblNd =
- m_rDoc.IsIdxInTbl(aTblNdIdx);
- if( pTblNd )
+ const SwTableNode* pTableNd =
+ m_rDoc.IsIdxInTable(aTableNdIdx);
+ if( pTableNd )
{
- SwTableFmlUpdate aTblUpdate( &pTblNd->
+ SwTableFormulaUpdate aTableUpdate( &pTableNd->
GetTable() );
- if (bUpdateFlds)
- UpdateTblFlds( &aTblUpdate );
+ if (bUpdateFields)
+ UpdateTableFields( &aTableUpdate );
else
- pNewFld->GetTyp()->ModifyNotification(0, &aTblUpdate);
+ pNewField->GetTyp()->ModifyNotification(0, &aTableUpdate);
- if (! bUpdateFlds)
- bTblSelBreak = true;
+ if (! bUpdateFields)
+ bTableSelBreak = true;
}
}
break;
case RES_MACROFLD:
- if( bUpdateFlds && pDstTxtFld->GetpTxtNode() )
- (pDstTxtFld->GetpTxtNode())->
- ModifyNotification( 0, pDstFmtFld );
+ if( bUpdateFields && pDstTextField->GetpTextNode() )
+ (pDstTextField->GetpTextNode())->
+ ModifyNotification( 0, pDstFormatField );
break;
case RES_DBNAMEFLD:
case RES_DBNEXTSETFLD:
case RES_DBNUMSETFLD:
case RES_DBSETNUMBERFLD:
- m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewFld)->GetRealDBData());
- pNewFld->GetTyp()->UpdateFlds();
+ m_rDoc.ChgDBData(static_cast<SwDBNameInfField*>( pNewField)->GetRealDBData());
+ pNewField->GetTyp()->UpdateFields();
break;
@@ -543,97 +543,97 @@ bool DocumentFieldsManager::UpdateFld(SwTxtFld * pDstTxtFld, SwField & rSrcFld,
{
// JP 10.02.96: call ChgValue, so that the style change sets the
// ContentString correctly
- SwDBField* pDBFld = static_cast<SwDBField*>(pNewFld);
- if (pDBFld->IsInitialized())
- pDBFld->ChgValue( pDBFld->GetValue(), true );
+ SwDBField* pDBField = static_cast<SwDBField*>(pNewField);
+ if (pDBField->IsInitialized())
+ pDBField->ChgValue( pDBField->GetValue(), true );
- pDBFld->ClearInitialized();
- pDBFld->InitContent();
+ pDBField->ClearInitialized();
+ pDBField->InitContent();
}
#endif
// no break;
default:
- pDstFmtFld->ModifyNotification( 0, pMsgHnt );
+ pDstFormatField->ModifyNotification( 0, pMsgHint );
}
// The fields we can calculate here are being triggered for an update
// here explicitly.
- if( nFldWhich == RES_USERFLD )
- UpdateUsrFlds();
+ if( nFieldWhich == RES_USERFLD )
+ UpdateUsrFields();
}
- return bTblSelBreak;
+ return bTableSelBreak;
}
/// Update reference and table fields
-void DocumentFieldsManager::UpdateRefFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateRefFields( SfxPoolItem* pHt )
{
- SwFieldType* pFldType;
- for( sal_uInt16 i = 0; i < mpFldTypes->size(); ++i )
- if( RES_GETREFFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
- pFldType->ModifyNotification( 0, pHt );
+ SwFieldType* pFieldType;
+ for( sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i )
+ if( RES_GETREFFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
+ pFieldType->ModifyNotification( 0, pHt );
}
-void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
+void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
{
OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE == pHt->Which(),
"What MessageItem is &m_rDoc?" );
- SwFieldType* pFldType(0);
+ SwFieldType* pFieldType(0);
- for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+ for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
{
- if( RES_TABLEFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+ if( RES_TABLEFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
{
- SwTableFmlUpdate* pUpdtFld = 0;
+ SwTableFormulaUpdate* pUpdateField = 0;
if( pHt && RES_TABLEFML_UPDATE == pHt->Which() )
- pUpdtFld = static_cast<SwTableFmlUpdate*>(pHt);
+ pUpdateField = static_cast<SwTableFormulaUpdate*>(pHt);
- SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
{
- if( pFmtFld->GetTxtFld() )
+ if( pFormatField->GetTextField() )
{
- SwTblField* pFld = static_cast<SwTblField*>(pFmtFld->GetField());
+ SwTableField* pField = static_cast<SwTableField*>(pFormatField->GetField());
- if( pUpdtFld )
+ if( pUpdateField )
{
// table where &m_rDoc field is located
- const SwTableNode* pTblNd;
- const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
- if( !rTxtNd.GetNodes().IsDocNodes() ||
- 0 == ( pTblNd = rTxtNd.FindTableNode() ) )
+ const SwTableNode* pTableNd;
+ const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+ if( !rTextNd.GetNodes().IsDocNodes() ||
+ 0 == ( pTableNd = rTextNd.FindTableNode() ) )
continue;
- switch( pUpdtFld->eFlags )
+ switch( pUpdateField->eFlags )
{
case TBL_CALC:
// re-set the value flag
// JP 17.06.96: internal representation of all formulas
// (reference to other table!!!)
- if( nsSwExtendedSubType::SUB_CMD & pFld->GetSubType() )
- pFld->PtrToBoxNm( pUpdtFld->pTbl );
+ if( nsSwExtendedSubType::SUB_CMD & pField->GetSubType() )
+ pField->PtrToBoxNm( pUpdateField->pTable );
else
- pFld->ChgValid( false );
+ pField->ChgValid( false );
break;
case TBL_BOXNAME:
// is &m_rDoc the wanted table?
- if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+ if( &pTableNd->GetTable() == pUpdateField->pTable )
// to the external representation
- pFld->PtrToBoxNm( pUpdtFld->pTbl );
+ pField->PtrToBoxNm( pUpdateField->pTable );
break;
case TBL_BOXPTR:
// to the internal representation
// JP 17.06.96: internal representation on all formulas
// (reference to other table!!!)
- pFld->BoxNmToPtr( pUpdtFld->pTbl );
+ pField->BoxNmToPtr( pUpdateField->pTable );
break;
case TBL_RELBOXNAME:
// is &m_rDoc the wanted table?
- if( &pTblNd->GetTable() == pUpdtFld->pTbl )
+ if( &pTableNd->GetTable() == pUpdateField->pTable )
// to the relative representation
- pFld->ToRelBoxNm( pUpdtFld->pTbl );
+ pField->ToRelBoxNm( pUpdateField->pTable );
break;
default:
break;
@@ -641,13 +641,13 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
}
else
// reset the value flag for all
- pFld->ChgValid( false );
+ pField->ChgValid( false );
}
}
break;
}
- pFldType = 0;
+ pFieldType = 0;
}
// process all table box formulas
@@ -656,47 +656,47 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
for (sal_uInt32 i = 0; i < nMaxItems; ++i)
{
if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
- static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() )
+ static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() )
{
- const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem))->ChangeState( pHt );
+ const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem))->ChangeState( pHt );
}
}
// all fields/boxes are now invalid, so we can start to calculate
if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
- TBL_CALC != static_cast<SwTableFmlUpdate*>(pHt)->eFlags ))
+ TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->eFlags ))
return ;
SwCalc* pCalc = 0;
- if( pFldType )
+ if( pFieldType )
{
- SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFmtFld = aIter.Last(); pFmtFld; pFmtFld = aIter.Previous() )
+ SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+ for( SwFormatField* pFormatField = aIter.Last(); pFormatField; pFormatField = aIter.Previous() )
{
// start calculation at the end
// new fields are inserted at the beginning of the modify chain
// that gives faster calculation on import
// mba: do we really need &m_rDoc "optimization"? Is it still valid?
- SwTblField* pFld;
- if( !pFmtFld->GetTxtFld() || (nsSwExtendedSubType::SUB_CMD &
- (pFld = static_cast<SwTblField*>(pFmtFld->GetField()))->GetSubType() ))
+ SwTableField* pField;
+ if( !pFormatField->GetTextField() || (nsSwExtendedSubType::SUB_CMD &
+ (pField = static_cast<SwTableField*>(pFormatField->GetField()))->GetSubType() ))
continue;
// needs to be recalculated
- if( !pFld->IsValid() )
+ if( !pField->IsValid() )
{
// table where &m_rDoc field is located
- const SwTxtNode& rTxtNd = pFmtFld->GetTxtFld()->GetTxtNode();
- if( !rTxtNd.GetNodes().IsDocNodes() )
+ const SwTextNode& rTextNd = pFormatField->GetTextField()->GetTextNode();
+ if( !rTextNd.GetNodes().IsDocNodes() )
continue;
- const SwTableNode* pTblNd = rTxtNd.FindTableNode();
- if( !pTblNd )
+ const SwTableNode* pTableNd = rTextNd.FindTableNode();
+ if( !pTableNd )
continue;
// if &m_rDoc field is not in the to-be-updated table, skip it
- if( pHt && &pTblNd->GetTable() !=
- static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+ if( pHt && &pTableNd->GetTable() !=
+ static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
continue;
if( !pCalc )
@@ -705,17 +705,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
// get the values of all SetExpression fields that are valid
// until the table
SwFrm* pFrm = 0;
- if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+ if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
{
// is in the special section, that's expensive!
Point aPt; // return the first frame of the layout - Tab.Headline!!
- pFrm = rTxtNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
+ pFrm = rTextNd.getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt );
if( pFrm )
{
- SwPosition aPos( *pTblNd );
- if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
- FldsToCalc( *pCalc, _SetGetExpFld(
- aPos.nNode, pFmtFld->GetTxtFld(),
+ SwPosition aPos( *pTableNd );
+ if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+ FieldsToCalc( *pCalc, _SetGetExpField(
+ aPos.nNode, pFormatField->GetTextField(),
&aPos.nContent ));
else
pFrm = 0;
@@ -724,26 +724,26 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
if( !pFrm )
{
// create index to determine the TextNode
- SwNodeIndex aIdx( rTxtNd );
- FldsToCalc( *pCalc,
- _SetGetExpFld( aIdx, pFmtFld->GetTxtFld() ));
+ SwNodeIndex aIdx( rTextNd );
+ FieldsToCalc( *pCalc,
+ _SetGetExpField( aIdx, pFormatField->GetTextField() ));
}
- SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
- pFld->CalcField( aPara );
+ SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+ pField->CalcField( aPara );
if( aPara.IsStackOverflow() )
{
bool const bResult = aPara.CalcWithStackOverflow();
if (bResult)
{
- pFld->CalcField( aPara );
+ pField->CalcField( aPara );
}
OSL_ENSURE(bResult,
"the chained formula could no be calculated");
}
pCalc->SetCalcError( CALC_NOERR );
}
- pFmtFld->ModifyNotification( 0, pHt );
+ pFormatField->ModifyNotification( 0, pHt );
}
}
@@ -751,17 +751,17 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
for (sal_uInt32 i = 0; i < nMaxItems; ++i )
{
if( 0 != (pItem = m_rDoc.GetAttrPool().GetItem2( RES_BOXATR_FORMULA, i ) ) &&
- static_cast<const SwTblBoxFormula*>(pItem)->GetDefinedIn() &&
- !static_cast<const SwTblBoxFormula*>(pItem)->IsValid() )
+ static_cast<const SwTableBoxFormula*>(pItem)->GetDefinedIn() &&
+ !static_cast<const SwTableBoxFormula*>(pItem)->IsValid() )
{
- SwTblBoxFormula* pFml = const_cast<SwTblBoxFormula*>(static_cast<const SwTblBoxFormula*>(pItem));
- SwTableBox* pBox = pFml->GetTableBox();
+ SwTableBoxFormula* pFormula = const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem));
+ SwTableBox* pBox = pFormula->GetTableBox();
if( pBox && pBox->GetSttNd() &&
pBox->GetSttNd()->GetNodes().IsDocNodes() )
{
- const SwTableNode* pTblNd = pBox->GetSttNd()->FindTableNode();
- if( !pHt || &pTblNd->GetTable() ==
- static_cast<SwTableFmlUpdate*>(pHt)->pTbl )
+ const SwTableNode* pTableNd = pBox->GetSttNd()->FindTableNode();
+ if( !pHt || &pTableNd->GetTable() ==
+ static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
{
double nValue;
if( !pCalc )
@@ -770,20 +770,20 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
// get the values of all SetExpression fields that are valid
// until the table
SwFrm* pFrm = 0;
- if( pTblNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
+ if( pTableNd->GetIndex() < m_rDoc.GetNodes().GetEndOfExtras().GetIndex() )
{
// is in the special section, that's expensive!
Point aPt; // return the first frame of the layout - Tab.Headline!!
- SwNodeIndex aCNdIdx( *pTblNd, +2 );
- SwCntntNode* pCNd = aCNdIdx.GetNode().GetCntntNode();
+ SwNodeIndex aCNdIdx( *pTableNd, +2 );
+ SwContentNode* pCNd = aCNdIdx.GetNode().GetContentNode();
if( !pCNd )
pCNd = m_rDoc.GetNodes().GoNext( &aCNdIdx );
if( pCNd && 0 != (pFrm = pCNd->getLayoutFrm( m_rDoc.getIDocumentLayoutAccess().GetCurrentLayout(), &aPt )) )
{
SwPosition aPos( *pCNd );
- if( GetBodyTxtNode( m_rDoc, aPos, *pFrm ) )
- FldsToCalc( *pCalc, _SetGetExpFld( aPos.nNode ));
+ if( GetBodyTextNode( m_rDoc, aPos, *pFrm ) )
+ FieldsToCalc( *pCalc, _SetGetExpField( aPos.nNode ));
else
pFrm = 0;
}
@@ -791,34 +791,34 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
if( !pFrm )
{
// create index to determine the TextNode
- SwNodeIndex aIdx( *pTblNd );
- FldsToCalc( *pCalc, _SetGetExpFld( aIdx ));
+ SwNodeIndex aIdx( *pTableNd );
+ FieldsToCalc( *pCalc, _SetGetExpField( aIdx ));
}
- SwTblCalcPara aPara( *pCalc, pTblNd->GetTable() );
- pFml->Calc( aPara, nValue );
+ SwTableCalcPara aPara( *pCalc, pTableNd->GetTable() );
+ pFormula->Calc( aPara, nValue );
if( aPara.IsStackOverflow() )
{
bool const bResult = aPara.CalcWithStackOverflow();
if (bResult)
{
- pFml->Calc( aPara, nValue );
+ pFormula->Calc( aPara, nValue );
}
OSL_ENSURE(bResult,
"the chained formula could no be calculated");
}
- SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
+ SwFrameFormat* pFormat = pBox->ClaimFrameFormat();
SfxItemSet aTmp( m_rDoc.GetAttrPool(),
RES_BOXATR_BEGIN,RES_BOXATR_END-1 );
if( pCalc->IsCalcError() )
nValue = DBL_MAX;
- aTmp.Put( SwTblBoxValue( nValue ));
- if( SfxItemState::SET != pFmt->GetItemState( RES_BOXATR_FORMAT ))
- aTmp.Put( SwTblBoxNumFormat( 0 ));
- pFmt->SetFmtAttr( aTmp );
+ aTmp.Put( SwTableBoxValue( nValue ));
+ if( SfxItemState::SET != pFormat->GetItemState( RES_BOXATR_FORMAT ))
+ aTmp.Put( SwTableBoxNumFormat( 0 ));
+ pFormat->SetFormatAttr( aTmp );
pCalc->SetCalcError( CALC_NOERR );
}
@@ -829,24 +829,24 @@ void DocumentFieldsManager::UpdateTblFlds( SfxPoolItem* pHt )
delete pCalc;
}
-void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds )
+void DocumentFieldsManager::UpdateExpFields( SwTextField* pUpdateField, bool bUpdRefFields )
{
- if( IsExpFldsLocked() || m_rDoc.IsInReading() )
+ if( IsExpFieldsLocked() || m_rDoc.IsInReading() )
return;
- bool bOldInUpdateFlds = mpUpdtFlds->IsInUpdateFlds();
- mpUpdtFlds->SetInUpdateFlds( true );
+ bool bOldInUpdateFields = mpUpdateFields->IsInUpdateFields();
+ mpUpdateFields->SetInUpdateFields( true );
- mpUpdtFlds->MakeFldList( m_rDoc, true, GETFLD_ALL );
- mbNewFldLst = false;
+ mpUpdateFields->MakeFieldList( m_rDoc, true, GETFLD_ALL );
+ mbNewFieldLst = false;
- if( mpUpdtFlds->GetSortLst()->empty() )
+ if( mpUpdateFields->GetSortLst()->empty() )
{
- if( bUpdRefFlds )
- UpdateRefFlds(NULL);
+ if( bUpdRefFields )
+ UpdateRefFields(NULL);
- mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
- mpUpdtFlds->SetFieldsDirty( false );
+ mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+ mpUpdateFields->SetFieldsDirty( false );
return ;
}
@@ -854,34 +854,34 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
// Hash table for all string replacements is filled on-the-fly.
// Try to fabricate an uneven number.
- sal_uInt16 nStrFmtCnt = (( mpFldTypes->size() / 7 ) + 1 ) * 7;
- SwHash** pHashStrTbl = new SwHash*[ nStrFmtCnt ];
- memset( pHashStrTbl, 0, sizeof( _HashStr* ) * nStrFmtCnt );
+ sal_uInt16 nStrFormatCnt = (( mpFieldTypes->size() / 7 ) + 1 ) * 7;
+ SwHash** pHashStrTable = new SwHash*[ nStrFormatCnt ];
+ memset( pHashStrTable, 0, sizeof( _HashStr* ) * nStrFormatCnt );
{
- const SwFieldType* pFldType;
+ const SwFieldType* pFieldType;
// process separately:
- for( n = mpFldTypes->size(); n; )
- switch( ( pFldType = (*mpFldTypes)[ --n ] )->Which() )
+ for( n = mpFieldTypes->size(); n; )
+ switch( ( pFieldType = (*mpFieldTypes)[ --n ] )->Which() )
{
case RES_USERFLD:
{
// Entry present?
sal_uInt16 nPos;
- const OUString& rNm = pFldType->GetName();
- OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
- SwHash* pFnd = Find( rNm, pHashStrTbl, nStrFmtCnt, &nPos );
+ const OUString& rNm = pFieldType->GetName();
+ OUString sExpand(const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->Expand(nsSwGetSetExpType::GSE_STRING, 0, 0));
+ SwHash* pFnd = Find( rNm, pHashStrTable, nStrFormatCnt, &nPos );
if( pFnd )
// modify entry in the hash table
static_cast<_HashStr*>(pFnd)->aSetStr = sExpand;
else
// insert the new entry
- *(pHashStrTbl + nPos ) = new _HashStr( rNm, sExpand,
- static_cast<_HashStr*>(*(pHashStrTbl + nPos)) );
+ *(pHashStrTable + nPos ) = new _HashStr( rNm, sExpand,
+ static_cast<_HashStr*>(*(pHashStrTable + nPos)) );
}
break;
case RES_SETEXPFLD:
- const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFldType))->SetOutlineChgNd( 0 );
+ const_cast<SwSetExpFieldType*>(static_cast<const SwSetExpFieldType*>(pFieldType))->SetOutlineChgNd( 0 );
break;
}
}
@@ -904,7 +904,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
// Make sure we don't hide all sections, which would lead to a crash. First, count how many of them do we have.
int nShownSections = 0;
- for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->GetSortLst()->end(); ++it )
+ for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
{
SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
if ( pSect && !pSect->IsCondHidden())
@@ -912,7 +912,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
}
OUString aNew;
- for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != mpUpdtFlds->GetSortLst()->end(); ++it )
+ for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != mpUpdateFields->GetSortLst()->end(); ++it )
{
SwSection* pSect = const_cast<SwSection*>((*it)->GetSection());
if( pSect )
@@ -947,45 +947,45 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
continue;
}
- SwTxtFld* pTxtFld = const_cast<SwTxtFld*>((*it)->GetTxtFld());
- if( !pTxtFld )
+ SwTextField* pTextField = const_cast<SwTextField*>((*it)->GetTextField());
+ if( !pTextField )
{
OSL_ENSURE( false, "what's wrong now'" );
continue;
}
- SwFmtFld* pFmtFld = const_cast<SwFmtFld*>(&pTxtFld->GetFmtFld());
- const SwField* pFld = pFmtFld->GetField();
+ SwFormatField* pFormatField = const_cast<SwFormatField*>(&pTextField->GetFormatField());
+ const SwField* pField = pFormatField->GetField();
- switch( nWhich = pFld->GetTyp()->Which() )
+ switch( nWhich = pField->GetTyp()->Which() )
{
case RES_HIDDENTXTFLD:
{
- SwHiddenTxtField* pHFld = const_cast<SwHiddenTxtField*>(static_cast<const SwHiddenTxtField*>(pFld));
- SwSbxValue aValue = aCalc.Calculate( pHFld->GetPar1() );
+ SwHiddenTextField* pHField = const_cast<SwHiddenTextField*>(static_cast<const SwHiddenTextField*>(pField));
+ SwSbxValue aValue = aCalc.Calculate( pHField->GetPar1() );
bool bValue = !aValue.GetBool();
if(!aValue.IsVoidValue())
{
- pHFld->SetValue( bValue );
+ pHField->SetValue( bValue );
// evaluate field
- pHFld->Evaluate(&m_rDoc);
+ pHField->Evaluate(&m_rDoc);
}
}
break;
case RES_HIDDENPARAFLD:
{
- SwHiddenParaField* pHPFld = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pFld));
- SwSbxValue aValue = aCalc.Calculate( pHPFld->GetPar1() );
+ SwHiddenParaField* pHPField = const_cast<SwHiddenParaField*>(static_cast<const SwHiddenParaField*>(pField));
+ SwSbxValue aValue = aCalc.Calculate( pHPField->GetPar1() );
bool bValue = aValue.GetBool();
if(!aValue.IsVoidValue())
- pHPFld->SetHidden( bValue );
+ pHPField->SetHidden( bValue );
}
break;
case RES_DBSETNUMBERFLD:
#if HAVE_FEATURE_DBCONNECTIVITY
{
- const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pFld))->Evaluate(&m_rDoc);
- aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pFld)->GetSetNumber());
+ const_cast<SwDBSetNumberField*>(static_cast<const SwDBSetNumberField*>(pField))->Evaluate(&m_rDoc);
+ aCalc.VarChange( sDBNumNm, static_cast<const SwDBSetNumberField*>(pField)->GetSetNumber());
}
#endif
break;
@@ -993,7 +993,7 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
case RES_DBNUMSETFLD:
#if HAVE_FEATURE_DBCONNECTIVITY
{
- UpdateDBNumFlds( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pFld)), aCalc );
+ UpdateDBNumFields( *const_cast<SwDBNameInfField*>(static_cast<const SwDBNameInfField*>(pField)), aCalc );
if( bCanFill )
bCanFill = pMgr->FillCalcWithMergeData( m_rDoc.GetNumberFormatter(), nLang, true, aCalc );
}
@@ -1003,20 +1003,20 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
{
#if HAVE_FEATURE_DBCONNECTIVITY
// evaluate field
- const_cast<SwDBField*>(static_cast<const SwDBField*>(pFld))->Evaluate();
+ const_cast<SwDBField*>(static_cast<const SwDBField*>(pField))->Evaluate();
- SwDBData aTmpDBData(static_cast<const SwDBField*>(pFld)->GetDBData());
+ SwDBData aTmpDBData(static_cast<const SwDBField*>(pField)->GetDBData());
if( pMgr->IsDataSourceOpen(aTmpDBData.sDataSource, aTmpDBData.sCommand, false))
aCalc.VarChange( sDBNumNm, pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType));
- const OUString& rName = pFld->GetTyp()->GetName();
+ const OUString& rName = pField->GetTyp()->GetName();
// Add entry to hash table
// Entry present?
sal_uInt16 nPos;
- SwHash* pFnd = Find( rName, pHashStrTbl, nStrFmtCnt, &nPos );
- OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+ SwHash* pFnd = Find( rName, pHashStrTable, nStrFormatCnt, &nPos );
+ OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
if( pFnd )
{
// Modify entry in the hash table
@@ -1025,8 +1025,8 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
else
{
// insert new entry
- *(pHashStrTbl + nPos ) = new _HashStr( rName,
- value, static_cast<_HashStr *>(*(pHashStrTbl + nPos)));
+ *(pHashStrTable + nPos ) = new _HashStr( rName,
+ value, static_cast<_HashStr *>(*(pHashStrTable + nPos)));
}
#endif
}
@@ -1034,47 +1034,47 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
case RES_GETEXPFLD:
case RES_SETEXPFLD:
{
- if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() ) // replace String
+ if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() ) // replace String
{
if( RES_GETEXPFLD == nWhich )
{
- SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+ SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
- if( (!pUpdtFld || pUpdtFld == pTxtFld )
- && pGFld->IsInBodyTxt() )
+ if( (!pUpdateField || pUpdateField == pTextField )
+ && pGField->IsInBodyText() )
{
- aNew = LookString( pHashStrTbl, nStrFmtCnt,
- pGFld->GetFormula() );
- pGFld->ChgExpStr( aNew );
+ aNew = LookString( pHashStrTable, nStrFormatCnt,
+ pGField->GetFormula() );
+ pGField->ChgExpStr( aNew );
}
}
else
{
- SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
+ SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
// is the "formula" a field?
- aNew = LookString( pHashStrTbl, nStrFmtCnt,
- pSFld->GetFormula() );
+ aNew = LookString( pHashStrTable, nStrFormatCnt,
+ pSField->GetFormula() );
if( aNew.isEmpty() ) // nothing found then the formula is the new value
- aNew = pSFld->GetFormula();
+ aNew = pSField->GetFormula();
// only update one field
- if( !pUpdtFld || pUpdtFld == pTxtFld )
- pSFld->ChgExpStr( aNew );
+ if( !pUpdateField || pUpdateField == pTextField )
+ pSField->ChgExpStr( aNew );
// lookup the field's name
- aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+ aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
// Entry present?
sal_uInt16 nPos;
- SwHash* pFnd = Find( aNew, pHashStrTbl, nStrFmtCnt, &nPos );
+ SwHash* pFnd = Find( aNew, pHashStrTable, nStrFormatCnt, &nPos );
if( pFnd )
// Modify entry in the hash table
- static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+ static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
else
// insert new entry
- *(pHashStrTbl + nPos ) = pFnd = new _HashStr( aNew,
- pSFld->GetExpStr(),
- static_cast<_HashStr*>(*(pHashStrTbl + nPos) ));
+ *(pHashStrTable + nPos ) = pFnd = new _HashStr( aNew,
+ pSField->GetExpStr(),
+ static_cast<_HashStr*>(*(pHashStrTable + nPos) ));
// Extension for calculation with Strings
SwSbxValue aValue;
@@ -1086,70 +1086,70 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
{
if( RES_GETEXPFLD == nWhich )
{
- SwGetExpField* pGFld = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pFld));
+ SwGetExpField* pGField = const_cast<SwGetExpField*>(static_cast<const SwGetExpField*>(pField));
- if( (!pUpdtFld || pUpdtFld == pTxtFld )
- && pGFld->IsInBodyTxt() )
+ if( (!pUpdateField || pUpdateField == pTextField )
+ && pGField->IsInBodyText() )
{
SwSbxValue aValue = aCalc.Calculate(
- pGFld->GetFormula());
+ pGField->GetFormula());
if(!aValue.IsVoidValue())
- pGFld->SetValue(aValue.GetDouble() );
+ pGField->SetValue(aValue.GetDouble() );
}
}
else
{
- SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
- SwSetExpFieldType* pSFldTyp = static_cast<SwSetExpFieldType*>(pFld->GetTyp());
- aNew = pSFldTyp->GetName();
+ SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+ SwSetExpFieldType* pSFieldTyp = static_cast<SwSetExpFieldType*>(pField->GetTyp());
+ aNew = pSFieldTyp->GetName();
SwNode* pSeqNd = 0;
- if( pSFld->IsSequenceFld() )
+ if( pSField->IsSequenceField() )
{
- const sal_uInt8 nLvl = pSFldTyp->GetOutlineLvl();
+ const sal_uInt8 nLvl = pSFieldTyp->GetOutlineLvl();
if( MAXLEVEL > nLvl )
{
// test if the Number needs to be updated
pSeqNd = m_rDoc.GetNodes()[ (*it)->GetNode() ];
- const SwTxtNode* pOutlNd = pSeqNd->
+ const SwTextNode* pOutlNd = pSeqNd->
FindOutlineNodeOfLevel( nLvl );
- if( pSFldTyp->GetOutlineChgNd() != pOutlNd )
+ if( pSFieldTyp->GetOutlineChgNd() != pOutlNd )
{
- pSFldTyp->SetOutlineChgNd( pOutlNd );
+ pSFieldTyp->SetOutlineChgNd( pOutlNd );
aCalc.VarChange( aNew, 0 );
}
}
}
aNew += "=";
- aNew += pSFld->GetFormula();
+ aNew += pSField->GetFormula();
SwSbxValue aValue = aCalc.Calculate( aNew );
double nErg = aValue.GetDouble();
// only update one field
- if( !aValue.IsVoidValue() && (!pUpdtFld || pUpdtFld == pTxtFld) )
+ if( !aValue.IsVoidValue() && (!pUpdateField || pUpdateField == pTextField) )
{
- pSFld->SetValue( nErg );
+ pSField->SetValue( nErg );
if( pSeqNd )
- pSFldTyp->SetChapter( *pSFld, *pSeqNd );
+ pSFieldTyp->SetChapter( *pSField, *pSeqNd );
}
}
}
}
} // switch
- pFmtFld->ModifyNotification( 0, 0 ); // trigger formatting
+ pFormatField->ModifyNotification( 0, 0 ); // trigger formatting
- if( pUpdtFld == pTxtFld ) // if only &m_rDoc one is updated
+ if( pUpdateField == pTextField ) // if only &m_rDoc one is updated
{
if( RES_GETEXPFLD == nWhich || // only GetField or
- RES_HIDDENTXTFLD == nWhich || // HiddenTxt?
- RES_HIDDENPARAFLD == nWhich) // HiddenParaFld?
+ RES_HIDDENTXTFLD == nWhich || // HiddenText?
+ RES_HIDDENPARAFLD == nWhich) // HiddenParaField?
break; // quit
- pUpdtFld = 0; // update all from here on
+ pUpdateField = 0; // update all from here on
}
}
@@ -1157,27 +1157,27 @@ void DocumentFieldsManager::UpdateExpFlds( SwTxtFld* pUpdtFld, bool bUpdRefFlds
pMgr->CloseAll(false);
#endif
// delete hash table
- ::DeleteHashTable( pHashStrTbl, nStrFmtCnt );
+ ::DeleteHashTable( pHashStrTable, nStrFormatCnt );
// update reference fields
- if( bUpdRefFlds )
- UpdateRefFlds(NULL);
+ if( bUpdRefFields )
+ UpdateRefFields(NULL);
- mpUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
- mpUpdtFlds->SetFieldsDirty( false );
+ mpUpdateFields->SetInUpdateFields( bOldInUpdateFields );
+ mpUpdateFields->SetFieldsDirty( false );
}
/// Insert field type that was marked as deleted
-void DocumentFieldsManager::UpdateUsrFlds()
+void DocumentFieldsManager::UpdateUsrFields()
{
SwCalc* pCalc = 0;
- const SwFieldType* pFldType;
- for( sal_uInt16 i = INIT_FLDTYPES; i < mpFldTypes->size(); ++i )
- if( RES_USERFLD == ( pFldType = (*mpFldTypes)[i] )->Which() )
+ const SwFieldType* pFieldType;
+ for( sal_uInt16 i = INIT_FLDTYPES; i < mpFieldTypes->size(); ++i )
+ if( RES_USERFLD == ( pFieldType = (*mpFieldTypes)[i] )->Which() )
{
if( !pCalc )
pCalc = new SwCalc( m_rDoc );
- const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFldType))->GetValue( *pCalc );
+ const_cast<SwUserFieldType*>(static_cast<const SwUserFieldType*>(pFieldType))->GetValue( *pCalc );
}
if( pCalc )
@@ -1187,53 +1187,53 @@ void DocumentFieldsManager::UpdateUsrFlds()
}
}
-void DocumentFieldsManager::UpdatePageFlds( SfxPoolItem* pMsgHnt )
+void DocumentFieldsManager::UpdatePageFields( SfxPoolItem* pMsgHint )
{
- SwFieldType* pFldType;
+ SwFieldType* pFieldType;
for( sal_uInt16 i = 0; i < INIT_FLDTYPES; ++i )
- switch( ( pFldType = (*mpFldTypes)[ i ] )->Which() )
+ switch( ( pFieldType = (*mpFieldTypes)[ i ] )->Which() )
{
case RES_PAGENUMBERFLD:
case RES_CHAPTERFLD:
case RES_GETEXPFLD:
case RES_REFPAGEGETFLD:
- pFldType->ModifyNotification( 0, pMsgHnt );
+ pFieldType->ModifyNotification( 0, pMsgHint );
break;
case RES_DOCSTATFLD:
- pFldType->ModifyNotification( 0, 0 );
+ pFieldType->ModifyNotification( 0, 0 );
break;
}
- SetNewFldLst(true);
+ SetNewFieldLst(true);
}
-void DocumentFieldsManager::LockExpFlds()
+void DocumentFieldsManager::LockExpFields()
{
- ++mnLockExpFld;
+ ++mnLockExpField;
}
-void DocumentFieldsManager::UnlockExpFlds()
+void DocumentFieldsManager::UnlockExpFields()
{
- assert(mnLockExpFld != 0);
- if( mnLockExpFld )
- --mnLockExpFld;
+ assert(mnLockExpField != 0);
+ if( mnLockExpField )
+ --mnLockExpField;
}
-bool DocumentFieldsManager::IsExpFldsLocked() const
+bool DocumentFieldsManager::IsExpFieldsLocked() const
{
- return 0 != mnLockExpFld;
+ return 0 != mnLockExpField;
}
-SwDocUpdtFld& DocumentFieldsManager::GetUpdtFlds() const
+SwDocUpdateField& DocumentFieldsManager::GetUpdateFields() const
{
- return *mpUpdtFlds;
+ return *mpUpdateFields;
}
bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLong nLen )
{
// See if the supplied nodes actually contain fields.
// If they don't, the flag doesn't need to be changed.
- bool bFldsFnd = false;
- if( b && pChk && !GetUpdtFlds().IsFieldsDirty() && !m_rDoc.IsInDtor()
+ bool bFieldsFnd = false;
+ if( b && pChk && !GetUpdateFields().IsFieldsDirty() && !m_rDoc.IsInDtor()
// ?? what's up with Undo, this is also wanted there!
/*&& &pChk->GetNodes() == &GetNodes()*/ )
{
@@ -1244,7 +1244,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
const SwNodes& rNds = pChk->GetNodes();
while( nLen-- )
{
- const SwTxtNode* pTNd = rNds[ nStt++ ]->GetTxtNode();
+ const SwTextNode* pTNd = rNds[ nStt++ ]->GetTextNode();
if( pTNd )
{
if( pTNd->GetAttrOutlineLevel() != 0 )
@@ -1255,7 +1255,7 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
const size_t nEnd = pTNd->GetSwpHints().Count();
for( size_t n = 0 ; n < nEnd; ++n )
{
- const SwTxtAttr* pAttr = pTNd->GetSwpHints()[ n ];
+ const SwTextAttr* pAttr = pTNd->GetSwpHints()[ n ];
if ( pAttr->Which() == RES_TXTATR_FIELD )
{
b = true;
@@ -1268,10 +1268,10 @@ bool DocumentFieldsManager::SetFieldsDirty( bool b, const SwNode* pChk, sal_uLon
break;
}
}
- bFldsFnd = b;
+ bFieldsFnd = b;
}
- GetUpdtFlds().SetFieldsDirty( b );
- return bFldsFnd;
+ GetUpdateFields().SetFieldsDirty( b );
+ return bFieldsFnd;
}
void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pNewDateTime )
@@ -1302,74 +1302,74 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
for( ; nStt < 5; ++nStt )
{
- SwFieldType* pFldType = GetSysFldType( aTypes[ nStt ] );
- SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ SwFieldType* pFieldType = GetSysFieldType( aTypes[ nStt ] );
+ SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
{
- if( pFmtFld && pFmtFld->GetTxtFld() )
+ if( pFormatField && pFormatField->GetTextField() )
{
bool bChgd = false;
switch( aTypes[ nStt ] )
{
case RES_DOCINFOFLD:
- if( static_cast<SwDocInfoField*>(pFmtFld->GetField())->IsFixed() )
+ if( static_cast<SwDocInfoField*>(pFormatField->GetField())->IsFixed() )
{
bChgd = true;
- SwDocInfoField* pDocInfFld = static_cast<SwDocInfoField*>(pFmtFld->GetField());
- pDocInfFld->SetExpansion( static_cast<SwDocInfoFieldType*>(
- pDocInfFld->GetTyp())->Expand(
- pDocInfFld->GetSubType(),
- pDocInfFld->GetFormat(),
- pDocInfFld->GetLanguage(),
- pDocInfFld->GetName() ) );
+ SwDocInfoField* pDocInfField = static_cast<SwDocInfoField*>(pFormatField->GetField());
+ pDocInfField->SetExpansion( static_cast<SwDocInfoFieldType*>(
+ pDocInfField->GetTyp())->Expand(
+ pDocInfField->GetSubType(),
+ pDocInfField->GetFormat(),
+ pDocInfField->GetLanguage(),
+ pDocInfField->GetName() ) );
}
break;
case RES_AUTHORFLD:
- if( static_cast<SwAuthorField*>(pFmtFld->GetField())->IsFixed() )
+ if( static_cast<SwAuthorField*>(pFormatField->GetField())->IsFixed() )
{
bChgd = true;
- SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFmtFld->GetField());
- pAuthorFld->SetExpansion( SwAuthorFieldType::Expand( pAuthorFld->GetFormat() ) );
+ SwAuthorField* pAuthorField = static_cast<SwAuthorField*>(pFormatField->GetField());
+ pAuthorField->SetExpansion( SwAuthorFieldType::Expand( pAuthorField->GetFormat() ) );
}
break;
case RES_EXTUSERFLD:
- if( static_cast<SwExtUserField*>(pFmtFld->GetField())->IsFixed() )
+ if( static_cast<SwExtUserField*>(pFormatField->GetField())->IsFixed() )
{
bChgd = true;
- SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFmtFld->GetField());
- pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
- pExtUserFld->GetSubType(),
- pExtUserFld->GetFormat()));
+ SwExtUserField* pExtUserField = static_cast<SwExtUserField*>(pFormatField->GetField());
+ pExtUserField->SetExpansion( SwExtUserFieldType::Expand(
+ pExtUserField->GetSubType(),
+ pExtUserField->GetFormat()));
}
break;
case RES_DATETIMEFLD:
- if( static_cast<SwDateTimeField*>(pFmtFld->GetField())->IsFixed() )
+ if( static_cast<SwDateTimeField*>(pFormatField->GetField())->IsFixed() )
{
bChgd = true;
- static_cast<SwDateTimeField*>(pFmtFld->GetField())->SetDateTime(
+ static_cast<SwDateTimeField*>(pFormatField->GetField())->SetDateTime(
DateTime(Date(nDate), tools::Time(nTime)) );
}
break;
case RES_FILENAMEFLD:
- if( static_cast<SwFileNameField*>(pFmtFld->GetField())->IsFixed() )
+ if( static_cast<SwFileNameField*>(pFormatField->GetField())->IsFixed() )
{
bChgd = true;
- SwFileNameField* pFileNameFld =
- static_cast<SwFileNameField*>(pFmtFld->GetField());
- pFileNameFld->SetExpansion( static_cast<SwFileNameFieldType*>(
- pFileNameFld->GetTyp())->Expand(
- pFileNameFld->GetFormat() ) );
+ SwFileNameField* pFileNameField =
+ static_cast<SwFileNameField*>(pFormatField->GetField());
+ pFileNameField->SetExpansion( static_cast<SwFileNameFieldType*>(
+ pFileNameField->GetTyp())->Expand(
+ pFileNameField->GetFormat() ) );
}
break;
}
// Trigger formatting
if( bChgd )
- pFmtFld->ModifyNotification( 0, 0 );
+ pFormatField->ModifyNotification( 0, 0 );
}
}
}
@@ -1378,11 +1378,11 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
m_rDoc.getIDocumentState().ResetModified();
}
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, const _SetGetExpField& rToThisField )
{
// create the sorted list of all SetFields
- mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
- mbNewFldLst = false;
+ mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+ mbNewFieldLst = false;
#if !HAVE_FEATURE_DBCONNECTIVITY
SwDBManager* pMgr = NULL;
@@ -1391,24 +1391,24 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, const _SetGetExpFld& rToT
pMgr->CloseAll(false);
#endif
- if( !mpUpdtFlds->GetSortLst()->empty() )
+ if( !mpUpdateFields->GetSortLst()->empty() )
{
- _SetGetExpFlds::const_iterator const itLast =
- mpUpdtFlds->GetSortLst()->upper_bound(
- const_cast<_SetGetExpFld*>(&rToThisFld));
- for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
- lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+ _SetGetExpFields::const_iterator const itLast =
+ mpUpdateFields->GetSortLst()->upper_bound(
+ const_cast<_SetGetExpField*>(&rToThisField));
+ for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
+ lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
}
#if HAVE_FEATURE_DBCONNECTIVITY
pMgr->CloseAll(false);
#endif
}
-void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
+void DocumentFieldsManager::FieldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt )
{
// create the sorted list of all SetFields
- mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_CALC );
- mbNewFldLst = false;
+ mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_CALC );
+ mbNewFieldLst = false;
#if !HAVE_FEATURE_DBCONNECTIVITY
SwDBManager* pMgr = NULL;
@@ -1417,14 +1417,14 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
pMgr->CloseAll(false);
#endif
- for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin();
- it != mpUpdtFlds->GetSortLst()->end() &&
+ for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin();
+ it != mpUpdateFields->GetSortLst()->end() &&
( (*it)->GetNode() < nLastNd ||
- ( (*it)->GetNode() == nLastNd && (*it)->GetCntnt() <= nLastCnt )
+ ( (*it)->GetNode() == nLastNd && (*it)->GetContent() <= nLastCnt )
);
++it )
{
- lcl_CalcFld( m_rDoc, rCalc, **it, pMgr );
+ lcl_CalcField( m_rDoc, rCalc, **it, pMgr );
}
#if HAVE_FEATURE_DBCONNECTIVITY
@@ -1432,70 +1432,70 @@ void DocumentFieldsManager::FldsToCalc( SwCalc& rCalc, sal_uLong nLastNd, sal_uI
#endif
}
-void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblSize,
- const _SetGetExpFld& rToThisFld )
+void DocumentFieldsManager::FieldsToExpand( SwHash**& ppHashTable, sal_uInt16& rTableSize,
+ const _SetGetExpField& rToThisField )
{
// create the sorted list of all SetFields
- mpUpdtFlds->MakeFldList( m_rDoc, mbNewFldLst, GETFLD_EXPAND );
- mbNewFldLst = false;
+ mpUpdateFields->MakeFieldList( m_rDoc, mbNewFieldLst, GETFLD_EXPAND );
+ mbNewFieldLst = false;
// Hash table for all string replacements is filled on-the-fly.
// Try to fabricate an uneven number.
- rTblSize = (( mpUpdtFlds->GetSortLst()->size() / 7 ) + 1 ) * 7;
- ppHashTbl = new SwHash*[ rTblSize ];
- memset( ppHashTbl, 0, sizeof( _HashStr* ) * rTblSize );
+ rTableSize = (( mpUpdateFields->GetSortLst()->size() / 7 ) + 1 ) * 7;
+ ppHashTable = new SwHash*[ rTableSize ];
+ memset( ppHashTable, 0, sizeof( _HashStr* ) * rTableSize );
- _SetGetExpFlds::const_iterator const itLast =
- mpUpdtFlds->GetSortLst()->upper_bound(
- const_cast<_SetGetExpFld*>(&rToThisFld));
+ _SetGetExpFields::const_iterator const itLast =
+ mpUpdateFields->GetSortLst()->upper_bound(
+ const_cast<_SetGetExpField*>(&rToThisField));
- for( _SetGetExpFlds::const_iterator it = mpUpdtFlds->GetSortLst()->begin(); it != itLast; ++it )
+ for( _SetGetExpFields::const_iterator it = mpUpdateFields->GetSortLst()->begin(); it != itLast; ++it )
{
- const SwTxtFld* pTxtFld = (*it)->GetTxtFld();
- if( !pTxtFld )
+ const SwTextField* pTextField = (*it)->GetTextField();
+ if( !pTextField )
continue;
- const SwField* pFld = pTxtFld->GetFmtFld().GetField();
- switch( pFld->GetTyp()->Which() )
+ const SwField* pField = pTextField->GetFormatField().GetField();
+ switch( pField->GetTyp()->Which() )
{
case RES_SETEXPFLD:
- if( nsSwGetSetExpType::GSE_STRING & pFld->GetSubType() )
+ if( nsSwGetSetExpType::GSE_STRING & pField->GetSubType() )
{
// set the new value in the hash table
// is the formula a field?
- SwSetExpField* pSFld = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pFld));
- OUString aNew = LookString( ppHashTbl, rTblSize, pSFld->GetFormula() );
+ SwSetExpField* pSField = const_cast<SwSetExpField*>(static_cast<const SwSetExpField*>(pField));
+ OUString aNew = LookString( ppHashTable, rTableSize, pSField->GetFormula() );
if( aNew.isEmpty() ) // nothing found, then the formula is
- aNew = pSFld->GetFormula(); // the new value
+ aNew = pSField->GetFormula(); // the new value
// #i3141# - update expression of field as in method
- // <SwDoc::UpdateExpFlds(..)> for string/text fields
- pSFld->ChgExpStr( aNew );
+ // <SwDoc::UpdateExpFields(..)> for string/text fields
+ pSField->ChgExpStr( aNew );
// look up the field's name
- aNew = static_cast<SwSetExpFieldType*>(pSFld->GetTyp())->GetSetRefName();
+ aNew = static_cast<SwSetExpFieldType*>(pSField->GetTyp())->GetSetRefName();
// Entry present?
sal_uInt16 nPos;
- SwHash* pFnd = Find( aNew, ppHashTbl, rTblSize, &nPos );
+ SwHash* pFnd = Find( aNew, ppHashTable, rTableSize, &nPos );
if( pFnd )
// modify entry in the hash table
- static_cast<_HashStr*>(pFnd)->aSetStr = pSFld->GetExpStr();
+ static_cast<_HashStr*>(pFnd)->aSetStr = pSField->GetExpStr();
else
// insert the new entry
- *(ppHashTbl + nPos ) = new _HashStr( aNew,
- pSFld->GetExpStr(), static_cast<_HashStr*>(*(ppHashTbl + nPos)) );
+ *(ppHashTable + nPos ) = new _HashStr( aNew,
+ pSField->GetExpStr(), static_cast<_HashStr*>(*(ppHashTable + nPos)) );
}
break;
case RES_DBFLD:
{
- const OUString& rName = pFld->GetTyp()->GetName();
+ const OUString& rName = pField->GetTyp()->GetName();
// Insert entry in the hash table
// Entry present?
sal_uInt16 nPos;
- SwHash* pFnd = Find( rName, ppHashTbl, rTblSize, &nPos );
- OUString const value(pFld->ExpandField(m_rDoc.IsClipBoard()));
+ SwHash* pFnd = Find( rName, ppHashTable, rTableSize, &nPos );
+ OUString const value(pField->ExpandField(m_rDoc.IsClipBoard()));
if( pFnd )
{
// modify entry in the hash table
@@ -1504,8 +1504,8 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
else
{
// insert the new entry
- *(ppHashTbl + nPos ) = new _HashStr( rName,
- value, static_cast<_HashStr *>(*(ppHashTbl + nPos)));
+ *(ppHashTable + nPos ) = new _HashStr( rName,
+ value, static_cast<_HashStr *>(*(ppHashTable + nPos)));
}
}
break;
@@ -1514,35 +1514,35 @@ void DocumentFieldsManager::FldsToExpand( SwHash**& ppHashTbl, sal_uInt16& rTblS
}
-bool DocumentFieldsManager::IsNewFldLst() const
+bool DocumentFieldsManager::IsNewFieldLst() const
{
- return mbNewFldLst;
+ return mbNewFieldLst;
}
-void DocumentFieldsManager::SetNewFldLst(bool bFlag)
+void DocumentFieldsManager::SetNewFieldLst(bool bFlag)
{
- mbNewFldLst = bFlag;
+ mbNewFieldLst = bFlag;
}
-void DocumentFieldsManager::InsDelFldInFldLst( bool bIns, const SwTxtFld& rFld )
+void DocumentFieldsManager::InsDelFieldInFieldLst( bool bIns, const SwTextField& rField )
{
- if( !mbNewFldLst || !m_rDoc.IsInDtor() )
- mpUpdtFlds->InsDelFldInFldLst( bIns, rFld );
+ if( !mbNewFieldLst || !m_rDoc.IsInDtor() )
+ mpUpdateFields->InsDelFieldInFieldLst( bIns, rField );
}
SwField * DocumentFieldsManager::GetFieldAtPos(const SwPosition & rPos)
{
- SwTxtFld * const pAttr = GetTxtFldAtPos(rPos);
+ SwTextField * const pAttr = GetTextFieldAtPos(rPos);
- return (pAttr) ? const_cast<SwField *>( pAttr->GetFmtFld().GetField() ) : 0;
+ return (pAttr) ? const_cast<SwField *>( pAttr->GetFormatField().GetField() ) : 0;
}
-SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
+SwTextField * DocumentFieldsManager::GetTextFieldAtPos(const SwPosition & rPos)
{
- SwTxtNode * const pNode = rPos.nNode.GetNode().GetTxtNode();
+ SwTextNode * const pNode = rPos.nNode.GetNode().GetTextNode();
return (pNode != NULL)
- ? pNode->GetFldTxtAttrAt( rPos.nContent.GetIndex(), true )
+ ? pNode->GetFieldTextAttrAt( rPos.nContent.GetIndex(), true )
: 0;
}
@@ -1550,10 +1550,10 @@ SwTxtFld * DocumentFieldsManager::GetTxtFldAtPos(const SwPosition & rPos)
/// optimization currently only available when no fields exist.
bool DocumentFieldsManager::containsUpdatableFields()
{
- for (sal_uInt16 i = 0; i < mpFldTypes->size(); ++i)
+ for (sal_uInt16 i = 0; i < mpFieldTypes->size(); ++i)
{
- SwFieldType* pFldType = (*mpFldTypes)[i];
- SwIterator<SwFmtFld,SwFieldType> aIter(*pFldType);
+ SwFieldType* pFieldType = (*mpFieldTypes)[i];
+ SwIterator<SwFormatField,SwFieldType> aIter(*pFieldType);
if (aIter.First())
return true;
}
@@ -1563,96 +1563,96 @@ bool DocumentFieldsManager::containsUpdatableFields()
/// Remove all unreferenced field types of a document
void DocumentFieldsManager::GCFieldTypes()
{
- for( sal_uInt16 n = mpFldTypes->size(); n > INIT_FLDTYPES; )
- if( !(*mpFldTypes)[ --n ]->HasWriterListeners() )
- RemoveFldType( n );
+ for( sal_uInt16 n = mpFieldTypes->size(); n > INIT_FLDTYPES; )
+ if( !(*mpFieldTypes)[ --n ]->HasWriterListeners() )
+ RemoveFieldType( n );
}
void DocumentFieldsManager::_InitFieldTypes() // is being called by the CTOR
{
// Field types
- mpFldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwChapterFieldType );
- mpFldTypes->push_back( new SwPageNumberFieldType );
- mpFldTypes->push_back( new SwAuthorFieldType );
- mpFldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwHiddenTxtFieldType );
- mpFldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwTblFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwHiddenParaFieldType );
- mpFldTypes->push_back( new SwDBNextSetFieldType );
- mpFldTypes->push_back( new SwDBNumSetFieldType );
- mpFldTypes->push_back( new SwDBSetNumberFieldType );
- mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
- mpFldTypes->push_back( new SwExtUserFieldType );
- mpFldTypes->push_back( new SwRefPageSetFieldType );
- mpFldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
- mpFldTypes->push_back( new SwCombinedCharFieldType );
- mpFldTypes->push_back( new SwDropDownFieldType );
+ mpFieldTypes->push_back( new SwDateTimeFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwChapterFieldType );
+ mpFieldTypes->push_back( new SwPageNumberFieldType );
+ mpFieldTypes->push_back( new SwAuthorFieldType );
+ mpFieldTypes->push_back( new SwFileNameFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwDBNameFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwGetExpFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwGetRefFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwHiddenTextFieldType );
+ mpFieldTypes->push_back( new SwPostItFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwDocStatFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwDocInfoFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwInputFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwTableFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwMacroFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwHiddenParaFieldType );
+ mpFieldTypes->push_back( new SwDBNextSetFieldType );
+ mpFieldTypes->push_back( new SwDBNumSetFieldType );
+ mpFieldTypes->push_back( new SwDBSetNumberFieldType );
+ mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwTemplNameFieldType(&m_rDoc) );
+ mpFieldTypes->push_back( new SwExtUserFieldType );
+ mpFieldTypes->push_back( new SwRefPageSetFieldType );
+ mpFieldTypes->push_back( new SwRefPageGetFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwJumpEditFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwScriptFieldType( &m_rDoc ) );
+ mpFieldTypes->push_back( new SwCombinedCharFieldType );
+ mpFieldTypes->push_back( new SwDropDownFieldType );
// Types have to be at the end!
- // We expect &m_rDoc in the InsertFldType!
+ // We expect &m_rDoc in the InsertFieldType!
// MIB 14.04.95: In Sw3StringPool::Setup (sw3imp.cxx) and
// lcl_sw3io_InSetExpField (sw3field.cxx) now also
- mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+ mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
SW_RESSTR(STR_POOLCOLL_LABEL_ABB), nsSwGetSetExpType::GSE_SEQ) );
- mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+ mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
SW_RESSTR(STR_POOLCOLL_LABEL_TABLE), nsSwGetSetExpType::GSE_SEQ) );
- mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+ mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
SW_RESSTR(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) );
- mpFldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+ mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) );
- assert( mpFldTypes->size() == INIT_FLDTYPES );
+ assert( mpFieldTypes->size() == INIT_FLDTYPES );
}
void DocumentFieldsManager::ClearFieldTypes()
{
- for(SwFldTypes::const_iterator it = mpFldTypes->begin() + INIT_FLDTYPES;
- it != mpFldTypes->end(); ++it)
+ for(SwFieldTypes::const_iterator it = mpFieldTypes->begin() + INIT_FLDTYPES;
+ it != mpFieldTypes->end(); ++it)
delete *it;
- mpFldTypes->erase( mpFldTypes->begin() + INIT_FLDTYPES, mpFldTypes->end() );
+ mpFieldTypes->erase( mpFieldTypes->begin() + INIT_FLDTYPES, mpFieldTypes->end() );
}
-void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& rCalc )
+void DocumentFieldsManager::UpdateDBNumFields( SwDBNameInfField& rDBField, SwCalc& rCalc )
{
#if !HAVE_FEATURE_DBCONNECTIVITY
- (void) rDBFld;
+ (void) rDBField;
(void) rCalc;
#else
SwDBManager* pMgr = m_rDoc.GetDBManager();
- sal_uInt16 nFldType = rDBFld.Which();
+ sal_uInt16 nFieldType = rDBField.Which();
- bool bPar1 = rCalc.Calculate( rDBFld.GetPar1() ).GetBool();
+ bool bPar1 = rCalc.Calculate( rDBField.GetPar1() ).GetBool();
- if( RES_DBNEXTSETFLD == nFldType )
- static_cast<SwDBNextSetField&>(rDBFld).SetCondValid( bPar1 );
+ if( RES_DBNEXTSETFLD == nFieldType )
+ static_cast<SwDBNextSetField&>(rDBField).SetCondValid( bPar1 );
else
- static_cast<SwDBNumSetField&>(rDBFld).SetCondValid( bPar1 );
+ static_cast<SwDBNumSetField&>(rDBField).SetCondValid( bPar1 );
- if( !rDBFld.GetRealDBData().sDataSource.isEmpty() )
+ if( !rDBField.GetRealDBData().sDataSource.isEmpty() )
{
// Edit a certain database
- if( RES_DBNEXTSETFLD == nFldType )
- static_cast<SwDBNextSetField&>(rDBFld).Evaluate(&m_rDoc);
+ if( RES_DBNEXTSETFLD == nFieldType )
+ static_cast<SwDBNextSetField&>(rDBField).Evaluate(&m_rDoc);
else
- static_cast<SwDBNumSetField&>(rDBFld).Evaluate(&m_rDoc);
+ static_cast<SwDBNumSetField&>(rDBField).Evaluate(&m_rDoc);
- SwDBData aTmpDBData( rDBFld.GetDBData(&m_rDoc) );
+ SwDBData aTmpDBData( rDBField.GetDBData(&m_rDoc) );
if( pMgr->OpenDataSource( aTmpDBData.sDataSource, aTmpDBData.sCommand, -1, false ))
- rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBFld),
+ rCalc.VarChange( lcl_GetDBVarName( m_rDoc, rDBField),
pMgr->GetSelectedRecordId(aTmpDBData.sDataSource, aTmpDBData.sCommand, aTmpDBData.nCommandType) );
}
else
@@ -1664,8 +1664,8 @@ void DocumentFieldsManager::UpdateDBNumFlds( SwDBNameInfField& rDBFld, SwCalc& r
DocumentFieldsManager::~DocumentFieldsManager()
{
- delete mpUpdtFlds;
- delete mpFldTypes;
+ delete mpUpdateFields;
+ delete mpFieldTypes;
}
}
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index ad23762a0c85..14dc9ab54ced 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -107,9 +107,9 @@ void DocumentLayoutManager::SetLayouter( SwLayouter* pNew )
The format is put into the respective format array.
If there already is a fitting format, it is returned instead. */
-SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxItemSet* pSet )
+SwFrameFormat *DocumentLayoutManager::MakeLayoutFormat( RndStdIds eRequest, const SfxItemSet* pSet )
{
- SwFrmFmt *pFmt = 0;
+ SwFrameFormat *pFormat = 0;
const bool bMod = m_rDoc.getIDocumentState().IsModified();
bool bHeader = false;
@@ -126,16 +126,16 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
case RND_STD_FOOTERL:
case RND_STD_FOOTERR:
{
- pFmt = new SwFrmFmt( m_rDoc.GetAttrPool(),
+ pFormat = new SwFrameFormat( m_rDoc.GetAttrPool(),
(bHeader ? "Right header" : "Right footer"),
- m_rDoc.GetDfltFrmFmt() );
+ m_rDoc.GetDfltFrameFormat() );
SwNodeIndex aTmpIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
SwStartNode* pSttNd =
m_rDoc.GetNodes().MakeTextSection
( aTmpIdx,
bHeader ? SwHeaderStartNode : SwFooterStartNode,
- m_rDoc.getIDocumentStylePoolAccess().GetTxtCollFromPool(static_cast<sal_uInt16>( bHeader
+ m_rDoc.getIDocumentStylePoolAccess().GetTextCollFromPool(static_cast<sal_uInt16>( bHeader
? ( eRequest == RND_STD_HEADERL
? RES_POOLCOLL_HEADERL
: eRequest == RND_STD_HEADERR
@@ -147,10 +147,10 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
? RES_POOLCOLL_FOOTERR
: RES_POOLCOLL_FOOTER )
) ) );
- pFmt->SetFmtAttr( SwFmtCntnt( pSttNd ));
+ pFormat->SetFormatAttr( SwFormatContent( pSttNd ));
if( pSet ) // Set a few more attributes
- pFmt->SetFmtAttr( *pSet );
+ pFormat->SetFormatAttr( *pSet );
// Why set it back? Doc has changed, or not?
// In any case, wrong for the FlyFrames!
@@ -161,14 +161,14 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
case RND_DRAW_OBJECT:
{
- pFmt = m_rDoc.MakeDrawFrmFmt( OUString(), m_rDoc.GetDfltFrmFmt() );
+ pFormat = m_rDoc.MakeDrawFrameFormat( OUString(), m_rDoc.GetDfltFrameFormat() );
if( pSet ) // Set a few more attributes
- pFmt->SetFmtAttr( *pSet );
+ pFormat->SetFormatAttr( *pSet );
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
m_rDoc.GetIDocumentUndoRedo().AppendUndo(
- new SwUndoInsLayFmt(pFmt, 0, 0));
+ new SwUndoInsLayFormat(pFormat, 0, 0));
}
}
break;
@@ -188,32 +188,32 @@ SwFrmFmt *DocumentLayoutManager::MakeLayoutFmt( RndStdIds eRequest, const SfxIte
"LayoutFormat was requested with an invalid Request." );
}
- return pFmt;
+ return pFormat;
}
/// Deletes the denoted format and its content.
-void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
+void DocumentLayoutManager::DelLayoutFormat( SwFrameFormat *pFormat )
{
// A chain of frames needs to be merged, if necessary,
// so that the Frame's contents are adjusted accordingly before we destroy the Frames.
- const SwFmtChain &rChain = pFmt->GetChain();
+ const SwFormatChain &rChain = pFormat->GetChain();
if ( rChain.GetPrev() )
{
- SwFmtChain aChain( rChain.GetPrev()->GetChain() );
+ SwFormatChain aChain( rChain.GetPrev()->GetChain() );
aChain.SetNext( rChain.GetNext() );
m_rDoc.SetAttr( aChain, *rChain.GetPrev() );
}
if ( rChain.GetNext() )
{
- SwFmtChain aChain( rChain.GetNext()->GetChain() );
+ SwFormatChain aChain( rChain.GetNext()->GetChain() );
aChain.SetPrev( rChain.GetPrev() );
m_rDoc.SetAttr( aChain, *rChain.GetNext() );
}
const SwNodeIndex* pCntIdx = 0;
// The draw format doesn't own its content, it just has a pointer to it.
- if (pFmt->Which() != RES_DRAWFRMFMT)
- pCntIdx = pFmt->GetCntnt().GetCntntIdx();
+ if (pFormat->Which() != RES_DRAWFRMFMT)
+ pCntIdx = pFormat->GetContent().GetContentIdx();
if (pCntIdx && !m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
// Disconnect if it's an OLE object
@@ -239,14 +239,14 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
}
// Destroy Frames
- pFmt->DelFrms();
+ pFormat->DelFrms();
// Only FlyFrames are undoable at first
- const sal_uInt16 nWh = pFmt->Which();
+ const sal_uInt16 nWh = pFormat->Which();
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo() &&
(RES_FLYFRMFMT == nWh || RES_DRAWFRMFMT == nWh))
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFmt( pFmt ));
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoDelLayFormat( pFormat ));
}
else
{
@@ -254,35 +254,35 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
if ( nWh == RES_FLYFRMFMT )
{
// determine frame formats of at-frame anchored objects
- const SwNodeIndex* pCntntIdx = 0;
- if (pFmt->Which() != RES_DRAWFRMFMT)
- pCntntIdx = pFmt->GetCntnt().GetCntntIdx();
- if (pCntntIdx)
+ const SwNodeIndex* pContentIdx = 0;
+ if (pFormat->Which() != RES_DRAWFRMFMT)
+ pContentIdx = pFormat->GetContent().GetContentIdx();
+ if (pContentIdx)
{
- const SwFrmFmts* pTbl = pFmt->GetDoc()->GetSpzFrmFmts();
- if ( pTbl )
+ const SwFrameFormats* pTable = pFormat->GetDoc()->GetSpzFrameFormats();
+ if ( pTable )
{
- std::vector<SwFrmFmt*> aToDeleteFrmFmts;
- const sal_uLong nNodeIdxOfFlyFmt( pCntntIdx->GetIndex() );
+ std::vector<SwFrameFormat*> aToDeleteFrameFormats;
+ const sal_uLong nNodeIdxOfFlyFormat( pContentIdx->GetIndex() );
- for ( size_t i = 0; i < pTbl->size(); ++i )
+ for ( size_t i = 0; i < pTable->size(); ++i )
{
- SwFrmFmt* pTmpFmt = (*pTbl)[i];
- const SwFmtAnchor &rAnch = pTmpFmt->GetAnchor();
+ SwFrameFormat* pTmpFormat = (*pTable)[i];
+ const SwFormatAnchor &rAnch = pTmpFormat->GetAnchor();
if ( rAnch.GetAnchorId() == FLY_AT_FLY &&
- rAnch.GetCntntAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFmt )
+ rAnch.GetContentAnchor()->nNode.GetIndex() == nNodeIdxOfFlyFormat )
{
- aToDeleteFrmFmts.push_back( pTmpFmt );
+ aToDeleteFrameFormats.push_back( pTmpFormat );
}
}
// delete found frame formats
- while ( !aToDeleteFrmFmts.empty() )
+ while ( !aToDeleteFrameFormats.empty() )
{
- SwFrmFmt* pTmpFmt = aToDeleteFrmFmts.back();
- pFmt->GetDoc()->getIDocumentLayoutAccess().DelLayoutFmt( pTmpFmt );
+ SwFrameFormat* pTmpFormat = aToDeleteFrameFormats.back();
+ pFormat->GetDoc()->getIDocumentLayoutAccess().DelLayoutFormat( pTmpFormat );
- aToDeleteFrmFmts.pop_back();
+ aToDeleteFrameFormats.pop_back();
}
}
}
@@ -292,34 +292,34 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
if( pCntIdx )
{
SwNode *pNode = &pCntIdx->GetNode();
- const_cast<SwFmtCntnt&>(static_cast<const SwFmtCntnt&>(pFmt->GetFmtAttr( RES_CNTNT ))).SetNewCntntIdx( 0 );
+ const_cast<SwFormatContent&>(static_cast<const SwFormatContent&>(pFormat->GetFormatAttr( RES_CNTNT ))).SetNewContentIdx( 0 );
m_rDoc.getIDocumentContentOperations().DeleteSection( pNode );
}
// Delete the character for FlyFrames anchored as char (if necessary)
- const SwFmtAnchor& rAnchor = pFmt->GetAnchor();
- if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetCntntAnchor())
+ const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
+ if ((FLY_AS_CHAR == rAnchor.GetAnchorId()) && rAnchor.GetContentAnchor())
{
- const SwPosition* pPos = rAnchor.GetCntntAnchor();
- SwTxtNode *pTxtNd = pPos->nNode.GetNode().GetTxtNode();
+ const SwPosition* pPos = rAnchor.GetContentAnchor();
+ SwTextNode *pTextNd = pPos->nNode.GetNode().GetTextNode();
// attribute is still in text node, delete it
- if ( pTxtNd )
+ if ( pTextNd )
{
- SwTxtFlyCnt* const pAttr = static_cast<SwTxtFlyCnt*>(
- pTxtNd->GetTxtAttrForCharAt( pPos->nContent.GetIndex(),
+ SwTextFlyCnt* const pAttr = static_cast<SwTextFlyCnt*>(
+ pTextNd->GetTextAttrForCharAt( pPos->nContent.GetIndex(),
RES_TXTATR_FLYCNT ));
- if ( pAttr && (pAttr->GetFlyCnt().GetFrmFmt() == pFmt) )
+ if ( pAttr && (pAttr->GetFlyCnt().GetFrameFormat() == pFormat) )
{
// dont delete, set pointer to 0
- const_cast<SwFmtFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFmt();
+ const_cast<SwFormatFlyCnt&>(pAttr->GetFlyCnt()).SetFlyFormat();
SwIndex aIdx( pPos->nContent );
- pTxtNd->EraseText( aIdx, 1 );
+ pTextNd->EraseText( aIdx, 1 );
}
}
}
- m_rDoc.DelFrmFmt( pFmt );
+ m_rDoc.DelFrameFormat( pFormat );
}
m_rDoc.getIDocumentState().SetModified();
}
@@ -330,10 +330,10 @@ void DocumentLayoutManager::DelLayoutFmt( SwFrmFmt *pFmt )
If the source format is located in another document, also copy correctly
in this case.
The Anchor attribute's position is always set to 0! */
-SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
- const SwFrmFmt& rSource,
- const SwFmtAnchor& rNewAnchor,
- bool bSetTxtFlyAtt,
+SwFrameFormat *DocumentLayoutManager::CopyLayoutFormat(
+ const SwFrameFormat& rSource,
+ const SwFormatAnchor& rNewAnchor,
+ bool bSetTextFlyAtt,
bool bMakeFrms )
{
const bool bFly = RES_FLYFRMFMT == rSource.Which();
@@ -356,8 +356,8 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
((FLY_AT_PARA == rNewAnchor.GetAnchorId()) ||
(FLY_AT_FLY == rNewAnchor.GetAnchorId()) ||
(FLY_AT_CHAR == rNewAnchor.GetAnchorId())) &&
- rNewAnchor.GetCntntAnchor() &&
- m_rDoc.IsInHeaderFooter( rNewAnchor.GetCntntAnchor()->nNode ) &&
+ rNewAnchor.GetContentAnchor() &&
+ m_rDoc.IsInHeaderFooter( rNewAnchor.GetContentAnchor()->nNode ) &&
pDrawContact != NULL &&
pDrawContact->GetMaster() != NULL &&
CheckControlLayer( pDrawContact->GetMaster() );
@@ -367,9 +367,9 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
if( bMayNotCopy )
return NULL;
- SwFrmFmt* pDest = m_rDoc.GetDfltFrmFmt();
- if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrmFmt() )
- pDest = m_rDoc.CopyFrmFmt( *static_cast<const SwFrmFmt*>(rSource.GetRegisteredIn()) );
+ SwFrameFormat* pDest = m_rDoc.GetDfltFrameFormat();
+ if( rSource.GetRegisteredIn() != pSrcDoc->GetDfltFrameFormat() )
+ pDest = m_rDoc.CopyFrameFormat( *static_cast<const SwFrameFormat*>(rSource.GetRegisteredIn()) );
if( bFly )
{
// #i11176#
@@ -378,36 +378,36 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
// These are then added to the DrawingLayer (which needs to exist).
// Together with correct sorting of all drawinglayer based objects
// before cloning ZOrder transfer works correctly then.
- SwFlyFrmFmt *pFormat = m_rDoc.MakeFlyFrmFmt( rSource.GetName(), pDest );
+ SwFlyFrameFormat *pFormat = m_rDoc.MakeFlyFrameFormat( rSource.GetName(), pDest );
pDest = pFormat;
SwXFrame::GetOrCreateSdrObject(*pFormat);
}
else
- pDest = m_rDoc.MakeDrawFrmFmt( OUString(), pDest );
+ pDest = m_rDoc.MakeDrawFrameFormat( OUString(), pDest );
// Copy all other or new attributes
pDest->CopyAttrs( rSource );
// Do not copy chains
- pDest->ResetFmtAttr( RES_CHAIN );
+ pDest->ResetFormatAttr( RES_CHAIN );
if( bFly )
{
// Duplicate the content.
- const SwNode& rCSttNd = rSource.GetCntnt().GetCntntIdx()->GetNode();
+ const SwNode& rCSttNd = rSource.GetContent().GetContentIdx()->GetNode();
SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() );
SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
SwStartNode* pSttNd = SwNodes::MakeEmptySection( aIdx, SwFlyStartNode );
- // Set the Anchor/CntntIndex first.
- // Within the copying part, we can access the values (DrawFmt in Headers and Footers)
+ // Set the Anchor/ContentIndex first.
+ // Within the copying part, we can access the values (DrawFormat in Headers and Footers)
aIdx = *pSttNd;
- SwFmtCntnt aAttr( rSource.GetCntnt() );
- aAttr.SetNewCntntIdx( &aIdx );
- pDest->SetFmtAttr( aAttr );
- pDest->SetFmtAttr( rNewAnchor );
+ SwFormatContent aAttr( rSource.GetContent() );
+ aAttr.SetNewContentIdx( &aIdx );
+ pDest->SetFormatAttr( aAttr );
+ pDest->SetFormatAttr( rNewAnchor );
if( !m_rDoc.IsCopyIsMove() || &m_rDoc != pSrcDoc )
{
@@ -434,14 +434,14 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
}
// Make sure that FlyFrames in FlyFrames are copied
aIdx = *pSttNd->EndOfSectionNode();
//fdo#36631 disable (scoped) any undo operations associated with the
- //contact object itself. They should be managed by SwUndoInsLayFmt.
+ //contact object itself. They should be managed by SwUndoInsLayFormat.
const ::sw::DrawUndoGuard drawUndoGuard(m_rDoc.GetIDocumentUndoRedo());
pSrcDoc->GetDocumentContentOperationsManager().CopyWithFlyInFly( aRg, 0, aIdx, NULL, false, true, true );
@@ -452,17 +452,17 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
// #i52780# - Note: moving object to visible layer not needed.
const SwDrawContact* pSourceContact = static_cast<const SwDrawContact *>(rSource.FindContactObj());
- SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrmFmt*>(pDest),
+ SwDrawContact* pContact = new SwDrawContact( static_cast<SwDrawFrameFormat*>(pDest),
m_rDoc.CloneSdrObj( *pSourceContact->GetMaster(),
m_rDoc.IsCopyIsMove() && &m_rDoc == pSrcDoc ) );
// #i49730# - notify draw frame format that position attributes are
// already set, if the position attributes are already set at the
// source draw frame format.
- if ( pDest->ISA(SwDrawFrmFmt) &&
- rSource.ISA(SwDrawFrmFmt) &&
- static_cast<const SwDrawFrmFmt&>(rSource).IsPosAttrSet() )
+ if ( pDest->ISA(SwDrawFrameFormat) &&
+ rSource.ISA(SwDrawFrameFormat) &&
+ static_cast<const SwDrawFrameFormat&>(rSource).IsPosAttrSet() )
{
- static_cast<SwDrawFrmFmt*>(pDest)->PosAttrSet();
+ static_cast<SwDrawFrameFormat*>(pDest)->PosAttrSet();
}
if( pDest->GetAnchor() == rNewAnchor )
@@ -474,33 +474,33 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
}
}
else
- pDest->SetFmtAttr( rNewAnchor );
+ pDest->SetFormatAttr( rNewAnchor );
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
{
- m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFmt(pDest,0,0));
+ m_rDoc.GetIDocumentUndoRedo().AppendUndo(new SwUndoInsLayFormat(pDest,0,0));
}
}
- if (bSetTxtFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
+ if (bSetTextFlyAtt && (FLY_AS_CHAR == rNewAnchor.GetAnchorId()))
{
- const SwPosition* pPos = rNewAnchor.GetCntntAnchor();
- SwFmtFlyCnt aFmt( pDest );
- pPos->nNode.GetNode().GetTxtNode()->InsertItem(
- aFmt, pPos->nContent.GetIndex(), 0 );
+ const SwPosition* pPos = rNewAnchor.GetContentAnchor();
+ SwFormatFlyCnt aFormat( pDest );
+ pPos->nNode.GetNode().GetTextNode()->InsertItem(
+ aFormat, pPos->nContent.GetIndex(), 0 );
}
if( bMakeFrms )
pDest->MakeFrms();
// If the draw format has a TextBox, then copy its fly format as well.
- if (SwFrmFmt* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
+ if (SwFrameFormat* pSourceTextBox = SwTextBoxHelper::findTextBox(&rSource))
{
- SwFrmFmt* pDestTextBox = CopyLayoutFmt(*pSourceTextBox, rNewAnchor, bSetTxtFlyAtt, bMakeFrms);
+ SwFrameFormat* pDestTextBox = CopyLayoutFormat(*pSourceTextBox, rNewAnchor, bSetTextFlyAtt, bMakeFrms);
SwAttrSet aSet(pDest->GetAttrSet());
- SwFmtCntnt aCntnt(pDestTextBox->GetCntnt().GetCntntIdx()->GetNode().GetStartNode());
- aSet.Put(aCntnt);
- pDest->SetFmtAttr(aSet);
+ SwFormatContent aContent(pDestTextBox->GetContent().GetContentIdx()->GetNode().GetStartNode());
+ aSet.Put(aContent);
+ pDest->SetFormatAttr(aSet);
}
return pDest;
diff --git a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
index 7ed4e7bf9b7f..2e2db8c74f6f 100644
--- a/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
+++ b/sw/source/core/doc/DocumentLinksAdministrationManager.cxx
@@ -53,11 +53,11 @@ namespace
struct _FindItem
{
const OUString m_Item;
- SwTableNode* pTblNd;
+ SwTableNode* pTableNd;
SwSectionNode* pSectNd;
_FindItem(const OUString& rS)
- : m_Item(rS), pTblNd(0), pSectNd(0)
+ : m_Item(rS), pTableNd(0), pSectNd(0)
{}
};
@@ -112,9 +112,9 @@ namespace
}
- bool lcl_FindSection( const SwSectionFmt* pSectFmt, _FindItem * const pItem, bool bCaseSensitive )
+ bool lcl_FindSection( const SwSectionFormat* pSectFormat, _FindItem * const pItem, bool bCaseSensitive )
{
- SwSection* pSect = pSectFmt->GetSection();
+ SwSection* pSect = pSectFormat->GetSection();
if( pSect )
{
OUString sNm( (bCaseSensitive)
@@ -127,8 +127,8 @@ namespace
{
// found, so get the data
const SwNodeIndex* pIdx;
- if( 0 != (pIdx = pSectFmt->GetCntnt().GetCntntIdx() ) &&
- &pSectFmt->GetDoc()->GetNodes() == &pIdx->GetNodes() )
+ if( 0 != (pIdx = pSectFormat->GetContent().GetContentIdx() ) &&
+ &pSectFormat->GetDoc()->GetNodes() == &pIdx->GetNodes() )
{
// a table in the normal NodesArr
pItem->pSectNd = pIdx->GetNode().GetSectionNode();
@@ -141,20 +141,20 @@ namespace
return true;
}
- bool lcl_FindTable( const SwFrmFmt* pTableFmt, _FindItem * const pItem )
+ bool lcl_FindTable( const SwFrameFormat* pTableFormat, _FindItem * const pItem )
{
- OUString sNm( GetAppCharClass().lowercase( pTableFmt->GetName() ));
+ OUString sNm( GetAppCharClass().lowercase( pTableFormat->GetName() ));
if ( sNm == pItem->m_Item )
{
- SwTable* pTmpTbl;
+ SwTable* pTmpTable;
SwTableBox* pFBox;
- if( 0 != ( pTmpTbl = SwTable::FindTable( pTableFmt ) ) &&
- 0 != ( pFBox = pTmpTbl->GetTabSortBoxes()[0] ) &&
+ if( 0 != ( pTmpTable = SwTable::FindTable( pTableFormat ) ) &&
+ 0 != ( pFBox = pTmpTable->GetTabSortBoxes()[0] ) &&
pFBox->GetSttNd() &&
- &pTableFmt->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
+ &pTableFormat->GetDoc()->GetNodes() == &pFBox->GetSttNd()->GetNodes() )
{
// a table in the normal NodesArr
- pItem->pTblNd = const_cast<SwTableNode*>(
+ pItem->pTableNd = const_cast<SwTableNode*>(
pFBox->GetSttNd()->FindTableNode());
return false;
}
@@ -247,9 +247,9 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
// Do we already have the Item?
OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+ for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
{
- if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+ if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
break;
}
if( aPara.pSectNd )
@@ -263,14 +263,14 @@ bool DocumentLinksAdministrationManager::GetData( const OUString& rItem, const O
}
_FindItem aPara( GetAppCharClass().lowercase( rItem ));
- for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+ for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
{
- if (!(lcl_FindTable(pFmt, &aPara)))
+ if (!(lcl_FindTable(pFormat, &aPara)))
break;
}
- if( aPara.pTblNd )
+ if( aPara.pTableNd )
{
- return SwServerObject( *aPara.pTblNd ).GetData( rValue, rMimeType );
+ return SwServerObject( *aPara.pTableNd ).GetData( rValue, rMimeType );
}
return false;
@@ -292,9 +292,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
// Do we already have the Item?
OUString sItem( bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+ for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
{
- if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+ if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
break;
}
if( aPara.pSectNd )
@@ -309,9 +309,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
OUString sItem(GetAppCharClass().lowercase(rItem));
_FindItem aPara( sItem );
- for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+ for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
{
- if (!(lcl_FindTable(pFmt, &aPara)))
+ if (!(lcl_FindTable(pFormat, &aPara)))
break;
}
@@ -341,9 +341,9 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
_FindItem aPara(bCaseSensitive ? rItem : GetAppCharClass().lowercase(rItem));
// sections
- for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+ for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
{
- if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+ if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
break;
}
@@ -364,17 +364,17 @@ bool DocumentLinksAdministrationManager::SetData( const OUString& rItem, const O
_FindItem aPara( GetAppCharClass().lowercase(rItem) );
// tables
- for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+ for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
{
- if (!(lcl_FindTable(pFmt, &aPara)))
+ if (!(lcl_FindTable(pFormat, &aPara)))
break;
}
- if(aPara.pTblNd
- && (0 == (pObj = aPara.pTblNd->GetTable().GetObject())))
+ if(aPara.pTableNd
+ && (0 == (pObj = aPara.pTableNd->GetTable().GetObject())))
{
// table found, but no link yet -> create hotlink
- pObj = new SwServerObject(*aPara.pTblNd);
- aPara.pTblNd->GetTable().SetRefObject(pObj);
+ pObj = new SwServerObject(*aPara.pTableNd);
+ aPara.pTableNd->GetTable().SetRefObject(pObj);
GetLinkManager().InsertServer(pObj);
}
return pObj;
@@ -453,15 +453,15 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
if( sCmp == "table" )
{
sName = rCC.lowercase( sName );
- for( const SwFrmFmt* pFmt : *m_rDoc.GetTblFrmFmts() )
+ for( const SwFrameFormat* pFormat : *m_rDoc.GetTableFrameFormats() )
{
- if (!(lcl_FindTable(pFmt, &aPara)))
+ if (!(lcl_FindTable(pFormat, &aPara)))
break;
}
- if( aPara.pTblNd )
+ if( aPara.pTableNd )
{
- rpRange = new SwNodeRange( *aPara.pTblNd, 0,
- *aPara.pTblNd->EndOfSectionNode(), 1 );
+ rpRange = new SwNodeRange( *aPara.pTableNd, 0,
+ *aPara.pTableNd->EndOfSectionNode(), 1 );
return true;
}
}
@@ -469,10 +469,10 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
{
SwNodeIndex* pIdx;
SwNode* pNd;
- const SwFlyFrmFmt* pFlyFmt = m_rDoc.FindFlyByName( sName );
- if( pFlyFmt &&
- 0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFmt->GetCntnt().GetCntntIdx()) ) &&
- !( pNd = &pIdx->GetNode())->IsNoTxtNode() )
+ const SwFlyFrameFormat* pFlyFormat = m_rDoc.FindFlyByName( sName );
+ if( pFlyFormat &&
+ 0 != ( pIdx = const_cast<SwNodeIndex*>(pFlyFormat->GetContent().GetContentIdx()) ) &&
+ !( pNd = &pIdx->GetNode())->IsNoTextNode() )
{
rpRange = new SwNodeRange( *pNd, 1, *pNd->EndOfSectionNode() );
return true;
@@ -489,7 +489,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
if( m_rDoc.GotoOutline( aPos, sName ))
{
SwNode* pNd = &aPos.nNode.GetNode();
- const int nLvl = pNd->GetTxtNode()->GetAttrOutlineLevel()-1;
+ const int nLvl = pNd->GetTextNode()->GetAttrOutlineLevel()-1;
const SwOutlineNodes& rOutlNds = m_rDoc.GetNodes().GetOutLineNds();
sal_uInt16 nTmpPos;
@@ -499,7 +499,7 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
// look for the section's end, now
for( ++nTmpPos;
nTmpPos < rOutlNds.size() &&
- nLvl < rOutlNds[ nTmpPos ]->GetTxtNode()->
+ nLvl < rOutlNds[ nTmpPos ]->GetTextNode()->
GetAttrOutlineLevel()-1;
++nTmpPos )
; // there is no block
@@ -534,9 +534,9 @@ bool DocumentLinksAdministrationManager::SelectServerObj( const OUString& rStr,
if( !m_rDoc.GetSections().empty() )
{
- for( const SwSectionFmt* pFmt : m_rDoc.GetSections() )
+ for( const SwSectionFormat* pFormat : m_rDoc.GetSections() )
{
- if (!(lcl_FindSection(pFmt, &aPara, bCaseSensitive)))
+ if (!(lcl_FindSection(pFormat, &aPara, bCaseSensitive)))
break;
}
if( aPara.pSectNd )
diff --git a/sw/source/core/doc/DocumentListItemsManager.cxx b/sw/source/core/doc/DocumentListItemsManager.cxx
index 5844fd27abed..66de4083f0c7 100644
--- a/sw/source/core/doc/DocumentListItemsManager.cxx
+++ b/sw/source/core/doc/DocumentListItemsManager.cxx
@@ -70,8 +70,8 @@ OUString DocumentListItemsManager::getListItemText( const SwNodeNum& rNodeNum,
const bool bWithNumber,
const bool bWithSpacesForLevel ) const
{
- return rNodeNum.GetTxtNode()
- ? rNodeNum.GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
+ return rNodeNum.GetTextNode()
+ ? rNodeNum.GetTextNode()->GetExpandText( 0, -1, bWithNumber,
bWithNumber, bWithSpacesForLevel )
: OUString();
}
@@ -100,7 +100,7 @@ void DocumentListItemsManager::getNumItems( tSortedNodeNumList& orNodeNumList )
{
const SwNodeNum* pNodeNum = (*aIter);
if ( pNodeNum->IsCounted() &&
- pNodeNum->GetTxtNode() && pNodeNum->GetTxtNode()->HasNumber() )
+ pNodeNum->GetTextNode() && pNodeNum->GetTextNode()->HasNumber() )
{
orNodeNumList.push_back( pNodeNum );
}
diff --git a/sw/source/core/doc/DocumentOutlineNodesManager.cxx b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
index 5e006164618d..95d0789fe849 100644
--- a/sw/source/core/doc/DocumentOutlineNodesManager.cxx
+++ b/sw/source/core/doc/DocumentOutlineNodesManager.cxx
@@ -35,22 +35,22 @@ sal_Int32 DocumentOutlineNodesManager::getOutlineNodesCount() const
int DocumentOutlineNodesManager::getOutlineLevel( const sal_Int32 nIdx ) const
{
return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
- GetTxtNode()->GetAttrOutlineLevel()-1;
+ GetTextNode()->GetAttrOutlineLevel()-1;
}
OUString DocumentOutlineNodesManager::getOutlineText( const sal_Int32 nIdx,
const bool bWithNumber,
const bool bWithSpacesForLevel,
- const bool bWithFtn ) const
+ const bool bWithFootnote ) const
{
return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->
- GetTxtNode()->GetExpandTxt( 0, -1, bWithNumber,
- bWithNumber, bWithSpacesForLevel, bWithFtn );
+ GetTextNode()->GetExpandText( 0, -1, bWithNumber,
+ bWithNumber, bWithSpacesForLevel, bWithFootnote );
}
-SwTxtNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
+SwTextNode* DocumentOutlineNodesManager::getOutlineNode( const sal_Int32 nIdx ) const
{
- return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTxtNode();
+ return m_rDoc.GetNodes().GetOutLineNds()[ nIdx ]->GetTextNode();
}
void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSortedOutlineNodeList& orOutlineNodeList ) const
@@ -62,7 +62,7 @@ void DocumentOutlineNodesManager::getOutlineNodes( IDocumentOutlineNodes::tSorte
for ( sal_Int32 i = 0; i < nOutlCount; ++i )
{
orOutlineNodeList.push_back(
- m_rDoc.GetNodes().GetOutLineNds()[i]->GetTxtNode() );
+ m_rDoc.GetNodes().GetOutLineNds()[i]->GetTextNode() );
}
}
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index e9c7dffeba44..99892d69b102 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -47,14 +47,14 @@ using namespace com::sun::star;
assert(dynamic_cast<SwIndexReg*>(&pPos->nNode.GetNode())
== pPos->nContent.GetIdxReg());
- SwTxtNode* pTxtNode = pPos->nNode.GetNode().GetTxtNode();
- if( pTxtNode == NULL )
+ SwTextNode* pTextNode = pPos->nNode.GetNode().GetTextNode();
+ if( pTextNode == NULL )
{
assert(pPos->nContent == 0);
}
else
{
- assert(pPos->nContent >= 0 && pPos->nContent <= pTxtNode->Len());
+ assert(pPos->nContent >= 0 && pPos->nContent <= pTextNode->Len());
}
}
@@ -69,25 +69,25 @@ using namespace com::sun::star;
// sure the redlines are sorted and non-overlapping.
static void lcl_CheckRedline( IDocumentRedlineAccess& redlineAccess )
{
- const SwRedlineTbl& rTbl = redlineAccess.GetRedlineTbl();
+ const SwRedlineTable& rTable = redlineAccess.GetRedlineTable();
// verify valid redline positions
- for( sal_uInt16 i = 0; i < rTbl.size(); ++i )
- lcl_CheckPam( rTbl[ i ] );
+ for( sal_uInt16 i = 0; i < rTable.size(); ++i )
+ lcl_CheckPam( rTable[ i ] );
- for( sal_uInt16 j = 0; j < rTbl.size(); ++j )
+ for( sal_uInt16 j = 0; j < rTable.size(); ++j )
{
// check for empty redlines
- OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
- ( rTbl[j]->GetContentIdx() != NULL ),
+ OSL_ENSURE( ( *(rTable[j]->GetPoint()) != *(rTable[j]->GetMark()) ) ||
+ ( rTable[j]->GetContentIdx() != NULL ),
_ERROR_PREFIX "empty redline" );
}
// verify proper redline sorting
- for( sal_uInt16 n = 1; n < rTbl.size(); ++n )
+ for( sal_uInt16 n = 1; n < rTable.size(); ++n )
{
- const SwRangeRedline* pPrev = rTbl[ n-1 ];
- const SwRangeRedline* pCurrent = rTbl[ n ];
+ const SwRangeRedline* pPrev = rTable[ n-1 ];
+ const SwRangeRedline* pCurrent = rTable[ n ];
// check redline sorting
SAL_WARN_IF( *pPrev->Start() > *pCurrent->Start(), "sw",
@@ -98,7 +98,7 @@ using namespace com::sun::star;
_ERROR_PREFIX "overlapping redlines" );
}
- assert(std::is_sorted(rTbl.begin(), rTbl.end(), CompareSwRedlineTbl()));
+ assert(std::is_sorted(rTable.begin(), rTable.end(), CompareSwRedlineTable()));
}
}
@@ -114,14 +114,14 @@ namespace
{
static inline bool IsPrevPos( const SwPosition & rPos1, const SwPosition & rPos2 )
{
- const SwCntntNode* pCNd;
+ const SwContentNode* pCNd;
return 0 == rPos2.nContent.GetIndex() &&
rPos2.nNode.GetIndex() - 1 == rPos1.nNode.GetIndex() &&
- 0 != ( pCNd = rPos1.nNode.GetNode().GetCntntNode() ) &&
+ 0 != ( pCNd = rPos1.nNode.GetNode().GetContentNode() ) &&
rPos1.nContent.GetIndex() == pCNd->Len();
}
- static bool lcl_AcceptRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+ static bool lcl_AcceptRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
bool bCallDelete,
const SwPosition* pSttRng = 0,
const SwPosition* pEndRng = 0 )
@@ -240,8 +240,8 @@ namespace
if( pDelStt && pDelEnd )
{
SwPaM aPam( *pDelStt, *pDelEnd );
- SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
- SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+ SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+ SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
if( bDelRedl )
delete pRedl;
@@ -280,7 +280,7 @@ namespace
return bRet;
}
- static bool lcl_RejectRedline( SwRedlineTbl& rArr, sal_uInt16& rPos,
+ static bool lcl_RejectRedline( SwRedlineTable& rArr, sal_uInt16& rPos,
bool bCallDelete,
const SwPosition* pSttRng = 0,
const SwPosition* pEndRng = 0 )
@@ -350,8 +350,8 @@ namespace
{
SwPaM aPam( *pDelStt, *pDelEnd );
- SwCntntNode* pCSttNd = pDelStt->nNode.GetNode().GetCntntNode();
- SwCntntNode* pCEndNd = pDelEnd->nNode.GetNode().GetCntntNode();
+ SwContentNode* pCSttNd = pDelStt->nNode.GetNode().GetContentNode();
+ SwContentNode* pCEndNd = pDelEnd->nNode.GetNode().GetContentNode();
if( bDelRedl )
delete pRedl;
@@ -484,14 +484,14 @@ namespace
return bRet;
}
- typedef bool (*Fn_AcceptReject)( SwRedlineTbl& rArr, sal_uInt16& rPos,
+ typedef bool (*Fn_AcceptReject)( SwRedlineTable& rArr, sal_uInt16& rPos,
bool bCallDelete,
const SwPosition* pSttRng,
const SwPosition* pEndRng);
static int lcl_AcceptRejectRedl( Fn_AcceptReject fn_AcceptReject,
- SwRedlineTbl& rArr, bool bCallDelete,
+ SwRedlineTable& rArr, bool bCallDelete,
const SwPaM& rPam)
{
sal_uInt16 n = 0;
@@ -545,7 +545,7 @@ namespace
: rPam.GetPoint();
SwDoc* pDoc = rPam.GetDoc();
if( !pStt->nContent.GetIndex() &&
- !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsCntntNode() )
+ !pDoc->GetNodes()[ pStt->nNode.GetIndex() - 1 ]->IsContentNode() )
{
const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pStt, 0 );
if( pRedl )
@@ -556,9 +556,9 @@ namespace
*pStt = *pRStt;
}
}
- if( pEnd->nNode.GetNode().IsCntntNode() &&
- !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsCntntNode() &&
- pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetCntntNode()->Len() )
+ if( pEnd->nNode.GetNode().IsContentNode() &&
+ !pDoc->GetNodes()[ pEnd->nNode.GetIndex() + 1 ]->IsContentNode() &&
+ pEnd->nContent.GetIndex() == pEnd->nNode.GetNode().GetContentNode()->Len() )
{
const SwRangeRedline* pRedl = pDoc->getIDocumentRedlineAccess().GetRedline( *pEnd, 0 );
if( pRedl )
@@ -577,12 +577,12 @@ namespace sw
DocumentRedlineManager::DocumentRedlineManager( SwDoc& i_rSwdoc ) : m_rDoc( i_rSwdoc ),
meRedlineMode((RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE)),
- mpRedlineTbl( new SwRedlineTbl ),
- mpExtraRedlineTbl ( new SwExtraRedlineTbl ),
- mpAutoFmtRedlnComment( 0 ),
+ mpRedlineTable( new SwRedlineTable ),
+ mpExtraRedlineTable ( new SwExtraRedlineTable ),
+ mpAutoFormatRedlnComment( 0 ),
mbIsRedlineMove(false),
mbReadlineChecked(false),
- mnAutoFmtRedlnCommentNo( 0 )
+ mnAutoFormatRedlnCommentNo( 0 )
{
}
@@ -627,12 +627,12 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
if (pFnc)
{
for (sal_uInt16 nLoop = 1; nLoop <= 2; ++nLoop)
- for (size_t i = 0; i < mpRedlineTbl->size(); ++i)
- ((*mpRedlineTbl)[i]->*pFnc)(nLoop, i);
+ for (size_t i = 0; i < mpRedlineTable->size(); ++i)
+ ((*mpRedlineTable)[i]->*pFnc)(nLoop, i);
//SwRangeRedline::MoveFromSection routinely changes
- //the keys that mpRedlineTbl is sorted by
- mpRedlineTbl->Resort();
+ //the keys that mpRedlineTable is sorted by
+ mpRedlineTable->Resort();
}
CheckAnchoredFlyConsistency(m_rDoc);
@@ -643,7 +643,7 @@ void DocumentRedlineManager::SetRedlineMode( RedlineMode_t eMode )
m_rDoc.getIDocumentState().SetModified();
}
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::IsRedlineOn() const
@@ -661,29 +661,29 @@ void DocumentRedlineManager::SetRedlineMode_intern(RedlineMode_t eMode)
meRedlineMode = eMode;
}
-const SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl() const
+const SwRedlineTable& DocumentRedlineManager::GetRedlineTable() const
{
- return *mpRedlineTbl;
+ return *mpRedlineTable;
}
-SwRedlineTbl& DocumentRedlineManager::GetRedlineTbl()
+SwRedlineTable& DocumentRedlineManager::GetRedlineTable()
{
- return *mpRedlineTbl;
+ return *mpRedlineTable;
}
-const SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl() const
+const SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable() const
{
- return *mpExtraRedlineTbl;
+ return *mpExtraRedlineTable;
}
-SwExtraRedlineTbl& DocumentRedlineManager::GetExtraRedlineTbl()
+SwExtraRedlineTable& DocumentRedlineManager::GetExtraRedlineTable()
{
- return *mpExtraRedlineTbl;
+ return *mpExtraRedlineTable;
}
-bool DocumentRedlineManager::HasExtraRedlineTbl() const
+bool DocumentRedlineManager::HasExtraRedlineTable() const
{
- return mpExtraRedlineTbl != nullptr;
+ return mpExtraRedlineTable != nullptr;
}
bool DocumentRedlineManager::IsInRedlines(const SwNode & rNode) const
@@ -739,13 +739,13 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
pNewRedl->InvalidateRange();
- if( m_rDoc.IsAutoFmtRedline() )
+ if( m_rDoc.IsAutoFormatRedline() )
{
- pNewRedl->SetAutoFmtFlag();
- if( mpAutoFmtRedlnComment && !mpAutoFmtRedlnComment->isEmpty() )
+ pNewRedl->SetAutoFormatFlag();
+ if( mpAutoFormatRedlnComment && !mpAutoFormatRedlnComment->isEmpty() )
{
- pNewRedl->SetComment( *mpAutoFmtRedlnComment );
- pNewRedl->SetSeqNo( mnAutoFmtRedlnCommentNo );
+ pNewRedl->SetComment( *mpAutoFormatRedlnComment );
+ pNewRedl->SetSeqNo( mnAutoFormatRedlnCommentNo );
}
}
@@ -753,8 +753,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
* pEnd = pStt == pNewRedl->GetPoint() ? pNewRedl->GetMark()
: pNewRedl->GetPoint();
{
- SwTxtNode* pTxtNode = pStt->nNode.GetNode().GetTxtNode();
- if( pTxtNode == NULL )
+ SwTextNode* pTextNode = pStt->nNode.GetNode().GetTextNode();
+ if( pTextNode == NULL )
{
if( pStt->nContent > 0 )
{
@@ -764,14 +764,14 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
}
else
{
- if( pStt->nContent > pTxtNode->Len() )
+ if( pStt->nContent > pTextNode->Len() )
{
OSL_ENSURE( false, "Redline start: index after text" );
- pStt->nContent = pTxtNode->Len();
+ pStt->nContent = pTextNode->Len();
}
}
- pTxtNode = pEnd->nNode.GetNode().GetTxtNode();
- if( pTxtNode == NULL )
+ pTextNode = pEnd->nNode.GetNode().GetTextNode();
+ if( pTextNode == NULL )
{
if( pEnd->nContent > 0 )
{
@@ -781,10 +781,10 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
}
else
{
- if( pEnd->nContent > pTxtNode->Len() )
+ if( pEnd->nContent > pTextNode->Len() )
{
OSL_ENSURE( false, "Redline end: index after text" );
- pEnd->nContent = pTxtNode->Len();
+ pEnd->nContent = pTextNode->Len();
}
}
}
@@ -801,11 +801,11 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
--n;
bool bDec = false;
- for( ; pNewRedl && n < mpRedlineTbl->size(); bDec ? n : ++n )
+ for( ; pNewRedl && n < mpRedlineTable->size(); bDec ? n : ++n )
{
bDec = false;
- SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+ SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
SwPosition* pRStt = pRedl->Start(),
* pREnd = pRStt == pRedl->GetPoint() ? pRedl->GetMark()
: pRedl->GetPoint();
@@ -814,7 +814,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
if( ( *pRStt == *pREnd ) &&
( pRedl->GetContentIdx() == NULL ) )
{
- mpRedlineTbl->DeleteAndDestroy(n);
+ mpRedlineTable->DeleteAndDestroy(n);
continue;
}
@@ -836,16 +836,16 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
( POS_COLLIDE_START == eCmpPos ) ||
( POS_OVERLAP_BEHIND == eCmpPos ) ) &&
pRedl->CanCombine( *pNewRedl ) &&
- ( n+1 >= (sal_uInt16)mpRedlineTbl->size() ||
- ( *(*mpRedlineTbl)[ n+1 ]->Start() >= *pEnd &&
- *(*mpRedlineTbl)[ n+1 ]->Start() != *pREnd ) ) )
+ ( n+1 >= (sal_uInt16)mpRedlineTable->size() ||
+ ( *(*mpRedlineTable)[ n+1 ]->Start() >= *pEnd &&
+ *(*mpRedlineTable)[ n+1 ]->Start() != *pREnd ) ) )
{
pRedl->SetEnd( *pEnd, pREnd );
if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
}
bMerged = true;
@@ -857,12 +857,12 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
( POS_OVERLAP_BEFORE == eCmpPos ) ) &&
pRedl->CanCombine( *pNewRedl ) &&
( !n ||
- *(*mpRedlineTbl)[ n-1 ]->End() != *pRStt ))
+ *(*mpRedlineTable)[ n-1 ]->End() != *pRStt ))
{
pRedl->SetStart( *pStt, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
bMerged = true;
bDelete = true;
@@ -871,7 +871,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
// own insert-over-insert redlines:
// just scrap the inside ones
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -904,20 +904,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
pCpy->SetStart( *pEnd );
- mpRedlineTbl->Insert( pCpy );
+ mpRedlineTable->Insert( pCpy );
}
pRedl->SetEnd( *pStt, pREnd );
if( ( *pStt == *pRStt ) &&
( pRedl->GetContentIdx() == NULL ) )
{
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
}
}
else if ( POS_OUTSIDE == eCmpPos )
@@ -930,7 +930,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
pSplit->SetEnd( *pRStt );
pNewRedl->SetStart( *pREnd );
- mpRedlineTbl->Insert( pSplit );
+ mpRedlineTable->Insert( pSplit );
if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
{
delete pNewRedl;
@@ -964,20 +964,20 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
SwRangeRedline* pCpy = new SwRangeRedline( *pRedl );
pCpy->SetStart( *pEnd );
- mpRedlineTbl->Insert( pCpy );
+ mpRedlineTable->Insert( pCpy );
}
pRedl->SetEnd( *pStt, pREnd );
if( ( *pStt == *pRStt ) &&
( pRedl->GetContentIdx() == NULL ) )
{
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
}
}
else if ( POS_OUTSIDE == eCmpPos )
@@ -990,7 +990,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
SwRangeRedline* pSplit = new SwRangeRedline( *pNewRedl );
pSplit->SetEnd( *pRStt );
pNewRedl->SetStart( *pREnd );
- mpRedlineTbl->Insert( pSplit );
+ mpRedlineTable->Insert( pSplit );
if( *pStt == *pEnd && pNewRedl->GetContentIdx() == NULL )
{
delete pNewRedl;
@@ -1002,7 +1002,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
// handle identical redlines in broken documents
// delete old (delete) redline
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else if ( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1016,8 +1016,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_OVERLAP_BEFORE:
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
bDec = true;
break;
@@ -1025,7 +1025,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pRedl->SetEnd( *pStt, pREnd );
if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
{
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
break;
@@ -1034,7 +1034,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_OUTSIDE:
// Overlaps the current one completely or has the
// same dimension, delete the old one
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
break;
@@ -1049,7 +1049,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNew->SetStart( *pEnd );
pRedl->SetEnd( *pStt, pREnd );
if( *pStt == *pRStt && pRedl->GetContentIdx() == NULL )
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
n = 0; // re-initialize
bDec = true;
@@ -1108,7 +1108,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->SetStart( *pRStt, pStt );
else
pNewRedl->SetEnd( *pREnd, pEnd );
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1127,9 +1127,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
// Before we can merge, we make it visible!
// We insert temporarily so that pNew is
// also dealt with when moving the indices.
- mpRedlineTbl->Insert(pNewRedl);
- pRedl->Show(0, mpRedlineTbl->GetPos(pRedl));
- mpRedlineTbl->Remove( pNewRedl );
+ mpRedlineTable->Insert(pNewRedl);
+ pRedl->Show(0, mpRedlineTable->GetPos(pRedl));
+ mpRedlineTable->Remove( pNewRedl );
pRStt = pRedl->Start();
pREnd = pRedl->End();
}
@@ -1159,7 +1159,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
bDec = true;
}
- mpRedlineTbl->DeleteAndDestroy( nToBeDeleted );
+ mpRedlineTable->DeleteAndDestroy( nToBeDeleted );
}
break;
default:
@@ -1183,7 +1183,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
case POS_EQUAL:
bCompress = true;
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
// no break!
@@ -1203,7 +1203,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
pEnd->nNode--;
pEnd->nContent.Assign(
- pEnd->nNode.GetNode().GetTxtNode(), 0);
+ pEnd->nNode.GetNode().GetTextNode(), 0);
m_rDoc.getIDocumentContentOperations().DelFullPara( *pNewRedl );
}
else
@@ -1216,15 +1216,15 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_OUTSIDE:
{
- mpRedlineTbl->Remove( n );
+ mpRedlineTable->Remove( n );
bDec = true;
// We insert temporarily so that pNew is
// also dealt with when moving the indices.
if( bCallDelete )
{
- mpRedlineTbl->Insert( pNewRedl );
+ mpRedlineTable->Insert( pNewRedl );
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( *pRedl );
- if( !mpRedlineTbl->Remove( pNewRedl ) )
+ if( !mpRedlineTable->Remove( pNewRedl ) )
pNewRedl = 0;
}
delete pRedl;
@@ -1236,22 +1236,22 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
SwPaM aPam( *pRStt, *pEnd );
if( *pEnd == *pREnd )
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
else
{
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
}
if( bCallDelete )
{
// We insert temporarily so that pNew is
// also dealt with when moving the indices.
- mpRedlineTbl->Insert( pNewRedl );
+ mpRedlineTable->Insert( pNewRedl );
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
- if( !mpRedlineTbl->Remove( pNewRedl ) )
+ if( !mpRedlineTable->Remove( pNewRedl ) )
pNewRedl = 0;
n = 0; // re-initialize
}
@@ -1265,7 +1265,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
if( *pStt == *pRStt )
{
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
else
@@ -1275,9 +1275,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
// We insert temporarily so that pNew is
// also dealt with when moving the indices.
- mpRedlineTbl->Insert( pNewRedl );
+ mpRedlineTable->Insert( pNewRedl );
m_rDoc.getIDocumentContentOperations().DeleteAndJoin( aPam );
- if( !mpRedlineTbl->Remove( pNewRedl ) )
+ if( !mpRedlineTable->Remove( pNewRedl ) )
pNewRedl = 0;
n = 0; // re-initialize
bDec = true;
@@ -1306,7 +1306,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
delete pNewRedl, pNewRedl = 0;
if( IsHideChanges( meRedlineMode ))
{
- pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
+ pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
}
bCompress = true;
}
@@ -1323,8 +1323,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->PushData( *pRedl, false );
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
bDec = true;
}
}
@@ -1340,8 +1340,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
}
}
}
@@ -1370,9 +1370,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->SetEnd( *pRStt, pEnd );
if( IsHideChanges( meRedlineMode ))
{
- mpRedlineTbl->Insert(pNewRedl);
- pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
- mpRedlineTbl->Remove( pNewRedl );
+ mpRedlineTable->Insert(pNewRedl);
+ pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+ mpRedlineTable->Remove( pNewRedl );
}
}
else
@@ -1383,8 +1383,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->SetEnd( *pRStt, pEnd );
pRedl->SetStart( *pNew->End(), pRStt ) ;
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
bDec = true;
}
}
@@ -1398,9 +1398,9 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->SetStart( *pREnd, pStt );
if( IsHideChanges( meRedlineMode ))
{
- mpRedlineTbl->Insert( pNewRedl );
- pRedl->Hide(0, mpRedlineTbl->GetPos(pRedl));
- mpRedlineTbl->Remove( pNewRedl );
+ mpRedlineTable->Insert( pNewRedl );
+ pRedl->Hide(0, mpRedlineTable->GetPos(pRedl));
+ mpRedlineTable->Remove( pNewRedl );
}
}
else
@@ -1413,8 +1413,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
}
}
}
@@ -1426,7 +1426,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
// insert the pNew part (if it exists)
if( pNew )
{
- mpRedlineTbl->Insert( pNew );
+ mpRedlineTable->Insert( pNew );
// pNew must be deleted if Insert() wasn't
// successful. But that can't happen, since pNew is
@@ -1447,8 +1447,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_OVERLAP_BEFORE:
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
bDec = true;
break;
@@ -1460,7 +1460,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_OUTSIDE:
// Overlaps the current one completely or has the
// same dimension, delete the old one
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
break;
@@ -1476,7 +1476,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pRedl->SetEnd( *pStt, pREnd );
if( ( *pStt == *pRStt ) &&
( pRedl->GetContentIdx() == NULL ) )
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
AppendRedline( pNew, bCallDelete );
n = 0; // re-initialize
bDec = true;
@@ -1544,7 +1544,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
{
// Overlaps the current one completely or has the
// same dimension, delete the old one
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
break;
@@ -1563,8 +1563,8 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
// or else only shorten the current one
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl, n );
bDec = true;
}
else
@@ -1591,7 +1591,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl->SetStart( *pRStt, pStt );
else
pNewRedl->SetEnd( *pREnd, pEnd );
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = false;
}
else if( POS_OVERLAP_BEHIND == eCmpPos )
@@ -1603,25 +1603,25 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
case POS_COLLIDE_END:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
pRedl->CanCombine( *pNewRedl ) && n &&
- *(*mpRedlineTbl)[ n-1 ]->End() < *pStt )
+ *(*mpRedlineTable)[ n-1 ]->End() < *pStt )
{
// If that's the case we can merge it, meaning
// the new one covers this well
pNewRedl->SetEnd( *pREnd, pEnd );
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
break;
case POS_COLLIDE_START:
if( pRedl->IsOwnRedline( *pNewRedl ) &&
pRedl->CanCombine( *pNewRedl ) &&
- n+1 < (sal_uInt16)mpRedlineTbl->size() &&
- *(*mpRedlineTbl)[ n+1 ]->Start() < *pEnd )
+ n+1 < (sal_uInt16)mpRedlineTable->size() &&
+ *(*mpRedlineTable)[ n+1 ]->Start() < *pEnd )
{
// If that's the case we can merge it, meaning
// the new one covers this well
pNewRedl->SetStart( *pRStt, pStt );
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
bDec = true;
}
break;
@@ -1652,7 +1652,7 @@ bool DocumentRedlineManager::AppendRedline( SwRangeRedline* pNewRedl, bool bCall
pNewRedl = 0;
}
else
- mpRedlineTbl->Insert( pNewRedl );
+ mpRedlineTable->Insert( pNewRedl );
}
if( bCompress )
@@ -1695,7 +1695,7 @@ bool DocumentRedlineManager::AppendTableRowRedline( SwTableRowRedline* pNewRedl,
// Make equivalent of 'AppendRedline' checks inside here too
- mpExtraRedlineTbl->Insert( pNewRedl );
+ mpExtraRedlineTable->Insert( pNewRedl );
}
else
{
@@ -1740,7 +1740,7 @@ bool DocumentRedlineManager::AppendTableCellRedline( SwTableCellRedline* pNewRed
// Make equivalent of 'AppendRedline' checks inside here too
- mpExtraRedlineTbl->Insert( pNewRedl );
+ mpExtraRedlineTable->Insert( pNewRedl );
}
else
{
@@ -1782,10 +1782,10 @@ void DocumentRedlineManager::CompressRedlines()
}
// Try to merge identical ones
- for( sal_uInt16 n = 1; n < mpRedlineTbl->size(); ++n )
+ for( sal_uInt16 n = 1; n < mpRedlineTable->size(); ++n )
{
- SwRangeRedline* pPrev = (*mpRedlineTbl)[ n-1 ],
- * pCur = (*mpRedlineTbl)[ n ];
+ SwRangeRedline* pPrev = (*mpRedlineTable)[ n-1 ],
+ * pCur = (*mpRedlineTable)[ n ];
const SwPosition* pPrevStt = pPrev->Start(),
* pPrevEnd = pPrevStt == pPrev->GetPoint()
? pPrev->GetMark() : pPrev->GetPoint();
@@ -1803,7 +1803,7 @@ void DocumentRedlineManager::CompressRedlines()
pCur->Show(0, n);
pPrev->SetEnd( *pCur->End() );
- mpRedlineTbl->DeleteAndDestroy( n );
+ mpRedlineTable->DeleteAndDestroy( n );
--n;
if( pFnc )
(pPrev->*pFnc)(0, nPrevIndex);
@@ -1811,7 +1811,7 @@ void DocumentRedlineManager::CompressRedlines()
}
_CHECK_REDLINE( *this )
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
@@ -1821,9 +1821,9 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
const SwPosition* pStt = rRange.Start();
const SwPosition* pEnd = rRange.End();
GetRedline( *pStt, &n );
- for ( ; n < mpRedlineTbl->size(); ++n)
+ for ( ; n < mpRedlineTable->size(); ++n)
{
- SwRangeRedline * pRedline = (*mpRedlineTbl)[ n ];
+ SwRangeRedline * pRedline = (*mpRedlineTable)[ n ];
SwPosition *const pRedlineStart = pRedline->Start();
SwPosition *const pRedlineEnd = pRedline->End();
if (*pRedlineStart <= *pStt && *pStt <= *pRedlineEnd &&
@@ -1855,25 +1855,25 @@ bool DocumentRedlineManager::SplitRedline( const SwPaM& rRange )
case 3:
pRedline->InvalidateRange();
- mpRedlineTbl->DeleteAndDestroy( n-- );
+ mpRedlineTable->DeleteAndDestroy( n-- );
pRedline = nullptr;
break;
}
if (pRedline && !pRedline->HasValidRange())
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedline, n );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedline, n );
}
if( pNew )
- mpRedlineTbl->Insert( pNew, n );
+ mpRedlineTable->Insert( pNew, n );
}
else if (*pEnd < *pRedlineStart)
break;
}
return bChg;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUndo,
@@ -1901,9 +1901,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
: rRange.GetPoint();
sal_uInt16 n = 0;
GetRedline( *pStt, &n );
- for( ; n < mpRedlineTbl->size() ; ++n )
+ for( ; n < mpRedlineTable->size() ; ++n )
{
- SwRangeRedline* pRedl = (*mpRedlineTbl)[ n ];
+ SwRangeRedline* pRedl = (*mpRedlineTable)[ n ];
if( USHRT_MAX != nDelType && nDelType != pRedl->GetType() )
continue;
@@ -1915,7 +1915,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
case POS_EQUAL:
case POS_OUTSIDE:
pRedl->InvalidateRange();
- mpRedlineTbl->DeleteAndDestroy( n-- );
+ mpRedlineTable->DeleteAndDestroy( n-- );
bChg = true;
break;
@@ -1923,8 +1923,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
pRedl->InvalidateRange();
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
--n;
break;
@@ -1934,8 +1934,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
--n;
}
break;
@@ -1948,8 +1948,8 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
{
pRedl->SetStart( *pEnd, pRStt );
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
--n;
}
else
@@ -1966,19 +1966,19 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
if( !pRedl->HasValidRange() )
{
// re-insert
- mpRedlineTbl->Remove( n );
- mpRedlineTbl->Insert( pRedl );
+ mpRedlineTable->Remove( n );
+ mpRedlineTable->Insert( pRedl );
--n;
}
if( pCpy )
- mpRedlineTbl->Insert( pCpy );
+ mpRedlineTable->Insert( pCpy );
}
}
break;
case POS_COLLIDE_END:
case POS_BEFORE:
- n = mpRedlineTbl->size();
+ n = mpRedlineTable->size();
break;
default:
break;
@@ -1990,7 +1990,7 @@ bool DocumentRedlineManager::DeleteRedline( const SwPaM& rRange, bool bSaveInUnd
return bChg;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSaveInUndo,
@@ -2003,9 +2003,9 @@ bool DocumentRedlineManager::DeleteRedline( const SwStartNode& rNode, bool bSave
sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16 nType ) const
{
const sal_uLong nNdIdx = rNd.GetIndex();
- for( sal_uInt16 n = 0; n < mpRedlineTbl->size() ; ++n )
+ for( sal_uInt16 n = 0; n < mpRedlineTable->size() ; ++n )
{
- const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+ const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
nMk = pTmp->GetMark()->nNode.GetIndex();
if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; }
@@ -2019,20 +2019,20 @@ sal_uInt16 DocumentRedlineManager::GetRedlinePos( const SwNode& rNd, sal_uInt16
}
return USHRT_MAX;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos,
sal_uInt16* pFndPos ) const
{
- sal_uInt16 nO = mpRedlineTbl->size(), nM, nU = 0;
+ sal_uInt16 nO = mpRedlineTable->size(), nM, nU = 0;
if( nO > 0 )
{
nO--;
while( nU <= nO )
{
nM = nU + ( nO - nU ) / 2;
- const SwRangeRedline* pRedl = (*mpRedlineTbl)[ nM ];
+ const SwRangeRedline* pRedl = (*mpRedlineTable)[ nM ];
const SwPosition* pStt = pRedl->Start();
const SwPosition* pEnd = pStt == pRedl->GetPoint()
? pRedl->GetMark()
@@ -2041,11 +2041,11 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
? *pStt == rPos
: ( *pStt <= rPos && rPos < *pEnd ) )
{
- while( nM && rPos == *(*mpRedlineTbl)[ nM - 1 ]->End() &&
- rPos == *(*mpRedlineTbl)[ nM - 1 ]->Start() )
+ while( nM && rPos == *(*mpRedlineTable)[ nM - 1 ]->End() &&
+ rPos == *(*mpRedlineTable)[ nM - 1 ]->Start() )
{
--nM;
- pRedl = (*mpRedlineTbl)[ nM ];
+ pRedl = (*mpRedlineTable)[ nM ];
}
// if there are format and insert changes in the same position
// show insert change first.
@@ -2053,19 +2053,19 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
// before and after the current redline
if( nsRedlineType_t::REDLINE_FORMAT == pRedl->GetType() )
{
- if( nM && rPos >= *(*mpRedlineTbl)[ nM - 1 ]->Start() &&
- rPos <= *(*mpRedlineTbl)[ nM - 1 ]->End() &&
- ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM - 1 ]->GetType() ) )
+ if( nM && rPos >= *(*mpRedlineTable)[ nM - 1 ]->Start() &&
+ rPos <= *(*mpRedlineTable)[ nM - 1 ]->End() &&
+ ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM - 1 ]->GetType() ) )
{
--nM;
- pRedl = (*mpRedlineTbl)[ nM ];
+ pRedl = (*mpRedlineTable)[ nM ];
}
- else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTbl)[ nM + 1 ]->Start() &&
- rPos <= *(*mpRedlineTbl)[ nM + 1 ]->End() &&
- ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTbl)[ nM + 1 ]->GetType() ) )
+ else if( ( nM + 1 ) <= nO && rPos >= *(*mpRedlineTable)[ nM + 1 ]->Start() &&
+ rPos <= *(*mpRedlineTable)[ nM + 1 ]->End() &&
+ ( nsRedlineType_t::REDLINE_INSERT == (*mpRedlineTable)[ nM + 1 ]->GetType() ) )
{
++nM;
- pRedl = (*mpRedlineTbl)[ nM ];
+ pRedl = (*mpRedlineTable)[ nM ];
}
}
@@ -2089,7 +2089,7 @@ const SwRangeRedline* DocumentRedlineManager::GetRedline( const SwPosition& rPos
*pFndPos = nU;
return 0;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2101,7 +2101,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
(nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
- SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+ SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
if( pTmp->HasMark() && pTmp->IsVisible() )
{
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2123,19 +2123,19 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
}
- bRet |= lcl_AcceptRedline( *mpRedlineTbl, nPos, bCallDelete );
+ bRet |= lcl_AcceptRedline( *mpRedlineTable, nPos, bCallDelete );
if( nSeqNo )
{
if( USHRT_MAX == nPos )
nPos = 0;
sal_uInt16 nFndPos = 2 == nLoopCnt
- ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
- : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+ ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+ : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
USHRT_MAX != ( nFndPos =
- mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
- pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+ mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+ pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
else
nLoopCnt = 0;
}
@@ -2157,7 +2157,7 @@ bool DocumentRedlineManager::AcceptRedline( sal_uInt16 nPos, bool bCallDelete )
}
return bRet;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2179,7 +2179,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoAcceptRedline( aPam ));
}
- int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTbl,
+ int nRet = lcl_AcceptRejectRedl( lcl_AcceptRedline, *mpRedlineTable,
bCallDelete, aPam );
if( nRet > 0 )
{
@@ -2203,7 +2203,7 @@ bool DocumentRedlineManager::AcceptRedline( const SwPaM& rPam, bool bCallDelete
}
return nRet != 0;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
@@ -2215,7 +2215,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
(nsRedlineMode_t::REDLINE_SHOW_MASK & meRedlineMode) )
SetRedlineMode( (RedlineMode_t)(nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE | meRedlineMode));
- SwRangeRedline* pTmp = (*mpRedlineTbl)[ nPos ];
+ SwRangeRedline* pTmp = (*mpRedlineTable)[ nPos ];
if( pTmp->HasMark() && pTmp->IsVisible() )
{
if (m_rDoc.GetIDocumentUndoRedo().DoesUndo())
@@ -2237,19 +2237,19 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
m_rDoc.GetIDocumentUndoRedo().AppendUndo(pUndo);
}
- bRet |= lcl_RejectRedline( *mpRedlineTbl, nPos, bCallDelete );
+ bRet |= lcl_RejectRedline( *mpRedlineTable, nPos, bCallDelete );
if( nSeqNo )
{
if( USHRT_MAX == nPos )
nPos = 0;
sal_uInt16 nFndPos = 2 == nLoopCnt
- ? mpRedlineTbl->FindNextSeqNo( nSeqNo, nPos )
- : mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos );
+ ? mpRedlineTable->FindNextSeqNo( nSeqNo, nPos )
+ : mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos );
if( USHRT_MAX != nFndPos || ( 0 != ( --nLoopCnt ) &&
USHRT_MAX != ( nFndPos =
- mpRedlineTbl->FindPrevSeqNo( nSeqNo, nPos ))) )
- pTmp = (*mpRedlineTbl)[ nPos = nFndPos ];
+ mpRedlineTable->FindPrevSeqNo( nSeqNo, nPos ))) )
+ pTmp = (*mpRedlineTable)[ nPos = nFndPos ];
else
nLoopCnt = 0;
}
@@ -2271,7 +2271,7 @@ bool DocumentRedlineManager::RejectRedline( sal_uInt16 nPos, bool bCallDelete )
}
return bRet;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete )
@@ -2293,7 +2293,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
m_rDoc.GetIDocumentUndoRedo().AppendUndo( new SwUndoRejectRedline(aPam) );
}
- int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTbl,
+ int nRet = lcl_AcceptRejectRedl( lcl_RejectRedline, *mpRedlineTable,
bCallDelete, aPam );
if( nRet > 0 )
{
@@ -2318,7 +2318,7 @@ bool DocumentRedlineManager::RejectRedline( const SwPaM& rPam, bool bCallDelete
return nRet != 0;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) const
@@ -2333,14 +2333,14 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
// If the starting position points to the last valid ContentNode,
// we take the next Redline in any case.
sal_uInt16 n = 0;
- const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, true );
+ const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, true );
if( pFnd )
{
const SwPosition* pEnd = pFnd->End();
- if( !pEnd->nNode.GetNode().IsCntntNode() )
+ if( !pEnd->nNode.GetNode().IsContentNode() )
{
SwNodeIndex aTmp( pEnd->nNode );
- SwCntntNode* pCNd = SwNodes::GoPrevSection( &aTmp );
+ SwContentNode* pCNd = SwNodes::GoPrevSection( &aTmp );
if( !pCNd || ( aTmp == rSttPos.nNode &&
pCNd->Len() == rSttPos.nContent.GetIndex() ))
pFnd = 0;
@@ -2352,9 +2352,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
do {
bRestart = false;
- for( ; !pFnd && n < mpRedlineTbl->size(); ++n )
+ for( ; !pFnd && n < mpRedlineTable->size(); ++n )
{
- pFnd = (*mpRedlineTbl)[ n ];
+ pFnd = (*mpRedlineTable)[ n ];
if( pFnd->HasMark() && pFnd->IsVisible() )
{
*rPam.GetMark() = *pFnd->Start();
@@ -2370,9 +2370,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
// Merge all of the same type and author that are
// consecutive into one Selection.
const SwPosition* pPrevEnd = pFnd->End();
- while( ++n < mpRedlineTbl->size() )
+ while( ++n < mpRedlineTable->size() )
{
- const SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+ const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
if( pTmp->HasMark() && pTmp->IsVisible() )
{
const SwPosition *pRStt;
@@ -2394,9 +2394,9 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
{
const SwRangeRedline* pSaveFnd = pFnd;
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
{
if( *pIdx <= rPam.GetPoint()->nNode )
@@ -2408,7 +2408,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
if( pFnd )
{
pIdx = &rPam.GetPoint()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
{
if( *pIdx >= rPam.GetMark()->nNode )
@@ -2420,7 +2420,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
if( !pFnd || *rPam.GetMark() == *rPam.GetPoint() )
{
- if( n < mpRedlineTbl->size() )
+ if( n < mpRedlineTable->size() )
{
bRestart = true;
*rPam.GetPoint() = *pSaveFnd->End();
@@ -2437,7 +2437,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
return pFnd;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) const
@@ -2452,14 +2452,14 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
// If the starting position points to the last valid ContentNode,
// we take the previous Redline in any case.
sal_uInt16 n = 0;
- const SwRangeRedline* pFnd = GetRedlineTbl().FindAtPosition( rSttPos, n, false );
+ const SwRangeRedline* pFnd = GetRedlineTable().FindAtPosition( rSttPos, n, false );
if( pFnd )
{
const SwPosition* pStt = pFnd->Start();
- if( !pStt->nNode.GetNode().IsCntntNode() )
+ if( !pStt->nNode.GetNode().IsContentNode() )
{
SwNodeIndex aTmp( pStt->nNode );
- SwCntntNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
+ SwContentNode* pCNd = m_rDoc.GetNodes().GoNextSection( &aTmp );
if( !pCNd || ( aTmp == rSttPos.nNode &&
!rSttPos.nContent.GetIndex() ))
pFnd = 0;
@@ -2473,7 +2473,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
while( !pFnd && 0 < n )
{
- pFnd = (*mpRedlineTbl)[ --n ];
+ pFnd = (*mpRedlineTable)[ --n ];
if( pFnd->HasMark() && pFnd->IsVisible() )
{
*rPam.GetMark() = *pFnd->End();
@@ -2490,7 +2490,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
const SwPosition* pNextStt = pFnd->Start();
while( 0 < n )
{
- const SwRangeRedline* pTmp = (*mpRedlineTbl)[ --n ];
+ const SwRangeRedline* pTmp = (*mpRedlineTable)[ --n ];
if( pTmp->HasMark() && pTmp->IsVisible() )
{
const SwPosition *pREnd;
@@ -2515,9 +2515,9 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
{
const SwRangeRedline* pSaveFnd = pFnd;
- SwCntntNode* pCNd;
+ SwContentNode* pCNd;
SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
{
if( *pIdx >= rPam.GetPoint()->nNode )
@@ -2529,7 +2529,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
if( pFnd )
{
pIdx = &rPam.GetPoint()->nNode;
- if( !pIdx->GetNode().IsCntntNode() &&
+ if( !pIdx->GetNode().IsContentNode() &&
0 != ( pCNd = m_rDoc.GetNodes().GoNextSection( pIdx )) )
{
if( *pIdx <= rPam.GetMark()->nNode )
@@ -2558,7 +2558,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
return pFnd;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
// Set comment at the Redline
@@ -2569,12 +2569,12 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
* pEnd = pStt == rPaM.GetPoint() ? rPaM.GetMark()
: rPaM.GetPoint();
sal_uInt16 n = 0;
- if( GetRedlineTbl().FindAtPosition( *pStt, n, true ) )
+ if( GetRedlineTable().FindAtPosition( *pStt, n, true ) )
{
- for( ; n < mpRedlineTbl->size(); ++n )
+ for( ; n < mpRedlineTable->size(); ++n )
{
bRet = true;
- SwRangeRedline* pTmp = (*mpRedlineTbl)[ n ];
+ SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
if( pStt != pEnd && *pTmp->Start() > *pEnd )
break;
@@ -2588,7 +2588,7 @@ bool DocumentRedlineManager::SetRedlineComment( const SwPaM& rPaM, const OUStrin
return bRet;
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
// Create a new author if necessary
@@ -2605,15 +2605,15 @@ sal_uInt16 DocumentRedlineManager::InsertRedlineAuthor( const OUString& rNew )
void DocumentRedlineManager::UpdateRedlineAttr()
{
- const SwRedlineTbl& rTbl = GetRedlineTbl();
- for( sal_uInt16 n = 0; n < rTbl.size(); ++n )
+ const SwRedlineTable& rTable = GetRedlineTable();
+ for( sal_uInt16 n = 0; n < rTable.size(); ++n )
{
- SwRangeRedline* pRedl = rTbl[ n ];
+ SwRangeRedline* pRedl = rTable[ n ];
if( pRedl->IsVisible() )
pRedl->InvalidateRange();
}
- // #TODO - add 'SwExtraRedlineTbl' also ?
+ // #TODO - add 'SwExtraRedlineTable' also ?
}
const uno::Sequence <sal_Int8>& DocumentRedlineManager::GetRedlinePassword() const
@@ -2632,30 +2632,30 @@ void DocumentRedlineManager::SetRedlinePassword(
/// AppendRedline. Is used by Autoformat.
/// A null pointer resets the mode. The pointer is not copied, so it
/// needs to stay valid!
-void DocumentRedlineManager::SetAutoFmtRedlineComment( const OUString* pTxt, sal_uInt16 nSeqNo )
+void DocumentRedlineManager::SetAutoFormatRedlineComment( const OUString* pText, sal_uInt16 nSeqNo )
{
- m_rDoc.SetAutoFmtRedline( 0 != pTxt );
- if( pTxt )
+ m_rDoc.SetAutoFormatRedline( 0 != pText );
+ if( pText )
{
- if( !mpAutoFmtRedlnComment )
- mpAutoFmtRedlnComment = new OUString( *pTxt );
+ if( !mpAutoFormatRedlnComment )
+ mpAutoFormatRedlnComment = new OUString( *pText );
else
- *mpAutoFmtRedlnComment = *pTxt;
+ *mpAutoFormatRedlnComment = *pText;
}
else
- delete mpAutoFmtRedlnComment, mpAutoFmtRedlnComment = 0;
+ delete mpAutoFormatRedlnComment, mpAutoFormatRedlnComment = 0;
- mnAutoFmtRedlnCommentNo = nSeqNo;
+ mnAutoFormatRedlnCommentNo = nSeqNo;
}
#define MAX_REDLINE_COUNT 250
void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
{
- const SwRedlineTbl& rRedlineTbl = GetRedlineTbl();
+ const SwRedlineTable& rRedlineTable = GetRedlineTable();
SwEditShell* pEditShell = m_rDoc.GetEditShell();
vcl::Window* pParent = pEditShell ? pEditShell->GetWin() : NULL;
- if ( pParent && !mbReadlineChecked && rRedlineTbl.size() > MAX_REDLINE_COUNT
+ if ( pParent && !mbReadlineChecked && rRedlineTable.size() > MAX_REDLINE_COUNT
&& !((_rReadlineMode & nsRedlineMode_t::REDLINE_SHOW_DELETE) == nsRedlineMode_t::REDLINE_SHOW_DELETE) )
{
ScopedVclPtrInstance< MessageDialog > aQuery(pParent, "QueryShowChangesDialog", "modules/swriter/ui/queryshowchangesdialog.ui");
@@ -2672,9 +2672,9 @@ void DocumentRedlineManager::checkRedlining(RedlineMode_t& _rReadlineMode)
DocumentRedlineManager::~DocumentRedlineManager()
{
- delete mpRedlineTbl; mpRedlineTbl = 0;
- delete mpExtraRedlineTbl; mpExtraRedlineTbl = 0;
- delete mpAutoFmtRedlnComment; mpAutoFmtRedlnComment = 0;
+ delete mpRedlineTable; mpRedlineTable = 0;
+ delete mpExtraRedlineTable; mpExtraRedlineTable = 0;
+ delete mpAutoFormatRedlnComment; mpAutoFormatRedlnComment = 0;
}
}
diff --git a/sw/source/core/doc/DocumentSettingManager.cxx b/sw/source/core/doc/DocumentSettingManager.cxx
index 83ba90f99e78..6970d1f8044e 100644
--- a/sw/source/core/doc/DocumentSettingManager.cxx
+++ b/sw/source/core/doc/DocumentSettingManager.cxx
@@ -39,7 +39,7 @@
sw::DocumentSettingManager::DocumentSettingManager(SwDoc &rDoc)
:m_rDoc(rDoc),
mnLinkUpdMode( GLOBALSETTING ),
- meFldUpdMode( AUTOUPD_GLOBALSETTING ),
+ meFieldUpdMode( AUTOUPD_GLOBALSETTING ),
meChrCmprType( CHARCOMPRESS_NONE ),
mn32DummyCompatibilityOptions1(0),
mn32DummyCompatibilityOptions2(0),
@@ -210,9 +210,9 @@ void sw::DocumentSettingManager::set(/*[in]*/ DocumentSettingId id, /*[in]*/ boo
{
mbOldNumbering = value;
- const SwNumRuleTbl& rNmTbl = m_rDoc.GetNumRuleTbl();
- for( SwNumRuleTbl::size_type n = 0; n < rNmTbl.size(); ++n )
- rNmTbl[n]->SetInvalidRule(true);
+ const SwNumRuleTable& rNmTable = m_rDoc.GetNumRuleTable();
+ for( SwNumRuleTable::size_type n = 0; n < rNmTable.size(); ++n )
+ rNmTable[n]->SetInvalidRule(true);
m_rDoc.UpdateNumRule();
@@ -417,7 +417,7 @@ void sw::DocumentSettingManager::setForbiddenCharacters(/*[in]*/ sal_uInt16 nLan
{
pTmpRoot->StartAllAction();
std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
pTmpRoot->EndAllAction();
}
m_rDoc.getIDocumentState().SetModified();
@@ -450,17 +450,17 @@ void sw::DocumentSettingManager::setLinkUpdateMode( /*[in]*/sal_uInt16 eMode )
mnLinkUpdMode = eMode;
}
-SwFldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
+SwFieldUpdateFlags sw::DocumentSettingManager::getFieldUpdateFlags( /*[in]*/bool bGlobalSettings ) const
{
- SwFldUpdateFlags eRet = meFldUpdMode;
+ SwFieldUpdateFlags eRet = meFieldUpdMode;
if( bGlobalSettings && AUTOUPD_GLOBALSETTING == eRet )
- eRet = SW_MOD()->GetFldUpdateFlags(get(DocumentSettingId::HTML_MODE));
+ eRet = SW_MOD()->GetFieldUpdateFlags(get(DocumentSettingId::HTML_MODE));
return eRet;
}
-void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFldUpdateFlags eMode )
+void sw::DocumentSettingManager::setFieldUpdateFlags(/*[in]*/SwFieldUpdateFlags eMode )
{
- meFldUpdMode = eMode;
+ meFieldUpdMode = eMode;
}
SwCharCompressType sw::DocumentSettingManager::getCharacterCompressionType() const
@@ -487,7 +487,7 @@ void sw::DocumentSettingManager::setCharacterCompressionType( /*[in]*/SwCharComp
{
pTmpRoot->StartAllAction();
std::set<SwRootFrm*> aAllLayouts = m_rDoc.GetAllLayouts();
- std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllCntnt), INV_SIZE));
+ std::for_each( aAllLayouts.begin(), aAllLayouts.end(), std::bind2nd(std::mem_fun(&SwRootFrm::InvalidateAllContent), INV_SIZE));
pTmpRoot->EndAllAction();
}
m_rDoc.getIDocumentState().SetModified();
diff --git a/sw/source/core/doc/DocumentStateManager.cxx b/sw/source/core/doc/DocumentStateManager.cxx
index 1e55f30d8d0e..601525073574 100644
--- a/sw/source/core/doc/DocumentStateManager.cxx
+++ b/sw/source/core/doc/DocumentStateManager.cxx
@@ -31,7 +31,7 @@ DocumentStateManager::DocumentStateManager( SwDoc& i_rSwdoc ) :
m_rDoc( i_rSwdoc ),
mbModified(false),
mbLoaded(false),
- mbUpdateExpFld(false),
+ mbUpdateExpField(false),
mbNewDoc(false),
mbPageNums(false),
mbInCallModified(false)
@@ -89,9 +89,9 @@ bool DocumentStateManager::IsLoaded() const
return mbLoaded;
}
-bool DocumentStateManager::IsUpdateExpFld() const
+bool DocumentStateManager::IsUpdateExpField() const
{
- return mbUpdateExpFld;
+ return mbUpdateExpField;
}
bool DocumentStateManager::IsNewDoc() const
@@ -114,9 +114,9 @@ void DocumentStateManager::SetNewDoc(bool b)
mbNewDoc = b;
}
-void DocumentStateManager::SetUpdateExpFldStat(bool b)
+void DocumentStateManager::SetUpdateExpFieldStat(bool b)
{
- mbUpdateExpFld = b;
+ mbUpdateExpField = b;
}
void DocumentStateManager::SetLoaded(bool b)
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 5f231eca35fd..4fed190ea0e8 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -79,8 +79,8 @@ DocumentStatisticsManager::DocumentStatisticsManager( SwDoc& i_rSwdoc ) : m_rDoc
void DocumentStatisticsManager::DocInfoChgd( )
{
- m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_DOCINFOFLD )->UpdateFlds();
- m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_TEMPLNAMEFLD )->UpdateFlds();
+ m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_DOCINFOFLD )->UpdateFields();
+ m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_TEMPLNAMEFLD )->UpdateFields();
m_rDoc.getIDocumentState().SetModified();
}
@@ -140,14 +140,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
case ND_TEXTNODE:
{
long const nOldChars(mpDocStat->nChar);
- SwTxtNode *pTxt = static_cast< SwTxtNode * >( pNd );
- if (pTxt->CountWords(*mpDocStat, 0, pTxt->GetTxt().getLength()))
+ SwTextNode *pText = static_cast< SwTextNode * >( pNd );
+ if (pText->CountWords(*mpDocStat, 0, pText->GetText().getLength()))
{
nChars -= (mpDocStat->nChar - nOldChars);
}
break;
}
- case ND_TABLENODE: ++mpDocStat->nTbl; break;
+ case ND_TABLENODE: ++mpDocStat->nTable; break;
case ND_GRFNODE: ++mpDocStat->nGrf; break;
case ND_OLENODE: ++mpDocStat->nOLE; break;
case ND_SECTIONNODE: break;
@@ -156,14 +156,14 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
// #i93174#: notes contain paragraphs that are not nodes
{
- SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_POSTITFLD) );
- SwIterator<SwFmtFld,SwFieldType> aIter( *pPostits );
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ SwFieldType * const pPostits( m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_POSTITFLD) );
+ SwIterator<SwFormatField,SwFieldType> aIter( *pPostits );
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
{
- if (pFmtFld->IsFldInDoc())
+ if (pFormatField->IsFieldInDoc())
{
SwPostItField const * const pField(
- static_cast<SwPostItField const*>(pFmtFld->GetField()));
+ static_cast<SwPostItField const*>(pFormatField->GetField()));
mpDocStat->nAllPara += pField->GetNumberOfParagraphs();
}
}
@@ -175,7 +175,7 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aStat( mpDocStat->nPage ? 8 : 7);
sal_Int32 n=0;
aStat[n].Name = "TableCount";
- aStat[n++].Value <<= (sal_Int32)mpDocStat->nTbl;
+ aStat[n++].Value <<= (sal_Int32)mpDocStat->nTable;
aStat[n].Name = "ImageCount";
aStat[n++].Value <<= (sal_Int32)mpDocStat->nGrf;
aStat[n].Name = "ObjectCount";
@@ -218,8 +218,8 @@ bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
// optionally update stat. fields
if (bFields)
{
- SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFldType(RES_DOCSTATFLD);
- pType->UpdateFlds();
+ SwFieldType *pType = m_rDoc.getIDocumentFieldsAccess().GetSysFieldType(RES_DOCSTATFLD);
+ pType->UpdateFields();
}
return nChars < 0;
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index b9403e8e38b1..f652f56d1670 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -94,11 +94,11 @@ namespace
{
// Make sure that the printer settings are taken over to the standard
// page style
- const SwFrmFmt& rPgDscFmt = rDoc.GetPageDesc( 0 ).GetMaster();
- const SvxLRSpaceItem& rLR = rPgDscFmt.GetLRSpace();
+ const SwFrameFormat& rPgDscFormat = rDoc.GetPageDesc( 0 ).GetMaster();
+ const SvxLRSpaceItem& rLR = rPgDscFormat.GetLRSpace();
const long nLeft = rLR.GetLeft();
const long nRight = rLR.GetRight();
- const long nWidth = rPgDscFmt.GetFrmSize().GetWidth();
+ const long nWidth = rPgDscFormat.GetFrmSize().GetWidth();
return nWidth - nLeft - nRight;
}
@@ -154,7 +154,7 @@ namespace
}
}
- static void lcl_SetHeadline( SwDoc* pDoc, SwTxtFmtColl* pColl,
+ static void lcl_SetHeadline( SwDoc* pDoc, SwTextFormatColl* pColl,
SfxItemSet& rSet,
sal_uInt16 nOutLvlBits, sal_uInt8 nLevel, bool bItalic )
{
@@ -184,16 +184,16 @@ namespace
if( !bHTMLMode )
{
SwNumRule * pOutlineRule = pDoc->GetOutlineNumRule();
- const SwNumFmt& rNFmt = pOutlineRule->Get( nLevel );
+ const SwNumFormat& rNFormat = pOutlineRule->Get( nLevel );
- if ( rNFmt.GetPositionAndSpaceMode() ==
+ if ( rNFormat.GetPositionAndSpaceMode() ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION &&
- ( rNFmt.GetAbsLSpace() || rNFmt.GetFirstLineOffset() ) )
+ ( rNFormat.GetAbsLSpace() || rNFormat.GetFirstLineOffset() ) )
{
- SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFmtAttr( RES_LR_SPACE )) );
- aLR.SetTxtFirstLineOfstValue( rNFmt.GetFirstLineOffset() );
- aLR.SetTxtLeft( rNFmt.GetAbsLSpace() );
- pColl->SetFmtAttr( aLR );
+ SvxLRSpaceItem aLR( static_cast<const SvxLRSpaceItem&>(pColl->GetFormatAttr( RES_LR_SPACE )) );
+ aLR.SetTextFirstLineOfstValue( rNFormat.GetFirstLineOffset() );
+ aLR.SetTextLeft( rNFormat.GetAbsLSpace() );
+ pColl->SetFormatAttr( aLR );
}
// #i71764#
@@ -203,11 +203,11 @@ namespace
{
SwNumRuleItem aItem(pOutlineRule->GetName());
- pColl->SetFmtAttr(aItem);
+ pColl->SetFormatAttr(aItem);
}
}
}
- pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool(
+ pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool(
RES_POOLCOLL_TEXT ));
}
}
@@ -217,7 +217,7 @@ namespace
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
sal_uInt16 nLeft = nFact ? GetMetricVal( CM_05 ) * nFact : 0;
- aLR.SetTxtLeft( nLeft );
+ aLR.SetTextLeft( nLeft );
rSet.Put( aLR );
if( bHeader )
@@ -236,26 +236,26 @@ namespace
}
}
- static void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
+ static void lcl_SetNumBul( SwDoc* pDoc, SwTextFormatColl* pColl,
SfxItemSet& rSet,
sal_uInt16 nNxt, SwTwips nEZ, SwTwips nLeft,
SwTwips nUpper, SwTwips nLower )
{
SvxLRSpaceItem aLR( RES_LR_SPACE ); SvxULSpaceItem aUL( RES_UL_SPACE );
- aLR.SetTxtFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTxtLeft( sal_uInt16(nLeft) );
+ aLR.SetTextFirstLineOfst( sal_uInt16(nEZ) ); aLR.SetTextLeft( sal_uInt16(nLeft) );
aUL.SetUpper( sal_uInt16(nUpper) ); aUL.SetLower( sal_uInt16(nLower) );
rSet.Put( aLR );
rSet.Put( aUL );
if( pColl )
- pColl->SetNextTxtFmtColl( *pDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nNxt ));
+ pColl->SetNextTextFormatColl( *pDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nNxt ));
}
static void lcl_PutStdPageSizeIntoItemSet( SwDoc* pDoc, SfxItemSet& rSet )
{
SwPageDesc* pStdPgDsc = pDoc->getIDocumentStylePoolAccess().GetPageDescFromPool( RES_POOLPAGE_STANDARD );
- SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+ SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
if( pStdPgDsc->GetLandscape() )
{
SwTwips nTmp = aFrmSz.GetHeight();
@@ -274,7 +274,7 @@ DocumentStylePoolManager::DocumentStylePoolManager( SwDoc& i_rSwdoc ) : m_rDoc(
{
}
-SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
+SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
{
OSL_ENSURE(
(RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -285,11 +285,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
(RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
"Wrong AutoFormat Id" );
- SwTxtFmtColl* pNewColl;
+ SwTextFormatColl* pNewColl;
sal_uInt16 nOutLvlBits = 0;
- for( sal_uInt16 n = 0; n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+ for( sal_uInt16 n = 0; n < m_rDoc.GetTextFormatColls()->size(); ++n )
{
- if( nId == ( pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ] )->GetPoolFmtId() )
+ if( nId == ( pNewColl = (*m_rDoc.GetTextFormatColls())[ n ] )->GetPoolFormatId() )
{
return pNewColl;
}
@@ -315,29 +315,29 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
OSL_ENSURE( nResId, "Invalid Pool ID" );
if( !nResId )
- return GetTxtCollFromPool( RES_POOLCOLL_STANDARD );
+ return GetTextCollFromPool( RES_POOLCOLL_STANDARD );
ResId aResId( nResId + nId, *pSwResMgr );
OUString aNm( aResId );
// A Set for all to-be-set Attributes
- SwAttrSet aSet( m_rDoc.GetAttrPool(), aTxtFmtCollSetRange );
+ SwAttrSet aSet( m_rDoc.GetAttrPool(), aTextFormatCollSetRange );
sal_uInt16 nParent = GetPoolParent( nId );
{
//FEATURE::CONDCOLL
if(::IsConditionalByPoolId( nId ))
- pNewColl = new SwConditionTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
- ? m_rDoc.GetDfltTxtFmtColl()
- : GetTxtCollFromPool( nParent ));
+ pNewColl = new SwConditionTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+ ? m_rDoc.GetDfltTextFormatColl()
+ : GetTextCollFromPool( nParent ));
else
//FEATURE::CONDCOLL
- pNewColl = new SwTxtFmtColl( m_rDoc.GetAttrPool(), aNm, !nParent
- ? m_rDoc.GetDfltTxtFmtColl()
- : GetTxtCollFromPool( nParent ));
- pNewColl->SetPoolFmtId( nId );
- m_rDoc.GetTxtFmtColls()->push_back( pNewColl );
+ pNewColl = new SwTextFormatColl( m_rDoc.GetAttrPool(), aNm, !nParent
+ ? m_rDoc.GetDfltTextFormatColl()
+ : GetTextCollFromPool( nParent ));
+ pNewColl->SetPoolFormatId( nId );
+ m_rDoc.GetTextFormatColls()->push_back( pNewColl );
}
bool bNoDefault = m_rDoc.GetDocumentSettingManager().get( DocumentSettingId::STYLES_NODEFAULT );
@@ -379,15 +379,15 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TEXT_IDENT: // Text body indentation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtFirstLineOfst( GetMetricVal( CM_05 ));
+ aLR.SetTextFirstLineOfst( GetMetricVal( CM_05 ));
aSet.Put( aLR );
}
break;
case RES_POOLCOLL_TEXT_NEGIDENT: // Text body neg. indentation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtFirstLineOfst( -(short)GetMetricVal( CM_05 ));
- aLR.SetTxtLeft( GetMetricVal( CM_1 ));
+ aLR.SetTextFirstLineOfst( -(short)GetMetricVal( CM_05 ));
+ aLR.SetTextLeft( GetMetricVal( CM_1 ));
SvxTabStopItem aTStops(RES_PARATR_TABSTOP); aTStops.Insert( SvxTabStop( 0 ));
aSet.Put( aLR );
@@ -397,7 +397,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TEXT_MOVE: // Text body move
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtLeft( GetMetricVal( CM_05 ));
+ aLR.SetTextLeft( GetMetricVal( CM_05 ));
aSet.Put( aLR );
}
break;
@@ -405,9 +405,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_CONFRONTATION: // Text body confrontation
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
+ aLR.SetTextFirstLineOfst( - short( GetMetricVal( CM_1 ) * 4 +
GetMetricVal( CM_05)) );
- aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 5 );
+ aLR.SetTextLeft( GetMetricVal( CM_1 ) * 5 );
SvxTabStopItem aTStops( RES_PARATR_TABSTOP ); aTStops.Insert( SvxTabStop( 0 ));
aSet.Put( aLR );
@@ -417,7 +417,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_MARGINAL: // Text body marginal
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtLeft( GetMetricVal( CM_1 ) * 4 );
+ aLR.SetTextLeft( GetMetricVal( CM_1 ) * 4 );
aSet.Put( aLR );
}
break;
@@ -466,9 +466,9 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
SvxULSpaceItem aUL( PT_12, PT_6, RES_UL_SPACE );
if( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
aUL.SetLower( HTML_PARSPACE );
- aSet.Put( SvxFmtKeepItem( true, RES_KEEP ));
+ aSet.Put( SvxFormatKeepItem( true, RES_KEEP ));
- pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+ pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
aSet.Put( aUL );
SetAllScriptItem( aSet, aFntSize );
@@ -483,7 +483,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_SIGNATURE: // Signatures
case RES_POOLCOLL_TABLE: // Tabele content
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -569,7 +569,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_FOOTERL:
case RES_POOLCOLL_FOOTERR:
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
long nRightMargin = lcl_GetRightMargin( m_rDoc );
@@ -586,7 +586,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
{
SetAllScriptItem( aSet, SvxWeightItem( WEIGHT_BOLD, RES_CHRATR_WEIGHT ) );
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -595,11 +595,11 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_ENDNOTE: // paragraph style Endnote
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
- aLR.SetTxtFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
- aLR.SetTxtLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
+ aLR.SetTextFirstLineOfst( -(short)( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) ) );
+ aLR.SetTextLeft( GetMetricVal( CM_05 ) + GetMetricVal( CM_01 ) );
SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
aSet.Put( aLR );
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -610,7 +610,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
aSet.Put( aUL );
SetAllScriptItem( aSet, SvxPostureItem( ITALIC_NORMAL, RES_CHRATR_POSTURE ) );
SetAllScriptItem( aSet, SvxFontHeightItem( PT_10, 100, RES_CHRATR_FONTSIZE ) );
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -626,7 +626,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
{
SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
aSet.Put( aUL );
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -640,7 +640,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
SvxULSpaceItem aUL( RES_UL_SPACE ); aUL.SetLower( PT_3 );
aSet.Put( aUL );
}
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -649,7 +649,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TOX_USERH: // Header
lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -688,7 +688,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TOX_IDXH: // Header
lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -709,7 +709,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TOX_CNTNTH: // Header
lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -750,7 +750,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
case RES_POOLCOLL_TOX_AUTHORITIESH:
lcl_SetRegister( &m_rDoc, aSet, 0, true, false );
{
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -960,7 +960,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ) );
- pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool( RES_POOLCOLL_TEXT ));
+ pNewColl->SetNextTextFormatColl( *GetTextCollFromPool( RES_POOLCOLL_TEXT ));
}
break;
@@ -972,7 +972,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
aSet.Put( SvxAdjustItem( SVX_ADJUST_CENTER, RES_PARATR_ADJUST ));
- pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+ pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
RES_POOLCOLL_TEXT ));
}
break;
@@ -1019,13 +1019,13 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
SvxULSpaceItem aUL( RES_UL_SPACE );
{
- pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+ pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
RES_POOLCOLL_TEXT ));
aUL = pNewColl->GetULSpace();
}
aUL.SetLower( HTML_PARSPACE );
aSet.Put( aUL);
- SwFmtLineNumber aLN; aLN.SetCountLines( false );
+ SwFormatLineNumber aLN; aLN.SetCountLines( false );
aSet.Put( aLN );
}
break;
@@ -1043,7 +1043,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
{
SvxLRSpaceItem aLR( RES_LR_SPACE );
{
- pNewColl->SetNextTxtFmtColl( *GetTxtCollFromPool(
+ pNewColl->SetNextTextFormatColl( *GetTextCollFromPool(
RES_POOLCOLL_HTML_DD ));
aLR = pNewColl->GetLRSpace();
}
@@ -1058,7 +1058,7 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
if( aSet.Count() )
{
{
- pNewColl->SetFmtAttr( aSet );
+ pNewColl->SetFormatAttr( aSet );
}
}
return pNewColl;
@@ -1066,12 +1066,12 @@ SwTxtFmtColl* DocumentStylePoolManager::GetTxtCollFromPool( sal_uInt16 nId, bool
/// Return the AutomaticFormat with the supplied Id. If it doesn't
/// exist, create it.
-SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
+SwFormat* DocumentStylePoolManager::GetFormatFromPool( sal_uInt16 nId )
{
- SwFmt *pNewFmt = 0;
- SwFmt *pDeriveFmt = 0;
+ SwFormat *pNewFormat = 0;
+ SwFormat *pDeriveFormat = 0;
- SwFmtsBase* pArray[ 2 ];
+ SwFormatsBase* pArray[ 2 ];
sal_uInt16 nArrCnt = 1, nRCId = 0;
sal_uInt16* pWhichRange = 0;
@@ -1079,14 +1079,14 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
{
case POOLGRP_CHARFMT:
{
- pArray[0] = m_rDoc.GetCharFmts();
- pDeriveFmt = m_rDoc.GetDfltCharFmt();
+ pArray[0] = m_rDoc.GetCharFormats();
+ pDeriveFormat = m_rDoc.GetDfltCharFormat();
if( nId > RES_POOLCHR_NORMAL_END )
nRCId = RC_POOLCHRFMT_HTML_BEGIN - RES_POOLCHR_HTML_BEGIN;
else
nRCId = RC_POOLCHRFMT_BEGIN - RES_POOLCHR_BEGIN;
- pWhichRange = aCharFmtSetRange;
+ pWhichRange = aCharFormatSetRange;
// Fault: unknown Format, but a CharFormat
// -> return the first one
@@ -1099,12 +1099,12 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
break;
case POOLGRP_FRAMEFMT:
{
- pArray[0] = m_rDoc.GetFrmFmts();
- pArray[1] = m_rDoc.GetSpzFrmFmts();
- pDeriveFmt = m_rDoc.GetDfltFrmFmt();
+ pArray[0] = m_rDoc.GetFrameFormats();
+ pArray[1] = m_rDoc.GetSpzFrameFormats();
+ pDeriveFormat = m_rDoc.GetDfltFrameFormat();
nArrCnt = 2;
nRCId = RC_POOLFRMFMT_BEGIN - RES_POOLFRM_BEGIN;
- pWhichRange = aFrmFmtSetRange;
+ pWhichRange = aFrameFormatSetRange;
// Fault: unknown Format, but a FrameFormat
// -> return the first one
@@ -1124,11 +1124,11 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
OSL_ENSURE( nRCId, "invalid Id" );
while( nArrCnt-- )
- for( size_t n = 0; n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
- if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
- GetPoolFmtId() )
+ for( size_t n = 0; n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+ if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+ GetPoolFormatId() )
{
- return pNewFmt;
+ return pNewFormat;
}
ResId aResId( nRCId + nId, *pSwResMgr );
@@ -1143,10 +1143,10 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
switch (nId & (COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID) )
{
case POOLGRP_CHARFMT:
- pNewFmt = m_rDoc._MakeCharFmt(aNm, pDeriveFmt, false, true);
+ pNewFormat = m_rDoc._MakeCharFormat(aNm, pDeriveFormat, false, true);
break;
case POOLGRP_FRAMEFMT:
- pNewFmt = m_rDoc._MakeFrmFmt(aNm, pDeriveFmt, false, true);
+ pNewFormat = m_rDoc._MakeFrameFormat(aNm, pDeriveFormat, false, true);
break;
default:
break;
@@ -1155,8 +1155,8 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
if( !bIsModified )
m_rDoc.getIDocumentState().ResetModified();
- pNewFmt->SetPoolFmtId( nId );
- pNewFmt->SetAuto( false ); // no AutoFormat
+ pNewFormat->SetPoolFormatId( nId );
+ pNewFormat->SetAuto( false ); // no AutoFormat
}
switch( nId )
@@ -1258,16 +1258,16 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
{
if ( m_rDoc.GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE) )
{
- aSet.Put( SwFmtAnchor( FLY_AS_CHAR ));
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
- aSet.Put( SwFmtSurround( SURROUND_NONE ) );
+ aSet.Put( SwFormatAnchor( FLY_AS_CHAR ));
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::LINE_CENTER, text::RelOrientation::PRINT_AREA ) );
+ aSet.Put( SwFormatSurround( SURROUND_NONE ) );
}
else
{
- aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
- aSet.Put( SwFmtSurround( SURROUND_PARALLEL ) );
- aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
+ aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+ aSet.Put( SwFormatSurround( SURROUND_PARALLEL ) );
+ aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::PRINT_AREA ) );
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::PRINT_AREA ) );
Color aCol( COL_BLACK );
SvxBorderLine aLine( &aCol, DEF_LINE_WIDTH_0 );
SvxBoxItem aBox( RES_BOX );
@@ -1288,44 +1288,44 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
case RES_POOLFRM_GRAPHIC:
case RES_POOLFRM_OLE:
{
- aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
- aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
- aSet.Put( SwFmtSurround( SURROUND_IDEAL ));
+ aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+ aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatSurround( SURROUND_IDEAL ));
}
break;
case RES_POOLFRM_FORMEL:
{
- aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
+ aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CHAR_CENTER, text::RelOrientation::FRAME ) );
aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
}
break;
case RES_POOLFRM_MARGINAL:
{
- aSet.Put( SwFmtAnchor( FLY_AT_PARA ));
- aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
- aSet.Put( SwFmtSurround( SURROUND_PARALLEL ));
+ aSet.Put( SwFormatAnchor( FLY_AT_PARA ));
+ aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::LEFT, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatSurround( SURROUND_PARALLEL ));
// Set the default width to 3.5 cm, use the minimum value for the height
- aSet.Put( SwFmtFrmSize( ATT_MIN_SIZE,
+ aSet.Put( SwFormatFrmSize( ATT_MIN_SIZE,
GetMetricVal( CM_1 ) * 3 + GetMetricVal( CM_05 ),
MM50 ));
}
break;
case RES_POOLFRM_WATERSIGN:
{
- aSet.Put( SwFmtAnchor( FLY_AT_PAGE ));
- aSet.Put( SwFmtHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatAnchor( FLY_AT_PAGE ));
+ aSet.Put( SwFormatHoriOrient( 0, text::HoriOrientation::CENTER, text::RelOrientation::FRAME ));
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::CENTER, text::RelOrientation::FRAME ));
aSet.Put( SvxOpaqueItem( RES_OPAQUE, false ));
- aSet.Put( SwFmtSurround( SURROUND_THROUGHT ));
+ aSet.Put( SwFormatSurround( SURROUND_THROUGHT ));
}
break;
case RES_POOLFRM_LABEL:
{
- aSet.Put( SwFmtAnchor( FLY_AS_CHAR ) );
- aSet.Put( SwFmtVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
+ aSet.Put( SwFormatAnchor( FLY_AS_CHAR ) );
+ aSet.Put( SwFormatVertOrient( 0, text::VertOrientation::TOP, text::RelOrientation::FRAME ) );
aSet.Put( SvxLRSpaceItem( 114, 114, 0, 0, RES_LR_SPACE ) );
SvxProtectItem aProtect( RES_PROTECT );
@@ -1333,27 +1333,27 @@ SwFmt* DocumentStylePoolManager::GetFmtFromPool( sal_uInt16 nId )
aProtect.SetPosProtect( true );
aSet.Put( aProtect );
- pNewFmt->SetAutoUpdateFmt( true );
+ pNewFormat->SetAutoUpdateFormat( true );
}
break;
}
if( aSet.Count() )
{
{
- pNewFmt->SetFmtAttr( aSet );
+ pNewFormat->SetFormatAttr( aSet );
}
}
- return pNewFmt;
+ return pNewFormat;
}
-SwFrmFmt* DocumentStylePoolManager::GetFrmFmtFromPool( sal_uInt16 nId )
+SwFrameFormat* DocumentStylePoolManager::GetFrameFormatFromPool( sal_uInt16 nId )
{
- return static_cast<SwFrmFmt*>(GetFmtFromPool( nId ));
+ return static_cast<SwFrameFormat*>(GetFormatFromPool( nId ));
}
-SwCharFmt* DocumentStylePoolManager::GetCharFmtFromPool( sal_uInt16 nId )
+SwCharFormat* DocumentStylePoolManager::GetCharFormatFromPool( sal_uInt16 nId )
{
- return static_cast<SwCharFmt*>(GetFmtFromPool( nId ));
+ return static_cast<SwCharFormat*>(GetFormatFromPool( nId ));
}
SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool bRegardLanguage )
@@ -1363,7 +1363,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
for( size_t n = 0; n < m_rDoc.GetPageDescCnt(); ++n )
{
- if ( nId == m_rDoc.GetPageDesc(n).GetPoolFmtId() )
+ if ( nId == m_rDoc.GetPageDesc(n).GetPoolFormatId() )
{
return &m_rDoc.GetPageDesc(n);
}
@@ -1387,7 +1387,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
pNewPgDsc = m_rDoc.MakePageDesc(aNm, 0, bRegardLanguage);
}
- pNewPgDsc->SetPoolFmtId( nId );
+ pNewPgDsc->SetPoolFormatId( nId );
if ( !bIsModified )
{
m_rDoc.getIDocumentState().ResetModified();
@@ -1405,7 +1405,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
aUL.SetLower( (sal_uInt16)aLR.GetLeft() );
}
- SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrmFmtSetRange );
+ SwAttrSet aSet( m_rDoc.GetAttrPool(), aPgFrameFormatSetRange );
bool bSetLeft = true;
switch( nId )
@@ -1457,7 +1457,7 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
{
Size aPSize( SvxPaperInfo::GetPaperSize( PAPER_ENV_C65 ) );
LandscapeSwap( aPSize );
- aSet.Put( SwFmtFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
+ aSet.Put( SwFormatFrmSize( ATT_FIX_SIZE, aPSize.Width(), aPSize.Height() ));
aLR.SetLeft( 0 ); aLR.SetRight( 0 );
aUL.SetUpper( 0 ); aUL.SetLower( 0 );
aSet.Put( aLR );
@@ -1488,18 +1488,18 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
aSet.Put( aLR );
aSet.Put( aUL );
pNewPgDsc->SetUseOn( nsUseOnPage::PD_ALL );
- SwPageFtnInfo aInf( pNewPgDsc->GetFtnInfo() );
+ SwPageFootnoteInfo aInf( pNewPgDsc->GetFootnoteInfo() );
aInf.SetLineWidth( 0 );
aInf.SetTopDist( 0 );
aInf.SetBottomDist( 0 );
- pNewPgDsc->SetFtnInfo( aInf );
+ pNewPgDsc->SetFootnoteInfo( aInf );
}
break;
case RES_POOLPAGE_LANDSCAPE: // "Landscape"
{
SwPageDesc* pStdPgDsc = GetPageDescFromPool( RES_POOLPAGE_STANDARD );
- SwFmtFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
+ SwFormatFrmSize aFrmSz( pStdPgDsc->GetMaster().GetFrmSize() );
if ( !pStdPgDsc->GetLandscape() )
{
const SwTwips nTmp = aFrmSz.GetHeight();
@@ -1520,11 +1520,11 @@ SwPageDesc* DocumentStylePoolManager::GetPageDescFromPool( sal_uInt16 nId, bool
{
if( bSetLeft )
{
- pNewPgDsc->GetLeft().SetFmtAttr( aSet );
- pNewPgDsc->GetFirstLeft().SetFmtAttr( aSet );
+ pNewPgDsc->GetLeft().SetFormatAttr( aSet );
+ pNewPgDsc->GetFirstLeft().SetFormatAttr( aSet );
}
- pNewPgDsc->GetMaster().SetFmtAttr( aSet );
- pNewPgDsc->GetFirstMaster().SetFmtAttr( aSet );
+ pNewPgDsc->GetMaster().SetFormatAttr( aSet );
+ pNewPgDsc->GetFirstMaster().SetFormatAttr( aSet );
}
return pNewPgDsc;
}
@@ -1536,9 +1536,9 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
SwNumRule* pNewRule;
- for (size_t n = 0; n < m_rDoc.GetNumRuleTbl().size(); ++n )
+ for (size_t n = 0; n < m_rDoc.GetNumRuleTable().size(); ++n )
{
- if (nId == ( pNewRule = m_rDoc.GetNumRuleTbl()[ n ] )->GetPoolFmtId())
+ if (nId == ( pNewRule = m_rDoc.GetNumRuleTable()[ n ] )->GetPoolFormatId())
{
return pNewRule;
}
@@ -1554,7 +1554,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
ResId aResId( sal_uInt32(RC_POOLNUMRULE_BEGIN + nId - RES_POOLNUMRULE_BEGIN), *pSwResMgr );
OUString aNm( aResId );
- SwCharFmt *pNumCFmt = 0, *pBullCFmt = 0;
+ SwCharFormat *pNumCFormat = 0, *pBullCFormat = 0;
const SvxNumberFormat::SvxNumPositionAndSpaceMode eNumberFormatPositionAndSpaceMode
= numfunc::GetDefaultPositionAndSpaceMode(); //#i89178#
@@ -1563,16 +1563,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
sal_uInt16 n = m_rDoc.MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode );
- pNewRule = m_rDoc.GetNumRuleTbl()[ n ];
- pNewRule->SetPoolFmtId( nId );
+ pNewRule = m_rDoc.GetNumRuleTable()[ n ];
+ pNewRule->SetPoolFormatId( nId );
pNewRule->SetAutoRule( false );
if( RES_POOLNUMRULE_NUM1 <= nId && nId <= RES_POOLNUMRULE_NUM5 )
- pNumCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+ pNumCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
if( ( RES_POOLNUMRULE_BUL1 <= nId && nId <= RES_POOLNUMRULE_BUL5 ) ||
RES_POOLNUMRULE_NUM5 == nId )
- pBullCFmt = GetCharFmtFromPool( RES_POOLCHR_NUM_LEVEL );
+ pBullCFormat = GetCharFormatFromPool( RES_POOLCHR_NUM_LEVEL );
if( !bIsModified )
m_rDoc.getIDocumentState().ResetModified();
@@ -1582,13 +1582,13 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
{
case RES_POOLNUMRULE_NUM1:
{
- SwNumFmt aFmt;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_ARABIC);
- aFmt.SetCharFmt( pNumCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetSuffix( "." );
+ SwNumFormat aFormat;
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_ARABIC);
+ aFormat.SetCharFormat( pNumCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetSuffix( "." );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -1599,27 +1599,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
@@ -1634,16 +1634,16 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
};
const sal_uInt16* pArr = aAbsSpace;
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_ARABIC);
- aFmt.SetCharFmt( pNumCFmt );
- aFmt.SetIncludeUpperLevels( 1 );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_ARABIC);
+ aFormat.SetCharFormat( pNumCFormat );
+ aFormat.SetIncludeUpperLevels( 1 );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
}
sal_uInt16 nSpace = 0;
@@ -1651,69 +1651,69 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
- aFmt.SetFirstLineOffset( - pArr[ n ] );
+ aFormat.SetAbsLSpace( nSpace = nSpace + pArr[ n ] );
+ aFormat.SetFirstLineOffset( - pArr[ n ] );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( nSpace = nSpace + pArr[ n ] );
- aFmt.SetIndentAt( nSpace );
- aFmt.SetFirstLineIndent( - pArr[ n ] );
+ aFormat.SetListtabPos( nSpace = nSpace + pArr[ n ] );
+ aFormat.SetIndentAt( nSpace );
+ aFormat.SetFirstLineIndent( - pArr[ n ] );
}
- aFmt.SetStart( n+1 );
- pNewRule->Set( n, aFmt );
+ aFormat.SetStart( n+1 );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_NUM3:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_ARABIC);
- aFmt.SetCharFmt( pNumCFmt );
- aFmt.SetIncludeUpperLevels( 1 );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_ARABIC);
+ aFormat.SetCharFormat( pNumCFormat );
+ aFormat.SetIncludeUpperLevels( 1 );
sal_uInt16 nOffs = GetMetricVal( CM_1 ) * 3;
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - nOffs );
+ aFormat.SetFirstLineOffset( - nOffs );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - nOffs );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - nOffs );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( (n+1) * nOffs );
+ aFormat.SetAbsLSpace( (n+1) * nOffs );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
long nPos = (n+1) * static_cast<long>(nOffs);
- aFmt.SetListtabPos(nPos);
- aFmt.SetIndentAt(nPos);
+ aFormat.SetListtabPos(nPos);
+ aFormat.SetIndentAt(nPos);
}
- aFmt.SetStart( n+1 );
- pNewRule->Set( n, aFmt );
+ aFormat.SetStart( n+1 );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_NUM4:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);
- aFmt.SetCharFmt( pNumCFmt );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetSuffix( "." );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_ROMAN_UPPER);
+ aFormat.SetCharFormat( pNumCFormat );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetSuffix( "." );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -1724,29 +1724,29 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
- aFmt.SetStart( n + 1 );
+ aFormat.SetStart( n + 1 );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
@@ -1761,118 +1761,118 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
};
const sal_uInt16* pArr0to2 = aAbsSpace0to2;
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_ARABIC);
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetSuffix( "." );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_ARABIC);
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetSuffix( "." );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
}
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( -pArr0to2[0] ); // == 0.40 cm
- aFmt.SetAbsLSpace( pArr0to2[1] ); // == 0.40 cm
+ aFormat.SetFirstLineOffset( -pArr0to2[0] ); // == 0.40 cm
+ aFormat.SetAbsLSpace( pArr0to2[1] ); // == 0.40 cm
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetFirstLineIndent( -pArr0to2[0] );
- aFmt.SetListtabPos( pArr0to2[1] );
- aFmt.SetIndentAt( pArr0to2[1] );
+ aFormat.SetFirstLineIndent( -pArr0to2[0] );
+ aFormat.SetListtabPos( pArr0to2[1] );
+ aFormat.SetIndentAt( pArr0to2[1] );
}
- aFmt.SetCharFmt( pNumCFmt );
- pNewRule->Set( 0, aFmt );
+ aFormat.SetCharFormat( pNumCFormat );
+ pNewRule->Set( 0, aFormat );
- aFmt.SetIncludeUpperLevels( 2 );
- aFmt.SetStart( 2 );
+ aFormat.SetIncludeUpperLevels( 2 );
+ aFormat.SetStart( 2 );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( -pArr0to2[2] ); // == 0.65 cm
- aFmt.SetAbsLSpace( pArr0to2[3] ); // == 1.10 cm
+ aFormat.SetFirstLineOffset( -pArr0to2[2] ); // == 0.65 cm
+ aFormat.SetAbsLSpace( pArr0to2[3] ); // == 1.10 cm
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetFirstLineIndent( -pArr0to2[2] );
- aFmt.SetListtabPos( pArr0to2[3] );
- aFmt.SetIndentAt( pArr0to2[3] );
+ aFormat.SetFirstLineIndent( -pArr0to2[2] );
+ aFormat.SetListtabPos( pArr0to2[3] );
+ aFormat.SetIndentAt( pArr0to2[3] );
}
- pNewRule->Set( 1, aFmt );
+ pNewRule->Set( 1, aFormat );
- aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
- aFmt.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetStart( 3 );
+ aFormat.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
+ aFormat.SetSuffix(OUString(static_cast<sal_Unicode>(')')));
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetStart( 3 );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - pArr0to2[4] ); // == 0.45cm
- aFmt.SetAbsLSpace( pArr0to2[5] ); // == 1.55 cm
+ aFormat.SetFirstLineOffset( - pArr0to2[4] ); // == 0.45cm
+ aFormat.SetAbsLSpace( pArr0to2[5] ); // == 1.55 cm
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetFirstLineIndent( -pArr0to2[4] );
- aFmt.SetListtabPos( pArr0to2[5] );
- aFmt.SetIndentAt( pArr0to2[5] );
+ aFormat.SetFirstLineIndent( -pArr0to2[4] );
+ aFormat.SetListtabPos( pArr0to2[5] );
+ aFormat.SetIndentAt( pArr0to2[5] );
}
- pNewRule->Set( 2, aFmt );
+ pNewRule->Set( 2, aFormat );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- aFmt.SetBulletChar( cBulletChar );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetBulletChar( cBulletChar );
sal_Int16 nOffs = GetMetricVal( CM_01 ) * 4,
nOffs2 = GetMetricVal( CM_1 ) * 2;
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - nOffs );
+ aFormat.SetFirstLineOffset( - nOffs );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetFirstLineIndent( - nOffs );
+ aFormat.SetFirstLineIndent( - nOffs );
}
- aFmt.SetSuffix( OUString() );
+ aFormat.SetSuffix( OUString() );
for (sal_uInt16 n = 3; n < MAXLEVEL; ++n)
{
- aFmt.SetStart( n+1 );
+ aFormat.SetStart( n+1 );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
+ aFormat.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
long nPos = nOffs2 + ((n-3) * static_cast<long>(nOffs));
- aFmt.SetListtabPos(nPos);
- aFmt.SetIndentAt(nPos);
+ aFormat.SetListtabPos(nPos);
+ aFormat.SetIndentAt(nPos);
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_BUL1:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- aFmt.SetBulletChar( cBulletChar );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetBulletChar( cBulletChar );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -1883,41 +1883,41 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_BUL2:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
- aFmt.SetBulletChar( 0x2013 );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetBulletChar( 0x2013 );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -1928,83 +1928,83 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_BUL3:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
sal_uInt16 nOffs = GetMetricVal( CM_01 ) * 4;
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - nOffs );
+ aFormat.SetFirstLineOffset( - nOffs );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - nOffs );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - nOffs );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
{
- aFmt.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
+ aFormat.SetBulletChar( ( n & 1 ? 0x25a1 : 0x2611 ) );
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( ((n & 1) +1) * nOffs );
+ aFormat.SetAbsLSpace( ((n & 1) +1) * nOffs );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
long nPos = ((n & 1) +1) * static_cast<long>(nOffs);
- aFmt.SetListtabPos(nPos);
- aFmt.SetIndentAt(nPos);
+ aFormat.SetListtabPos(nPos);
+ aFormat.SetIndentAt(nPos);
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_BUL4:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -2016,48 +2016,48 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::SPACE );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::SPACE );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
switch( n )
{
- case 0: aFmt.SetBulletChar( 0x27a2 ); break;
- case 1: aFmt.SetBulletChar( 0xE006 ); break;
- default: aFmt.SetBulletChar( 0xE004 ); break;
+ case 0: aFormat.SetBulletChar( 0x27a2 ); break;
+ case 1: aFormat.SetBulletChar( 0xE006 ); break;
+ default: aFormat.SetBulletChar( 0xE004 ); break;
}
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
case RES_POOLNUMRULE_BUL5:
{
- SwNumFmt aFmt;
+ SwNumFormat aFormat;
- aFmt.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
- aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
- aFmt.SetCharFmt( pBullCFmt );
- aFmt.SetStart( 1 );
- aFmt.SetIncludeUpperLevels( 1 );
- aFmt.SetBulletChar( 0x2717 );
- aFmt.SetBulletFont( &numfunc::GetDefBulletFont() );
+ aFormat.SetPositionAndSpaceMode( eNumberFormatPositionAndSpaceMode );
+ aFormat.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+ aFormat.SetCharFormat( pBullCFormat );
+ aFormat.SetStart( 1 );
+ aFormat.SetIncludeUpperLevels( 1 );
+ aFormat.SetBulletChar( 0x2717 );
+ aFormat.SetBulletFont( &numfunc::GetDefBulletFont() );
static const sal_uInt16 aAbsSpace[ MAXLEVEL ] =
{
@@ -2068,27 +2068,27 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetFirstLineOffset( - (*pArr) );
+ aFormat.SetFirstLineOffset( - (*pArr) );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
- aFmt.SetFirstLineIndent( - (*pArr) );
+ aFormat.SetLabelFollowedBy( SvxNumberFormat::LISTTAB );
+ aFormat.SetFirstLineIndent( - (*pArr) );
}
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n, ++pArr)
{
if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
- aFmt.SetAbsLSpace( *pArr );
+ aFormat.SetAbsLSpace( *pArr );
}
else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
{
- aFmt.SetListtabPos( *pArr );
- aFmt.SetIndentAt( *pArr );
+ aFormat.SetListtabPos( *pArr );
+ aFormat.SetIndentAt( *pArr );
}
- pNewRule->Set( n, aFmt );
+ pNewRule->Set( n, aFormat );
}
}
break;
@@ -2098,7 +2098,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
}
/// Check if this AutoCollection is already/still in use in this Document
-bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolTextCollUsed( sal_uInt16 nId ) const
{
OSL_ENSURE(
(RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
@@ -2109,38 +2109,38 @@ bool DocumentStylePoolManager::IsPoolTxtCollUsed( sal_uInt16 nId ) const
(RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END),
"Wrong AutoFormat Id" );
- SwTxtFmtColl* pNewColl = 0;
+ SwTextFormatColl* pNewColl = 0;
bool bFnd = false;
- for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTxtFmtColls()->size(); ++n )
+ for( sal_uInt16 n = 0; !bFnd && n < m_rDoc.GetTextFormatColls()->size(); ++n )
{
- pNewColl = (*m_rDoc.GetTxtFmtColls())[ n ];
- if( nId == pNewColl->GetPoolFmtId() )
+ pNewColl = (*m_rDoc.GetTextFormatColls())[ n ];
+ if( nId == pNewColl->GetPoolFormatId() )
bFnd = true;
}
if( !bFnd || !pNewColl->HasWriterListeners() )
return false;
- SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+ SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
return !pNewColl->GetInfo( aGetHt );
}
/// Check if this AutoCollection is already/still in use
-bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
+bool DocumentStylePoolManager::IsPoolFormatUsed( sal_uInt16 nId ) const
{
- const SwFmt *pNewFmt = 0;
- const SwFmtsBase* pArray[ 2 ];
+ const SwFormat *pNewFormat = 0;
+ const SwFormatsBase* pArray[ 2 ];
sal_uInt16 nArrCnt = 1;
bool bFnd = true;
if (RES_POOLCHR_BEGIN <= nId && nId < RES_POOLCHR_END)
{
- pArray[0] = m_rDoc.GetCharFmts();
+ pArray[0] = m_rDoc.GetCharFormats();
}
else if (RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END)
{
- pArray[0] = m_rDoc.GetFrmFmts();
- pArray[1] = m_rDoc.GetSpzFrmFmts();
+ pArray[0] = m_rDoc.GetFrameFormats();
+ pArray[1] = m_rDoc.GetSpzFrameFormats();
nArrCnt = 2;
}
else
@@ -2155,19 +2155,19 @@ bool DocumentStylePoolManager::IsPoolFmtUsed( sal_uInt16 nId ) const
{
bFnd = false;
while( nArrCnt-- && !bFnd )
- for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFmtCount(); ++n )
- if( nId == ( pNewFmt = (*pArray[ nArrCnt ] ).GetFmt( n ) )->
- GetPoolFmtId() )
+ for( size_t n = 0; !bFnd && n < (*pArray[nArrCnt]).GetFormatCount(); ++n )
+ if( nId == ( pNewFormat = (*pArray[ nArrCnt ] ).GetFormat( n ) )->
+ GetPoolFormatId() )
bFnd = true;
}
// Not found or no dependencies?
- if( bFnd && pNewFmt->HasWriterListeners() )
+ if( bFnd && pNewFormat->HasWriterListeners() )
{
// Check if we have dependent ContentNodes in the Nodes array
// (also indirect ones for derived Formats)
- SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
- bFnd = !pNewFmt->GetInfo( aGetHt );
+ SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
+ bFnd = !pNewFormat->GetInfo( aGetHt );
}
else
bFnd = false;
@@ -2185,7 +2185,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
for( size_t n = 0; !bFnd && n < m_rDoc.GetPageDescCnt(); ++n )
{
pNewPgDsc = &m_rDoc.GetPageDesc(n);
- if( nId == pNewPgDsc->GetPoolFmtId() )
+ if( nId == pNewPgDsc->GetPoolFormatId() )
bFnd = true;
}
@@ -2195,7 +2195,7 @@ bool DocumentStylePoolManager::IsPoolPageDescUsed( sal_uInt16 nId ) const
// Check if we have dependent ContentNodes in the Nodes array
// (also indirect ones for derived Formats)
- SwAutoFmtGetDocNode aGetHt( &m_rDoc.GetNodes() );
+ SwAutoFormatGetDocNode aGetHt( &m_rDoc.GetNodes() );
return !pNewPgDsc->GetInfo( aGetHt );
}
diff --git a/sw/source/core/doc/DocumentTimerManager.cxx b/sw/source/core/doc/DocumentTimerManager.cxx
index 210eb3689424..8ac66584af7d 100644
--- a/sw/source/core/doc/DocumentTimerManager.cxx
+++ b/sw/source/core/doc/DocumentTimerManager.cxx
@@ -124,23 +124,23 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
}
}
- SwFldUpdateFlags nFldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
- if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag
- || AUTOUPD_FIELD_AND_CHARTS == nFldUpdFlag ) &&
- m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsFieldsDirty()
+ SwFieldUpdateFlags nFieldUpdFlag = m_rDoc.GetDocumentSettingManager().getFieldUpdateFlags(true);
+ if( ( AUTOUPD_FIELD_ONLY == nFieldUpdFlag
+ || AUTOUPD_FIELD_AND_CHARTS == nFieldUpdFlag ) &&
+ m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsFieldsDirty()
// If we switch the field name the Fields are not updated.
// So the "background update" should always be carried out
- /* && !pStartSh->GetViewOptions()->IsFldName()*/ )
+ /* && !pStartSh->GetViewOptions()->IsFieldName()*/ )
{
- if ( m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().IsInUpdateFlds() ||
- m_rDoc.getIDocumentFieldsAccess().IsExpFldsLocked() )
+ if ( m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().IsInUpdateFields() ||
+ m_rDoc.getIDocumentFieldsAccess().IsExpFieldsLocked() )
{
pIdle->Start();
return;
}
// Action brackets!
- m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( true );
+ m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( true );
pTmpRoot->StartAllAction();
@@ -148,17 +148,17 @@ IMPL_LINK_TYPED( DocumentTimerManager, DoIdleJobs, Idle*, pIdle, void )
const bool bOldLockView = pShell->IsViewLocked();
pShell->LockView( true );
- m_rDoc.getIDocumentFieldsAccess().GetSysFldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 ); // ChapterField
- m_rDoc.getIDocumentFieldsAccess().UpdateExpFlds( 0, false ); // Updates ExpressionFields
- m_rDoc.getIDocumentFieldsAccess().UpdateTblFlds(NULL); // Tables
- m_rDoc.getIDocumentFieldsAccess().UpdateRefFlds(NULL); // References
+ m_rDoc.getIDocumentFieldsAccess().GetSysFieldType( RES_CHAPTERFLD )->ModifyNotification( 0, 0 ); // ChapterField
+ m_rDoc.getIDocumentFieldsAccess().UpdateExpFields( 0, false ); // Updates ExpressionFields
+ m_rDoc.getIDocumentFieldsAccess().UpdateTableFields(NULL); // Tables
+ m_rDoc.getIDocumentFieldsAccess().UpdateRefFields(NULL); // References
pTmpRoot->EndAllAction();
pShell->LockView( bOldLockView );
- m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetInUpdateFlds( false );
- m_rDoc.getIDocumentFieldsAccess().GetUpdtFlds().SetFieldsDirty( false );
+ m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetInUpdateFields( false );
+ m_rDoc.getIDocumentFieldsAccess().GetUpdateFields().SetFieldsDirty( false );
}
}
#ifdef TIMELOG
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index dab5cf8a00c7..43db6abb9dc7 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -37,9 +37,9 @@ extern ResMgr* pSwResMgr;
*SwStyleNameMapper::pRegisterUINameArray = 0,
*SwStyleNameMapper::pDocUINameArray = 0,
*SwStyleNameMapper::pHTMLUINameArray = 0,
- *SwStyleNameMapper::pFrmFmtUINameArray = 0,
- *SwStyleNameMapper::pChrFmtUINameArray = 0,
- *SwStyleNameMapper::pHTMLChrFmtUINameArray = 0,
+ *SwStyleNameMapper::pFrameFormatUINameArray = 0,
+ *SwStyleNameMapper::pChrFormatUINameArray = 0,
+ *SwStyleNameMapper::pHTMLChrFormatUINameArray = 0,
*SwStyleNameMapper::pPageDescUINameArray = 0,
*SwStyleNameMapper::pNumRuleUINameArray = 0,
@@ -50,9 +50,9 @@ extern ResMgr* pSwResMgr;
*SwStyleNameMapper::pRegisterProgNameArray = 0,
*SwStyleNameMapper::pDocProgNameArray = 0,
*SwStyleNameMapper::pHTMLProgNameArray = 0,
- *SwStyleNameMapper::pFrmFmtProgNameArray = 0,
- *SwStyleNameMapper::pChrFmtProgNameArray = 0,
- *SwStyleNameMapper::pHTMLChrFmtProgNameArray = 0,
+ *SwStyleNameMapper::pFrameFormatProgNameArray = 0,
+ *SwStyleNameMapper::pChrFormatProgNameArray = 0,
+ *SwStyleNameMapper::pHTMLChrFormatProgNameArray = 0,
*SwStyleNameMapper::pPageDescProgNameArray = 0,
*SwStyleNameMapper::pNumRuleProgNameArray = 0;
@@ -233,7 +233,7 @@ const struct SwTableEntry HTMLProgNameTable [] =
{ 0, NULL }
};
-const struct SwTableEntry FrmFmtProgNameTable [] =
+const struct SwTableEntry FrameFormatProgNameTable [] =
{
ENTRY( "Frame" ), // RES_POOLFRM_FRAME
ENTRY( "Graphics" ),
@@ -245,7 +245,7 @@ const struct SwTableEntry FrmFmtProgNameTable [] =
{ 0, NULL }
};
-const struct SwTableEntry ChrFmtProgNameTable [] =
+const struct SwTableEntry ChrFormatProgNameTable [] =
{
ENTRY( "Footnote Symbol" ), // RES_POOLCHR_FOOTNOTE
ENTRY( "Page Number" ),
@@ -267,7 +267,7 @@ const struct SwTableEntry ChrFmtProgNameTable [] =
{ 0, NULL }
};
-const struct SwTableEntry HTMLChrFmtProgNameTable [] =
+const struct SwTableEntry HTMLChrFormatProgNameTable [] =
{
ENTRY( "Emphasis" ), // RES_POOLCHR_HTML_EMPHASIS
ENTRY( "Citation" ),
@@ -447,14 +447,14 @@ const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName eFlag
case nsSwGetPoolIdFromName::GET_POOLID_CHRFMT:
{
pHashPointer = bProgName ? &pCharProgMap : &pCharUIMap;
- vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFmtProgNameArray : &GetChrFmtUINameArray) );
- vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFmtProgNameArray : &GetHTMLChrFmtUINameArray) );
+ vIndexes.push_back( boost::make_tuple(RES_POOLCHR_NORMAL_BEGIN, RES_POOLCHR_NORMAL_END, bProgName ? &GetChrFormatProgNameArray : &GetChrFormatUINameArray) );
+ vIndexes.push_back( boost::make_tuple(RES_POOLCHR_HTML_BEGIN, RES_POOLCHR_HTML_END, bProgName ? &GetHTMLChrFormatProgNameArray : &GetHTMLChrFormatUINameArray) );
}
break;
case nsSwGetPoolIdFromName::GET_POOLID_FRMFMT:
{
pHashPointer = bProgName ? &pFrameProgMap : &pFrameUIMap;
- vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrmFmtProgNameArray : &GetFrmFmtUINameArray) );
+ vIndexes.push_back( boost::make_tuple(RES_POOLFRM_BEGIN, RES_POOLFRM_END, bProgName ? &GetFrameFormatProgNameArray : &GetFrameFormatUINameArray) );
}
break;
case nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC:
@@ -637,19 +637,19 @@ const OUString& SwStyleNameMapper::getNameFromId(
case POOLGRP_CHARFMT:
if( RES_POOLCHR_NORMAL_BEGIN <= nId && nId < RES_POOLCHR_NORMAL_END )
{
- pStrArr = bProgName ? &GetChrFmtProgNameArray() : &GetChrFmtUINameArray();
+ pStrArr = bProgName ? &GetChrFormatProgNameArray() : &GetChrFormatUINameArray();
nStt = RES_POOLCHR_NORMAL_BEGIN;
}
else if( RES_POOLCHR_HTML_BEGIN <= nId && nId < RES_POOLCHR_HTML_END )
{
- pStrArr = bProgName ? &GetHTMLChrFmtProgNameArray() : &GetHTMLChrFmtUINameArray();
+ pStrArr = bProgName ? &GetHTMLChrFormatProgNameArray() : &GetHTMLChrFormatUINameArray();
nStt = RES_POOLCHR_HTML_BEGIN;
}
break;
case POOLGRP_FRAMEFMT:
if( RES_POOLFRM_BEGIN <= nId && nId < RES_POOLFRM_END )
{
- pStrArr = bProgName ? &GetFrmFmtProgNameArray() : &GetFrmFmtUINameArray();
+ pStrArr = bProgName ? &GetFrameFormatProgNameArray() : &GetFrameFormatUINameArray();
nStt = RES_POOLFRM_BEGIN;
}
break;
@@ -769,28 +769,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLUINameArray()
return *pHTMLUINameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatUINameArray()
{
- if (!pFrmFmtUINameArray)
- pFrmFmtUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
+ if (!pFrameFormatUINameArray)
+ pFrameFormatUINameArray = lcl_NewUINameArray( RC_POOLFRMFMT_BEGIN,
RC_POOLFRMFMT_BEGIN + (RES_POOLFRM_END - RES_POOLFRM_BEGIN) );
- return *pFrmFmtUINameArray;
+ return *pFrameFormatUINameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatUINameArray()
{
- if (!pChrFmtUINameArray)
- pChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
+ if (!pChrFormatUINameArray)
+ pChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_BEGIN,
RC_POOLCHRFMT_BEGIN + (RES_POOLCHR_NORMAL_END - RES_POOLCHR_NORMAL_BEGIN) );
- return *pChrFmtUINameArray;
+ return *pChrFormatUINameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtUINameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatUINameArray()
{
- if (!pHTMLChrFmtUINameArray)
- pHTMLChrFmtUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
+ if (!pHTMLChrFormatUINameArray)
+ pHTMLChrFormatUINameArray = lcl_NewUINameArray( RC_POOLCHRFMT_HTML_BEGIN,
RC_POOLCHRFMT_HTML_BEGIN + (RES_POOLCHR_HTML_END - RES_POOLCHR_HTML_BEGIN) );
- return *pHTMLChrFmtUINameArray;
+ return *pHTMLChrFormatUINameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescUINameArray()
@@ -857,28 +857,28 @@ const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLProgNameArray()
return *pHTMLProgNameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetFrmFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetFrameFormatProgNameArray()
{
- if (!pFrmFmtProgNameArray)
- pFrmFmtProgNameArray = lcl_NewProgNameArray( FrmFmtProgNameTable,
- sizeof ( FrmFmtProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pFrmFmtProgNameArray;
+ if (!pFrameFormatProgNameArray)
+ pFrameFormatProgNameArray = lcl_NewProgNameArray( FrameFormatProgNameTable,
+ sizeof ( FrameFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+ return *pFrameFormatProgNameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetChrFormatProgNameArray()
{
- if (!pChrFmtProgNameArray)
- pChrFmtProgNameArray = lcl_NewProgNameArray( ChrFmtProgNameTable,
- sizeof ( ChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pChrFmtProgNameArray;
+ if (!pChrFormatProgNameArray)
+ pChrFormatProgNameArray = lcl_NewProgNameArray( ChrFormatProgNameTable,
+ sizeof ( ChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+ return *pChrFormatProgNameArray;
}
-const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFmtProgNameArray()
+const ::std::vector<OUString>& SwStyleNameMapper::GetHTMLChrFormatProgNameArray()
{
- if (!pHTMLChrFmtProgNameArray)
- pHTMLChrFmtProgNameArray = lcl_NewProgNameArray( HTMLChrFmtProgNameTable,
- sizeof ( HTMLChrFmtProgNameTable ) / sizeof ( SwTableEntry ) );
- return *pHTMLChrFmtProgNameArray;
+ if (!pHTMLChrFormatProgNameArray)
+ pHTMLChrFormatProgNameArray = lcl_NewProgNameArray( HTMLChrFormatProgNameTable,
+ sizeof ( HTMLChrFormatProgNameTable ) / sizeof ( SwTableEntry ) );
+ return *pHTMLChrFormatProgNameArray;
}
const ::std::vector<OUString>& SwStyleNameMapper::GetPageDescProgNameArray()
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 05e2b821a5f9..50afa2e7ad1a 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -297,7 +297,7 @@ const char * dbg_out(const SfxItemSet & rSet)
return dbg_out(lcl_dbg_out(rSet));
}
-static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
+static const OUString lcl_dbg_out(const SwTextAttr & rAttr)
{
OUString aStr("[ ");
@@ -312,7 +312,7 @@ static const OUString lcl_dbg_out(const SwTxtAttr & rAttr)
return aStr;
}
-const char * dbg_out(const SwTxtAttr & rAttr)
+const char * dbg_out(const SwTextAttr & rAttr)
{
return dbg_out(lcl_dbg_out(rAttr));
}
@@ -413,31 +413,31 @@ const char * dbg_out(const SwRect & rRect)
return dbg_out(lcl_dbg_out(rRect));
}
-static OUString lcl_dbg_out(const SwFrmFmt & rFrmFmt)
+static OUString lcl_dbg_out(const SwFrameFormat & rFrameFormat)
{
OUString aResult("[ ");
char sBuffer[256];
- sprintf(sBuffer, "%p", &rFrmFmt);
+ sprintf(sBuffer, "%p", &rFrameFormat);
aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
aResult += "(";
- aResult += rFrmFmt.GetName();
+ aResult += rFrameFormat.GetName();
aResult += ")";
- if (rFrmFmt.IsAuto())
+ if (rFrameFormat.IsAuto())
aResult += "*";
aResult += " ,";
- aResult += lcl_dbg_out(rFrmFmt.FindLayoutRect());
+ aResult += lcl_dbg_out(rFrameFormat.FindLayoutRect());
aResult += " ]";
return aResult;
}
-const char * dbg_out(const SwFrmFmt & rFrmFmt)
+const char * dbg_out(const SwFrameFormat & rFrameFormat)
{
- return dbg_out(lcl_dbg_out(rFrmFmt));
+ return dbg_out(lcl_dbg_out(rFrameFormat));
}
static const OUString lcl_AnchoredFrames(const SwNode & rNode)
@@ -447,16 +447,16 @@ static const OUString lcl_AnchoredFrames(const SwNode & rNode)
const SwDoc * pDoc = rNode.GetDoc();
if (pDoc)
{
- const SwFrmFmts * pFrmFmts = pDoc->GetSpzFrmFmts();
+ const SwFrameFormats * pFrameFormats = pDoc->GetSpzFrameFormats();
- if (pFrmFmts)
+ if (pFrameFormats)
{
bool bFirst = true;
- for (SwFrmFmts::const_iterator i(pFrmFmts->begin());
- i != pFrmFmts->end(); ++i)
+ for (SwFrameFormats::const_iterator i(pFrameFormats->begin());
+ i != pFrameFormats->end(); ++i)
{
- const SwFmtAnchor & rAnchor = (*i)->GetAnchor();
- const SwPosition * pPos = rAnchor.GetCntntAnchor();
+ const SwFormatAnchor & rAnchor = (*i)->GetAnchor();
+ const SwPosition * pPos = rAnchor.GetContentAnchor();
if (pPos && &pPos->nNode.GetNode() == &rNode)
{
@@ -542,31 +542,31 @@ static OUString lcl_dbg_out(const SwNode & rNode)
aTmpStr += "\">";
- const SwTxtNode * pTxtNode = rNode.GetTxtNode();
+ const SwTextNode * pTextNode = rNode.GetTextNode();
- if (rNode.IsTxtNode())
+ if (rNode.IsTextNode())
{
- const SfxItemSet * pAttrSet = pTxtNode->GetpSwAttrSet();
+ const SfxItemSet * pAttrSet = pTextNode->GetpSwAttrSet();
aTmpStr += "<txt>";
- aTmpStr += pTxtNode->GetTxt().getLength() > 10 ? pTxtNode->GetTxt().copy(0, 10) : pTxtNode->GetTxt();
+ aTmpStr += pTextNode->GetText().getLength() > 10 ? pTextNode->GetText().copy(0, 10) : pTextNode->GetText();
aTmpStr += "</txt>";
if (rNode.IsTableNode())
aTmpStr += "<tbl/>";
aTmpStr += "<outlinelevel>";
- aTmpStr += OUString::number(pTxtNode->GetAttrOutlineLevel()-1);
+ aTmpStr += OUString::number(pTextNode->GetAttrOutlineLevel()-1);
aTmpStr += "</outlinelevel>";
- const SwNumRule * pNumRule = pTxtNode->GetNumRule();
+ const SwNumRule * pNumRule = pTextNode->GetNumRule();
if (pNumRule != NULL)
{
aTmpStr += "<number>";
- if ( pTxtNode->GetNum() )
+ if ( pTextNode->GetNum() )
{
- aTmpStr += lcl_dbg_out(*(pTxtNode->GetNum()));
+ aTmpStr += lcl_dbg_out(*(pTextNode->GetNum()));
}
aTmpStr += "</number>";
@@ -585,25 +585,25 @@ static OUString lcl_dbg_out(const SwNode & rNode)
aTmpStr += "*";
}
- const SwNumFmt * pNumFmt = NULL;
+ const SwNumFormat * pNumFormat = NULL;
aTmpStr += "</rule>";
- if (pTxtNode->GetActualListLevel() > 0)
- pNumFmt = pNumRule->GetNumFmt( static_cast< sal_uInt16 >(pTxtNode->GetActualListLevel()) );
+ if (pTextNode->GetActualListLevel() > 0)
+ pNumFormat = pNumRule->GetNumFormat( static_cast< sal_uInt16 >(pTextNode->GetActualListLevel()) );
- if (pNumFmt)
+ if (pNumFormat)
{
aTmpStr += "<numformat>";
aTmpStr +=
- lcl_dbg_out_NumType(pNumFmt->GetNumberingType());
+ lcl_dbg_out_NumType(pNumFormat->GetNumberingType());
aTmpStr += "</numformat>";
}
}
- if (pTxtNode->IsCountedInList())
+ if (pTextNode->IsCountedInList())
aTmpStr += "<counted/>";
- SwFmtColl * pColl = pTxtNode->GetFmtColl();
+ SwFormatColl * pColl = pTextNode->GetFormatColl();
if (pColl)
{
@@ -612,10 +612,10 @@ static OUString lcl_dbg_out(const SwNode & rNode)
aTmpStr += "(";
- SwTxtFmtColl *pTxtColl = static_cast<SwTxtFmtColl*>(pColl);
- if (pTxtColl->IsAssignedToListLevelOfOutlineStyle())
+ SwTextFormatColl *pTextColl = static_cast<SwTextFormatColl*>(pColl);
+ if (pTextColl->IsAssignedToListLevelOfOutlineStyle())
{
- aTmpStr += OUString::number(pTxtColl->GetAssignedOutlineStyleLevel());
+ aTmpStr += OUString::number(pTextColl->GetAssignedOutlineStyleLevel());
}
else
{
@@ -624,7 +624,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
const SwNumRuleItem & rItem =
static_cast<const SwNumRuleItem &>
- (pColl->GetFmtAttr(RES_PARATR_NUMRULE));
+ (pColl->GetFormatAttr(RES_PARATR_NUMRULE));
const OUString sNumruleName = rItem.GetValue();
if (!sNumruleName.isEmpty())
@@ -636,7 +636,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
aTmpStr += "</coll>";
}
- SwFmtColl * pCColl = pTxtNode->GetCondFmtColl();
+ SwFormatColl * pCColl = pTextNode->GetCondFormatColl();
if (pCColl)
{
@@ -652,7 +652,7 @@ static OUString lcl_dbg_out(const SwNode & rNode)
if (bDbgOutPrintAttrSet)
{
aTmpStr += "<attrs>";
- aTmpStr += lcl_dbg_out(pTxtNode->GetSwAttrSet());
+ aTmpStr += lcl_dbg_out(pTextNode->GetSwAttrSet());
aTmpStr += "</attrs>";
}
}
@@ -687,7 +687,7 @@ const char * dbg_out(const SwNode * pNode)
return NULL;
}
-const char * dbg_out(const SwCntntNode * pNode)
+const char * dbg_out(const SwContentNode * pNode)
{
if (NULL != pNode)
return dbg_out(*pNode);
@@ -695,7 +695,7 @@ const char * dbg_out(const SwCntntNode * pNode)
return NULL;
}
-const char * dbg_out(const SwTxtNode * pNode)
+const char * dbg_out(const SwTextNode * pNode)
{
if (NULL != pNode)
return dbg_out(*pNode);
@@ -829,11 +829,11 @@ const char * dbg_out(const SwRewriter & rRewriter)
return dbg_out(lcl_dbg_out(rRewriter));
}
-static OUString lcl_dbg_out(const SvxNumberFormat & rFmt)
+static OUString lcl_dbg_out(const SvxNumberFormat & rFormat)
{
OUString aResult;
- aResult = lcl_dbg_out_NumType(rFmt.GetNumberingType());
+ aResult = lcl_dbg_out_NumType(rFormat.GetNumberingType());
return aResult;
}
@@ -865,45 +865,45 @@ const char * dbg_out(const SwNumRule & rRule)
return dbg_out(lcl_dbg_out(rRule));
}
-static OUString lcl_dbg_out(const SwTxtFmtColl & rFmt)
+static OUString lcl_dbg_out(const SwTextFormatColl & rFormat)
{
- OUString aResult(rFmt.GetName());
+ OUString aResult(rFormat.GetName());
aResult += "(";
- aResult += OUString::number(rFmt.GetAttrOutlineLevel());
+ aResult += OUString::number(rFormat.GetAttrOutlineLevel());
aResult += ")";
return aResult;
}
-const char * dbg_out(const SwTxtFmtColl & rFmt)
+const char * dbg_out(const SwTextFormatColl & rFormat)
{
- return dbg_out(lcl_dbg_out(rFmt));
+ return dbg_out(lcl_dbg_out(rFormat));
}
-static OUString lcl_dbg_out(const SwFrmFmts & rFrmFmts)
+static OUString lcl_dbg_out(const SwFrameFormats & rFrameFormats)
{
- return lcl_dbg_out_SvPtrArr<SwFrmFmts>(rFrmFmts);
+ return lcl_dbg_out_SvPtrArr<SwFrameFormats>(rFrameFormats);
}
-const char * dbg_out(const SwFrmFmts & rFrmFmts)
+const char * dbg_out(const SwFrameFormats & rFrameFormats)
{
- return dbg_out(lcl_dbg_out(rFrmFmts));
+ return dbg_out(lcl_dbg_out(rFrameFormats));
}
-static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
+static OUString lcl_dbg_out(const SwNumRuleTable & rTable)
{
OUString aResult("[");
- for (size_t n = 0; n < rTbl.size(); n++)
+ for (size_t n = 0; n < rTable.size(); n++)
{
if (n > 0)
aResult += ", ";
- aResult += rTbl[n]->GetName();
+ aResult += rTable[n]->GetName();
char sBuffer[256];
- sprintf(sBuffer, "(%p)", rTbl[n]);
+ sprintf(sBuffer, "(%p)", rTable[n]);
aResult += OUString(sBuffer, strlen(sBuffer), RTL_TEXTENCODING_ASCII_US);
}
@@ -912,9 +912,9 @@ static OUString lcl_dbg_out(const SwNumRuleTbl & rTbl)
return aResult;
}
-const char * dbg_out(const SwNumRuleTbl & rTbl)
+const char * dbg_out(const SwNumRuleTable & rTable)
{
- return dbg_out(lcl_dbg_out(rTbl));
+ return dbg_out(lcl_dbg_out(rTable));
}
static OUString lcl_TokenType2Str(FormTokenType nType)
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index e90448e836df..f1880db1d6ae 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -500,13 +500,13 @@ void SwDoc::ChgDBData(const SwDBData& rNewData)
maDBData = rNewData;
getIDocumentState().SetModified();
}
- getIDocumentFieldsAccess().GetSysFldType(RES_DBNAMEFLD)->UpdateFlds();
+ getIDocumentFieldsAccess().GetSysFieldType(RES_DBNAMEFLD)->UpdateFields();
}
-struct _PostItFld : public _SetGetExpFld
+struct _PostItField : public _SetGetExpField
{
- _PostItFld( const SwNodeIndex& rNdIdx, const SwTxtFld* pFld, const SwIndex* pIdx = 0 )
- : _SetGetExpFld( rNdIdx, pFld, pIdx ) {}
+ _PostItField( const SwNodeIndex& rNdIdx, const SwTextField* pField, const SwIndex* pIdx = 0 )
+ : _SetGetExpField( rNdIdx, pField, pIdx ) {}
sal_uInt16 GetPageNo( const StringRangeEnumerator &rRangeEnum,
const std::set< sal_Int32 > &rPossiblePages,
@@ -514,24 +514,24 @@ struct _PostItFld : public _SetGetExpFld
const SwPostItField* GetPostIt() const
{
- return static_cast<const SwPostItField*>( GetTxtFld()->GetFmtFld().GetField() );
+ return static_cast<const SwPostItField*>( GetTextField()->GetFormatField().GetField() );
}
};
-sal_uInt16 _PostItFld::GetPageNo(
+sal_uInt16 _PostItField::GetPageNo(
const StringRangeEnumerator &rRangeEnum,
const std::set< sal_Int32 > &rPossiblePages,
/* out */ sal_uInt16& rVirtPgNo, /* out */ sal_uInt16& rLineNo )
{
- //Problem: If a PostItFld is contained in a Node that is represented
+ //Problem: If a PostItField is contained in a Node that is represented
//by more than one layout instance,
//we have to decide whether it should be printed once or n-times.
//Probably only once. For the page number we don't select a random one,
//but the PostIt's first occurrence in the selected area.
rVirtPgNo = 0;
- const sal_Int32 nPos = GetCntnt();
- SwIterator<SwTxtFrm,SwTxtNode> aIter( GetTxtFld()->GetTxtNode() );
- for( SwTxtFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
+ const sal_Int32 nPos = GetContent();
+ SwIterator<SwTextFrm,SwTextNode> aIter( GetTextField()->GetTextNode() );
+ for( SwTextFrm* pFrm = aIter.First(); pFrm; pFrm = aIter.Next() )
{
if( pFrm->GetOfst() > nPos ||
(pFrm->HasFollow() && pFrm->GetFollow()->GetOfst() <= nPos) )
@@ -550,28 +550,28 @@ sal_uInt16 _PostItFld::GetPageNo(
bool sw_GetPostIts(
IDocumentFieldsAccess* pIDFA,
- _SetGetExpFlds * pSrtLst )
+ _SetGetExpFields * pSrtLst )
{
bool bHasPostIts = false;
- SwFieldType* pFldType = pIDFA->GetSysFldType( RES_POSTITFLD );
- OSL_ENSURE( pFldType, "no PostItType ? ");
+ SwFieldType* pFieldType = pIDFA->GetSysFieldType( RES_POSTITFLD );
+ OSL_ENSURE( pFieldType, "no PostItType ? ");
- if( pFldType->HasWriterListeners() )
+ if( pFieldType->HasWriterListeners() )
{
// Found modify object; insert all fields into the array
- SwIterator<SwFmtFld,SwFieldType> aIter( *pFldType );
- for( SwFmtFld* pFld = aIter.First(); pFld; pFld = aIter.Next() )
+ SwIterator<SwFormatField,SwFieldType> aIter( *pFieldType );
+ for( SwFormatField* pField = aIter.First(); pField; pField = aIter.Next() )
{
- const SwTxtFld* pTxtFld;
- if( 0 != ( pTxtFld = pFld->GetTxtFld() ) &&
- pTxtFld->GetTxtNode().GetNodes().IsDocNodes() )
+ const SwTextField* pTextField;
+ if( 0 != ( pTextField = pField->GetTextField() ) &&
+ pTextField->GetTextNode().GetNodes().IsDocNodes() )
{
bHasPostIts = true;
if (pSrtLst)
{
- SwNodeIndex aIdx( pTxtFld->GetTxtNode() );
- _PostItFld* pNew = new _PostItFld( aIdx, pTxtFld );
+ SwNodeIndex aIdx( pTextField->GetTextNode() );
+ _PostItField* pNew = new _PostItField( aIdx, pTextField );
pSrtLst->insert( pNew );
}
else
@@ -596,7 +596,7 @@ static void lcl_FormatPostIt(
if (bNewPage)
{
- pIDCO->InsertPoolItem( aPam, SvxFmtBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
+ pIDCO->InsertPoolItem( aPam, SvxFormatBreakItem( SVX_BREAK_PAGE_AFTER, RES_BREAK ) );
pIDCO->SplitNode( *aPam.GetPoint(), false );
}
else if (!bIsFirstPostIt)
@@ -641,9 +641,9 @@ static sal_Int32 lcl_GetPaperBin( const SwPageFrm *pStartFrm )
{
sal_Int32 nRes = -1;
- const SwFrmFmt &rFmt = pStartFrm->GetPageDesc()->GetMaster();
+ const SwFrameFormat &rFormat = pStartFrm->GetPageDesc()->GetMaster();
const SfxPoolItem *pItem = NULL;
- SfxItemState eState = rFmt.GetItemState( RES_PAPER_BIN, false, &pItem );
+ SfxItemState eState = rFormat.GetItemState( RES_PAPER_BIN, false, &pItem );
const SvxPaperBinItem *pPaperBinItem = dynamic_cast< const SvxPaperBinItem * >(pItem);
if (eState > SfxItemState::DEFAULT && pPaperBinItem)
nRes = pPaperBinItem->GetValue();
@@ -742,7 +742,7 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
sal_Int16 nPostItMode = (sal_Int16) rOptions.getIntValue( "PrintAnnotationMode", 0 );
OSL_ENSURE(nPostItMode == POSTITS_NONE || rData.HasPostItData(),
"print post-its without post-it data?" );
- const _SetGetExpFlds::size_type nPostItCount =
+ const _SetGetExpFields::size_type nPostItCount =
rData.HasPostItData() ? rData.m_pPostItFields->size() : 0;
if (nPostItMode != POSTITS_NONE && nPostItCount > 0)
{
@@ -770,9 +770,9 @@ void SwDoc::UpdatePagesForPrintingWithPostItData(
// already get them in the correct order
sal_uInt16 nVirtPg = 0, nLineNo = 0, nLastPageNum = 0, nPhyPageNum = 0;
bool bIsFirstPostIt = true;
- for (_SetGetExpFlds::size_type i = 0; i < nPostItCount; ++i)
+ for (_SetGetExpFields::size_type i = 0; i < nPostItCount; ++i)
{
- _PostItFld& rPostIt = static_cast<_PostItFld&>(*(*rData.m_pPostItFields)[ i ]);
+ _PostItField& rPostIt = static_cast<_PostItField&>(*(*rData.m_pPostItFields)[ i ]);
nLastPageNum = nPhyPageNum;
nPhyPageNum = rPostIt.GetPageNo(
aRangeEnum, rData.GetValidPagesSet(), nVirtPg, nLineNo );
@@ -1016,7 +1016,7 @@ void SwDoc::CalculatePagePairsForProspectPrinting(
}
/// @return the reference in the doc for the name
-const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
+const SwFormatRefMark* SwDoc::GetRefMark( const OUString& rName ) const
{
sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
for( sal_uInt32 n = 0; n < nMaxItems; ++n )
@@ -1025,20 +1025,20 @@ const SwFmtRefMark* SwDoc::GetRefMark( const OUString& rName ) const
if( 0 == (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n ) ))
continue;
- const SwFmtRefMark* pFmtRef = static_cast<const SwFmtRefMark*>(pItem);
- const SwTxtRefMark* pTxtRef = pFmtRef->GetTxtRefMark();
- if( pTxtRef && &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() &&
- rName == pFmtRef->GetRefName() )
- return pFmtRef;
+ const SwFormatRefMark* pFormatRef = static_cast<const SwFormatRefMark*>(pItem);
+ const SwTextRefMark* pTextRef = pFormatRef->GetTextRefMark();
+ if( pTextRef && &pTextRef->GetTextNode().GetNodes() == &GetNodes() &&
+ rName == pFormatRef->GetRefName() )
+ return pFormatRef;
}
return 0;
}
/// @return the RefMark per index - for Uno
-const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
+const SwFormatRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
{
- const SwTxtRefMark* pTxtRef;
- const SwFmtRefMark* pRet = 0;
+ const SwTextRefMark* pTextRef;
+ const SwFormatRefMark* pRet = 0;
sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
sal_uInt32 nCount = 0;
@@ -1047,12 +1047,12 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
const SfxPoolItem* pItem;
if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
- 0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
- &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+ 0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+ &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
{
if(nCount == nIndex)
{
- pRet = static_cast<const SwFmtRefMark*>(pItem);
+ pRet = static_cast<const SwFormatRefMark*>(pItem);
break;
}
nCount++;
@@ -1066,7 +1066,7 @@ const SwFmtRefMark* SwDoc::GetRefMark( sal_uInt16 nIndex ) const
// OS 25.06.96: From now on we always return the reference count
sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
{
- const SwTxtRefMark* pTxtRef;
+ const SwTextRefMark* pTextRef;
const sal_uInt32 nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_REFMARK );
sal_uInt16 nCount = 0;
@@ -1075,12 +1075,12 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
const SfxPoolItem* pItem;
if( 0 != (pItem = GetAttrPool().GetItem2( RES_TXTATR_REFMARK, n )) &&
- 0 != (pTxtRef = static_cast<const SwFmtRefMark*>(pItem)->GetTxtRefMark()) &&
- &pTxtRef->GetTxtNode().GetNodes() == &GetNodes() )
+ 0 != (pTextRef = static_cast<const SwFormatRefMark*>(pItem)->GetTextRefMark()) &&
+ &pTextRef->GetTextNode().GetNodes() == &GetNodes() )
{
if( pNames )
{
- OUString pTmp(static_cast<const SwFmtRefMark*>(pItem)->GetRefName());
+ OUString pTmp(static_cast<const SwFormatRefMark*>(pItem)->GetRefName());
pNames->insert(pNames->begin() + nCount, pTmp);
}
++nCount;
@@ -1092,27 +1092,27 @@ sal_uInt16 SwDoc::GetRefMarks( std::vector<OUString>* pNames ) const
static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
{
- SwTxtNode *pTxtNode = rpNd->GetTxtNode();
+ SwTextNode *pTextNode = rpNd->GetTextNode();
bool bOnlyWrong = *static_cast<sal_Bool*>(pArgs);
- if( pTxtNode )
+ if( pTextNode )
{
if( bOnlyWrong )
{
- if( pTxtNode->GetWrong() &&
- pTxtNode->GetWrong()->InvalidateWrong() )
- pTxtNode->SetWrongDirty( true );
- if( pTxtNode->GetGrammarCheck() &&
- pTxtNode->GetGrammarCheck()->InvalidateWrong() )
- pTxtNode->SetGrammarCheckDirty( true );
+ if( pTextNode->GetWrong() &&
+ pTextNode->GetWrong()->InvalidateWrong() )
+ pTextNode->SetWrongDirty( true );
+ if( pTextNode->GetGrammarCheck() &&
+ pTextNode->GetGrammarCheck()->InvalidateWrong() )
+ pTextNode->SetGrammarCheckDirty( true );
}
else
{
- pTxtNode->SetWrongDirty( true );
- if( pTxtNode->GetWrong() )
- pTxtNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
- pTxtNode->SetGrammarCheckDirty( true );
- if( pTxtNode->GetGrammarCheck() )
- pTxtNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
+ pTextNode->SetWrongDirty( true );
+ if( pTextNode->GetWrong() )
+ pTextNode->GetWrong()->SetInvalid( 0, COMPLETE_STRING );
+ pTextNode->SetGrammarCheckDirty( true );
+ if( pTextNode->GetGrammarCheck() )
+ pTextNode->GetGrammarCheck()->SetInvalid( 0, COMPLETE_STRING );
}
}
return true;
@@ -1120,13 +1120,13 @@ static bool lcl_SpellAndGrammarAgain( const SwNodePtr& rpNd, void* pArgs )
static bool lcl_CheckSmartTagsAgain( const SwNodePtr& rpNd, void* )
{
- SwTxtNode *pTxtNode = rpNd->GetTxtNode();
- if( pTxtNode )
+ SwTextNode *pTextNode = rpNd->GetTextNode();
+ if( pTextNode )
{
- pTxtNode->SetSmartTagDirty( true );
- if( pTxtNode->GetSmartTags() )
+ pTextNode->SetSmartTagDirty( true );
+ if( pTextNode->GetSmartTags() )
{
- pTxtNode->SetSmartTags( NULL );
+ pTextNode->SetSmartTags( NULL );
}
}
return true;
@@ -1166,28 +1166,28 @@ void SwDoc::InvalidateAutoCompleteFlag()
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::AllInvalidateAutoCompleteWords));
for( sal_uLong nNd = 1, nCnt = GetNodes().Count(); nNd < nCnt; ++nNd )
{
- SwTxtNode* pTxtNode = GetNodes()[ nNd ]->GetTxtNode();
- if ( pTxtNode ) pTxtNode->SetAutoCompleteWordDirty( true );
+ SwTextNode* pTextNode = GetNodes()[ nNd ]->GetTextNode();
+ if ( pTextNode ) pTextNode->SetAutoCompleteWordDirty( true );
}
std::for_each( aAllLayouts.begin(), aAllLayouts.end(),std::mem_fun(&SwRootFrm::SetIdleFlags));
}
}
-const SwFmtINetFmt* SwDoc::FindINetAttr( const OUString& rName ) const
+const SwFormatINetFormat* SwDoc::FindINetAttr( const OUString& rName ) const
{
- const SwFmtINetFmt* pItem;
- const SwTxtINetFmt* pTxtAttr;
- const SwTxtNode* pTxtNd;
+ const SwFormatINetFormat* pItem;
+ const SwTextINetFormat* pTextAttr;
+ const SwTextNode* pTextNd;
sal_uInt32 n, nMaxItems = GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
for( n = 0; n < nMaxItems; ++n )
{
- pItem = static_cast<const SwFmtINetFmt*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
+ pItem = static_cast<const SwFormatINetFormat*>( GetAttrPool().GetItem2( RES_TXTATR_INETFMT, n ) );
if( 0 != pItem &&
pItem->GetName() == rName &&
- 0 != ( pTxtAttr = pItem->GetTxtINetFmt()) &&
- 0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
- &pTxtNd->GetNodes() == &GetNodes() )
+ 0 != ( pTextAttr = pItem->GetTextINetFormat()) &&
+ 0 != ( pTextNd = pTextAttr->GetpTextNode() ) &&
+ &pTextNd->GetNodes() == &GetNodes() )
{
return pItem;
}
@@ -1207,7 +1207,7 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
::SetProgressState( static_cast<long>(i), GetDocShell() );
const sal_uLong nIndex = rOutNds[ i ]->GetIndex();
- const int nLvl = GetNodes()[ nIndex ]->GetTxtNode()->GetAttrOutlineLevel()-1;
+ const int nLvl = GetNodes()[ nIndex ]->GetTextNode()->GetAttrOutlineLevel()-1;
if( nLvl > nLevel )
continue;
long nEndOfs = 1;
@@ -1216,42 +1216,42 @@ void SwDoc::Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool bIm
rOutNds[ i + 1 ]->GetIndex() : GetNodes().Count();
bool bKeep = false;
while( ( nWish || bKeep ) && nIndex + nEndOfs < nNextOutNd &&
- GetNodes()[ nIndex + nEndOfs ]->IsTxtNode() )
+ GetNodes()[ nIndex + nEndOfs ]->IsTextNode() )
{
- SwTxtNode* pTxtNode = GetNodes()[ nIndex+nEndOfs ]->GetTxtNode();
- if (pTxtNode->GetTxt().getLength() && nWish)
+ SwTextNode* pTextNode = GetNodes()[ nIndex+nEndOfs ]->GetTextNode();
+ if (pTextNode->GetText().getLength() && nWish)
--nWish;
- bKeep = pTxtNode->GetSwAttrSet().GetKeep().GetValue();
+ bKeep = pTextNode->GetSwAttrSet().GetKeep().GetValue();
++nEndOfs;
}
SwNodeRange aRange( *rOutNds[ i ], 0, *rOutNds[ i ], nEndOfs );
GetNodes()._Copy( aRange, aEndOfDoc );
}
- const SwTxtFmtColls *pColl = pExtDoc->GetTxtFmtColls();
- for( SwTxtFmtColls::size_type i = 0; i < pColl->size(); ++i )
- (*pColl)[ i ]->ResetFmtAttr( RES_PAGEDESC, RES_BREAK );
+ const SwTextFormatColls *pColl = pExtDoc->GetTextFormatColls();
+ for( SwTextFormatColls::size_type i = 0; i < pColl->size(); ++i )
+ (*pColl)[ i ]->ResetFormatAttr( RES_PAGEDESC, RES_BREAK );
SwNodeIndex aIndx( pExtDoc->GetNodes().GetEndOfExtras() );
++aEndOfDoc;
while( aIndx < aEndOfDoc )
{
SwNode *pNode;
bool bDelete = false;
- if( (pNode = &aIndx.GetNode())->IsTxtNode() )
+ if( (pNode = &aIndx.GetNode())->IsTextNode() )
{
- SwTxtNode *pNd = pNode->GetTxtNode();
+ SwTextNode *pNd = pNode->GetTextNode();
if( pNd->HasSwAttrSet() )
pNd->ResetAttr( RES_PAGEDESC, RES_BREAK );
if( bImpress )
{
- SwTxtFmtColl* pMyColl = pNd->GetTxtColl();
+ SwTextFormatColl* pMyColl = pNd->GetTextColl();
const sal_uInt16 nHeadLine = static_cast<sal_uInt16>(
!pMyColl->IsAssignedToListLevelOfOutlineStyle()
? RES_POOLCOLL_HEADLINE2
: RES_POOLCOLL_HEADLINE1 );
- pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTxtCollFromPool( nHeadLine );
- pNd->ChgFmtColl( pMyColl );
+ pMyColl = pExtDoc->getIDocumentStylePoolAccess().GetTextCollFromPool( nHeadLine );
+ pNd->ChgFormatColl( pMyColl );
}
if( !pNd->Len() &&
pNd->StartOfSectionIndex()+2 < pNd->EndOfSectionIndex() )
@@ -1274,26 +1274,26 @@ bool SwDoc::RemoveInvisibleContent()
GetIDocumentUndoRedo().StartUndo( UNDO_UI_DELETE_INVISIBLECNTNT, NULL );
{
- SwTxtNode* pTxtNd;
- SwIterator<SwFmtFld,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD ) );
- for( SwFmtFld* pFmtFld = aIter.First(); pFmtFld; pFmtFld = aIter.Next() )
+ SwTextNode* pTextNd;
+ SwIterator<SwFormatField,SwFieldType> aIter( *getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD ) );
+ for( SwFormatField* pFormatField = aIter.First(); pFormatField; pFormatField = aIter.Next() )
{
- if( pFmtFld->GetTxtFld() &&
- 0 != ( pTxtNd = pFmtFld->GetTxtFld()->GetpTxtNode() ) &&
- pTxtNd->GetpSwpHints() && pTxtNd->HasHiddenParaField() &&
- &pTxtNd->GetNodes() == &GetNodes() )
+ if( pFormatField->GetTextField() &&
+ 0 != ( pTextNd = pFormatField->GetTextField()->GetpTextNode() ) &&
+ pTextNd->GetpSwpHints() && pTextNd->HasHiddenParaField() &&
+ &pTextNd->GetNodes() == &GetNodes() )
{
bRet = true;
- SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
+ SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
// Remove hidden paragraph or delete contents:
// Delete contents if
// 1. removing the paragraph would result in an empty section or
// 2. if the paragraph is the last paragraph in the section and
// there is no paragraph in front of the paragraph:
- if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
- ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
- !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+ if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+ ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+ !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
{
getIDocumentContentOperations().DeleteRange( aPam );
}
@@ -1309,12 +1309,12 @@ bool SwDoc::RemoveInvisibleContent()
// Remove any hidden paragraph (hidden text attribute)
for( sal_uLong n = GetNodes().Count(); n; )
{
- SwTxtNode* pTxtNd = GetNodes()[ --n ]->GetTxtNode();
- if ( pTxtNd )
+ SwTextNode* pTextNd = GetNodes()[ --n ]->GetTextNode();
+ if ( pTextNd )
{
bool bRemoved = false;
- SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
- if ( pTxtNd->HasHiddenCharAttribute( true ) )
+ SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+ if ( pTextNd->HasHiddenCharAttribute( true ) )
{
bRemoved = true;
bRet = true;
@@ -1324,9 +1324,9 @@ bool SwDoc::RemoveInvisibleContent()
// 1. removing the paragraph would result in an empty section or
// 2. if the paragraph is the last paragraph in the section and
// there is no paragraph in front of the paragraph:
- if ( ( 2 == pTxtNd->EndOfSectionIndex() - pTxtNd->StartOfSectionIndex() ) ||
- ( 1 == pTxtNd->EndOfSectionIndex() - pTxtNd->GetIndex() &&
- !GetNodes()[ pTxtNd->GetIndex() - 1 ]->GetTxtNode() ) )
+ if ( ( 2 == pTextNd->EndOfSectionIndex() - pTextNd->StartOfSectionIndex() ) ||
+ ( 1 == pTextNd->EndOfSectionIndex() - pTextNd->GetIndex() &&
+ !GetNodes()[ pTextNd->GetIndex() - 1 ]->GetTextNode() ) )
{
getIDocumentContentOperations().DeleteRange( aPam );
}
@@ -1336,11 +1336,11 @@ bool SwDoc::RemoveInvisibleContent()
getIDocumentContentOperations().DelFullPara( aPam );
}
}
- else if ( pTxtNd->HasHiddenCharAttribute( false ) )
+ else if ( pTextNd->HasHiddenCharAttribute( false ) )
{
bRemoved = true;
bRet = true;
- SwScriptInfo::DeleteHiddenRanges( *pTxtNd );
+ SwScriptInfo::DeleteHiddenRanges( *pTextNd );
}
// Footnotes/Frames may have been removed, therefore we have
@@ -1352,16 +1352,16 @@ bool SwDoc::RemoveInvisibleContent()
{
// Delete/empty all hidden areas
- SwSectionFmts aSectFmts;
- SwSectionFmts& rSectFmts = GetSections();
+ SwSectionFormats aSectFormats;
+ SwSectionFormats& rSectFormats = GetSections();
- for( SwSectionFmts::size_type n = rSectFmts.size(); n; )
+ for( SwSectionFormats::size_type n = rSectFormats.size(); n; )
{
- SwSectionFmt* pSectFmt = rSectFmts[ --n ];
+ SwSectionFormat* pSectFormat = rSectFormats[ --n ];
// don't add sections in Undo/Redo
- if( !pSectFmt->IsInNodesArr())
+ if( !pSectFormat->IsInNodesArr())
continue;
- SwSection* pSect = pSectFmt->GetSection();
+ SwSection* pSect = pSectFormat->GetSection();
if( pSect->CalcHiddenFlag() )
{
SwSection* pParent = pSect, *pTmp;
@@ -1372,10 +1372,10 @@ bool SwDoc::RemoveInvisibleContent()
pParent = pTmp;
}
- SwSectionFmts::iterator it = std::find(
- aSectFmts.begin(), aSectFmts.end(), pSect->GetFmt() );
- if (it == aSectFmts.end())
- aSectFmts.insert( aSectFmts.begin(), pSect->GetFmt() );
+ SwSectionFormats::iterator it = std::find(
+ aSectFormats.begin(), aSectFormats.end(), pSect->GetFormat() );
+ if (it == aSectFormats.end())
+ aSectFormats.insert( aSectFormats.begin(), pSect->GetFormat() );
}
if( !pSect->GetCondition().isEmpty() )
{
@@ -1386,14 +1386,14 @@ bool SwDoc::RemoveInvisibleContent()
}
}
- SwSectionFmts::size_type n = aSectFmts.size();
+ SwSectionFormats::size_type n = aSectFormats.size();
if( 0 != n )
{
while( n )
{
- SwSectionFmt* pSectFmt = aSectFmts[ --n ];
- SwSectionNode* pSectNd = pSectFmt->GetSectionNode();
+ SwSectionFormat* pSectFormat = aSectFormats[ --n ];
+ SwSectionNode* pSectNd = pSectFormat->GetSectionNode();
if( pSectNd )
{
bRet = true;
@@ -1405,7 +1405,7 @@ bool SwDoc::RemoveInvisibleContent()
pSectNd->EndOfSectionIndex() + 1 )
{
// only delete the content
- SwCntntNode* pCNd = GetNodes().GoNext(
+ SwContentNode* pCNd = GetNodes().GoNext(
&aPam.GetPoint()->nNode );
aPam.GetPoint()->nContent.Assign( pCNd, 0 );
aPam.SetMark();
@@ -1426,7 +1426,7 @@ bool SwDoc::RemoveInvisibleContent()
}
}
- aSectFmts.clear();
+ aSectFormats.clear();
}
}
@@ -1438,29 +1438,29 @@ bool SwDoc::RemoveInvisibleContent()
bool SwDoc::HasInvisibleContent() const
{
- if(SwIterator<SwFmtFld,SwFieldType>(*getIDocumentFieldsAccess().GetSysFldType( RES_HIDDENPARAFLD)).First())
+ if(SwIterator<SwFormatField,SwFieldType>(*getIDocumentFieldsAccess().GetSysFieldType( RES_HIDDENPARAFLD)).First())
return true;
// Search for any hidden paragraph (hidden text attribute)
for( sal_uLong n = GetNodes().Count()-1; n; --n)
{
- SwTxtNode* pTxtNd = GetNodes()[ n ]->GetTxtNode();
- if ( pTxtNd )
+ SwTextNode* pTextNd = GetNodes()[ n ]->GetTextNode();
+ if ( pTextNd )
{
- SwPaM aPam(*pTxtNd, 0, *pTxtNd, pTxtNd->GetTxt().getLength());
- if( pTxtNd->HasHiddenCharAttribute( true ) || ( pTxtNd->HasHiddenCharAttribute( false ) ) )
+ SwPaM aPam(*pTextNd, 0, *pTextNd, pTextNd->GetText().getLength());
+ if( pTextNd->HasHiddenCharAttribute( true ) || ( pTextNd->HasHiddenCharAttribute( false ) ) )
return true;
}
}
- const SwSectionFmts& rSectFmts = GetSections();
- for( SwSectionFmts::size_type n = rSectFmts.size()-1; n; --n )
+ const SwSectionFormats& rSectFormats = GetSections();
+ for( SwSectionFormats::size_type n = rSectFormats.size()-1; n; --n )
{
- SwSectionFmt* pSectFmt = rSectFmts[ n ];
+ SwSectionFormat* pSectFormat = rSectFormats[ n ];
// don't add sections in Undo/Redo
- if( !pSectFmt->IsInNodesArr())
+ if( !pSectFormat->IsInNodesArr())
continue;
- SwSection* pSect = pSectFmt->GetSection();
+ SwSection* pSect = pSectFormat->GetSection();
if( pSect->IsHidden() )
return true;
}
@@ -1483,40 +1483,40 @@ bool SwDoc::RestoreInvisibleContent()
bool SwDoc::ConvertFieldsToText()
{
bool bRet = false;
- getIDocumentFieldsAccess().LockExpFlds();
+ getIDocumentFieldsAccess().LockExpFields();
GetIDocumentUndoRedo().StartUndo( UNDO_UI_REPLACE, NULL );
- const SwFldTypes* pMyFldTypes = getIDocumentFieldsAccess().GetFldTypes();
- const SwFldTypes::size_type nCount = pMyFldTypes->size();
+ const SwFieldTypes* pMyFieldTypes = getIDocumentFieldsAccess().GetFieldTypes();
+ const SwFieldTypes::size_type nCount = pMyFieldTypes->size();
//go backward, field types are removed
- for(SwFldTypes::size_type nType = nCount; nType > 0; --nType)
+ for(SwFieldTypes::size_type nType = nCount; nType > 0; --nType)
{
- const SwFieldType *pCurType = (*pMyFldTypes)[nType - 1];
+ const SwFieldType *pCurType = (*pMyFieldTypes)[nType - 1];
if ( RES_POSTITFLD == pCurType->Which() )
continue;
- SwIterator<SwFmtFld,SwFieldType> aIter( *pCurType );
- ::std::vector<const SwFmtFld*> aFieldFmts;
- for( SwFmtFld* pCurFldFmt = aIter.First(); pCurFldFmt; pCurFldFmt = aIter.Next() )
- aFieldFmts.push_back(pCurFldFmt);
+ SwIterator<SwFormatField,SwFieldType> aIter( *pCurType );
+ ::std::vector<const SwFormatField*> aFieldFormats;
+ for( SwFormatField* pCurFieldFormat = aIter.First(); pCurFieldFormat; pCurFieldFormat = aIter.Next() )
+ aFieldFormats.push_back(pCurFieldFormat);
- ::std::vector<const SwFmtFld*>::iterator aBegin = aFieldFmts.begin();
- ::std::vector<const SwFmtFld*>::iterator aEnd = aFieldFmts.end();
+ ::std::vector<const SwFormatField*>::iterator aBegin = aFieldFormats.begin();
+ ::std::vector<const SwFormatField*>::iterator aEnd = aFieldFormats.end();
while(aBegin != aEnd)
{
- const SwTxtFld *pTxtFld = (*aBegin)->GetTxtFld();
+ const SwTextField *pTextField = (*aBegin)->GetTextField();
// skip fields that are currently not in the document
// e.g. fields in undo or redo array
- bool bSkip = !pTxtFld ||
- !pTxtFld->GetpTxtNode()->GetNodes().IsDocNodes();
+ bool bSkip = !pTextField ||
+ !pTextField->GetpTextNode()->GetNodes().IsDocNodes();
if (!bSkip)
{
- bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTxtFld->GetpTxtNode()));
- const SwFmtFld& rFmtFld = pTxtFld->GetFmtFld();
- const SwField* pField = rFmtFld.GetField();
+ bool bInHeaderFooter = IsInHeaderFooter(SwNodeIndex(*pTextField->GetpTextNode()));
+ const SwFormatField& rFormatField = pTextField->GetFormatField();
+ const SwField* pField = rFormatField.GetField();
//#i55595# some fields have to be excluded in headers/footers
sal_uInt16 nWhich = pField->GetTyp()->Which();
@@ -1535,15 +1535,15 @@ bool SwDoc::ConvertFieldsToText()
if( RES_DBFLD == pCurType->Which() && !static_cast<const SwDBField*>(pField)->IsInitialized())
sText.clear();
- SwPaM aInsertPam(*pTxtFld->GetpTxtNode(), pTxtFld->GetStart());
+ SwPaM aInsertPam(*pTextField->GetpTextNode(), pTextField->GetStart());
aInsertPam.SetMark();
// go to the end of the field
- const SwTxtFld *pFieldAtEnd = sw::DocumentFieldsManager::GetTxtFldAtPos(*aInsertPam.End());
+ const SwTextField *pFieldAtEnd = sw::DocumentFieldsManager::GetTextFieldAtPos(*aInsertPam.End());
if (pFieldAtEnd && pFieldAtEnd->Which() == RES_TXTATR_INPUTFIELD)
{
SwPosition &rEndPos = *aInsertPam.GetPoint();
- rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( *aInsertPam.End() );
+ rEndPos.nContent = SwCrsrShell::EndOfInputFieldAtPos( *aInsertPam.End() );
}
else
{
@@ -1580,24 +1580,24 @@ bool SwDoc::ConvertFieldsToText()
if( bRet )
getIDocumentState().SetModified();
GetIDocumentUndoRedo().EndUndo( UNDO_UI_REPLACE, NULL );
- getIDocumentFieldsAccess().UnlockExpFlds();
+ getIDocumentFieldsAccess().UnlockExpFields();
return bRet;
}
-bool SwDoc::IsInsTblFormatNum() const
+bool SwDoc::IsInsTableFormatNum() const
{
- return SW_MOD()->IsInsTblFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+ return SW_MOD()->IsInsTableFormatNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
}
-bool SwDoc::IsInsTblChangeNumFormat() const
+bool SwDoc::IsInsTableChangeNumFormat() const
{
- return SW_MOD()->IsInsTblChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+ return SW_MOD()->IsInsTableChangeNumFormat(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
}
-bool SwDoc::IsInsTblAlignNum() const
+bool SwDoc::IsInsTableAlignNum() const
{
- return SW_MOD()->IsInsTblAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
+ return SW_MOD()->IsInsTableAlignNum(GetDocumentSettingManager().get(DocumentSettingId::HTML_MODE));
}
/// Set up the InsertDB as Undo table
@@ -1605,11 +1605,11 @@ void SwDoc::AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable )
{
if( bIsTable )
{
- const SwTableNode* pTblNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
- if( pTblNd )
+ const SwTableNode* pTableNd = rPam.GetPoint()->nNode.GetNode().FindTableNode();
+ if( pTableNd )
{
- SwUndoCpyTbl* pUndo = new SwUndoCpyTbl;
- pUndo->SetTableSttIdx( pTblNd->GetIndex() );
+ SwUndoCpyTable* pUndo = new SwUndoCpyTable;
+ pUndo->SetTableSttIdx( pTableNd->GetIndex() );
GetIDocumentUndoRedo().AppendUndo( pUndo );
}
}
@@ -1645,15 +1645,15 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
{
if (&rPam.GetNode(true) == &rPam.GetNode(false))
{
- SwTxtNode * pTxtNode = rPam.GetNode(true).GetTxtNode();
+ SwTextNode * pTextNode = rPam.GetNode(true).GetTextNode();
- if (0 != pTxtNode)
+ if (0 != pTextNode)
{
const sal_Int32 nStart = rPam.Start()->nContent.GetIndex();
const sal_Int32 nEnd = rPam.End()->nContent.GetIndex();
return SW_RESSTR(STR_START_QUOTE)
- + ShortenString(pTxtNode->GetTxt().copy(nStart, nEnd - nStart),
+ + ShortenString(pTextNode->GetText().copy(nStart, nEnd - nStart),
nUndoStringLength,
SW_RESSTR(STR_LDOTS))
+ SW_RESSTR(STR_END_QUOTE);
@@ -1672,30 +1672,30 @@ bool SwDoc::ContainsHiddenChars() const
for( sal_uLong n = GetNodes().Count(); n; )
{
SwNode* pNd = GetNodes()[ --n ];
- if ( pNd->IsTxtNode() && pNd->GetTxtNode()->HasHiddenCharAttribute( false ) )
+ if ( pNd->IsTextNode() && pNd->GetTextNode()->HasHiddenCharAttribute( false ) )
return true;
}
return false;
}
-SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr )
+SwUnoCrsr* SwDoc::CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr )
{
SwUnoCrsr* pNew;
- if( bTblCrsr )
+ if( bTableCrsr )
pNew = new SwUnoTableCrsr( rPos );
else
pNew = new SwUnoCrsr( rPos );
- mpUnoCrsrTbl->insert( pNew );
+ mpUnoCrsrTable->insert( pNew );
return pNew;
}
void SwDoc::ChkCondColls()
{
- for (SwTxtFmtColls::size_type n = 0; n < mpTxtFmtCollTbl->size(); ++n)
+ for (SwTextFormatColls::size_type n = 0; n < mpTextFormatCollTable->size(); ++n)
{
- SwTxtFmtColl *pColl = (*mpTxtFmtCollTbl)[n];
+ SwTextFormatColl *pColl = (*mpTextFormatCollTable)[n];
if (RES_CONDTXTFMTCOLL == pColl->Which())
pColl->CallSwClientNotify( SwAttrHint(RES_CONDTXTFMTCOLL) );
}
diff --git a/sw/source/core/doc/docbasic.cxx b/sw/source/core/doc/docbasic.cxx
index e28666606618..48c92bb71d9d 100644
--- a/sw/source/core/doc/docbasic.cxx
+++ b/sw/source/core/doc/docbasic.cxx
@@ -137,7 +137,7 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
return 0;
sal_uInt16 nRet = 0;
- const SvxMacroTableDtor* pTbl = 0;
+ const SvxMacroTableDtor* pTable = 0;
switch( rCallEvent.eType )
{
case EVENT_OBJECT_INETATTR:
@@ -156,20 +156,20 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
}
}
if( !bCheckPtr )
- pTbl = rCallEvent.PTR.pINetAttr->GetMacroTbl();
+ pTable = rCallEvent.PTR.pINetAttr->GetMacroTable();
break;
case EVENT_OBJECT_URLITEM:
case EVENT_OBJECT_IMAGE:
{
- const SwFrmFmt* pFmt = rCallEvent.PTR.pFmt;
+ const SwFrameFormat* pFormat = rCallEvent.PTR.pFormat;
if( bCheckPtr )
{
- if ( GetSpzFrmFmts()->Contains( pFmt ) )
+ if ( GetSpzFrameFormats()->Contains( pFormat ) )
bCheckPtr = false; // misuse as a flag
}
if( !bCheckPtr )
- pTbl = &pFmt->GetMacro().GetMacroTable();
+ pTable = &pFormat->GetMacro().GetMacroTable();
}
break;
@@ -178,10 +178,10 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
const IMapObject* pIMapObj = rCallEvent.PTR.IMAP.pIMapObj;
if( bCheckPtr )
{
- const SwFrmFmt* pFmt = rCallEvent.PTR.IMAP.pFmt;
+ const SwFrameFormat* pFormat = rCallEvent.PTR.IMAP.pFormat;
const ImageMap* pIMap;
- if( GetSpzFrmFmts()->Contains( pFmt ) &&
- 0 != (pIMap = pFmt->GetURL().GetMap()) )
+ if( GetSpzFrameFormats()->Contains( pFormat ) &&
+ 0 != (pIMap = pFormat->GetURL().GetMap()) )
{
for( size_t nPos = pIMap->GetIMapObjectCount(); nPos; )
if( pIMapObj == pIMap->GetIMapObject( --nPos ))
@@ -192,19 +192,19 @@ sal_uInt16 SwDoc::CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent& rCallEve
}
}
if( !bCheckPtr )
- pTbl = &pIMapObj->GetMacroTable();
+ pTable = &pIMapObj->GetMacroTable();
}
break;
default:
break;
}
- if( pTbl )
+ if( pTable )
{
nRet = 0x1;
- if( pTbl->IsKeyValid( nEvent ) )
+ if( pTable->IsKeyValid( nEvent ) )
{
- const SvxMacro& rMacro = *pTbl->Get( nEvent );
+ const SvxMacro& rMacro = *pTable->Get( nEvent );
if( STARBASIC == rMacro.GetScriptType() )
{
nRet += 0 == mpDocShell->CallBasic( rMacro.GetMacName(),
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index 3975e13b0a35..9b9f143320d7 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -101,25 +101,25 @@ namespace
pMark);
}
- static inline ::std::unique_ptr<SwPosition> lcl_PositionFromCntntNode(
- SwCntntNode * const pCntntNode,
+ static inline ::std::unique_ptr<SwPosition> lcl_PositionFromContentNode(
+ SwContentNode * const pContentNode,
const bool bAtEnd=false)
{
- ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pCntntNode));
- pResult->nContent.Assign(pCntntNode, bAtEnd ? pCntntNode->Len() : 0);
+ ::std::unique_ptr<SwPosition> pResult(new SwPosition(*pContentNode));
+ pResult->nContent.Assign(pContentNode, bAtEnd ? pContentNode->Len() : 0);
return pResult;
}
- // return a position at the begin of rEnd, if it is a CntntNode
+ // return a position at the begin of rEnd, if it is a ContentNode
// else set it to the begin of the Node after rEnd, if there is one
// else set it to the end of the node before rStt
- // else set it to the CntntNode of the Pos outside the Range
+ // else set it to the ContentNode of the Pos outside the Range
static inline ::std::unique_ptr<SwPosition> lcl_FindExpelPosition(
const SwNodeIndex& rStt,
const SwNodeIndex& rEnd,
const SwPosition& rOtherPosition)
{
- SwCntntNode * pNode = rEnd.GetNode().GetCntntNode();
+ SwContentNode * pNode = rEnd.GetNode().GetContentNode();
bool bPosAtEndOfNode = false;
if ( pNode == NULL)
{
@@ -135,7 +135,7 @@ namespace
}
if ( pNode != NULL )
{
- return lcl_PositionFromCntntNode( pNode, bPosAtEndOfNode );
+ return lcl_PositionFromContentNode( pNode, bPosAtEndOfNode );
}
return ::std::unique_ptr<SwPosition>(new SwPosition(rOtherPosition));
@@ -333,11 +333,11 @@ OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()
bool IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
{
- return rPaM.Start()->nNode.GetNode().IsTxtNode() &&
+ return rPaM.Start()->nNode.GetNode().IsTextNode() &&
rPaM.Start()->nContent.GetIndex() == 0 &&
( !rPaM.HasMark() ||
( rPaM.GetMark()->nNode == rPaM.GetPoint()->nNode &&
- rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTxtNode()->Len() ) );
+ rPaM.End()->nContent.GetIndex() == rPaM.End()->nNode.GetNode().GetTextNode()->Len() ) );
}
namespace sw { namespace mark
@@ -369,7 +369,7 @@ namespace sw { namespace mark
pPos2->nContent.GetIndex());
}
#endif
- // see for example _SaveCntntIdx, Shells
+ // see for example _SaveContentIdx, Shells
OSL_PRECOND(m_vAllMarks.size() < USHRT_MAX,
"MarkManager::makeMark(..)"
" - more than USHRT_MAX marks are not supported correctly");
@@ -494,12 +494,12 @@ namespace sw { namespace mark
return pFieldMark;
}
- ::sw::mark::IMark* MarkManager::getMarkForTxtNode(
- const SwTxtNode& rTxtNode,
+ ::sw::mark::IMark* MarkManager::getMarkForTextNode(
+ const SwTextNode& rTextNode,
const IDocumentMarkAccess::MarkType eType )
{
- SwPosition aPos(rTxtNode);
- aPos.nContent.Assign(&(const_cast<SwTxtNode&>(rTxtNode)), 0);
+ SwPosition aPos(rTextNode);
+ aPos.nContent.Assign(&(const_cast<SwTextNode&>(rTextNode)), 0);
const iterator_t ppExistingMark = lcl_FindMarkAtPos(m_vBookmarks, aPos, eType);
if(ppExistingMark != m_vBookmarks.end())
return ppExistingMark->get();
@@ -1208,31 +1208,31 @@ SaveBookmark::SaveBookmark(
}
}
m_nNode1 = rBkmk.GetMarkPos().nNode.GetIndex();
- m_nCntnt1 = rBkmk.GetMarkPos().nContent.GetIndex();
+ m_nContent1 = rBkmk.GetMarkPos().nContent.GetIndex();
if(m_bSavePos)
{
m_nNode1 -= rMvPos.GetIndex();
if(pIdx && !m_nNode1)
- m_nCntnt1 -= pIdx->GetIndex();
+ m_nContent1 -= pIdx->GetIndex();
}
if(rBkmk.IsExpanded())
{
m_nNode2 = rBkmk.GetOtherMarkPos().nNode.GetIndex();
- m_nCntnt2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
+ m_nContent2 = rBkmk.GetOtherMarkPos().nContent.GetIndex();
if(m_bSaveOtherPos)
{
m_nNode2 -= rMvPos.GetIndex();
if(pIdx && !m_nNode2)
- m_nCntnt2 -= pIdx->GetIndex();
+ m_nContent2 -= pIdx->GetIndex();
}
}
else
{
m_nNode2 = ULONG_MAX;
- m_nCntnt2 = -1;
+ m_nContent2 = -1;
}
}
@@ -1253,14 +1253,14 @@ void SaveBookmark::SetInDoc(
{
aPam.GetMark()->nNode += m_nNode2;
if(pIdx && !m_nNode2)
- aPam.GetMark()->nContent += m_nCntnt2;
+ aPam.GetMark()->nContent += m_nContent2;
else
- aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+ aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
}
else
{
aPam.GetMark()->nNode = m_nNode2;
- aPam.GetMark()->nContent.Assign(aPam.GetCntntNode(false), m_nCntnt2);
+ aPam.GetMark()->nContent.Assign(aPam.GetContentNode(false), m_nContent2);
}
}
@@ -1269,14 +1269,14 @@ void SaveBookmark::SetInDoc(
aPam.GetPoint()->nNode += m_nNode1;
if(pIdx && !m_nNode1)
- aPam.GetPoint()->nContent += m_nCntnt1;
+ aPam.GetPoint()->nContent += m_nContent1;
else
- aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+ aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
}
else
{
aPam.GetPoint()->nNode = m_nNode1;
- aPam.GetPoint()->nContent.Assign(aPam.GetCntntNode(), m_nCntnt1);
+ aPam.GetPoint()->nContent.Assign(aPam.GetContentNode(), m_nContent1);
}
if(!aPam.HasMark()
@@ -1321,11 +1321,11 @@ void _DelBookmarks(
// Copy all Redlines which are in the move area into an array
// which holds all position information as offset.
// Assignement happens after moving.
- SwRedlineTbl& rTbl = pDoc->getIDocumentRedlineAccess().GetRedlineTbl();
- for(SwRedlineTbl::size_type nCnt = 0; nCnt < rTbl.size(); ++nCnt )
+ SwRedlineTable& rTable = pDoc->getIDocumentRedlineAccess().GetRedlineTable();
+ for(SwRedlineTable::size_type nCnt = 0; nCnt < rTable.size(); ++nCnt )
{
// Is at position?
- SwRangeRedline* pRedl = rTbl[ nCnt ];
+ SwRangeRedline* pRedl = rTable[ nCnt ];
SwPosition *const pRStt = pRedl->Start();
SwPosition *const pREnd = pRedl->End();
@@ -1338,7 +1338,7 @@ void _DelBookmarks(
else
{
bool bStt = true;
- SwCntntNode* pCNd = pRStt->nNode.GetNode().GetCntntNode();
+ SwContentNode* pCNd = pRStt->nNode.GetNode().GetContentNode();
if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoNext( &pRStt->nNode )) )
{
bStt = false;
@@ -1346,7 +1346,7 @@ void _DelBookmarks(
if( 0 == ( pCNd = SwNodes::GoPrevious( &pRStt->nNode )) )
{
pRStt->nNode = pREnd->nNode;
- pCNd = pRStt->nNode.GetNode().GetCntntNode();
+ pCNd = pRStt->nNode.GetNode().GetContentNode();
}
}
pRStt->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
@@ -1360,7 +1360,7 @@ void _DelBookmarks(
else
{
bool bStt = false;
- SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
+ SwContentNode* pCNd = pREnd->nNode.GetNode().GetContentNode();
if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &pREnd->nNode )) )
{
bStt = true;
@@ -1368,7 +1368,7 @@ void _DelBookmarks(
if( 0 == ( pCNd = pDoc->GetNodes().GoNext( &pREnd->nNode )) )
{
pREnd->nNode = pRStt->nNode;
- pCNd = pREnd->nNode.GetNode().GetCntntNode();
+ pCNd = pREnd->nNode.GetNode().GetContentNode();
}
}
pREnd->nContent.Assign( pCNd, bStt ? 0 : pCNd->Len() );
diff --git a/sw/source/core/doc/docchart.cxx b/sw/source/core/doc/docchart.cxx
index 6c5b45997824..1354afaa51f5 100644
--- a/sw/source/core/doc/docchart.cxx
+++ b/sw/source/core/doc/docchart.cxx
@@ -43,10 +43,10 @@
void SwTable::UpdateCharts() const
{
- GetFrmFmt()->GetDoc()->UpdateCharts( GetFrmFmt()->GetName() );
+ GetFrameFormat()->GetDoc()->UpdateCharts( GetFrameFormat()->GetName() );
}
-bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
+bool SwTable::IsTableComplexForChart( const OUString& rSelection ) const
{
const SwTableBox* pSttBox, *pEndBox;
if( 2 < rSelection.getLength() )
@@ -59,8 +59,8 @@ bool SwTable::IsTblComplexForChart( const OUString& rSelection ) const
const sal_Int32 nLength {'>' == rSelection[ rSelection.getLength()-1 ]
? rSelection.getLength()-1 : rSelection.getLength()};
- pSttBox = GetTblBox(rSelection.copy( nOffset, nSeparator - nOffset ));
- pEndBox = GetTblBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
+ pSttBox = GetTableBox(rSelection.copy( nOffset, nSeparator - nOffset ));
+ pEndBox = GetTableBox(rSelection.copy( nSeparator+1, nLength - (nSeparator+1) ));
}
else
{
@@ -90,26 +90,26 @@ void SwDoc::DoUpdateAllCharts()
SwViewShell* pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
if( pVSh )
{
- const SwFrmFmts& rTblFmts = *GetTblFrmFmts();
- for( size_t n = 0; n < rTblFmts.size(); ++n )
+ const SwFrameFormats& rTableFormats = *GetTableFrameFormats();
+ for( size_t n = 0; n < rTableFormats.size(); ++n )
{
- SwTable* pTmpTbl;
- const SwTableNode* pTblNd;
- const SwFrmFmt* pFmt = rTblFmts[ n ];
+ SwTable* pTmpTable;
+ const SwTableNode* pTableNd;
+ const SwFrameFormat* pFormat = rTableFormats[ n ];
- if( 0 != ( pTmpTbl = SwTable::FindTable( pFmt ) ) &&
- 0 != ( pTblNd = pTmpTbl->GetTableNode() ) &&
- pTblNd->GetNodes().IsDocNodes() )
+ if( 0 != ( pTmpTable = SwTable::FindTable( pFormat ) ) &&
+ 0 != ( pTableNd = pTmpTable->GetTableNode() ) &&
+ pTableNd->GetNodes().IsDocNodes() )
{
- _UpdateCharts( *pTmpTbl, *pVSh );
+ _UpdateCharts( *pTmpTable, *pVSh );
}
}
}
}
-void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
+void SwDoc::_UpdateCharts( const SwTable& rTable, SwViewShell const & rVSh ) const
{
- OUString aName( rTbl.GetFrmFmt()->GetName() );
+ OUString aName( rTable.GetFrameFormat()->GetName() );
SwStartNode *pStNd;
SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
while( 0 != (pStNd = aIdx.GetNode().GetStartNode()) )
@@ -117,12 +117,12 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
++aIdx;
SwOLENode *pONd;
if( 0 != ( pONd = aIdx.GetNode().GetOLENode() ) &&
- aName == pONd->GetChartTblName() &&
+ aName == pONd->GetChartTableName() &&
pONd->getLayoutFrm( rVSh.GetLayout() ) )
{
SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
if (pPCD)
- pPCD->InvalidateTable( &rTbl );
+ pPCD->InvalidateTable( &rTable );
// following this the framework will now take care of repainting
// the chart or it's replacement image...
}
@@ -132,29 +132,29 @@ void SwDoc::_UpdateCharts( const SwTable& rTbl, SwViewShell const & rVSh ) const
void SwDoc::UpdateCharts( const OUString &rName ) const
{
- SwTable* pTmpTbl = SwTable::FindTable( FindTblFmtByName( rName ) );
- if( pTmpTbl )
+ SwTable* pTmpTable = SwTable::FindTable( FindTableFormatByName( rName ) );
+ if( pTmpTable )
{
SwViewShell const * pVSh = getIDocumentLayoutAccess().GetCurrentViewShell();
if( pVSh )
- _UpdateCharts( *pTmpTbl, *pVSh );
+ _UpdateCharts( *pTmpTable, *pVSh );
}
}
-void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
+void SwDoc::SetTableName( SwFrameFormat& rTableFormat, const OUString &rNewName )
{
- const OUString aOldName( rTblFmt.GetName() );
+ const OUString aOldName( rTableFormat.GetName() );
bool bNameFound = rNewName.isEmpty();
if( !bNameFound )
{
- const SwFrmFmts& rTbl = *GetTblFrmFmts();
- for( size_t i = rTbl.size(); i; )
+ const SwFrameFormats& rTable = *GetTableFrameFormats();
+ for( size_t i = rTable.size(); i; )
{
- const SwFrmFmt* pFmt;
- if( !( pFmt = rTbl[ --i ] )->IsDefault() &&
- pFmt->GetName() == rNewName && IsUsed( *pFmt ) )
+ const SwFrameFormat* pFormat;
+ if( !( pFormat = rTable[ --i ] )->IsDefault() &&
+ pFormat->GetName() == rNewName && IsUsed( *pFormat ) )
{
bNameFound = true;
break;
@@ -163,9 +163,9 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
}
if( !bNameFound )
- rTblFmt.SetName( rNewName, true );
+ rTableFormat.SetName( rNewName, true );
else
- rTblFmt.SetName( GetUniqueTblName(), true );
+ rTableFormat.SetName( GetUniqueTableName(), true );
SwStartNode *pStNd;
SwNodeIndex aIdx( *GetNodes().GetEndOfAutotext().StartOfSectionNode(), 1 );
@@ -173,11 +173,11 @@ void SwDoc::SetTableName( SwFrmFmt& rTblFmt, const OUString &rNewName )
{
++aIdx;
SwOLENode *pNd = aIdx.GetNode().GetOLENode();
- if( pNd && aOldName == pNd->GetChartTblName() )
+ if( pNd && aOldName == pNd->GetChartTableName() )
{
- pNd->SetChartTblName( rNewName );
+ pNd->SetChartTableName( rNewName );
- SwTable* pTable = SwTable::FindTable( &rTblFmt );
+ SwTable* pTable = SwTable::FindTable( &rTableFormat );
SwChartDataProvider *pPCD = getIDocumentChartDataProviderAccess().GetChartDataProvider();
if (pPCD)
pPCD->InvalidateTable( pTable );
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index e53e37c09409..df1886680394 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -146,11 +146,11 @@ public:
}
};
-class CompareFrmFmtText : public CompareData
+class CompareFrameFormatText : public CompareData
{
const SwNodeIndex &m_rIndex;
public:
- CompareFrmFmtText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
+ CompareFrameFormatText(SwDoc &rD, const SwNodeIndex &rIndex, bool bRecordDiff=true)
: CompareData(rD, bRecordDiff)
, m_rIndex(rIndex)
{
@@ -261,14 +261,14 @@ public:
class WordArrayComparator : public ArrayComparator
{
private:
- const SwTxtNode *pTxtNd1, *pTxtNd2;
+ const SwTextNode *pTextNd1, *pTextNd2;
int *pPos1, *pPos2;
int nCnt1, nCnt2; // number of words
- static void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
+ static void CalcPositions( int *pPos, const SwTextNode *pTextNd, int &nCnt );
public:
- WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
+ WordArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 );
virtual ~WordArrayComparator();
virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
@@ -281,17 +281,17 @@ public:
class CharArrayComparator : public ArrayComparator
{
private:
- const SwTxtNode *pTxtNd1, *pTxtNd2;
+ const SwTextNode *pTextNd1, *pTextNd2;
public:
- CharArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 )
- : pTxtNd1( pNode1 ), pTxtNd2( pNode2 )
+ CharArrayComparator( const SwTextNode *pNode1, const SwTextNode *pNode2 )
+ : pTextNd1( pNode1 ), pTextNd2( pNode2 )
{
}
virtual bool Compare( int nIdx1, int nIdx2 ) const SAL_OVERRIDE;
- virtual int GetLen1() const SAL_OVERRIDE { return pTxtNd1->GetTxt().getLength(); }
- virtual int GetLen2() const SAL_OVERRIDE { return pTxtNd2->GetTxt().getLength(); }
+ virtual int GetLen1() const SAL_OVERRIDE { return pTextNd1->GetText().getLength(); }
+ virtual int GetLen2() const SAL_OVERRIDE { return pTextNd2->GetText().getLength(); }
};
/// Options set in Tools->Options->Writer->Comparison
@@ -999,10 +999,10 @@ public:
virtual sal_uLong GetHashValue() const SAL_OVERRIDE;
virtual bool Compare( const CompareLine& rLine ) const SAL_OVERRIDE;
- static sal_uLong GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal );
+ static sal_uLong GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal );
static bool CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd );
- static bool CompareTxtNd( const SwTxtNode& rDstNd,
- const SwTxtNode& rSrcNd );
+ static bool CompareTextNd( const SwTextNode& rDstNd,
+ const SwTextNode& rSrcNd );
bool ChangesInLine( const SwCompareLine& rLine,
SwPaM *& rpInsRing, SwPaM*& rpDelRing ) const;
@@ -1030,7 +1030,7 @@ sal_uLong SwCompareLine::GetHashValue() const
switch( rNode.GetNodeType() )
{
case ND_TEXTNODE:
- nRet = GetTxtNodeHashValue( *rNode.GetTxtNode(), nRet );
+ nRet = GetTextNodeHashValue( *rNode.GetTextNode(), nRet );
break;
case ND_TABLENODE:
@@ -1039,8 +1039,8 @@ sal_uLong SwCompareLine::GetHashValue() const
SwNodeIndex aIdx( rNode );
while( &aIdx.GetNode() != pEndNd )
{
- if( aIdx.GetNode().IsTxtNode() )
- nRet = GetTxtNodeHashValue( *aIdx.GetNode().GetTxtNode(), nRet );
+ if( aIdx.GetNode().IsTextNode() )
+ nRet = GetTextNodeHashValue( *aIdx.GetNode().GetTextNode(), nRet );
++aIdx;
}
}
@@ -1097,13 +1097,13 @@ namespace
SwNodeIndex aIdx( rNode );
while (&aIdx.GetNode() != pEndNd)
{
- if (aIdx.GetNode().IsTxtNode())
+ if (aIdx.GetNode().IsTextNode())
{
if (sRet.getLength())
{
sRet.append( '\n' );
}
- sRet.append( aIdx.GetNode().GetTxtNode()->GetExpandTxt() );
+ sRet.append( aIdx.GetNode().GetTextNode()->GetExpandText() );
}
++aIdx;
}
@@ -1121,8 +1121,8 @@ bool SwCompareLine::CompareNode( const SwNode& rDstNd, const SwNode& rSrcNd )
switch( rDstNd.GetNodeType() )
{
case ND_TEXTNODE:
- bRet = CompareTxtNd( *rDstNd.GetTxtNode(), *rSrcNd.GetTxtNode() )
- && ( !CmpOptions.bUseRsid || rDstNd.GetTxtNode()->CompareParRsid( *rSrcNd.GetTxtNode() ) );
+ bRet = CompareTextNd( *rDstNd.GetTextNode(), *rSrcNd.GetTextNode() )
+ && ( !CmpOptions.bUseRsid || rDstNd.GetTextNode()->CompareParRsid( *rSrcNd.GetTextNode() ) );
break;
case ND_TABLENODE:
@@ -1210,7 +1210,7 @@ OUString SwCompareLine::GetText() const
switch( rNode.GetNodeType() )
{
case ND_TEXTNODE:
- sRet = rNode.GetTxtNode()->GetExpandTxt();
+ sRet = rNode.GetTextNode()->GetExpandText();
break;
case ND_TABLENODE:
@@ -1261,20 +1261,20 @@ OUString SwCompareLine::GetText() const
return sRet;
}
-sal_uLong SwCompareLine::GetTxtNodeHashValue( const SwTxtNode& rNd, sal_uLong nVal )
+sal_uLong SwCompareLine::GetTextNodeHashValue( const SwTextNode& rNd, sal_uLong nVal )
{
- OUString sStr( rNd.GetExpandTxt() );
+ OUString sStr( rNd.GetExpandText() );
for( sal_Int32 n = 0; n < sStr.getLength(); ++n )
( nVal <<= 1 ) += sStr[ n ];
return nVal;
}
-bool SwCompareLine::CompareTxtNd( const SwTxtNode& rDstNd,
- const SwTxtNode& rSrcNd )
+bool SwCompareLine::CompareTextNd( const SwTextNode& rDstNd,
+ const SwTextNode& rSrcNd )
{
bool bRet = false;
// Very simple at first
- if( rDstNd.GetTxt() == rSrcNd.GetTxt() )
+ if( rDstNd.GetText() == rSrcNd.GetText() )
{
// The text is the same, but are the "special attributes" (0xFF) also the same?
bRet = true;
@@ -1291,14 +1291,14 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
if( ND_TEXTNODE == rNode.GetNodeType() &&
ND_TEXTNODE == rLine.GetNode().GetNodeType() )
{
- SwTxtNode& rDstNd = *const_cast<SwTxtNode*>(rNode.GetTxtNode());
- const SwTxtNode& rSrcNd = *rLine.GetNode().GetTxtNode();
+ SwTextNode& rDstNd = *const_cast<SwTextNode*>(rNode.GetTextNode());
+ const SwTextNode& rSrcNd = *rLine.GetNode().GetTextNode();
SwDoc* pDstDoc = rDstNd.GetDoc();
int nLcsLen = 0;
- int nDstLen = rDstNd.GetTxt().getLength();
- int nSrcLen = rSrcNd.GetTxt().getLength();
+ int nDstLen = rDstNd.GetText().getLength();
+ int nSrcLen = rSrcNd.GetText().getLength();
int nMinLen = std::min( nDstLen , nSrcLen );
int nAvgLen = ( nDstLen + nSrcLen )/2;
@@ -1669,7 +1669,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
if( pTmp->GetPoint()->nContent == 0 )
{
++pTmp->GetPoint()->nNode;
- pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+ pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
}
// #i101009#
// prevent redlines that end on structural end node
@@ -1677,7 +1677,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
& pTmp->GetPoint()->nNode.GetNode())
{
--pTmp->GetPoint()->nNode;
- SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+ SwContentNode *const pContentNode( pTmp->GetContentNode() );
pTmp->GetPoint()->nContent.Assign( pContentNode,
(pContentNode) ? pContentNode->Len() : 0 );
}
@@ -1701,7 +1701,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
if( pTmp->GetPoint()->nContent == 0 )
{
++pTmp->GetPoint()->nNode;
- pTmp->GetPoint()->nContent.Assign( pTmp->GetCntntNode(), 0 );
+ pTmp->GetPoint()->nContent.Assign( pTmp->GetContentNode(), 0 );
}
// #i101009#
// prevent redlines that end on structural end node
@@ -1709,7 +1709,7 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
& pTmp->GetPoint()->nNode.GetNode())
{
--pTmp->GetPoint()->nNode;
- SwCntntNode *const pContentNode( pTmp->GetCntntNode() );
+ SwContentNode *const pContentNode( pTmp->GetContentNode() );
pTmp->GetPoint()->nContent.Assign( pContentNode,
(pContentNode) ? pContentNode->Len() : 0 );
}
@@ -1720,14 +1720,14 @@ void CompareData::SetRedlinesToDoc( bool bUseDocInfo )
// combine consecutive
if( pTmp->GetNext() != pInsRing )
{
- const SwCntntNode* pCNd;
+ const SwContentNode* pCNd;
do {
SwPosition& rSttEnd = *pTmp->End(),