summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2015-05-20 13:05:49 +0200
commitab465b90f6c6da5595393a0ba73f33a1e71a2b65 (patch)
tree36b77192de2799a11b4bf0b269cb3f74d0a0bb1f /sw/source
parent0db96caf0fcce09b87621c11b584a6d81cc7df86 (diff)
bin/rename-sw-abbreviations.shlibreoffice-5-0-branch-point
renames the most annoying abbreviations in Writer (and partially in the shared code too). Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
Diffstat (limited to 'sw/source')
-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
818 files changed, 46223 insertions, 46223 deletions
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;
}