summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx46
-rw-r--r--sw/inc/HandleAnchorNodeChg.hxx8
-rw-r--r--sw/inc/IDocumentLayoutAccess.hxx8
-rw-r--r--sw/inc/PostItMgr.hxx18
-rw-r--r--sw/inc/SidebarWin.hxx4
-rw-r--r--sw/inc/ToxTabStopTokenHandler.hxx8
-rw-r--r--sw/inc/ToxTextGenerator.hxx8
-rw-r--r--sw/inc/accmap.hxx50
-rw-r--r--sw/inc/anchoreddrawobject.hxx8
-rw-r--r--sw/inc/anchoredobject.hxx78
-rw-r--r--sw/inc/calc.hxx2
-rw-r--r--sw/inc/cellfml.hxx2
-rw-r--r--sw/inc/chpfld.hxx4
-rw-r--r--sw/inc/cmdid.h2
-rw-r--r--sw/inc/crsrsh.hxx282
-rw-r--r--sw/inc/crstate.hxx32
-rw-r--r--sw/inc/cshtyp.hxx18
-rw-r--r--sw/inc/dbfld.hxx2
-rw-r--r--sw/inc/dcontact.hxx40
-rw-r--r--sw/inc/doc.hxx78
-rw-r--r--sw/inc/docary.hxx2
-rw-r--r--sw/inc/docsh.hxx4
-rw-r--r--sw/inc/docufld.hxx6
-rw-r--r--sw/inc/editsh.hxx22
-rw-r--r--sw/inc/expfld.hxx10
-rw-r--r--sw/inc/fesh.hxx90
-rw-r--r--sw/inc/flypos.hxx18
-rw-r--r--sw/inc/fmtcnct.hxx2
-rw-r--r--sw/inc/fmtflcnt.hxx2
-rw-r--r--sw/inc/fmtfsize.hxx28
-rw-r--r--sw/inc/format.hxx8
-rw-r--r--sw/inc/frmatr.hxx6
-rw-r--r--sw/inc/frmfmt.hxx52
-rw-r--r--sw/inc/hhcwrp.hxx2
-rw-r--r--sw/inc/hints.hxx22
-rw-r--r--sw/inc/htmltbl.hxx2
-rw-r--r--sw/inc/init.hxx4
-rw-r--r--sw/inc/ndarr.hxx18
-rw-r--r--sw/inc/ndgrf.hxx2
-rw-r--r--sw/inc/ndnotxt.hxx4
-rw-r--r--sw/inc/ndtxt.hxx10
-rw-r--r--sw/inc/node.hxx52
-rw-r--r--sw/inc/pagedesc.hxx2
-rw-r--r--sw/inc/pagepreviewlayout.hxx14
-rw-r--r--sw/inc/postithelper.hxx12
-rw-r--r--sw/inc/section.hxx18
-rw-r--r--sw/inc/shellio.hxx14
-rw-r--r--sw/inc/splargs.hxx18
-rw-r--r--sw/inc/swabstdlg.hxx4
-rw-r--r--sw/inc/swatrset.hxx6
-rw-r--r--sw/inc/swcrsr.hxx48
-rw-r--r--sw/inc/swtable.hxx6
-rw-r--r--sw/inc/swtblfmt.hxx24
-rw-r--r--sw/inc/swtypes.hxx20
-rw-r--r--sw/inc/tblsel.hxx54
-rw-r--r--sw/inc/textboxhelper.hxx4
-rw-r--r--sw/inc/txtflcnt.hxx18
-rw-r--r--sw/inc/txtftn.hxx4
-rw-r--r--sw/inc/undobj.hxx8
-rw-r--r--sw/inc/unobaseclass.hxx4
-rw-r--r--sw/inc/unochart.hxx4
-rw-r--r--sw/inc/unocrsr.hxx28
-rw-r--r--sw/inc/unocrsrhelper.hxx26
-rw-r--r--sw/inc/unoparagraph.hxx4
-rw-r--r--sw/inc/unotbl.hxx12
-rw-r--r--sw/inc/unotextcursor.hxx4
-rw-r--r--sw/inc/unotextrange.hxx6
-rw-r--r--sw/inc/unotxdoc.hxx8
-rw-r--r--sw/inc/view.hxx26
-rw-r--r--sw/inc/viewopt.hxx8
-rw-r--r--sw/inc/viewsh.hxx26
-rw-r--r--sw/inc/viscrs.hxx46
-rw-r--r--sw/qa/complex/writer/CheckBookmarks.java36
-rw-r--r--sw/qa/complex/writer/testdocuments/TESTXMLID.odtbin10879 -> 10881 bytes
-rw-r--r--sw/qa/core/macros-test.cxx4
-rw-r--r--sw/qa/core/test_ToxTextGenerator.cxx4
-rw-r--r--sw/qa/extras/inc/swmodeltestbase.hxx2
-rw-r--r--sw/qa/extras/odfimport/odfimport.cxx24
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx50
-rw-r--r--sw/qa/extras/uiwriter/uiwriter.cxx436
-rw-r--r--sw/sdi/_tabsh.sdi2
-rw-r--r--sw/source/core/access/acccell.cxx66
-rw-r--r--sw/source/core/access/acccell.hxx8
-rw-r--r--sw/source/core/access/acccontext.cxx252
-rw-r--r--sw/source/core/access/acccontext.hxx40
-rw-r--r--sw/source/core/access/accdoc.cxx148
-rw-r--r--sw/source/core/access/accembedded.cxx16
-rw-r--r--sw/source/core/access/accembedded.hxx2
-rw-r--r--sw/source/core/access/accfootnote.cxx12
-rw-r--r--sw/source/core/access/accfootnote.hxx6
-rw-r--r--sw/source/core/access/accframe.cxx140
-rw-r--r--sw/source/core/access/accframe.hxx50
-rw-r--r--sw/source/core/access/accframebase.cxx84
-rw-r--r--sw/source/core/access/accframebase.hxx10
-rw-r--r--sw/source/core/access/accfrmobj.cxx136
-rw-r--r--sw/source/core/access/accfrmobj.hxx16
-rw-r--r--sw/source/core/access/accfrmobjmap.cxx34
-rw-r--r--sw/source/core/access/accfrmobjmap.hxx10
-rw-r--r--sw/source/core/access/accfrmobjslist.cxx38
-rw-r--r--sw/source/core/access/accfrmobjslist.hxx16
-rw-r--r--sw/source/core/access/accgraphic.cxx6
-rw-r--r--sw/source/core/access/accgraphic.hxx2
-rw-r--r--sw/source/core/access/accheaderfooter.cxx12
-rw-r--r--sw/source/core/access/accheaderfooter.hxx8
-rw-r--r--sw/source/core/access/accmap.cxx686
-rw-r--r--sw/source/core/access/accnotextframe.cxx22
-rw-r--r--sw/source/core/access/accnotextframe.hxx4
-rw-r--r--sw/source/core/access/accnotexthyperlink.cxx8
-rw-r--r--sw/source/core/access/accnotexthyperlink.hxx6
-rw-r--r--sw/source/core/access/accpage.cxx8
-rw-r--r--sw/source/core/access/accpage.hxx6
-rw-r--r--sw/source/core/access/accpara.cxx306
-rw-r--r--sw/source/core/access/accpara.hxx4
-rw-r--r--sw/source/core/access/accportions.hxx2
-rw-r--r--sw/source/core/access/accselectionhelper.cxx58
-rw-r--r--sw/source/core/access/acctable.cxx384
-rw-r--r--sw/source/core/access/acctable.hxx12
-rw-r--r--sw/source/core/access/acctextframe.cxx48
-rw-r--r--sw/source/core/access/acctextframe.hxx8
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx38
-rw-r--r--sw/source/core/access/parachangetrackinginfo.hxx6
-rw-r--r--sw/source/core/attr/calbck.cxx4
-rw-r--r--sw/source/core/attr/format.cxx28
-rw-r--r--sw/source/core/attr/hints.cxx4
-rw-r--r--sw/source/core/bastyp/calc.cxx8
-rw-r--r--sw/source/core/bastyp/init.cxx6
-rw-r--r--sw/source/core/bastyp/swtypes.cxx22
-rw-r--r--sw/source/core/crsr/BlockCursor.cxx2
-rw-r--r--sw/source/core/crsr/BlockCursor.hxx16
-rw-r--r--sw/source/core/crsr/callnk.cxx74
-rw-r--r--sw/source/core/crsr/callnk.hxx14
-rw-r--r--sw/source/core/crsr/crbm.cxx124
-rw-r--r--sw/source/core/crsr/crsrsh.cxx1904
-rw-r--r--sw/source/core/crsr/crstrvl.cxx818
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx56
-rw-r--r--sw/source/core/crsr/findattr.cxx26
-rw-r--r--sw/source/core/crsr/findcoll.cxx6
-rw-r--r--sw/source/core/crsr/findtxt.cxx20
-rw-r--r--sw/source/core/crsr/pam.cxx74
-rw-r--r--sw/source/core/crsr/swcrsr.cxx320
-rw-r--r--sw/source/core/crsr/trvlcol.cxx58
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx116
-rw-r--r--sw/source/core/crsr/trvlreg.cxx54
-rw-r--r--sw/source/core/crsr/trvltbl.cxx358
-rw-r--r--sw/source/core/crsr/viscrs.cxx296
-rw-r--r--sw/source/core/doc/CntntIdxStore.cxx86
-rw-r--r--sw/source/core/doc/DocumentChartDataProviderManager.cxx2
-rw-r--r--sw/source/core/doc/DocumentContentOperationsManager.cxx28
-rw-r--r--sw/source/core/doc/DocumentDeviceManager.cxx4
-rw-r--r--sw/source/core/doc/DocumentDrawModelManager.cxx10
-rw-r--r--sw/source/core/doc/DocumentFieldsManager.cxx22
-rw-r--r--sw/source/core/doc/DocumentLayoutManager.cxx20
-rw-r--r--sw/source/core/doc/DocumentLinksAdministrationManager.cxx4
-rw-r--r--sw/source/core/doc/DocumentSettingManager.cxx6
-rw-r--r--sw/source/core/doc/DocumentStylePoolManager.cxx26
-rw-r--r--sw/source/core/doc/DocumentTimerManager.cxx6
-rw-r--r--sw/source/core/doc/doc.cxx92
-rw-r--r--sw/source/core/doc/docchart.cxx2
-rw-r--r--sw/source/core/doc/doccorr.cxx96
-rw-r--r--sw/source/core/doc/docdesc.cxx18
-rw-r--r--sw/source/core/doc/docdraw.cxx20
-rw-r--r--sw/source/core/doc/docedt.cxx44
-rw-r--r--sw/source/core/doc/docfld.cxx22
-rw-r--r--sw/source/core/doc/docfly.cxx168
-rw-r--r--sw/source/core/doc/docfmt.cxx4
-rw-r--r--sw/source/core/doc/docftn.cxx8
-rw-r--r--sw/source/core/doc/docglos.cxx10
-rw-r--r--sw/source/core/doc/doclay.cxx78
-rw-r--r--sw/source/core/doc/docnew.cxx6
-rw-r--r--sw/source/core/doc/docnum.cxx8
-rw-r--r--sw/source/core/doc/docruby.cxx32
-rw-r--r--sw/source/core/doc/docsort.cxx8
-rw-r--r--sw/source/core/doc/doctxm.cxx60
-rw-r--r--sw/source/core/doc/ftnidx.cxx4
-rw-r--r--sw/source/core/doc/htmltbl.cxx68
-rw-r--r--sw/source/core/doc/lineinfo.cxx4
-rw-r--r--sw/source/core/doc/notxtfrm.cxx124
-rw-r--r--sw/source/core/doc/tblafmt.cxx4
-rw-r--r--sw/source/core/doc/tblcpy.cxx14
-rw-r--r--sw/source/core/doc/tblrwcl.cxx438
-rw-r--r--sw/source/core/doc/textboxhelper.cxx16
-rw-r--r--sw/source/core/docnode/ndcopy.cxx2
-rw-r--r--sw/source/core/docnode/ndsect.cxx98
-rw-r--r--sw/source/core/docnode/ndtbl.cxx392
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx240
-rw-r--r--sw/source/core/docnode/node.cxx176
-rw-r--r--sw/source/core/docnode/node2lay.cxx244
-rw-r--r--sw/source/core/docnode/nodes.cxx174
-rw-r--r--sw/source/core/docnode/section.cxx50
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx8
-rw-r--r--sw/source/core/draw/dcontact.cxx292
-rw-r--r--sw/source/core/draw/dflyobj.cxx150
-rw-r--r--sw/source/core/draw/dpage.cxx18
-rw-r--r--sw/source/core/draw/dview.cxx126
-rw-r--r--sw/source/core/edit/acorrect.cxx64
-rw-r--r--sw/source/core/edit/autofmt.cxx130
-rw-r--r--sw/source/core/edit/edatmisc.cxx32
-rw-r--r--sw/source/core/edit/edattr.cxx62
-rw-r--r--sw/source/core/edit/eddel.cxx48
-rw-r--r--sw/source/core/edit/edfcol.cxx6
-rw-r--r--sw/source/core/edit/edfld.cxx12
-rw-r--r--sw/source/core/edit/edfmt.cxx2
-rw-r--r--sw/source/core/edit/edglbldc.cxx52
-rw-r--r--sw/source/core/edit/edglss.cxx22
-rw-r--r--sw/source/core/edit/editsh.cxx216
-rw-r--r--sw/source/core/edit/edlingu.cxx460
-rw-r--r--sw/source/core/edit/ednumber.cxx186
-rw-r--r--sw/source/core/edit/edredln.cxx8
-rw-r--r--sw/source/core/edit/edsect.cxx42
-rw-r--r--sw/source/core/edit/edtab.cxx98
-rw-r--r--sw/source/core/edit/edtox.cxx12
-rw-r--r--sw/source/core/edit/edundo.cxx28
-rw-r--r--sw/source/core/edit/edws.cxx30
-rw-r--r--sw/source/core/fields/authfld.cxx8
-rw-r--r--sw/source/core/fields/cellfml.cxx34
-rw-r--r--sw/source/core/fields/chpfld.cxx8
-rw-r--r--sw/source/core/fields/docufld.cxx52
-rw-r--r--sw/source/core/fields/expfld.cxx70
-rw-r--r--sw/source/core/fields/fldlst.cxx6
-rw-r--r--sw/source/core/fields/postithelper.cxx28
-rw-r--r--sw/source/core/fields/reffld.cxx134
-rw-r--r--sw/source/core/frmedt/fecopy.cxx188
-rw-r--r--sw/source/core/frmedt/fedesc.cxx74
-rw-r--r--sw/source/core/frmedt/fefly1.cxx446
-rw-r--r--sw/source/core/frmedt/feflyole.cxx16
-rw-r--r--sw/source/core/frmedt/feshview.cxx512
-rw-r--r--sw/source/core/frmedt/fetab.cxx732
-rw-r--r--sw/source/core/frmedt/fews.cxx528
-rw-r--r--sw/source/core/frmedt/tblsel.cxx900
-rw-r--r--sw/source/core/graphic/ndgrf.cxx24
-rw-r--r--sw/source/core/inc/DocumentContentOperationsManager.hxx4
-rw-r--r--sw/source/core/inc/DocumentLayoutManager.hxx6
-rw-r--r--sw/source/core/inc/DocumentSettingManager.hxx2
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx2
-rw-r--r--sw/source/core/inc/UndoInsert.hxx4
-rw-r--r--sw/source/core/inc/acorrect.hxx2
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx72
-rw-r--r--sw/source/core/inc/ascharanchoredobjectposition.hxx6
-rw-r--r--sw/source/core/inc/blink.hxx18
-rw-r--r--sw/source/core/inc/bodyfrm.hxx8
-rw-r--r--sw/source/core/inc/cellfrm.hxx20
-rw-r--r--sw/source/core/inc/cntfrm.hxx74
-rw-r--r--sw/source/core/inc/colfrm.hxx10
-rw-r--r--sw/source/core/inc/dbg_lay.hxx20
-rw-r--r--sw/source/core/inc/dflyobj.hxx10
-rw-r--r--sw/source/core/inc/docfld.hxx4
-rw-r--r--sw/source/core/inc/drawfont.hxx28
-rw-r--r--sw/source/core/inc/dview.hxx8
-rw-r--r--sw/source/core/inc/environmentofanchoredobject.hxx12
-rw-r--r--sw/source/core/inc/fefly.hxx2
-rw-r--r--sw/source/core/inc/flowfrm.hxx118
-rw-r--r--sw/source/core/inc/flyfrm.hxx76
-rw-r--r--sw/source/core/inc/flyfrms.hxx56
-rw-r--r--sw/source/core/inc/fntcache.hxx2
-rw-r--r--sw/source/core/inc/frame.hxx676
-rw-r--r--sw/source/core/inc/frminf.hxx16
-rw-r--r--sw/source/core/inc/frmtool.hxx178
-rw-r--r--sw/source/core/inc/ftnboss.hxx90
-rw-r--r--sw/source/core/inc/ftnfrm.hxx82
-rw-r--r--sw/source/core/inc/hffrm.hxx22
-rw-r--r--sw/source/core/inc/layact.hxx64
-rw-r--r--sw/source/core/inc/layfrm.hxx130
-rw-r--r--sw/source/core/inc/layouter.hxx66
-rw-r--r--sw/source/core/inc/movedfwdfrmsbyobjpos.hxx22
-rw-r--r--sw/source/core/inc/mvsave.hxx4
-rw-r--r--sw/source/core/inc/node2lay.hxx24
-rw-r--r--sw/source/core/inc/notxtfrm.hxx16
-rw-r--r--sw/source/core/inc/objectformatter.hxx36
-rw-r--r--sw/source/core/inc/pagefrm.hxx136
-rw-r--r--sw/source/core/inc/pamtyp.hxx2
-rw-r--r--sw/source/core/inc/prevwpage.hxx4
-rw-r--r--sw/source/core/inc/ptqueue.hxx4
-rw-r--r--sw/source/core/inc/rootfrm.hxx88
-rw-r--r--sw/source/core/inc/rowfrm.hxx22
-rw-r--r--sw/source/core/inc/sectfrm.hxx64
-rw-r--r--sw/source/core/inc/swfont.hxx8
-rw-r--r--sw/source/core/inc/swselectionlist.hxx10
-rw-r--r--sw/source/core/inc/tabfrm.hxx60
-rw-r--r--sw/source/core/inc/tblrwcl.hxx4
-rw-r--r--sw/source/core/inc/tocntntanchoredobjectposition.hxx26
-rw-r--r--sw/source/core/inc/tolayoutanchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/txtfly.hxx48
-rw-r--r--sw/source/core/inc/txtfrm.hxx204
-rw-r--r--sw/source/core/inc/unoport.hxx24
-rw-r--r--sw/source/core/inc/viewimp.hxx66
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx152
-rw-r--r--sw/source/core/layout/anchoredobject.cxx232
-rw-r--r--sw/source/core/layout/atrfrm.cxx290
-rw-r--r--sw/source/core/layout/calcmove.cxx934
-rw-r--r--sw/source/core/layout/colfrm.cxx136
-rw-r--r--sw/source/core/layout/dbg_lay.cxx272
-rw-r--r--sw/source/core/layout/dumpfilter.cxx4
-rw-r--r--sw/source/core/layout/findfrm.cxx1024
-rw-r--r--sw/source/core/layout/flowfrm.cxx974
-rw-r--r--sw/source/core/layout/fly.cxx1010
-rw-r--r--sw/source/core/layout/flycnt.cxx632
-rw-r--r--sw/source/core/layout/flyincnt.cxx86
-rw-r--r--sw/source/core/layout/flylay.cxx602
-rw-r--r--sw/source/core/layout/flypos.cxx8
-rw-r--r--sw/source/core/layout/frmtool.cxx1566
-rw-r--r--sw/source/core/layout/ftnfrm.cxx1292
-rw-r--r--sw/source/core/layout/hffrm.cxx274
-rw-r--r--sw/source/core/layout/layact.cxx672
-rw-r--r--sw/source/core/layout/laycache.cxx220
-rw-r--r--sw/source/core/layout/layhelp.hxx34
-rw-r--r--sw/source/core/layout/layouter.cxx158
-rw-r--r--sw/source/core/layout/movedfwdfrmsbyobjpos.cxx44
-rw-r--r--sw/source/core/layout/newfrm.cxx220
-rw-r--r--sw/source/core/layout/objectformatter.cxx176
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.cxx86
-rw-r--r--sw/source/core/layout/objectformatterlayfrm.hxx20
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.cxx352
-rw-r--r--sw/source/core/layout/objectformattertxtfrm.hxx32
-rw-r--r--sw/source/core/layout/pagechg.cxx748
-rw-r--r--sw/source/core/layout/pagedesc.cxx72
-rw-r--r--sw/source/core/layout/paintfrm.cxx1148
-rw-r--r--sw/source/core/layout/sectfrm.cxx1154
-rw-r--r--sw/source/core/layout/softpagebreak.cxx48
-rw-r--r--sw/source/core/layout/ssfrm.cxx356
-rw-r--r--sw/source/core/layout/swselectionlist.cxx36
-rw-r--r--sw/source/core/layout/tabfrm.cxx1922
-rw-r--r--sw/source/core/layout/trvlfrm.cxx1168
-rw-r--r--sw/source/core/layout/unusedf.cxx30
-rw-r--r--sw/source/core/layout/virtoutp.cxx16
-rw-r--r--sw/source/core/layout/virtoutp.hxx2
-rw-r--r--sw/source/core/layout/wsfrm.cxx1556
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx376
-rw-r--r--sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx78
-rw-r--r--sw/source/core/objectpositioning/environmentofanchoredobject.cxx60
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx394
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx38
-rw-r--r--sw/source/core/ole/ndole.cxx10
-rw-r--r--sw/source/core/table/swnewtable.cxx86
-rw-r--r--sw/source/core/table/swtable.cxx214
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx396
-rw-r--r--sw/source/core/text/atrstck.cxx2
-rw-r--r--sw/source/core/text/blink.cxx16
-rw-r--r--sw/source/core/text/frmcrsr.cxx530
-rw-r--r--sw/source/core/text/frmform.cxx464
-rw-r--r--sw/source/core/text/frminf.cxx84
-rw-r--r--sw/source/core/text/frmpaint.cxx138
-rw-r--r--sw/source/core/text/guess.cxx12
-rw-r--r--sw/source/core/text/inftxt.cxx148
-rw-r--r--sw/source/core/text/inftxt.hxx34
-rw-r--r--sw/source/core/text/itradj.cxx32
-rw-r--r--sw/source/core/text/itratr.cxx42
-rw-r--r--sw/source/core/text/itratr.hxx4
-rw-r--r--sw/source/core/text/itrcrsr.cxx152
-rw-r--r--sw/source/core/text/itrform2.cxx220
-rw-r--r--sw/source/core/text/itrform2.hxx12
-rw-r--r--sw/source/core/text/itrpaint.cxx30
-rw-r--r--sw/source/core/text/itrpaint.hxx8
-rw-r--r--sw/source/core/text/itrtxt.cxx30
-rw-r--r--sw/source/core/text/itrtxt.hxx56
-rw-r--r--sw/source/core/text/pordrop.hxx2
-rw-r--r--sw/source/core/text/porexp.cxx4
-rw-r--r--sw/source/core/text/porexp.hxx2
-rw-r--r--sw/source/core/text/porfld.cxx46
-rw-r--r--sw/source/core/text/porfld.hxx6
-rw-r--r--sw/source/core/text/porfly.cxx80
-rw-r--r--sw/source/core/text/porfly.hxx26
-rw-r--r--sw/source/core/text/porftn.hxx4
-rw-r--r--sw/source/core/text/porglue.cxx4
-rw-r--r--sw/source/core/text/porglue.hxx2
-rw-r--r--sw/source/core/text/porlay.cxx10
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.cxx12
-rw-r--r--sw/source/core/text/porlin.hxx2
-rw-r--r--sw/source/core/text/pormulti.cxx82
-rw-r--r--sw/source/core/text/pormulti.hxx2
-rw-r--r--sw/source/core/text/porrst.cxx60
-rw-r--r--sw/source/core/text/porrst.hxx2
-rw-r--r--sw/source/core/text/portxt.cxx20
-rw-r--r--sw/source/core/text/portxt.hxx2
-rw-r--r--sw/source/core/text/redlnitr.cxx12
-rw-r--r--sw/source/core/text/txtcache.cxx34
-rw-r--r--sw/source/core/text/txtcache.hxx6
-rw-r--r--sw/source/core/text/txtdrop.cxx36
-rw-r--r--sw/source/core/text/txtfld.cxx34
-rw-r--r--sw/source/core/text/txtfly.cxx232
-rw-r--r--sw/source/core/text/txtfrm.cxx568
-rw-r--r--sw/source/core/text/txtftn.cxx484
-rw-r--r--sw/source/core/text/txthyph.cxx18
-rw-r--r--sw/source/core/text/txtinit.cxx12
-rw-r--r--sw/source/core/text/txtio.cxx4
-rw-r--r--sw/source/core/text/txtpaint.cxx12
-rw-r--r--sw/source/core/text/txtpaint.hxx6
-rw-r--r--sw/source/core/text/txttab.cxx44
-rw-r--r--sw/source/core/text/widorp.cxx152
-rw-r--r--sw/source/core/text/widorp.hxx20
-rw-r--r--sw/source/core/text/xmldump.cxx86
-rw-r--r--sw/source/core/tox/ToxTabStopTokenHandler.cxx18
-rw-r--r--sw/source/core/tox/ToxTextGenerator.cxx6
-rw-r--r--sw/source/core/tox/txmsrt.cxx6
-rw-r--r--sw/source/core/txtnode/SwGrammarContact.cxx8
-rw-r--r--sw/source/core/txtnode/atrfld.cxx2
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx70
-rw-r--r--sw/source/core/txtnode/atrftn.cxx44
-rw-r--r--sw/source/core/txtnode/fntcache.cxx76
-rw-r--r--sw/source/core/txtnode/fntcap.cxx50
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx96
-rw-r--r--sw/source/core/txtnode/swfont.cxx28
-rw-r--r--sw/source/core/txtnode/thints.cxx4
-rw-r--r--sw/source/core/txtnode/txtedt.cxx128
-rw-r--r--sw/source/core/undo/rolbck.cxx6
-rw-r--r--sw/source/core/undo/unattr.cxx16
-rw-r--r--sw/source/core/undo/undel.cxx14
-rw-r--r--sw/source/core/undo/undobj.cxx2
-rw-r--r--sw/source/core/undo/undobj1.cxx26
-rw-r--r--sw/source/core/undo/unfmco.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx6
-rw-r--r--sw/source/core/undo/unsort.cxx16
-rw-r--r--sw/source/core/undo/untbl.cxx70
-rw-r--r--sw/source/core/unocore/unochart.cxx156
-rw-r--r--sw/source/core/unocore/unocrsr.cxx40
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx42
-rw-r--r--sw/source/core/unocore/unodraw.cxx16
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx14
-rw-r--r--sw/source/core/unocore/unoframe.cxx146
-rw-r--r--sw/source/core/unocore/unoftn.cxx6
-rw-r--r--sw/source/core/unocore/unoobj.cxx194
-rw-r--r--sw/source/core/unocore/unoobj2.cxx156
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx18
-rw-r--r--sw/source/core/unocore/unoport.cxx94
-rw-r--r--sw/source/core/unocore/unoportenum.cxx244
-rw-r--r--sw/source/core/unocore/unoredline.cxx28
-rw-r--r--sw/source/core/unocore/unostyle.cxx16
-rw-r--r--sw/source/core/unocore/unotbl.cxx430
-rw-r--r--sw/source/core/unocore/unotext.cxx38
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx60
-rw-r--r--sw/source/core/view/vdraw.cxx10
-rw-r--r--sw/source/core/view/viewimp.cxx92
-rw-r--r--sw/source/core/view/viewpg.cxx20
-rw-r--r--sw/source/core/view/viewsh.cxx170
-rw-r--r--sw/source/core/view/vnew.cxx28
-rw-r--r--sw/source/core/view/vprint.cxx72
-rw-r--r--sw/source/core/view/vprint.hxx2
-rw-r--r--sw/source/filter/ascii/parasc.cxx6
-rw-r--r--sw/source/filter/basflt/fltini.cxx44
-rw-r--r--sw/source/filter/basflt/fltshell.cxx2
-rw-r--r--sw/source/filter/basflt/shellio.cxx64
-rw-r--r--sw/source/filter/html/css1atr.cxx46
-rw-r--r--sw/source/filter/html/htmlatr.cxx24
-rw-r--r--sw/source/filter/html/htmlcss1.cxx58
-rw-r--r--sw/source/filter/html/htmlctxt.cxx34
-rw-r--r--sw/source/filter/html/htmldrawreader.cxx18
-rw-r--r--sw/source/filter/html/htmldrawwriter.cxx8
-rw-r--r--sw/source/filter/html/htmlfly.cxx18
-rw-r--r--sw/source/filter/html/htmlfly.hxx30
-rw-r--r--sw/source/filter/html/htmlflyt.cxx10
-rw-r--r--sw/source/filter/html/htmlflywriter.cxx166
-rw-r--r--sw/source/filter/html/htmlforw.cxx24
-rw-r--r--sw/source/filter/html/htmlgrin.cxx58
-rw-r--r--sw/source/filter/html/htmlplug.cxx94
-rw-r--r--sw/source/filter/html/htmlsect.cxx40
-rw-r--r--sw/source/filter/html/htmltab.cxx66
-rw-r--r--sw/source/filter/html/htmltabw.cxx12
-rw-r--r--sw/source/filter/html/swhtml.cxx62
-rw-r--r--sw/source/filter/html/swhtml.hxx30
-rw-r--r--sw/source/filter/html/wrthtml.cxx16
-rw-r--r--sw/source/filter/html/wrthtml.hxx20
-rw-r--r--sw/source/filter/inc/msfilter.hxx4
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx2
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx10
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx28
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.hxx14
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx4
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx22
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/docxsdrexport.cxx6
-rw-r--r--sw/source/filter/ww8/escher.hxx6
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx40
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx2
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx22
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx8
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx10
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx38
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx32
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx16
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx8
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx44
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx2
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx34
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par.cxx52
-rw-r--r--sw/source/filter/ww8/ww8par.hxx22
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx14
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx4
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx36
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx28
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx4
-rw-r--r--sw/source/filter/xml/xmlexpit.cxx12
-rw-r--r--sw/source/filter/xml/xmlimp.cxx58
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx16
-rw-r--r--sw/source/filter/xml/xmltble.cxx26
-rw-r--r--sw/source/filter/xml/xmltbli.cxx56
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/filter/xml/xmltexti.cxx94
-rw-r--r--sw/source/ui/chrdlg/break.cxx4
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx14
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx4
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx8
-rw-r--r--sw/source/ui/config/optpage.cxx30
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx16
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx14
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx8
-rw-r--r--sw/source/ui/dialog/macassgn.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx8
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx36
-rw-r--r--sw/source/ui/envelp/labelexp.cxx4
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx2
-rw-r--r--sw/source/ui/fldui/fldedt.cxx14
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx2
-rw-r--r--sw/source/ui/fldui/javaedit.cxx4
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx18
-rw-r--r--sw/source/ui/frmdlg/column.cxx50
-rw-r--r--sw/source/ui/frmdlg/cption.cxx8
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx34
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx282
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx20
-rw-r--r--sw/source/ui/index/cntex.cxx6
-rw-r--r--sw/source/ui/index/cnttab.cxx2
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx22
-rw-r--r--sw/source/ui/misc/glossary.cxx6
-rw-r--r--sw/source/ui/misc/num.cxx2
-rw-r--r--sw/source/ui/misc/srtdlg.cxx2
-rw-r--r--sw/source/ui/misc/titlepage.cxx4
-rw-r--r--sw/source/ui/table/rowht.cxx10
-rw-r--r--sw/source/ui/table/tabledlg.cxx4
-rw-r--r--sw/source/ui/table/tautofmt.cxx2
-rw-r--r--sw/source/uibase/app/appenv.cxx26
-rw-r--r--sw/source/uibase/app/apphdl.cxx4
-rw-r--r--sw/source/uibase/app/applab.cxx28
-rw-r--r--sw/source/uibase/app/docsh.cxx28
-rw-r--r--sw/source/uibase/app/docsh2.cxx54
-rw-r--r--sw/source/uibase/app/docst.cxx66
-rw-r--r--sw/source/uibase/config/cfgitems.cxx4
-rw-r--r--sw/source/uibase/config/usrpref.cxx4
-rw-r--r--sw/source/uibase/config/viewopt.cxx6
-rw-r--r--sw/source/uibase/dbui/dbmgr.cxx16
-rw-r--r--sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx18
-rw-r--r--sw/source/uibase/dialog/regionsw.cxx4
-rw-r--r--sw/source/uibase/dochdl/gloshdl.cxx6
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx188
-rw-r--r--sw/source/uibase/docvw/FrameControlsManager.cxx44
-rw-r--r--sw/source/uibase/docvw/HeaderFooterWin.cxx4
-rw-r--r--sw/source/uibase/docvw/PageBreakWin.cxx54
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx58
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx50
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.cxx24
-rw-r--r--sw/source/uibase/docvw/SidebarWinAcc.hxx4
-rw-r--r--sw/source/uibase/docvw/edtdd.cxx28
-rw-r--r--sw/source/uibase/docvw/edtwin.cxx584
-rw-r--r--sw/source/uibase/docvw/edtwin2.cxx14
-rw-r--r--sw/source/uibase/docvw/edtwin3.cxx4
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.cxx80
-rw-r--r--sw/source/uibase/docvw/frmsidebarwincontainer.hxx22
-rw-r--r--sw/source/uibase/fldui/fldmgr.cxx8
-rw-r--r--sw/source/uibase/frmdlg/colex.cxx30
-rw-r--r--sw/source/uibase/frmdlg/colmgr.cxx2
-rw-r--r--sw/source/uibase/frmdlg/frmmgr.cxx94
-rw-r--r--sw/source/uibase/inc/FrameControl.hxx14
-rw-r--r--sw/source/uibase/inc/FrameControlsManager.hxx14
-rw-r--r--sw/source/uibase/inc/HeaderFooterWin.hxx2
-rw-r--r--sw/source/uibase/inc/PageBreakWin.hxx4
-rw-r--r--sw/source/uibase/inc/basesh.hxx10
-rw-r--r--sw/source/uibase/inc/cfgitems.hxx4
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx2
-rw-r--r--sw/source/uibase/inc/colex.hxx2
-rw-r--r--sw/source/uibase/inc/column.hxx6
-rw-r--r--sw/source/uibase/inc/edtwin.hxx18
-rw-r--r--sw/source/uibase/inc/frmdlg.hxx8
-rw-r--r--sw/source/uibase/inc/frmmgr.hxx40
-rw-r--r--sw/source/uibase/inc/frmpage.hxx42
-rw-r--r--sw/source/uibase/inc/initui.hxx4
-rw-r--r--sw/source/uibase/inc/navmgr.hxx4
-rw-r--r--sw/source/uibase/inc/optpage.hxx10
-rw-r--r--sw/source/uibase/inc/pview.hxx6
-rw-r--r--sw/source/uibase/inc/shdwcrsr.hxx2
-rw-r--r--sw/source/uibase/inc/tabsh.hxx2
-rw-r--r--sw/source/uibase/inc/textsh.hxx4
-rw-r--r--sw/source/uibase/inc/uivwimp.hxx8
-rw-r--r--sw/source/uibase/inc/unotools.hxx6
-rw-r--r--sw/source/uibase/inc/wrap.hxx2
-rw-r--r--sw/source/uibase/inc/wrtsh.hxx88
-rw-r--r--sw/source/uibase/lingu/hhcwrp.cxx48
-rw-r--r--sw/source/uibase/lingu/olmenu.cxx6
-rw-r--r--sw/source/uibase/misc/redlndlg.cxx6
-rw-r--r--sw/source/uibase/ribbar/drawbase.cxx36
-rw-r--r--sw/source/uibase/ribbar/inputwin.cxx8
-rw-r--r--sw/source/uibase/shells/basesh.cxx178
-rw-r--r--sw/source/uibase/shells/beziersh.cxx4
-rw-r--r--sw/source/uibase/shells/drwbassh.cxx22
-rw-r--r--sw/source/uibase/shells/frmsh.cxx98
-rw-r--r--sw/source/uibase/shells/grfsh.cxx44
-rw-r--r--sw/source/uibase/shells/langhelper.cxx6
-rw-r--r--sw/source/uibase/shells/listsh.cxx4
-rw-r--r--sw/source/uibase/shells/mediash.cxx4
-rw-r--r--sw/source/uibase/shells/tabsh.cxx20
-rw-r--r--sw/source/uibase/shells/textdrw.cxx2
-rw-r--r--sw/source/uibase/shells/textfld.cxx24
-rw-r--r--sw/source/uibase/shells/textidx.cxx4
-rw-r--r--sw/source/uibase/shells/textsh.cxx80
-rw-r--r--sw/source/uibase/shells/textsh1.cxx46
-rw-r--r--sw/source/uibase/shells/txtattr.cxx18
-rw-r--r--sw/source/uibase/shells/txtcrsr.cxx20
-rw-r--r--sw/source/uibase/table/chartins.cxx2
-rw-r--r--sw/source/uibase/table/tablemgr.cxx4
-rw-r--r--sw/source/uibase/uiview/formatclipboard.cxx24
-rw-r--r--sw/source/uibase/uiview/pview.cxx14
-rw-r--r--sw/source/uibase/uiview/swcli.cxx12
-rw-r--r--sw/source/uibase/uiview/view.cxx66
-rw-r--r--sw/source/uibase/uiview/view0.cxx2
-rw-r--r--sw/source/uibase/uiview/view2.cxx94
-rw-r--r--sw/source/uibase/uiview/viewdlg.cxx2
-rw-r--r--sw/source/uibase/uiview/viewdlg2.cxx10
-rw-r--r--sw/source/uibase/uiview/viewdraw.cxx18
-rw-r--r--sw/source/uibase/uiview/viewling.cxx46
-rw-r--r--sw/source/uibase/uiview/viewmdi.cxx18
-rw-r--r--sw/source/uibase/uiview/viewport.cxx30
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx2
-rw-r--r--sw/source/uibase/uiview/viewsrch.cxx36
-rw-r--r--sw/source/uibase/uiview/viewstat.cxx32
-rw-r--r--sw/source/uibase/uiview/viewtab.cxx196
-rw-r--r--sw/source/uibase/uno/unotxdoc.cxx108
-rw-r--r--sw/source/uibase/uno/unotxvw.cxx138
-rw-r--r--sw/source/uibase/utlui/attrdesc.cxx8
-rw-r--r--sw/source/uibase/utlui/content.cxx24
-rw-r--r--sw/source/uibase/utlui/glbltree.cxx12
-rw-r--r--sw/source/uibase/utlui/initui.cxx10
-rw-r--r--sw/source/uibase/utlui/navipi.cxx30
-rw-r--r--sw/source/uibase/utlui/shdwcrsr.cxx10
-rw-r--r--sw/source/uibase/utlui/tmplctrl.cxx4
-rw-r--r--sw/source/uibase/utlui/uitool.cxx28
-rw-r--r--sw/source/uibase/utlui/unotools.cxx58
-rw-r--r--sw/source/uibase/wrtsh/delete.cxx86
-rw-r--r--sw/source/uibase/wrtsh/move.cxx238
-rw-r--r--sw/source/uibase/wrtsh/navmgr.cxx8
-rw-r--r--sw/source/uibase/wrtsh/select.cxx206
-rw-r--r--sw/source/uibase/wrtsh/wrtsh1.cxx148
-rw-r--r--sw/source/uibase/wrtsh/wrtsh2.cxx16
-rw-r--r--sw/source/uibase/wrtsh/wrtsh3.cxx34
-rw-r--r--sw/source/uibase/wrtsh/wrtsh4.cxx36
-rw-r--r--sw/source/uibase/wrtsh/wrtundo.cxx14
-rw-r--r--sw/uiconfig/swriter/ui/frmaddpage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/frmtypepage.ui2
-rw-r--r--sw/uiconfig/swriter/ui/frmurlpage.ui2
651 files changed, 27946 insertions, 27946 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 74da45127883..c1d3e30654f4 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -34,9 +34,9 @@ namespace vcl
class PDFExtOutDevData;
}
class OutputDevice;
-class SwFrm;
+class SwFrame;
class SwLinePortion;
-class SwPageFrm;
+class SwPageFrame;
class SwPrintData;
class SwTextPainter;
class SwEditShell;
@@ -55,11 +55,11 @@ class SvxLanguageItem;
*
* Grouping elements:
*
- * SwRootFrm Document
+ * SwRootFrame Document
* Part
* Art
* SwSection Sect
- * SwFootnoteContFrm and SwFlyFrm Div
+ * SwFootnoteContFrame and SwFlyFrame Div
* SwFormat "Quotations" BlockQuote
* SwFormat "Caption" Caption
* SwSection (TOC) TOC
@@ -73,16 +73,16 @@ class SvxLanguageItem;
* SwTextNode with Outline H1 - H6
* SwTextNode with NumRule L, LI, LBody
* SwTable Table
- * SwRowFrm TR
- * SwCellFrm in Headline row or
+ * SwRowFrame TR
+ * SwCellFrame in Headline row or
* SwFtm "Table Heading" TH
- * SwCellFrm TD
+ * SwCellFrame TD
*
* Inline-Level Structure Elements:
*
* SwTextPortion Span
* SwFormat "Quotation" Quote
- * SwFootnoteFrm Note
+ * SwFootnoteFrame Note
* Form
* Reference
* SwFieldPortion (AuthorityField) BibEntry
@@ -91,21 +91,21 @@ class SvxLanguageItem;
*
* Illustration elements:
*
- * SwFlyFrm with SwNoTextFrm Figure
- * SwFlyFrm with Math OLE Object Formula
+ * SwFlyFrame with SwNoTextFrame Figure
+ * SwFlyFrame with Math OLE Object Formula
*
*/
struct Num_Info
{
- const SwFrm& mrFrm;
- Num_Info( const SwFrm& rFrm ) : mrFrm( rFrm ) {};
+ const SwFrame& mrFrame;
+ Num_Info( const SwFrame& rFrame ) : mrFrame( rFrame ) {};
};
-struct Frm_Info
+struct Frame_Info
{
- const SwFrm& mrFrm;
- Frm_Info( const SwFrm& rFrm ) : mrFrm( rFrm ) {};
+ const SwFrame& mrFrame;
+ Frame_Info( const SwFrame& rFrame ) : mrFrame( rFrame ) {};
};
struct Por_Info
@@ -141,7 +141,7 @@ class SwTaggedPDFHelper
vcl::PDFExtOutDevData* mpPDFExtOutDevData;
const Num_Info* mpNumInfo;
- const Frm_Info* mpFrmInfo;
+ const Frame_Info* mpFrameInfo;
const Por_Info* mpPorInfo;
void BeginTag( vcl::PDFWriter::StructElement aTagRole, const OUString& rTagName );
@@ -160,10 +160,10 @@ class SwTaggedPDFHelper
public:
- // pFrmInfo != 0 => BeginBlockStructureElement
+ // pFrameInfo != 0 => BeginBlockStructureElement
// pPorInfo != 0 => BeginInlineStructureElement
- // pFrmInfo, pPorInfo = 0 => BeginNonStructureElement
- SwTaggedPDFHelper( const Num_Info* pNumInfo, const Frm_Info* pFrmInfo, const Por_Info* pPorInfo,
+ // pFrameInfo, pPorInfo = 0 => BeginNonStructureElement
+ SwTaggedPDFHelper( const Num_Info* pNumInfo, const Frame_Info* pFrameInfo, const Por_Info* pPorInfo,
OutputDevice& rOut );
~SwTaggedPDFHelper();
@@ -187,7 +187,7 @@ typedef std::vector< IdMapEntry > LinkIdMap;
typedef std::map< const SwTable*, TableColumnsMapEntry > TableColumnsMap;
typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListIdMap;
typedef std::map< const SwNumberTreeNode*, sal_Int32 > NumListBodyIdMap;
-typedef std::map< const void*, sal_Int32 > FrmTagIdMap;
+typedef std::map< const void*, sal_Int32 > FrameTagIdMap;
class SwEnhancedPDFExportHelper
{
@@ -215,7 +215,7 @@ class SwEnhancedPDFExportHelper
static LinkIdMap aLinkIdMap;
static NumListIdMap aNumListIdMap;
static NumListBodyIdMap aNumListBodyIdMap;
- static FrmTagIdMap aFrmTagIdMap;
+ static FrameTagIdMap aFrameTagIdMap;
static LanguageType eLanguageDefault;
@@ -242,12 +242,12 @@ class SwEnhancedPDFExportHelper
static LinkIdMap& GetLinkIdMap() { return aLinkIdMap; }
static NumListIdMap& GetNumListIdMap() {return aNumListIdMap; }
static NumListBodyIdMap& GetNumListBodyIdMap() {return aNumListBodyIdMap; }
- static FrmTagIdMap& GetFrmTagIdMap() { return aFrmTagIdMap; }
+ static FrameTagIdMap& GetFrameTagIdMap() { return aFrameTagIdMap; }
static LanguageType GetDefaultLanguage() {return eLanguageDefault; }
//scale and position rRectangle if we're scaling due to notes in margins.
- Rectangle SwRectToPDFRect(const SwPageFrm* pCurrPage,
+ Rectangle SwRectToPDFRect(const SwPageFrame* pCurrPage,
const Rectangle& rRectangle) const;
};
diff --git a/sw/inc/HandleAnchorNodeChg.hxx b/sw/inc/HandleAnchorNodeChg.hxx
index cba6d26e545d..8261c86c16d6 100644
--- a/sw/inc/HandleAnchorNodeChg.hxx
+++ b/sw/inc/HandleAnchorNodeChg.hxx
@@ -21,7 +21,7 @@
class SwFlyFrameFormat;
class SwFormatAnchor;
-class SwFlyFrm;
+class SwFlyFrame;
// helper class to track change of anchor node of at-paragraph respectively
// at-character anchored fly frames
@@ -43,15 +43,15 @@ public:
@param _rNewAnchorFormat
new anchor attribute, which will be applied at the given fly frame format
- @param _pKeepThisFlyFrm
+ @param _pKeepThisFlyFrame
optional parameter - pointer to a fly frame of the given fly frame format,
which isn't deleted, if re-creation of fly frames is necessary.
*/
SwHandleAnchorNodeChg( SwFlyFrameFormat& _rFlyFrameFormat,
const SwFormatAnchor& _rNewAnchorFormat,
- SwFlyFrm* _pKeepThisFlyFrm = nullptr );
+ SwFlyFrame* _pKeepThisFlyFrame = nullptr );
- /** calls <SwFlyFrameFormat::MakeFrms>, if re-creation of fly frames is necessary.
+ /** calls <SwFlyFrameFormat::MakeFrames>, if re-creation of fly frames is necessary.
@author OD
*/
diff --git a/sw/inc/IDocumentLayoutAccess.hxx b/sw/inc/IDocumentLayoutAccess.hxx
index ab02daa108df..23f465f36f5f 100644
--- a/sw/inc/IDocumentLayoutAccess.hxx
+++ b/sw/inc/IDocumentLayoutAccess.hxx
@@ -23,7 +23,7 @@
#include <swtypes.hxx>
class SwViewShell;
-class SwRootFrm;
+class SwRootFrame;
class SwFrameFormat;
class SfxItemSet;
class SwLayouter;
@@ -39,8 +39,8 @@ public:
*/
virtual const SwViewShell* GetCurrentViewShell() const = 0;
virtual SwViewShell* GetCurrentViewShell() = 0;
- virtual const SwRootFrm* GetCurrentLayout() const = 0;
- virtual SwRootFrm* GetCurrentLayout() = 0;
+ virtual const SwRootFrame* GetCurrentLayout() const = 0;
+ virtual SwRootFrame* GetCurrentLayout() = 0;
virtual bool HasLayout() const = 0;
/** !!!The old layout must be deleted!!!
@@ -64,7 +64,7 @@ public:
/**
*/
virtual SwFrameFormat* CopyLayoutFormat( const SwFrameFormat& rSrc, const SwFormatAnchor& rNewAnchor,
- bool bSetTextFlyAtt, bool bMakeFrms ) = 0;
+ bool bSetTextFlyAtt, bool bMakeFrames ) = 0;
protected:
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 3c8324e3dd4d..b41bdb36159f 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -57,10 +57,10 @@ namespace sw { namespace annotation {
}}
namespace sw { namespace sidebarwindows {
class SwSidebarWin;
- class SwFrmSidebarWinContainer;
+ class SwFrameSidebarWinContainer;
}}
class SwSidebarItem;
-class SwFrm;
+class SwFrame;
namespace vcl { class Window; }
struct ImplSVEvent;
@@ -158,8 +158,8 @@ class SwPostItMgr: public SfxListener
OutlinerParaObject* mpAnswer;
bool mbIsShowAnchor;
- // data structure to collect the <SwSidebarWin> instances for certain <SwFrm> instances.
- sw::sidebarwindows::SwFrmSidebarWinContainer* mpFrmSidebarWinContainer;
+ // data structure to collect the <SwSidebarWin> instances for certain <SwFrame> instances.
+ sw::sidebarwindows::SwFrameSidebarWinContainer* mpFrameSidebarWinContainer;
typedef std::list<sw::sidebarwindows::SwSidebarWin*>::iterator SwSidebarWin_iterator;
@@ -277,15 +277,15 @@ class SwPostItMgr: public SfxListener
void AssureStdModeAtShell();
- void ConnectSidebarWinToFrm( const SwFrm& rFrm,
+ void ConnectSidebarWinToFrame( const SwFrame& rFrame,
const SwFormatField& rFormatField,
sw::sidebarwindows::SwSidebarWin& rSidebarWin );
- void DisconnectSidebarWinFromFrm( const SwFrm& rFrm,
+ void DisconnectSidebarWinFromFrame( const SwFrame& rFrame,
sw::sidebarwindows::SwSidebarWin& rSidebarWin );
- bool HasFrmConnectedSidebarWins( const SwFrm& rFrm );
- vcl::Window* GetSidebarWinForFrmByIndex( const SwFrm& rFrm,
+ bool HasFrameConnectedSidebarWins( const SwFrame& rFrame );
+ vcl::Window* GetSidebarWinForFrameByIndex( const SwFrame& rFrame,
const sal_Int32 nIndex );
- void GetAllSidebarWinForFrm( const SwFrm& rFrm,
+ void GetAllSidebarWinForFrame( const SwFrame& rFrame,
std::vector< vcl::Window* >* pChildren );
void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 4d88b4623a1c..c6738fac6132 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -41,7 +41,7 @@ class SwEditWin;
class SwView;
class Edit;
class MenuButton;
-class SwFrm;
+class SwFrame;
namespace sw { namespace overlay {
class OverlayRanges;
@@ -247,7 +247,7 @@ class SwSidebarWin : public vcl::Window
bool mbIsFollow;
SwSidebarItem& mrSidebarItem;
- const SwFrm* mpAnchorFrm;
+ const SwFrame* mpAnchorFrame;
};
} } // eof namespace sw::sidebarwindows
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index 8f015b0d3a0f..60a2056e9428 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -18,7 +18,7 @@
struct SwFormToken;
class SwPageDesc;
-class SwRootFrm;
+class SwRootFrame;
class SwTextNode;
namespace sw {
@@ -46,7 +46,7 @@ public:
*/
virtual HandledTabStopToken
HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
- const SwRootFrm *currentLayout) const = 0;
+ const SwRootFrame *currentLayout) const = 0;
};
/** The default implementation of ToxTabStopTokenHandler */
@@ -84,7 +84,7 @@ public:
*/
ToxTabStopTokenHandler::HandledTabStopToken
HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
- const SwRootFrm *currentLayout) const override;
+ const SwRootFrame *currentLayout) const override;
private:
/** Test whether the page layout can be obtained by a layout rectangle.
@@ -92,7 +92,7 @@ private:
* Is used to determine how to find tab stop position.
*/
static bool
- CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrm *currentLayout);
+ CanUseLayoutRectangle(const SwTextNode& targetNode, const SwRootFrame *currentLayout);
/** Calculate the page margin from the page description.
*
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 94f142c83ff3..bbd4872541be 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -32,13 +32,13 @@ class SwAttrPool;
class SwFormatAutoFormat;
class SwChapterField;
class SwChapterFieldType;
-class SwContentFrm;
+class SwContentFrame;
class SwContentNode;
class SwDoc;
class SwForm;
struct SwFormToken;
class SwPageDesc;
-class SwRootFrm;
+class SwRootFrame;
class SwTextAttr;
class SwTextNode;
struct SwTOXSortTabBase;
@@ -138,7 +138,7 @@ private:
/** Generate the text for a chapter token.
*/
OUString
- GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrm* contentFrame,
+ GenerateTextForChapterToken(const SwFormToken& chapterToken, const SwContentFrame* contentFrame,
const SwContentNode *contentNode) const;
/** Obtain a ChapterField to use for the text generation.
@@ -147,7 +147,7 @@ private:
*/
virtual SwChapterField
ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
- const SwContentFrm* contentFrame, const SwContentNode *contentNode) const;
+ const SwContentFrame* contentFrame, const SwContentNode *contentNode) const;
friend class ::ToxTextGeneratorTest;
};
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index a47051303379..eaf01f294e27 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -37,9 +37,9 @@
class SwAccessibleParagraph;
class SwViewShell;
class Rectangle;
-class SwFrm;
-class SwTextFrm;
-class SwPageFrm;
+class SwFrame;
+class SwTextFrame;
+class SwPageFrame;
class SwAccessibleContext;
class SwAccessibleContextMap_Impl;
class SwAccessibleEventList_Impl;
@@ -79,7 +79,7 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder,
{
mutable ::osl::Mutex maMutex;
::osl::Mutex maEventMutex;
- SwAccessibleContextMap_Impl *mpFrmMap;
+ SwAccessibleContextMap_Impl *mpFrameMap;
SwAccessibleShapeMap_Impl *mpShapeMap;
SwShapeList_Impl *mpShapes;
SwAccessibleEventList_Impl *mpEvents;
@@ -107,12 +107,12 @@ class SwAccessibleMap : public ::accessibility::IAccessibleViewForwarder,
void InvalidateShapeSelection();
- //mpSelectedFrmMap contains the old selected objects.
- SwAccessibleContextMap_Impl *mpSeletedFrmMap;
+ //mpSelectedFrameMap contains the old selected objects.
+ SwAccessibleContextMap_Impl *mpSeletedFrameMap;
//IvalidateShapeInParaSelection() method is responsible for the updating the selected states of the objects.
void InvalidateShapeInParaSelection();
- void _InvalidateRelationSet( const SwFrm* pFrm, bool bFrom );
+ void _InvalidateRelationSet( const SwFrame* pFrame, bool bFrom );
css::uno::Reference<css::accessibility::XAccessible>
_GetDocumentView( bool bPagePreview );
@@ -136,14 +136,14 @@ public:
css::uno::Reference<css::accessibility::XAccessible> GetDocumentPreview(
const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
::rtl::Reference < SwAccessibleContext > GetContextImpl(
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bCreate = true );
css::uno::Reference<css::accessibility::XAccessible> GetContext(
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bCreate = true );
::rtl::Reference < ::accessibility::AccessibleShape > GetContextImpl(
@@ -180,25 +180,25 @@ public:
*/
Size GetPreviewPageSize( sal_uInt16 _nPreviewPageNum ) const;
- void RemoveContext( const SwFrm *pFrm );
+ void RemoveContext( const SwFrame *pFrame );
void RemoveContext( const SdrObject *pObj );
// Dispose frame and its children if bRecursive is set
- void Dispose( const SwFrm* pFrm,
+ void Dispose( const SwFrame* pFrame,
const SdrObject* pObj,
vcl::Window* pWindow,
bool bRecursive = false );
- void InvalidatePosOrSize( const SwFrm* pFrm,
+ void InvalidatePosOrSize( const SwFrame* pFrame,
const SdrObject* pObj,
vcl::Window* pWindow,
- const SwRect& rOldFrm );
+ const SwRect& rOldFrame );
- void InvalidateContent( const SwFrm *pFrm );
+ void InvalidateContent( const SwFrame *pFrame );
- void InvalidateAttr( const SwTextFrm& rTextFrm );
+ void InvalidateAttr( const SwTextFrame& rTextFrame );
- void InvalidateCursorPosition( const SwFrm *pFrm );
+ void InvalidateCursorPosition( const SwFrame *pFrame );
void InvalidateFocus();
void SetCursorContext(
const ::rtl::Reference < SwAccessibleContext >& rCursorContext );
@@ -206,15 +206,15 @@ public:
// Invalidate state of whole tree. If an action is open, this call
// is processed when the last action ends.
void InvalidateStates( AccessibleStates _nStates,
- const SwFrm* _pFrm = nullptr );
+ const SwFrame* _pFrame = nullptr );
- void InvalidateRelationSet( const SwFrm* pMaster, const SwFrm* pFollow );
+ void InvalidateRelationSet( const SwFrame* pMaster, const SwFrame* pFollow );
/** invalidation CONTENT_FLOWS_FROM/_TO relation of a paragraph
@author OD
- @param _rTextFrm
+ @param _rTextFrame
input parameter - reference to paragraph, whose CONTENT_FLOWS_FROM/_TO
has to be invalidated.
@@ -222,14 +222,14 @@ public:
input parameter - boolean indicating, if relation CONTENT_FLOWS_FROM
(value <true>) or CONTENT_FLOWS_TO (value <false>) has to be invalidated.
*/
- void InvalidateParaFlowRelation( const SwTextFrm& _rTextFrm,
+ void InvalidateParaFlowRelation( const SwTextFrame& _rTextFrame,
const bool _bFrom );
/** invalidation of text selection of a paragraph
@author OD
*/
- void InvalidateParaTextSelection( const SwTextFrm& _rTextFrm );
+ void InvalidateParaTextSelection( const SwTextFrame& _rTextFrame );
/** invalidation of text selection of all paragraphs
@@ -237,17 +237,17 @@ public:
*/
void InvalidateTextSelectionOfAllParas();
- sal_Int32 GetChildIndex( const SwFrm& rParentFrm,
+ sal_Int32 GetChildIndex( const SwFrame& rParentFrame,
vcl::Window& rChild ) const;
// update preview data (and fire events if necessary)
void UpdatePreview( const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
void InvalidatePreviewSelection( sal_uInt16 nSelPage );
- bool IsPageSelected( const SwPageFrm *pPageFrm ) const;
+ bool IsPageSelected( const SwPageFrame *pPageFrame ) const;
void FireEvents();
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx
index 3d25df8ba2fc..7b097a2fb606 100644
--- a/sw/inc/anchoreddrawobject.hxx
+++ b/sw/inc/anchoreddrawobject.hxx
@@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
@author OD
*/
- void _InvalidatePage( SwPageFrm* _pPageFrm );
+ void _InvalidatePage( SwPageFrame* _pPageFrame );
protected:
virtual void ObjectAttachedToAnchorFrame() override;
@@ -154,21 +154,21 @@ class SW_DLLPUBLIC SwAnchoredDrawObject : public SwAnchoredObject
@author OD
- @param <_pNewAnchorFrm>
+ @param <_pNewAnchorFrame>
input parameter - new anchor frame for the anchored object.
@param <_pNewObjRect>
optional input parameter - proposed new object rectangle. If not
provided the current object rectangle is taken.
*/
- void AdjustPositioningAttr( const SwFrm* _pNewAnchorFrm,
+ void AdjustPositioningAttr( const SwFrame* _pNewAnchorFrame,
const SwRect* _pNewObjRect = nullptr );
/** method to notify background of drawing object
@author OD
*/
- virtual void NotifyBackground( SwPageFrm* _pPageFrm,
+ virtual void NotifyBackground( SwPageFrame* _pPageFrame,
const SwRect& _rRect,
PrepareHint _eHint ) override;
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index 803a3986ec1e..8b72e4c77fe1 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -24,11 +24,11 @@
#include <libxml/xmlwriter.h>
class SdrObject;
-class SwFrm;
-class SwLayoutFrm;
-class SwTextFrm;
+class SwFrame;
+class SwLayoutFrame;
+class SwTextFrame;
-class SwPageFrm;
+class SwPageFrame;
class SwObjPositioningInProgress;
class SwFrameFormat;
@@ -37,8 +37,8 @@ class SwFormatAnchor;
/** wrapper class for the positioning of Writer fly frames and drawing objects
Purpose of this class is to provide a unified interface for the positioning
- of Writer fly frames (derived classes of <SwFlyFrm>) and of drawing objects
- (derived classes of <SwDrawFrm>).
+ of Writer fly frames (derived classes of <SwFlyFrame>) and of drawing objects
+ (derived classes of <SwDrawFrame>).
@author OD
*/
@@ -48,10 +48,10 @@ class SW_DLLPUBLIC SwAnchoredObject
// drawing object representing the anchored object in the drawing layer
SdrObject* mpDrawObj;
// frame the object is anchored at
- SwFrm* mpAnchorFrm;
+ SwFrame* mpAnchorFrame;
// #i28701 - page frame the object is registered at
// note: no page frame for as-character anchored objects
- SwPageFrm* mpPageFrm;
+ SwPageFrame* mpPageFrame;
// current relative position (relative to anchor position of anchor frame)
Point maRelPos;
@@ -71,7 +71,7 @@ class SW_DLLPUBLIC SwAnchoredObject
// Layout frame vertical position is orient at - typically its the upper
// of the anchor frame, but it could also by the upper of a follow or
// a following layout frame in the text flow.
- const SwLayoutFrm* mpVertPosOrientFrm;
+ const SwLayoutFrame* mpVertPosOrientFrame;
// i#i28701 boolean, indicating that the object
// positioning algorithm is in progress.
@@ -103,7 +103,7 @@ class SW_DLLPUBLIC SwAnchoredObject
// considered during its positioning.
// This boolean is used, if compatibility option 'Consider wrapping style
// influence on object positioning' is OFF and a positioning loop is
- // detected in method <SwFlyAtCntFrm::MakeAll()> or method
+ // detected in method <SwFlyAtContentFrame::MakeAll()> or method
// <SwAnchoredDrawObject::_MakeObjPosAnchoredAtPara()>.
// The boolean is reset to <false>, when the layout process for a
// page frame starts.
@@ -131,19 +131,19 @@ class SW_DLLPUBLIC SwAnchoredObject
For to-character anchored Writer fly frames the member <maLastCharRect>
is updated. This is checked for change and depending on the applied
positioning, it's decided, if the Writer fly frame has to be invalidated.
- improvement - add second parameter <_rAnchorCharFrm>
+ improvement - add second parameter <_rAnchorCharFrame>
@author OD
@param _rAnch
input parameter - reference to anchor position
- @param _rAnchorCharFrm
+ @param _rAnchorCharFrame
input parameter - reference to the text frame containing the anchor
character.
*/
void _CheckCharRect( const SwFormatAnchor& _rAnch,
- const SwTextFrm& _rAnchorCharFrm );
+ const SwTextFrame& _rAnchorCharFrame );
/** check top of line
@@ -157,23 +157,23 @@ class SW_DLLPUBLIC SwAnchoredObject
@param _rAnch
input parameter - reference to anchor position
- @param _rAnchorCharFrm
+ @param _rAnchorCharFrame
input parameter - reference to the text frame containing the anchor
character.
*/
void _CheckTopOfLine( const SwFormatAnchor& _rAnch,
- const SwTextFrm& _rAnchorCharFrm );
+ const SwTextFrame& _rAnchorCharFrame );
// method <sw_HideObj(..)> sets needed data structure values for the
// object positioning
- friend bool sw_HideObj( const SwTextFrm& _rFrm,
+ friend bool sw_HideObj( const SwTextFrame& _rFrame,
const RndStdIds _eAnchorType,
const sal_Int32 _nObjAnchorPos,
SwAnchoredObject* _pAnchoredObj );
protected:
SwAnchoredObject();
- void SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFrm );
+ void SetVertPosOrientFrame( const SwLayoutFrame& _rVertPosOrientFrame );
/** method to assure that anchored object is registered at the correct
page frame
@@ -215,24 +215,24 @@ class SW_DLLPUBLIC SwAnchoredObject
const SdrObject* GetDrawObj() const { return mpDrawObj; }
SdrObject* DrawObj() { return mpDrawObj; }
- // accessors to member <mpAnchorFrm>
- const SwFrm* GetAnchorFrm() const { return mpAnchorFrm; }
- SwFrm* AnchorFrm() { return mpAnchorFrm; }
- void ChgAnchorFrm( SwFrm* _pNewAnchorFrm );
+ // accessors to member <mpAnchorFrame>
+ const SwFrame* GetAnchorFrame() const { return mpAnchorFrame; }
+ SwFrame* AnchorFrame() { return mpAnchorFrame; }
+ void ChgAnchorFrame( SwFrame* _pNewAnchorFrame );
/** determine anchor frame containing the anchor position
- the anchor frame, which is determined, is <mpAnchorFrm>
+ the anchor frame, which is determined, is <mpAnchorFrame>
for an at-page, at-frame or at-paragraph anchored object
and the anchor character frame for an at-character and as-character
anchored object.
@author OD
*/
- SwFrm* GetAnchorFrmContainingAnchPos();
+ SwFrame* GetAnchorFrameContainingAnchPos();
- SwPageFrm* GetPageFrm() { return mpPageFrm; }
- const SwPageFrm* GetPageFrm() const { return mpPageFrm; }
- void SetPageFrm( SwPageFrm* _pNewPageFrm );
+ SwPageFrame* GetPageFrame() { return mpPageFrame; }
+ const SwPageFrame* GetPageFrame() const { return mpPageFrame; }
+ void SetPageFrame( SwPageFrame* _pNewPageFrame );
/** method to determine the page frame, on which the 'anchor' of
the given anchored object is.
@@ -248,30 +248,30 @@ class SW_DLLPUBLIC SwAnchoredObject
input parameter - anchored object, for which the page frame of its
'anchor' has to be determined.
- @return SwPageFrm&
+ @return SwPageFrame&
page frame, the 'anchor' of the given anchored object is on
*/
- SwPageFrm* FindPageFrmOfAnchor();
+ SwPageFrame* FindPageFrameOfAnchor();
/** get frame, which contains the anchor character, if the object
is anchored at-character or as-character.
@author OD
- @return SwTextFrm*
+ @return SwTextFrame*
text frame containing the anchor character. It's NULL, if the object
isn't anchored at-character resp. as-character.
*/
- SwTextFrm* FindAnchorCharFrm();
+ SwTextFrame* FindAnchorCharFrame();
// accessors to data of position calculation:
// frame vertical position is orient at
- const SwLayoutFrm* GetVertPosOrientFrm() const
+ const SwLayoutFrame* GetVertPosOrientFrame() const
{
- return mpVertPosOrientFrm;
+ return mpVertPosOrientFrame;
}
- // method to clear member <mpVertPosOrientFrm>
- void ClearVertPosOrientFrm();
+ // method to clear member <mpVertPosOrientFrame>
+ void ClearVertPosOrientFrame();
/** check anchor character rectangle and top of line
@@ -290,8 +290,8 @@ class SW_DLLPUBLIC SwAnchoredObject
// accessors to member <maLastCharRect>
const SwRect& GetLastCharRect() const { return maLastCharRect;}
- SwTwips GetRelCharX( const SwFrm* pFrm ) const;
- SwTwips GetRelCharY( const SwFrm* pFrm ) const;
+ SwTwips GetRelCharX( const SwFrame* pFrame ) const;
+ SwTwips GetRelCharY( const SwFrame* pFrame ) const;
void AddLastCharY( long nDiff );
void ResetLastCharRectHeight();
@@ -345,7 +345,7 @@ class SW_DLLPUBLIC SwAnchoredObject
@author OD
*/
- virtual void NotifyBackground( SwPageFrm* _pPageFrm,
+ virtual void NotifyBackground( SwPageFrame* _pPageFrame,
const SwRect& _rRect,
PrepareHint _eHint ) = 0;
@@ -489,7 +489,7 @@ class SW_DLLPUBLIC SwAnchoredObject
@return Point - determined relative position
*/
- Point GetRelPosToAnchorFrm() const;
+ Point GetRelPosToAnchorFrame() const;
/** method to determine position of anchored object relative to
page frame
@@ -512,7 +512,7 @@ class SW_DLLPUBLIC SwAnchoredObject
@return Point - determined relative position
*/
- Point GetRelPosToPageFrm( const bool _bFollowTextFlow,
+ Point GetRelPosToPageFrame( const bool _bFollowTextFlow,
bool& _obRelToTableCell ) const;
/** method to determine position of anchored object relative to
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 491920e1fb13..def19644ee12 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -154,7 +154,7 @@ class SwCalc
SwHash* VarTable[ TBLSZ ];
OUString aVarName, sCurrSym;
OUString sCommand;
- std::vector<const SwUserFieldType*> aRekurStk;
+ std::vector<const SwUserFieldType*> aRekurStack;
SwSbxValue nLastLeft;
SwSbxValue nNumberValue;
SwCalcExp aErrExpr;
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index a470914ddb8f..e681a25fead8 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -37,7 +37,7 @@ class SwTableCalcPara
sal_uInt16 nStackCnt, nMaxSize;
public:
- SwTableSortBoxes *pBoxStk; ///< stack for recognizing recursion
+ SwTableSortBoxes *pBoxStack; ///< stack for recognizing recursion
SwCalc& rCalc; ///< current Calculator
const SwTable* pTable; ///< current table
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 59b6c84f989f..9889ecbc49eb 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -21,7 +21,7 @@
#include "fldbas.hxx"
-class SwFrm;
+class SwFrame;
class SwContentNode;
class SwTextNode;
class ToxTextGeneratorTest;
@@ -63,7 +63,7 @@ public:
SwChapterField(SwChapterFieldType*, sal_uInt32 nFormat = 0);
// #i53420#
- void ChangeExpansion( const SwFrm*,
+ void ChangeExpansion( const SwFrame*,
const SwContentNode*,
bool bSrchNum = false);
void ChangeExpansion(const SwTextNode &rNd, bool bSrchNum);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 6e7cd830d38d..cd0ce77edbf0 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -600,7 +600,7 @@
#define FN_NAVIGATION_BACK (FN_EXTRA2 + 115)
#define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 116)
-// #i972: bool items to be passed to SwFrmPage for evaluation
+// #i972: bool items to be passed to SwFramePage for evaluation
#define FN_OLE_IS_MATH (FN_EXTRA2 + 114)
#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115)
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 124e5de8a4f2..d53a61064cc0 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -40,8 +40,8 @@
class SfxItemSet;
class SfxPoolItem;
-class SwContentFrm;
-class SwCrsrShell;
+class SwContentFrame;
+class SwCursorShell;
class SwCursor;
class SwField;
class SwFieldType;
@@ -49,11 +49,11 @@ class SwFormat;
class SwFormatField;
class SwNodeIndex;
class SwPaM;
-class SwShellCrsr;
-class SwShellTableCrsr;
+class SwShellCursor;
+class SwShellTableCursor;
class SwTableNode;
class SwTextFormatColl;
-class SwVisCrsr;
+class SwVisibleCursor;
class SwTextINetFormat;
class SwFormatINetFormat;
class SwTextAttr;
@@ -129,29 +129,29 @@ struct SwContentAtPos
bool IsInRTLText()const;
};
-// return values of SetCrsr (can be combined via ||)
+// return values of SetCursor (can be combined via ||)
const int CRSR_POSOLD = 0x01, // cursor stays at old position
CRSR_POSCHG = 0x02; // position changed by the layout
/// Helperfunction to resolve backward references in regular expressions
OUString *ReplaceBackReferences( const css::util::SearchOptions& rSearchOpt, SwPaM* pPam );
-class SW_DLLPUBLIC SwCrsrShell
+class SW_DLLPUBLIC SwCursorShell
: public SwViewShell
, public SwModify
, public ::sw::IShellCursorSupplier
{
friend class SwCallLink;
- friend class SwVisCrsr;
+ friend class SwVisibleCursor;
friend class SwSelPaintRects;
- // requires the Crsr as InternalCrsr
- friend bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
+ // requires the Cursor as InternalCursor
+ friend bool GetAutoSumSel( const SwCursorShell&, SwCellFrames& );
public:
- /** for calling UpdateCrsr */
- enum CrsrFlag {
+ /** for calling UpdateCursor */
+ enum CursorFlag {
UPDOWN = (1 << 0), ///< keep Up/Down on columns
SCROLLWIN = (1 << 1), ///< scroll window
CHKRANGE = (1 << 2), ///< check overlapping PaMs
@@ -161,23 +161,23 @@ public:
private:
SwRect m_aCharRect; ///< Char-SRectangle on which the cursor is located
- Point m_aCrsrHeight; ///< height & offset from visible Cursor
+ Point m_aCursorHeight; ///< height & offset from visible Cursor
Point m_aOldRBPos; ///< Right/Bottom of last VisArea
// (used in Invalidate by Cursor)
- Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Crsr is set
+ Link<const SwFlyFrameFormat*,void> m_aFlyMacroLnk; /**< Link will be called, if the Cursor is set
into a fly. A macro can then be called */
- Link<SwCrsrShell*,void> m_aChgLnk; /**< link will be called by every attribute/
+ Link<SwCursorShell*,void> m_aChgLnk; /**< link will be called by every attribute/
format changes at cursor position.*/
- Link<SwCrsrShell&,void> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived
+ Link<SwCursorShell&,void> m_aGrfArrivedLnk; ///< Link calls to UI if a graphic is arrived
- SwShellCrsr* m_pCurCrsr; ///< current cursor
- SwShellCrsr* m_pCrsrStk; ///< stack for the cursor
- SwVisCrsr *m_pVisCrsr; ///< the visible cursor
+ SwShellCursor* m_pCurrentCursor; ///< current cursor
+ SwShellCursor* m_pCursorStack; ///< stack for the cursor
+ SwVisibleCursor *m_pVisibleCursor; ///< the visible cursor
- SwBlockCursor *m_pBlockCrsr; ///< interface of cursor for block (=rectangular) selection
+ SwBlockCursor *m_pBlockCursor; ///< interface of cursor for block (=rectangular) selection
- SwShellTableCrsr* m_pTableCrsr; /**< table Crsr; only in tables when the
+ SwShellTableCursor* m_pTableCursor; /**< table Cursor; only in tables when the
selection lays over 2 columns */
SwNodeIndex* m_pBoxIdx; ///< for recognizing of the changed
@@ -185,27 +185,27 @@ private:
long m_nUpDownX; /**< try to move the cursor on up/down always
in the same column */
- long m_nLeftFrmPos;
+ long m_nLeftFramePos;
sal_uLong m_nAktNode; // save CursorPos at Start-Action
sal_Int32 m_nAktContent;
sal_uInt16 m_nAktNdTyp;
bool m_bAktSelection;
/*
- * Via the Method SttCrsrMove and EndCrsrMove this counter gets
+ * Via the Method SttCursorMove and EndCursorMove this counter gets
* incremented/decremented. As long as the counter is inequal to 0, the
* current Cursor gets no update. This way, "complicated" cursor movements
* (via Find()) can be realised.
*/
- sal_uInt16 m_nCrsrMove;
+ sal_uInt16 m_nCursorMove;
sal_uInt16 m_nBasicActionCnt; ///< Actions which are parenthesized by Basic
- CrsrMoveState m_eMvState; ///< Status for Crsr-Travelling - GetCrsrOfst
+ CursorMoveState m_eMvState; ///< Status for Cursor-Travelling - GetCursorOfst
OUString m_sMarkedListId;
int m_nMarkedListLevel;
bool m_bHasFocus : 1; ///< Shell is "active" in a window
- bool m_bSVCrsrVis : 1; ///< SV-Cursor visible/invisible
+ bool m_bSVCursorVis : 1; ///< SV-Cursor visible/invisible
bool m_bChgCallFlag : 1; ///< attribute change inside Start- and EndAction
bool m_bVisPortChgd : 1; ///< in VisPortChg-Call
// (used in Invalidate by the Cursor)
@@ -215,28 +215,28 @@ private:
// access only via SwChgLinkFlag
bool m_bAllProtect : 1; ///< Flag for areas
// true -> everything protected / hidden
- bool m_bInCMvVisportChgd : 1; ///< Flag for CrsrMoves
+ bool m_bInCMvVisportChgd : 1; ///< Flag for CursorMoves
// true -> view was moved
bool m_bGCAttr : 1; // true -> non expanded attributes exist.
bool m_bIgnoreReadonly : 1; // true -> make the cursor visible on next
// EndAction in spite of Readonly
bool m_bSelTableCells : 1; // true -> select cells over the InputWin
bool m_bAutoUpdateCells : 1; // true -> autoformat cells
- bool m_bBasicHideCrsr : 1; // true -> HideCrsr from Basic
- bool m_bSetCrsrInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas
- bool m_bOverwriteCrsr : 1; // true -> show Overwrite Crsr
+ bool m_bBasicHideCursor : 1; // true -> HideCursor from Basic
+ bool m_bSetCursorInReadOnly : 1;// true -> Cursor is allowed in ReadOnly-Areas
+ bool m_bOverwriteCursor : 1; // true -> show Overwrite Cursor
bool m_bMacroExecAllowed : 1;
- SwFrm* m_oldColFrm;
+ SwFrame* m_oldColFrame;
- SAL_DLLPRIVATE void UpdateCrsr(
- sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
+ SAL_DLLPRIVATE void UpdateCursor(
+ sal_uInt16 eFlags = SwCursorShell::SCROLLWIN|SwCursorShell::CHKRANGE,
bool bIdleEnd = false );
- SAL_DLLPRIVATE void MoveCrsrToNum();
+ SAL_DLLPRIVATE void MoveCursorToNum();
- SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
+ SAL_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCursor** ppDelRing );
/** Mark a certain list level of a certain list
@@ -258,10 +258,10 @@ private:
SAL_DLLPRIVATE short GetTextDirection( const Point* pPt = nullptr ) const;
- SAL_DLLPRIVATE bool isInHiddenTextFrm(SwShellCrsr* pShellCrsr);
+ SAL_DLLPRIVATE bool isInHiddenTextFrame(SwShellCursor* pShellCursor);
-typedef bool (SwCursor:: *FNCrsr)();
- SAL_DLLPRIVATE bool CallCrsrFN( FNCrsr );
+typedef bool (SwCursor:: *FNCursor)();
+ SAL_DLLPRIVATE bool CallCursorFN( FNCursor );
SAL_DLLPRIVATE const SwRangeRedline* _GotoRedline( sal_uInt16 nArrPos, bool bSelect );
@@ -272,9 +272,9 @@ protected:
/*
* Compare-Methode for the StackCursor and the current Cursor.
* The Methods return -1, 0, 1 for lower, equal, greater. The enum
- * CrsrCompareType says which position is compared.
+ * CursorCompareType says which position is compared.
*/
- enum CrsrCompareType {
+ enum CursorCompareType {
StackPtStackMk,
StackPtCurrPt,
StackPtCurrMk,
@@ -282,7 +282,7 @@ protected:
StackMkCurrMk,
CurrPtCurrMk
};
- int CompareCursor( CrsrCompareType eType ) const;
+ int CompareCursor( CursorCompareType eType ) const;
bool _SelTableRowOrCol( bool bRow, bool bRowSimple = false );
@@ -298,24 +298,24 @@ protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew) override;
public:
- SwCrsrShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
+ SwCursorShell( SwDoc& rDoc, vcl::Window *pWin, const SwViewOption *pOpt = nullptr );
// disguised copy constructor
- SwCrsrShell( SwCrsrShell& rShell, vcl::Window *pWin );
- virtual ~SwCrsrShell();
+ SwCursorShell( SwCursorShell& rShell, vcl::Window *pWin );
+ virtual ~SwCursorShell();
// create new cursor and append the old one
virtual SwPaM & CreateNewShellCursor() override;
virtual SwPaM & GetCurrentShellCursor() override;
- SwPaM * CreateCrsr();
+ SwPaM * CreateCursor();
///< delete the current cursor and make the following into the current
- bool DestroyCrsr();
+ bool DestroyCursor();
///< transform TableCursor to normal cursor, nullify Tablemode
- void TableCrsrToCursor();
+ void TableCursorToCursor();
///< enter block mode, change normal cursor into block cursor
- void CrsrToBlockCrsr();
+ void CursorToBlockCursor();
///< leave block mode, change block cursor into normal cursor
- void BlockCrsrToCrsr();
+ void BlockCursorToCursor();
// SelAll() selects the document body content
// if ExtendedSelect() is called afterwards, the whole nodes array is selected
@@ -326,21 +326,21 @@ public:
/// If document body starts with a table.
bool StartsWithTable();
- SwPaM* GetCrsr( bool bMakeTableCrsr = true ) const;
- inline SwCursor* GetSwCrsr( bool bMakeTableCrsr = true ) const;
+ SwPaM* GetCursor( bool bMakeTableCursor = true ) const;
+ inline SwCursor* GetSwCursor( bool bMakeTableCursor = true ) const;
// return only the current cursor
- SwShellCrsr* _GetCrsr() { return m_pCurCrsr; }
- const SwShellCrsr* _GetCrsr() const { return m_pCurCrsr; }
+ SwShellCursor* _GetCursor() { return m_pCurrentCursor; }
+ const SwShellCursor* _GetCursor() const { return m_pCurrentCursor; }
// show passed cursor - for UNO
- void SetSelection(const SwPaM& rCrsr);
+ void SetSelection(const SwPaM& rCursor);
// remove all cursors from ContentNodes and set to 0
- void ParkCrsr( const SwNodeIndex &rIdx );
+ void ParkCursor( const SwNodeIndex &rIdx );
// return the current cursor stack
// (required in EditShell when deleting contents)
- inline SwPaM* GetStkCrsr() const;
+ inline SwPaM* GetStackCursor() const;
// start parenthesing, hide SV-Cursor and selected areas
void StartAction();
@@ -389,7 +389,7 @@ public:
// return values:
// CRSR_POSCHG: when cursor was corrected from SPoint by the layout
// CRSR_POSOLD: when the cursor was not changed
- int SetCrsr( const Point &rPt, bool bOnlyText = false, bool bBlock = true );
+ int SetCursor( const Point &rPt, bool bOnlyText = false, bool bBlock = true );
/*
* Notification that the visible area was changed. m_aVisArea is reset, then
@@ -427,21 +427,21 @@ public:
// story a copy of the cursor in the stack
void Push();
/*
- * Delete a cursor (controlled by bOldCrsr)
- * - from stack or (bOldCrsr = true)
+ * Delete a cursor (controlled by bOldCursor)
+ * - from stack or (bOldCursor = true)
* - delete the current one and replace it with the cursor from the
* stack
* Return: whether there was one left one the stack
*/
- bool Pop( bool bOldCrsr = true );
+ bool Pop( bool bOldCursor = true );
/*
* Combine 2 Cursors.
* Delete the topmost from the stack and move its Mark into the current.
*/
void Combine();
- void SttCrsrMove();
- void EndCrsrMove( const bool bIdleEnd = false );
+ void SttCursorMove();
+ void EndCursorMove( const bool bIdleEnd = false );
/*
* When the focus is lost the selected ranges are not displayed anymore.
@@ -453,28 +453,28 @@ public:
void ShGetFcs( bool bUpdate = true );
// Methods for displaying or hiding the visible text cursor.
- void ShowCrsr();
- void HideCrsr();
+ void ShowCursor();
+ void HideCursor();
// Methods for displaying or hiding the selected ranges with visible cursor.
- void ShowCrsrs( bool bCrsrVis );
- void HideCrsrs();
+ void ShowCursors( bool bCursorVis );
+ void HideCursors();
- bool IsOverwriteCrsr() const { return m_bOverwriteCrsr; }
- void SetOverwriteCrsr( bool bFlag ) { m_bOverwriteCrsr = bFlag; }
+ bool IsOverwriteCursor() const { return m_bOverwriteCursor; }
+ void SetOverwriteCursor( bool bFlag ) { m_bOverwriteCursor = bFlag; }
// Return current frame in which the cursor is placed.
- SwContentFrm *GetCurrFrm( const bool bCalcFrm = true ) const;
+ SwContentFrame *GetCurrFrame( const bool bCalcFrame = true ) const;
//true if cursor is hidden because of readonly.
//false if it is working despite readonly.
- bool IsCrsrReadonly() const;
+ bool IsCursorReadonly() const;
// Cursor is placed in something that is protected or selection contains
// something that is protected.
bool HasReadonlySel(bool bAnnotationMode = false) const;
// Can the cursor be set to read only ranges?
- bool IsReadOnlyAvailable() const { return m_bSetCrsrInReadOnly; }
+ bool IsReadOnlyAvailable() const { return m_bSetCursorInReadOnly; }
void SetReadOnlyAvailable( bool bFlag );
bool IsOverReadOnlyPos( const Point& rPt ) const;
@@ -483,12 +483,12 @@ public:
const Link<const SwFlyFrameFormat*,void>& GetFlyMacroLnk() const { return m_aFlyMacroLnk; }
// Methods returning/altering link for changes of attributes/formates.
- void SetChgLnk( const Link<SwCrsrShell*,void> &rLnk ) { m_aChgLnk = rLnk; }
- const Link<SwCrsrShell*,void>& GetChgLnk() const { return m_aChgLnk; }
+ void SetChgLnk( const Link<SwCursorShell*,void> &rLnk ) { m_aChgLnk = rLnk; }
+ const Link<SwCursorShell*,void>& GetChgLnk() const { return m_aChgLnk; }
// Methods returning/altering ling for "graphic completely loaded".
- void SetGrfArrivedLnk( const Link<SwCrsrShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
- const Link<SwCrsrShell&,void>& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; }
+ void SetGrfArrivedLnk( const Link<SwCursorShell&,void> &rLnk ) { m_aGrfArrivedLnk = rLnk; }
+ const Link<SwCursorShell&,void>& GetGrfArrivedLnk() const { return m_aGrfArrivedLnk; }
//Call ChgLink. When within an action calling will be delayed.
void CallChgLnk();
@@ -520,7 +520,7 @@ public:
/*
* Returns if cursor is wholly or partly within visible range.
*/
- bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
+ bool IsCursorVisible() const { return VisArea().IsOver( GetCharRect() ); }
/*
* Returns SwRect, at which the character is located.
*/
@@ -530,7 +530,7 @@ public:
// true: in which cursor is located.
// false: which is visible at the upper margin.
void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
- bool bAtCrsrPos = true, const bool bCalcFrm = true );
+ bool bAtCursorPos = true, const bool bCalcFrame = true );
// Determine how "empty pages" are handled
// (used in PhyPage).
sal_uInt16 GetNextPrevPageNum( bool bNext = true );
@@ -540,17 +540,17 @@ public:
sal_uInt16 GetPageCnt();
- bool GoNextCrsr();
+ bool GoNextCursor();
- bool GoPrevCrsr();
+ bool GoPrevCursor();
- // at CurCrsr.SPoint
+ // at CurrentCursor.SPoint
::sw::mark::IMark* SetBookmark(
const vcl::KeyCode&,
const OUString& rName,
const OUString& rShortName,
IDocumentMarkAccess::MarkType eMark = IDocumentMarkAccess::MarkType::BOOKMARK);
- bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurCrsr.SPoint
+ bool GotoMark( const ::sw::mark::IMark* const pMark ); // sets CurrentCursor.SPoint
bool GotoMark( const ::sw::mark::IMark* const pMark, bool bAtStart );
bool GoNextBookmark(); // true, if there was one
bool GoPrevBookmark();
@@ -563,7 +563,7 @@ public:
// update Cursr, i.e. reset it into content should only be called when the
// cursor was set to a random position e.g. when deleting frames
- void UpdateCrsrPos();
+ void UpdateCursorPos();
// get the selected text at the current cursor. it will be filled with
// fields etc.
@@ -573,10 +573,10 @@ public:
OUString GetText() const;
// Check of SPoint or Mark of current cursor are placed within a table.
- inline const SwTableNode* IsCrsrInTable( bool bIsPtInTable = true ) const;
+ inline const SwTableNode* IsCursorInTable( bool bIsPtInTable = true ) const;
- inline Point& GetCrsrDocPos( bool bPoint = true ) const;
- inline bool IsCrsrPtAtEnd() const;
+ inline Point& GetCursorDocPos( bool bPoint = true ) const;
+ inline bool IsCursorPtAtEnd() const;
inline const SwPaM* GetTableCrs() const;
inline SwPaM* GetTableCrs();
@@ -585,7 +585,7 @@ public:
// get current table selection as text
OUString GetBoxNms() const;
- // set Crsr to the next/previous cell
+ // set Cursor to the next/previous cell
bool GoNextCell( bool bAppendLine = true );
bool GoPrevCell();
// go to this box (if available and inside of table)
@@ -617,28 +617,28 @@ public:
/** Delivers the current shell cursor
Some operations have to run on the current cursor ring,
- some on the m_pTableCrsr (if exist) or the current cursor ring and
- some on the m_pTableCrsr or m_pBlockCrsr or the current cursor ring.
+ some on the m_pTableCursor (if exist) or the current cursor ring and
+ some on the m_pTableCursor or m_pBlockCursor or the current cursor ring.
This small function checks the existence and delivers the wished cursor.
@param bBlock [bool]
if the block cursor is of interest or not
- @return m_pTableCrsr if exist,
- m_pBlockCrsr if exist and of interest (param bBlock)
- otherwise m_pCurCrsr
+ @return m_pTableCursor if exist,
+ m_pBlockCursor if exist and of interest (param bBlock)
+ otherwise m_pCurrentCursor
*/
- SwShellCrsr* getShellCrsr( bool bBlock );
- const SwShellCrsr* getShellCrsr( bool bBlock ) const
- { return (const_cast<SwCrsrShell*>(this))->getShellCrsr( bBlock ); }
+ SwShellCursor* getShellCursor( bool bBlock );
+ const SwShellCursor* getShellCursor( bool bBlock ) const
+ { return (const_cast<SwCursorShell*>(this))->getShellCursor( bBlock ); }
- bool IsBlockMode() const { return nullptr != m_pBlockCrsr; }
+ bool IsBlockMode() const { return nullptr != m_pBlockCursor; }
- // is the Crsr in a table and is the selection over 2 columns
- bool IsTableMode() const { return nullptr != m_pTableCrsr; }
+ // is the Cursor in a table and is the selection over 2 columns
+ bool IsTableMode() const { return nullptr != m_pTableCursor; }
- const SwShellTableCrsr* GetTableCrsr() const { return m_pTableCrsr; }
- SwShellTableCrsr* GetTableCrsr() { return m_pTableCrsr; }
+ const SwShellTableCursor* GetTableCursor() const { return m_pTableCursor; }
+ SwShellTableCursor* GetTableCursor() { return m_pTableCursor; }
size_t UpdateTableSelBoxes();
bool GotoFootnoteText(); ///< jump from content to footnote
@@ -650,7 +650,7 @@ public:
bool GotoHeaderText(); ///< jump from the content to the header
bool GotoFooterText(); ///< jump from the content to the footer
// jump to the header/footer of the given or current PageDesc
- bool SetCrsrInHdFt( size_t nDescNo = SIZE_MAX,
+ bool SetCursorInHdFt( size_t nDescNo = SIZE_MAX,
bool bInHeader = true );
// is point of cursor in header/footer. pbInHeader return true if it is
// in a headerframe otherwise in a footerframe
@@ -682,8 +682,8 @@ public:
// Place only the visible cursor at the given position in the document.
// Return false if SPoint was corrected by layout.
// (This is needed for displaying the Drag&Drop/Copy-Cursor.)
- bool SetVisCrsr( const Point &rPt );
- inline void UnSetVisCrsr();
+ bool SetVisibleCursor( const Point &rPt );
+ inline void UnSetVisibleCursor();
// jump to the next or previous field of the corresponding type
bool MoveFieldType(
@@ -697,11 +697,11 @@ public:
static SwTextField* GetTextFieldAtPos(
const SwPosition* pPos,
const bool bIncludeInputFieldAtStart );
- static SwField* GetFieldAtCrsr(
- const SwPaM* pCrsr,
+ static SwField* GetFieldAtCursor(
+ const SwPaM* pCursor,
const bool bIncludeInputFieldAtStart );
SwField* GetCurField( const bool bIncludeInputFieldAtStart = false ) const;
- bool CrsrInsideInputField() const;
+ bool CursorInsideInputField() const;
static bool PosInsideInputField( const SwPosition& rPos );
bool DocPtInsideInputField( const Point& rDocPt ) const;
static sal_Int32 StartOfInputFieldAtPos( const SwPosition& rPos );
@@ -709,7 +709,7 @@ public:
// Return number of cursors in ring (The flag indicates whether
// only cursors containing selections are requested).
- sal_uInt16 GetCrsrCnt( bool bAll = true ) const;
+ sal_uInt16 GetCursorCnt( bool bAll = true ) const;
// Char Travelling - methods (in crstrvl1.cxx)
bool GoStartWord();
@@ -739,9 +739,9 @@ public:
// delete all created cursors, set the table cursor and the last cursor to
// its TextNode (or StartNode?)
- // They all get created on the next ::GetCrsr again
+ // They all get created on the next ::GetCursor again
// Used for Drag&Drop/Clipboard-Paste in tables
- bool ParkTableCrsr();
+ bool ParkTableCursor();
// Non expanded attributes?
bool IsGCAttr() const { return m_bGCAttr; }
@@ -763,7 +763,7 @@ public:
bool GetContentAtPos( const Point& rPt,
SwContentAtPos& rContentAtPos,
- bool bSetCrsr = false,
+ bool bSetCursor = false,
SwRect* pFieldRect = nullptr );
const SwPostItField* GetPostItFieldAtCursor() const;
@@ -800,9 +800,9 @@ public:
bool IsAutoUpdateCells() const { return m_bAutoUpdateCells; }
void SetAutoUpdateCells( bool bFlag ) { m_bAutoUpdateCells = bFlag; }
- bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
+ bool GetShadowCursorPos( const Point& rPt, SwFillMode eFillMode,
SwRect& rRect, short& rOrient );
- bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
+ bool SetShadowCursorPos( const Point& rPt, SwFillMode eFillMode );
const SwRangeRedline* SelNextRedline();
const SwRangeRedline* SelPrevRedline();
@@ -822,7 +822,7 @@ public:
bool SelectHiddenRange();
// remove all invalid cursors
- void ClearUpCrsrs();
+ void ClearUpCursors();
inline void SetMacroExecAllowed( const bool _bMacroExecAllowed )
{
@@ -842,7 +842,7 @@ public:
@return the textual description of the current selection
*/
- OUString GetCrsrDescr() const;
+ OUString GetCursorDescr() const;
virtual void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
/// Implementation of lok::Document::getPartPageRectangles() for Writer.
@@ -850,68 +850,68 @@ public:
};
// Cursor Inlines:
-inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
+inline SwMoveFnCollection* SwCursorShell::MakeFindRange(
sal_uInt16 nStt, sal_uInt16 nEnd, SwPaM* pPam ) const
{
- return m_pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
+ return m_pCurrentCursor->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
}
-inline SwCursor* SwCrsrShell::GetSwCrsr( bool bMakeTableCrsr ) const
+inline SwCursor* SwCursorShell::GetSwCursor( bool bMakeTableCursor ) const
{
- return static_cast<SwCursor*>(GetCrsr( bMakeTableCrsr ));
+ return static_cast<SwCursor*>(GetCursor( bMakeTableCursor ));
}
-inline SwPaM* SwCrsrShell::GetStkCrsr() const { return m_pCrsrStk; }
+inline SwPaM* SwCursorShell::GetStackCursor() const { return m_pCursorStack; }
-inline void SwCrsrShell::SetMark() { m_pCurCrsr->SetMark(); }
+inline void SwCursorShell::SetMark() { m_pCurrentCursor->SetMark(); }
-inline bool SwCrsrShell::HasMark() { return( m_pCurCrsr->HasMark() ); }
+inline bool SwCursorShell::HasMark() { return( m_pCurrentCursor->HasMark() ); }
-inline bool SwCrsrShell::IsSelection() const
+inline bool SwCursorShell::IsSelection() const
{
- return IsTableMode() || m_pCurCrsr->HasMark() ||
- m_pCurCrsr->GetNext() != m_pCurCrsr;
+ return IsTableMode() || m_pCurrentCursor->HasMark() ||
+ m_pCurrentCursor->GetNext() != m_pCurrentCursor;
}
-inline bool SwCrsrShell::IsMultiSelection() const
+inline bool SwCursorShell::IsMultiSelection() const
{
- return m_pCurCrsr->GetNext() != m_pCurCrsr;
+ return m_pCurrentCursor->GetNext() != m_pCurrentCursor;
}
-inline bool SwCrsrShell::IsSelOnePara() const
+inline bool SwCursorShell::IsSelOnePara() const
{
- return !m_pCurCrsr->IsMultiSelection() &&
- m_pCurCrsr->GetPoint()->nNode == m_pCurCrsr->GetMark()->nNode;
+ return !m_pCurrentCursor->IsMultiSelection() &&
+ m_pCurrentCursor->GetPoint()->nNode == m_pCurrentCursor->GetMark()->nNode;
}
-inline const SwTableNode* SwCrsrShell::IsCrsrInTable( bool bIsPtInTable ) const
+inline const SwTableNode* SwCursorShell::IsCursorInTable( bool bIsPtInTable ) const
{
- return m_pCurCrsr->GetNode( bIsPtInTable ).FindTableNode();
+ return m_pCurrentCursor->GetNode( bIsPtInTable ).FindTableNode();
}
-inline bool SwCrsrShell::IsCrsrPtAtEnd() const
+inline bool SwCursorShell::IsCursorPtAtEnd() const
{
- return m_pCurCrsr->End() == m_pCurCrsr->GetPoint();
+ return m_pCurrentCursor->End() == m_pCurrentCursor->GetPoint();
}
-inline Point& SwCrsrShell::GetCrsrDocPos( bool bPoint ) const
+inline Point& SwCursorShell::GetCursorDocPos( bool bPoint ) const
{
- return bPoint ? m_pCurCrsr->GetPtPos() : m_pCurCrsr->GetMkPos();
+ return bPoint ? m_pCurrentCursor->GetPtPos() : m_pCurrentCursor->GetMkPos();
}
-inline const SwPaM* SwCrsrShell::GetTableCrs() const
+inline const SwPaM* SwCursorShell::GetTableCrs() const
{
- return m_pTableCrsr;
+ return m_pTableCursor;
}
-inline SwPaM* SwCrsrShell::GetTableCrs()
+inline SwPaM* SwCursorShell::GetTableCrs()
{
- return m_pTableCrsr;
+ return m_pTableCursor;
}
-inline void SwCrsrShell::UnSetVisCrsr()
+inline void SwCursorShell::UnSetVisibleCursor()
{
- m_pVisCrsr->Hide();
- m_pVisCrsr->SetDragCrsr( false );
+ m_pVisibleCursor->Hide();
+ m_pVisibleCursor->SetDragCursor( false );
}
#endif // _CRSRSH_HXX
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index cdb7df2e1fc2..0663b21bc81f 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -32,16 +32,16 @@ enum SwFillMode
FILL_INDENT ///< by left paragraph indention
};
-struct SwFillCrsrPos
+struct SwFillCursorPos
{
- SwRect aCrsr; ///< position and size of the ShadowCursor
+ SwRect aCursor; ///< position and size of the ShadowCursor
sal_uInt16 nParaCnt; ///< number of paragraphs to insert
sal_uInt16 nTabCnt; ///< number of tabs respectively size of indentation
sal_uInt16 nSpaceCnt; ///< number of spaces to insert
sal_uInt16 nColumnCnt; ///< number of necessary column breaks
sal_Int16 eOrient; ///< paragraph alignment
SwFillMode eMode; ///< desired fill-up rule
- SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) :
+ SwFillCursorPos( SwFillMode eMd = FILL_TAB ) :
nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ),
eOrient( css::text::HoriOrientation::NONE ), eMode( eMd )
{}
@@ -68,7 +68,7 @@ struct Sw2LinesPos
/**
* SwSpecialPos. This structure is used to pass some additional information
- * during the call of SwTextFrm::GetCharRect(). An SwSpecialPos defines a position
+ * during the call of SwTextFrame::GetCharRect(). An SwSpecialPos defines a position
* inside a portion which does not have a representation in the core string or
* which is only represented by one position, e.g., field portions,
* number portions, ergo sum and quo vadis portions.
@@ -85,7 +85,7 @@ struct Sw2LinesPos
*
* Get the position of the second character inside a number portion:
* nCharOfst = 2; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_BEFORE;
- * Call SwTextFrm:::GetCharRect with core string position 0.
+ * Call SwTextFrame:::GetCharRect with core string position 0.
*
* Example 2)
*
@@ -94,7 +94,7 @@ struct Sw2LinesPos
* Get the position of the third character in follow field B, core position
* of field A is 33.
* nCharOfst = 7; nLineOfst = 0; nExtendRange = SP_EXTEND_RANGE_NONE;
- * Call SwTextFrm:::GetCharRect with core string position 33.
+ * Call SwTextFrame:::GetCharRect with core string position 33.
*/
enum class SwSPExtendRange : sal_uInt8
@@ -114,11 +114,11 @@ struct SwSpecialPos
{}
};
-// CrsrTravelling-States (for GetCrsrOfst)
-enum CrsrMoveState
+// CursorTravelling-States (for GetCursorOfst)
+enum CursorMoveState
{
MV_NONE, ///< default
- MV_UPDOWN, ///< Crsr Up/Down
+ MV_UPDOWN, ///< Cursor Up/Down
MV_RIGHTMARGIN, ///< at right margin
MV_LEFTMARGIN, ///< at left margin
MV_SETONLYTEXT, ///< stay with the cursor inside text
@@ -126,27 +126,27 @@ enum CrsrMoveState
};
// struct for later extensions
-struct SwCrsrMoveState
+struct SwCursorMoveState
{
- SwFillCrsrPos *m_pFill; ///< for automatic filling with tabs etc
+ SwFillCursorPos *m_pFill; ///< for automatic filling with tabs etc
Sw2LinesPos *m_p2Lines; ///< for selections inside/around 2line portions
SwSpecialPos* m_pSpecialPos; ///< for positions inside fields
Point m_aRealHeight; ///< contains then the position/height of the cursor
- CrsrMoveState m_eState;
+ CursorMoveState m_eState;
sal_uInt8 m_nCursorBidiLevel;
bool m_bStop;
bool m_bRealHeight; ///< should the real height be calculated?
bool m_bFieldInfo; ///< should be fields recognized?
bool m_bPosCorr; ///< Point had to be corrected
bool m_bFootnoteNoInfo; ///< recognized footnote numbering
- bool m_bExactOnly; /**< let GetCrsrOfst look for exact matches only,
+ bool m_bExactOnly; /**< let GetCursorOfst look for exact matches only,
i.e. never let it run into GetContentPos */
bool m_bFillRet; ///< only used temporary in FillMode
bool m_bSetInReadOnly; ///< ReadOnly areas may be entered
bool m_bRealWidth; ///< Calculation of the width required
bool m_b2Lines; ///< Check 2line portions and fill p2Lines
bool m_bNoScroll; ///< No scrolling of undersized textframes
- bool m_bPosMatchesBounds; /**< GetCrsrOfst should not return the next
+ bool m_bPosMatchesBounds; /**< GetCursorOfst should not return the next
position if screen position is inside second
have of bound rect */
@@ -160,7 +160,7 @@ struct SwCrsrMoveState
bool m_bInNumPortion; ///< point is in number portion #i23726#
int m_nInNumPostionOffset; ///< distance from number portion's start
- SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) :
+ SwCursorMoveState( CursorMoveState eSt = MV_NONE ) :
m_pFill( nullptr ),
m_p2Lines( nullptr ),
m_pSpecialPos( nullptr ),
@@ -183,7 +183,7 @@ struct SwCrsrMoveState
m_bInNumPortion(false), // #i26726#
m_nInNumPostionOffset(0) // #i26726#
{}
- SwCrsrMoveState( SwFillCrsrPos *pInitFill ) :
+ SwCursorMoveState( SwFillCursorPos *pInitFill ) :
m_pFill( pInitFill ),
m_p2Lines( nullptr ),
m_pSpecialPos( nullptr ),
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 2ba43ffef947..a75b3f9f878b 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -23,21 +23,21 @@
#include "swdllapi.h"
class SwPaM;
-class SwContentFrm;
-class SwLayoutFrm;
+class SwContentFrame;
+class SwLayoutFrame;
// Structure for SwPaM. Contains the method-pointers for cursor movement.
struct SwMoveFnCollection;
typedef SwMoveFnCollection* SwMoveFn;
-// Type definition for CrsrShell.
-// Direction-parameter for MovePage (initialized in SwContentFrm).
-typedef SwLayoutFrm * (*SwWhichPage)( const SwLayoutFrm * );
-typedef SwContentFrm * (*SwPosPage)( const SwLayoutFrm * );
+// Type definition for CursorShell.
+// Direction-parameter for MovePage (initialized in SwContentFrame).
+typedef SwLayoutFrame * (*SwWhichPage)( const SwLayoutFrame * );
+typedef SwContentFrame * (*SwPosPage)( const SwLayoutFrame * );
extern SwWhichPage fnPagePrev, fnPageCurr, fnPageNext;
extern SwPosPage fnPageStart, fnPageEnd;
-// Direction-parameter for MovePara (initialized in SwContentFrm).
+// Direction-parameter for MovePara (initialized in SwContentFrame).
typedef SwMoveFnCollection* SwPosPara;
typedef bool (*SwWhichPara)( SwPaM&, SwPosPara );
extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
@@ -56,8 +56,8 @@ extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext;
extern SwPosTable fnTableStart, fnTableEnd;
// Direction-parameter for MoveColumn
-typedef SwLayoutFrm * (*SwWhichColumn)( const SwLayoutFrm * );
-typedef SwContentFrm * (*SwPosColumn)( const SwLayoutFrm * );
+typedef SwLayoutFrame * (*SwWhichColumn)( const SwLayoutFrame * );
+typedef SwContentFrame * (*SwPosColumn)( const SwLayoutFrame * );
extern SwWhichColumn fnColumnPrev, fnColumnCurr, fnColumnNext;
extern SwPosColumn fnColumnStart, fnColumnEnd;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 682c950b7031..3e996288f038 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -25,7 +25,7 @@
class SwDoc;
class SwTextField;
-class SwFrm;
+class SwFrame;
// Database field.
class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index c565b66dee82..73d4242f337e 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -32,9 +32,9 @@
class SfxPoolItem;
class SwFrameFormat;
class SwFlyFrameFormat;
-class SwFlyFrm;
-class SwFrm;
-class SwPageFrm;
+class SwFlyFrame;
+class SwFrame;
+class SwPageFrame;
class SwVirtFlyDrawObj;
class SwFormatAnchor;
class SwFlyDrawObj;
@@ -54,7 +54,7 @@ inline const SwFrameFormat *FindFrameFormat( const SdrObject *pObj )
{ return ::FindFrameFormat( const_cast<SdrObject*>(pObj) ); }
bool HasWrap( const SdrObject* pObj );
-void setContextWritingMode( SdrObject* pObj, SwFrm* pAnchor );
+void setContextWritingMode( SdrObject* pObj, SwFrame* pAnchor );
/// @return BoundRect plus distance.
SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj );
@@ -253,8 +253,8 @@ class SwDrawVirtObj : public SdrVirtObj
/// connection to writer layout
const SwAnchoredObject& GetAnchoredObj() const { return maAnchoredDrawObj; }
SwAnchoredObject& AnchoredObj() { return maAnchoredDrawObj; }
- const SwFrm* GetAnchorFrm() const;
- SwFrm* AnchorFrm();
+ const SwFrame* GetAnchorFrame() const;
+ SwFrame* AnchorFrame();
void RemoveFromWriterLayout();
/// connection to drawing layer
@@ -363,10 +363,10 @@ class SwDrawContact : public SwContact
/** unary function used by <list> iterator to find a 'virtual' drawing
object anchored at a given frame */
- struct VirtObjAnchoredAtFrmPred
+ struct VirtObjAnchoredAtFramePred
{
- const SwFrm* mpAnchorFrm;
- VirtObjAnchoredAtFrmPred( const SwFrm& _rAnchorFrm );
+ const SwFrame* mpAnchorFrame;
+ VirtObjAnchoredAtFramePred( const SwFrame& _rAnchorFrame );
bool operator() ( const SwDrawVirtObj* _pDrawVirtObj );
};
@@ -396,25 +396,25 @@ class SwDrawContact : public SwContact
virtual SdrObject* GetMaster() override;
virtual void SetMaster( SdrObject* _pNewMaster ) override;
- const SwFrm* GetAnchorFrm( const SdrObject* _pDrawObj = nullptr ) const;
- SwFrm* GetAnchorFrm( SdrObject* _pDrawObj = nullptr );
+ const SwFrame* GetAnchorFrame( const SdrObject* _pDrawObj = nullptr ) const;
+ SwFrame* GetAnchorFrame( SdrObject* _pDrawObj = nullptr );
- inline const SwPageFrm* GetPageFrm() const
+ inline const SwPageFrame* GetPageFrame() const
{
- return maAnchoredDrawObj.GetPageFrm();
+ return maAnchoredDrawObj.GetPageFrame();
}
- inline SwPageFrm* GetPageFrm()
+ inline SwPageFrame* GetPageFrame()
{
- return maAnchoredDrawObj.GetPageFrm();
+ return maAnchoredDrawObj.GetPageFrame();
}
- void SetPageFrm( SwPageFrm* _pNewPageFrm )
+ void SetPageFrame( SwPageFrame* _pNewPageFrame )
{
- return maAnchoredDrawObj.SetPageFrm( _pNewPageFrm );
+ return maAnchoredDrawObj.SetPageFrame( _pNewPageFrame );
}
void ChkPage();
- SwPageFrm* FindPage( const SwRect &rRect );
+ SwPageFrame* FindPage( const SwRect &rRect );
- /** Inserts SdrObject in the arrays of the layout ((SwPageFrm and SwFrm).
+ /** Inserts SdrObject in the arrays of the layout ((SwPageFrame and SwFrame).
The anchor is determined according to the attribute SwFormatAnchor.
If required the object gets unregistered with the old anchor. */
void ConnectToLayout( const SwFormatAnchor *pAnch = nullptr );
@@ -436,7 +436,7 @@ class SwDrawContact : public SwContact
/** get drawing object ('master' or 'virtual')
by frame. */
- SdrObject* GetDrawObjectByAnchorFrm( const SwFrm& _rAnchorFrm );
+ SdrObject* GetDrawObjectByAnchorFrame( const SwFrame& _rAnchorFrame );
/// Virtual methods of SdrObjUserCall.
virtual void Changed(const SdrObject& rObj, SdrUserCallType eType, const Rectangle& rOldBoundRect) override;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index be104eb2abab..c752fa385526 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -78,11 +78,11 @@ class SvxMacroTableDtor;
class SwAutoCompleteWord;
class SwAutoCorrExceptWord;
class SwCalc;
-class SwCellFrm;
+class SwCellFrame;
class SwCharFormat;
class SwCharFormats;
class SwConditionTextFormatColl;
-class SwCrsrShell;
+class SwCursorShell;
class SwCursor;
class SwDBNameInfField;
class SwDocShell;
@@ -120,7 +120,7 @@ class SwPagePreviewPrtData;
class SwRangeRedline;
class SwRedlineTable;
class SwExtraRedlineTable;
-class SwRootFrm;
+class SwRootFrame;
class SwRubyList;
class SwRubyListEntry;
class SwSectionFormat;
@@ -142,7 +142,7 @@ class SwTextBlocks;
class SwTextFormatColl;
class SwTextFormatColls;
class SwURLStateChanged;
-class SwUnoCrsr;
+class SwUnoCursor;
class SwViewShell;
class _SetGetExpField;
class SwDrawContact;
@@ -168,7 +168,7 @@ class SwChartLockController_Helper;
class IGrammarContact;
class SwPrintData;
class SwRenderData;
-class SwPageFrm;
+class SwPageFrame;
class SwViewOption;
class SwList;
class IDocumentUndoRedo;
@@ -392,7 +392,7 @@ private:
const SwContentNode& rNode, RndStdIds eRequestId,
const SfxItemSet* pFlyAttrSet,
SwFrameFormat* = nullptr );
- sal_Int8 SetFlyFrmAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrms );
+ sal_Int8 SetFlyFrameAnchor( SwFrameFormat& rFlyFormat, SfxItemSet& rSet, bool bNewFrames );
typedef SwFormat* (SwDoc:: *FNCopyFormat)( const OUString&, SwFormat*, bool, bool );
SwFormat* CopyFormat( const SwFormat& rFormat, const SwFormatsBase& rFormatArr,
@@ -619,7 +619,7 @@ public:
have to be surrounded completely by css::awt::Selection.
( Start < Pos < End ) !!!
(Required for Writers.) */
- SwPosFlyFrms GetAllFlyFormats( const SwPaM* = nullptr,
+ SwPosFlyFrames GetAllFlyFormats( const SwPaM* = nullptr,
bool bDrawAlso = false,
bool bAsCharAlso = false ) const;
@@ -656,13 +656,13 @@ public:
// these items work for the UNO API and thus e.g. for ODF im/export)
void CheckForUniqueItemForLineFillNameOrIndex(SfxItemSet& rSet);
- bool SetFlyFrmAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
+ bool SetFlyFrameAttr( SwFrameFormat& rFlyFormat, SfxItemSet& rSet );
bool SetFrameFormatToFly( SwFrameFormat& rFlyFormat, SwFrameFormat& rNewFormat,
SfxItemSet* pSet = nullptr, bool bKeepOrient = false );
- void SetFlyFrmTitle( SwFlyFrameFormat& rFlyFrameFormat,
+ void SetFlyFrameTitle( SwFlyFrameFormat& rFlyFrameFormat,
const OUString& sNewTitle );
- void SetFlyFrmDescription( SwFlyFrameFormat& rFlyFrameFormat,
+ void SetFlyFrameDescription( SwFlyFrameFormat& rFlyFrameFormat,
const OUString& sNewDescription );
// Footnotes
@@ -686,7 +686,7 @@ public:
SwConversionArgs *pConvArgs = nullptr ) const;
css::uno::Reference< css::linguistic2::XHyphenatedWord >
- Hyphenate( SwPaM *pPam, const Point &rCrsrPos,
+ Hyphenate( SwPaM *pPam, const Point &rCursorPos,
sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
// count words in pam
@@ -726,7 +726,7 @@ public:
OUString GetUniqueFrameName() const;
OUString GetUniqueShapeName() const;
- std::set<SwRootFrm*> GetAllLayouts();
+ std::set<SwRootFrame*> GetAllLayouts();
void SetFlyName( SwFlyFrameFormat& rFormat, const OUString& rName );
const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_Int8 nNdTyp = 0 ) const;
@@ -898,15 +898,15 @@ public:
// travel over PaM Ring
bool InsertGlossary( SwTextBlocks& rBlock, const OUString& rEntry,
- SwPaM& rPaM, SwCrsrShell* pShell = nullptr);
+ SwPaM& rPaM, SwCursorShell* pShell = nullptr);
/** get the set of printable pages for the XRenderable API by
evaluating the respective settings (see implementation) */
- static void CalculatePagesForPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+ static void CalculatePagesForPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
sal_Int32 nDocPageCount );
static void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
sal_Int32 nDocPageCount );
- static void CalculatePagePairsForProspectPrinting( const SwRootFrm& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
+ static void CalculatePagePairsForProspectPrinting( const SwRootFrame& rLayout, SwRenderData &rData, const SwPrintUIOptions &rOptions,
sal_Int32 nDocPageCount );
// PageDescriptor interface.
@@ -1013,34 +1013,34 @@ public:
// Correct the SwPosition-Objects that are registered with the document
// e. g. Bookmarks or tables/indices.
- // If bMoveCrsr is set move Crsr too.
+ // If bMoveCursor is set move Cursor too.
// Set everything in rOldNode on rNewPos + Offset.
void CorrAbs(
const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset = 0,
- bool bMoveCrsr = false );
+ bool bMoveCursor = false );
// Set everything in the range of [rStartNode, rEndNode] to rNewPos.
static void CorrAbs(
const SwNodeIndex& rStartNode,
const SwNodeIndex& rEndNode,
const SwPosition& rNewPos,
- bool bMoveCrsr = false );
+ bool bMoveCursor = false );
// Set everything in this range from rRange to rNewPos.
static void CorrAbs(
const SwPaM& rRange,
const SwPosition& rNewPos,
- bool bMoveCrsr = false );
+ bool bMoveCursor = false );
// Set everything in rOldNode to relative Pos.
void CorrRel(
const SwNodeIndex& rOldNode,
const SwPosition& rNewPos,
const sal_Int32 nOffset = 0,
- bool bMoveCrsr = false );
+ bool bMoveCursor = false );
// Query / set rules for Outline.
inline SwNumRule* GetOutlineNumRule() const
@@ -1230,14 +1230,14 @@ public:
bool IsInsTableAlignNum() const;
// From FEShell (for Undo and BModified).
- static void GetTabCols( SwTabCols &rFill, const SwCursor* pCrsr,
- const SwCellFrm* pBoxFrm = nullptr );
+ static void GetTabCols( SwTabCols &rFill, const SwCursor* pCursor,
+ const SwCellFrame* pBoxFrame = nullptr );
void SetTabCols( const SwTabCols &rNew, bool bCurRowOnly,
- const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = nullptr );
- static void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr,
- const SwCellFrm* pBoxFrm = nullptr );
- void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCrsr,
- const SwCellFrm* pBoxFrm = nullptr );
+ const SwCursor* pCursor, const SwCellFrame* pBoxFrame = nullptr );
+ static void GetTabRows( SwTabCols &rFill, const SwCursor* pCursor,
+ const SwCellFrame* pBoxFrame = nullptr );
+ void SetTabRows( const SwTabCols &rNew, bool bCurColOnly, const SwCursor* pCursor,
+ const SwCellFrame* pBoxFrame = nullptr );
// Direct access for UNO.
void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
@@ -1460,7 +1460,7 @@ public:
void SetOLEObjModified();
// Uno - Interfaces
- std::shared_ptr<SwUnoCrsr> CreateUnoCrsr( const SwPosition& rPos, bool bTableCrsr = false );
+ std::shared_ptr<SwUnoCursor> CreateUnoCursor( const SwPosition& rPos, bool bTableCursor = false );
// FeShell - Interfaces
// !!! These assume always an existing layout !!!
@@ -1469,8 +1469,8 @@ public:
const bool _bSameOnly,
const bool _bPosCorr );
- void SetRowHeight( const SwCursor& rCursor, const SwFormatFrmSize &rNew );
- static void GetRowHeight( const SwCursor& rCursor, SwFormatFrmSize *& rpSz );
+ void SetRowHeight( const SwCursor& rCursor, const SwFormatFrameSize &rNew );
+ static void GetRowHeight( const SwCursor& rCursor, SwFormatFrameSize *& rpSz );
void SetRowSplit( const SwCursor& rCursor, const SwFormatRowSplit &rNew );
static void GetRowSplit( const SwCursor& rCursor, SwFormatRowSplit *& rpSz );
bool BalanceRowHeight( const SwCursor& rCursor, bool bTstOnly = true );
@@ -1501,7 +1501,7 @@ public:
SwChainRet Chain( SwFrameFormat &rSource, const SwFrameFormat &rDest );
void Unchain( SwFrameFormat &rFormat );
- // For Copy/Move from FrmShell.
+ // For Copy/Move from FrameShell.
SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
bool bInsInPage = true );
@@ -1634,17 +1634,17 @@ public:
void dumpAsXml(struct _xmlTextWriter* = nullptr) const;
std::set<Color> GetDocColors();
- std::vector< std::weak_ptr<SwUnoCrsr> > mvUnoCrsrTable;
+ std::vector< std::weak_ptr<SwUnoCursor> > mvUnoCursorTable;
- // Remove expired UnoCrsr weak pointers the document keeps to notify about document death.
- void cleanupUnoCrsrTable()
+ // Remove expired UnoCursor weak pointers the document keeps to notify about document death.
+ void cleanupUnoCursorTable()
{
// In most cases we'll remove most of the elements.
- std::vector< std::weak_ptr<SwUnoCrsr> > unoCrsrTable;
- std::copy_if(mvUnoCrsrTable.begin(), mvUnoCrsrTable.end(),
- std::back_inserter(unoCrsrTable),
- [](const std::weak_ptr<SwUnoCrsr>& pWeakPtr) { return !pWeakPtr.expired(); });
- std::swap(mvUnoCrsrTable, unoCrsrTable);
+ std::vector< std::weak_ptr<SwUnoCursor> > unoCursorTable;
+ std::copy_if(mvUnoCursorTable.begin(), mvUnoCursorTable.end(),
+ std::back_inserter(unoCursorTable),
+ [](const std::weak_ptr<SwUnoCursor>& pWeakPtr) { return !pWeakPtr.expired(); });
+ std::swap(mvUnoCursorTable, unoCursorTable);
}
private:
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 07246188f681..37c5201905e4 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -27,7 +27,7 @@
class SwRangeRedline;
class SwExtraRedline;
-class SwUnoCrsr;
+class SwUnoCursor;
class SwOLENode;
class SwTable;
class SwTableLine;
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index bd9cf5419751..52fe09828031 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -45,7 +45,7 @@ class SwWrtShell;
class SwFEShell;
class Reader;
class SwReader;
-class SwCrsrShell;
+class SwCursorShell;
class SwSrcView;
class SwPaM;
class SwgReaderOption;
@@ -228,7 +228,7 @@ public:
/// For inserting document.
Reader* StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr,
- SwCrsrShell* pCrsrSh = nullptr, SwPaM* pPaM = nullptr);
+ SwCursorShell* pCursorSh = nullptr, SwPaM* pPaM = nullptr);
#if defined WNT
virtual bool DdeGetData( const OUString& rItem, const OUString& rMimeType,
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 2e8c9152fd24..d684e9facc71 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -29,7 +29,7 @@
class _SetGetExpFields;
class SwTextField;
-class SwFrm;
+class SwFrame;
class OutlinerParaObject;
class SwTextAPIObject;
class SwFormatField;
@@ -273,7 +273,7 @@ public:
SwDocStatField( SwDocStatFieldType*,
sal_uInt16 nSubType = 0, sal_uInt32 nFormat = 0);
- void ChangeExpansion( const SwFrm* pFrm );
+ void ChangeExpansion( const SwFrame* pFrame );
virtual OUString Expand() const override;
virtual SwField* Copy() const override;
@@ -619,7 +619,7 @@ public:
void SetText( const OUString& rText ) { sText = rText; }
- void ChangeExpansion( const SwFrm* pFrm, const SwTextField* pField );
+ void ChangeExpansion( const SwFrame* pFrame, const SwTextField* pField );
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich ) override;
};
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 74605baa5749..f786d84a8d83 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -141,7 +141,7 @@ typedef std::vector<SwGetINetAttr> SwGetINetAttrs;
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
-class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
+class SW_DLLPUBLIC SwEditShell : public SwCursorShell
{
static SvxSwAutoFormatFlags* s_pAutoFormatFlags;
@@ -165,7 +165,7 @@ class SW_DLLPUBLIC SwEditShell : public SwCrsrShell
public:
/// Edit (all selected ranges).
- void Insert( sal_Unicode, bool bOnlyCurrCrsr = false );
+ void Insert( sal_Unicode, bool bOnlyCurrCursor = false );
void Insert2( const OUString &, const bool bForceExpandHints = false );
void Overwrite( const OUString & );
@@ -234,7 +234,7 @@ public:
bool GetCurAttr( SfxItemSet& ,
const bool bMergeIndentValuesOfNumRule = false ) const;
void SetAttrItem( const SfxPoolItem&, SetAttrMode nFlags = SetAttrMode::DEFAULT );
- void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCrsr = nullptr );
+ void SetAttrSet( const SfxItemSet&, SetAttrMode nFlags = SetAttrMode::DEFAULT, SwPaM* pCursor = nullptr );
/** Get RES_CHRATR_* items of one type in the current selection.
* @param nWhich WhichId of the collected items.
@@ -276,7 +276,7 @@ public:
/// Query default attribute of document.
const SfxPoolItem& GetDefault( sal_uInt16 nFormatHint ) const;
- void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCrsr = nullptr );
+ void ResetAttr( const std::set<sal_uInt16> &attrs = std::set<sal_uInt16>(), SwPaM* pCursor = nullptr );
void GCAttr();
/// @return the scripttpye of the selection.
@@ -459,7 +459,7 @@ public:
bool IsProtectedOutlinePara() const;
- const SwNumRule* GetNumRuleAtCurrCrsrPos() const;
+ const SwNumRule* GetNumRuleAtCurrCursorPos() const;
/** Returns the numbering rule found at the paragraphs of the current selection,
if all paragraphs of the current selection have the same or none numbering rule applied. */
@@ -499,7 +499,7 @@ public:
void ChangeIndentOfAllListLevels( short nDiff );
// Adjust method name
void SetIndent(short nIndent, const SwPosition & rPos);
- bool IsFirstOfNumRuleAtCrsrPos() const;
+ bool IsFirstOfNumRuleAtCursorPos() const;
bool IsNoNum( bool bChkStart = true ) const;
@@ -525,7 +525,7 @@ public:
void ChgNumRuleFormats( const SwNumRule& rRule );
/// Set (and query if) a numbering with StartFlag starts at current PointPos.
- void SetNumRuleStart( bool bFlag = true, SwPaM* pCrsr = nullptr );
+ void SetNumRuleStart( bool bFlag = true, SwPaM* pCursor = nullptr );
bool IsNumRuleStart( SwPaM* pPaM = nullptr ) const;
void SetNodeNumStart( sal_uInt16 nStt, SwPaM* = nullptr );
@@ -579,7 +579,7 @@ public:
/// To enable set up of StartActions and EndActions.
virtual void CalcLayout() override;
- /// Determine form of content. Return Type at CurCrsr->SPoint.
+ /// Determine form of content. Return Type at CurrentCursor->SPoint.
sal_uInt16 GetCntType() const;
/// Are there frames, footnotes, etc.
@@ -594,7 +594,7 @@ public:
bool GetSelectedText( OUString &rBuf,
int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK );
- /** @return graphic, if CurCrsr->Point() points to a SwGrfNode
+ /** @return graphic, if CurrentCursor->Point() points to a SwGrfNode
(and mark is not set or points to the same graphic). */
const Graphic* GetGraphic( bool bWait = true ) const;
@@ -632,7 +632,7 @@ public:
Graphic GetIMapGraphic() const; ///< @return a graphic for all Flys!
const SwFlyFrameFormat* FindFlyByName( const OUString& rName, sal_uInt8 nNdTyp = 0 ) const;
- /** @return a ClientObject, if CurCrsr->Point() points to a SwOLENode
+ /** @return a ClientObject, if CurrentCursor->Point() points to a SwOLENode
(and mark is neither set not pointint to same ClientObject)
else give rap on the knuckles. */
svt::EmbeddedObjectRef& GetOLEObject() const;
@@ -960,7 +960,7 @@ public:
~SwActContext();
};
- /// Class for automated call of Start- and EndCrsrMove().
+ /// Class for automated call of Start- and EndCursorMove().
class SwMvContext {
SwEditShell & m_rShell;
public:
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 58041f3269b9..b2dbe78d15d8 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -27,7 +27,7 @@
class SfxPoolItem;
class SwTextNode;
-class SwFrm;
+class SwFrame;
struct SwPosition;
class SwTextField;
class SwDoc;
@@ -37,7 +37,7 @@ class SwEditShell;
/// Forward declaration: get "BodyTextNode" for exp.fld in Fly's headers/footers/footnotes.
const SwTextNode* GetBodyTextNode( const SwDoc& pDoc, SwPosition& rPos,
- const SwFrm& rFrm );
+ const SwFrame& rFrame );
OUString ReplacePoint(const OUString& sTmpName, bool bWithCommandType = false);
@@ -111,7 +111,7 @@ public:
/** For fields in header/footer/footnotes/flys:
Only called by formatting!! */
- void ChangeExpansion( const SwFrm&, const SwTextField& );
+ void ChangeExpansion( const SwFrame&, const SwTextField& );
virtual OUString GetFieldName() const override;
@@ -363,8 +363,8 @@ public:
SwField* GetField(size_t nId);
void GotoFieldPos(size_t nId);
- void PushCrsr();
- void PopCrsr();
+ void PushCursor();
+ void PopCursor();
/** Put all that are new into SortLst for updating. @return true if not empty.
(For Glossary: only update its input-fields).
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index da9420ff973a..f0367287daf2 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -39,13 +39,13 @@
namespace editeng { class SvxBorderLine; }
-class SwFlyFrm;
+class SwFlyFrame;
class SwTabCols;
class SvxBrushItem;
class SvxFrameDirectionItem;
class SwTableAutoFormat;
-class SwFrm;
-class SwFormatFrmSize;
+class SwFrame;
+class SwFormatFrameSize;
class SwFormatRowSplit;
class SdrObject;
class Color;
@@ -60,9 +60,9 @@ namespace svx
class ISdrObjectFilter;
}
-// return values for GetFrmType() und GetSelFrmType().
+// return values for GetFrameType() und GetSelFrameType().
//! values can be combined via logical or
-enum class FrmTypeFlags {
+enum class FrameTypeFlags {
NONE = 0,
PAGE = 1,
HEADER = 2,
@@ -82,7 +82,7 @@ enum class FrmTypeFlags {
};
namespace o3tl
{
- template<> struct typed_flags<FrmTypeFlags> : is_typed_flags<FrmTypeFlags, 0x7fff> {};
+ template<> struct typed_flags<FrameTypeFlags> : is_typed_flags<FrameTypeFlags, 0x7fff> {};
}
//! values can be combined via logical or
@@ -92,10 +92,10 @@ enum class GotoObjFlags
DrawControl = 1,
DrawSimple = 2,
DrawAny = DrawControl | DrawSimple,
- FlyFrm = 4,
+ FlyFrame = 4,
FlyGrf = 8,
FlyOLE = 16,
- FlyAny = FlyOLE | FlyGrf | FlyFrm,
+ FlyAny = FlyOLE | FlyGrf | FlyFrame,
Any = FlyAny | DrawAny,
};
namespace o3tl
@@ -141,8 +141,8 @@ enum CurRectType
RECT_PAGE_CALC, ///< ... page will be formatted if required.
RECT_PAGE_PRT, ///< Rect of current PrtArea of page.
RECT_FRM, ///< Rect of current frame.
- RECT_FLY_EMBEDDED, ///< Rect of current FlyFrm.
- RECT_FLY_PRT_EMBEDDED, ///< Rect of PrtArea of FlyFrm
+ RECT_FLY_EMBEDDED, ///< Rect of current FlyFrame.
+ RECT_FLY_PRT_EMBEDDED, ///< Rect of PrtArea of FlyFrame
RECT_SECTION, ///< Rect of current section.
RECT_OUTTABSECTION, ///< Rect of current section but outside of table.
RECT_SECTION_PRT, ///< Rect of current PrtArea of section.
@@ -156,8 +156,8 @@ enum CurRectType
struct SwGetCurColNumPara
{
const SwFrameFormat* pFrameFormat;
- const SwRect* pPrtRect, *pFrmRect;
- SwGetCurColNumPara() : pFrameFormat( nullptr ), pPrtRect( nullptr ), pFrmRect( nullptr ) {}
+ const SwRect* pPrtRect, *pFrameRect;
+ SwGetCurColNumPara() : pFrameFormat( nullptr ), pPrtRect( nullptr ), pFrameRect( nullptr ) {}
};
enum class SwPasteSdr
@@ -207,7 +207,7 @@ private:
std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom;
bool m_bCheckForOLEInCaption;
- SAL_DLLPRIVATE SwFlyFrm *FindFlyFrm( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const;
+ SAL_DLLPRIVATE SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >& ) const;
/// Terminate actions for all shells and call ChangeLink.
SAL_DLLPRIVATE void EndAllActionAndCall();
@@ -218,14 +218,14 @@ private:
/** Used for mouse operations on a table:
@return a cell frame that is 'close' to rPt. */
- SAL_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const;
+ SAL_DLLPRIVATE const SwFrame *GetBox( const Point &rPt, bool* pbRow = nullptr, bool* pbCol = nullptr ) const;
// 0 == not in any column.
- SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
+ SAL_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrame *pFrame,
SwGetCurColNumPara* pPara ) const;
- SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
- SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
+ SAL_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrame *pBox ) const;
+ SAL_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrame *pBox ) const;
SAL_DLLPRIVATE bool ImpEndCreate();
@@ -237,7 +237,7 @@ private:
bool bSelectInsert );
/// Get list of marked SdrObjects;
- /// helper method for GetSelFrmType, IsSelContainsControl.
+ /// helper method for GetSelFrameType, IsSelContainsControl.
SAL_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
SAL_DLLPRIVATE bool CheckHeadline( bool bRepeat ) const;
@@ -263,7 +263,7 @@ public:
bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
bool bIsMove = false, bool bSelectInsert = true );
- void SelectFlyFrm( SwFlyFrm& rFrm, bool bNew = false );
+ void SelectFlyFrame( SwFlyFrame& rFrame, bool bNew = false );
/// Is selected frame within another frame?
const SwFrameFormat* IsFlyInFly();
@@ -301,15 +301,15 @@ public:
sophisticated one day. */
bool IsDirectlyInSection() const;
- /** For return values see above FrmType.
+ /** For return values see above FrameType.
pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor.
Although (0,TRUE) is kind of a standard, the parameters are not defaulted here
in order to force more conscious use especially of bStopAtFly. */
- FrmTypeFlags GetFrmType( const Point *pPt, bool bStopAtFly ) const;
- FrmTypeFlags GetSelFrmType() const; //Selektion (Drawing)
+ FrameTypeFlags GetFrameType( const Point *pPt, bool bStopAtFly ) const;
+ FrameTypeFlags GetSelFrameType() const; //Selektion (Drawing)
/** check whether selected frame contains a control;
- * companion method to GetSelFrmType, used for preventing
+ * companion method to GetSelFrameType, used for preventing
* drag&drop of controls into header */
bool IsSelContainsControl() const;
@@ -334,7 +334,7 @@ public:
bool _bMirror = false,
Point* _opRef = nullptr,
Size* _opPercent = nullptr,
- const SwFormatFrmSize* pFormatFrmSize = nullptr ) const;
+ const SwFormatFrameSize* pFormatFrameSize = nullptr ) const;
/// Set size of draw objects.
void SetObjRect( const SwRect& rRect );
@@ -376,12 +376,12 @@ public:
OUString GetObjDescription() const;
void SetObjDescription( const OUString& rDescription );
- bool IsFrmSelected() const;
- bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
- bool SetFlyFrmAttr( SfxItemSet &rSet );
+ bool IsFrameSelected() const;
+ bool GetFlyFrameAttr( SfxItemSet &rSet ) const;
+ bool SetFlyFrameAttr( SfxItemSet &rSet );
static SfxItemSet makeItemSetFromFormatAnchor(SfxItemPool& rPool, const SwFormatAnchor &rAnchor);
- bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = nullptr );
- const SwFrameFormat *NewFlyFrm( const SfxItemSet &rSet, bool bAnchValid = false,
+ bool ResetFlyFrameAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = nullptr );
+ const SwFrameFormat *NewFlyFrame( const SfxItemSet &rSet, bool bAnchValid = false,
SwFrameFormat *pParent = nullptr );
void SetFlyPos( const Point &rAbsPos);
Point FindAnchorPos( const Point &rAbsPos, bool bMoveIt = false );
@@ -389,19 +389,19 @@ public:
/** Determines whether a frame or its environment is vertically formatted and right-to-left.
also determines, if frame or its environmane is in mongolianlayout (vertical left-to-right)
- add output parameter <bVertL2R> */
- bool IsFrmVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
+ bool IsFrameVertical(const bool bEnvironment, bool& bRightToLeft, bool& bVertL2R) const;
SwFrameFormat* GetSelectedFrameFormat() const; ///< If frame then frame style, else 0.
void SetFrameFormat( SwFrameFormat *pFormat, bool bKeepOrient = false, Point* pDocPos = nullptr ); ///< If frame then set frame style.
// Get selected fly
- SwFlyFrm* GetSelectedFlyFrm() const;
+ SwFlyFrame* GetSelectedFlyFrame() const;
// Get current fly in which the cursor is positioned
- SwFlyFrm* GetCurrFlyFrm(const bool bCalcFrm = true) const;
+ SwFlyFrame* GetCurrFlyFrame(const bool bCalcFrame = true) const;
// Get selected fly, but if none Get current fly in which the cursor is positioned
- SwFlyFrm* GetSelectedOrCurrFlyFrm(const bool bCalcFrm = true) const;
+ SwFlyFrame* GetSelectedOrCurrFlyFrame(const bool bCalcFrame = true) const;
/// Find/delete fly containing the cursor.
SwFrameFormat* WizardGetFly();
@@ -416,8 +416,8 @@ public:
size_t GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false ) const;
const SwFrameFormat* GetFlyNum(size_t nIdx, FlyCntType eType = FLYCNTTYPE_ALL, bool bIgnoreTextBoxes = false) const;
- /// If a fly is selected, it draws cursor into the first ContentFrm.
- const SwFrameFormat* SelFlyGrabCrsr();
+ /// If a fly is selected, it draws cursor into the first ContentFrame.
+ const SwFrameFormat* SelFlyGrabCursor();
/// Get FlyFrameFormat; fuer UI Macro Anbindung an Flys
const SwFrameFormat* GetFlyFrameFormat() const;
@@ -438,14 +438,14 @@ public:
Else the size is provided via GetCurFlyRect(). */
virtual void CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
const SwRect *pFlyPrtRect = nullptr,
- const SwRect *pFlyFrmRect = nullptr,
- const bool bNoTextFrmPrtAreaChanged = false ) = 0;
+ const SwRect *pFlyFrameRect = nullptr,
+ const bool bNoTextFramePrtAreaChanged = false ) = 0;
/** Connect objects with ActivateWhenVisible at Paint.
Called by notxtfrm::Paint, implemented in wrtsh. */
virtual void ConnectObj( svt::EmbeddedObjectRef&,
const SwRect &rPrt,
- const SwRect &rFrm ) = 0;
+ const SwRect &rFrame ) = 0;
/// Check resize of OLE-Object.
bool IsCheckForOLEInCaption() const { return m_bCheckForOLEInCaption; }
@@ -579,7 +579,7 @@ public:
// --> #i972#
/** for starmath formulas anchored 'as char' it aligns it baseline to baseline
changing the previous vertical orientation */
- void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = nullptr );
+ void AlignFormulaToBaseline( const css::uno::Reference < css::embed::XEmbeddedObject >& xObj, SwFlyFrame * pFly = nullptr );
/// aligns all formulas with anchor 'as char' to baseline
void AlignAllFormulasToBaseline();
@@ -590,13 +590,13 @@ public:
/// Convert document position into position relative to the current page.
Point GetRelativePagePosition(const Point& rDocPos);
- /// Hide or show layout-selection and pass call to CrsrSh.
+ /// Hide or show layout-selection and pass call to CursorSh.
void ShLooseFcs();
void ShGetFcs( bool bUpdate = true );
/// PageDescriptor-interface
void ChgCurPageDesc( const SwPageDesc& );
- size_t GetCurPageDesc( const bool bCalcFrm = true ) const;
+ size_t GetCurPageDesc( const bool bCalcFrame = true ) const;
size_t GetMousePageDesc( const Point &rPt ) const;
size_t GetPageDescCnt() const;
SwPageDesc* FindPageDescByName( const OUString& rName,
@@ -616,7 +616,7 @@ public:
/// Page number of the page containing Point, O if no page.
sal_uInt16 GetPageNumber( const Point &rPoint ) const;
- bool GetPageNumber( long nYPos, bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
+ bool GetPageNumber( long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
const SfxItemSet* pFlyAttrSet = nullptr,
@@ -647,10 +647,10 @@ public:
bool SplitTab( bool bVert = true, sal_uInt16 nCnt = 1, bool bSameHeight = false );
bool Sort(const SwSortOptions&); //Sortieren.
- void SetRowHeight( const SwFormatFrmSize &rSz );
+ void SetRowHeight( const SwFormatFrameSize &rSz );
/// Pointer must be destroyed by caller != 0.
- void GetRowHeight( SwFormatFrmSize *&rpSz ) const;
+ void GetRowHeight( SwFormatFrameSize *&rpSz ) const;
void SetRowSplit( const SwFormatRowSplit &rSz );
void GetRowSplit( SwFormatRowSplit *&rpSz ) const;
@@ -702,7 +702,7 @@ public:
sal_uInt16 GetRowsToRepeat() const;
void SetRowsToRepeat( sal_uInt16 nNumOfRows );
- sal_uInt16 GetVirtPageNum( const bool bCalcFrm = true );
+ sal_uInt16 GetVirtPageNum( const bool bCalcFrame = true );
/** @return the number of table rows currently selected
if the selection start at the top of the table. */
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index f4d1a97b1d3f..f4bcdfb58ad3 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -27,28 +27,28 @@ class SwFrameFormat;
class SwNodeIndex;
/// For querying current flys in document.
-class SW_DLLPUBLIC SwPosFlyFrm
+class SW_DLLPUBLIC SwPosFlyFrame
{
const SwFrameFormat* m_pFrameFormat; ///< FlyFrameFormat
SwNodeIndex* m_pNodeIndex; ///< Index for node is sufficient.
sal_uInt32 m_nOrdNum;
public:
- SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
- virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
+ SwPosFlyFrame( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
+ virtual ~SwPosFlyFrame(); ///< Virtual for Writer (DLL !!)
const SwFrameFormat& GetFormat() const { return *m_pFrameFormat; }
const SwNodeIndex& GetNdIndex() const { return *m_pNodeIndex; }
sal_uInt32 GetOrdNum() const { return m_nOrdNum; }
};
-// define needed classes to safely handle an array of allocated SwPosFlyFrm(s).
-// SwPosFlyFrms can be handled by value (as return value), only refcounts to
-// contained SwPosFlyFrm* will be copied. When releasing the last SwPosFlyFrmPtr
+// define needed classes to safely handle an array of allocated SwPosFlyFrame(s).
+// SwPosFlyFrames can be handled by value (as return value), only refcounts to
+// contained SwPosFlyFrame* will be copied. When releasing the last SwPosFlyFramePtr
// instance the allocated instance will be freed. The array is sorted by
// GetNdIndex by using a std::set container.
-typedef std::shared_ptr< SwPosFlyFrm > SwPosFlyFrmPtr;
-struct SwPosFlyFrmCmp { bool operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr& rB) const; };
-typedef std::set< SwPosFlyFrmPtr, SwPosFlyFrmCmp > SwPosFlyFrms;
+typedef std::shared_ptr< SwPosFlyFrame > SwPosFlyFramePtr;
+struct SwPosFlyFrameCmp { bool operator()(const SwPosFlyFramePtr& rA, const SwPosFlyFramePtr& rB) const; };
+typedef std::set< SwPosFlyFramePtr, SwPosFlyFrameCmp > SwPosFlyFrames;
#endif // INCLUDED_SW_INC_FLYPOS_HXX
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 2fb7ee23177b..18b02ce24081 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -27,7 +27,7 @@
class IntlWrapper;
-/// Connection (text flow) between two FlyFrms.
+/// Connection (text flow) between two FlyFrames.
class SW_DLLPUBLIC SwFormatChain: public SfxPoolItem
{
SwClient aPrev, ///< Previous SwFlyFrameFormat (if existent).
diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 06ad1f32f2ae..64480288334c 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -43,7 +43,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = nullptr ) const override;
inline SwFrameFormat *GetFrameFormat() const { return pFormat; }
- /// For Undo: delete the FlyFrmFormat "logically"; it is kept in Undo-object.
+ /// For Undo: delete the FlyFrameFormat "logically"; it is kept in Undo-object.
inline void SetFlyFormat( SwFrameFormat* pNew = nullptr ) { pFormat = pNew; }
const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 4f77040ed410..e58cdda00d68 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -30,7 +30,7 @@ class IntlWrapper;
//Frame size.
-enum SwFrmSize
+enum SwFrameSize
{
ATT_VAR_SIZE, ///< Frame is variable in Var-direction.
ATT_FIX_SIZE, ///< Frame cannot be moved in Var-direction.
@@ -38,11 +38,11 @@ enum SwFrmSize
(can be exceeded but not be less). */
};
-class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem
+class SW_DLLPUBLIC SwFormatFrameSize: public SfxPoolItem
{
Size m_aSize;
- SwFrmSize m_eFrmHeightType;
- SwFrmSize m_eFrmWidthType;
+ SwFrameSize m_eFrameHeightType;
+ SwFrameSize m_eFrameWidthType;
sal_uInt8 m_nWidthPercent;
sal_Int16 m_eWidthPercentRelation;
sal_uInt8 m_nHeightPercent;
@@ -60,9 +60,9 @@ class SW_DLLPUBLIC SwFormatFrmSize: public SfxPoolItem
// minus borders in BrowseView if the environment is the page.
public:
- SwFormatFrmSize( SwFrmSize eSize = ATT_VAR_SIZE,
+ SwFormatFrameSize( SwFrameSize eSize = ATT_VAR_SIZE,
SwTwips nWidth = 0, SwTwips nHeight = 0 );
- SwFormatFrmSize& operator=( const SwFormatFrmSize& rCpy );
+ SwFormatFrameSize& operator=( const SwFormatFrameSize& rCpy );
/// "Pure virtual methods" of SfxPoolItem.
virtual bool operator==( const SfxPoolItem& ) const override;
@@ -75,11 +75,11 @@ public:
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override;
- SwFrmSize GetHeightSizeType() const { return m_eFrmHeightType; }
- void SetHeightSizeType( SwFrmSize eSize ) { m_eFrmHeightType = eSize; }
+ SwFrameSize GetHeightSizeType() const { return m_eFrameHeightType; }
+ void SetHeightSizeType( SwFrameSize eSize ) { m_eFrameHeightType = eSize; }
- SwFrmSize GetWidthSizeType() const { return m_eFrmWidthType; }
- void SetWidthSizeType( SwFrmSize eSize ) { m_eFrmWidthType = eSize; }
+ SwFrameSize GetWidthSizeType() const { return m_eFrameWidthType; }
+ void SetWidthSizeType( SwFrameSize eSize ) { m_eFrameWidthType = eSize; }
const Size& GetSize() const { return m_aSize; }
void SetSize( const Size &rNew ) { m_aSize = rNew; }
@@ -104,11 +104,11 @@ public:
void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
};
-inline const SwFormatFrmSize &SwAttrSet::GetFrmSize(bool bInP) const
- { return static_cast<const SwFormatFrmSize&>(Get( RES_FRM_SIZE,bInP)); }
+inline const SwFormatFrameSize &SwAttrSet::GetFrameSize(bool bInP) const
+ { return static_cast<const SwFormatFrameSize&>(Get( RES_FRM_SIZE,bInP)); }
-inline const SwFormatFrmSize &SwFormat::GetFrmSize(bool bInP) const
- { return m_aSet.GetFrmSize(bInP); }
+inline const SwFormatFrameSize &SwFormat::GetFrameSize(bool bInP) const
+ { return m_aSet.GetFrameSize(bInP); }
#endif
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 63d41185a8cf..d3350d9b6422 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -63,9 +63,9 @@ class SW_DLLPUBLIC SwFormat : public SwModify
protected:
SwFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+ const sal_uInt16* pWhichRanges, SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich );
SwFormat( SwAttrPool& rPool, const OUString &rFormatNm, const sal_uInt16* pWhichRanges,
- SwFormat *pDrvdFrm, sal_uInt16 nFormatWhich );
+ SwFormat *pDrvdFrame, sal_uInt16 nFormatWhich );
SwFormat( const SwFormat& rFormat );
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNewValue ) override;
@@ -190,7 +190,7 @@ public:
/// Frame-attributes - implemented in frmatr.hxx.
inline const SwFormatFillOrder &GetFillOrder( bool = true ) const;
- inline const SwFormatFrmSize &GetFrmSize( bool = true ) const;
+ inline const SwFormatFrameSize &GetFrameSize( bool = true ) const;
inline const SwFormatHeader &GetHeader( bool = true ) const;
inline const SwFormatFooter &GetFooter( bool = true ) const;
inline const SwFormatSurround &GetSurround( bool = true ) const;
@@ -223,7 +223,7 @@ public:
inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const;
inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const;
inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
- inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const;
+ inline const SvxFrameDirectionItem &GetFrameDir( bool = true ) const;
inline const SwTextGridItem &GetTextGrid( bool = true ) const;
inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
// #i18732#
diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx
index 4685e24ddbd1..d24eb57b8927 100644
--- a/sw/inc/frmatr.hxx
+++ b/sw/inc/frmatr.hxx
@@ -63,7 +63,7 @@ inline const SvxFormatBreakItem &SwAttrSet::GetBreak(bool bInP) const
{ return static_cast<const SvxFormatBreakItem&>(Get( RES_BREAK,bInP)); }
inline const SvxMacroItem &SwAttrSet::GetMacro(bool bInP) const
{ return static_cast<const SvxMacroItem&>(Get( RES_FRMMACRO,bInP)); }
-inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(bool bInP) const
+inline const SvxFrameDirectionItem &SwAttrSet::GetFrameDir(bool bInP) const
{ return static_cast<const SvxFrameDirectionItem&>(Get( RES_FRAMEDIR,bInP)); }
inline const SdrTextVertAdjustItem &SwAttrSet::GetTextVertAdjust(bool bInP) const
{ return static_cast<const SdrTextVertAdjustItem&>(Get( RES_TEXT_VERT_ADJUST,bInP)); }
@@ -91,8 +91,8 @@ inline const SvxFormatBreakItem &SwFormat::GetBreak(bool bInP) const
{ return m_aSet.GetBreak(bInP); }
inline const SvxMacroItem &SwFormat::GetMacro(bool bInP) const
{ return m_aSet.GetMacro(bInP); }
-inline const SvxFrameDirectionItem &SwFormat::GetFrmDir(bool bInP) const
- { return m_aSet.GetFrmDir(bInP); }
+inline const SvxFrameDirectionItem &SwFormat::GetFrameDir(bool bInP) const
+ { return m_aSet.GetFrameDir(bInP); }
inline const SdrTextVertAdjustItem &SwFormat::GetTextVertAdjust(bool bInP) const
{ return m_aSet.GetTextVertAdjust(bInP); }
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index 717f3702995a..52b0b1324850 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -25,7 +25,7 @@
#include <format.hxx>
#include "swdllapi.h"
-class SwFlyFrm;
+class SwFlyFrame;
class SwAnchoredObject;
class Graphic;
class ImageMap;
@@ -51,14 +51,14 @@ protected:
SwFrameFormat(
SwAttrPool& rPool,
const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm,
+ SwFrameFormat *pDrvdFrame,
sal_uInt16 nFormatWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = nullptr);
SwFrameFormat(
SwAttrPool& rPool,
const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm,
+ SwFrameFormat *pDrvdFrame,
sal_uInt16 nFormatWhich = RES_FRMFMT,
const sal_uInt16* pWhichRange = nullptr);
@@ -67,11 +67,11 @@ protected:
public:
virtual ~SwFrameFormat();
- /// Destroys all Frms in aDepend (Frms are identified via dynamic_cast).
- virtual void DelFrms();
+ /// Destroys all Frames in aDepend (Frames are identified via dynamic_cast).
+ virtual void DelFrames();
/// Creates the views.
- virtual void MakeFrms();
+ virtual void MakeFrames();
virtual Graphic MakeGraphic( ImageMap* pMap = nullptr );
@@ -80,14 +80,14 @@ public:
rPoint - test on DocPosition.
pFly - optional FlyFrame, in case it is already known. */
IMapObject* GetIMapObject( const Point& rPoint,
- const SwFlyFrm *pFly = nullptr ) const;
+ const SwFlyFrame *pFly = nullptr ) const;
/** @return the real size of the frame - or an empty rectangle
if no layout exists.
If pPoint is given, look for the frame closest to it. */
SwRect FindLayoutRect( const bool bPrtArea = false,
const Point* pPoint = nullptr,
- const bool bCalcFrm = false ) const;
+ const bool bCalcFrame = false ) const;
/** Searches SdrObject. SdrObjUserCall is client of the format.
The UserCall knows its SdrObject. */
@@ -97,7 +97,7 @@ public:
/** @return the SdrObject, that is connected to the ContactObject.
Only DrawFrameFormats are connected to the "real SdrObject". FlyFrameFormats
- are connected to a Master and all FlyFrms has the "real SdrObject".
+ are connected to a Master and all FlyFrames has the "real SdrObject".
"Real SdrObject" has position and a Z-order. */
SdrObject *FindSdrObject();
const SdrObject *FindSdrObject() const
@@ -152,32 +152,32 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat
it stores the previous position of Prt rectangle from RequestObjectResize
so it can be used to move frames of non-resizable objects to align them correctly
when they get borders (this is done in SwWrtShell::CalcAndGetScale) */
- Point m_aLastFlyFrmPrtRectPos;
+ Point m_aLastFlyFramePrtRectPos;
SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete;
SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete;
protected:
SwFlyFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FLYFRMFMT )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FLYFRMFMT )
{}
SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FLYFRMFMT )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FLYFRMFMT )
{}
public:
virtual ~SwFlyFrameFormat();
/// Creates the views.
- virtual void MakeFrms() override;
+ virtual void MakeFrames() override;
- SwFlyFrm* GetFrm( const Point* pDocPos = nullptr,
- const bool bCalcFrm = false ) const;
+ SwFlyFrame* GetFrame( const Point* pDocPos = nullptr,
+ const bool bCalcFrame = false ) const;
SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = nullptr,
- const bool bCalcFrm = false ) const;
+ const bool bCalcFrame = false ) const;
virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override;
@@ -214,8 +214,8 @@ public:
*/
bool IsBackgroundBrushInherited() const;
- const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; }
- void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; }
+ const Point & GetLastFlyFramePrtRectPos() const { return m_aLastFlyFramePrtRectPos; }
+ void SetLastFlyFramePrtRectPos( const Point &rPoint ) { m_aLastFlyFramePrtRectPos = rPoint; }
DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrameFormat)
};
@@ -240,8 +240,8 @@ class SW_DLLPUBLIC SwDrawFrameFormat: public SwFrameFormat
protected:
SwDrawFrameFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_DRAWFRMFMT ),
m_pSdrObjectCached(nullptr),
meLayoutDir( SwFrameFormat::HORI_L2R ),
@@ -252,8 +252,8 @@ protected:
{}
SwDrawFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_DRAWFRMFMT ),
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_DRAWFRMFMT ),
m_pSdrObjectCached(nullptr),
meLayoutDir( SwFrameFormat::HORI_L2R ),
@@ -267,11 +267,11 @@ public:
/** DrawObjects are removed from the arrays at the layout.
The DrawObjects are marked as deleted. */
- virtual void DelFrms() override;
+ virtual void DelFrames() override;
/** Register DrawObjects in the arrays at layout.
Reset delete marks. */
- virtual void MakeFrms() override;
+ virtual void MakeFrames() override;
virtual Graphic MakeGraphic( ImageMap* pMap = nullptr ) override;
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 587cc747f139..e7ab19790e23 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -66,7 +66,7 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion
void ChangeText( const OUString &rNewText,
const OUString& rOrigText,
const css::uno::Sequence< sal_Int32 > *pOffsets,
- SwPaM *pCrsr );
+ SwPaM *pCursor );
void ChangeText_impl( const OUString &rNewText, bool bKeepAttributes );
inline bool IsDrawObj() { return m_bIsDrawObj; }
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 751dd5daae53..f5da6ee6c5c5 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -29,8 +29,8 @@ class SwTable;
class SwNode;
class SwNodes;
class SwContentNode;
-class SwPageFrm;
-class SwFrm;
+class SwPageFrame;
+class SwFrame;
class SwTextNode;
class SwHistory;
@@ -225,19 +225,19 @@ public:
class SwVirtPageNumInfo: public SwMsgPoolItem
{
- const SwPageFrm *m_pPage;
- const SwPageFrm *m_pOrigPage;
- const SwFrm *m_pFrm;
+ const SwPageFrame *m_pPage;
+ const SwPageFrame *m_pOrigPage;
+ const SwFrame *m_pFrame;
/** Multiple attributes can be attached to a single paragraph / table
The frame, in the end, has to decide which attribute takes effect and which physical page it involves */
public:
- SwVirtPageNumInfo( const SwPageFrm *pPg );
+ SwVirtPageNumInfo( const SwPageFrame *pPg );
- const SwPageFrm *GetPage() { return m_pPage; }
- const SwPageFrm *GetOrigPage() { return m_pOrigPage;}
- const SwFrm *GetFrm() { return m_pFrm; }
- void SetInfo( const SwPageFrm *pPg,
- const SwFrm *pF ) { m_pFrm = pF, m_pPage = pPg; }
+ const SwPageFrame *GetPage() { return m_pPage; }
+ const SwPageFrame *GetOrigPage() { return m_pOrigPage;}
+ const SwFrame *GetFrame() { return m_pFrame; }
+ void SetInfo( const SwPageFrame *pPg,
+ const SwFrame *pF ) { m_pFrame = pF, m_pPage = pPg; }
};
class SwFindNearestNode : public SwMsgPoolItem
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 2f6e98e42d79..5711d332ba96 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -327,7 +327,7 @@ public:
static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc );
/// Calculates available width by table-frame.
- sal_uInt16 GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const;
+ sal_uInt16 GetBrowseWidthByTabFrame( const SwTabFrame& rTabFrame ) const;
/** Calculates available width by the table-frame or
static GetBrowseWidth if no layout exists. */
diff --git a/sw/inc/init.hxx b/sw/inc/init.hxx
index 78932dcb5130..96fb0c15fc07 100644
--- a/sw/inc/init.hxx
+++ b/sw/inc/init.hxx
@@ -49,8 +49,8 @@ private:
}
// layout/newfrm.cxx
-void _FrmInit();
-void _FrmFinit();
+void _FrameInit();
+void _FrameFinit();
void SetShell( SwViewShell *pSh );
// text/txtfrm.cxx
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 8850d62d1c3a..3b55ec5974f5 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -121,12 +121,12 @@ class SW_DLLPUBLIC SwNodes
void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 );
void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize,
- SwNodeIndex& rInsPos, bool bNewFrms );
+ SwNodeIndex& rInsPos, bool bNewFrames );
void UpdateOutlineIdx( const SwNode& ); ///< Update all OutlineNodes starting from Node.
void _CopyNodes( const SwNodeRange&, const SwNodeIndex&,
- bool bNewFrms = true, bool bTableInsDummyNode = false ) const;
+ bool bNewFrames = true, bool bTableInsDummyNode = false ) const;
void _DelDummyNodes( const SwNodeRange& rRg );
protected:
@@ -171,12 +171,12 @@ public:
void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1);
bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&,
- bool bNewFrms = true );
+ bool bNewFrames = true );
void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes );
void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos,
- bool bNewFrms = true ) const
- { _CopyNodes( rRg, rInsPos, bNewFrms ); }
+ bool bNewFrames = true ) const
+ { _CopyNodes( rRg, rInsPos, bNewFrames ); }
void SectionUp( SwNodeRange *);
void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode );
@@ -305,7 +305,7 @@ public:
SwTOXBase const*const pTOXBase,
SwNodeIndex const*const pEnde,
bool const bInsAtStart = true,
- bool const bCreateFrms = true);
+ bool const bCreateFrames = true);
/// Which Doc contains the nodes-array?
SwDoc* GetDoc() { return m_pMyDoc; }
@@ -313,9 +313,9 @@ public:
/** Search previous / next content node or table node with frames.
If no end is given begin with the FrameIndex, else start search
- with that before rFrmIdx and pEnd at the back.
- If no valid node is found, return 0. rFrmIdx points to the node with frames. **/
- SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
+ with that before rFrameIdx and pEnd at the back.
+ If no valid node is found, return 0. rFrameIdx points to the node with frames. **/
+ SwNode* FindPrvNxtFrameNode( SwNodeIndex& rFrameIdx,
const SwNode* pEnd = nullptr ) const;
SwNode * DocumentSectionStartNode(SwNode * pNode) const;
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index 885311d9f6d1..7b960c9c8a32 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -189,7 +189,7 @@ public:
void ScaleImageMap();
/// Returns the with our graphic attributes filled Graphic-Attr-Structure.
- GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrm* pFrm ) const;
+ GraphicAttr& GetGraphicAttr( GraphicAttr&, const SwFrame* pFrame ) const;
std::weak_ptr< SwAsyncRetrieveInputStreamThreadConsumer > GetThreadConsumer() { return mpThreadConsumer;}
bool IsLinkedInputStreamReady() const { return mbLinkedInputStreamReady;}
diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx
index 3c6b23439704..4a4e3c492672 100644
--- a/sw/inc/ndnotxt.hxx
+++ b/sw/inc/ndnotxt.hxx
@@ -28,7 +28,7 @@ namespace tools { class PolyPolygon; }
class SW_DLLPUBLIC SwNoTextNode : public SwContentNode
{
friend class SwNodes;
- friend class SwNoTextFrm;
+ friend class SwNoTextFrame;
tools::PolyPolygon *pContour;
bool bAutomaticContour : 1; // automatic contour polygon, not manipulated
@@ -51,7 +51,7 @@ protected:
public:
virtual ~SwNoTextNode();
- virtual SwContentFrm *MakeFrm( SwFrm* ) override;
+ virtual SwContentFrame *MakeFrame( SwFrame* ) override;
inline SwGrfFormatColl *GetGrfColl() const { return const_cast<SwGrfFormatColl*>(static_cast<const SwGrfFormatColl*>(GetRegisteredIn())); }
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index bf0a17494684..4a58a1e3560e 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -45,7 +45,7 @@ namespace utl {
}
class SwTextFormatColl;
-class SwContentFrm;
+class SwContentFrame;
class SwTextField;
class SwTextInputField;
class SfxItemSet;
@@ -76,7 +76,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
/// For creating the first TextNode.
friend class SwDoc; ///< CTOR and AppendTextNode()
friend class SwNodes;
- friend class SwTextFrm;
+ friend class SwTextFrame;
friend class SwScriptInfo;
/** May be 0. It is only then not 0 if it contains hard attributes.
@@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable
const SwTextInputField* GetOverlappingInputField( const SwTextAttr& rTextAttr ) const;
- void DelFrms_TextNodePart();
+ void DelFrames_TextNodePart();
public:
enum class WrongState { TODO, PENDING, DONE };
@@ -352,7 +352,7 @@ public:
const css::uno::Sequence<sal_Int32>& rOffsets );
/// Virtual methods from ContentNode.
- virtual SwContentFrm *MakeFrm( SwFrm* ) override;
+ virtual SwContentFrame *MakeFrame( SwFrame* ) override;
virtual SwContentNode *SplitContentNode( const SwPosition & ) override;
virtual SwContentNode *JoinNext() override;
virtual SwContentNode *JoinPrev() override;
@@ -674,7 +674,7 @@ public:
bool IsSymbol( const sal_Int32 nBegin ) const; // In itratr.cxx.
virtual SwContentNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const override;
- /// Interactive hyphenation: we find TextFrm and call its CalcHyph.
+ /// Interactive hyphenation: we find TextFrame and call its CalcHyph.
bool Hyphenate( SwInterHyphInfo &rHyphInf );
void DelSoftHyph( const sal_Int32 nStart, const sal_Int32 nEnd );
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index bcadbfee7408..d1ef7366d0f4 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -32,11 +32,11 @@
#include <memory>
#include <vector>
-class SwContentFrm;
+class SwContentFrame;
class SwContentNode;
class SwDoc;
class SwEndNode;
-class SwFrm;
+class SwFrame;
class SwFrameFormat;
class SwGrfNode;
class SwNoTextNode;
@@ -48,8 +48,8 @@ class SwSectionFormat;
class SwTOXBase;
class SwSectionNode;
class SwStartNode;
-class SwTabFrm;
-class SwRootFrm;
+class SwTabFrame;
+class SwRootFrame;
class SwTable;
class SwTableNode;
class SwTableBox;
@@ -380,9 +380,9 @@ protected:
public:
- /** MakeFrm will be called for a certain layout
- pSib is another SwFrm of the same layout (e.g. the SwRootFrm itself, a sibling, the parent) */
- virtual SwContentFrm *MakeFrm( SwFrm* pSib ) = 0;
+ /** MakeFrame will be called for a certain layout
+ pSib is another SwFrame of the same layout (e.g. the SwRootFrame itself, a sibling, the parent) */
+ virtual SwContentFrame *MakeFrame( SwFrame* pSib ) = 0;
virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0;
@@ -399,30 +399,30 @@ public:
bool GoNext(SwIndex *, sal_uInt16 nMode ) const;
bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const;
- /// Replacement for good old GetFrm(..):
- SwContentFrm *getLayoutFrm( const SwRootFrm*,
+ /// Replacement for good old GetFrame(..):
+ SwContentFrame *getLayoutFrame( const SwRootFrame*,
const Point* pDocPos = nullptr,
const SwPosition *pPos = nullptr,
- const bool bCalcFrm = true ) const;
+ const bool bCalcFrame = true ) const;
/** @return the real size of the frame or an empty rectangle if
no layout exists. Needed for export filters. */
SwRect FindLayoutRect( const bool bPrtArea = false,
const Point* pPoint = nullptr,
- const bool bCalcFrm = false ) const;
- SwRect FindPageFrmRect( const bool bPrtArea = false,
+ const bool bCalcFrame = false ) const;
+ SwRect FindPageFrameRect( const bool bPrtArea = false,
const Point* pPoint = nullptr,
- const bool bCalcFrm = false ) const;
+ const bool bCalcFrame = false ) const;
/** Method creates all views of document for given node. The content
frames that are created are put in the respective layout. */
- void MakeFrms( SwContentNode& rNode );
+ void MakeFrames( SwContentNode& rNode );
/** Method deletes all views of document for the node. The content-
frames are removed from the respective layout.
Add an input param to identify if acc table should be disposed
*/
- void DelFrms( bool bIsAccTableDispose = true );
+ void DelFrames( bool bIsAccTableDispose = true );
/** @return count of elements of node content. Default is 1.
There are differences between text node and formula node. */
@@ -502,18 +502,18 @@ public:
const SwTable& GetTable() const { return *m_pTable; }
SwTable& GetTable() { return *m_pTable; }
- SwTabFrm *MakeFrm( SwFrm* );
+ SwTabFrame *MakeFrame( SwFrame* );
- /// Creates the frms for the table node (i.e. the TabFrms).
- void MakeFrms( SwNodeIndex* pIdxBehind );
+ /// Creates the frms for the table node (i.e. the TabFrames).
+ void MakeFrames( SwNodeIndex* pIdxBehind );
/** Method deletes all views of document for the node.
The content frames are removed from the respective layout. */
- void DelFrms();
+ void DelFrames();
/** Method creates all views of the document for the previous node.
The content frames that are created are put into the respective layout. */
- void MakeFrms( const SwNodeIndex & rIdx );
+ void MakeFrames( const SwNodeIndex & rIdx );
SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
void SetNewTable( SwTable* , bool bNewFrames=true );
@@ -547,21 +547,21 @@ public:
const SwSection& GetSection() const { return *m_pSection; }
SwSection& GetSection() { return *m_pSection; }
- SwFrm *MakeFrm( SwFrm* );
+ SwFrame *MakeFrame( SwFrame* );
- /** Creates the frms for the SectionNode (i.e. the SectionFrms).
+ /** Creates the frms for the SectionNode (i.e. the SectionFrames).
On default the frames are created until the end of the range.
- When another NodeIndex pEnd is passed a MakeFrms is called up to it.
+ When another NodeIndex pEnd is passed a MakeFrames is called up to it.
Used by TableToText. */
- void MakeFrms( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = nullptr );
+ void MakeFrames( SwNodeIndex* pIdxBehind, SwNodeIndex* pEnd = nullptr );
/** Method deletes all views of document for the node. The
content frames are removed from the respective layout. */
- void DelFrms();
+ void DelFrames();
/** Method creates all views of document for the previous node.
The content frames created are put into the respective layout. */
- void MakeFrms( const SwNodeIndex & rIdx );
+ void MakeFrames( const SwNodeIndex & rIdx );
SwSectionNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 258f63464b81..db943eb00686 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -106,7 +106,7 @@ public:
* Access to complete m_eUse including the information on header and footer
* via ReadUseOn(), WriteUseOn() (for Filter and CopyCTor)!
*
- * The Frmformats for header/footer are adjusted by the UI according to
+ * The Frameformats for header/footer are adjusted by the UI according to
* the attributes for header and footer at master (height, margin, back-
* ground ...)
* Header/footer for left hand pages are copied or mirrored (Chg at
diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx
index c18a43738509..7c440bede8cc 100644
--- a/sw/inc/pagepreviewlayout.hxx
+++ b/sw/inc/pagepreviewlayout.hxx
@@ -30,8 +30,8 @@
#include <swtypes.hxx>
class SwViewShell;
-class SwRootFrm;
-class SwPageFrm;
+class SwRootFrame;
+class SwPageFrame;
class Fraction;
struct PreviewPage;
@@ -51,7 +51,7 @@ private:
/// view shell the print preview is generated for.
SwViewShell& mrParentViewShell;
/// top layout frame of the layout for accessing the pages
- const SwRootFrm& mrLayoutRootFrm;
+ const SwRootFrame& mrLayoutRootFrame;
/** boolean indicating, if the layout information (number of columns and rows)
are valid. */
@@ -183,7 +183,7 @@ private:
@return boolean, indicating, if calculation was successful.
*/
- bool _CalcPreviewDataForPage( const SwPageFrm& _rPage,
+ bool _CalcPreviewDataForPage( const SwPageFrame& _rPage,
const Point& _rPreviewOffset,
PreviewPage* _opPreviewPage );
@@ -230,13 +230,13 @@ public:
(2) Change of the zoom at the view options.
(3) Preparations for paint of the page preview.
- @param _rLayoutRootFrm
+ @param _rLayoutRootFrame
input parameter - constant reference to the root frame of the layout.
- Reference will be hold as member <mrLayoutRootFrm> in order to get
+ Reference will be hold as member <mrLayoutRootFrame> in order to get
access to the page frames.
*/
SwPagePreviewLayout( SwViewShell& _rParentViewShell,
- const SwRootFrm& _rLayoutRootFrm );
+ const SwRootFrame& _rLayoutRootFrame );
/** destructor of <SwPagePreviewLayout>
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 554e5ebc6a43..373429b4782b 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -28,7 +28,7 @@
class SfxBroadcaster;
class SwTextField;
-class SwRootFrm;
+class SwRootFrame;
class SwPostItMgr;
class SwEditWin;
namespace sw { namespace sidebarwindows {
@@ -41,7 +41,7 @@ typedef sal_Int64 SwPostItBits;
struct SwLayoutInfo
{
- const SwFrm* mpAnchorFrm;
+ const SwFrame* mpAnchorFrame;
SwRect mPosition;
// optional start of the annotation
@@ -57,7 +57,7 @@ struct SwLayoutInfo
sal_uInt16 mRedlineAuthor;
SwLayoutInfo()
- : mpAnchorFrm(nullptr)
+ : mpAnchorFrame(nullptr)
, mPosition()
, mnStartNodeIdx( 0 )
, mnStartContent( -1 )
@@ -81,9 +81,9 @@ namespace SwPostItHelper
const SwPosition& rAnchorPos,
const SwPosition* pAnnotationStartPos = nullptr );
- long getLayoutHeight( const SwRootFrm* pRoot );
- void setSidebarChanged( SwRootFrm* pRoot, bool bBrowseMode );
- unsigned long getPageInfo( SwRect& rPageFrm, const SwRootFrm* , const Point& );
+ long getLayoutHeight( const SwRootFrame* pRoot );
+ void setSidebarChanged( SwRootFrame* pRoot, bool bBrowseMode );
+ unsigned long getPageInfo( SwRect& rPageFrame, const SwRootFrame* , const Point& );
}
class SwSidebarItem
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 793b4147f91d..b6008d9e3961 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -142,8 +142,8 @@ class SW_DLLPUBLIC SwSection
{
// In order to correctly maintain the flag when creating/deleting frames.
friend class SwSectionNode;
- // The "read CTOR" of SwSectionFrm have to change the Hiddenflag.
- friend class SwSectionFrm;
+ // The "read CTOR" of SwSectionFrame have to change the Hiddenflag.
+ friend class SwSectionFrame;
private:
mutable SwSectionData m_Data;
@@ -249,15 +249,15 @@ public:
};
// #i117863#
-class SwSectionFrmMoveAndDeleteHint : public SfxSimpleHint
+class SwSectionFrameMoveAndDeleteHint : public SfxSimpleHint
{
public:
- SwSectionFrmMoveAndDeleteHint( const bool bSaveContent )
+ SwSectionFrameMoveAndDeleteHint( const bool bSaveContent )
: SfxSimpleHint( SFX_HINT_DYING )
, mbSaveContent( bSaveContent )
{}
- virtual ~SwSectionFrmMoveAndDeleteHint()
+ virtual ~SwSectionFrameMoveAndDeleteHint()
{}
bool IsSaveContent() const
@@ -286,17 +286,17 @@ class SW_DLLPUBLIC SwSectionFormat
SAL_DLLPRIVATE void UpdateParent(); // Parent has been changed.
protected:
- SwSectionFormat( SwFrameFormat* pDrvdFrm, SwDoc *pDoc );
+ SwSectionFormat( SwFrameFormat* pDrvdFrame, SwDoc *pDoc );
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew ) override;
public:
virtual ~SwSectionFormat();
- // Deletes all Frms in aDepend (Frms are recognized via dynamic_cast).
- virtual void DelFrms() override;
+ // Deletes all Frames in aDepend (Frames are recognized via dynamic_cast).
+ virtual void DelFrames() override;
// Creates views.
- virtual void MakeFrms() override;
+ virtual void MakeFrames() override;
// Get information from Format.
virtual bool GetInfo( SfxPoolItem& ) const override;
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index bf6f001ef3d2..a234095086ee 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -48,7 +48,7 @@ class SvStream;
class SvxFontItem;
class SvxMacroTableDtor;
class SwContentNode;
-class SwCrsrShell;
+class SwCursorShell;
class SwDoc;
class SwPaM;
class SwTextBlocks;
@@ -151,7 +151,7 @@ class SW_DLLPUBLIC SwReader: public SwDocFac
css::uno::Reference < css::embed::XStorage > xStg;
SfxMedium* pMedium; // Who wants to obtain a Medium (W4W).
- SwPaM* pCrsr;
+ SwPaM* pCursor;
OUString aFileName;
OUString sBaseURL;
bool mbSkipImages;
@@ -227,8 +227,8 @@ public:
virtual void SetFltName( const OUString& rFltNm );
- // Adapt item-set of a Frm-Format to the old format.
- static void ResetFrameFormatAttrs( SfxItemSet &rFrmSet );
+ // Adapt item-set of a Frame-Format to the old format.
+ static void ResetFrameFormatAttrs( SfxItemSet &rFrameSet );
// Adapt Frame-/Graphics-/OLE- styles to the old format
// (without borders etc.).
@@ -491,7 +491,7 @@ class SW_DLLPUBLIC SwWriter
SfxMedium* pMedium;
SwPaM* pOutPam;
- SwCrsrShell *pShell;
+ SwCursorShell *pShell;
SwDoc &rDoc;
bool bWriteAll;
@@ -499,13 +499,13 @@ class SW_DLLPUBLIC SwWriter
public:
sal_uLong Write( WriterRef& rxWriter, const OUString* = nullptr);
- SwWriter( SvStream&, SwCrsrShell &, bool bWriteAll = false );
+ SwWriter( SvStream&, SwCursorShell &, bool bWriteAll = false );
SwWriter( SvStream&, SwDoc & );
SwWriter( SvStream&, SwPaM &, bool bWriteAll = false );
SwWriter( const css::uno::Reference < css::embed::XStorage >&, SwDoc& );
- SwWriter( SfxMedium&, SwCrsrShell &, bool bWriteAll = false );
+ SwWriter( SfxMedium&, SwCursorShell &, bool bWriteAll = false );
SwWriter( SfxMedium&, SwDoc & );
};
diff --git a/sw/inc/splargs.hxx b/sw/inc/splargs.hxx
index 40343400ac73..7010e6a54971 100644
--- a/sw/inc/splargs.hxx
+++ b/sw/inc/splargs.hxx
@@ -30,7 +30,7 @@
#include <functional>
#include <limits.h>
-class SwTextFrm;
+class SwTextFrame;
class SwTextNode;
class SwIndex;
namespace vcl { class Font; }
@@ -107,12 +107,12 @@ struct SwSpellArgs : SwArgsBase
// Parameter-class for Hyphenate.
// docedt.cxx: SwDoc::Hyphenate()
// txtedt.cxx: SwTextNode::Hyphenate()
-// txthyph.cxx: SwTextFrm::Hyphenate()
+// txthyph.cxx: SwTextFrame::Hyphenate()
class SwInterHyphInfo
{
css::uno::Reference< css::linguistic2::XHyphenatedWord > xHyphWord;
- const Point aCrsrPos;
+ const Point aCursorPos;
bool bNoLang : 1;
bool bCheck : 1;
public:
@@ -121,9 +121,9 @@ public:
sal_Int32 nWordStart;
sal_Int32 nWordLen;
- SwInterHyphInfo( const Point &rCrsrPos, sal_Int32 nStartPos = 0,
+ SwInterHyphInfo( const Point &rCursorPos, sal_Int32 nStartPos = 0,
sal_Int32 nLength = SAL_MAX_INT32 )
- : aCrsrPos(rCrsrPos)
+ : aCursorPos(rCursorPos)
, bNoLang(false)
, bCheck(false)
, nStart(nStartPos)
@@ -135,9 +135,9 @@ public:
{
return nEnd;
}
- const Point *GetCrsrPos() const
+ const Point *GetCursorPos() const
{
- return aCrsrPos.X() || aCrsrPos.Y() ? &aCrsrPos : nullptr;
+ return aCursorPos.X() || aCursorPos.Y() ? &aCursorPos : nullptr;
}
bool IsCheck() const { return bCheck; }
void SetCheck( const bool bNew ) { bCheck = bNew; }
@@ -155,8 +155,8 @@ public:
namespace sw {
-SwTextFrm *
-SwHyphIterCacheLastTxtFrm(SwTextNode *, std::function<SwTextFrm * ()>);
+SwTextFrame *
+SwHyphIterCacheLastTextFrame(SwTextNode *, std::function<SwTextFrame * ()>);
}
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 8919596a8198..6fd3e806bce1 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -387,10 +387,10 @@ public:
virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg(vcl::Window *pParent) = 0;
virtual VclAbstractDialog* CreateTableMergeDialog( vcl::Window* pParent, bool& rWithPrev ) = 0;
- virtual SfxAbstractTabDialog* CreateFrmTabDialog(const OUString &rDialogType,
+ virtual SfxAbstractTabDialog* CreateFrameTabDialog(const OUString &rDialogType,
SfxViewFrame *pFrame, vcl::Window *pParent,
const SfxItemSet& rCoreSet,
- bool bNewFrm = true,
+ bool bNewFrame = true,
bool bFormat = false,
const OString& sDefPage = OString(),
const OUString* pFormatStr = nullptr) = 0;
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index a0d08f2a20c2..5d6763ed98b0 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -58,7 +58,7 @@ class SvxCharHiddenItem;
// Frame attributes
class SwFormatFillOrder;
-class SwFormatFrmSize;
+class SwFormatFrameSize;
class SvxPaperBinItem;
class SvxLRSpaceItem;
class SvxULSpaceItem;
@@ -256,7 +256,7 @@ public:
// Frame attributes. Implementation in frmatr.hxx.
inline const SwFormatFillOrder &GetFillOrder( bool = true ) const;
- inline const SwFormatFrmSize &GetFrmSize( bool = true ) const;
+ inline const SwFormatFrameSize &GetFrameSize( bool = true ) const;
inline const SvxPaperBinItem &GetPaperBin( bool = true ) const;
inline const SvxLRSpaceItem &GetLRSpace( bool = true ) const;
inline const SvxULSpaceItem &GetULSpace( bool = true ) const;
@@ -287,7 +287,7 @@ public:
inline const SwFormatFootnoteAtTextEnd &GetFootnoteAtTextEnd( bool = true ) const;
inline const SwFormatEndAtTextEnd &GetEndAtTextEnd( bool = true ) const;
inline const SwFormatNoBalancedColumns &GetBalancedColumns( bool = true ) const;
- inline const SvxFrameDirectionItem &GetFrmDir( bool = true ) const;
+ inline const SvxFrameDirectionItem &GetFrameDir( bool = true ) const;
inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( bool = true ) const;
inline const SwFormatFollowTextFlow &GetFollowTextFlow(bool = true) const;
inline const SwFormatWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(bool = true) const;
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 08b217e095fc..1d37cbfb960d 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -58,7 +58,7 @@ namespace nsSwCursorSelOverFlags
class SW_DLLPUBLIC SwCursor : public SwPaM
{
- friend class SwCrsrSaveState;
+ friend class SwCursorSaveState;
_SwCursor_SavePos* m_pSavePos;
long m_nRowSpanOffset; // required for travelling in tabs with rowspans
@@ -78,8 +78,8 @@ protected:
const _SwCursor_SavePos* GetSavePos() const { return m_pSavePos; }
- virtual const SwContentFrm* DoSetBidiLevelLeftRight(
- bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr);
+ virtual const SwContentFrame* DoSetBidiLevelLeftRight(
+ bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor);
virtual void DoSetBidiLevelUpDown();
virtual bool IsSelOvrCheck(int eFlags);
@@ -157,7 +157,7 @@ public:
bool ExpandToSentenceBorders();
virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
- bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr );
+ bool bAllowVisual, bool bSkipHidden, bool bInsertCursor );
bool UpDown( bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX );
bool LeftRightMargin( bool bLeftMargin, bool bAPI = false );
bool IsAtLeftRightMargin( bool bLeftMargin, bool bAPI = false ) const;
@@ -190,10 +190,10 @@ public:
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
nsSwCursorSelOverFlags::SELOVER_CHANGEPOS ));
bool IsInProtectTable( bool bMove = false,
- bool bChgCrsr = true );
+ bool bChgCursor = true );
bool IsNoContent() const;
- /** Restore cursor state to the one saved by SwCrsrSaveState **/
+ /** Restore cursor state to the one saved by SwCursorSaveState **/
void RestoreSavePos();
// true: cursor can be set at this position.
@@ -205,31 +205,31 @@ public:
virtual bool IsSkipOverProtectSections() const;
virtual bool IsSkipOverHiddenSections() const;
- sal_uInt8 GetCrsrBidiLevel() const { return m_nCursorBidiLevel; }
- void SetCrsrBidiLevel( sal_uInt8 nNewLevel ) { m_nCursorBidiLevel = nNewLevel; }
+ sal_uInt8 GetCursorBidiLevel() const { return m_nCursorBidiLevel; }
+ void SetCursorBidiLevel( sal_uInt8 nNewLevel ) { m_nCursorBidiLevel = nNewLevel; }
bool IsColumnSelection() const { return m_bColumnSelection; }
void SetColumnSelection( bool bNew ) { m_bColumnSelection = bNew; }
- long GetCrsrRowSpanOffset() const { return m_nRowSpanOffset; }
+ long GetCursorRowSpanOffset() const { return m_nRowSpanOffset; }
DECL_FIXEDMEMPOOL_NEWDEL( SwCursor )
};
/**
- A helper class to save cursor state (position). Create SwCrsrSaveState
+ A helper class to save cursor state (position). Create SwCursorSaveState
object to save current state, use SwCursor::RestoreSavePos() to actually
- restore cursor state to the saved state (SwCrsrSaveState destructor only
+ restore cursor state to the saved state (SwCursorSaveState destructor only
removes the saved state from an internal stack). It is possible to stack
- several SwCrsrSaveState objects.
+ several SwCursorSaveState objects.
**/
-class SwCrsrSaveState
+class SwCursorSaveState
{
private:
- SwCursor& m_rCrsr;
+ SwCursor& m_rCursor;
public:
- SwCrsrSaveState( SwCursor& rC ) : m_rCrsr( rC ) { rC.SaveState(); }
- ~SwCrsrSaveState() { m_rCrsr.RestoreState(); }
+ SwCursorSaveState( SwCursor& rC ) : m_rCursor( rC ) { rC.SaveState(); }
+ ~SwCursorSaveState() { m_rCursor.RestoreState(); }
};
// internal, used by SwCursor::SaveState() etc.
@@ -239,9 +239,9 @@ struct _SwCursor_SavePos
sal_Int32 nContent;
_SwCursor_SavePos* pNext;
- _SwCursor_SavePos( const SwCursor& rCrsr )
- : nNode( rCrsr.GetPoint()->nNode.GetIndex() ),
- nContent( rCrsr.GetPoint()->nContent.GetIndex() ),
+ _SwCursor_SavePos( const SwCursor& rCursor )
+ : nNode( rCursor.GetPoint()->nNode.GetIndex() ),
+ nContent( rCursor.GetPoint()->nContent.GetIndex() ),
pNext( nullptr )
{}
virtual ~_SwCursor_SavePos() {}
@@ -269,7 +269,7 @@ public:
virtual ~SwTableCursor();
virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
- bool bAllowVisual, bool bSkipHidden, bool bInsertCrsr ) override;
+ bool bAllowVisual, bool bSkipHidden, bool bInsertCursor ) override;
virtual bool GotoTable( const OUString& rName ) override;
void InsertBox( const SwTableBox& rTableBox );
@@ -278,14 +278,14 @@ public:
const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; }
// Creates cursor for all boxes.
- SwCursor* MakeBoxSels( SwCursor* pAktCrsr );
+ SwCursor* MakeBoxSels( SwCursor* pAktCursor );
// Any boxes protected?
bool HasReadOnlyBoxSel() const;
// Has table cursor been changed? If so, save new values immediately.
- bool IsCrsrMovedUpdate();
+ bool IsCursorMovedUpdate();
// Has table cursor been changed?
- bool IsCrsrMoved() const
+ bool IsCursorMoved() const
{
return m_nTableMkNd != GetMark()->nNode.GetIndex() ||
m_nTablePtNd != GetPoint()->nNode.GetIndex() ||
@@ -296,7 +296,7 @@ public:
bool IsChgd() const { return m_bChanged; }
// Park table cursor at start node of boxes.
- void ParkCrsr();
+ void ParkCursor();
bool NewTableSelection();
void ActualizeSelection( const SwSelBoxes &rBoxes );
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 0f1b4a8ec150..fd3928622e09 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -248,7 +248,7 @@ public:
sal_uInt16 nCnt = 1, bool bBehind = true );
void PrepareDelBoxes( const SwSelBoxes& rBoxes );
bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged,
- SwUndo* pUndo, const bool bDelMakeFrms, const bool bCorrBorder );
+ SwUndo* pUndo, const bool bDelMakeFrames, const bool bCorrBorder );
bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 );
void FindSuperfluousRows( SwSelBoxes& rBoxes )
@@ -496,13 +496,13 @@ public:
void RegisterToFormat( SwFormat& rFormat ) ;
};
-class SwCellFrm;
+class SwCellFrame;
class SW_DLLPUBLIC SwTableCellInfo : public ::boost::noncopyable
{
struct Impl;
::std::unique_ptr<Impl> m_pImpl;
- const SwCellFrm * getCellFrm() const ;
+ const SwCellFrame * getCellFrame() const ;
public:
SwTableCellInfo(const SwTable * pTable);
diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx
index 999b7c5fefe2..394716a89a20 100644
--- a/sw/inc/swtblfmt.hxx
+++ b/sw/inc/swtblfmt.hxx
@@ -29,12 +29,12 @@ class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat
protected:
SwTableFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange )
{}
SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange )
{}
public:
@@ -50,12 +50,12 @@ class SwTableLineFormat : public SwFrameFormat
protected:
SwTableLineFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange )
{}
SwTableLineFormat( SwAttrPool& rPool, const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableLineSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableLineSetRange )
{}
public:
@@ -71,12 +71,12 @@ class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat
protected:
SwTableBoxFormat( SwAttrPool& rPool, const sal_Char* pFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, pFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, pFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange )
{}
SwTableBoxFormat( SwAttrPool& rPool, const OUString &rFormatNm,
- SwFrameFormat *pDrvdFrm )
- : SwFrameFormat( rPool, rFormatNm, pDrvdFrm, RES_FRMFMT, aTableBoxSetRange )
+ SwFrameFormat *pDrvdFrame )
+ : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableBoxSetRange )
{}
// For recognition of changes (especially TableBoxAttribute).
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 5bff42792be2..5d99dae0ce41 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -68,8 +68,8 @@ const sal_Int32 COMPLETE_STRING = SAL_MAX_INT32;
const SwTwips cMinHdFtHeight = 56;
-#define MINFLY 23 // Minimal size for FlyFrms.
-#define MINLAY 23 // Minimal size for other Frms.
+#define MINFLY 23 // Minimal size for FlyFrames.
+#define MINLAY 23 // Minimal size for other Frames.
// Default column distance of two text columns corresponds to 0.3 cm.
#define DEF_GUTTER_WIDTH (MM50 / 5 * 3)
@@ -247,17 +247,17 @@ enum PrepareHint
PREP_FIXSIZE_CHG, // FixSize has changed.
PREP_FOLLOW_FOLLOWS, // Follow is now possibly adjacent.
PREP_ADJUST_FRM, // Adjust size via grow/shrink without formatting.
- PREP_FLY_CHGD, // A FlyFrm has changed its size.
- PREP_FLY_ATTR_CHG, // A FlyFrm hat has changed its attributes
+ PREP_FLY_CHGD, // A FlyFrame has changed its size.
+ PREP_FLY_ATTR_CHG, // A FlyFrame hat has changed its attributes
// (e. g. wrap).
- PREP_FLY_ARRIVE, // A FlyFrm now overlaps range.
- PREP_FLY_LEAVE, // A FlyFrm has left range.
+ PREP_FLY_ARRIVE, // A FlyFrame now overlaps range.
+ PREP_FLY_LEAVE, // A FlyFrame has left range.
PREP_FTN, // Invalidation of footnotes.
- PREP_POS_CHGD, // Position of Frm has changed.
+ PREP_POS_CHGD, // Position of Frame has changed.
// (Check for Fly-break). In void* of Prepare()
// a sal_Bool& is passed. If this is sal_True,
// it indicateds that a format has been executed.
- PREP_UL_SPACE, // UL-Space has changed, TextFrms have to
+ PREP_UL_SPACE, // UL-Space has changed, TextFrames have to
// re-calculate line space.
PREP_MUST_FIT, // Make frm fit (split) even if the attributes do
// not allow that (e.g. "keep together").
@@ -267,7 +267,7 @@ enum PrepareHint
PREP_QUOVADIS, // If a footnote has to be split between two paragraphs
// the last on the page has to receive a QUOVADIS in
// order to format the text into it.
- PREP_BOSS_CHGD, // If a Frm changes its column/page this additional
+ PREP_BOSS_CHGD, // If a Frame changes its column/page this additional
// Prepare is sended to POS_CHGD in MoveFwd/Bwd
// (join Footnote-numbers etc.)
// Direction is communicated via pVoid:
@@ -279,7 +279,7 @@ enum PrepareHint
PREP_MOVEFTN, // A footnote changes its page. Its contents receives at first a
// height of zero in order to avoid too much noise. At formatting
// it checks whether it fits and if necessary changes its page again.
- PREP_ERGOSUM, // Needed because of movement in FootnoteFrms. Check QuoVadis/ErgoSum.
+ PREP_ERGOSUM, // Needed because of movement in FootnoteFrames. Check QuoVadis/ErgoSum.
PREP_END // END.
};
diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx
index 524cb4ebd30f..dd4170893c60 100644
--- a/sw/inc/tblsel.hxx
+++ b/sw/inc/tblsel.hxx
@@ -29,21 +29,21 @@
#include <deque>
#include <vector>
-class SwCrsrShell;
+class SwCursorShell;
class SwCursor;
class SwTableCursor;
-class SwFrm;
-class SwTabFrm;
+class SwFrame;
+class SwTabFrame;
class SwTableBox;
class SwTableLine;
-class SwLayoutFrm;
+class SwLayoutFrame;
class SwPaM;
class SwNode;
class SwTable;
class SwUndoTableMerge;
-class SwCellFrm;
+class SwCellFrame;
-typedef ::std::deque< SwCellFrm* > SwCellFrms;
+typedef ::std::deque< SwCellFrame* > SwCellFrames;
struct CompareSwSelBoxes
{
@@ -70,23 +70,23 @@ namespace nsSwTableSearchType
const SwTableSearchType TBLSEARCH_NO_UNION_CORRECT = 0x10; // Do not correct collected Union.
}
-SW_DLLPUBLIC void GetTableSel( const SwCrsrShell& rShell, SwSelBoxes& rBoxes,
+SW_DLLPUBLIC void GetTableSel( const SwCursorShell& rShell, SwSelBoxes& rBoxes,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
-void GetTableSel( const SwCursor& rCrsr, SwSelBoxes& rBoxes,
+void GetTableSel( const SwCursor& rCursor, SwSelBoxes& rBoxes,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
-// As before, but don't start from selection but from Start- EndFrms.
-void GetTableSel( const SwLayoutFrm* pStart, const SwLayoutFrm* pEnd,
- SwSelBoxes& rBoxes, SwCellFrms* pCells,
+// As before, but don't start from selection but from Start- EndFrames.
+void GetTableSel( const SwLayoutFrame* pStart, const SwLayoutFrame* pEnd,
+ SwSelBoxes& rBoxes, SwCellFrames* pCells,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// As before but directly via PaMs.
-void GetTableSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes );
-void GetTableSelCrs( const SwTableCursor& rTableCrsr, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwCursorShell& rShell, SwSelBoxes& rBoxes );
+void GetTableSelCrs( const SwTableCursor& rTableCursor, SwSelBoxes& rBoxes );
// Collect boxes relevant for auto sum.
-bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
+bool GetAutoSumSel( const SwCursorShell&, SwCellFrames& );
// Check if the SelBoxes contains protected Boxes.
bool HasProtectedCells( const SwSelBoxes& rBoxes );
@@ -95,9 +95,9 @@ bool HasProtectedCells( const SwSelBoxes& rBoxes );
bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd);
// Check if cell is part of SSelection.
-// (Became a function, in order to make sure that GetTableSel() and MakeTableCrsr()
+// (Became a function, in order to make sure that GetTableSel() and MakeTableCursor()
// have always the same concept of the selection.
-bool IsFrmInTableSel( const SwRect& rUnion, const SwFrm* pCell );
+bool IsFrameInTableSel( const SwRect& rUnion, const SwFrame* pCell );
// Determine boxes to be merged.
// In this process the rectangle gets "adapted" on the base of the layout,
@@ -113,25 +113,25 @@ sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes );
bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam );
// Check if Split or InsertCol lead to a box becoming smaller than MINLAY.
-bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv,
+bool CheckSplitCells( const SwCursorShell& rShell, sal_uInt16 nDiv,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
-bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv,
+bool CheckSplitCells( const SwCursor& rCursor, sal_uInt16 nDiv,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// For working on tab selection also for split tables.
class SwSelUnion
{
SwRect m_aUnion; // The rectangle enclosing the selection.
- SwTabFrm *m_pTable; // The (Follow-)Table for the Union.
+ SwTabFrame *m_pTable; // The (Follow-)Table for the Union.
public:
- SwSelUnion( const SwRect &rRect, SwTabFrm *pTab ) :
+ SwSelUnion( const SwRect &rRect, SwTabFrame *pTab ) :
m_aUnion( rRect ), m_pTable( pTab ) {}
const SwRect& GetUnion() const { return m_aUnion; }
SwRect& GetUnion() { return m_aUnion; }
- const SwTabFrm *GetTable() const { return m_pTable; }
- SwTabFrm *GetTable() { return m_pTable; }
+ const SwTabFrame *GetTable() const { return m_pTable; }
+ SwTabFrame *GetTable() { return m_pTable; }
};
// Determines tables affected by a table selection and union rectangles
@@ -142,8 +142,8 @@ typedef std::vector<SwSelUnion> SwSelUnions;
// - also for split tables.
// If a parameter is passed that != nsSwTableSearchType::TBLSEARCH_NONE
// the selection is extended in the given direction.
-void MakeSelUnions( SwSelUnions&, const SwLayoutFrm *pStart,
- const SwLayoutFrm *pEnd,
+void MakeSelUnions( SwSelUnions&, const SwLayoutFrame *pStart,
+ const SwLayoutFrame *pEnd,
const SwTableSearchType = nsSwTableSearchType::TBLSEARCH_NONE );
// These classes copy the current table selections (rBoxes) into a
@@ -181,9 +181,9 @@ public:
void SetTableLines( const SwSelBoxes &rBoxes, const SwTable &rTable );
void SetTableLines( const SwTable &rTable );
//Add an input param to identify if acc table should be disposed
- void DelFrms ( SwTable &rTable, bool bAccTableDispose = false );
- void MakeFrms( SwTable &rTable );
- void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber,
+ void DelFrames ( SwTable &rTable, bool bAccTableDispose = false );
+ void MakeFrames( SwTable &rTable );
+ void MakeNewFrames( SwTable &rTable, const sal_uInt16 nNumber,
const bool bBehind );
bool AreLinesToRestore( const SwTable &rTable ) const;
diff --git a/sw/inc/textboxhelper.hxx b/sw/inc/textboxhelper.hxx
index f4fb97a3dc6d..d72ba4da5311 100644
--- a/sw/inc/textboxhelper.hxx
+++ b/sw/inc/textboxhelper.hxx
@@ -60,7 +60,7 @@ public:
static void getProperty(SwFrameFormat* pShape, sal_uInt16 nWID, sal_uInt8 nMemberID, css::uno::Any& rValue);
/// Similar to syncProperty(), but used by the internal API (e.g. for UI purposes).
- static void syncFlyFrmAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
+ static void syncFlyFrameAttr(SwFrameFormat& rShape, SfxItemSet& rSet);
/// If we have an associated TextFrame, then return that.
static SwFrameFormat* findTextBox(const SwFrameFormat* pShape);
@@ -73,7 +73,7 @@ public:
/**
* Look up TextFrames in a document, which are in fact TextBoxes.
*
- * If rNode has a matching SwContentFrm, then only TextBoxes of rNode are
+ * If rNode has a matching SwContentFrame, then only TextBoxes of rNode are
* returned.
*/
static std::set<const SwFrameFormat*> findTextBoxes(const SwNode& rNode);
diff --git a/sw/inc/txtflcnt.hxx b/sw/inc/txtflcnt.hxx
index 74f78691db0f..b4530d630124 100644
--- a/sw/inc/txtflcnt.hxx
+++ b/sw/inc/txtflcnt.hxx
@@ -21,36 +21,36 @@
#include <txatbase.hxx>
-class SwFlyInCntFrm;
-class SwFrm;
+class SwFlyInContentFrame;
+class SwFrame;
class SwTextNode;
class SwDoc;
// Attribute for line-bound frames (without end index).
class SwTextFlyCnt : public SwTextAttr
{
- SwFlyInCntFrm *_GetFlyFrm( const SwFrm *pCurrFrm );
+ SwFlyInContentFrame *_GetFlyFrame( const SwFrame *pCurrFrame );
public:
SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStart );
// Sets anchor in pFormat and
void SetAnchor( const SwTextNode *pNode );
- inline SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm );
- inline const SwFlyInCntFrm *GetFlyFrm( const SwFrm *pCurrFrm ) const;
+ inline SwFlyInContentFrame *GetFlyFrame( const SwFrame *pCurrFrame );
+ inline const SwFlyInContentFrame *GetFlyFrame( const SwFrame *pCurrFrame ) const;
// creates for itself a new FlyFrameFormat.
void CopyFlyFormat( SwDoc* pDoc );
};
-inline SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm )
+inline SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame )
{
- return _GetFlyFrm( pCurrFrm );
+ return _GetFlyFrame( pCurrFrame );
}
-inline const SwFlyInCntFrm *SwTextFlyCnt::GetFlyFrm( const SwFrm *pCurrFrm ) const
+inline const SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame( const SwFrame *pCurrFrame ) const
{
- return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrm( pCurrFrm );
+ return (const_cast<SwTextFlyCnt*>(this))->_GetFlyFrame( pCurrFrame );
}
#endif
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index 2d34daaabae6..daf1bb163bb0 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -27,7 +27,7 @@ class SwNodeIndex;
class SwTextNode;
class SwNodes;
class SwDoc;
-class SwFrm;
+class SwFrame;
class SW_DLLPUBLIC SwTextFootnote : public SwTextAttr
{
@@ -52,7 +52,7 @@ public:
void MakeNewTextSection( SwNodes& rNodes );
// Delete the FootnoteFrame from page.
- void DelFrms( const SwFrm* );
+ void DelFrames( const SwFrame* );
// Check conditional paragraph styles.
void CheckCondColl();
diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx
index f07aa30f3c74..d83db238ecc5 100644
--- a/sw/inc/undobj.hxx
+++ b/sw/inc/undobj.hxx
@@ -279,8 +279,8 @@ public:
class SwUndoInsLayFormat : public SwUndoFlyBase
{
- sal_uLong mnCrsrSaveIndexPara; // Cursor position
- sal_Int32 mnCrsrSaveIndexPos; // for undo
+ sal_uLong mnCursorSaveIndexPara; // Cursor position
+ sal_Int32 mnCursorSaveIndexPos; // for undo
public:
SwUndoInsLayFormat( SwFrameFormat* pFormat, sal_uLong nNodeIdx, sal_Int32 nCntIdx );
@@ -296,7 +296,7 @@ public:
class SwUndoDelLayFormat : public SwUndoFlyBase
{
- bool bShowSelFrm;
+ bool bShowSelFrame;
public:
SwUndoDelLayFormat( SwFrameFormat* pFormat );
@@ -305,7 +305,7 @@ public:
void RedoForRollback();
- void ChgShowSel( bool bNew ) { bShowSelFrm = bNew; }
+ void ChgShowSel( bool bNew ) { bShowSelFrame = bNew; }
virtual SwRewriter GetRewriter() const override;
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 8cc22f416205..367af0c47b23 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -29,7 +29,7 @@
class SfxPoolItem;
class SwClient;
class SwDoc;
-class SwUnoTableCrsr;
+class SwUnoTableCursor;
typedef ::cppu::WeakImplHelper
< css::lang::XServiceInfo
@@ -79,7 +79,7 @@ private:
public:
UnoActionRemoveContext(SwDoc *const pDoc);
- UnoActionRemoveContext(SwUnoTableCrsr const& rCursor);
+ UnoActionRemoveContext(SwUnoTableCursor const& rCursor);
~UnoActionRemoveContext();
};
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 899be66fd332..935db3d705e1 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -263,7 +263,7 @@ class SwChartDataSequence :
css::uno::Reference< css::chart2::data::XDataProvider > m_xDataProvider;
SwChartDataProvider * m_pDataProvider;
- sw::UnoCursorPointer m_pTableCrsr; // cursor spanned over cells to use
+ sw::UnoCursorPointer m_pTableCursor; // cursor spanned over cells to use
const SfxItemPropertySet* m_pPropSet;
@@ -279,7 +279,7 @@ protected:
public:
SwChartDataSequence( SwChartDataProvider &rProvider,
SwFrameFormat &rTableFormat,
- std::shared_ptr<SwUnoCrsr> pTableCursor );
+ std::shared_ptr<SwUnoCursor> pTableCursor );
virtual ~SwChartDataSequence();
static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx
index 902e75530423..9ee9261de581 100644
--- a/sw/inc/unocrsr.hxx
+++ b/sw/inc/unocrsr.hxx
@@ -31,7 +31,7 @@ namespace sw
};
}
-class SwUnoCrsr : public virtual SwCursor, public SwModify
+class SwUnoCursor : public virtual SwCursor, public SwModify
{
private:
bool m_bRemainInSection : 1;
@@ -39,13 +39,13 @@ private:
bool m_bSkipOverProtectSections : 1;
public:
- SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = nullptr );
- virtual ~SwUnoCrsr();
+ SwUnoCursor( const SwPosition &rPos, SwPaM* pRing = nullptr );
+ virtual ~SwUnoCursor();
protected:
- virtual const SwContentFrm* DoSetBidiLevelLeftRight(
- bool & io_rbLeft, bool bVisualAllowed, bool bInsertCrsr) override;
+ virtual const SwContentFrame* DoSetBidiLevelLeftRight(
+ bool & io_rbLeft, bool bVisualAllowed, bool bInsertCursor) override;
virtual void DoSetBidiLevelUpDown() override;
public:
@@ -72,10 +72,10 @@ public:
void SetSkipOverHiddenSections( bool bFlag )
{ m_bSkipOverHiddenSections = bFlag; }
- DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCrsr )
+ DECL_FIXEDMEMPOOL_NEWDEL( SwUnoCursor )
};
-class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
+class SwUnoTableCursor : public virtual SwUnoCursor, public virtual SwTableCursor
{
// The selection has the same order as the table boxes, i.e.
// if something is deleted from the one array at a certain position
@@ -85,8 +85,8 @@ class SwUnoTableCrsr : public virtual SwUnoCrsr, public virtual SwTableCursor
using SwTableCursor::MakeBoxSels;
public:
- SwUnoTableCrsr( const SwPosition& rPos );
- virtual ~SwUnoTableCrsr();
+ SwUnoTableCursor( const SwPosition& rPos );
+ virtual ~SwUnoTableCursor();
// Does a selection of content exist in table?
// Return value indicates if the cursor remains at its old position.
@@ -109,7 +109,7 @@ namespace sw
UnoCursorPointer()
: m_pCursor(nullptr), m_bSectionRestricted(false)
{}
- UnoCursorPointer(std::shared_ptr<SwUnoCrsr> pCursor, bool bSectionRestricted=false)
+ UnoCursorPointer(std::shared_ptr<SwUnoCursor> pCursor, bool bSectionRestricted=false)
: m_pCursor(pCursor), m_bSectionRestricted(bSectionRestricted)
{
m_pCursor->Add(this);
@@ -144,9 +144,9 @@ namespace sw
if(!GetRegisteredIn())
m_pCursor.reset();
};
- SwUnoCrsr& operator*() const
+ SwUnoCursor& operator*() const
{ return *m_pCursor.get(); }
- SwUnoCrsr* operator->() const
+ SwUnoCursor* operator->() const
{ return m_pCursor.get(); }
UnoCursorPointer& operator=(UnoCursorPointer aOther)
{
@@ -157,7 +157,7 @@ namespace sw
}
explicit operator bool() const
{ return static_cast<bool>(m_pCursor); }
- void reset(std::shared_ptr<SwUnoCrsr> pNew)
+ void reset(std::shared_ptr<SwUnoCursor> pNew)
{
if(pNew)
pNew->Add(this);
@@ -166,7 +166,7 @@ namespace sw
m_pCursor = pNew;
}
private:
- std::shared_ptr<SwUnoCrsr> m_pCursor;
+ std::shared_ptr<SwUnoCursor> m_pCursor;
const bool m_bSectionRestricted;
};
}
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 41f83af366ce..50154968fb00 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -35,8 +35,8 @@ struct SfxItemPropertySimpleEntry;
class SdrObject;
class SwTextNode;
class SwCursor;
-class SwUnoCrsr;
-class SwUnoTableCrsr;
+class SwUnoCursor;
+class SwUnoTableCursor;
class SwFormatColl;
struct SwSortOptions;
class SwDoc;
@@ -81,7 +81,7 @@ namespace SwUnoCursorHelper
GetNestedTextContent(SwTextNode & rTextNode, sal_Int32 const nIndex,
bool const bParent);
- bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
+ bool getCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, css::uno::Any *pAny
, css::beans::PropertyState& eState
@@ -89,14 +89,14 @@ namespace SwUnoCursorHelper
void GetCurPageStyle(SwPaM& rPaM, OUString &rString);
- inline bool IsStartOfPara(SwPaM& rUnoCrsr)
- { return rUnoCrsr.GetPoint()->nContent == 0;}
- inline bool IsEndOfPara(SwPaM& rUnoCrsr)
- { return rUnoCrsr.GetContentNode() &&
- rUnoCrsr.GetPoint()->nContent == rUnoCrsr.GetContentNode()->Len();}
+ inline bool IsStartOfPara(SwPaM& rUnoCursor)
+ { return rUnoCursor.GetPoint()->nContent == 0;}
+ inline bool IsEndOfPara(SwPaM& rUnoCursor)
+ { return rUnoCursor.GetContentNode() &&
+ rUnoCursor.GetPoint()->nContent == rUnoCursor.GetContentNode()->Len();}
- void resetCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
- void InsertFile(SwUnoCrsr* pUnoCrsr,
+ void resetCursorPropertyValue(const SfxItemPropertySimpleEntry& rEntry, SwPaM& rPam);
+ void InsertFile(SwUnoCursor* pUnoCursor,
const OUString& rURL,
const css::uno::Sequence< css::beans::PropertyValue >& rOptions)
throw (css::lang::IllegalArgumentException,
@@ -133,10 +133,10 @@ namespace SwUnoCursorHelper
throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
/// @param bTableMode: attributes should be applied to a table selection
- void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet,
+ void SetCursorAttr(SwPaM & rPam, const SfxItemSet & rSet,
const SetAttrMode nAttrMode,
const bool bTableMode = false);
- void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
+ void GetCursorAttr(SwPaM & rPam, SfxItemSet & rSet,
const bool bOnlyTextAttr = false,
const bool bGetFromChrFormat = true);
void GetTextFromPam(SwPaM & rPam, OUString & rBuffer);
@@ -235,7 +235,7 @@ namespace SwUnoCursorHelper
css::uno::Reference<css::uno::XInterface> const& xIfc,
SwDoc & rTargetDoc,
SwPaM *& o_rpPaM, std::pair<OUString, FlyCntType> & o_rFrame,
- OUString & o_rTableName, SwUnoTableCrsr const*& o_rpTableCursor,
+ OUString & o_rTableName, SwUnoTableCursor const*& o_rpTableCursor,
::sw::mark::IMark const*& o_rpMark,
std::vector<SdrObject *> & o_rSdrObjects);
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 9a29e8b82178..4da09be3f151 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -41,7 +41,7 @@
struct SwPosition;
class SwPaM;
-class SwUnoCrsr;
+class SwUnoCursor;
class SwStartNode;
class SwTextNode;
class SwTable;
@@ -277,7 +277,7 @@ struct SwXParagraphEnumeration
{
static SwXParagraphEnumeration* Create(
css::uno::Reference< css::text::XText > const & xParent,
- std::shared_ptr<SwUnoCrsr> pCursor,
+ std::shared_ptr<SwUnoCursor> pCursor,
const CursorType eType,
SwStartNode const*const pStartNode = nullptr,
SwTable const*const pTable = nullptr);
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index c04b006e3720..96323c274809 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -270,9 +270,9 @@ public:
virtual const SwDoc* GetDoc() const override;
virtual SwDoc* GetDoc() override;
- const SwUnoCrsr& GetCrsr() const;
- SwUnoCrsr& GetCrsr();
- sw::UnoCursorPointer m_pUnoCrsr;
+ const SwUnoCursor& GetCursor() const;
+ SwUnoCursor& GetCursor();
+ sw::UnoCursorPointer m_pUnoCursor;
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
virtual ~SwXTextTableCursor() { };
};
@@ -456,7 +456,7 @@ class SwXCellRange : public cppu::WeakImplHelper
SwRangeDescriptor aRgDesc;
const SfxItemPropertySet* m_pPropSet;
- sw::UnoCursorPointer m_pTableCrsr;
+ sw::UnoCursorPointer m_pTableCursor;
bool m_bFirstRowAsLabel;
bool m_bFirstColumnAsLabel;
@@ -465,7 +465,7 @@ class SwXCellRange : public cppu::WeakImplHelper
void setLabelDescriptions(const css::uno::Sequence<OUString>& rDesc, bool bRow);
public:
- SwXCellRange(sw::UnoCursorPointer pCrsr, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
+ SwXCellRange(sw::UnoCursorPointer pCursor, SwFrameFormat& rFrameFormat, SwRangeDescriptor& rDesc);
void SetLabels(bool bFirstRowAsLabel, bool bFirstColumnAsLabel)
{ m_bFirstRowAsLabel = bFirstRowAsLabel, m_bFirstColumnAsLabel = bFirstColumnAsLabel; }
virtual ~SwXCellRange() {};
@@ -540,7 +540,7 @@ public:
sal_uInt16 getRowCount();
sal_uInt16 getColumnCount();
- const SwUnoCrsr* GetTableCrsr() const;
+ const SwUnoCursor* GetTableCursor() const;
};
class SwXTableRows final : public cppu::WeakImplHelper
diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
index f8fa7463d2e5..998a092e326d 100644
--- a/sw/inc/unotextcursor.hxx
+++ b/sw/inc/unotextcursor.hxx
@@ -45,7 +45,7 @@
class SwDoc;
struct SwPosition;
-class SwUnoCrsr;
+class SwUnoCursor;
typedef ::cppu::WeakImplHelper
< css::lang::XServiceInfo
@@ -89,7 +89,7 @@ public:
SwPaM const& rSourceCursor,
const enum CursorType eType = CURSOR_ALL);
- SwUnoCrsr& GetCursor();
+ SwUnoCursor& GetCursor();
bool IsAtEndOfMeta() const;
void DeleteAndInsert(OUString const& rText,
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
index 13b020957f0b..785d9dbac41d 100644
--- a/sw/inc/unotextrange.hxx
+++ b/sw/inc/unotextrange.hxx
@@ -36,7 +36,7 @@
#include <unobaseclass.hxx>
class SwDoc;
-class SwUnoCrsr;
+class SwUnoCursor;
class SwFrameFormat;
class SW_DLLPUBLIC SwUnoInternalPaM
@@ -252,8 +252,8 @@ typedef ::cppu::WeakImplHelper
struct SwXTextRanges : public SwXTextRanges_Base
{
- virtual SwUnoCrsr* GetCursor() =0;
- static SwXTextRanges* Create(SwPaM* const pCrsr);
+ virtual SwUnoCursor* GetCursor() =0;
+ static SwXTextRanges* Create(SwPaM* const pCursor);
static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
};
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 222114b118de..87386bbd193a 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -80,7 +80,7 @@ class SwDocShell;
class UnoActionContext;
class SwXBodyText;
class SwXDrawPage;
-class SwUnoCrsr;
+class SwUnoCursor;
class SwXDocumentPropertyHelper;
class SfxViewFrame;
class SwPrintUIOptions;
@@ -448,9 +448,9 @@ public:
void InitNewDoc();
- SwUnoCrsr* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr);
- SwUnoCrsr* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
- css::uno::Reference< css::text::XTextCursor > & xCrsr, bool bAll,
+ SwUnoCursor* CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCursor);
+ SwUnoCursor* FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
+ css::uno::Reference< css::text::XTextCursor > & xCursor, bool bAll,
sal_Int32& nResult,
css::uno::Reference< css::uno::XInterface > xLastResult);
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 42b7f9d177d7..a757d79a0234 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -78,7 +78,7 @@ class Graphic;
class GraphicFilter;
class SwPostItMgr;
enum class SotExchangeDest;
-class SwCrsrShell;
+class SwCursorShell;
namespace com{ namespace sun { namespace star {
namespace view{ class XSelectionSupplier; }
@@ -170,7 +170,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
Timer m_aTimer; // for delayed ChgLnks during an action
OUString m_sSwViewData,
//and the new cursor position if the user double click in the PagePreview
- m_sNewCrsrPos;
+ m_sNewCursorPos;
// to support keyboard the number of the page to go to can be set too
sal_uInt16 m_nNewPage;
@@ -232,8 +232,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
bool m_bWheelScrollInProgress;
- bool m_bCenterCrsr : 1,
- m_bTopCrsr : 1,
+ bool m_bCenterCursor : 1,
+ m_bTopCursor : 1,
m_bAlwaysShowSel : 1,
m_bTabColFromDoc : 1,
m_bTabRowFromDoc : 1,
@@ -284,8 +284,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
// scrollbar movements
SAL_DLLPRIVATE long PageUp();
SAL_DLLPRIVATE long PageDown();
- SAL_DLLPRIVATE bool PageUpCrsr(bool bSelect);
- SAL_DLLPRIVATE bool PageDownCrsr(bool bSelect);
+ SAL_DLLPRIVATE bool PageUpCursor(bool bSelect);
+ SAL_DLLPRIVATE bool PageDownCursor(bool bSelect);
SAL_DLLPRIVATE long PhyPageUp();
SAL_DLLPRIVATE long PhyPageDown();
@@ -312,7 +312,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
SAL_DLLPRIVATE void HyphStart( SvxSpellArea eSpell );
SAL_DLLPRIVATE void SpellKontext(bool bOn = true)
- { m_bCenterCrsr = bOn; m_bAlwaysShowSel = bOn; }
+ { m_bCenterCursor = bOn; m_bAlwaysShowSel = bOn; }
// for readonly switching
SAL_DLLPRIVATE virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
@@ -459,7 +459,7 @@ public:
bool HandleWheelCommands( const CommandEvent& );
// insert frames
- void InsFrmMode(sal_uInt16 nCols);
+ void InsFrameMode(sal_uInt16 nCols);
void SetZoom( SvxZoomType eZoomType, short nFactor = 100, bool bViewOnly = false);
virtual void SetZoomFactor( const Fraction &rX, const Fraction & ) override;
@@ -539,7 +539,7 @@ public:
void StateTabWin(SfxItemSet&);
// attributes have changed
- DECL_LINK_TYPED( AttrChangedNotify, SwCrsrShell*, void );
+ DECL_LINK_TYPED( AttrChangedNotify, SwCursorShell*, void );
// form control has been activated
DECL_LINK_TYPED( FormControlActivated, LinkParamNone*, void );
@@ -569,10 +569,10 @@ public:
virtual void ReadUserDataSequence ( const css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override;
virtual void WriteUserDataSequence ( css::uno::Sequence < css::beans::PropertyValue >&, bool bBrowse ) override;
- void SetCrsrAtTop( bool bFlag, bool bCenter = false )
- { m_bTopCrsr = bFlag, m_bCenterCrsr = bCenter; }
- bool IsCrsrAtTop() const { return m_bTopCrsr; }
- bool IsCrsrAtCenter() const { return m_bCenterCrsr; }
+ void SetCursorAtTop( bool bFlag, bool bCenter = false )
+ { m_bTopCursor = bFlag, m_bCenterCursor = bCenter; }
+ bool IsCursorAtTop() const { return m_bTopCursor; }
+ bool IsCursorAtCenter() const { return m_bCenterCursor; }
bool JumpToSwMark( const OUString& rMark );
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index a3cf5b317eed..8f3179039d4d 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -138,7 +138,7 @@ protected:
short m_nDivisionY;
sal_uInt8 m_nPagePreviewRow; // Page Preview Row/Columns.
sal_uInt8 m_nPagePreviewCol; // Page Preview Row/Columns.
- sal_uInt8 m_nShadowCrsrFillMode; // FillMode for ShadowCrsr.
+ sal_uInt8 m_nShadowCursorFillMode; // FillMode for ShadowCursor.
bool m_bReadonly : 1; // Readonly-Doc.
bool m_bStarOneSetting : 1;// Prevent from UI automatics (no scrollbars in readonly documents).
bool m_bIsPagePreview : 1; // The preview mustn't print field/footnote/... shadings.
@@ -549,8 +549,8 @@ public:
bool IsPagePreview() const {return m_bIsPagePreview; }
void SetPagePreview(bool bSet) { m_bIsPagePreview= bSet; }
- sal_uInt8 GetShdwCrsrFillMode() const { return m_nShadowCrsrFillMode; }
- void SetShdwCrsrFillMode( sal_uInt8 nMode ) { m_nShadowCrsrFillMode = nMode; };
+ sal_uInt8 GetShdwCursorFillMode() const { return m_nShadowCursorFillMode; }
+ void SetShdwCursorFillMode( sal_uInt8 nMode ) { m_nShadowCursorFillMode = nMode; };
bool IsShowPlaceHolderFields() const { return m_bShowPlaceHolderFields; }
void SetShowPlaceHolderFields(bool bSet) { m_bShowPlaceHolderFields = bSet; }
@@ -602,7 +602,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt )
{
m_nUIOptions = rVOpt.m_nUIOptions;
m_nTableDestination = rVOpt.m_nTableDestination;
- m_nShadowCrsrFillMode = rVOpt.m_nShadowCrsrFillMode;
+ m_nShadowCursorFillMode = rVOpt.m_nShadowCursorFillMode;
}
// Helper function for checking HTML-capabilities.
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 254e4ec5b840..283ba948f009 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -53,7 +53,7 @@ class IDocumentListItems;
class IDocumentOutlineNodes;
class SfxPrinter;
class SfxProgress;
-class SwRootFrm;
+class SwRootFrame;
class SwNodes;
class SdrView;
class SfxItemPool;
@@ -67,10 +67,10 @@ class OutputDevice;
class SwLayIdle;
struct ShellResource;
class SwRegionRects;
-class SwFrm;
+class SwFrame;
class SvtAccessibilityOptions;
class SwPagePreviewLayout;
-class SwTextFrm;
+class SwTextFrame;
class BitmapEx;
struct SwAccessibilityOptions;
@@ -89,7 +89,7 @@ namespace vcl
// Currently the Preview flag is needed for DrawPage.
#define VSHELLFLAG_ISPREVIEW ((long)0x1)
#define VSHELLFLAG_SHARELAYOUT ((long)0x2)
-typedef std::shared_ptr<SwRootFrm> SwRootFrmPtr;
+typedef std::shared_ptr<SwRootFrame> SwRootFramePtr;
class SwViewShell;
class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
@@ -158,7 +158,7 @@ class SW_DLLPUBLIC SwViewShell : public sw::Ring<SwViewShell>
SdrPaintWindow* mpTargetPaintWindow;
VclPtr<OutputDevice> mpBufferedOut;
- SwRootFrmPtr mpLayout;
+ SwRootFramePtr mpLayout;
// Initialization; called by the diverse constructors.
SAL_DLLPRIVATE void Init( const SwViewOption *pNewOpt );
@@ -278,7 +278,7 @@ public:
// Invalidate first visible page for all Shells in ring.
void SetFirstVisPageInvalid();
- SwRootFrm *GetLayout() const;
+ SwRootFrame *GetLayout() const;
bool IsNewLayout() const; // Has Layout been loaded or created?
Size GetDocSize() const; // Get document size.
@@ -511,18 +511,18 @@ public:
@author OD
- @param _pFromTextFrm
+ @param _pFromTextFrame
input parameter - paragraph frame, for which the relation CONTENT_FLOWS_FROM
has to be invalidated.
If NULL, no CONTENT_FLOWS_FROM relation has to be invalidated
- @param _pToTextFrm
+ @param _pToTextFrame
input parameter - paragraph frame, for which the relation CONTENT_FLOWS_TO
has to be invalidated.
If NULL, no CONTENT_FLOWS_TO relation has to be invalidated
*/
- void InvalidateAccessibleParaFlowRelation( const SwTextFrm* _pFromTextFrm,
- const SwTextFrm* _pToTextFrm );
+ void InvalidateAccessibleParaFlowRelation( const SwTextFrame* _pFromTextFrame,
+ const SwTextFrame* _pToTextFrame );
/** invalidate text selection for paragraphs
@@ -537,10 +537,10 @@ public:
@author OD
- @param rTextFrm
+ @param rTextFrame
input parameter - paragraph frame, whose attributes have changed
*/
- void InvalidateAccessibleParaAttrs( const SwTextFrm& rTextFrm );
+ void InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame );
SwAccessibleMap* GetAccessibleMap();
@@ -589,7 +589,7 @@ class CurrShell
{
public:
SwViewShell *pPrev;
- SwRootFrm *pRoot;
+ SwRootFrame *pRoot;
CurrShell( SwViewShell *pNew );
~CurrShell();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 0e2da96efe14..701e9cd486ed 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -26,22 +26,22 @@
#include "swrect.hxx"
#include "swregion.hxx"
-class SwCrsrShell;
-class SwShellCrsr;
+class SwCursorShell;
+class SwShellCursor;
class SwTextInputField;
// From here classes/methods for non-text cursor.
-class SwVisCrsr
+class SwVisibleCursor
{
friend void _InitCore();
friend void _FinitCore();
bool m_bIsVisible;
- bool m_bIsDragCrsr;
+ bool m_bIsDragCursor;
- vcl::Cursor m_aTextCrsr;
- const SwCrsrShell* m_pCrsrShell;
+ vcl::Cursor m_aTextCursor;
+ const SwCursorShell* m_pCursorShell;
/// For LibreOfficeKit only - remember what page we were at the last time.
sal_uInt16 m_nPageLastTime;
@@ -49,14 +49,14 @@ class SwVisCrsr
void _SetPosAndShow();
public:
- SwVisCrsr( const SwCrsrShell * pCShell );
- ~SwVisCrsr();
+ SwVisibleCursor( const SwCursorShell * pCShell );
+ ~SwVisibleCursor();
void Show();
void Hide();
bool IsVisible() const { return m_bIsVisible; }
- void SetDragCrsr( bool bFlag = true ) { m_bIsDragCrsr = bFlag; }
+ void SetDragCursor( bool bFlag = true ) { m_bIsDragCursor = bFlag; }
};
// From here classes/methods for selections.
@@ -72,7 +72,7 @@ class SwSelPaintRects : public SwRects
static long s_nPixPtX, s_nPixPtY;
static MapMode *s_pMapMode;
- const SwCrsrShell* m_pCursorShell;
+ const SwCursorShell* m_pCursorShell;
#if HAVE_FEATURE_DESKTOP || defined(ANDROID)
sdr::overlay::OverlayObject* m_pCursorOverlay;
@@ -88,14 +88,14 @@ class SwSelPaintRects : public SwRects
void HighlightInputField();
public:
- SwSelPaintRects( const SwCrsrShell& rCSh );
+ SwSelPaintRects( const SwCursorShell& rCSh );
virtual ~SwSelPaintRects();
virtual void FillRects() = 0;
/// Fill rStart and rEnd with a rectangle that represents the start and end for selection handles.
virtual void FillStartEnd(SwRect& rStart, SwRect& rEnd) const = 0;
- // #i75172# in SwCrsrShell::CreateCrsr() the content of SwSelPaintRects is exchanged. To
+ // #i75172# in SwCursorShell::CreateCursor() the content of SwSelPaintRects is exchanged. To
// make a complete swap access to m_pCursorOverlay is needed there
void swapContent(SwSelPaintRects& rSwap);
@@ -108,14 +108,14 @@ public:
m_bShowTextInputFieldOverlay = bShow;
}
- const SwCrsrShell* GetShell() const { return m_pCursorShell; }
+ const SwCursorShell* GetShell() const { return m_pCursorShell; }
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
static void Get1PixelInLogic( const SwViewShell& rSh,
long* pX = nullptr, long* pY = nullptr );
};
-class SwShellCrsr : public virtual SwCursor, public SwSelPaintRects
+class SwShellCursor : public virtual SwCursor, public SwSelPaintRects
{
private:
// Document positions of start/end characters of a SSelection.
@@ -126,12 +126,12 @@ private:
using SwCursor::UpDown;
public:
- SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos );
- SwShellCrsr( const SwCrsrShell& rCrsrSh, const SwPosition &rPos,
+ SwShellCursor( const SwCursorShell& rCursorSh, const SwPosition &rPos );
+ SwShellCursor( const SwCursorShell& rCursorSh, const SwPosition &rPos,
const Point& rPtPos, SwPaM* pRing = nullptr );
// note: *intentionally* links the new shell cursor into the old one's Ring
- SwShellCrsr( SwShellCrsr& );
- virtual ~SwShellCrsr();
+ SwShellCursor( SwShellCursor& );
+ virtual ~SwShellCursor();
virtual void FillRects() override; // For Table- und normal cursors.
/// @see SwSelPaintRects::FillStartEnd(), override for text selections.
@@ -164,10 +164,10 @@ public:
virtual bool IsReadOnlyAvailable() const override;
- DECL_FIXEDMEMPOOL_NEWDEL( SwShellCrsr )
+ DECL_FIXEDMEMPOOL_NEWDEL( SwShellCursor )
};
-class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCursor
+class SwShellTableCursor : public virtual SwShellCursor, public virtual SwTableCursor
{
/// Left edge of the selection start (top left cell).
SwRect m_aStart;
@@ -178,11 +178,11 @@ class SwShellTableCrsr : public virtual SwShellCrsr, public virtual SwTableCurso
// it has to be deleted from the other one as well!!
public:
- SwShellTableCrsr( const SwCrsrShell& rCrsrSh, const SwPosition& rPos );
- SwShellTableCrsr( const SwCrsrShell& rCrsrSh,
+ SwShellTableCursor( const SwCursorShell& rCursorSh, const SwPosition& rPos );
+ SwShellTableCursor( const SwCursorShell& rCursorSh,
const SwPosition &rMkPos, const Point& rMkPt,
const SwPosition &rPtPos, const Point& rPtPt );
- virtual ~SwShellTableCrsr();
+ virtual ~SwShellTableCursor();
virtual void FillRects() override; // For table and normal cursor.
/// @see SwSelPaintRects::FillStartEnd(), override for table selections.
diff --git a/sw/qa/complex/writer/CheckBookmarks.java b/sw/qa/complex/writer/CheckBookmarks.java
index 9acb16aadbc6..a73af1a60cc5 100644
--- a/sw/qa/complex/writer/CheckBookmarks.java
+++ b/sw/qa/complex/writer/CheckBookmarks.java
@@ -153,35 +153,35 @@ public class CheckBookmarks {
xText.createTextCursor(),
"P" + nPara + "word" + nBookmark,
"P" + nPara + "word" + nBookmark);
- XTextCursor xWordCrsr = xText.createTextCursor();
- xWordCrsr.setString(" ");
+ XTextCursor xWordCursor = xText.createTextCursor();
+ xWordCursor.setString(" ");
}
- XTextCursor xParaCrsr = xText.createTextCursor();
- XTextRange xParaCrsrAsRange = UnoRuntime.queryInterface(
+ XTextCursor xParaCursor = xText.createTextCursor();
+ XTextRange xParaCursorAsRange = UnoRuntime.queryInterface(
XTextRange.class,
- xParaCrsr);
- xText.insertControlCharacter(xParaCrsrAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
+ xParaCursor);
+ xText.insertControlCharacter(xParaCursorAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
}
}
private void insertRandomParts(long seed)
{
java.util.Random rnd = new java.util.Random(seed);
- XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+ XTextCursor xCursor = m_xDoc.getText().createTextCursor();
for(int i=0; i<600; i++) {
- xCrsr.goRight((short)rnd.nextInt(100), false);
- xCrsr.setString(Long.toString(rnd.nextLong()));
+ xCursor.goRight((short)rnd.nextInt(100), false);
+ xCursor.setString(Long.toString(rnd.nextLong()));
}
}
private void deleteRandomParts(long seed)
{
java.util.Random rnd = new java.util.Random(seed);
- XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+ XTextCursor xCursor = m_xDoc.getText().createTextCursor();
for(int i=0; i<600; i++) {
- xCrsr.goRight((short)rnd.nextInt(100), false);
- xCrsr.goRight((short)rnd.nextInt(20), true);
- xCrsr.setString("");
+ xCursor.goRight((short)rnd.nextInt(100), false);
+ xCursor.goRight((short)rnd.nextInt(20), true);
+ xCursor.setString("");
}
}
@@ -189,13 +189,13 @@ public class CheckBookmarks {
{
XText xText = m_xDoc.getText();
java.util.Random rnd = new java.util.Random(seed);
- XTextCursor xCrsr = m_xDoc.getText().createTextCursor();
+ XTextCursor xCursor = m_xDoc.getText().createTextCursor();
for(int i=0; i<30; i++) {
- xCrsr.goRight((short)rnd.nextInt(300), false);
- XTextRange xCrsrAsRange = UnoRuntime.queryInterface(
+ xCursor.goRight((short)rnd.nextInt(300), false);
+ XTextRange xCursorAsRange = UnoRuntime.queryInterface(
XTextRange.class,
- xCrsr);
- xText.insertControlCharacter(xCrsrAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
+ xCursor);
+ xText.insertControlCharacter(xCursorAsRange, com.sun.star.text.ControlCharacter.PARAGRAPH_BREAK, false);
}
}
diff --git a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt b/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
index 063d392a489f..ba7ceabc2d89 100644
--- a/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
+++ b/sw/qa/complex/writer/testdocuments/TESTXMLID.odt
Binary files differ
diff --git a/sw/qa/core/macros-test.cxx b/sw/qa/core/macros-test.cxx
index 2223fd7e752f..6787d4f707bc 100644
--- a/sw/qa/core/macros-test.cxx
+++ b/sw/qa/core/macros-test.cxx
@@ -439,8 +439,8 @@ void SwMacrosTest::testFindReplace()
CPPUNIT_ASSERT(pTextDoc);
SwDoc *const pDoc = pTextDoc->GetDocShell()->GetDoc();
SwNodeIndex aIdx(pDoc->GetNodes().GetEndOfContent(), -1);
- // use a UnoCrsr so it will be corrected when deleting nodes
- auto pPaM(pDoc->CreateUnoCrsr(SwPosition(aIdx)));
+ // use a UnoCursor so it will be corrected when deleting nodes
+ auto pPaM(pDoc->CreateUnoCursor(SwPosition(aIdx)));
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
rIDCO.InsertString(*pPaM, "foo");
diff --git a/sw/qa/core/test_ToxTextGenerator.cxx b/sw/qa/core/test_ToxTextGenerator.cxx
index 2a565ee05a88..983f2ecfa8f4 100644
--- a/sw/qa/core/test_ToxTextGenerator.cxx
+++ b/sw/qa/core/test_ToxTextGenerator.cxx
@@ -108,7 +108,7 @@ class MockedToxTabStopTokenHandler : public ToxTabStopTokenHandler {
public:
virtual HandledTabStopToken
HandleTabStopToken(const SwFormToken& aToken, const SwTextNode& targetNode,
- const SwRootFrm *currentLayout) const override {
+ const SwRootFrame *currentLayout) const override {
(void)(aToken); (void)(targetNode); (void)(currentLayout); // avoid unused warnings.
return HandledTabStopToken();
}
@@ -128,7 +128,7 @@ public:
private:
SwChapterField
ObtainChapterField(SwChapterFieldType* chapterFieldType, const SwFormToken* chapterToken,
- const SwContentFrm* contentFrame, const SwContentNode *contentNode) const override {
+ const SwContentFrame* contentFrame, const SwContentNode *contentNode) const override {
// get rid of 'unused-parameters' warnings
(void)(chapterFieldType);(void)(chapterToken);(void)(contentFrame);(void)(contentNode);
return mChapterField;
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 09b3a95a429a..8a51f82b97df 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -303,7 +303,7 @@ private:
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
- SwRootFrm* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+ SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
pLayout->dumpAsXml(pXmlWriter);
// delete xml writer
diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx
index 64be393bf170..7aa34f374fea 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -459,20 +459,20 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
{
pWrtShell->SelAll(); // Selects A1.
- SwTextNode& rCellEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rCellEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
// fdo#72486 This was "Hello.", i.e. a single select-all selected the whole document, not just the cell only.
CPPUNIT_ASSERT_EQUAL(OUString("A1"), rCellEnd.GetText());
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCursor->Start()->nNode.GetNode());
CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
// This was "A1", i.e. Ctrl-A only selected the A1 cell of the table, not the whole document.
CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
@@ -480,11 +480,11 @@ DECLARE_ODFIMPORT_TEST(testFdo37606, "fdo37606.odt")
{
pWrtShell->SttEndDoc(false); // Go to the end of the doc.
pWrtShell->SelAll(); // And now that we're outside of the table, try Ctrl-A again.
- SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCursor->Start()->nNode.GetNode());
// This was "Hello", i.e. Ctrl-A did not select the starting table.
CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
@@ -534,16 +534,16 @@ DECLARE_ODFIMPORT_TEST(testFdo69862, "fdo69862.odt")
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
pWrtShell->SelAll(); // Selects A1.
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCursor->Start()->nNode.GetNode());
// This was "Footnote.", as Ctrl-A also selected footnotes, but it should not.
CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
CPPUNIT_ASSERT_EQUAL(OUString("H" "\x01" "ello."), rEnd.GetText());
}
@@ -553,16 +553,16 @@ DECLARE_ODFIMPORT_TEST(testFdo69979, "fdo69979.odt")
SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
CPPUNIT_ASSERT(pTextDoc);
SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
pWrtShell->SelAll(); // Selects A1.
pWrtShell->SelAll(); // Selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCrsr->Start()->nNode.GetNode());
+ SwTextNode& rStart = dynamic_cast<SwTextNode&>(pShellCursor->Start()->nNode.GetNode());
// This was "", as Ctrl-A also selected headers, but it should not.
CPPUNIT_ASSERT_EQUAL(OUString("A1"), rStart.GetText());
- SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
CPPUNIT_ASSERT_EQUAL(OUString("Hello."), rEnd.GetText());
}
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 858e6a4332fc..a975fff35ade 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -168,14 +168,14 @@ void SwTiledRenderingTest::testPostKeyEvent()
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// Did we manage to go after the first character?
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pShellCrsr->GetPoint()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pShellCursor->GetPoint()->nContent.GetIndex());
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYINPUT, 'x', 0);
pXTextDocument->postKeyEvent(LOK_KEYEVENT_KEYUP, 'x', 0);
// Did we manage to insert the character after the first one?
- CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("Axaa bbb."), pShellCursor->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
}
void SwTiledRenderingTest::testPostMouseEvent()
@@ -183,16 +183,16 @@ void SwTiledRenderingTest::testPostMouseEvent()
SwXTextDocument* pXTextDocument = createDoc("dummy.fodt");
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, /*bBasicCall=*/false);
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// Did we manage to go after the first character?
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pShellCrsr->GetPoint()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(1), pShellCursor->GetPoint()->nContent.GetIndex());
- Point aStart = pShellCrsr->GetSttPos();
+ Point aStart = pShellCursor->GetSttPos();
aStart.setX(aStart.getX() - 1000);
pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONDOWN, aStart.getX(), aStart.getY(), 1);
pXTextDocument->postMouseEvent(LOK_MOUSEEVENT_MOUSEBUTTONUP, aStart.getX(), aStart.getY(), 1);
// The new cursor position must be before the first word.
- CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), pShellCrsr->GetPoint()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), pShellCursor->GetPoint()->nContent.GetIndex());
}
void SwTiledRenderingTest::testSetTextSelection()
@@ -203,21 +203,21 @@ void SwTiledRenderingTest::testSetTextSelection()
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/false, 5, /*bBasicCall=*/false);
// Create a selection by on the word.
pWrtShell->SelWrd();
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// Did we indeed manage to select the second word?
- CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("bbb"), pShellCursor->GetText());
// Now use setTextSelection() to move the start of the selection 1000 twips left.
- Point aStart = pShellCrsr->GetSttPos();
+ Point aStart = pShellCursor->GetSttPos();
aStart.setX(aStart.getX() - 1000);
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_START, aStart.getX(), aStart.getY());
// The new selection must include the first word, too -- but not the ending dot.
- CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("Aaa bbb"), pShellCursor->GetText());
// Next: test that LOK_SETTEXTSELECTION_RESET + LOK_SETTEXTSELECTION_END can be used to create a selection.
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_RESET, aStart.getX(), aStart.getY());
pXTextDocument->setTextSelection(LOK_SETTEXTSELECTION_END, aStart.getX() + 1000, aStart.getY());
- CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("Aaa b"), pShellCursor->GetText());
}
void SwTiledRenderingTest::testGetTextSelection()
@@ -283,25 +283,25 @@ void SwTiledRenderingTest::testResetSelection()
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
// Select one character.
pWrtShell->Right(CRSR_SKIP_CHARS, /*bSelect=*/true, 1, /*bBasicCall=*/false);
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// We have a text selection.
- CPPUNIT_ASSERT(pShellCrsr->HasMark());
+ CPPUNIT_ASSERT(pShellCursor->HasMark());
pXTextDocument->resetSelection();
// We no longer have a text selection.
- CPPUNIT_ASSERT(!pShellCrsr->HasMark());
+ CPPUNIT_ASSERT(!pShellCursor->HasMark());
SdrPage* pPage = pWrtShell->GetDoc()->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
SdrObject* pObject = pPage->GetObj(0);
Point aPoint = pObject->GetSnapRect().Center();
// Select the shape.
- pWrtShell->EnterSelFrmMode(&aPoint);
+ pWrtShell->EnterSelFrameMode(&aPoint);
// We have a graphic selection.
- CPPUNIT_ASSERT(pWrtShell->IsSelFrmMode());
+ CPPUNIT_ASSERT(pWrtShell->IsSelFrameMode());
pXTextDocument->resetSelection();
// We no longer have a graphic selection.
- CPPUNIT_ASSERT(!pWrtShell->IsSelFrmMode());
+ CPPUNIT_ASSERT(!pWrtShell->IsSelFrameMode());
}
void lcl_search(bool bBackward)
@@ -321,12 +321,12 @@ void SwTiledRenderingTest::testSearch()
SwXTextDocument* pXTextDocument = createDoc("search.odt");
pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
- size_t nNode = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
+ size_t nNode = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
// First hit, in the second paragraph, before the shape.
lcl_search(false);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
- size_t nActual = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
+ size_t nActual = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
/// Make sure we get search result selection for normal find as well, not only find all.
CPPUNIT_ASSERT(!m_aSearchResultSelection.empty());
@@ -342,7 +342,7 @@ void SwTiledRenderingTest::testSearch()
// Last hit, in the last paragraph, after the shape.
lcl_search(false);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
- nActual = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
+ nActual = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 7, nActual);
// Now change direction and make sure that the first 2 hits are in the shape, but not the 3rd one.
@@ -352,7 +352,7 @@ void SwTiledRenderingTest::testSearch()
CPPUNIT_ASSERT(pWrtShell->GetDrawView()->GetTextEditObject());
lcl_search(true);
CPPUNIT_ASSERT(!pWrtShell->GetDrawView()->GetTextEditObject());
- nActual = pWrtShell->getShellCrsr(false)->Start()->nNode.GetNode().GetIndex();
+ nActual = pWrtShell->getShellCursor(false)->Start()->nNode.GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(nNode + 1, nActual);
comphelper::LibreOfficeKit::setActive(false);
@@ -364,9 +364,9 @@ void SwTiledRenderingTest::testSearchViewArea()
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
// Go to the second page, 1-based.
pWrtShell->GotoPage(2, false);
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// Get the ~top left corner of the second page.
- Point aPoint = pShellCrsr->GetSttPos();
+ Point aPoint = pShellCursor->GetSttPos();
// Go back to the first page, search while the cursor is there, but the
// visible area is the second page.
@@ -380,7 +380,7 @@ void SwTiledRenderingTest::testSearchViewArea()
}));
comphelper::dispatchCommand(".uno:ExecuteSearch", aPropertyValues);
// This was just "Heading", i.e. SwView::SearchAndWrap() did not search from only the top of the second page.
- CPPUNIT_ASSERT_EQUAL(OUString("Heading on second page"), pShellCrsr->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("Heading on second page"), pShellCursor->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
}
void SwTiledRenderingTest::testSearchTextFrame()
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx
index 89378366b41d..c69f3306a048 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -392,7 +392,7 @@ void SwUiWriterTest::testTdf67238()
sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
//insert a 3X3 table in the newly created document
SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
- const SwTable& rTbl = pWrtShell->InsertTable(TableOpt, 3, 3);
+ const SwTable& rTable = pWrtShell->InsertTable(TableOpt, 3, 3);
//checking for the rows and columns
uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getRows()->getCount());
@@ -403,78 +403,78 @@ void SwUiWriterTest::testTdf67238()
//making the table protected
pWrtShell->ProtectCells();
//checking each cell's protection, it should be protected
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
//undo the changes, make cells [un]protected
rUndoManager.Undo();
//checking each cell's protection, it should be [un]protected
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
//redo the changes, make cells protected
rUndoManager.Redo();
//checking each cell's protection, it should be protected
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
//moving the cursor to the starting of the document
pWrtShell->SttDoc();
//making the table [un]protected
pWrtShell->SelTable();
pWrtShell->UnProtectCells();
//checking each cell's protection, it should be [un]protected
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
//undo the changes, make cells protected
rUndoManager.Undo();
//checking each cell's protection, it should be protected
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
//redo the changes, make cells [un]protected
rUndoManager.Redo();
//checking each cell's protection, it should be [un]protected
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
- CPPUNIT_ASSERT(!((rTbl.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("A3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("B3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C1"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C2"))->GetFrameFormat()->GetProtect()).IsContentProtected());
+ CPPUNIT_ASSERT(!((rTable.GetTableBox("C3"))->GetFrameFormat()->GetProtect()).IsContentProtected());
}
void SwUiWriterTest::testFdo75110()
@@ -499,8 +499,8 @@ void SwUiWriterTest::testFdo75898()
pWrtShell->InsertRow(1, true);
// Now check if the table has 3 lines.
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
- SwTableNode* pTableNode = pShellCrsr->Start()->nNode.GetNode().FindTableNode();
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+ SwTableNode* pTableNode = pShellCursor->Start()->nNode.GetNode().FindTableNode();
// This was 1, when doing the same using the UI, Writer even crashed.
CPPUNIT_ASSERT_EQUAL(static_cast<size_t>(3), pTableNode->GetTable().GetTabLines().size());
}
@@ -535,8 +535,8 @@ void SwUiWriterTest::testFdo69893()
pWrtShell->SelAll(); // A1 is empty -> selects the whole table.
pWrtShell->SelAll(); // Selects the whole document.
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
- SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCrsr->End()->nNode.GetNode());
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
+ SwTextNode& rEnd = dynamic_cast<SwTextNode&>(pShellCursor->End()->nNode.GetNode());
// Selection did not include the para after table, this was "B1".
CPPUNIT_ASSERT_EQUAL(OUString("Para after table."), rEnd.GetText());
}
@@ -581,12 +581,12 @@ void SwUiWriterTest::testImportRTF()
// Insert the RTF at the cursor position.
OString aData = "{\\rtf1 Hello world!\\par}";
SvMemoryStream aStream(const_cast<sal_Char*>(aData.getStr()), aData.getLength(), StreamMode::READ);
- SwReader aReader(aStream, OUString(), OUString(), *pWrtShell->GetCrsr());
+ SwReader aReader(aStream, OUString(), OUString(), *pWrtShell->GetCursor());
Reader* pRTFReader = SwReaderWriter::GetReader(READER_WRITER_RTF);
CPPUNIT_ASSERT(pRTFReader != nullptr);
CPPUNIT_ASSERT_EQUAL(sal_uLong(0), aReader.Read(*pRTFReader));
- sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
+ sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(OUString("fooHello world!"), pDoc->GetNodes()[nIndex - 1]->GetTextNode()->GetText());
CPPUNIT_ASSERT_EQUAL(OUString("bar"), pDoc->GetNodes()[nIndex]->GetTextNode()->GetText());
}
@@ -790,9 +790,9 @@ void SwUiWriterTest::testCommentedWord()
pWrtShell->SelWrd();
// Make sure that not only the word, but its comment anchor is also selected.
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(false);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(false);
// This was 9, only "word", not "word<anchor character>" was selected.
- CPPUNIT_ASSERT_EQUAL(sal_Int32(10), pShellCrsr->End()->nContent.GetIndex());
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(10), pShellCursor->End()->nContent.GetIndex());
// Test that getAnchor() points to "word", not to an empty string.
uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY);
@@ -937,13 +937,13 @@ void SwUiWriterTest::testAutoCorr()
//Normal AutoCorrect
pWrtShell->Insert("tset");
pWrtShell->AutoCorrect(corr, cIns);
- sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
+ sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(OUString("Test "), static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex])->GetText());
//AutoCorrect with change style to bolt
pWrtShell->Insert("Bolt");
pWrtShell->AutoCorrect(corr, cIns);
- nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
+ nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
const uno::Reference< text::XTextRange > xRun = getRun(getParagraph(1), 2);
CPPUNIT_ASSERT_EQUAL(OUString("Bolt"), xRun->getString());
CPPUNIT_ASSERT_EQUAL(OUString("Arial"), getProperty<OUString>(xRun, "CharFontName"));
@@ -1475,35 +1475,35 @@ void SwUiWriterTest::testTextSearch()
{
// Create a new empty Writer document
SwDoc* pDoc = createDoc();
- SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
+ SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
// Insert some text
- rIDCO.InsertString(*pCrsr, "Hello World This is a test");
+ rIDCO.InsertString(*pCursor, "Hello World This is a test");
// Use cursor to select part of text
for (int i = 0; i < 10; i++) {
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
}
- pCrsr->SetMark();
+ pCursor->SetMark();
for(int i = 0; i < 4; i++) {
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
}
//Checking that the proper selection is made
- CPPUNIT_ASSERT_EQUAL(OUString("This"), pCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("This"), pCursor->GetText());
// Apply a "Bold" attribute to selection
SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
- rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
+ rIDCO.InsertPoolItem(*pCursor, aWeightItem);
//making another selection of text
for (int i = 0; i < 7; i++) {
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
}
- pCrsr->SetMark();
+ pCursor->SetMark();
for(int i = 0; i < 5; i++) {
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
}
//Checking that the proper selection is made
- CPPUNIT_ASSERT_EQUAL(OUString("Hello"), pCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("Hello"), pCursor->GetText());
// Apply a "Bold" attribute to selection
- rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
+ rIDCO.InsertPoolItem(*pCursor, aWeightItem);
//Performing Search Operation and also covering the UNO coverage for setProperty
uno::Reference<util::XSearchable> xSearch(mxComponent, uno::UNO_QUERY);
uno::Reference<util::XSearchDescriptor> xSearchDes(xSearch->createSearchDescriptor(), uno::UNO_QUERY);
@@ -1742,25 +1742,25 @@ void SwUiWriterTest::testTdf60967()
{
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
+ SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
pWrtShell->ChangeHeaderOrFooter("Default Style", true, true, true);
//Inserting table
SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
pWrtShell->InsertTable(TableOpt, 2, 2);
//getting the cursor's position just after the table insert
- SwPosition aPosAfterTable(*(pCrsr->GetPoint()));
+ SwPosition aPosAfterTable(*(pCursor->GetPoint()));
//moving cursor to B2 (bottom right cell)
- pCrsr->Move(fnMoveBackward);
- SwPosition aPosInTable(*(pCrsr->GetPoint()));
+ pCursor->Move(fnMoveBackward);
+ SwPosition aPosInTable(*(pCursor->GetPoint()));
//deleting paragraph following table with Ctrl+Shift+Del
sal_Int32 val = pWrtShell->DelToEndOfSentence();
CPPUNIT_ASSERT_EQUAL(sal_Int32(1), val);
//getting the cursor's position just after the paragraph deletion
- SwPosition aPosAfterDel(*(pCrsr->GetPoint()));
+ SwPosition aPosAfterDel(*(pCursor->GetPoint()));
//moving cursor forward to check whether there is any node following the table, BTW there should not be any such node
- pCrsr->Move(fnMoveForward);
- SwPosition aPosMoveAfterDel(*(pCrsr->GetPoint()));
+ pCursor->Move(fnMoveForward);
+ SwPosition aPosMoveAfterDel(*(pCursor->GetPoint()));
//checking the positions to verify that the paragraph is actually deleted
CPPUNIT_ASSERT(aPosInTable == aPosAfterDel);
CPPUNIT_ASSERT(aPosInTable == aPosMoveAfterDel);
@@ -1768,12 +1768,12 @@ void SwUiWriterTest::testTdf60967()
rUndoManager.Undo();
{
//paragraph *text node* should be back
- SwPosition aPosAfterUndo(*(pCrsr->GetPoint()));
+ SwPosition aPosAfterUndo(*(pCursor->GetPoint()));
//after undo aPosAfterTable increases the node position by one, since this contains the position *text node* so aPosAfterUndo should be less than aPosAfterTable
CPPUNIT_ASSERT(aPosAfterTable > aPosAfterUndo);
//moving cursor forward to check whether there is any node following the paragraph, BTW there should not be any such node as paragraph node is the last one in header
- pCrsr->Move(fnMoveForward);
- SwPosition aPosMoveAfterUndo(*(pCrsr->GetPoint()));
+ pCursor->Move(fnMoveForward);
+ SwPosition aPosMoveAfterUndo(*(pCursor->GetPoint()));
//checking positions to verify that paragraph node is the last one and we are paragraph node only
CPPUNIT_ASSERT(aPosAfterTable > aPosMoveAfterUndo);
CPPUNIT_ASSERT(aPosMoveAfterUndo == aPosAfterUndo);
@@ -1781,12 +1781,12 @@ void SwUiWriterTest::testTdf60967()
//Redo the changes
rUndoManager.Redo();
//paragraph *text node* should not be there
- SwPosition aPosAfterRedo(*(pCrsr->GetPoint()));
+ SwPosition aPosAfterRedo(*(pCursor->GetPoint()));
//position should be exactly same as it was after deletion of *text node*
CPPUNIT_ASSERT(aPosMoveAfterDel == aPosAfterRedo);
//moving the cursor forward, but it should not actually move as there is no *text node* after the table due to this same position is expected after move as it was before move
- pCrsr->Move(fnMoveForward);
- SwPosition aPosAfterUndoMove(*(pCrsr->GetPoint()));
+ pCursor->Move(fnMoveForward);
+ SwPosition aPosAfterUndoMove(*(pCursor->GetPoint()));
CPPUNIT_ASSERT(aPosAfterUndoMove == aPosAfterRedo);
}
@@ -1812,15 +1812,15 @@ void SwUiWriterTest::testSearchWithTransliterate()
SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_DIACRITICS_CTL;
//transliteration option set so that at least one of the search strings is not found
sal_uLong case1 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
- CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCrsr->GetText());
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true);
+ CPPUNIT_ASSERT_EQUAL(OUString(""),pShellCursor->GetText());
CPPUNIT_ASSERT_EQUAL(0,(int)case1);
SearchOpt.searchString = "paragraph";
SearchOpt.transliterateFlags = css::i18n::TransliterationModulesExtra::IGNORE_KASHIDA_CTL;
//transliteration option set so that all search strings are found
sal_uLong case2 = pWrtShell->SearchPattern(SearchOpt,true,DOCPOS_START,DOCPOS_END);
- pShellCrsr = pWrtShell->getShellCrsr(true);
- CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCrsr->GetText());
+ pShellCursor = pWrtShell->getShellCursor(true);
+ CPPUNIT_ASSERT_EQUAL(OUString("paragraph"),pShellCursor->GetText());
CPPUNIT_ASSERT_EQUAL(1,(int)case2);
}
@@ -1838,7 +1838,7 @@ void SwUiWriterTest::testTdf77342()
{
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
+ SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
//inserting first footnote
pWrtShell->InsertFootnote("");
SwFieldType* pField = pWrtShell->GetFieldType(0, RES_GETREFFLD);
@@ -1851,15 +1851,15 @@ void SwUiWriterTest::testTdf77342()
//inserting second footnote
pWrtShell->InsertFootnote("");
pWrtShell->SttDoc();
- pCrsr->Move(fnMoveForward);
+ pCursor->Move(fnMoveForward);
//inserting reference field 2
SwGetRefField aField2(pRefType, OUString(""), REF_FOOTNOTE, sal_uInt16(1), REF_CONTENT);
pWrtShell->Insert(aField2);
//inserting third footnote
pWrtShell->InsertFootnote("");
pWrtShell->SttDoc();
- pCrsr->Move(fnMoveForward);
- pCrsr->Move(fnMoveForward);
+ pCursor->Move(fnMoveForward);
+ pCursor->Move(fnMoveForward);
//inserting reference field 3
SwGetRefField aField3(pRefType, OUString(""), REF_FOOTNOTE, sal_uInt16(2), REF_CONTENT);
pWrtShell->Insert(aField3);
@@ -1873,37 +1873,37 @@ void SwUiWriterTest::testTdf77342()
pClpDoc->getIDocumentFieldsAccess().LockExpFields();
//selecting reference field 2 and reference field 3 and footnote 1 and footnote 2
//selection is such that more than one and not all footnotes and ref fields are selected
- pCrsr->Move(fnMoveBackward);
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
//start marking
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward);
- pCrsr->Move(fnMoveForward);
- pCrsr->Move(fnMoveForward);
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward);
+ pCursor->Move(fnMoveForward);
+ pCursor->Move(fnMoveForward);
//copying the selection to clipboard
pWrtShell->Copy(pClpDoc);
//deleting selection mark after copy
- pCrsr->DeleteMark();
+ pCursor->DeleteMark();
//checking that the footnotes reference fields have same values after copy operation
uno::Any aAny;
sal_uInt16 aFormat;
//reference field 1
pWrtShell->SttDoc();
- SwField* pRef1 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ SwField* pRef1 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pRef1->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pRef1->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(0)), aAny);
//reference field 2
- pCrsr->Move(fnMoveForward);
- SwField* pRef2 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pRef2 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pRef2->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pRef2->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//reference field 3
- pCrsr->Move(fnMoveForward);
- SwField* pRef3 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pRef3 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pRef3->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pRef3->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
@@ -1915,67 +1915,67 @@ void SwUiWriterTest::testTdf77342()
//checking the fields, both new and old, for proper values
pWrtShell->SttDoc();
//old reference field 1
- SwField* pOldRef11 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ SwField* pOldRef11 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef11->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef11->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(0)), aAny);
//old reference field 2
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef12 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef12 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef12->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef12->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//old reference field 3
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef13 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef13 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef13->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef13->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(2)), aAny);
//old footnote 1
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd1 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote1 = pTextNd1->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd1 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote1 = pTextNd1->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote1(pFootnote1->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), rFootnote1.GetNumber());
SwTextFootnote* pTFNote1 = static_cast<SwTextFootnote*> (pFootnote1);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pTFNote1->GetSeqRefNo());
//old footnote 2
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd2 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote2 = pTextNd2->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd2 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote2 = pTextNd2->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote2(pFootnote2->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), rFootnote2.GetNumber());
SwTextFootnote* pTFNote2 = static_cast<SwTextFootnote*> (pFootnote2);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTFNote2->GetSeqRefNo());
//old footnote 3
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd3 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote3 = pTextNd3->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd3 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote3 = pTextNd3->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote3(pFootnote3->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(3), rFootnote3.GetNumber());
SwTextFootnote* pTFNote3 = static_cast<SwTextFootnote*> (pFootnote3);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pTFNote3->GetSeqRefNo());
//new reference field 1
- pCrsr->Move(fnMoveForward);
- SwField* pNewRef11 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pNewRef11 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pNewRef11->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pNewRef11->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//new reference field 2
- pCrsr->Move(fnMoveForward);
- SwField* pNewRef12 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pNewRef12 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pNewRef12->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pNewRef12->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(3)), aAny);
//new footnote 1
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd4 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote4 = pTextNd4->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd4 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote4 = pTextNd4->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote4(pFootnote4->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), rFootnote4.GetNumber());
SwTextFootnote* pTFNote4 = static_cast<SwTextFootnote*> (pFootnote4);
@@ -1987,89 +1987,89 @@ void SwUiWriterTest::testTdf77342()
//checking the fields, both new and old, for proper values
pWrtShell->SttDoc();
//new reference field 1
- SwField* pNewRef21 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ SwField* pNewRef21 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pNewRef21->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pNewRef21->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//new reference field 2
- pCrsr->Move(fnMoveForward);
- SwField* pNewRef22 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pNewRef22 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pNewRef22->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pNewRef22->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(4)), aAny);
//new footnote 1
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd11 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote11 = pTextNd11->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd11 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote11 = pTextNd11->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote11(pFootnote11->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), rFootnote11.GetNumber());
SwTextFootnote* pTFNote11 = static_cast<SwTextFootnote*> (pFootnote11);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), pTFNote11->GetSeqRefNo());
//old reference field 1
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef21 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef21 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef21->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef21->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(0)), aAny);
//old reference field 2
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef22 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef22 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef22->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef22->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//old reference field 3
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef23 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef23 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef23->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef23->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(2)), aAny);
//old footnote 1
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd12 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote12 = pTextNd12->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd12 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote12 = pTextNd12->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote12(pFootnote12->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), rFootnote12.GetNumber());
SwTextFootnote* pTFNote12 = static_cast<SwTextFootnote*> (pFootnote12);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(2), pTFNote12->GetSeqRefNo());
//old footnote 2
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd13 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote13 = pTextNd13->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd13 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote13 = pTextNd13->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote13(pFootnote13->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(3), rFootnote13.GetNumber());
SwTextFootnote* pTFNote13 = static_cast<SwTextFootnote*> (pFootnote13);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(1), pTFNote13->GetSeqRefNo());
//old footnote 3
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd14 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote14 = pTextNd14->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd14 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote14 = pTextNd14->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote14(pFootnote14->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(4), rFootnote14.GetNumber());
SwTextFootnote* pTFNote14 = static_cast<SwTextFootnote*> (pFootnote14);
CPPUNIT_ASSERT_EQUAL(sal_uInt16(0), pTFNote14->GetSeqRefNo());
//old reference field 4
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef24 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef24 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef24->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef24->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(1)), aAny);
//old reference field 5
- pCrsr->Move(fnMoveForward);
- SwField* pOldRef25 = SwCrsrShell::GetFieldAtCrsr(pCrsr, true);
+ pCursor->Move(fnMoveForward);
+ SwField* pOldRef25 = SwCursorShell::GetFieldAtCursor(pCursor, true);
aFormat = pOldRef25->GetFormat();
CPPUNIT_ASSERT_EQUAL(sal_uInt16(REF_CONTENT), aFormat);
pOldRef25->QueryValue(aAny, sal_uInt16(FIELD_PROP_SHORT1));
CPPUNIT_ASSERT_EQUAL(uno::makeAny(sal_uInt16(3)), aAny);
//old footnote 4
- pCrsr->Move(fnMoveForward);
- SwTextNode* pTextNd15 = pCrsr->GetNode().GetTextNode();
- SwTextAttr* const pFootnote15 = pTextNd15->GetTextAttrForCharAt(pCrsr->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
+ pCursor->Move(fnMoveForward);
+ SwTextNode* pTextNd15 = pCursor->GetNode().GetTextNode();
+ SwTextAttr* const pFootnote15 = pTextNd15->GetTextAttrForCharAt(pCursor->GetPoint()->nContent.GetIndex(), RES_TXTATR_FTN);
const SwFormatFootnote& rFootnote15(pFootnote15->GetFootnote());
CPPUNIT_ASSERT_EQUAL(sal_uInt16(5), rFootnote15.GetNumber());
SwTextFootnote* pTFNote15 = static_cast<SwTextFootnote*> (pFootnote15);
@@ -2107,7 +2107,7 @@ void SwUiWriterTest::testTdf74363()
const sal_Unicode cChar = ' ';
pWrtShell->AutoCorrect(corr, cChar);
//The word should be capitalized due to autocorrect
- sal_uLong nIndex = pWrtShell->GetCrsr()->GetNode().GetIndex();
+ sal_uLong nIndex = pWrtShell->GetCursor()->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(OUString("Testing "), static_cast<SwTextNode*>(pDoc->GetNodes()[nIndex])->GetText());
}
@@ -2286,7 +2286,7 @@ void SwUiWriterTest::testTdf90808()
uno::Reference<text::XTextDocument> xTextDocument(mxComponent, uno::UNO_QUERY);
uno::Reference<text::XTextRange> xTextRange(xTextDocument->getText(), uno::UNO_QUERY);
uno::Reference<text::XText> xText(xTextRange->getText(), uno::UNO_QUERY);
- uno::Reference<text::XParagraphCursor> xCrsr(xText->createTextCursor(), uno::UNO_QUERY);
+ uno::Reference<text::XParagraphCursor> xCursor(xText->createTextCursor(), uno::UNO_QUERY);
//inserting text into document so that the paragraph is not empty
xText->setString("Hello World!");
uno::Reference<lang::XMultiServiceFactory> xFact(mxComponent, uno::UNO_QUERY);
@@ -2295,49 +2295,49 @@ void SwUiWriterTest::testTdf90808()
uno::Reference<container::XNamed> xHeadingName1(xHeadingBookmark1, uno::UNO_QUERY);
xHeadingName1->setName("__RefHeading__1");
//moving cursor to the starting of paragraph
- xCrsr->gotoStartOfParagraph(false);
+ xCursor->gotoStartOfParagraph(false);
//inserting the bookmark in paragraph
- xText->insertTextContent(xCrsr, xHeadingBookmark1, true);
+ xText->insertTextContent(xCursor, xHeadingBookmark1, true);
//creating bookmark 2
uno::Reference<text::XTextContent> xHeadingBookmark2(xFact->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY);
uno::Reference<container::XNamed> xHeadingName2(xHeadingBookmark2, uno::UNO_QUERY);
xHeadingName2->setName("__RefHeading__2");
//inserting the bookmark in same paragraph, at the end
//only one bookmark of this type is allowed in each paragraph an exception of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the other bookmark in same paragraph
- xCrsr->gotoEndOfParagraph(true);
- CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xHeadingBookmark2, true), css::lang::IllegalArgumentException);
+ xCursor->gotoEndOfParagraph(true);
+ CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCursor, xHeadingBookmark2, true), css::lang::IllegalArgumentException);
//now testing for __RefNumPara__
//creating bookmark 1
uno::Reference<text::XTextContent> xNumBookmark1(xFact->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY);
uno::Reference<container::XNamed> xNumName1(xNumBookmark1, uno::UNO_QUERY);
xNumName1->setName("__RefNumPara__1");
//moving cursor to the starting of paragraph
- xCrsr->gotoStartOfParagraph(false);
+ xCursor->gotoStartOfParagraph(false);
//inserting the bookmark in paragraph
- xText->insertTextContent(xCrsr, xNumBookmark1, true);
+ xText->insertTextContent(xCursor, xNumBookmark1, true);
//creating bookmark 2
uno::Reference<text::XTextContent> xNumBookmark2(xFact->createInstance("com.sun.star.text.Bookmark"), uno::UNO_QUERY);
uno::Reference<container::XNamed> xNumName2(xNumBookmark2, uno::UNO_QUERY);
xNumName2->setName("__RefNumPara__2");
//inserting the bookmark in same paragraph, at the end
//only one bookmark of this type is allowed in each paragraph an exception of com.sun.star.lang.IllegalArgumentException must be thrown when inserting the other bookmark in same paragraph
- xCrsr->gotoEndOfParagraph(true);
- CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCrsr, xNumBookmark2, true), css::lang::IllegalArgumentException);
+ xCursor->gotoEndOfParagraph(true);
+ CPPUNIT_ASSERT_THROW(xText->insertTextContent(xCursor, xNumBookmark2, true), css::lang::IllegalArgumentException);
}
void SwUiWriterTest::testTdf75137()
{
SwDoc* pDoc = createDoc();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwShellCrsr* pShellCrsr = pWrtShell->getShellCrsr(true);
+ SwShellCursor* pShellCursor = pWrtShell->getShellCursor(true);
pWrtShell->InsertFootnote("This is first footnote");
- sal_uLong firstIndex = pShellCrsr->GetNode().GetIndex();
- pShellCrsr->GotoFootnoteAnchor();
+ sal_uLong firstIndex = pShellCursor->GetNode().GetIndex();
+ pShellCursor->GotoFootnoteAnchor();
pWrtShell->InsertFootnote("This is second footnote");
pWrtShell->Up(false);
- sal_uLong secondIndex = pShellCrsr->GetNode().GetIndex();
+ sal_uLong secondIndex = pShellCursor->GetNode().GetIndex();
pWrtShell->Down(false);
- sal_uLong thirdIndex = pShellCrsr->GetNode().GetIndex();
+ sal_uLong thirdIndex = pShellCursor->GetNode().GetIndex();
CPPUNIT_ASSERT_EQUAL(firstIndex, thirdIndex);
CPPUNIT_ASSERT(firstIndex != secondIndex);
}
@@ -2349,34 +2349,34 @@ void SwUiWriterTest::testTdf83798()
pWrtShell->GotoNextTOXBase();
const SwTOXBase* pTOXBase = pWrtShell->GetCurTOX();
pWrtShell->UpdateTableOf(*pTOXBase);
- SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward, fnGoNode);
- CPPUNIT_ASSERT_EQUAL(OUString("Table of Contents"), pCrsr->GetText());
- pCrsr->DeleteMark();
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward, fnGoContent);
- CPPUNIT_ASSERT_EQUAL(OUString("1"), pCrsr->GetText());
- pCrsr->DeleteMark();
- pCrsr->Move(fnMoveForward, fnGoNode);
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward, fnGoContent);
- pCrsr->Move(fnMoveForward, fnGoContent);
- pCrsr->Move(fnMoveForward, fnGoContent);
- CPPUNIT_ASSERT_EQUAL(OUString("1.A"), pCrsr->GetText());
- pCrsr->DeleteMark();
- pCrsr->Move(fnMoveForward, fnGoNode);
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward, fnGoContent);
- CPPUNIT_ASSERT_EQUAL(OUString("2"), pCrsr->GetText());
- pCrsr->DeleteMark();
- pCrsr->Move(fnMoveForward, fnGoNode);
- pCrsr->SetMark();
- pCrsr->Move(fnMoveForward, fnGoContent);
- pCrsr->Move(fnMoveForward, fnGoContent);
- pCrsr->Move(fnMoveForward, fnGoContent);
- CPPUNIT_ASSERT_EQUAL(OUString("2.A"), pCrsr->GetText());
- pCrsr->DeleteMark();
+ SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward, fnGoNode);
+ CPPUNIT_ASSERT_EQUAL(OUString("Table of Contents"), pCursor->GetText());
+ pCursor->DeleteMark();
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward, fnGoContent);
+ CPPUNIT_ASSERT_EQUAL(OUString("1"), pCursor->GetText());
+ pCursor->DeleteMark();
+ pCursor->Move(fnMoveForward, fnGoNode);
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward, fnGoContent);
+ pCursor->Move(fnMoveForward, fnGoContent);
+ pCursor->Move(fnMoveForward, fnGoContent);
+ CPPUNIT_ASSERT_EQUAL(OUString("1.A"), pCursor->GetText());
+ pCursor->DeleteMark();
+ pCursor->Move(fnMoveForward, fnGoNode);
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward, fnGoContent);
+ CPPUNIT_ASSERT_EQUAL(OUString("2"), pCursor->GetText());
+ pCursor->DeleteMark();
+ pCursor->Move(fnMoveForward, fnGoNode);
+ pCursor->SetMark();
+ pCursor->Move(fnMoveForward, fnGoContent);
+ pCursor->Move(fnMoveForward, fnGoContent);
+ pCursor->Move(fnMoveForward, fnGoContent);
+ CPPUNIT_ASSERT_EQUAL(OUString("2.A"), pCursor->GetText());
+ pCursor->DeleteMark();
}
void SwUiWriterTest::testTdf89714()
@@ -2527,25 +2527,25 @@ void SwUiWriterTest::testUndoCharAttribute()
{
// Create a new empty Writer document
SwDoc* pDoc = createDoc();
- SwPaM* pCrsr = pDoc->GetEditShell()->GetCrsr();
+ SwPaM* pCursor = pDoc->GetEditShell()->GetCursor();
sw::UndoManager& rUndoManager = pDoc->GetUndoManager();
IDocumentContentOperations & rIDCO(pDoc->getIDocumentContentOperations());
// Insert some text
- rIDCO.InsertString(*pCrsr, "This will be bolded");
+ rIDCO.InsertString(*pCursor, "This will be bolded");
// Position of word 9876543210
// Use cursor to select part of text
- pCrsr->SetMark();
+ pCursor->SetMark();
for (int i = 0; i < 9; i++) {
- pCrsr->Move(fnMoveBackward);
+ pCursor->Move(fnMoveBackward);
}
// Check that correct text was selected
- CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCrsr->GetText());
+ CPPUNIT_ASSERT_EQUAL(OUString("be bolded"), pCursor->GetText());
// Apply a "Bold" attribute to selection
SvxWeightItem aWeightItem(WEIGHT_BOLD, RES_CHRATR_WEIGHT);
- rIDCO.InsertPoolItem(*pCrsr, aWeightItem);
+ rIDCO.InsertPoolItem(*pCursor, aWeightItem);
SfxItemSet aSet( pDoc->GetAttrPool(), RES_CHRATR_WEIGHT, RES_CHRATR_WEIGHT);
// Adds selected text's attributes to aSet
- pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
+ pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
SfxPoolItem const * pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
// Check that bold is active on the selection; checks if it's in aSet
CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), true);
@@ -2553,7 +2553,7 @@ void SwUiWriterTest::testUndoCharAttribute()
rUndoManager.Undo();
// Check that bold is no longer active
aSet.ClearItem(RES_CHRATR_WEIGHT);
- pCrsr->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
+ pCursor->GetNode().GetTextNode()->GetAttr(aSet, 10, 19);
pPoolItem = aSet.GetItem(RES_CHRATR_WEIGHT);
CPPUNIT_ASSERT_EQUAL((*pPoolItem == aWeightItem), false);
}
@@ -2639,7 +2639,7 @@ void SwUiWriterTest::testUnoCursorPointer()
SwDoc* const pDoc(pxDocDocument->GetDocShell()->GetDoc());
std::unique_ptr<SwNodeIndex> pIdx(new SwNodeIndex(pDoc->GetNodes().GetEndOfContent(), -1));
std::unique_ptr<SwPosition> pPos(new SwPosition(*pIdx));
- sw::UnoCursorPointer pCursor(pDoc->CreateUnoCrsr(*pPos));
+ sw::UnoCursorPointer pCursor(pDoc->CreateUnoCursor(*pPos));
CPPUNIT_ASSERT(static_cast<bool>(pCursor));
pPos.reset(); // we need to kill the SwPosition before disposing
pIdx.reset(); // we need to kill the SwNodeIndex before disposing
@@ -2733,16 +2733,16 @@ void SwUiWriterTest::testUnicodeNotationToggle()
uno::Sequence<beans::PropertyValue> aPropertyValues;
pWrtShell->EndPara();
- sOriginalDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+ sOriginalDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
CPPUNIT_ASSERT_EQUAL(OUString("uU+002b"), sOriginalDocString);
lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
sExpectedString = "u+";
- sDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+ sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
CPPUNIT_ASSERT( sDocString.equals(sExpectedString) );
lcl_dispatchCommand(mxComponent, ".uno:UnicodeNotationToggle", aPropertyValues);
- sDocString = pWrtShell->GetCrsr()->GetNode().GetTextNode()->GetText();
+ sDocString = pWrtShell->GetCursor()->GetNode().GetTextNode()->GetText();
CPPUNIT_ASSERT( sDocString.equals(sOriginalDocString) );
}
@@ -2790,7 +2790,7 @@ void SwUiWriterTest::testTdf88986()
// Create the item set that is normally passed to the insert frame dialog.
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
- SwFlyFrmAttrMgr aMgr(true, pWrtShell, FRMMGR_TYPE_TEXT);
+ SwFlyFrameAttrMgr aMgr(true, pWrtShell, FRMMGR_TYPE_TEXT);
SfxItemSet aSet = aShell.CreateInsertFrameItemSet(aMgr);
// This was missing along with the gradient and other tables.
@@ -2810,8 +2810,8 @@ void SwUiWriterTest::testTdf87922()
sal_Int32 nLength = rText.getLength();
SwDrawTextInfo aDrawTextInfo(pWrtShell, *pWrtShell->GetOut(), pScriptInfo, rText, nIndex, nLength);
// Root -> page -> body -> text.
- SwTextFrm* pTextFrm = static_cast<SwTextFrm*>(pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower());
- aDrawTextInfo.SetFrm(pTextFrm);
+ SwTextFrame* pTextFrame = static_cast<SwTextFrame*>(pWrtShell->GetLayout()->GetLower()->GetLower()->GetLower());
+ aDrawTextInfo.SetFrame(pTextFrame);
// If no color background color is found, assume white.
Color* pColor = sw::GetActiveRetoucheColor();
@@ -2878,7 +2878,7 @@ void SwUiWriterTest::testTdf92648()
// and the text boxes haven't got zero height
for (std::set<const SwFrameFormat*>::iterator it=aTextBoxes.begin(); it!=aTextBoxes.end(); ++it)
{
- SwFormatFrmSize aSize((*it)->GetFrmSize());
+ SwFormatFrameSize aSize((*it)->GetFrameSize());
CPPUNIT_ASSERT(aSize.GetHeight() != 0);
}
}
diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi
index 7d81beefad35..2508c2fc7b9b 100644
--- a/sw/sdi/_tabsh.sdi
+++ b/sw/sdi/_tabsh.sdi
@@ -313,7 +313,7 @@ interface BaseTextTable
SID_ATTR_BORDER // status()
[
ExecMethod = Execute ;
- StateMethod = GetFrmBorderState ;
+ StateMethod = GetFrameBorderState ;
GroupId = GID_TABLE;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index 8faf03b222ff..64315c280bbc 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -60,16 +60,16 @@ bool SwAccessibleCell::IsSelected()
assert(GetMap());
const SwViewShell *pVSh = GetMap()->GetShell();
assert(pVSh);
- if( dynamic_cast<const SwCrsrShell*>( pVSh) != nullptr )
+ if( dynamic_cast<const SwCursorShell*>( pVSh) != nullptr )
{
- const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
+ const SwCursorShell *pCSh = static_cast< const SwCursorShell * >( pVSh );
if( pCSh->IsTableMode() )
{
- const SwCellFrm *pCFrm =
- static_cast< const SwCellFrm * >( GetFrm() );
+ const SwCellFrame *pCFrame =
+ static_cast< const SwCellFrame * >( GetFrame() );
SwTableBox *pBox =
- const_cast< SwTableBox *>( pCFrm->GetTabBox() );
- SwSelBoxes const& rBoxes(pCSh->GetTableCrsr()->GetSelectedBoxes());
+ const_cast< SwTableBox *>( pCFrame->GetTabBox() );
+ SwSelBoxes const& rBoxes(pCSh->GetTableCursor()->GetSelectedBoxes());
bRet = rBoxes.find(pBox) != rBoxes.end();
}
}
@@ -84,7 +84,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
// SELECTABLE
const SwViewShell *pVSh = GetMap()->GetShell();
assert(pVSh);
- if( dynamic_cast<const SwCrsrShell*>( pVSh) != nullptr )
+ if( dynamic_cast<const SwCursorShell*>( pVSh) != nullptr )
rStateSet.AddState( AccessibleStateType::SELECTABLE );
//Add resizable state to table cell.
rStateSet.AddState( AccessibleStateType::RESIZABLE );
@@ -100,13 +100,13 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
}
SwAccessibleCell::SwAccessibleCell( SwAccessibleMap *pInitMap,
- const SwCellFrm *pCellFrm )
- : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrm )
+ const SwCellFrame *pCellFrame )
+ : SwAccessibleContext( pInitMap, AccessibleRole::TABLE_CELL, pCellFrame )
, aSelectionHelper( *this )
, bIsSelected( false )
{
SolarMutexGuard aGuard;
- OUString sBoxName( pCellFrm->GetTabBox()->GetName() );
+ OUString sBoxName( pCellFrame->GetTabBox()->GetName() );
SetName( sBoxName );
bIsSelected = IsSelected();
@@ -151,16 +151,16 @@ bool SwAccessibleCell::_InvalidateMyCursorPos()
return bChanged;
}
-bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
+bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrame *pFrame )
{
bool bChanged = false;
- const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *GetMap() );
+ const SwAccessibleChildSList aVisList( GetVisArea(), *pFrame, *GetMap() );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() )
{
const SwAccessibleChild& rLower = *aIter;
- const SwFrm *pLower = rLower.GetSwFrm();
+ const SwFrame *pLower = rLower.GetSwFrame();
if( pLower )
{
if( rLower.IsAccessible( GetMap()->GetShell()->IsPreview() ) )
@@ -169,7 +169,7 @@ bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
GetMap()->GetContextImpl( pLower, false ) );
if( xAccImpl.is() )
{
- assert(xAccImpl->GetFrm()->IsCellFrm());
+ assert(xAccImpl->GetFrame()->IsCellFrame());
bChanged = static_cast< SwAccessibleCell *>(
xAccImpl.get() )->_InvalidateMyCursorPos();
}
@@ -195,9 +195,9 @@ void SwAccessibleCell::_InvalidateCursorPos()
if (IsSelected())
{
const SwAccessibleChild aChild( GetChild( *(GetMap()), 0 ) );
- if( aChild.IsValid() && aChild.GetSwFrm() )
+ if( aChild.IsValid() && aChild.GetSwFrame() )
{
- ::rtl::Reference < SwAccessibleContext > xChildImpl( GetMap()->GetContextImpl( aChild.GetSwFrm()) );
+ ::rtl::Reference < SwAccessibleContext > xChildImpl( GetMap()->GetContextImpl( aChild.GetSwFrame()) );
if (xChildImpl.is())
{
AccessibleEventObject aEvent;
@@ -208,16 +208,16 @@ void SwAccessibleCell::_InvalidateCursorPos()
}
}
- const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
- assert(pParent->IsTabFrm());
- const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( pParent );
- if( pTabFrm->IsFollow() )
- pTabFrm = pTabFrm->FindMaster();
+ const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
+ assert(pParent->IsTabFrame());
+ const SwTabFrame *pTabFrame = static_cast< const SwTabFrame * >( pParent );
+ if( pTabFrame->IsFollow() )
+ pTabFrame = pTabFrame->FindMaster();
- while( pTabFrm )
+ while( pTabFrame )
{
- _InvalidateChildrenCursorPos( pTabFrm );
- pTabFrm = pTabFrm->GetFollow();
+ _InvalidateChildrenCursorPos( pTabFrame );
+ pTabFrame = pTabFrame->GetFollow();
}
if (m_pAccTable.is())
{
@@ -265,21 +265,21 @@ uno::Sequence< OUString > SAL_CALL SwAccessibleCell::getSupportedServiceNames()
void SwAccessibleCell::Dispose( bool bRecursive )
{
- const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
+ const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pParent, false ) );
if( xAccImpl.is() )
- xAccImpl->DisposeChild( SwAccessibleChild(GetFrm()), bRecursive );
+ xAccImpl->DisposeChild( SwAccessibleChild(GetFrame()), bRecursive );
SwAccessibleContext::Dispose( bRecursive );
}
void SwAccessibleCell::InvalidatePosOrSize( const SwRect& rOldBox )
{
- const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
+ const SwFrame *pParent = GetParent( SwAccessibleChild(GetFrame()), IsInPagePreview() );
::rtl::Reference< SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pParent, false ) );
if( xAccImpl.is() )
- xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrm()), rOldBox );
+ xAccImpl->InvalidateChildPosOrSize( SwAccessibleChild(GetFrame()), rOldBox );
SwAccessibleContext::InvalidatePosOrSize( rOldBox );
}
@@ -339,11 +339,11 @@ uno::Sequence< sal_Int8 > SAL_CALL SwAccessibleCell::getImplementationId()
SwFrameFormat* SwAccessibleCell::GetTableBoxFormat() const
{
- assert(GetFrm());
- assert(GetFrm()->IsCellFrm());
+ assert(GetFrame());
+ assert(GetFrame()->IsCellFrame());
- const SwCellFrm* pCellFrm = static_cast<const SwCellFrm*>( GetFrm() );
- return pCellFrm->GetTabBox()->GetFrameFormat();
+ const SwCellFrame* pCellFrame = static_cast<const SwCellFrame*>( GetFrame() );
+ return pCellFrame->GetTabBox()->GetFrameFormat();
}
//Implement TableCell currentValue
@@ -437,7 +437,7 @@ sal_Int32 SAL_CALL SwAccessibleCell::getBackground()
{
SolarMutexGuard g;
- const SvxBrushItem &rBack = GetFrm()->GetAttrSet()->GetBackground();
+ const SvxBrushItem &rBack = GetFrame()->GetAttrSet()->GetBackground();
sal_uInt32 crBack = rBack.GetColor().GetColor();
if (COL_AUTO == crBack)
diff --git a/sw/source/core/access/acccell.hxx b/sw/source/core/access/acccell.hxx
index 6814270b172b..6d66f33e35b9 100644
--- a/sw/source/core/access/acccell.hxx
+++ b/sw/source/core/access/acccell.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/accessibility/XAccessibleValue.hpp>
#include <accselectionhelper.hxx>
-class SwCellFrm;
+class SwCellFrame;
class SwAccessibleTable;
class SwFrameFormat;
@@ -40,7 +40,7 @@ class SwAccessibleCell : public SwAccessibleContext,
bool IsSelected();
bool _InvalidateMyCursorPos();
- bool _InvalidateChildrenCursorPos( const SwFrm *pFrm );
+ bool _InvalidateChildrenCursorPos( const SwFrame *pFrame );
rtl::Reference<SwAccessibleTable> m_pAccTable;
@@ -54,7 +54,7 @@ protected:
virtual ~SwAccessibleCell();
public:
- SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrm *pCellFrm );
+ SwAccessibleCell( SwAccessibleMap* pInitMap, const SwCellFrame *pCellFrame );
virtual bool HasCursor() override; // required by map to remember that object
@@ -85,7 +85,7 @@ public:
virtual void Dispose( bool bRecursive = false ) override;
- virtual void InvalidatePosOrSize( const SwRect& rFrm ) override;
+ virtual void InvalidatePosOrSize( const SwRect& rFrame ) override;
// XInterface
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index f10e16acd7dc..e200104967dc 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -97,43 +97,43 @@ vcl::Window *SwAccessibleContext::GetWindow()
}
// get SwViewShell from accessibility map, and cast to cursor shell
-SwCrsrShell* SwAccessibleContext::GetCrsrShell()
+SwCursorShell* SwAccessibleContext::GetCursorShell()
{
- SwCrsrShell* pCrsrShell;
+ SwCursorShell* pCursorShell;
SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : nullptr;
OSL_ENSURE( pViewShell, "no view shell" );
- if( pViewShell && dynamic_cast<const SwCrsrShell*>( pViewShell) != nullptr )
- pCrsrShell = static_cast<SwCrsrShell*>( pViewShell );
+ if( pViewShell && dynamic_cast<const SwCursorShell*>( pViewShell) != nullptr )
+ pCursorShell = static_cast<SwCursorShell*>( pViewShell );
else
- pCrsrShell = nullptr;
+ pCursorShell = nullptr;
- return pCrsrShell;
+ return pCursorShell;
}
-const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
+const SwCursorShell* SwAccessibleContext::GetCursorShell() const
{
- // just like non-const GetCrsrShell
- const SwCrsrShell* pCrsrShell;
+ // just like non-const GetCursorShell
+ const SwCursorShell* pCursorShell;
const SwViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : nullptr;
OSL_ENSURE( pViewShell, "no view shell" );
- if( pViewShell && dynamic_cast<const SwCrsrShell*>( pViewShell) != nullptr )
- pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell );
+ if( pViewShell && dynamic_cast<const SwCursorShell*>( pViewShell) != nullptr )
+ pCursorShell = static_cast<const SwCursorShell*>( pViewShell );
else
- pCrsrShell = nullptr;
+ pCursorShell = nullptr;
- return pCrsrShell;
+ return pCursorShell;
}
enum class Action { NONE, SCROLLED, SCROLLED_WITHIN,
SCROLLED_IN, SCROLLED_OUT };
-void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
+void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame,
const SwRect& rOldVisArea )
{
const SwRect& rNewVisArea = GetVisArea();
- const bool bVisibleChildrenOnly = SwAccessibleChild( pFrm ).IsVisibleChildrenOnly();
+ const bool bVisibleChildrenOnly = SwAccessibleChild( pFrame ).IsVisibleChildrenOnly();
- const SwAccessibleChildSList aList( *pFrm, *(GetMap()) );
+ const SwAccessibleChildSList aList( *pFrame, *(GetMap()) );
SwAccessibleChildSList::const_iterator aIter( aList.begin() );
while( aIter != aList.end() )
{
@@ -182,11 +182,11 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
}
if( Action::NONE != eAction )
{
- if ( rLower.GetSwFrm() )
+ if ( rLower.GetSwFrame() )
{
OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
- const SwFrm* pLower( rLower.GetSwFrm() );
+ const SwFrame* pLower( rLower.GetSwFrame() );
::rtl::Reference< SwAccessibleContext > xAccImpl =
GetMap()->GetContextImpl( pLower );
if( xAccImpl.is() )
@@ -256,13 +256,13 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
}
}
}
- else if ( rLower.GetSwFrm() &&
+ else if ( rLower.GetSwFrame() &&
( !bVisibleChildrenOnly ||
aBox.IsOver( rOldVisArea ) ||
aBox.IsOver( rNewVisArea ) ) )
{
// There are no unaccessible SdrObjects that need to be notified
- ChildrenScrolled( rLower.GetSwFrm(), rOldVisArea );
+ ChildrenScrolled( rLower.GetSwFrame(), rOldVisArea );
}
++aIter;
}
@@ -272,7 +272,7 @@ void SwAccessibleContext::Scrolled( const SwRect& rOldVisArea )
{
SetVisArea( GetMap()->GetVisArea() );
- ChildrenScrolled( GetFrm(), rOldVisArea );
+ ChildrenScrolled( GetFrame(), rOldVisArea );
bool bIsOldShowingState;
bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -291,7 +291,7 @@ void SwAccessibleContext::ScrolledWithin( const SwRect& rOldVisArea )
{
SetVisArea( GetMap()->GetVisArea() );
- ChildrenScrolled( GetFrm(), rOldVisArea );
+ ChildrenScrolled( GetFrame(), rOldVisArea );
FireVisibleDataEvent();
}
@@ -305,7 +305,7 @@ void SwAccessibleContext::ScrolledIn()
"Vis area of child is wrong. Did it exist already?" );
// Send child event at parent. That's all we have to do here.
- const SwFrm* pParent = GetParent();
+ const SwFrame* pParent = GetParent();
::rtl::Reference< SwAccessibleContext > xParentImpl(
GetMap()->GetContextImpl( pParent, false ) );
uno::Reference < XAccessibleContext > xThis( this );
@@ -341,7 +341,7 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
// because this call will only dispose children that are in the
// new vis area. The children we want to dispose however are in the
// old vis area all.
- ChildrenScrolled( GetFrm(), rOldVisArea );
+ ChildrenScrolled( GetFrame(), rOldVisArea );
// Broadcast a state changed event for the showing state.
// It might be that the child is freshly created just to send
@@ -350,16 +350,16 @@ void SwAccessibleContext::ScrolledOut( const SwRect& rOldVisArea )
}
// #i27301# - use new type definition for <_nStates>
-void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
+void SwAccessibleContext::InvalidateChildrenStates( const SwFrame* _pFrame,
AccessibleStates _nStates )
{
- const SwAccessibleChildSList aVisList( GetVisArea(), *_pFrm, *(GetMap()) );
+ const SwAccessibleChildSList aVisList( GetVisArea(), *_pFrame, *(GetMap()) );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() )
{
const SwAccessibleChild& rLower = *aIter;
- const SwFrm* pLower = rLower.GetSwFrm();
+ const SwFrame* pLower = rLower.GetSwFrame();
if( pLower )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
@@ -383,15 +383,15 @@ void SwAccessibleContext::InvalidateChildrenStates( const SwFrm* _pFrm,
}
}
-void SwAccessibleContext::DisposeChildren( const SwFrm *pFrm,
+void SwAccessibleContext::DisposeChildren( const SwFrame *pFrame,
bool bRecursive )
{
- const SwAccessibleChildSList aVisList( GetVisArea(), *pFrm, *(GetMap()) );
+ const SwAccessibleChildSList aVisList( GetVisArea(), *pFrame, *(GetMap()) );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() )
{
const SwAccessibleChild& rLower = *aIter;
- const SwFrm* pLower = rLower.GetSwFrm();
+ const SwFrame* pLower = rLower.GetSwFrame();
if( pLower )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
@@ -432,8 +432,8 @@ void SwAccessibleContext::_InvalidateFocus()
void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
{
- OSL_ENSURE( GetFrm(), "fire event for disposed frame?" );
- if( !GetFrm() )
+ OSL_ENSURE( GetFrame(), "fire event for disposed frame?" );
+ if( !GetFrame() )
return;
if( !rEvent.Source.is() )
@@ -512,7 +512,7 @@ bool SwAccessibleContext::IsEditableState()
SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *const pMap,
sal_Int16 const nRole,
- const SwFrm *pF )
+ const SwFrame *pF )
: SwAccessibleFrame( pMap->GetVisArea().SVRect(), pF,
pMap->GetShell()->IsPreview() )
, m_pMap( pMap )
@@ -528,7 +528,7 @@ SwAccessibleContext::SwAccessibleContext( SwAccessibleMap *const pMap,
SwAccessibleContext::~SwAccessibleContext()
{
SolarMutexGuard aGuard;
- RemoveFrmFromAccessibleMap();
+ RemoveFrameFromAccessibleMap();
}
uno::Reference< XAccessibleContext > SAL_CALL
@@ -575,10 +575,10 @@ uno::Reference< XAccessible> SAL_CALL
}
uno::Reference< XAccessible > xChild;
- if( aChild.GetSwFrm() )
+ if( aChild.GetSwFrame() )
{
::rtl::Reference < SwAccessibleContext > xChildImpl(
- GetMap()->GetContextImpl( aChild.GetSwFrm(), !m_isDisposing ) );
+ GetMap()->GetContextImpl( aChild.GetSwFrame(), !m_isDisposing ) );
if( xChildImpl.is() )
{
xChildImpl->SetParent( this );
@@ -608,7 +608,7 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent()
CHECK_FOR_DEFUNC( XAccessibleContext )
- const SwFrm *pUpper = GetParent();
+ const SwFrame *pUpper = GetParent();
OSL_ENSURE( pUpper != nullptr || m_isDisposing, "no upper found" );
uno::Reference< XAccessible > xAcc;
@@ -633,7 +633,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
CHECK_FOR_DEFUNC( XAccessibleContext )
- const SwFrm *pUpper = GetParent();
+ const SwFrame *pUpper = GetParent();
OSL_ENSURE( pUpper != nullptr || m_isDisposing, "no upper found" );
sal_Int32 nIndex = -1;
@@ -643,7 +643,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent()
GetMap()->GetContextImpl(pUpper, !m_isDisposing) );
OSL_ENSURE( xAccImpl.is() || m_isDisposing, "no parent found" );
if( xAccImpl.is() )
- nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
+ nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrame()) );
}
return nIndex;
@@ -776,18 +776,18 @@ uno::Reference< XAccessible > SAL_CALL SwAccessibleContext::getAccessibleAtPoint
CHECK_FOR_WINDOW( XAccessibleComponent, pWin )
Point aPixPoint( aPoint.X, aPoint.Y ); // px rel to parent
- if( !GetFrm()->IsRootFrm() )
+ if( !GetFrame()->IsRootFrame() )
{
- SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root
+ SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
Point aPixPos( GetMap()->CoreToPixel( aLogBounds.SVRect() ).TopLeft() );
aPixPoint.setX(aPixPoint.getX() + aPixPos.getX());
aPixPoint.setY(aPixPoint.getY() + aPixPos.getY());
}
const SwAccessibleChild aChild( GetChildAtPixel( aPixPoint, *(GetMap()) ) );
- if( aChild.GetSwFrm() )
+ if( aChild.GetSwFrame() )
{
- xAcc = GetMap()->GetContext( aChild.GetSwFrm() );
+ xAcc = GetMap()->GetContext( aChild.GetSwFrame() );
}
else if( aChild.GetDrawObject() )
{
@@ -826,30 +826,30 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(bool bRelative)
CHECK_FOR_DEFUNC( XAccessibleComponent )
- const SwFrm *pParent = GetParent();
+ const SwFrame *pParent = GetParent();
OSL_ENSURE( pParent, "no Parent found" );
vcl::Window *pWin = GetWindow();
CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent )
- SwRect aLogBounds( GetBounds( *(GetMap()), GetFrm() ) ); // twip rel to doc root
+ SwRect aLogBounds( GetBounds( *(GetMap()), GetFrame() ) ); // twip rel to doc root
Rectangle aPixBounds( 0, 0, 0, 0 );
- if( GetFrm()->IsPageFrm() &&
- static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() )
+ if( GetFrame()->IsPageFrame() &&
+ static_cast < const SwPageFrame * >( GetFrame() )->IsEmptyPage() )
{
OSL_ENSURE( GetShell()->IsPreview(), "empty page accessible?" );
if( GetShell()->IsPreview() )
{
// adjust method call <GetMap()->GetPreviewPageSize()>
sal_uInt16 nPageNum =
- static_cast < const SwPageFrm * >( GetFrm() )->GetPhyPageNum();
+ static_cast < const SwPageFrame * >( GetFrame() )->GetPhyPageNum();
aLogBounds.SSize( GetMap()->GetPreviewPageSize( nPageNum ) );
}
}
if( !aLogBounds.IsEmpty() )
{
aPixBounds = GetMap()->CoreToPixel( aLogBounds.SVRect() );
- if( !pParent->IsRootFrm() && bRelative)
+ if( !pParent->IsRootFrame() && bRelative)
{
SwRect aParentLogBounds( GetBounds( *(GetMap()), pParent ) ); // twip rel to doc root
Point aParentPixPos( GetMap()->CoreToPixel( aParentLogBounds.SVRect() ).TopLeft() );
@@ -910,30 +910,30 @@ void SAL_CALL SwAccessibleContext::grabFocus()
CHECK_FOR_DEFUNC( XAccessibleContext );
- if( GetFrm()->IsFlyFrm() )
+ if( GetFrame()->IsFlyFrame() )
{
const SdrObject *pObj =
- static_cast < const SwFlyFrm * >( GetFrm() )->GetVirtDrawObj();
+ static_cast < const SwFlyFrame * >( GetFrame() )->GetVirtDrawObj();
if( pObj )
Select( const_cast < SdrObject * >( pObj ), false );
}
else
{
- const SwContentFrm *pCFrm = nullptr;
- if( GetFrm()->IsContentFrm() )
- pCFrm = static_cast< const SwContentFrm * >( GetFrm() );
- else if( GetFrm()->IsLayoutFrm() )
- pCFrm = static_cast< const SwLayoutFrm * >( GetFrm() )->ContainsContent();
+ const SwContentFrame *pCFrame = nullptr;
+ if( GetFrame()->IsContentFrame() )
+ pCFrame = static_cast< const SwContentFrame * >( GetFrame() );
+ else if( GetFrame()->IsLayoutFrame() )
+ pCFrame = static_cast< const SwLayoutFrame * >( GetFrame() )->ContainsContent();
- if( pCFrm && pCFrm->IsTextFrm() )
+ if( pCFrame && pCFrame->IsTextFrame() )
{
- const SwTextFrm *pTextFrm = static_cast< const SwTextFrm * >( pCFrm );
- const SwTextNode *pTextNd = pTextFrm->GetTextNode();
+ const SwTextFrame *pTextFrame = static_cast< const SwTextFrame * >( pCFrame );
+ const SwTextNode *pTextNd = pTextFrame->GetTextNode();
if( pTextNd )
{
// create pam for selection
SwIndex aIndex( const_cast< SwTextNode * >( pTextNd ),
- pTextFrm->GetOfst() );
+ pTextFrame->GetOfst() );
SwPosition aStartPos( *pTextNd, aIndex );
SwPaM aPaM( aStartPos );
@@ -1026,7 +1026,7 @@ void SwAccessibleContext::Dispose( bool bRecursive )
{
SolarMutexGuard aGuard;
- OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+ OSL_ENSURE( GetFrame() && GetMap(), "already disposed" );
OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
"invalid vis area for dispose" );
@@ -1034,7 +1034,7 @@ void SwAccessibleContext::Dispose( bool bRecursive )
// dispose children
if( bRecursive )
- DisposeChildren( GetFrm(), bRecursive );
+ DisposeChildren( GetFrame(), bRecursive );
// get parent
uno::Reference< XAccessible > xParent( GetWeakParent() );
@@ -1065,58 +1065,58 @@ void SwAccessibleContext::Dispose( bool bRecursive )
m_nClientId = 0;
}
- RemoveFrmFromAccessibleMap();
- ClearFrm();
+ RemoveFrameFromAccessibleMap();
+ ClearFrame();
m_pMap = nullptr;
m_isDisposing = false;
}
-void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
+void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrameOrObj,
bool bRecursive )
{
SolarMutexGuard aGuard;
- if ( IsShowing( *(GetMap()), rChildFrmOrObj ) ||
- rChildFrmOrObj.AlwaysIncludeAsChild() ||
- !SwAccessibleChild( GetFrm() ).IsVisibleChildrenOnly() )
+ if ( IsShowing( *(GetMap()), rChildFrameOrObj ) ||
+ rChildFrameOrObj.AlwaysIncludeAsChild() ||
+ !SwAccessibleChild( GetFrame() ).IsVisibleChildrenOnly() )
{
// If the object could have existed before, than there is nothing to do,
// because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
- if( rChildFrmOrObj.GetSwFrm() )
+ if( rChildFrameOrObj.GetSwFrame() )
{
::rtl::Reference< SwAccessibleContext > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
xAccImpl->Dispose( bRecursive );
}
- else if ( rChildFrmOrObj.GetDrawObject() )
+ else if ( rChildFrameOrObj.GetDrawObject() )
{
::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
this );
- DisposeShape( rChildFrmOrObj.GetDrawObject(),
+ DisposeShape( rChildFrameOrObj.GetDrawObject(),
xAccImpl.get() );
}
- else if ( rChildFrmOrObj.GetWindow() )
+ else if ( rChildFrameOrObj.GetWindow() )
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc =
- rChildFrmOrObj.GetWindow()->GetAccessible();
+ rChildFrameOrObj.GetWindow()->GetAccessible();
aEvent.OldValue <<= xAcc;
FireAccessibleEvent( aEvent );
}
}
- else if( bRecursive && rChildFrmOrObj.GetSwFrm() )
- DisposeChildren( rChildFrmOrObj.GetSwFrm(), bRecursive );
+ else if( bRecursive && rChildFrameOrObj.GetSwFrame() )
+ DisposeChildren( rChildFrameOrObj.GetSwFrame(), bRecursive );
}
void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
{
SolarMutexGuard aGuard;
- OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
+ OSL_ENSURE( GetFrame() && !GetFrame()->Frame().IsEmpty(), "context should have a size" );
bool bIsOldShowingState;
bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -1144,47 +1144,47 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
}
void SwAccessibleContext::InvalidateChildPosOrSize(
- const SwAccessibleChild& rChildFrmOrObj,
- const SwRect& rOldFrm )
+ const SwAccessibleChild& rChildFrameOrObj,
+ const SwRect& rOldFrame )
{
SolarMutexGuard aGuard;
- OSL_ENSURE( !rChildFrmOrObj.GetSwFrm() ||
- !rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(),
+ OSL_ENSURE( !rChildFrameOrObj.GetSwFrame() ||
+ !rChildFrameOrObj.GetSwFrame()->Frame().IsEmpty(),
"child context should have a size" );
- if ( rChildFrmOrObj.AlwaysIncludeAsChild() )
+ if ( rChildFrameOrObj.AlwaysIncludeAsChild() )
{
// nothing to do;
return;
}
- const bool bVisibleChildrenOnly = SwAccessibleChild( GetFrm() ).IsVisibleChildrenOnly();
- const bool bNew = rOldFrm.IsEmpty() ||
- ( rOldFrm.Left() == 0 && rOldFrm.Top() == 0 );
- if( IsShowing( *(GetMap()), rChildFrmOrObj ) )
+ const bool bVisibleChildrenOnly = SwAccessibleChild( GetFrame() ).IsVisibleChildrenOnly();
+ const bool bNew = rOldFrame.IsEmpty() ||
+ ( rOldFrame.Left() == 0 && rOldFrame.Top() == 0 );
+ if( IsShowing( *(GetMap()), rChildFrameOrObj ) )
{
// If the object could have existed before, than there is nothing to do,
// because no wrapper exists now and therefore no one is interested to
// get notified of the movement.
- if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrm )) )
+ if( bNew || (bVisibleChildrenOnly && !IsShowing( rOldFrame )) )
{
- if( rChildFrmOrObj.GetSwFrm() )
+ if( rChildFrameOrObj.GetSwFrame() )
{
// The frame becomes visible. A child event must be send.
::rtl::Reference< SwAccessibleContext > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
xAccImpl->ScrolledIn();
}
- else if ( rChildFrmOrObj.GetDrawObject() )
+ else if ( rChildFrameOrObj.GetDrawObject() )
{
::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
this );
// #i37790#
if ( xAccImpl.is() )
{
- ScrolledInShape( rChildFrmOrObj.GetDrawObject(),
+ ScrolledInShape( rChildFrameOrObj.GetDrawObject(),
xAccImpl.get() );
}
else
@@ -1192,11 +1192,11 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
}
}
- else if ( rChildFrmOrObj.GetWindow() )
+ else if ( rChildFrameOrObj.GetWindow() )
{
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= (rChildFrmOrObj.GetWindow()->GetAccessible());
+ aEvent.NewValue <<= (rChildFrameOrObj.GetWindow()->GetAccessible());
FireAccessibleEvent( aEvent );
}
}
@@ -1208,24 +1208,24 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
// no notifications for grandchildren are required. If the are
// grandgrandchildren, they would be notified by the layout.
if( bVisibleChildrenOnly &&
- !bNew && IsShowing( rOldFrm ) )
+ !bNew && IsShowing( rOldFrame ) )
{
- if( rChildFrmOrObj.GetSwFrm() )
+ if( rChildFrameOrObj.GetSwFrame() )
{
::rtl::Reference< SwAccessibleContext > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetSwFrm() );
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetSwFrame() );
xAccImpl->SetParent( this );
xAccImpl->Dispose( true );
}
- else if ( rChildFrmOrObj.GetDrawObject() )
+ else if ( rChildFrameOrObj.GetDrawObject() )
{
::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
- GetMap()->GetContextImpl( rChildFrmOrObj.GetDrawObject(),
+ GetMap()->GetContextImpl( rChildFrameOrObj.GetDrawObject(),
this );
- DisposeShape( rChildFrmOrObj.GetDrawObject(),
+ DisposeShape( rChildFrameOrObj.GetDrawObject(),
xAccImpl.get() );
}
- else if ( rChildFrmOrObj.GetWindow() )
+ else if ( rChildFrameOrObj.GetWindow() )
{
OSL_FAIL( "<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <vcl::Window>." );
}
@@ -1292,7 +1292,7 @@ void SwAccessibleContext::InvalidateStates( AccessibleStates _nStates )
}
}
- InvalidateChildrenStates( GetFrm(), _nStates );
+ InvalidateChildrenStates( GetFrame(), _nStates );
}
}
@@ -1330,19 +1330,19 @@ bool SwAccessibleContext::HasCursor()
bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
bool bAdd )
{
- SwCrsrShell* pCrsrShell = GetCrsrShell();
- if( !pCrsrShell )
+ SwCursorShell* pCursorShell = GetCursorShell();
+ if( !pCursorShell )
return false;
- SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCrsrShell) != nullptr
- ? static_cast<SwFEShell*>( pCrsrShell )
+ SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCursorShell) != nullptr
+ ? static_cast<SwFEShell*>( pCursorShell )
: nullptr;
// Get rid of activated OLE object
if( pFEShell )
pFEShell->FinishOLEObj();
- SwWrtShell* pWrtShell = dynamic_cast<const SwWrtShell*>( pCrsrShell) != nullptr
- ? static_cast<SwWrtShell*>( pCrsrShell )
+ SwWrtShell* pWrtShell = dynamic_cast<const SwWrtShell*>( pCursorShell) != nullptr
+ ? static_cast<SwWrtShell*>( pCursorShell )
: nullptr;
bool bRet = false;
@@ -1360,28 +1360,28 @@ bool SwAccessibleContext::Select( SwPaM *pPaM, SdrObject *pObj,
{
// Get rid of frame selection. If there is one, make text cursor
// visible again.
- bool bCallShowCrsr = false;
- if( pFEShell && (pFEShell->IsFrmSelected() ||
+ bool bCallShowCursor = false;
+ if( pFEShell && (pFEShell->IsFrameSelected() ||
pFEShell->IsObjSelected()) )
{
Point aPt( LONG_MIN, LONG_MIN );
pFEShell->SelectObj( aPt );
- bCallShowCrsr = true;
+ bCallShowCursor = true;
}
- pCrsrShell->KillPams();
+ pCursorShell->KillPams();
if( pWrtShell && pPaM->HasMark() )
// We have to do this or SwWrtShell can't figure out that it needs
// to kill the selection later, when the user moves the cursor.
pWrtShell->SttSelect();
- pCrsrShell->SetSelection( *pPaM );
+ pCursorShell->SetSelection( *pPaM );
if( pPaM->HasMark() && *pPaM->GetPoint() == *pPaM->GetMark())
// Setting a "Selection" that starts and ends at the same spot
// should remove the selection rather than create an empty one, so
// that we get defined behavior if accessibility sets the cursor
// later.
- pCrsrShell->ClearMark();
- if( bCallShowCrsr )
- pCrsrShell->ShowCrsr();
+ pCursorShell->ClearMark();
+ if( bCallShowCursor )
+ pCursorShell->ShowCursor();
bRet = true;
}
@@ -1411,22 +1411,22 @@ OUString SwAccessibleContext::GetResource( sal_uInt16 nResId,
return sStr;
}
-void SwAccessibleContext::RemoveFrmFromAccessibleMap()
+void SwAccessibleContext::RemoveFrameFromAccessibleMap()
{
- if (m_isRegisteredAtAccessibleMap && GetFrm() && GetMap())
- GetMap()->RemoveContext( GetFrm() );
+ if (m_isRegisteredAtAccessibleMap && GetFrame() && GetMap())
+ GetMap()->RemoveContext( GetFrame() );
}
bool SwAccessibleContext::HasAdditionalAccessibleChildren()
{
bool bRet( false );
- if ( GetFrm()->IsTextFrm() )
+ if ( GetFrame()->IsTextFrame() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
{
- bRet = pPostItMgr->HasFrmConnectedSidebarWins( *(GetFrm()) );
+ bRet = pPostItMgr->HasFrameConnectedSidebarWins( *(GetFrame()) );
}
}
@@ -1438,13 +1438,13 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
{
vcl::Window* pAdditionalAccessibleChild( nullptr );
- if ( GetFrm()->IsTextFrm() )
+ if ( GetFrame()->IsTextFrame() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
{
pAdditionalAccessibleChild =
- pPostItMgr->GetSidebarWinForFrmByIndex( *(GetFrm()), nIndex );
+ pPostItMgr->GetSidebarWinForFrameByIndex( *(GetFrame()), nIndex );
}
}
@@ -1454,12 +1454,12 @@ vcl::Window* SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
/** #i88070# - get all additional accessible children */
void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector< vcl::Window* >* pChildren )
{
- if ( GetFrm()->IsTextFrm() )
+ if ( GetFrame()->IsTextFrame() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell()->GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
{
- pPostItMgr->GetAllSidebarWinForFrm( *(GetFrm()), pChildren );
+ pPostItMgr->GetAllSidebarWinForFrame( *(GetFrame()), pChildren );
}
}
}
diff --git a/sw/source/core/access/acccontext.hxx b/sw/source/core/access/acccontext.hxx
index e52daa569fed..e703bf4e6c29 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -31,7 +31,7 @@
namespace vcl { class Window; }
class SwAccessibleMap;
-class SwCrsrShell;
+class SwCursorShell;
class SdrObject;
class SwPaM;
namespace utl {
@@ -55,7 +55,7 @@ class SwAccessibleContext :
{
// The implements for the XAccessibleSelection interface has been
// 'externalized' and wants access to the protected members like
- // GetMap, GetChild, GetParent, and GetFrm.
+ // GetMap, GetChild, GetParent, and GetFrame.
friend class SwAccessibleSelectionHelper;
protected:
@@ -117,15 +117,15 @@ protected:
return GetMap()->GetShell();
}
- /** convenience method to get SwCrsrShell through accessibility map
- * @returns SwCrsrShell, or NULL if none is found */
- SwCrsrShell* GetCrsrShell();
- const SwCrsrShell* GetCrsrShell() const;
+ /** convenience method to get SwCursorShell through accessibility map
+ * @returns SwCursorShell, or NULL if none is found */
+ SwCursorShell* GetCursorShell();
+ const SwCursorShell* GetCursorShell() const;
// Notify all children that the vis area has changed.
- // The SwFrm might belong to the current object or to any other child or
+ // The SwFrame might belong to the current object or to any other child or
// grandchild.
- void ChildrenScrolled( const SwFrm *pFrm, const SwRect& rOldVisArea );
+ void ChildrenScrolled( const SwFrame *pFrame, const SwRect& rOldVisArea );
// The context's showing state changed. May only be called for context that
// exist even if they aren't visible.
@@ -140,15 +140,15 @@ protected:
// The context has to be removed while setting the vis area
void ScrolledOut( const SwRect& rOldVisArea );
- // Invalidate the states of all children of the specified SwFrm. The
- // SwFrm might belong the current object or to any child or grandchild!
+ // Invalidate the states of all children of the specified SwFrame. The
+ // SwFrame might belong the current object or to any child or grandchild!
// #i27301# - use new type definition for <_nStates>
- void InvalidateChildrenStates( const SwFrm* _pFrm,
+ void InvalidateChildrenStates( const SwFrame* _pFrame,
AccessibleStates _nStates );
- // Dispose children of the specified SwFrm. The SwFrm might belong to
+ // Dispose children of the specified SwFrame. The SwFrame might belong to
// the current object or to any other child or grandchild.
- void DisposeChildren( const SwFrm *pFrm,
+ void DisposeChildren( const SwFrame *pFrame,
bool bRecursive );
void DisposeShape( const SdrObject *pObj,
@@ -188,13 +188,13 @@ protected:
{
m_isRegisteredAtAccessibleMap = false;
}
- void RemoveFrmFromAccessibleMap();
+ void RemoveFrameFromAccessibleMap();
virtual ~SwAccessibleContext();
public:
SwAccessibleContext( SwAccessibleMap *m_pMap, sal_Int16 nRole,
- const SwFrm *pFrm );
+ const SwFrame *pFrame );
// XAccessible
@@ -319,14 +319,14 @@ public:
virtual void Dispose( bool bRecursive = false );
// The child object is not visible an longer and should be destroyed
- virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrmOrObj, bool bRecursive );
+ virtual void DisposeChild( const sw::access::SwAccessibleChild& rFrameOrObj, bool bRecursive );
// The object has been moved by the layout
- virtual void InvalidatePosOrSize( const SwRect& rFrm );
+ virtual void InvalidatePosOrSize( const SwRect& rFrame );
// The child object has been moved by the layout
- virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrmOrObj,
- const SwRect& rFrm );
+ virtual void InvalidateChildPosOrSize( const sw::access::SwAccessibleChild& rFrameOrObj,
+ const SwRect& rFrame );
// The content may have changed (but it hasn't to have changed)
void InvalidateContent();
@@ -386,7 +386,7 @@ public:
throw aExcept;
#define CHECK_FOR_DEFUNC_THIS( ifc, ths ) \
- if( !(GetFrm() && GetMap()) ) \
+ if( !(GetFrame() && GetMap()) ) \
{ \
css::uno::Reference < ifc > xThis( ths ); \
css::lang::DisposedException aExcept( \
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 08271f25bf16..2cb759a11876 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -93,7 +93,7 @@ void SwAccessibleDocumentBase::SetVisArea()
SwAccessibleFrame::SetVisArea( GetMap()->GetVisArea() );
// #i58139# - showing state of document view needs also be updated.
// Thus, call method <Scrolled(..)> instead of <ChildrenScrolled(..)>
- // ChildrenScrolled( GetFrm(), aOldVisArea );
+ // ChildrenScrolled( GetFrame(), aOldVisArea );
Scrolled( aOldVisArea );
}
}
@@ -382,7 +382,7 @@ SwAccessibleDocument::~SwAccessibleDocument()
void SwAccessibleDocument::Dispose( bool bRecursive )
{
- OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+ OSL_ENSURE( GetFrame() && GetMap(), "already disposed" );
vcl::Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : nullptr;
if( pWin )
@@ -559,12 +559,12 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
if (!pDoc)
return anyAtrribute;
- SwCrsrShell* pCrsrShell = GetCrsrShell();
- if( !pCrsrShell )
+ SwCursorShell* pCursorShell = GetCursorShell();
+ if( !pCursorShell )
return anyAtrribute;
- SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCrsrShell) != nullptr
- ? static_cast<SwFEShell*>( pCrsrShell )
+ SwFEShell* pFEShell = dynamic_cast<const SwFEShell*>( pCursorShell) != nullptr
+ ? static_cast<SwFEShell*>( pCursorShell )
: nullptr;
OUString sAttrName;
OUString sValue;
@@ -582,95 +582,95 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sValue += OUString::number( nPage ) ;
sAttrName = ";total-pages:";
sValue += sAttrName;
- sValue += OUString::number( pCrsrShell->GetPageCnt() ) ;
+ sValue += OUString::number( pCursorShell->GetPageCnt() ) ;
sValue += ";";
sAttrName = "line-number:";
- SwContentFrm* pCurrFrm = pCrsrShell->GetCurrFrm();
- SwPageFrm* pCurrPage=static_cast<SwFrm*>(pCurrFrm)->FindPageFrm();
+ SwContentFrame* pCurrFrame = pCursorShell->GetCurrFrame();
+ SwPageFrame* pCurrPage=static_cast<SwFrame*>(pCurrFrame)->FindPageFrame();
sal_uLong nLineNum = 0;
- SwTextFrm* pTextFrm = nullptr;
- SwTextFrm* pCurrTextFrm = nullptr;
- pTextFrm = static_cast< SwTextFrm* >(static_cast< SwPageFrm* > (pCurrPage)->ContainsContent());
- if (pCurrFrm->IsInFly())//such as, graphic,chart
+ SwTextFrame* pTextFrame = nullptr;
+ SwTextFrame* pCurrTextFrame = nullptr;
+ pTextFrame = static_cast< SwTextFrame* >(static_cast< SwPageFrame* > (pCurrPage)->ContainsContent());
+ if (pCurrFrame->IsInFly())//such as, graphic,chart
{
- SwFlyFrm *pFlyFrm = pCurrFrm->FindFlyFrm();
- const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+ SwFlyFrame *pFlyFrame = pCurrFrame->FindFlyFrame();
+ const SwFormatAnchor& rAnchor = pFlyFrame->GetFormat()->GetAnchor();
RndStdIds eAnchorId = rAnchor.GetAnchorId();
if(eAnchorId == FLY_AS_CHAR)
{
- const SwFrm *pSwFrm = pFlyFrm->GetAnchorFrm();
- if(pSwFrm->IsTextFrm())
- pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm*>(pSwFrm));
+ const SwFrame *pSwFrame = pFlyFrame->GetAnchorFrame();
+ if(pSwFrame->IsTextFrame())
+ pCurrTextFrame = const_cast<SwTextFrame*>(static_cast<const SwTextFrame*>(pSwFrame));
}
}
else
- pCurrTextFrm = const_cast<SwTextFrm*>(static_cast<const SwTextFrm* >(pCurrFrm));
+ pCurrTextFrame = const_cast<SwTextFrame*>(static_cast<const SwTextFrame* >(pCurrFrame));
//check whether the text frame where the Graph/OLE/Frame anchored is in the Header/Footer
- SwFrm* pFrm = pCurrTextFrm;
- while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
- pFrm = pFrm->GetUpper();
- if ( pFrm )
- pCurrTextFrm = nullptr;
+ SwFrame* pFrame = pCurrTextFrame;
+ while ( pFrame && !pFrame->IsHeaderFrame() && !pFrame->IsFooterFrame() )
+ pFrame = pFrame->GetUpper();
+ if ( pFrame )
+ pCurrTextFrame = nullptr;
//check shape
- if(pCrsrShell->Imp()->GetDrawView())
+ if(pCursorShell->Imp()->GetDrawView())
{
- const SdrMarkList &rMrkList = pCrsrShell->Imp()->GetDrawView()->GetMarkedObjectList();
+ const SdrMarkList &rMrkList = pCursorShell->Imp()->GetDrawView()->GetMarkedObjectList();
for ( size_t i = 0; i < rMrkList.GetMarkCount(); ++i )
{
SdrObject *pObj = rMrkList.GetMark(i)->GetMarkedSdrObj();
SwFrameFormat* pFormat = static_cast<SwDrawContact*>(pObj->GetUserCall())->GetFormat();
const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if( FLY_AS_CHAR != rAnchor.GetAnchorId() )
- pCurrTextFrm = nullptr;
+ pCurrTextFrame = nullptr;
}
}
//calculate line number
- if (pCurrTextFrm && pTextFrm)
+ if (pCurrTextFrame && pTextFrame)
{
- if (!(pCurrTextFrm->IsInTab() || pCurrTextFrm->IsInFootnote()))
+ if (!(pCurrTextFrame->IsInTab() || pCurrTextFrame->IsInFootnote()))
{
- while( pTextFrm != pCurrTextFrm )
+ while( pTextFrame != pCurrTextFrame )
{
//check header/footer
- pFrm = pTextFrm;
- while ( pFrm && !pFrm->IsHeaderFrm() && !pFrm->IsFooterFrm() )
- pFrm = pFrm->GetUpper();
- if ( pFrm )
+ pFrame = pTextFrame;
+ while ( pFrame && !pFrame->IsHeaderFrame() && !pFrame->IsFooterFrame() )
+ pFrame = pFrame->GetUpper();
+ if ( pFrame )
{
- pTextFrm = static_cast< SwTextFrm*>(pTextFrm->GetNextContentFrm());
+ pTextFrame = static_cast< SwTextFrame*>(pTextFrame->GetNextContentFrame());
continue;
}
- if (!(pTextFrm->IsInTab() || pTextFrm->IsInFootnote() || pTextFrm->IsInFly()))
- nLineNum += pTextFrm->GetThisLines();
- pTextFrm = static_cast< SwTextFrm* >(pTextFrm ->GetNextContentFrm());
+ if (!(pTextFrame->IsInTab() || pTextFrame->IsInFootnote() || pTextFrame->IsInFly()))
+ nLineNum += pTextFrame->GetThisLines();
+ pTextFrame = static_cast< SwTextFrame* >(pTextFrame ->GetNextContentFrame());
}
- SwPaM* pCaret = pCrsrShell->GetCrsr();
- if (!pCurrTextFrm->IsEmpty() && pCaret)
+ SwPaM* pCaret = pCursorShell->GetCursor();
+ if (!pCurrTextFrame->IsEmpty() && pCaret)
{
- if (pCurrTextFrm->IsTextFrm())
+ if (pCurrTextFrame->IsTextFrame())
{
const SwPosition* pPoint = nullptr;
- if(pCurrTextFrm->IsInFly())
+ if(pCurrTextFrame->IsInFly())
{
- SwFlyFrm *pFlyFrm = pCurrTextFrm->FindFlyFrm();
- const SwFormatAnchor& rAnchor = pFlyFrm->GetFormat()->GetAnchor();
+ SwFlyFrame *pFlyFrame = pCurrTextFrame->FindFlyFrame();
+ const SwFormatAnchor& rAnchor = pFlyFrame->GetFormat()->GetAnchor();
pPoint= rAnchor.GetContentAnchor();
}
else
pPoint = pCaret->GetPoint();
const sal_Int32 nActPos = pPoint->nContent.GetIndex();
- nLineNum += pCurrTextFrm->GetLineCount( nActPos );
+ nLineNum += pCurrTextFrame->GetLineCount( nActPos );
}
else//graphic, form, shape, etc.
{
SwPosition* pPoint = pCaret->GetPoint();
- Point aPt = pCrsrShell->_GetCrsr()->GetPtPos();
- if( pCrsrShell->GetLayout()->GetCrsrOfst( pPoint, aPt/*,* &eTmpState*/ ) )
+ Point aPt = pCursorShell->_GetCursor()->GetPtPos();
+ if( pCursorShell->GetLayout()->GetCursorOfst( pPoint, aPt/*,* &eTmpState*/ ) )
{
const sal_Int32 nActPos = pPoint->nContent.GetIndex();
- nLineNum += pCurrTextFrm->GetLineCount( nActPos );
+ nLineNum += pCurrTextFrame->GetLineCount( nActPos );
}
}
}
@@ -684,7 +684,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sValue += ";";
- SwFrm* pCurrCol=static_cast<SwFrm*>(pCurrFrm)->FindColFrm();
+ SwFrame* pCurrCol=static_cast<SwFrame*>(pCurrFrame)->FindColFrame();
sAttrName = "column-number:";
sValue += sAttrName;
@@ -692,18 +692,18 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
int nCurrCol = 1;
if(pCurrCol!=nullptr)
{
- //SwLayoutFrm* pParent = pCurrCol->GetUpper();
- SwFrm* pCurrPageCol=static_cast<SwFrm*>(pCurrFrm)->FindColFrm();
- while(pCurrPageCol && pCurrPageCol->GetUpper() && pCurrPageCol->GetUpper()->IsPageFrm())
+ //SwLayoutFrame* pParent = pCurrCol->GetUpper();
+ SwFrame* pCurrPageCol=static_cast<SwFrame*>(pCurrFrame)->FindColFrame();
+ while(pCurrPageCol && pCurrPageCol->GetUpper() && pCurrPageCol->GetUpper()->IsPageFrame())
{
pCurrPageCol = pCurrPageCol->GetUpper();
}
- SwLayoutFrm* pParent = pCurrPageCol->GetUpper();
+ SwLayoutFrame* pParent = pCurrPageCol->GetUpper();
if(pParent!=nullptr)
{
- SwFrm* pCol = pParent->Lower();
+ SwFrame* pCol = pParent->Lower();
while(pCol&&(pCol!=pCurrPageCol))
{
pCol = pCol->GetNext();
@@ -724,13 +724,13 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
sValue += ";";
- SwSectionFrm* pCurrSctFrm=static_cast<SwFrm*>(pCurrFrm)->FindSctFrm();
- if(pCurrSctFrm!=nullptr && pCurrSctFrm->GetSection()!=nullptr )
+ SwSectionFrame* pCurrSctFrame=static_cast<SwFrame*>(pCurrFrame)->FindSctFrame();
+ if(pCurrSctFrame!=nullptr && pCurrSctFrame->GetSection()!=nullptr )
{
sAttrName = "section-name:";
sValue += sAttrName;
- OUString sectionName = pCurrSctFrm->GetSection()->GetSectionName();
+ OUString sectionName = pCurrSctFrame->GetSection()->GetSectionName();
sectionName = sectionName.replaceFirst( "\\" , "\\\\" );
sectionName = sectionName.replaceFirst( "=" , "\\=" );
@@ -749,10 +749,10 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
if(pCurrCol!=nullptr)
{
- SwLayoutFrm* pParent = pCurrCol->GetUpper();
+ SwLayoutFrame* pParent = pCurrCol->GetUpper();
if(pParent!=nullptr)
{
- SwFrm* pCol = pParent->Lower();
+ SwFrame* pCol = pParent->Lower();
while(pCol&&(pCol!=pCurrCol))
{
pCol = pCol->GetNext();
@@ -766,7 +766,7 @@ uno::Any SAL_CALL SwAccessibleDocument::getExtendedAttributes()
//section-total-columns
sAttrName = "section-total-columns:";
- const SwFormatCol &rFormatSctCol=pCurrSctFrm->GetAttrSet()->GetCol();
+ const SwFormatCol &rFormatSctCol=pCurrSctFrame->GetAttrSet()->GetCol();
sal_uInt16 nSctColCount=rFormatSctCol.GetNumCols();
nSctColCount = nSctColCount>0?nSctColCount:1;
sValue += sAttrName;
@@ -858,38 +858,38 @@ css::uno::Sequence< css::uno::Any >
}
else if ( nType == FORFINDREPLACEFLOWTO )
{
- SwCrsrShell* pCrsrShell = GetCrsrShell();
- if ( pCrsrShell )
+ SwCursorShell* pCursorShell = GetCursorShell();
+ if ( pCursorShell )
{
- SwPaM *_pStartCrsr = pCrsrShell->GetCrsr(), *__pStartCrsr = _pStartCrsr;
+ SwPaM *_pStartCursor = pCursorShell->GetCursor(), *__pStartCursor = _pStartCursor;
SwContentNode* pPrevNode = nullptr;
- std::vector<SwFrm*> vFrmList;
+ std::vector<SwFrame*> vFrameList;
do
{
- if ( _pStartCrsr && _pStartCrsr->HasMark() )
+ if ( _pStartCursor && _pStartCursor->HasMark() )
{
- SwContentNode* pContentNode = _pStartCrsr->GetContentNode();
+ SwContentNode* pContentNode = _pStartCursor->GetContentNode();
if ( pContentNode == pPrevNode )
{
continue;
}
- SwFrm* pFrm = pContentNode ? pContentNode->getLayoutFrm( pCrsrShell->GetLayout() ) : nullptr;
- if ( pFrm )
+ SwFrame* pFrame = pContentNode ? pContentNode->getLayoutFrame( pCursorShell->GetLayout() ) : nullptr;
+ if ( pFrame )
{
- vFrmList.push_back( pFrm );
+ vFrameList.push_back( pFrame );
}
pPrevNode = pContentNode;
}
}
- while( _pStartCrsr && ( (_pStartCrsr = _pStartCrsr->GetNext()) != __pStartCrsr) );
+ while( _pStartCursor && ( (_pStartCursor = _pStartCursor->GetNext()) != __pStartCursor) );
- if ( vFrmList.size() )
+ if ( vFrameList.size() )
{
- uno::Sequence< uno::Any > aRet(vFrmList.size());
- std::vector<SwFrm*>::iterator aIter = vFrmList.begin();
- for ( sal_Int32 nIndex = 0; aIter != vFrmList.end(); ++aIter, nIndex++ )
+ uno::Sequence< uno::Any > aRet(vFrameList.size());
+ std::vector<SwFrame*>::iterator aIter = vFrameList.begin();
+ for ( sal_Int32 nIndex = 0; aIter != vFrameList.end(); ++aIter, nIndex++ )
{
uno::Reference< XAccessible > xAcc = pAccMap->GetContext(*aIter, false);
if ( xAcc.is() )
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index fda48d759d1f..ef3b70b992d2 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -37,8 +37,8 @@ const sal_Char sImplementationName[] = "com.sun.star.comp.Writer.SwAccessibleEmb
SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject(
SwAccessibleMap* pInitMap,
- const SwFlyFrm* pFlyFrm ) :
- SwAccessibleNoTextFrame( pInitMap, AccessibleRole::EMBEDDED_OBJECT, pFlyFrm )
+ const SwFlyFrame* pFlyFrame ) :
+ SwAccessibleNoTextFrame( pInitMap, AccessibleRole::EMBEDDED_OBJECT, pFlyFrame )
{
}
@@ -108,16 +108,16 @@ css::uno::Any SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
css::uno::Any strRet;
OUString style;
- SwFlyFrm* pFFrm = getFlyFrm();
+ SwFlyFrame* pFFrame = getFlyFrame();
- if( pFFrm )
+ if( pFFrame )
{
style = "style:";
- SwContentFrm* pCFrm;
- pCFrm = pFFrm->ContainsContent();
- if( pCFrm )
+ SwContentFrame* pCFrame;
+ pCFrame = pFFrame->ContainsContent();
+ if( pCFrame )
{
- SwContentNode* pCNode = pCFrm->GetNode();
+ SwContentNode* pCNode = pCFrame->GetNode();
if( pCNode )
{
style += static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
diff --git a/sw/source/core/access/accembedded.hxx b/sw/source/core/access/accembedded.hxx
index c349edc09de4..3141ff580fa4 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -33,7 +33,7 @@ protected:
public:
SwAccessibleEmbeddedObject( SwAccessibleMap* pInitMap,
- const SwFlyFrm* pFlyFrm );
+ const SwFlyFrame* pFlyFrame );
// XInterface
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index c71e3fab4690..e64b0308f4e8 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 SwFootnoteFrm *pFootnoteFrm ) :
+ const SwFootnoteFrame *pFootnoteFrame ) :
SwAccessibleContext( pInitMap,
bIsEndnote ? AccessibleRole::END_NOTE : AccessibleRole::FOOTNOTE,
- pFootnoteFrm )
+ pFootnoteFrame )
{
SolarMutexGuard aGuard;
@@ -57,7 +57,7 @@ SwAccessibleFootnote::SwAccessibleFootnote(
OUString sArg;
const SwTextFootnote *pTextFootnote =
- static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+ static_cast< const SwFootnoteFrame *>( GetFrame() )->GetAttr();
if( pTextFootnote )
{
const SwDoc *pDoc = GetShell()->GetDoc();
@@ -84,7 +84,7 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
OUString sArg;
const SwTextFootnote *pTextFootnote =
- static_cast< const SwFootnoteFrm *>( GetFrm() )->GetAttr();
+ static_cast< const SwFootnoteFrame *>( GetFrame() )->GetAttr();
if( pTextFootnote )
{
const SwDoc *pDoc = GetMap()->GetShell()->GetDoc();
@@ -128,9 +128,9 @@ Sequence< sal_Int8 > SAL_CALL SwAccessibleFootnote::getImplementationId()
return css::uno::Sequence<sal_Int8>();
}
-bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrm *pFootnoteFrm )
+bool SwAccessibleFootnote::IsEndnote( const SwFootnoteFrame *pFootnoteFrame )
{
- const SwTextFootnote *pTextFootnote = pFootnoteFrm ->GetAttr();
+ const SwTextFootnote *pTextFootnote = pFootnoteFrame ->GetAttr();
return pTextFootnote && pTextFootnote->GetFootnote().IsEndNote() ;
}
diff --git a/sw/source/core/access/accfootnote.hxx b/sw/source/core/access/accfootnote.hxx
index cc48ec61488b..1c715dc305b7 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 SwFootnoteFrm;
+class SwFootnoteFrame;
class SwAccessibleFootnote : public SwAccessibleContext
{
@@ -34,7 +34,7 @@ protected:
public:
SwAccessibleFootnote( SwAccessibleMap* pInitMap,
bool bIsEndnote,
- const SwFootnoteFrm *pFootnoteFrm );
+ const SwFootnoteFrame *pFootnoteFrame );
// XAccessibleContext
@@ -64,7 +64,7 @@ public:
// XTypeProvider
virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override;
- static bool IsEndnote( const SwFootnoteFrm *pFrm );
+ static bool IsEndnote( const SwFootnoteFrame *pFrame );
};
#endif
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index 7ea913440e0a..aafafd8278d4 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -46,12 +46,12 @@ using namespace sw::access;
// frame's paint area.
sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bInPagePreview )
{
sal_Int32 nCount = 0;
- const SwAccessibleChildSList aVisList( rVisArea, *pFrm, rAccMap );
+ const SwAccessibleChildSList aVisList( rVisArea, *pFrame, rAccMap );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() )
@@ -61,11 +61,11 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
{
nCount++;
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
nCount += GetChildCount( rAccMap,
- rVisArea, rLower.GetSwFrm(),
+ rVisArea, rLower.GetSwFrame(),
bInPagePreview );
}
++aIter;
@@ -77,7 +77,7 @@ sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap,
SwAccessibleChild SwAccessibleFrame::GetChild(
SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
sal_Int32& rPos,
bool bInPagePreview )
{
@@ -85,10 +85,10 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
if( rPos >= 0 )
{
- if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+ if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
{
// We need a sorted list here
- const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
while( aIter != aVisMap.cend() && !aRet.IsValid() )
{
@@ -100,11 +100,11 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
else
rPos--;
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
aRet = GetChild( rAccMap,
- rVisArea, *(rLower.GetSwFrm()), rPos,
+ rVisArea, *(rLower.GetSwFrame()), rPos,
bInPagePreview );
}
++aIter;
@@ -114,7 +114,7 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
{
// The unsorted list is sorted enough, because it returns lower
// frames in the correct order.
- const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() && !aRet.IsValid() )
{
@@ -126,11 +126,11 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
else
rPos--;
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
aRet = GetChild( rAccMap,
- rVisArea, *(rLower.GetSwFrm()), rPos,
+ rVisArea, *(rLower.GetSwFrame()), rPos,
bInPagePreview );
}
++aIter;
@@ -144,17 +144,17 @@ SwAccessibleChild SwAccessibleFrame::GetChild(
bool SwAccessibleFrame::GetChildIndex(
SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
const SwAccessibleChild& rChild,
sal_Int32& rPos,
bool bInPagePreview )
{
bool bFound = false;
- if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+ if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
{
// We need a sorted list here
- const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
while( aIter != aVisMap.cend() && !bFound )
{
@@ -166,11 +166,11 @@ bool SwAccessibleFrame::GetChildIndex(
else
rPos++;
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
bFound = GetChildIndex( rAccMap,
- rVisArea, *(rLower.GetSwFrm()), rChild,
+ rVisArea, *(rLower.GetSwFrame()), rChild,
rPos, bInPagePreview );
}
++aIter;
@@ -181,7 +181,7 @@ bool SwAccessibleFrame::GetChildIndex(
// The unsorted list is sorted enough, because it returns lower
// frames in the correct order.
- const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() && !bFound )
{
@@ -193,11 +193,11 @@ bool SwAccessibleFrame::GetChildIndex(
else
rPos++;
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
bFound = GetChildIndex( rAccMap,
- rVisArea, *(rLower.GetSwFrm()), rChild,
+ rVisArea, *(rLower.GetSwFrame()), rChild,
rPos, bInPagePreview );
}
++aIter;
@@ -208,18 +208,18 @@ bool SwAccessibleFrame::GetChildIndex(
}
SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
const Point& rPixPos,
bool bInPagePreview,
SwAccessibleMap& rAccMap )
{
SwAccessibleChild aRet;
- if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+ if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
{
// We need a sorted list here, and we have to reverse iterate,
// because objects in front should be returned.
- const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
SwAccessibleChildMap::const_reverse_iterator aRIter( aVisMap.crbegin() );
while( aRIter != aVisMap.crend() && !aRet.IsValid() )
{
@@ -236,10 +236,10 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
aRet = rLower;
}
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
- aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrm()), rPixPos,
+ aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrame()), rPixPos,
bInPagePreview, rAccMap );
}
++aRIter;
@@ -250,7 +250,7 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
// The unsorted list is sorted enough, because it returns lower
// frames in the correct order. Moreover, we can iterate forward,
// because the lowers don't overlap!
- const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() && !aRet.IsValid() )
{
@@ -267,10 +267,10 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
aRet = rLower;
}
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
- aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrm()), rPixPos,
+ aRet = GetChildAtPixel( rVisArea, *(rLower.GetSwFrame()), rPixPos,
bInPagePreview, rAccMap );
}
++aIter;
@@ -282,14 +282,14 @@ SwAccessibleChild SwAccessibleFrame::GetChildAtPixel( const SwRect& rVisArea,
void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
::std::list< SwAccessibleChild >& rChildren,
bool bInPagePreview )
{
- if( SwAccessibleChildMap::IsSortingRequired( rFrm ) )
+ if( SwAccessibleChildMap::IsSortingRequired( rFrame ) )
{
// We need a sorted list here
- const SwAccessibleChildMap aVisMap( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildMap aVisMap( rVisArea, rFrame, rAccMap );
SwAccessibleChildMap::const_iterator aIter( aVisMap.cbegin() );
while( aIter != aVisMap.cend() )
{
@@ -298,10 +298,10 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
{
rChildren.push_back( rLower );
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
- GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrm()),
+ GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrame()),
rChildren, bInPagePreview );
}
++aIter;
@@ -311,7 +311,7 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
{
// The unsorted list is sorted enough, because it returns lower
// frames in the correct order.
- const SwAccessibleChildSList aVisList( rVisArea, rFrm, rAccMap );
+ const SwAccessibleChildSList aVisList( rVisArea, rFrame, rAccMap );
SwAccessibleChildSList::const_iterator aIter( aVisList.begin() );
while( aIter != aVisList.end() )
{
@@ -320,10 +320,10 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
{
rChildren.push_back( rLower );
}
- else if( rLower.GetSwFrm() )
+ else if( rLower.GetSwFrame() )
{
// There are no unaccessible SdrObjects that count
- GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrm()),
+ GetChildren( rAccMap, rVisArea, *(rLower.GetSwFrame()),
rChildren, bInPagePreview );
}
++aIter;
@@ -332,20 +332,20 @@ void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
}
SwRect SwAccessibleFrame::GetBounds( const SwAccessibleMap& rAccMap,
- const SwFrm *pFrm )
+ const SwFrame *pFrame )
{
- if( !pFrm )
- pFrm = GetFrm();
+ if( !pFrame )
+ pFrame = GetFrame();
- SwAccessibleChild aFrm( pFrm );
- SwRect aBounds( aFrm.GetBounds( rAccMap ).Intersection( maVisArea ) );
+ SwAccessibleChild aFrame( pFrame );
+ SwRect aBounds( aFrame.GetBounds( rAccMap ).Intersection( maVisArea ) );
return aBounds;
}
bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
{
- const SwFrm *pFrm = GetFrm();
- if( !pFrm )
+ const SwFrame *pFrame = GetFrame();
+ if( !pFrame )
return false;
OSL_ENSURE( pVSh, "no view shell" );
@@ -353,7 +353,7 @@ bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
pVSh->IsPreview()) )
return false;
- if( !pFrm->IsRootFrm() && pFrm->IsProtected() )
+ if( !pFrame->IsRootFrame() && pFrame->IsProtected() )
return false;
return true;
@@ -361,8 +361,8 @@ bool SwAccessibleFrame::IsEditable( SwViewShell *pVSh ) const
bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
{
- SwAccessibleChild aFrm( GetFrm() );
- if( !aFrm.GetSwFrm() )
+ SwAccessibleChild aFrame( GetFrame() );
+ if( !aFrame.GetSwFrame() )
return false;
OSL_ENSURE( pVSh, "no view shell" );
@@ -372,49 +372,49 @@ bool SwAccessibleFrame::IsOpaque( SwViewShell *pVSh ) const
const SwViewOption *pVOpt = pVSh->GetViewOptions();
do
{
- const SwFrm *pFrm = aFrm.GetSwFrm();
- if( pFrm->IsRootFrm() )
+ const SwFrame *pFrame = aFrame.GetSwFrame();
+ if( pFrame->IsRootFrame() )
return true;
- if( pFrm->IsPageFrm() && !pVOpt->IsPageBack() )
+ if( pFrame->IsPageFrame() && !pVOpt->IsPageBack() )
return false;
- const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground();
+ const SvxBrushItem &rBack = pFrame->GetAttrSet()->GetBackground();
if( !rBack.GetColor().GetTransparency() ||
rBack.GetGraphicPos() != GPOS_NONE )
return true;
// If a fly frame has a transparent background color, we have to consider the background.
// But a background color "no fill"/"auto fill" should *not* be considered.
- if( pFrm->IsFlyFrm() &&
+ if( pFrame->IsFlyFrame() &&
(rBack.GetColor().GetTransparency() != 0) &&
(rBack.GetColor() != COL_TRANSPARENT)
)
return true;
- if( pFrm->IsSctFrm() )
+ if( pFrame->IsSctFrame() )
{
- const SwSection* pSection = static_cast<const SwSectionFrm*>(pFrm)->GetSection();
+ const SwSection* pSection = static_cast<const SwSectionFrame*>(pFrame)->GetSection();
if( pSection && ( TOX_HEADER_SECTION == pSection->GetType() ||
TOX_CONTENT_SECTION == pSection->GetType() ) &&
!pVOpt->IsReadonly() &&
SwViewOption::IsIndexShadings() )
return true;
}
- if( pFrm->IsFlyFrm() )
- aFrm = static_cast<const SwFlyFrm*>(pFrm)->GetAnchorFrm();
+ if( pFrame->IsFlyFrame() )
+ aFrame = static_cast<const SwFlyFrame*>(pFrame)->GetAnchorFrame();
else
- aFrm = pFrm->GetUpper();
- } while( aFrm.GetSwFrm() && !aFrm.IsAccessible( IsInPagePreview() ) );
+ aFrame = pFrame->GetUpper();
+ } while( aFrame.GetSwFrame() && !aFrame.IsAccessible( IsInPagePreview() ) );
return false;
}
SwAccessibleFrame::SwAccessibleFrame( const SwRect& rVisArea,
- const SwFrm *pF,
+ const SwFrame *pF,
bool bIsPagePreview ) :
maVisArea( rVisArea ),
- mpFrm( pF ),
+ mpFrame( pF ),
mbIsInPagePreview( bIsPagePreview ),
bIsAccDocUse( false )
{
@@ -424,16 +424,16 @@ SwAccessibleFrame::~SwAccessibleFrame()
{
}
-const SwFrm* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrmOrObj,
+const SwFrame* SwAccessibleFrame::GetParent( const SwAccessibleChild& rFrameOrObj,
bool bInPagePreview )
{
- return rFrmOrObj.GetParent( bInPagePreview );
+ return rFrameOrObj.GetParent( bInPagePreview );
}
OUString SwAccessibleFrame::GetFormattedPageNumber() const
{
- sal_uInt16 nPageNum = GetFrm()->GetVirtPageNum();
- sal_uInt32 nFormat = GetFrm()->FindPageFrm()->GetPageDesc()
+ sal_uInt16 nPageNum = GetFrame()->GetVirtPageNum();
+ sal_uInt32 nFormat = GetFrame()->FindPageFrame()->GetPageDesc()
->GetNumType().GetNumberingType();
if( SVX_NUM_NUMBER_NONE == nFormat )
nFormat = SVX_NUM_ARABIC;
@@ -444,21 +444,21 @@ OUString SwAccessibleFrame::GetFormattedPageNumber() const
sal_Int32 SwAccessibleFrame::GetChildCount( SwAccessibleMap& rAccMap ) const
{
- return GetChildCount( rAccMap, maVisArea, mpFrm, IsInPagePreview() );
+ return GetChildCount( rAccMap, maVisArea, mpFrame, IsInPagePreview() );
}
sw::access::SwAccessibleChild SwAccessibleFrame::GetChild(
SwAccessibleMap& rAccMap,
sal_Int32 nPos ) const
{
- return SwAccessibleFrame::GetChild( rAccMap, maVisArea, *mpFrm, nPos, IsInPagePreview() );
+ return SwAccessibleFrame::GetChild( rAccMap, maVisArea, *mpFrame, nPos, IsInPagePreview() );
}
sal_Int32 SwAccessibleFrame::GetChildIndex( SwAccessibleMap& rAccMap,
const sw::access::SwAccessibleChild& rChild ) const
{
sal_Int32 nPos = 0;
- return GetChildIndex( rAccMap, maVisArea, *mpFrm, rChild, nPos, IsInPagePreview() )
+ return GetChildIndex( rAccMap, maVisArea, *mpFrame, rChild, nPos, IsInPagePreview() )
? nPos
: -1L;
}
@@ -467,19 +467,19 @@ sw::access::SwAccessibleChild SwAccessibleFrame::GetChildAtPixel(
const Point& rPos,
SwAccessibleMap& rAccMap ) const
{
- return GetChildAtPixel( maVisArea, *mpFrm, rPos, IsInPagePreview(), rAccMap );
+ return GetChildAtPixel( maVisArea, *mpFrame, rPos, IsInPagePreview(), rAccMap );
}
void SwAccessibleFrame::GetChildren( SwAccessibleMap& rAccMap,
::std::list< sw::access::SwAccessibleChild >& rChildren ) const
{
- GetChildren( rAccMap, maVisArea, *mpFrm, rChildren, IsInPagePreview() );
+ GetChildren( rAccMap, maVisArea, *mpFrame, rChildren, IsInPagePreview() );
}
bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap,
- const sw::access::SwAccessibleChild& rFrmOrObj ) const
+ const sw::access::SwAccessibleChild& rFrameOrObj ) const
{
- return IsShowing( rFrmOrObj.GetBox( rAccMap ) );
+ return IsShowing( rFrameOrObj.GetBox( rAccMap ) );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accframe.hxx b/sw/source/core/access/accframe.hxx
index 91462027f665..55d9e2497043 100644
--- a/sw/source/core/access/accframe.hxx
+++ b/sw/source/core/access/accframe.hxx
@@ -29,7 +29,7 @@
#include <accfrmobj.hxx>
class SwAccessibleMap;
-class SwFrm;
+class SwFrame;
class SwViewShell;
namespace sw { namespace access {
class SwAccessibleChild;
@@ -40,39 +40,39 @@ namespace sw { namespace access {
class SwAccessibleFrame
{
SwRect maVisArea;
- const SwFrm* mpFrm;
+ const SwFrame* mpFrame;
const bool mbIsInPagePreview;
protected:
// #i77106# - method needs to be called by new class <SwAccessibleTableColHeaders>
static sal_Int32 GetChildCount( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bInPagePreviewr );
// private:
static sw::access::SwAccessibleChild GetChild( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
sal_Int32& rPos,
bool bInPagePreview);
static bool GetChildIndex( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
const sw::access::SwAccessibleChild& rChild,
sal_Int32& rPos,
bool bInPagePreview );
static sw::access::SwAccessibleChild GetChildAtPixel( const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
const Point& rPos,
bool bInPagePreview,
SwAccessibleMap& rAccMap );
static void GetChildren( SwAccessibleMap& rAccMap,
const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
::std::list< sw::access::SwAccessibleChild >& rChildren,
bool bInPagePreview );
@@ -82,8 +82,8 @@ protected:
bool IsOpaque( SwViewShell *pVSh ) const;
bool IsShowing( const SwAccessibleMap& rAccMap,
- const sw::access::SwAccessibleChild& rFrmOrObj ) const;
- inline bool IsShowing( const SwRect& rFrm ) const;
+ const sw::access::SwAccessibleChild& rFrameOrObj ) const;
+ inline bool IsShowing( const SwRect& rFrame ) const;
inline bool IsShowing( const SwAccessibleMap& rAccMap ) const;
inline bool IsInPagePreview() const
@@ -91,23 +91,23 @@ protected:
return mbIsInPagePreview;
}
- inline void ClearFrm()
+ inline void ClearFrame()
{
- mpFrm = nullptr;
+ mpFrame = nullptr;
}
SwAccessibleFrame( const SwRect& rVisArea,
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bIsPagePreview );
virtual ~SwAccessibleFrame();
// MT: Move to private area?
bool bIsAccDocUse;
public:
- // Return the SwFrm this context is attached to.
- const SwFrm* GetFrm() const { return mpFrm; };
+ // Return the SwFrame this context is attached to.
+ const SwFrame* GetFrame() const { return mpFrame; };
- static const SwFrm* GetParent( const sw::access::SwAccessibleChild& rFrmOrObj,
+ static const SwFrame* GetParent( const sw::access::SwAccessibleChild& rFrameOrObj,
bool bInPagePreview );
sal_Int32 GetChildIndex( SwAccessibleMap& rAccMap,
@@ -117,14 +117,14 @@ protected:
// Return the bounding box of the frame clipped to the vis area. If
// no frame is specified, use this' frame.
SwRect GetBounds( const SwAccessibleMap& rAccMap,
- const SwFrm *pFrm = nullptr );
+ const SwFrame *pFrame = nullptr );
// Return the upper that has a context attached. This might be
// another one than the immediate upper.
- inline const SwFrm *GetParent() const;
+ inline const SwFrame *GetParent() const;
// Return the lower count or the nth lower, there the lowers have a
- // not be same one as the SwFrm's lowers
+ // not be same one as the SwFrame's lowers
sal_Int32 GetChildCount( SwAccessibleMap& rAccMap ) const;
sw::access::SwAccessibleChild GetChild( SwAccessibleMap& rAccMap,
sal_Int32 nPos ) const;
@@ -146,21 +146,21 @@ protected:
OUString GetFormattedPageNumber() const;
};
-inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrm ) const
+inline bool SwAccessibleFrame::IsShowing( const SwRect& rFrame ) const
{
- return rFrm.IsOver( maVisArea );
+ return rFrame.IsOver( maVisArea );
}
inline bool SwAccessibleFrame::IsShowing( const SwAccessibleMap& rAccMap ) const
{
- sw::access::SwAccessibleChild aFrmOrObj( GetFrm() );
- return IsShowing( rAccMap, aFrmOrObj );
+ sw::access::SwAccessibleChild aFrameOrObj( GetFrame() );
+ return IsShowing( rAccMap, aFrameOrObj );
}
-inline const SwFrm *SwAccessibleFrame::GetParent() const
+inline const SwFrame *SwAccessibleFrame::GetParent() const
{
- sw::access::SwAccessibleChild aFrmOrObj( GetFrm() );
- return GetParent( aFrmOrObj, IsInPagePreview() );
+ sw::access::SwAccessibleChild aFrameOrObj( GetFrame() );
+ return GetParent( aFrameOrObj, IsInPagePreview() );
}
#endif
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index f895714fd41c..dcd7e577e0e6 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -53,8 +53,8 @@ bool SwAccessibleFrameBase::IsSelected()
if( dynamic_cast<const SwFEShell*>( pVSh) != nullptr )
{
const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
- const SwFrm *pFlyFrm = pFESh->GetSelectedFlyFrm();
- if( pFlyFrm == GetFrm() )
+ const SwFrame *pFlyFrame = pFESh->GetSelectedFlyFrame();
+ if( pFlyFrame == GetFrame() )
bRet = true;
}
@@ -94,21 +94,21 @@ void SwAccessibleFrameBase::GetStates(
rStateSet.AddState( AccessibleStateType::SELECTED );
}
-sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
+sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrame *pFlyFrame )
{
sal_uInt8 nType = ND_TEXTNODE;
- if( pFlyFrm->Lower() )
+ if( pFlyFrame->Lower() )
{
- if( pFlyFrm->Lower()->IsNoTextFrm() )
+ if( pFlyFrame->Lower()->IsNoTextFrame() )
{
- const SwContentFrm *pCntFrm =
- static_cast<const SwContentFrm *>( pFlyFrm->Lower() );
- nType = pCntFrm->GetNode()->GetNodeType();
+ const SwContentFrame *pContentFrame =
+ static_cast<const SwContentFrame *>( pFlyFrame->Lower() );
+ nType = pContentFrame->GetNode()->GetNodeType();
}
}
else
{
- const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
const SwFormatContent& rContent = pFrameFormat->GetContent();
const SwNodeIndex *pNdIdx = rContent.GetContentIdx();
if( pNdIdx )
@@ -126,13 +126,13 @@ sal_uInt8 SwAccessibleFrameBase::GetNodeType( const SwFlyFrm *pFlyFrm )
SwAccessibleFrameBase::SwAccessibleFrameBase(
SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
- const SwFlyFrm* pFlyFrm ) :
- SwAccessibleContext( pInitMap, nInitRole, pFlyFrm ),
+ const SwFlyFrame* pFlyFrame ) :
+ SwAccessibleContext( pInitMap, nInitRole, pFlyFrame ),
bIsSelected( false )
{
SolarMutexGuard aGuard;
- const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
const_cast< SwFrameFormat * >( pFrameFormat )->Add( this );
SetName( pFrameFormat->GetName() );
@@ -215,13 +215,13 @@ SwAccessibleFrameBase::~SwAccessibleFrameBase()
void SwAccessibleFrameBase::Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew)
{
sal_uInt16 nWhich = pOld ? pOld->Which() : pNew ? pNew->Which() : 0 ;
- const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( GetFrm() );
+ const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( GetFrame() );
switch( nWhich )
{
case RES_NAME_CHANGED:
- if( pFlyFrm )
+ if( pFlyFrame )
{
- const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
assert(pFrameFormat == GetRegisteredIn() && "invalid frame");
const OUString sOldName( GetName() );
@@ -272,25 +272,25 @@ void SwAccessibleFrameBase::Dispose( bool bRecursive )
}
//Get the selection cursor of the document.
-SwPaM* SwAccessibleFrameBase::GetCrsr()
+SwPaM* SwAccessibleFrameBase::GetCursor()
{
// get the cursor shell; if we don't have any, we don't have a
// cursor/selection either
- SwPaM* pCrsr = nullptr;
- SwCrsrShell* pCrsrShell = GetCrsrShell();
- if( pCrsrShell != nullptr && !pCrsrShell->IsTableMode() )
+ SwPaM* pCursor = nullptr;
+ SwCursorShell* pCursorShell = GetCursorShell();
+ if( pCursorShell != nullptr && !pCursorShell->IsTableMode() )
{
- SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCrsrShell) != nullptr
- ? static_cast< SwFEShell * >( pCrsrShell ) : nullptr;
+ SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pCursorShell) != nullptr
+ ? static_cast< SwFEShell * >( pCursorShell ) : nullptr;
if( !pFESh ||
- !(pFESh->IsFrmSelected() || pFESh->IsObjSelected() > 0) )
+ !(pFESh->IsFrameSelected() || pFESh->IsObjSelected() > 0) )
{
// get the selection, and test whether it affects our text node
- pCrsr = pCrsrShell->GetCrsr( false /* ??? */ );
+ pCursor = pCursorShell->GetCursor( false /* ??? */ );
}
}
- return pCrsr;
+ return pCursor;
}
//Return the selected state of the object.
@@ -305,8 +305,8 @@ bool SwAccessibleFrameBase::GetSelectedState( )
}
// SELETED.
- SwFlyFrm* pFlyFrm = getFlyFrm();
- const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ SwFlyFrame* pFlyFrame = getFlyFrame();
+ const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
const SwPosition *pPos = pAnchor.GetContentAnchor();
if( !pPos )
@@ -314,23 +314,23 @@ bool SwAccessibleFrameBase::GetSelectedState( )
int pIndex = pPos->nContent.GetIndex();
if( pPos->nNode.GetNode().GetTextNode() )
{
- SwPaM* pCrsr = GetCrsr();
- if( pCrsr != nullptr )
+ SwPaM* pCursor = GetCursor();
+ if( pCursor != nullptr )
{
const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
sal_uLong nHere = pNode->GetIndex();
// iterate over ring
- SwPaM* pRingStart = pCrsr;
+ SwPaM* pRingStart = pCursor;
do
{
// ignore, if no mark
- if( pCrsr->HasMark() )
+ if( pCursor->HasMark() )
{
- // check whether nHere is 'inside' pCrsr
- SwPosition* pStart = pCrsr->Start();
+ // check whether nHere is 'inside' pCursor
+ SwPosition* pStart = pCursor->Start();
sal_uLong nStartIndex = pStart->nNode.GetIndex();
- SwPosition* pEnd = pCrsr->End();
+ SwPosition* pEnd = pCursor->End();
sal_uLong nEndIndex = pEnd->nNode.GetIndex();
if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex) )
{
@@ -353,26 +353,26 @@ bool SwAccessibleFrameBase::GetSelectedState( )
// else: this PaM is collapsed and doesn't select anything
// next PaM in ring
- pCrsr = pCrsr->GetNext();
+ pCursor = pCursor->GetNext();
}
- while( pCrsr != pRingStart );
+ while( pCursor != pRingStart );
}
}
return false;
}
-SwFlyFrm* SwAccessibleFrameBase::getFlyFrm() const
+SwFlyFrame* SwAccessibleFrameBase::getFlyFrame() const
{
- SwFlyFrm* pFlyFrm = nullptr;
+ SwFlyFrame* pFlyFrame = nullptr;
- const SwFrm* pFrm = GetFrm();
- assert(pFrm);
- if( pFrm->IsFlyFrm() )
+ const SwFrame* pFrame = GetFrame();
+ assert(pFrame);
+ if( pFrame->IsFlyFrame() )
{
- pFlyFrm = static_cast<SwFlyFrm*>( const_cast<SwFrm*>( pFrm ) );
+ pFlyFrame = static_cast<SwFlyFrame*>( const_cast<SwFrame*>( pFrame ) );
}
- return pFlyFrm;
+ return pFlyFrame;
}
bool SwAccessibleFrameBase::SetSelectedState( bool )
diff --git a/sw/source/core/access/accframebase.hxx b/sw/source/core/access/accframebase.hxx
index 0be3137423c5..45335a43ad31 100644
--- a/sw/source/core/access/accframebase.hxx
+++ b/sw/source/core/access/accframebase.hxx
@@ -24,7 +24,7 @@
#include <calbck.hxx>
#include <pam.hxx>
-class SwFlyFrm;
+class SwFlyFrame;
class SwAccessibleFrameBase : public SwAccessibleContext,
public SwClient
@@ -37,9 +37,9 @@ protected:
// This derived class additionally sets SELECTABLE(1), SELECTED(+),
// FOCUSABLE(1) and FOCUSED(+)
virtual void GetStates( ::utl::AccessibleStateSetHelper& rStateSet ) override;
- SwFlyFrm* getFlyFrm() const;
+ SwFlyFrame* getFlyFrame() const;
bool GetSelectedState( );
- SwPaM* GetCrsr();
+ SwPaM* GetCursor();
virtual void _InvalidateCursorPos() override;
virtual void _InvalidateFocus() override;
@@ -50,11 +50,11 @@ protected:
public:
SwAccessibleFrameBase( SwAccessibleMap* pInitMap,
sal_Int16 nInitRole,
- const SwFlyFrm *pFlyFrm );
+ const SwFlyFrame *pFlyFrame );
virtual bool HasCursor() override; // required by map to remember that object
- static sal_uInt8 GetNodeType( const SwFlyFrm *pFlyFrm );
+ static sal_uInt8 GetNodeType( const SwFlyFrame *pFlyFrame );
// The object is not visible an longer and should be destroyed
virtual void Dispose( bool bRecursive = false ) override;
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index a449247cd103..cbd7b518e486 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -40,45 +40,45 @@
namespace sw { namespace access {
SwAccessibleChild::SwAccessibleChild()
- : mpFrm( nullptr )
+ : mpFrame( nullptr )
, mpDrawObj( nullptr )
, mpWindow( nullptr )
{}
SwAccessibleChild::SwAccessibleChild( const SdrObject* pDrawObj )
- : mpFrm( nullptr )
+ : mpFrame( nullptr )
, mpDrawObj( nullptr )
, mpWindow( nullptr )
{
Init( pDrawObj );
}
-SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm )
- : mpFrm( nullptr )
+SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame )
+ : mpFrame( nullptr )
, mpDrawObj( nullptr )
, mpWindow( nullptr )
{
- Init( pFrm );
+ Init( pFrame );
}
SwAccessibleChild::SwAccessibleChild( vcl::Window* pWindow )
- : mpFrm( nullptr )
+ : mpFrame( nullptr )
, mpDrawObj( nullptr )
, mpWindow( nullptr )
{
Init( pWindow );
}
-SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
+SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame,
const SdrObject* pDrawObj,
vcl::Window* pWindow )
- : mpFrm( nullptr )
+ : mpFrame( nullptr )
, mpDrawObj( nullptr )
, mpWindow( nullptr )
{
- if ( pFrm )
+ if ( pFrame )
{
- Init( pFrm );
+ Init( pFrame );
}
else if ( pDrawObj )
{
@@ -88,7 +88,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
{
Init( pWindow );
}
- OSL_ENSURE( (!pFrm || pFrm == mpFrm) &&
+ OSL_ENSURE( (!pFrame || pFrame == mpFrame) &&
(!pDrawObj || pDrawObj == mpDrawObj) &&
(!pWindow || pWindow == mpWindow),
"invalid frame/object/window combination" );
@@ -98,17 +98,17 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
void SwAccessibleChild::Init( const SdrObject* pDrawObj )
{
mpDrawObj = pDrawObj;
- mpFrm = mpDrawObj && dynamic_cast<const SwVirtFlyDrawObj*>( mpDrawObj) != nullptr
- ? static_cast < const SwVirtFlyDrawObj * >( mpDrawObj )->GetFlyFrm()
+ mpFrame = mpDrawObj && dynamic_cast<const SwVirtFlyDrawObj*>( mpDrawObj) != nullptr
+ ? static_cast < const SwVirtFlyDrawObj * >( mpDrawObj )->GetFlyFrame()
: nullptr;
mpWindow = nullptr;
}
-void SwAccessibleChild::Init( const SwFrm* pFrm )
+void SwAccessibleChild::Init( const SwFrame* pFrame )
{
- mpFrm = pFrm;
- mpDrawObj = mpFrm && mpFrm->IsFlyFrm()
- ? static_cast < const SwFlyFrm * >( mpFrm )->GetVirtDrawObj()
+ mpFrame = pFrame;
+ mpDrawObj = mpFrame && mpFrame->IsFlyFrame()
+ ? static_cast < const SwFlyFrame * >( mpFrame )->GetVirtDrawObj()
: nullptr;
mpWindow = nullptr;
}
@@ -116,7 +116,7 @@ void SwAccessibleChild::Init( const SwFrm* pFrm )
void SwAccessibleChild::Init( vcl::Window* pWindow )
{
mpWindow = pWindow;
- mpFrm = nullptr;
+ mpFrame = nullptr;
mpDrawObj = nullptr;
}
@@ -124,14 +124,14 @@ bool SwAccessibleChild::IsAccessible( bool bPagePreview ) const
{
bool bRet( false );
- if ( mpFrm )
+ if ( mpFrame )
{
- bRet = mpFrm->IsAccessibleFrm() &&
- ( !mpFrm->IsCellFrm() ||
- static_cast<const SwCellFrm *>( mpFrm )->GetTabBox()->GetSttNd() != nullptr ) &&
- !mpFrm->IsInCoveredCell() &&
+ bRet = mpFrame->IsAccessibleFrame() &&
+ ( !mpFrame->IsCellFrame() ||
+ static_cast<const SwCellFrame *>( mpFrame )->GetTabBox()->GetSttNd() != nullptr ) &&
+ !mpFrame->IsInCoveredCell() &&
( bPagePreview ||
- !mpFrm->IsPageFrm() );
+ !mpFrame->IsPageFrame() );
}
else if ( mpDrawObj )
{
@@ -149,10 +149,10 @@ bool SwAccessibleChild::IsBoundAsChar() const
{
bool bRet( false );
- if ( mpFrm )
+ if ( mpFrame )
{
- bRet = mpFrm->IsFlyFrm() &&
- static_cast< const SwFlyFrm *>(mpFrm)->IsFlyInCntFrm();
+ bRet = mpFrame->IsFlyFrame() &&
+ static_cast< const SwFlyFrame *>(mpFrame)->IsFlyInContentFrame();
}
else if ( mpDrawObj )
{
@@ -169,7 +169,7 @@ bool SwAccessibleChild::IsBoundAsChar() const
}
SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
- : mpFrm( r.mpFrm )
+ : mpFrame( r.mpFrame )
, mpDrawObj( r.mpDrawObj )
, mpWindow( r.mpWindow )
{}
@@ -177,7 +177,7 @@ SwAccessibleChild::SwAccessibleChild( const SwAccessibleChild& r )
SwAccessibleChild& SwAccessibleChild::operator=( const SwAccessibleChild& r )
{
mpDrawObj = r.mpDrawObj;
- mpFrm = r.mpFrm;
+ mpFrame = r.mpFrame;
mpWindow = r.mpWindow;
return *this;
@@ -189,9 +189,9 @@ SwAccessibleChild& SwAccessibleChild::operator=( const SdrObject* pDrawObj )
return *this;
}
-SwAccessibleChild& SwAccessibleChild::operator=( const SwFrm* pFrm )
+SwAccessibleChild& SwAccessibleChild::operator=( const SwFrame* pFrame )
{
- Init( pFrm );
+ Init( pFrame );
return *this;
}
@@ -203,14 +203,14 @@ SwAccessibleChild& SwAccessibleChild::operator=( vcl::Window* pWindow )
bool SwAccessibleChild::operator==( const SwAccessibleChild& r ) const
{
- return mpFrm == r.mpFrm &&
+ return mpFrame == r.mpFrame &&
mpDrawObj == r.mpDrawObj &&
mpWindow == r.mpWindow;
}
bool SwAccessibleChild::IsValid() const
{
- return mpFrm != nullptr ||
+ return mpFrame != nullptr ||
mpDrawObj != nullptr ||
mpWindow != nullptr;
}
@@ -219,17 +219,17 @@ bool SwAccessibleChild::IsVisibleChildrenOnly() const
{
bool bRet( false );
- if ( !mpFrm )
+ if ( !mpFrame )
{
bRet = true;
}
else
{
- bRet = mpFrm->IsRootFrm() ||
- !( mpFrm->IsTabFrm() ||
- mpFrm->IsInTab() ||
+ bRet = mpFrame->IsRootFrame() ||
+ !( mpFrame->IsTabFrame() ||
+ mpFrame->IsInTab() ||
( IsBoundAsChar() &&
- static_cast<const SwFlyFrm*>(mpFrm)->GetAnchorFrm()->IsInTab() ) );
+ static_cast<const SwFlyFrame*>(mpFrame)->GetAnchorFrame()->IsInTab() ) );
}
return bRet;
@@ -239,21 +239,21 @@ SwRect SwAccessibleChild::GetBox( const SwAccessibleMap& rAccMap ) const
{
SwRect aBox;
- if ( mpFrm )
+ if ( mpFrame )
{
- if ( mpFrm->IsPageFrm() &&
- static_cast< const SwPageFrm * >( mpFrm )->IsEmptyPage() )
+ if ( mpFrame->IsPageFrame() &&
+ static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
{
- aBox = SwRect( mpFrm->Frm().Left(), mpFrm->Frm().Top()-1, 1, 1 );
+ aBox = SwRect( mpFrame->Frame().Left(), mpFrame->Frame().Top()-1, 1, 1 );
}
- else if ( mpFrm->IsTabFrm() )
+ else if ( mpFrame->IsTabFrame() )
{
- aBox = SwRect( mpFrm->Frm() );
- aBox.Intersection( mpFrm->GetUpper()->Frm() );
+ aBox = SwRect( mpFrame->Frame() );
+ aBox.Intersection( mpFrame->GetUpper()->Frame() );
}
else
{
- aBox = mpFrm->Frm();
+ aBox = mpFrame->Frame();
}
}
else if( mpDrawObj )
@@ -278,15 +278,15 @@ SwRect SwAccessibleChild::GetBounds( const SwAccessibleMap& rAccMap ) const
{
SwRect aBound;
- if( mpFrm )
+ if( mpFrame )
{
- if( mpFrm->IsPageFrm() &&
- static_cast< const SwPageFrm * >( mpFrm )->IsEmptyPage() )
+ if( mpFrame->IsPageFrame() &&
+ static_cast< const SwPageFrame * >( mpFrame )->IsEmptyPage() )
{
- aBound = SwRect( mpFrm->Frm().Left(), mpFrm->Frm().Top()-1, 0, 0 );
+ aBound = SwRect( mpFrame->Frame().Left(), mpFrame->Frame().Top()-1, 0, 0 );
}
else
- aBound = mpFrm->PaintArea();
+ aBound = mpFrame->PaintArea();
}
else if( mpDrawObj )
{
@@ -312,19 +312,19 @@ bool SwAccessibleChild::AlwaysIncludeAsChild() const
return bAlwaysIncludedAsChild;
}
-const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
+const SwFrame* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
{
- const SwFrm* pParent( nullptr );
+ const SwFrame* pParent( nullptr );
- if ( mpFrm )
+ if ( mpFrame )
{
- if( mpFrm->IsFlyFrm() )
+ if( mpFrame->IsFlyFrame() )
{
- const SwFlyFrm* pFly = static_cast< const SwFlyFrm *>( mpFrm );
- if( pFly->IsFlyInCntFrm() )
+ const SwFlyFrame* pFly = static_cast< const SwFlyFrame *>( mpFrame );
+ if( pFly->IsFlyInContentFrame() )
{
// For FLY_AS_CHAR the parent is the anchor
- pParent = pFly->GetAnchorFrm();
+ pParent = pFly->GetAnchorFrame();
OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
"parent is not accessible" );
}
@@ -333,19 +333,19 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
// In any other case the parent is the root frm
// (in page preview, the page frame)
if( bInPagePreview )
- pParent = pFly->FindPageFrm();
+ pParent = pFly->FindPageFrame();
else
- pParent = pFly->getRootFrm();
+ pParent = pFly->getRootFrame();
}
}
else
{
- SwAccessibleChild aUpper( mpFrm->GetUpper() );
- while( aUpper.GetSwFrm() && !aUpper.IsAccessible(bInPagePreview) )
+ SwAccessibleChild aUpper( mpFrame->GetUpper() );
+ while( aUpper.GetSwFrame() && !aUpper.IsAccessible(bInPagePreview) )
{
- aUpper = aUpper.GetSwFrm()->GetUpper();
+ aUpper = aUpper.GetSwFrame()->GetUpper();
}
- pParent = aUpper.GetSwFrm();
+ pParent = aUpper.GetSwFrame();
}
}
else if( mpDrawObj )
@@ -360,7 +360,7 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
if( pFrameFormat && FLY_AS_CHAR == pFrameFormat->GetAnchor().GetAnchorId() )
{
// For FLY_AS_CHAR the parent is the anchor
- pParent = pContact->GetAnchorFrm();
+ pParent = pContact->GetAnchorFrame();
OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
"parent is not accessible" );
@@ -369,9 +369,9 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
{
// In any other case the parent is the root frm
if( bInPagePreview )
- pParent = pContact->GetAnchorFrm()->FindPageFrm();
+ pParent = pContact->GetAnchorFrame()->FindPageFrame();
else
- pParent = pContact->GetAnchorFrm()->getRootFrm();
+ pParent = pContact->GetAnchorFrame()->getRootFrame();
}
}
}
@@ -393,7 +393,7 @@ const SwFrm* SwAccessibleChild::GetParent( const bool bInPagePreview ) const
dynamic_cast< SwAccessibleContext *>( xAccParent.get() );
if ( pAccParentImpl )
{
- pParent = pAccParentImpl->GetFrm();
+ pParent = pAccParentImpl->GetFrame();
}
}
}
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 31a489e43640..e05ddc100f45 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -23,7 +23,7 @@
#include <vcl/vclptr.hxx>
class SwAccessibleMap;
-class SwFrm;
+class SwFrame;
class SdrObject;
namespace vcl { class Window; }
class SwRect;
@@ -35,9 +35,9 @@ class SwAccessibleChild
public:
SwAccessibleChild();
explicit SwAccessibleChild( const SdrObject* pDrawObj );
- explicit SwAccessibleChild( const SwFrm* pFrm );
+ explicit SwAccessibleChild( const SwFrame* pFrame );
explicit SwAccessibleChild( vcl::Window* pWindow );
- SwAccessibleChild( const SwFrm* pFrm,
+ SwAccessibleChild( const SwFrame* pFrame,
const SdrObject* pDrawObj,
vcl::Window* pWindow );
@@ -45,18 +45,18 @@ class SwAccessibleChild
SwAccessibleChild& operator=( const SwAccessibleChild& r );
SwAccessibleChild& operator=( const SdrObject* pDrawObj );
- SwAccessibleChild& operator=( const SwFrm* pFrm );
+ SwAccessibleChild& operator=( const SwFrame* pFrame );
SwAccessibleChild& operator=( vcl::Window* pWindow );
bool operator==( const SwAccessibleChild& r ) const;
bool IsValid() const;
- const SwFrm* GetSwFrm() const { return mpFrm; }
+ const SwFrame* GetSwFrame() const { return mpFrame; }
const SdrObject* GetDrawObject() const { return mpDrawObj; }
vcl::Window* GetWindow() const { return mpWindow; }
- const SwFrm* GetParent( const bool bInPagePreview ) const;
+ const SwFrame* GetParent( const bool bInPagePreview ) const;
bool IsAccessible( bool bPagePreview ) const;
bool IsBoundAsChar() const;
@@ -70,12 +70,12 @@ class SwAccessibleChild
bool AlwaysIncludeAsChild() const;
private:
- const SwFrm* mpFrm;
+ const SwFrame* mpFrame;
const SdrObject* mpDrawObj;
VclPtr<vcl::Window> mpWindow;
void Init( const SdrObject* pDrawObj );
- void Init( const SwFrm* pFrm );
+ void Init( const SwFrame* pFrame );
void Init( vcl::Window* pWindow );
};
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 05168a432a36..ec2622178b97 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -37,16 +37,16 @@
using namespace sw::access;
SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
SwAccessibleMap& rAccMap )
: nHellId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetHellId() )
, nControlsId( rAccMap.GetShell()->GetDoc()->getIDocumentDrawModelAccess().GetControlsId() )
{
- const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrm ).IsVisibleChildrenOnly();
+ const bool bVisibleChildrenOnly = SwAccessibleChild( &rFrame ).IsVisibleChildrenOnly();
sal_uInt32 nPos = 0;
- SwAccessibleChild aLower( rFrm.GetLower() );
- while( aLower.GetSwFrm() )
+ SwAccessibleChild aLower( rFrame.GetLower() );
+ while( aLower.GetSwFrame() )
{
if ( !bVisibleChildrenOnly ||
aLower.AlwaysIncludeAsChild() ||
@@ -55,15 +55,15 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
insert( nPos++, SwAccessibleChildMapKey::TEXT, aLower );
}
- aLower = aLower.GetSwFrm()->GetNext();
+ aLower = aLower.GetSwFrame()->GetNext();
}
- if ( rFrm.IsPageFrm() )
+ if ( rFrame.IsPageFrame() )
{
OSL_ENSURE( bVisibleChildrenOnly, "page frame within tab frame???" );
- const SwPageFrm *pPgFrm =
- static_cast< const SwPageFrm * >( &rFrm );
- const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
+ const SwPageFrame *pPgFrame =
+ static_cast< const SwPageFrame * >( &rFrame );
+ const SwSortedObjs *pObjs = pPgFrame->GetSortedObjs();
if ( pObjs )
{
for( size_t i=0; i<pObjs->size(); ++i )
@@ -76,9 +76,9 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
}
}
}
- else if( rFrm.IsTextFrm() )
+ else if( rFrame.IsTextFrame() )
{
- const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
+ const SwSortedObjs *pObjs = rFrame.GetDrawObjs();
if ( pObjs )
{
for( size_t i=0; i<pObjs->size(); ++i )
@@ -96,7 +96,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
- rAccMap.GetContextImpl( &rFrm, false );
+ rAccMap.GetContextImpl( &rFrame, false );
if( xAccImpl.is() )
{
SwAccessibleContext* pAccImpl = xAccImpl.get();
@@ -149,12 +149,12 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
return insert( aEntry );
}
-bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
+bool SwAccessibleChildMap::IsSortingRequired( const SwFrame& rFrame )
{
- return ( rFrm.IsPageFrm() &&
- static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
- ( rFrm.IsTextFrm() &&
- rFrm.GetDrawObjs() );
+ return ( rFrame.IsPageFrame() &&
+ static_cast< const SwPageFrame& >( rFrame ).GetSortedObjs() ) ||
+ ( rFrame.IsTextFrame() &&
+ rFrame.GetDrawObjs() );
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index d2593333f819..53ccbd0dc978 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -27,7 +27,7 @@
class SwAccessibleMap;
class SwRect;
-class SwFrm;
+class SwFrame;
class SdrObject;
class SwAccessibleChildMapKey
@@ -75,9 +75,9 @@ public:
/* MT: Need to get this position parameter stuff in dev300 somehow...
//This methods are used to insert an object to the map, adding a position parameter.
::std::pair< iterator, bool > insert( sal_uInt32 nOrd, Point nPos,
- const SwFrmOrObj& rLower );
+ const SwFrameOrObj& rLower );
::std::pair< iterator, bool > insert( const SdrObject *pObj,
- const SwFrmOrObj& rLower,
+ const SwFrameOrObj& rLower,
const SwDoc *pDoc,
Point nPos);
*/
@@ -113,10 +113,10 @@ private:
public:
SwAccessibleChildMap( const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
SwAccessibleMap& rAccMap );
- static bool IsSortingRequired( const SwFrm& rFrm );
+ static bool IsSortingRequired( const SwFrame& rFrame );
const_iterator cbegin() const { return maMap.cbegin(); }
const_iterator cend() const { return maMap.cend(); }
diff --git a/sw/source/core/access/accfrmobjslist.cxx b/sw/source/core/access/accfrmobjslist.cxx
index 5c3cb557d0a1..36d6a880b5b0 100644
--- a/sw/source/core/access/accfrmobjslist.cxx
+++ b/sw/source/core/access/accfrmobjslist.cxx
@@ -31,24 +31,24 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
const SwAccessibleChildSList& rLst,
SwAccessibleMap& rAccMap )
: rList( rLst ),
- aCurr( rList.GetFrm().GetLower() ),
+ aCurr( rList.GetFrame().GetLower() ),
nNextObj( 0 )
{
- if( !aCurr.GetSwFrm() )
+ if( !aCurr.GetSwFrame() )
{
- const SwFrm& rFrm = rList.GetFrm();
- if( rFrm.IsPageFrm() )
+ const SwFrame& rFrame = rList.GetFrame();
+ if( rFrame.IsPageFrame() )
{
- const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm );
- const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs();
+ const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
+ const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
if( pObjs && pObjs->size() )
{
aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
}
}
- else if( rFrm.IsTextFrm() )
+ else if( rFrame.IsTextFrame() )
{
- const SwSortedObjs *pObjs = rFrm.GetDrawObjs();
+ const SwSortedObjs *pObjs = rFrame.GetDrawObjs();
if ( pObjs && pObjs->size() )
{
aCurr = (*pObjs)[nNextObj++]->GetDrawObj();
@@ -62,7 +62,7 @@ SwAccessibleChildSList_const_iterator::SwAccessibleChildSList_const_iterator(
if ( !aCurr.IsValid() )
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
- rAccMap.GetContextImpl( &rFrm, false );
+ rAccMap.GetContextImpl( &rFrame, false );
if( xAccImpl.is() )
{
SwAccessibleContext* pAccImpl = xAccImpl.get();
@@ -92,10 +92,10 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
{
bNextTaken = false;
}
- else if( aCurr.GetSwFrm() )
+ else if( aCurr.GetSwFrame() )
{
- aCurr = aCurr.GetSwFrm()->GetNext();
- if( !aCurr.GetSwFrm() )
+ aCurr = aCurr.GetSwFrame()->GetNext();
+ if( !aCurr.GetSwFrame() )
{
bNextTaken = false;
}
@@ -103,18 +103,18 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
if( !bNextTaken )
{
- const SwFrm& rFrm = rList.GetFrm();
- if( rFrm.IsPageFrm() )
+ const SwFrame& rFrame = rList.GetFrame();
+ if( rFrame.IsPageFrame() )
{
- const SwPageFrm& rPgFrm = static_cast< const SwPageFrm& >( rFrm );
- const SwSortedObjs *pObjs = rPgFrm.GetSortedObjs();
+ const SwPageFrame& rPgFrame = static_cast< const SwPageFrame& >( rFrame );
+ const SwSortedObjs *pObjs = rPgFrame.GetSortedObjs();
aCurr = ( pObjs && nNextObj < pObjs->size() )
? (*pObjs)[nNextObj++]->GetDrawObj()
: static_cast< const SdrObject *>( nullptr );
}
- else if( rFrm.IsTextFrm() )
+ else if( rFrame.IsTextFrame() )
{
- const SwSortedObjs* pObjs = rFrm.GetDrawObjs();
+ const SwSortedObjs* pObjs = rFrame.GetDrawObjs();
const size_t nObjsCount = pObjs ? pObjs->size() : 0;
aCurr = ( pObjs && nNextObj < nObjsCount )
? (*pObjs)[nNextObj++]->GetDrawObj()
@@ -128,7 +128,7 @@ SwAccessibleChildSList_const_iterator& SwAccessibleChildSList_const_iterator::ne
if ( !aCurr.IsValid() )
{
::rtl::Reference < SwAccessibleContext > xAccImpl =
- rList.GetAccMap().GetContextImpl( &rFrm, false );
+ rList.GetAccMap().GetContextImpl( &rFrame, false );
if( xAccImpl.is() )
{
SwAccessibleContext* pAccImpl = xAccImpl.get();
diff --git a/sw/source/core/access/accfrmobjslist.hxx b/sw/source/core/access/accfrmobjslist.hxx
index d009ed72cf1b..863d86e9d6d2 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -76,27 +76,27 @@ public:
class SwAccessibleChildSList
{
const SwRect maVisArea;
- const SwFrm& mrFrm;
+ const SwFrame& mrFrame;
const bool mbVisibleChildrenOnly;
SwAccessibleMap& mrAccMap;
public:
typedef SwAccessibleChildSList_const_iterator const_iterator;
- inline SwAccessibleChildSList( const SwFrm& rFrm,
+ inline SwAccessibleChildSList( const SwFrame& rFrame,
SwAccessibleMap& rAccMap )
: maVisArea()
- , mrFrm( rFrm )
+ , mrFrame( rFrame )
, mbVisibleChildrenOnly( false )
, mrAccMap( rAccMap )
{}
inline SwAccessibleChildSList( const SwRect& rVisArea,
- const SwFrm& rFrm,
+ const SwFrame& rFrame,
SwAccessibleMap& rAccMap )
: maVisArea( rVisArea )
- , mrFrm( rFrm )
- , mbVisibleChildrenOnly( sw::access::SwAccessibleChild( &rFrm ).IsVisibleChildrenOnly() )
+ , mrFrame( rFrame )
+ , mbVisibleChildrenOnly( sw::access::SwAccessibleChild( &rFrame ).IsVisibleChildrenOnly() )
, mrAccMap( rAccMap )
{
}
@@ -111,9 +111,9 @@ public:
return SwAccessibleChildSList_const_iterator( *this );
}
- inline const SwFrm& GetFrm() const
+ inline const SwFrame& GetFrame() const
{
- return mrFrm;
+ return mrFrame;
}
inline bool IsVisibleChildrenOnly() const
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index c29ca478c9ca..6c6a697d9adc 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -33,8 +33,8 @@ using namespace ::com::sun::star::accessibility;
SwAccessibleGraphic::SwAccessibleGraphic(
SwAccessibleMap* pInitMap,
- const SwFlyFrm* pFlyFrm ) :
- SwAccessibleNoTextFrame( pInitMap, AccessibleRole::GRAPHIC, pFlyFrm )
+ const SwFlyFrame* pFlyFrame ) :
+ SwAccessibleNoTextFrame( pInitMap, AccessibleRole::GRAPHIC, pFlyFrame )
{
}
@@ -76,7 +76,7 @@ sal_Int16 SAL_CALL SwAccessibleGraphic::getAccessibleRole()
{
SolarMutexGuard g;
- SwFormatURL aURL( static_cast<const SwLayoutFrm*>(GetFrm())->GetFormat()->GetURL() );
+ SwFormatURL aURL( static_cast<const SwLayoutFrame*>(GetFrame())->GetFormat()->GetURL() );
if (aURL.GetMap())
return AccessibleRole::IMAGE_MAP;
diff --git a/sw/source/core/access/accgraphic.hxx b/sw/source/core/access/accgraphic.hxx
index 35c50b29ddd0..44bac5c5e764 100644
--- a/sw/source/core/access/accgraphic.hxx
+++ b/sw/source/core/access/accgraphic.hxx
@@ -29,7 +29,7 @@ protected:
public:
SwAccessibleGraphic( SwAccessibleMap* pInitMap,
- const SwFlyFrm *pFlyFrm );
+ const SwFlyFrame *pFlyFrame );
// XServiceInfo
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index aa594c5fe908..36327d58f70f 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -38,23 +38,23 @@ const sal_Char sImplementationNameFooter[] = "com.sun.star.comp.Writer.SwAccessi
SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
SwAccessibleMap* pInitMap,
- const SwHeaderFrm* pHdFrm ) :
- SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrm )
+ const SwHeaderFrame* pHdFrame ) :
+ SwAccessibleContext( pInitMap, AccessibleRole::HEADER, pHdFrame )
{
SolarMutexGuard aGuard;
- OUString sArg( OUString::number( pHdFrm->GetPhyPageNum() ) );
+ OUString sArg( OUString::number( pHdFrame->GetPhyPageNum() ) );
SetName( GetResource( STR_ACCESS_HEADER_NAME, &sArg ) );
}
SwAccessibleHeaderFooter::SwAccessibleHeaderFooter(
SwAccessibleMap* pInitMap,
- const SwFooterFrm* pFtFrm ) :
- SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrm )
+ const SwFooterFrame* pFtFrame ) :
+ SwAccessibleContext( pInitMap, AccessibleRole::FOOTER, pFtFrame )
{
SolarMutexGuard aGuard;
- OUString sArg( OUString::number( pFtFrm->GetPhyPageNum() ) );
+ OUString sArg( OUString::number( pFtFrame->GetPhyPageNum() ) );
SetName( GetResource( STR_ACCESS_FOOTER_NAME, &sArg ) );
}
diff --git a/sw/source/core/access/accheaderfooter.hxx b/sw/source/core/access/accheaderfooter.hxx
index 7f91d40eca7a..b3fe7aeb2796 100644
--- a/sw/source/core/access/accheaderfooter.hxx
+++ b/sw/source/core/access/accheaderfooter.hxx
@@ -22,8 +22,8 @@
#include "acccontext.hxx"
-class SwHeaderFrm;
-class SwFooterFrm;
+class SwHeaderFrame;
+class SwFooterFrame;
class SwAccessibleHeaderFooter : public SwAccessibleContext
{
@@ -32,9 +32,9 @@ protected:
public:
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
- const SwHeaderFrm* pHdFrm );
+ const SwHeaderFrame* pHdFrame );
SwAccessibleHeaderFooter( SwAccessibleMap* pInitMap,
- const SwFooterFrm* pFtFrm );
+ const SwFooterFrame* pFtFrame );
// XAccessibleContext
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index b8504b61f353..817bdfd2ebc9 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -76,9 +76,9 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::accessibility;
using namespace ::sw::access;
-struct SwFrmFunc
+struct SwFrameFunc
{
- bool operator()( const SwFrm * p1, const SwFrm * p2) const
+ bool operator()( const SwFrame * p1, const SwFrame * p2) const
{
return p1 < p2;
}
@@ -87,10 +87,10 @@ struct SwFrmFunc
class SwAccessibleContextMap_Impl
{
public:
- typedef const SwFrm * key_type;
+ typedef const SwFrame * key_type;
typedef uno::WeakReference < XAccessible > mapped_type;
typedef std::pair<const key_type,mapped_type> value_type;
- typedef SwFrmFunc key_compare;
+ typedef SwFrameFunc key_compare;
typedef std::map<key_type,mapped_type,key_compare>::iterator iterator;
typedef std::map<key_type,mapped_type,key_compare>::const_iterator const_iterator;
private:
@@ -338,36 +338,36 @@ private:
SwRect maOldBox; // the old bounds for CHILD_POS_CHANGED
// and POS_CHANGED
uno::WeakReference < XAccessible > mxAcc; // The object that fires the event
- SwAccessibleChild maFrmOrObj; // the child for CHILD_POS_CHANGED and
+ SwAccessibleChild maFrameOrObj; // the child for CHILD_POS_CHANGED and
// the same as xAcc for any other
// event type
EventType meType; // The event type
AccessibleStates mnStates; // check states or update caret pos
public:
- const SwFrm* mpParentFrm; // The object that fires the event
- bool IsNoXaccParentFrm() const
+ const SwFrame* mpParentFrame; // The object that fires the event
+ bool IsNoXaccParentFrame() const
{
- return CHILD_POS_CHANGED == meType && mpParentFrm != nullptr;
+ return CHILD_POS_CHANGED == meType && mpParentFrame != nullptr;
}
public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrmOrObj )
+ const SwAccessibleChild& rFrameOrObj )
: mxAcc( pA ),
- maFrmOrObj( rFrmOrObj ),
+ maFrameOrObj( rFrameOrObj ),
meType( eT ),
mnStates( AccessibleStates::NONE ),
- mpParentFrm( nullptr )
+ mpParentFrame( nullptr )
{}
SwAccessibleEvent_Impl( EventType eT,
- const SwAccessibleChild& rFrmOrObj )
- : maFrmOrObj( rFrmOrObj ),
+ const SwAccessibleChild& rFrameOrObj )
+ : maFrameOrObj( rFrameOrObj ),
meType( eT ),
mnStates( AccessibleStates::NONE ),
- mpParentFrm( nullptr )
+ mpParentFrame( nullptr )
{
assert(SwAccessibleEvent_Impl::DISPOSE == meType &&
"wrong event constructor, DISPOSE only");
@@ -376,7 +376,7 @@ public:
explicit SwAccessibleEvent_Impl( EventType eT )
: meType( eT ),
mnStates( AccessibleStates::NONE ),
- mpParentFrm( nullptr )
+ mpParentFrame( nullptr )
{
assert(SwAccessibleEvent_Impl::SHAPE_SELECTION == meType &&
"wrong event constructor, SHAPE_SELECTION only" );
@@ -384,14 +384,14 @@ public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrmOrObj,
+ const SwAccessibleChild& rFrameOrObj,
const SwRect& rR )
: maOldBox( rR ),
mxAcc( pA ),
- maFrmOrObj( rFrmOrObj ),
+ maFrameOrObj( rFrameOrObj ),
meType( eT ),
mnStates( AccessibleStates::NONE ),
- mpParentFrm( nullptr )
+ mpParentFrame( nullptr )
{
assert((SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
SwAccessibleEvent_Impl::POS_CHANGED == meType) &&
@@ -400,25 +400,25 @@ public:
SwAccessibleEvent_Impl( EventType eT,
SwAccessibleContext *pA,
- const SwAccessibleChild& rFrmOrObj,
+ const SwAccessibleChild& rFrameOrObj,
const AccessibleStates _nStates )
: mxAcc( pA ),
- maFrmOrObj( rFrmOrObj ),
+ maFrameOrObj( rFrameOrObj ),
meType( eT ),
mnStates( _nStates ),
- mpParentFrm( nullptr )
+ mpParentFrame( nullptr )
{
assert( SwAccessibleEvent_Impl::CARET_OR_STATES == meType &&
"wrong event constructor, CARET_OR_STATES only" );
}
- SwAccessibleEvent_Impl( EventType eT, const SwFrm *pParentFrm,
- const SwAccessibleChild& rFrmOrObj, const SwRect& rR ) :
+ SwAccessibleEvent_Impl( EventType eT, const SwFrame *pParentFrame,
+ const SwAccessibleChild& rFrameOrObj, const SwRect& rR ) :
maOldBox( rR ),
- maFrmOrObj( rFrmOrObj ),
+ maFrameOrObj( rFrameOrObj ),
meType( eT ),
mnStates( AccessibleStates::NONE ),
- mpParentFrm( pParentFrm )
+ mpParentFrame( pParentFrame )
{
assert( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType &&
"wrong event constructor, CHILD_POS_CHANGED only" );
@@ -453,9 +453,9 @@ public:
maOldBox = rOldBox;
}
- inline const SwAccessibleChild& GetFrmOrObj() const
+ inline const SwAccessibleChild& GetFrameOrObj() const
{
- return maFrmOrObj;
+ return maFrameOrObj;
}
// <SetStates(..)> only used in method <SwAccessibleMap::AppendEvent(..)>
@@ -530,7 +530,7 @@ void SwAccessibleEventList_Impl::MoveInvalidXAccToEnd()
for ( ;li != end();)
{
SwAccessibleEvent_Impl e = *li;
- if (e.IsNoXaccParentFrm())
+ if (e.IsNoXaccParentFrame())
{
iterator liNext = li;
++liNext;
@@ -568,13 +568,13 @@ struct SwAccessibleChildFunc
bool operator()( const SwAccessibleChild& r1,
const SwAccessibleChild& r2 ) const
{
- const void *p1 = r1.GetSwFrm()
- ? static_cast < const void * >( r1.GetSwFrm())
+ const void *p1 = r1.GetSwFrame()
+ ? static_cast < const void * >( r1.GetSwFrame())
: ( r1.GetDrawObject()
? static_cast < const void * >( r1.GetDrawObject() )
: static_cast < const void * >( r1.GetWindow() ) );
- const void *p2 = r2.GetSwFrm()
- ? static_cast < const void * >( r2.GetSwFrm())
+ const void *p2 = r2.GetSwFrame()
+ ? static_cast < const void * >( r2.GetSwFrame())
: ( r2.GetDrawObject()
? static_cast < const void * >( r2.GetDrawObject() )
: static_cast < const void * >( r2.GetWindow() ) );
@@ -653,7 +653,7 @@ class SwAccPreviewData
SwRect maVisArea;
Fraction maScale;
- const SwPageFrm *mpSelPage;
+ const SwPageFrame *mpSelPage;
/** adjust logic page rectangle to its visible part
@@ -680,10 +680,10 @@ public:
void Update( const SwAccessibleMap& rAccMap,
const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize );
- void InvalidateSelection( const SwPageFrm* _pSelectedPageFrm );
+ void InvalidateSelection( const SwPageFrame* _pSelectedPageFrame );
const SwRect& GetVisArea() const { return maVisArea;}
@@ -694,9 +694,9 @@ public:
void AdjustMapMode( MapMode& rMapMode,
const Point& rPoint ) const;
- inline const SwPageFrm *GetSelPage() const { return mpSelPage; }
+ inline const SwPageFrame *GetSelPage() const { return mpSelPage; }
- void DisposePage(const SwPageFrm *pPageFrm );
+ void DisposePage(const SwPageFrame *pPageFrame );
};
SwAccPreviewData::SwAccPreviewData() :
@@ -711,12 +711,12 @@ SwAccPreviewData::~SwAccPreviewData()
void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize )
{
// store preview scaling, maximal preview page size and selected page
maScale = _rScale;
- mpSelPage = _pSelectedPageFrm;
+ mpSelPage = _pSelectedPageFrame;
// prepare loop on preview pages
maPreviewRects.clear();
@@ -757,9 +757,9 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
}
}
-void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm )
+void SwAccPreviewData::InvalidateSelection( const SwPageFrame* _pSelectedPageFrame )
{
- mpSelPage = _pSelectedPageFrm;
+ mpSelPage = _pSelectedPageFrame;
OSL_ENSURE( mpSelPage, "selected page not found" );
}
@@ -797,9 +797,9 @@ void SwAccPreviewData::AdjustMapMode( MapMode& rMapMode,
// else: don't adjust MapMode
}
-void SwAccPreviewData::DisposePage(const SwPageFrm *pPageFrm )
+void SwAccPreviewData::DisposePage(const SwPageFrame *pPageFrame )
{
- if( mpSelPage == pPageFrm )
+ if( mpSelPage == pPageFrame )
mpSelPage = nullptr;
}
@@ -835,11 +835,11 @@ void SwAccPreviewData::AdjustLogicPgRectToVisibleArea(
}
static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
- const SwFrm *pFrm )
+ const SwFrame *pFrame )
{
bool bRet = false;
- if( pFrm && pFrm->IsCellFrm() && rAcc.is() )
+ if( pFrame && pFrame->IsCellFrame() && rAcc.is() )
{
// Is it in the same table? We check that
// by comparing the last table frame in the
@@ -847,23 +847,23 @@ static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
// searching the first one.
SwAccessibleContext *pAccImpl =
static_cast< SwAccessibleContext *>( rAcc.get() );
- if( pAccImpl->GetFrm()->IsCellFrm() )
+ if( pAccImpl->GetFrame()->IsCellFrame() )
{
- const SwTabFrm *pTabFrm1 = pAccImpl->GetFrm()->FindTabFrm();
- if (pTabFrm1)
+ const SwTabFrame *pTabFrame1 = pAccImpl->GetFrame()->FindTabFrame();
+ if (pTabFrame1)
{
- while (pTabFrm1->GetFollow())
- pTabFrm1 = pTabFrm1->GetFollow();
+ while (pTabFrame1->GetFollow())
+ pTabFrame1 = pTabFrame1->GetFollow();
}
- const SwTabFrm *pTabFrm2 = pFrm->FindTabFrm();
- if (pTabFrm2)
+ const SwTabFrame *pTabFrame2 = pFrame->FindTabFrame();
+ if (pTabFrame2)
{
- while (pTabFrm2->GetFollow())
- pTabFrm2 = pTabFrm2->GetFollow();
+ while (pTabFrame2->GetFollow())
+ pTabFrame2 = pTabFrame2->GetFollow();
}
- bRet = (pTabFrm1 == pTabFrm2);
+ bRet = (pTabFrame1 == pTabFrame2);
}
}
@@ -873,11 +873,11 @@ static bool AreInSameTable( const uno::Reference< XAccessible >& rAcc,
void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
{
::rtl::Reference < SwAccessibleContext > xAccImpl( rEvent.GetContext() );
- if (!xAccImpl.is() && rEvent.mpParentFrm != nullptr)
+ if (!xAccImpl.is() && rEvent.mpParentFrame != nullptr)
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( rEvent.mpParentFrm );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( rEvent.mpParentFrame );
+ if( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xAcc( (*aIter).second );
if (xAcc.is())
@@ -894,7 +894,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
{
DoInvalidateShapeSelection();
}
- else if( xAccImpl.is() && xAccImpl->GetFrm() )
+ else if( xAccImpl.is() && xAccImpl->GetFrame() )
{
if ( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE &&
rEvent.IsInvalidateTextAttrs() )
@@ -910,7 +910,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
xAccImpl->InvalidatePosOrSize( rEvent.GetOldBox() );
break;
case SwAccessibleEvent_Impl::CHILD_POS_CHANGED:
- xAccImpl->InvalidateChildPosOrSize( rEvent.GetFrmOrObj(),
+ xAccImpl->InvalidateChildPosOrSize( rEvent.GetFrameOrObj(),
rEvent.GetOldBox() );
break;
case SwAccessibleEvent_Impl::DISPOSE:
@@ -974,7 +974,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
{
SwAccessibleEventMap_Impl::iterator aIter =
- mpEventMap->find( rEvent.GetFrmOrObj() );
+ mpEventMap->find( rEvent.GetFrameOrObj() );
if( aIter != mpEventMap->end() )
{
SwAccessibleEvent_Impl aEvent( *(*aIter).second );
@@ -1059,7 +1059,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
}
else if( SwAccessibleEvent_Impl::DISPOSE != rEvent.GetType() )
{
- SwAccessibleEventMap_Impl::value_type aEntry( rEvent.GetFrmOrObj(),
+ SwAccessibleEventMap_Impl::value_type aEntry( rEvent.GetFrameOrObj(),
mpEvents->insert( mpEvents->end(), rEvent ) );
mpEventMap->insert( aEntry );
}
@@ -1072,12 +1072,12 @@ void SwAccessibleMap::InvalidateCursorPosition(
SwAccessibleContext *pAccImpl =
static_cast< SwAccessibleContext *>( rAcc.get() );
OSL_ENSURE( pAccImpl, "no caret context" );
- OSL_ENSURE( pAccImpl->GetFrm(), "caret context is disposed" );
+ OSL_ENSURE( pAccImpl->GetFrame(), "caret context is disposed" );
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
pAccImpl,
- SwAccessibleChild(pAccImpl->GetFrm()),
+ SwAccessibleChild(pAccImpl->GetFrame()),
AccessibleStates::CARET );
AppendEvent( aEvent );
}
@@ -1088,7 +1088,7 @@ void SwAccessibleMap::InvalidateCursorPosition(
// been disposed because it moved out of the vis area.
// Setting the cursor for such frames is useless and even
// causes asserts.
- if( pAccImpl->GetFrm() )
+ if( pAccImpl->GetFrame() )
pAccImpl->InvalidateCursorPos();
}
}
@@ -1121,7 +1121,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
const SwViewShell *pVSh = GetShell();
const SwFEShell *pFESh = dynamic_cast<const SwFEShell*>( pVSh) != nullptr ?
static_cast< const SwFEShell * >( pVSh ) : nullptr;
- SwPaM* pCrsr = pFESh ? pFESh->GetCrsr( false /* ??? */ ) : nullptr;
+ SwPaM* pCursor = pFESh ? pFESh->GetCursor( false /* ??? */ ) : nullptr;
//const size_t nSelShapes = pFESh ? pFESh->IsObjSelected() : 0;
@@ -1155,7 +1155,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
while( aIter != aEndIter )
{
- SwAccessibleChild pFrm( (*aIter).first );
+ SwAccessibleChild pFrame( (*aIter).first );
const SwFrameFormat *pFrameFormat = (*aIter).first ? ::FindFrameFormat( (*aIter).first ) : nullptr;
if( !pFrameFormat )
@@ -1185,21 +1185,21 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
{
int pIndex = pPos->nContent.GetIndex();
bool bMarked = false;
- if( pCrsr != nullptr )
+ if( pCursor != nullptr )
{
const SwTextNode* pNode = pPos->nNode.GetNode().GetTextNode();
sal_uLong nHere = pNode->GetIndex();
- for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+ for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
{
// ignore, if no mark
- if( rTmpCrsr.HasMark() )
+ if( rTmpCursor.HasMark() )
{
bMarked = true;
- // check whether nHere is 'inside' pCrsr
- SwPosition* pStart = rTmpCrsr.Start();
+ // check whether nHere is 'inside' pCursor
+ SwPosition* pStart = rTmpCursor.Start();
sal_uLong nStartIndex = pStart->nNode.GetIndex();
- SwPosition* pEnd = rTmpCrsr.End();
+ SwPosition* pEnd = rTmpCursor.End();
sal_uLong nEndIndex = pEnd->nNode.GetIndex();
if( ( nHere >= nStartIndex ) && (nHere <= nEndIndex) )
{
@@ -1264,25 +1264,25 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
delete[] pShapes;
- //Checked for FlyFrm
- if (mpFrmMap)
+ //Checked for FlyFrame
+ if (mpFrameMap)
{
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
- while( aIter != mpFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+ while( aIter != mpFrameMap->end() )
{
- const SwFrm *pFrm = (*aIter).first;
- if(pFrm->IsFlyFrm())
+ const SwFrame *pFrame = (*aIter).first;
+ if(pFrame->IsFlyFrame())
{
uno::Reference < XAccessible > xAcc = (*aIter).second;
if(xAcc.is())
{
SwAccessibleFrameBase *pAccFrame = (static_cast< SwAccessibleFrameBase * >(xAcc.get()));
- bool bFrmChanged = pAccFrame->SetSelectedState( true );
- if (bFrmChanged)
+ bool bFrameChanged = pAccFrame->SetSelectedState( true );
+ if (bFrameChanged)
{
- const SwFlyFrm *pFlyFrm = static_cast< const SwFlyFrm * >( pFrm );
- const SwFrameFormat *pFrameFormat = pFlyFrm->GetFormat();
+ const SwFlyFrame *pFlyFrame = static_cast< const SwFlyFrame * >( pFrame );
+ const SwFrameFormat *pFrameFormat = pFlyFrame->GetFormat();
if (pFrameFormat)
{
const SwFormatAnchor& pAnchor = pFrameFormat->GetAnchor();
@@ -1320,33 +1320,33 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
//Checked for Paras.
bool bMarkChanged = false;
SwAccessibleContextMap_Impl mapTemp;
- if( pCrsr != nullptr )
+ if( pCursor != nullptr )
{
- for(SwPaM& rTmpCrsr : pCrsr->GetRingContainer())
+ for(SwPaM& rTmpCursor : pCursor->GetRingContainer())
{
- if( rTmpCrsr.HasMark() )
+ if( rTmpCursor.HasMark() )
{
- SwNodeIndex nStartIndex( rTmpCrsr.Start()->nNode );
- SwNodeIndex nEndIndex( rTmpCrsr.End()->nNode );
+ SwNodeIndex nStartIndex( rTmpCursor.Start()->nNode );
+ SwNodeIndex nEndIndex( rTmpCursor.End()->nNode );
while(nStartIndex <= nEndIndex)
{
- SwFrm *pFrm = nullptr;
+ SwFrame *pFrame = nullptr;
if(nStartIndex.GetNode().IsContentNode())
{
SwContentNode* pCNd = static_cast<SwContentNode*>(&(nStartIndex.GetNode()));
- pFrm = SwIterator<SwFrm, SwContentNode>(*pCNd).First();
+ pFrame = SwIterator<SwFrame, SwContentNode>(*pCNd).First();
}
else if( nStartIndex.GetNode().IsTableNode() )
{
SwTableNode * pTable = static_cast<SwTableNode *>(&(nStartIndex.GetNode()));
SwTableFormat* pFormat = pTable->GetTable().GetFrameFormat();
- pFrm = SwIterator<SwFrm, SwTableFormat>(*pFormat).First();
+ pFrame = SwIterator<SwFrame, SwTableFormat>(*pFormat).First();
}
- if( pFrm && mpFrmMap)
+ if( pFrame && mpFrameMap)
{
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pFrm );
- if( aIter != mpFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pFrame );
+ if( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xAcc = (*aIter).second;
bool isChanged = false;
@@ -1356,9 +1356,9 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
if(!isChanged)
{
- SwAccessibleContextMap_Impl::iterator aEraseIter = mpSeletedFrmMap->find( pFrm );
- if(aEraseIter != mpSeletedFrmMap->end())
- mpSeletedFrmMap->erase(aEraseIter);
+ SwAccessibleContextMap_Impl::iterator aEraseIter = mpSeletedFrameMap->find( pFrame );
+ if(aEraseIter != mpSeletedFrameMap->end())
+ mpSeletedFrameMap->erase(aEraseIter);
}
else
{
@@ -1366,7 +1366,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
vecAdd.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
}
- mapTemp.insert( SwAccessibleContextMap_Impl::value_type( pFrm, xAcc ) );
+ mapTemp.insert( SwAccessibleContextMap_Impl::value_type( pFrame, xAcc ) );
}
}
++nStartIndex;
@@ -1374,12 +1374,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
}
}
}
- if( !mpSeletedFrmMap )
- mpSeletedFrmMap = new SwAccessibleContextMap_Impl;
- if( !mpSeletedFrmMap->empty() )
+ if( !mpSeletedFrameMap )
+ mpSeletedFrameMap = new SwAccessibleContextMap_Impl;
+ if( !mpSeletedFrameMap->empty() )
{
- SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrmMap->begin();
- while( aIter != mpSeletedFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpSeletedFrameMap->begin();
+ while( aIter != mpSeletedFrameMap->end() )
{
uno::Reference < XAccessible > xAcc = (*aIter).second;
if(xAcc.is())
@@ -1388,7 +1388,7 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
vecRemove.push_back(static_cast< SwAccessibleContext * >(xAcc.get()));
}
bMarkChanged = true;
- mpSeletedFrmMap->clear();
+ mpSeletedFrameMap->clear();
}
if( !mapTemp.empty() )
@@ -1396,12 +1396,12 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
SwAccessibleContextMap_Impl::iterator aIter = mapTemp.begin();
while( aIter != mapTemp.end() )
{
- mpSeletedFrmMap->insert( SwAccessibleContextMap_Impl::value_type( (*aIter).first, (*aIter).second ) );
+ mpSeletedFrameMap->insert( SwAccessibleContextMap_Impl::value_type( (*aIter).first, (*aIter).second ) );
++aIter;
}
mapTemp.clear();
}
- if( bMarkChanged && mpFrmMap)
+ if( bMarkChanged && mpFrameMap)
{
VEC_PARA::iterator vi = vecAdd.begin();
for (; vi != vecAdd.end() ; ++vi)
@@ -1647,7 +1647,7 @@ void SwAccessibleMap::DoInvalidateShapeFocus()
*/
SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
- mpFrmMap( nullptr ),
+ mpFrameMap( nullptr ),
mpShapeMap( nullptr ),
mpShapes( nullptr ),
mpEvents( nullptr ),
@@ -1657,7 +1657,7 @@ SwAccessibleMap::SwAccessibleMap( SwViewShell *pSh ) :
mpPreview( nullptr ),
mnPara( 1 ),
mbShapeSelected( false ),
- mpSeletedFrmMap(nullptr)
+ mpSeletedFrameMap(nullptr)
{
pSh->GetLayout()->AddAccessibleShell();
}
@@ -1667,11 +1667,11 @@ SwAccessibleMap::~SwAccessibleMap()
uno::Reference < XAccessible > xAcc;
{
osl::MutexGuard aGuard( maMutex );
- if( mpFrmMap )
+ if( mpFrameMap )
{
- const SwRootFrm *pRootFrm = GetShell()->GetLayout();
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pRootFrm );
- if( aIter != mpFrmMap->end() )
+ const SwRootFrame *pRootFrame = GetShell()->GetLayout();
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pRootFrame );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
if( !xAcc.is() )
xAcc = new SwAccessibleDocument( this );
@@ -1683,10 +1683,10 @@ SwAccessibleMap::~SwAccessibleMap()
SwAccessibleDocument *pAcc = static_cast< SwAccessibleDocument * >( xAcc.get() );
pAcc->Dispose( true );
}
- if( mpFrmMap )
+ if( mpFrameMap )
{
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
- while( aIter != mpFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+ while( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xTmp = (*aIter).second;
if( xTmp.is() )
@@ -1700,12 +1700,12 @@ SwAccessibleMap::~SwAccessibleMap()
{
osl::MutexGuard aGuard( maMutex );
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE( !mpFrmMap || mpFrmMap->empty(),
+ OSL_ENSURE( !mpFrameMap || mpFrameMap->empty(),
"Frame map should be empty after disposing the root frame" );
- if( mpFrmMap )
+ if( mpFrameMap )
{
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->begin();
- while( aIter != mpFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->begin();
+ while( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xTmp = (*aIter).second;
if( xTmp.is() )
@@ -1735,8 +1735,8 @@ SwAccessibleMap::~SwAccessibleMap()
}
}
#endif
- delete mpFrmMap;
- mpFrmMap = nullptr;
+ delete mpFrameMap;
+ mpFrameMap = nullptr;
delete mpShapeMap;
mpShapeMap = nullptr;
delete mpShapes;
@@ -1775,7 +1775,7 @@ SwAccessibleMap::~SwAccessibleMap()
mpEvents = nullptr;
}
mpVSh->GetLayout()->RemoveAccessibleShell();
- delete mpSeletedFrmMap;
+ delete mpSeletedFrameMap;
}
uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
@@ -1787,22 +1787,22 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
{
osl::MutexGuard aGuard( maMutex );
- if( !mpFrmMap )
+ if( !mpFrameMap )
{
- mpFrmMap = new SwAccessibleContextMap_Impl;
+ mpFrameMap = new SwAccessibleContextMap_Impl;
#if OSL_DEBUG_LEVEL > 0
- mpFrmMap->mbLocked = false;
+ mpFrameMap->mbLocked = false;
#endif
}
#if OSL_DEBUG_LEVEL > 0
- OSL_ENSURE( !mpFrmMap->mbLocked, "Map is locked" );
- mpFrmMap->mbLocked = true;
+ OSL_ENSURE( !mpFrameMap->mbLocked, "Map is locked" );
+ mpFrameMap->mbLocked = true;
#endif
- const SwRootFrm *pRootFrm = GetShell()->GetLayout();
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pRootFrm );
- if( aIter != mpFrmMap->end() )
+ const SwRootFrame *pRootFrame = GetShell()->GetLayout();
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pRootFrame );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
if( xAcc.is() )
{
@@ -1815,19 +1815,19 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
else
xAcc = new SwAccessibleDocument( this );
- if( aIter != mpFrmMap->end() )
+ if( aIter != mpFrameMap->end() )
{
(*aIter).second = xAcc;
}
else
{
- SwAccessibleContextMap_Impl::value_type aEntry( pRootFrm, xAcc );
- mpFrmMap->insert( aEntry );
+ SwAccessibleContextMap_Impl::value_type aEntry( pRootFrame, xAcc );
+ mpFrameMap->insert( aEntry );
}
}
#if OSL_DEBUG_LEVEL > 0
- mpFrmMap->mbLocked = false;
+ mpFrameMap->mbLocked = false;
#endif
}
@@ -1849,19 +1849,19 @@ uno::Reference< XAccessible > SwAccessibleMap::GetDocumentView( )
uno::Reference<XAccessible> SwAccessibleMap::GetDocumentPreview(
const std::vector<PreviewPage*>& _rPreviewPages,
const Fraction& _rScale,
- const SwPageFrm* _pSelectedPageFrm,
+ const SwPageFrame* _pSelectedPageFrame,
const Size& _rPreviewWinSize )
{
// create & update preview data object
if( mpPreview == nullptr )
mpPreview = new SwAccPreviewData();
- mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrm, _rPreviewWinSize );
+ mpPreview->Update( *this, _rPreviewPages, _rScale, _pSelectedPageFrame, _rPreviewWinSize );
uno::Reference<XAccessible> xAcc = _GetDocumentView( true );
return xAcc;
}
-uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
+uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrame *pFrame,
bool bCreate )
{
uno::Reference < XAccessible > xAcc;
@@ -1871,73 +1871,73 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
{
osl::MutexGuard aGuard( maMutex );
- if( !mpFrmMap && bCreate )
- mpFrmMap = new SwAccessibleContextMap_Impl;
- if( mpFrmMap )
+ if( !mpFrameMap && bCreate )
+ mpFrameMap = new SwAccessibleContextMap_Impl;
+ if( mpFrameMap )
{
- SwAccessibleContextMap_Impl::iterator aIter = mpFrmMap->find( pFrm );
- if( aIter != mpFrmMap->end() )
+ SwAccessibleContextMap_Impl::iterator aIter = mpFrameMap->find( pFrame );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
if( !xAcc.is() && bCreate )
{
SwAccessibleContext *pAcc = nullptr;
- switch( pFrm->GetType() )
+ switch( pFrame->GetType() )
{
case FRM_TXT:
mnPara++;
pAcc = new SwAccessibleParagraph( *this,
- static_cast< const SwTextFrm& >( *pFrm ) );
+ static_cast< const SwTextFrame& >( *pFrame ) );
break;
case FRM_HEADER:
pAcc = new SwAccessibleHeaderFooter( this,
- static_cast< const SwHeaderFrm *>( pFrm ) );
+ static_cast< const SwHeaderFrame *>( pFrame ) );
break;
case FRM_FOOTER:
pAcc = new SwAccessibleHeaderFooter( this,
- static_cast< const SwFooterFrm *>( pFrm ) );
+ static_cast< const SwFooterFrame *>( pFrame ) );
break;
case FRM_FTN:
{
- const SwFootnoteFrm *pFootnoteFrm =
- static_cast < const SwFootnoteFrm * >( pFrm );
+ const SwFootnoteFrame *pFootnoteFrame =
+ static_cast < const SwFootnoteFrame * >( pFrame );
bool bIsEndnote =
- SwAccessibleFootnote::IsEndnote( pFootnoteFrm );
+ SwAccessibleFootnote::IsEndnote( pFootnoteFrame );
pAcc = new SwAccessibleFootnote( this, bIsEndnote,
/*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
- pFootnoteFrm );
+ pFootnoteFrame );
}
break;
case FRM_FLY:
{
- const SwFlyFrm *pFlyFrm =
- static_cast < const SwFlyFrm * >( pFrm );
- switch( SwAccessibleFrameBase::GetNodeType( pFlyFrm ) )
+ const SwFlyFrame *pFlyFrame =
+ static_cast < const SwFlyFrame * >( pFrame );
+ switch( SwAccessibleFrameBase::GetNodeType( pFlyFrame ) )
{
case ND_GRFNODE:
- pAcc = new SwAccessibleGraphic( this, pFlyFrm );
+ pAcc = new SwAccessibleGraphic( this, pFlyFrame );
break;
case ND_OLENODE:
- pAcc = new SwAccessibleEmbeddedObject( this, pFlyFrm );
+ pAcc = new SwAccessibleEmbeddedObject( this, pFlyFrame );
break;
default:
- pAcc = new SwAccessibleTextFrame( this, *pFlyFrm );
+ pAcc = new SwAccessibleTextFrame( this, *pFlyFrame );
break;
}
}
break;
case FRM_CELL:
pAcc = new SwAccessibleCell( this,
- static_cast< const SwCellFrm *>( pFrm ) );
+ static_cast< const SwCellFrame *>( pFrame ) );
break;
case FRM_TAB:
pAcc = new SwAccessibleTable( this,
- static_cast< const SwTabFrm *>( pFrm ) );
+ static_cast< const SwTabFrame *>( pFrame ) );
break;
case FRM_PAGE:
OSL_ENSURE( GetShell()->IsPreview(),
"accessible page frames only in PagePreview" );
- pAcc = new SwAccessiblePage( this, pFrm );
+ pAcc = new SwAccessiblePage( this, pFrame );
break;
}
xAcc = pAcc;
@@ -1945,18 +1945,18 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
OSL_ENSURE( xAcc.is(), "unknown frame type" );
if( xAcc.is() )
{
- if( aIter != mpFrmMap->end() )
+ if( aIter != mpFrameMap->end() )
{
(*aIter).second = xAcc;
}
else
{
- SwAccessibleContextMap_Impl::value_type aEntry( pFrm, xAcc );
- mpFrmMap->insert( aEntry );
+ SwAccessibleContextMap_Impl::value_type aEntry( pFrame, xAcc );
+ mpFrameMap->insert( aEntry );
}
if( pAcc->HasCursor() &&
- !AreInSameTable( mxCursorContext, pFrm ) )
+ !AreInSameTable( mxCursorContext, pFrame ) )
{
// If the new context has the focus, and if we know
// another context that had the focus, then the focus
@@ -1993,10 +1993,10 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
}
::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
- const SwFrm *pFrm,
+ const SwFrame *pFrame,
bool bCreate )
{
- uno::Reference < XAccessible > xAcc( GetContext( pFrm, bCreate ) );
+ uno::Reference < XAccessible > xAcc( GetContext( pFrame, bCreate ) );
::rtl::Reference < SwAccessibleContext > xAccImpl(
static_cast< SwAccessibleContext * >( xAcc.get() ) );
@@ -2182,17 +2182,17 @@ void SwAccessibleMap::AddGroupContext(const SdrObject *pParentObj, uno::Referenc
return xAccImpl;
}
-void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
+void SwAccessibleMap::RemoveContext( const SwFrame *pFrame )
{
osl::MutexGuard aGuard( maMutex );
- if( mpFrmMap )
+ if( mpFrameMap )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( pFrm );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( pFrame );
+ if( aIter != mpFrameMap->end() )
{
- mpFrmMap->erase( aIter );
+ mpFrameMap->erase( aIter );
// Remove reference to old caret object. Though mxCursorContext
// is a weak reference and cleared automatically, clearing it
@@ -2202,18 +2202,18 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
{
SwAccessibleContext *pOldAccImpl =
static_cast< SwAccessibleContext *>( xOldAcc.get() );
- OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" );
- if( pOldAccImpl->GetFrm() == pFrm )
+ OSL_ENSURE( pOldAccImpl->GetFrame(), "old caret context is disposed" );
+ if( pOldAccImpl->GetFrame() == pFrame )
{
xOldAcc.clear(); // get an empty ref
mxCursorContext = xOldAcc;
}
}
- if( mpFrmMap->empty() )
+ if( mpFrameMap->empty() )
{
- delete mpFrmMap;
- mpFrmMap = nullptr;
+ delete mpFrameMap;
+ mpFrameMap = nullptr;
}
}
}
@@ -2244,23 +2244,23 @@ void SwAccessibleMap::RemoveContext( const SdrObject *pObj )
}
}
-void SwAccessibleMap::Dispose( const SwFrm *pFrm,
+void SwAccessibleMap::Dispose( const SwFrame *pFrame,
const SdrObject *pObj,
vcl::Window* pWindow,
bool bRecursive )
{
- SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
+ SwAccessibleChild aFrameOrObj( pFrame, pObj, pWindow );
// Indeed, the following assert checks the frame's accessible flag,
// because that's the one that is evaluated in the layout. The frame
// might not be accessible anyway. That's the case for cell frames that
// contain further cells.
- OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
+ OSL_ENSURE( !aFrameOrObj.GetSwFrame() || aFrameOrObj.GetSwFrame()->IsAccessibleFrame(),
"non accessible frame should be disposed" );
- if (aFrmOrObj.IsAccessible( GetShell()->IsPreview() )
+ if (aFrameOrObj.IsAccessible( GetShell()->IsPreview() )
// fdo#87199 dispose the darn thing if it ever was accessible
- || (pFrm && mpFrmMap && mpFrmMap->find(pFrm) != mpFrmMap->end()))
+ || (pFrame && mpFrameMap && mpFrameMap->find(pFrame) != mpFrameMap->end()))
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
@@ -2270,28 +2270,28 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
osl::MutexGuard aGuard( maMutex );
// First of all look for an accessible context for a frame
- if( aFrmOrObj.GetSwFrm() && mpFrmMap )
+ if( aFrameOrObj.GetSwFrame() && mpFrameMap )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xAcc( (*aIter).second );
xAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
}
}
- if( !xAccImpl.is() && mpFrmMap )
+ if( !xAccImpl.is() && mpFrameMap )
{
// If there is none, look if the parent is accessible.
- const SwFrm *pParent =
- SwAccessibleFrame::GetParent( aFrmOrObj,
+ const SwFrame *pParent =
+ SwAccessibleFrame::GetParent( aFrameOrObj,
GetShell()->IsPreview());
if( pParent )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( pParent );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( pParent );
+ if( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xAcc( (*aIter).second );
xParentAccImpl =
@@ -2299,10 +2299,10 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
}
}
}
- if( !xParentAccImpl.is() && !aFrmOrObj.GetSwFrm() && mpShapeMap )
+ if( !xParentAccImpl.is() && !aFrameOrObj.GetSwFrame() && mpShapeMap )
{
SwAccessibleShapeMap_Impl::iterator aIter =
- mpShapeMap->find( aFrmOrObj.GetDrawObject() );
+ mpShapeMap->find( aFrameOrObj.GetDrawObject() );
if( aIter != mpShapeMap->end() )
{
uno::Reference < XAccessible > xAcc( (*aIter).second );
@@ -2333,11 +2333,11 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
if( mpEvents )
{
SwAccessibleEventMap_Impl::iterator aIter =
- mpEventMap->find( aFrmOrObj );
+ mpEventMap->find( aFrameOrObj );
if( aIter != mpEventMap->end() )
{
SwAccessibleEvent_Impl aEvent(
- SwAccessibleEvent_Impl::DISPOSE, aFrmOrObj );
+ SwAccessibleEvent_Impl::DISPOSE, aFrameOrObj );
AppendEvent( aEvent );
}
}
@@ -2358,40 +2358,40 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
// be broadcasted at the end of the action to give the table
// a chance to generate a single table change event.
- xParentAccImpl->DisposeChild( aFrmOrObj, bRecursive );
+ xParentAccImpl->DisposeChild( aFrameOrObj, bRecursive );
}
else if( xShapeAccImpl.is() )
{
- RemoveContext( aFrmOrObj.GetDrawObject() );
+ RemoveContext( aFrameOrObj.GetDrawObject() );
xShapeAccImpl->dispose();
}
- if( mpPreview && pFrm && pFrm->IsPageFrm() )
- mpPreview->DisposePage( static_cast< const SwPageFrm *>( pFrm ) );
+ if( mpPreview && pFrame && pFrame->IsPageFrame() )
+ mpPreview->DisposePage( static_cast< const SwPageFrame *>( pFrame ) );
}
}
-void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
+void SwAccessibleMap::InvalidatePosOrSize( const SwFrame *pFrame,
const SdrObject *pObj,
vcl::Window* pWindow,
const SwRect& rOldBox )
{
- SwAccessibleChild aFrmOrObj( pFrm, pObj, pWindow );
- if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+ SwAccessibleChild aFrameOrObj( pFrame, pObj, pWindow );
+ if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
::rtl::Reference< SwAccessibleContext > xAccImpl;
::rtl::Reference< SwAccessibleContext > xParentAccImpl;
- const SwFrm *pParent =nullptr;
+ const SwFrame *pParent =nullptr;
{
osl::MutexGuard aGuard( maMutex );
- if( mpFrmMap )
+ if( mpFrameMap )
{
- if( aFrmOrObj.GetSwFrm() )
+ if( aFrameOrObj.GetSwFrame() )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
{
// If there is an accessible object already it is
// notified directly.
@@ -2405,14 +2405,14 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
// Otherwise we look if the parent is accessible.
// If not, there is nothing to do.
pParent =
- SwAccessibleFrame::GetParent( aFrmOrObj,
+ SwAccessibleFrame::GetParent( aFrameOrObj,
GetShell()->IsPreview());
if( pParent )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( pParent );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( pParent );
+ if( aIter != mpFrameMap->end() )
{
uno::Reference < XAccessible > xAcc( (*aIter).second );
xParentAccImpl =
@@ -2429,7 +2429,7 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
{
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::POS_CHANGED, xAccImpl.get(),
- aFrmOrObj, rOldBox );
+ aFrameOrObj, rOldBox );
AppendEvent( aEvent );
}
else
@@ -2444,13 +2444,13 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
{
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
- xParentAccImpl.get(), aFrmOrObj, rOldBox );
+ xParentAccImpl.get(), aFrameOrObj, rOldBox );
AppendEvent( aEvent );
}
else
{
FireEvents();
- xParentAccImpl->InvalidateChildPosOrSize( aFrmOrObj,
+ xParentAccImpl->InvalidateChildPosOrSize( aFrameOrObj,
rOldBox );
}
}
@@ -2459,19 +2459,19 @@ void SwAccessibleMap::InvalidatePosOrSize( const SwFrm *pFrm,
/*
For child graphic and its parent paragraph,if split 2 graphic to 2 paragraph,
will delete one graphic swfrm and new create 1 graphic swfrm ,
-then the new paragraph and the new graphic SwFrm will add .
-but when add graphic SwFrm ,the accessible of the new Paragraph is not created yet.
+then the new paragraph and the new graphic SwFrame will add .
+but when add graphic SwFrame ,the accessible of the new Paragraph is not created yet.
so the new graphic accessible 'parent is NULL,
-so run here: save the parent's SwFrm not the accessible object parent,
+so run here: save the parent's SwFrame not the accessible object parent,
*/
- bool bIsValidFrm = false;
+ bool bIsValidFrame = false;
bool bIsTextParent = false;
- if (aFrmOrObj.GetSwFrm())
+ if (aFrameOrObj.GetSwFrame())
{
- int nType = pFrm->GetType();
+ int nType = pFrame->GetType();
if ( FRM_FLY == nType )
{
- bIsValidFrm =true;
+ bIsValidFrame =true;
}
}
else if(pObj)
@@ -2482,15 +2482,15 @@ so run here: save the parent's SwFrm not the accessible object parent,
bIsTextParent =true;
}
}
-// bool bIsVisibleChildrenOnly =aFrmOrObj.IsVisibleChildrenOnly() ;
-// bool bIsBoundAsChar =aFrmOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
- if((bIsValidFrm || bIsTextParent) )
+// bool bIsVisibleChildrenOnly =aFrameOrObj.IsVisibleChildrenOnly() ;
+// bool bIsBoundAsChar =aFrameOrObj.IsBoundAsChar() ;//bIsVisibleChildrenOnly && bIsBoundAsChar &&
+ if((bIsValidFrame || bIsTextParent) )
{
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
- pParent, aFrmOrObj, rOldBox );
+ pParent, aFrameOrObj, rOldBox );
AppendEvent( aEvent );
}
else
@@ -2502,20 +2502,20 @@ so run here: save the parent's SwFrm not the accessible object parent,
}
}
-void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
+void SwAccessibleMap::InvalidateContent( const SwFrame *pFrame )
{
- SwAccessibleChild aFrmOrObj( pFrm );
- if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+ SwAccessibleChild aFrameOrObj( pFrame );
+ if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
uno::Reference < XAccessible > xAcc;
{
osl::MutexGuard aGuard( maMutex );
- if( mpFrmMap )
+ if( mpFrameMap )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
}
}
@@ -2528,7 +2528,7 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
{
SwAccessibleEvent_Impl aEvent(
SwAccessibleEvent_Impl::INVALID_CONTENT, pAccImpl,
- aFrmOrObj );
+ aFrameOrObj );
AppendEvent( aEvent );
}
else
@@ -2540,20 +2540,20 @@ void SwAccessibleMap::InvalidateContent( const SwFrm *pFrm )
}
}
-void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
+void SwAccessibleMap::InvalidateAttr( const SwTextFrame& rTextFrame )
{
- SwAccessibleChild aFrmOrObj( &rTextFrm );
- if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+ SwAccessibleChild aFrameOrObj( &rTextFrame );
+ if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
uno::Reference < XAccessible > xAcc;
{
osl::MutexGuard aGuard( maMutex );
- if( mpFrmMap )
+ if( mpFrameMap )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
}
}
@@ -2565,7 +2565,7 @@ void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::INVALID_ATTR,
- pAccImpl, aFrmOrObj );
+ pAccImpl, aFrameOrObj );
aEvent.SetStates( AccessibleStates::TEXT_ATTRIBUTE_CHANGED );
AppendEvent( aEvent );
}
@@ -2578,38 +2578,38 @@ void SwAccessibleMap::InvalidateAttr( const SwTextFrm& rTextFrm )
}
}
-void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
+void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
{
- SwAccessibleChild aFrmOrObj( pFrm );
+ SwAccessibleChild aFrameOrObj( pFrame );
bool bShapeSelected = false;
const SwViewShell *pVSh = GetShell();
- if( dynamic_cast<const SwCrsrShell*>( pVSh) != nullptr )
+ if( dynamic_cast<const SwCursorShell*>( pVSh) != nullptr )
{
- const SwCrsrShell *pCSh = static_cast< const SwCrsrShell * >( pVSh );
+ const SwCursorShell *pCSh = static_cast< const SwCursorShell * >( pVSh );
if( pCSh->IsTableMode() )
{
- while( aFrmOrObj.GetSwFrm() && !aFrmOrObj.GetSwFrm()->IsCellFrm() )
- aFrmOrObj = aFrmOrObj.GetSwFrm()->GetUpper();
+ while( aFrameOrObj.GetSwFrame() && !aFrameOrObj.GetSwFrame()->IsCellFrame() )
+ aFrameOrObj = aFrameOrObj.GetSwFrame()->GetUpper();
}
else if( dynamic_cast<const SwFEShell*>( pVSh) != nullptr )
{
const SwFEShell *pFESh = static_cast< const SwFEShell * >( pVSh );
- const SwFrm *pFlyFrm = pFESh->GetSelectedFlyFrm();
- if( pFlyFrm )
+ const SwFrame *pFlyFrame = pFESh->GetSelectedFlyFrame();
+ if( pFlyFrame )
{
- OSL_ENSURE( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
+ OSL_ENSURE( !pFrame || pFrame->FindFlyFrame() == pFlyFrame,
"cursor is not contained in fly frame" );
- aFrmOrObj = pFlyFrm;
+ aFrameOrObj = pFlyFrame;
}
else if( pFESh->IsObjSelected() > 0 )
{
bShapeSelected = true;
- aFrmOrObj = static_cast<const SwFrm *>( nullptr );
+ aFrameOrObj = static_cast<const SwFrame *>( nullptr );
}
}
}
- OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreview()),
+ OSL_ENSURE( bShapeSelected || aFrameOrObj.IsAccessible(GetShell()->IsPreview()),
"frame is not accessible" );
uno::Reference < XAccessible > xOldAcc;
@@ -2625,27 +2625,27 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
bOldShapeSelected = mbShapeSelected;
mbShapeSelected = bShapeSelected;
- if( aFrmOrObj.GetSwFrm() && mpFrmMap )
+ if( aFrameOrObj.GetSwFrame() && mpFrameMap )
{
SwAccessibleContextMap_Impl::iterator aIter =
- mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
xAcc = (*aIter).second;
else
{
SwRect rcEmpty;
- const SwTabFrm* pTabFrm = aFrmOrObj.GetSwFrm()->FindTabFrm();
- if (pTabFrm)
+ const SwTabFrame* pTabFrame = aFrameOrObj.GetSwFrame()->FindTabFrame();
+ if (pTabFrame)
{
- InvalidatePosOrSize(pTabFrm, nullptr, nullptr, rcEmpty);
+ InvalidatePosOrSize(pTabFrame, nullptr, nullptr, rcEmpty);
}
else
{
- InvalidatePosOrSize(aFrmOrObj.GetSwFrm(), nullptr, nullptr, rcEmpty);
+ InvalidatePosOrSize(aFrameOrObj.GetSwFrame(), nullptr, nullptr, rcEmpty);
}
- aIter = mpFrmMap->find( aFrmOrObj.GetSwFrm() );
- if( aIter != mpFrmMap->end() )
+ aIter = mpFrameMap->find( aFrameOrObj.GetSwFrame() );
+ if( aIter != mpFrameMap->end() )
{
xAcc = (*aIter).second;
}
@@ -2664,10 +2664,10 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
// table, its the best choice, because using it avoids
// an unnecessary cursor invalidation cycle when creating
// a new object for the current cell.
- if( aFrmOrObj.GetSwFrm()->IsCellFrm() )
+ if( aFrameOrObj.GetSwFrame()->IsCellFrame() )
{
if( xOldAcc.is() &&
- AreInSameTable( xOldAcc, aFrmOrObj.GetSwFrm() ) )
+ AreInSameTable( xOldAcc, aFrameOrObj.GetSwFrame() ) )
{
if( xAcc.is() )
xOldAcc = xAcc; // avoid extra invalidation
@@ -2675,7 +2675,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
xAcc = xOldAcc; // make sure ate least one
}
if( !xAcc.is() )
- xAcc = GetContext( aFrmOrObj.GetSwFrm() );
+ xAcc = GetContext( aFrameOrObj.GetSwFrame() );
}
}
else if (bShapeSelected)
@@ -2694,19 +2694,19 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
}
if (pObj != nullptr)
{
- const SwFrm *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
+ const SwFrame *pParent = SwAccessibleFrame::GetParent( SwAccessibleChild(pObj), GetShell()->IsPreview() );
if( pParent )
{
::rtl::Reference< SwAccessibleContext > xParentAccImpl = GetContextImpl(pParent,false);
if (!xParentAccImpl.is())
{
- const SwTabFrm* pTabFrm = pParent->FindTabFrm();
- if (pTabFrm)
+ const SwTabFrame* pTabFrame = pParent->FindTabFrame();
+ if (pTabFrame)
{
//The Table should not add in acc.because the "pParent" is not add to acc .
- uno::Reference< XAccessible> xAccParentTab = GetContext(pTabFrm);//Should Create.
+ uno::Reference< XAccessible> xAccParentTab = GetContext(pTabFrame);//Should Create.
- const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrm), GetShell()->IsPreview() );
+ const SwFrame *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pTabFrame), GetShell()->IsPreview() );
if (pParentRoot)
{
::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
@@ -2727,7 +2727,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
//directly create this acc para .
xParentAccImpl = GetContextImpl(pParent);//Should Create.
- const SwFrm *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
+ const SwFrame *pParentRoot = SwAccessibleFrame::GetParent( SwAccessibleChild(pParent), GetShell()->IsPreview() );
::rtl::Reference< SwAccessibleContext > xParentAccImplRoot = GetContextImpl(pParentRoot,false);
if(xParentAccImplRoot.is())
@@ -2836,23 +2836,23 @@ void SwAccessibleMap::SetCursorContext(
}
void SwAccessibleMap::InvalidateStates( AccessibleStates _nStates,
- const SwFrm* _pFrm )
+ const SwFrame* _pFrame )
{
// Start with the frame or the first upper that is accessible
- SwAccessibleChild aFrmOrObj( _pFrm );
- while( aFrmOrObj.GetSwFrm() &&
- !aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
- aFrmOrObj = aFrmOrObj.GetSwFrm()->GetUpper();
- if( !aFrmOrObj.GetSwFrm() )
- aFrmOrObj = GetShell()->GetLayout();
-
- uno::Reference< XAccessible > xAcc( GetContext( aFrmOrObj.GetSwFrm() ) );
+ SwAccessibleChild aFrameOrObj( _pFrame );
+ while( aFrameOrObj.GetSwFrame() &&
+ !aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
+ aFrameOrObj = aFrameOrObj.GetSwFrame()->GetUpper();
+ if( !aFrameOrObj.GetSwFrame() )
+ aFrameOrObj = GetShell()->GetLayout();
+
+ uno::Reference< XAccessible > xAcc( GetContext( aFrameOrObj.GetSwFrame() ) );
SwAccessibleContext *pAccImpl = static_cast< SwAccessibleContext *>( xAcc.get() );
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
pAccImpl,
- SwAccessibleChild(pAccImpl->GetFrm()),
+ SwAccessibleChild(pAccImpl->GetFrame()),
_nStates );
AppendEvent( aEvent );
}
@@ -2863,22 +2863,22 @@ void SwAccessibleMap::InvalidateStates( AccessibleStates _nStates,
}
}
-void SwAccessibleMap::_InvalidateRelationSet( const SwFrm* pFrm,
+void SwAccessibleMap::_InvalidateRelationSet( const SwFrame* pFrame,
bool bFrom )
{
// first, see if this frame is accessible, and if so, get the respective
- SwAccessibleChild aFrmOrObj( pFrm );
- if( aFrmOrObj.IsAccessible( GetShell()->IsPreview() ) )
+ SwAccessibleChild aFrameOrObj( pFrame );
+ if( aFrameOrObj.IsAccessible( GetShell()->IsPreview() ) )
{
uno::Reference < XAccessible > xAcc;
{
osl::MutexGuard aGuard( maMutex );