[Libreoffice-commits] core.git: sw/inc sw/qa sw/sdi sw/source sw/uiconfig
Robinson Tryon
qubit at runcibility.com
Wed Nov 25 03:13:51 PST 2015
sw/inc/EnhancedPDFExportHelper.hxx | 46
sw/inc/HandleAnchorNodeChg.hxx | 8
sw/inc/IDocumentLayoutAccess.hxx | 8
sw/inc/PostItMgr.hxx | 18
sw/inc/SidebarWin.hxx | 4
sw/inc/ToxTabStopTokenHandler.hxx | 8
sw/inc/ToxTextGenerator.hxx | 8
sw/inc/accmap.hxx | 50
sw/inc/anchoreddrawobject.hxx | 8
sw/inc/anchoredobject.hxx | 78
sw/inc/calc.hxx | 2
sw/inc/cellfml.hxx | 2
sw/inc/chpfld.hxx | 4
sw/inc/cmdid.h | 2
sw/inc/crsrsh.hxx | 282 -
sw/inc/crstate.hxx | 32
sw/inc/cshtyp.hxx | 18
sw/inc/dbfld.hxx | 2
sw/inc/dcontact.hxx | 40
sw/inc/doc.hxx | 78
sw/inc/docary.hxx | 2
sw/inc/docsh.hxx | 4
sw/inc/docufld.hxx | 6
sw/inc/editsh.hxx | 22
sw/inc/expfld.hxx | 10
sw/inc/fesh.hxx | 90
sw/inc/flypos.hxx | 18
sw/inc/fmtcnct.hxx | 2
sw/inc/fmtflcnt.hxx | 2
sw/inc/fmtfsize.hxx | 28
sw/inc/format.hxx | 8
sw/inc/frmatr.hxx | 6
sw/inc/frmfmt.hxx | 52
sw/inc/hhcwrp.hxx | 2
sw/inc/hints.hxx | 22
sw/inc/htmltbl.hxx | 2
sw/inc/init.hxx | 4
sw/inc/ndarr.hxx | 18
sw/inc/ndgrf.hxx | 2
sw/inc/ndnotxt.hxx | 4
sw/inc/ndtxt.hxx | 10
sw/inc/node.hxx | 52
sw/inc/pagedesc.hxx | 2
sw/inc/pagepreviewlayout.hxx | 14
sw/inc/postithelper.hxx | 12
sw/inc/section.hxx | 18
sw/inc/shellio.hxx | 14
sw/inc/splargs.hxx | 18
sw/inc/swabstdlg.hxx | 4
sw/inc/swatrset.hxx | 6
sw/inc/swcrsr.hxx | 48
sw/inc/swtable.hxx | 6
sw/inc/swtblfmt.hxx | 24
sw/inc/swtypes.hxx | 20
sw/inc/tblsel.hxx | 54
sw/inc/textboxhelper.hxx | 4
sw/inc/txtflcnt.hxx | 18
sw/inc/txtftn.hxx | 4
sw/inc/undobj.hxx | 8
sw/inc/unobaseclass.hxx | 4
sw/inc/unochart.hxx | 4
sw/inc/unocrsr.hxx | 28
sw/inc/unocrsrhelper.hxx | 26
sw/inc/unoparagraph.hxx | 4
sw/inc/unotbl.hxx | 12
sw/inc/unotextcursor.hxx | 4
sw/inc/unotextrange.hxx | 6
sw/inc/unotxdoc.hxx | 8
sw/inc/view.hxx | 26
sw/inc/viewopt.hxx | 8
sw/inc/viewsh.hxx | 26
sw/inc/viscrs.hxx | 46
sw/qa/complex/writer/CheckBookmarks.java | 36
sw/qa/complex/writer/testdocuments/TESTXMLID.odt |binary
sw/qa/core/macros-test.cxx | 4
sw/qa/core/test_ToxTextGenerator.cxx | 4
sw/qa/extras/inc/swmodeltestbase.hxx | 2
sw/qa/extras/odfimport/odfimport.cxx | 24
sw/qa/extras/tiledrendering/tiledrendering.cxx | 50
sw/qa/extras/uiwriter/uiwriter.cxx | 436 +-
sw/sdi/_tabsh.sdi | 2
sw/source/core/access/acccell.cxx | 66
sw/source/core/access/acccell.hxx | 8
sw/source/core/access/acccontext.cxx | 252 -
sw/source/core/access/acccontext.hxx | 40
sw/source/core/access/accdoc.cxx | 148
sw/source/core/access/accembedded.cxx | 16
sw/source/core/access/accembedded.hxx | 2
sw/source/core/access/accfootnote.cxx | 12
sw/source/core/access/accfootnote.hxx | 6
sw/source/core/access/accframe.cxx | 140
sw/source/core/access/accframe.hxx | 50
sw/source/core/access/accframebase.cxx | 84
sw/source/core/access/accframebase.hxx | 10
sw/source/core/access/accfrmobj.cxx | 136
sw/source/core/access/accfrmobj.hxx | 16
sw/source/core/access/accfrmobjmap.cxx | 34
sw/source/core/access/accfrmobjmap.hxx | 10
sw/source/core/access/accfrmobjslist.cxx | 38
sw/source/core/access/accfrmobjslist.hxx | 16
sw/source/core/access/accgraphic.cxx | 6
sw/source/core/access/accgraphic.hxx | 2
sw/source/core/access/accheaderfooter.cxx | 12
sw/source/core/access/accheaderfooter.hxx | 8
sw/source/core/access/accmap.cxx | 686 +--
sw/source/core/access/accnotextframe.cxx | 22
sw/source/core/access/accnotextframe.hxx | 4
sw/source/core/access/accnotexthyperlink.cxx | 8
sw/source/core/access/accnotexthyperlink.hxx | 6
sw/source/core/access/accpage.cxx | 8
sw/source/core/access/accpage.hxx | 6
sw/source/core/access/accpara.cxx | 306 -
sw/source/core/access/accpara.hxx | 4
sw/source/core/access/accportions.hxx | 2
sw/source/core/access/accselectionhelper.cxx | 58
sw/source/core/access/acctable.cxx | 384 -
sw/source/core/access/acctable.hxx | 12
sw/source/core/access/acctextframe.cxx | 48
sw/source/core/access/acctextframe.hxx | 8
sw/source/core/access/parachangetrackinginfo.cxx | 38
sw/source/core/access/parachangetrackinginfo.hxx | 6
sw/source/core/attr/calbck.cxx | 4
sw/source/core/attr/format.cxx | 28
sw/source/core/attr/hints.cxx | 4
sw/source/core/bastyp/calc.cxx | 8
sw/source/core/bastyp/init.cxx | 6
sw/source/core/bastyp/swtypes.cxx | 22
sw/source/core/crsr/BlockCursor.cxx | 2
sw/source/core/crsr/BlockCursor.hxx | 16
sw/source/core/crsr/callnk.cxx | 74
sw/source/core/crsr/callnk.hxx | 14
sw/source/core/crsr/crbm.cxx | 124
sw/source/core/crsr/crsrsh.cxx | 1904 ++++-----
sw/source/core/crsr/crstrvl.cxx | 818 ++--
sw/source/core/crsr/crstrvl1.cxx | 56
sw/source/core/crsr/findattr.cxx | 26
sw/source/core/crsr/findcoll.cxx | 6
sw/source/core/crsr/findtxt.cxx | 20
sw/source/core/crsr/pam.cxx | 74
sw/source/core/crsr/swcrsr.cxx | 320 -
sw/source/core/crsr/trvlcol.cxx | 58
sw/source/core/crsr/trvlfnfl.cxx | 116
sw/source/core/crsr/trvlreg.cxx | 54
sw/source/core/crsr/trvltbl.cxx | 358 -
sw/source/core/crsr/viscrs.cxx | 296 -
sw/source/core/doc/CntntIdxStore.cxx | 86
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 2
sw/source/core/doc/DocumentContentOperationsManager.cxx | 28
sw/source/core/doc/DocumentDeviceManager.cxx | 4
sw/source/core/doc/DocumentDrawModelManager.cxx | 10
sw/source/core/doc/DocumentFieldsManager.cxx | 22
sw/source/core/doc/DocumentLayoutManager.cxx | 20
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 4
sw/source/core/doc/DocumentSettingManager.cxx | 6
sw/source/core/doc/DocumentStylePoolManager.cxx | 26
sw/source/core/doc/DocumentTimerManager.cxx | 6
sw/source/core/doc/doc.cxx | 92
sw/source/core/doc/docchart.cxx | 2
sw/source/core/doc/doccorr.cxx | 96
sw/source/core/doc/docdesc.cxx | 18
sw/source/core/doc/docdraw.cxx | 20
sw/source/core/doc/docedt.cxx | 44
sw/source/core/doc/docfld.cxx | 22
sw/source/core/doc/docfly.cxx | 168
sw/source/core/doc/docfmt.cxx | 4
sw/source/core/doc/docftn.cxx | 8
sw/source/core/doc/docglos.cxx | 10
sw/source/core/doc/doclay.cxx | 78
sw/source/core/doc/docnew.cxx | 6
sw/source/core/doc/docnum.cxx | 8
sw/source/core/doc/docruby.cxx | 32
sw/source/core/doc/docsort.cxx | 8
sw/source/core/doc/doctxm.cxx | 60
sw/source/core/doc/ftnidx.cxx | 4
sw/source/core/doc/htmltbl.cxx | 68
sw/source/core/doc/lineinfo.cxx | 4
sw/source/core/doc/notxtfrm.cxx | 124
sw/source/core/doc/tblafmt.cxx | 4
sw/source/core/doc/tblcpy.cxx | 14
sw/source/core/doc/tblrwcl.cxx | 438 +-
sw/source/core/doc/textboxhelper.cxx | 16
sw/source/core/docnode/ndcopy.cxx | 2
sw/source/core/docnode/ndsect.cxx | 98
sw/source/core/docnode/ndtbl.cxx | 392 +-
sw/source/core/docnode/ndtbl1.cxx | 240 -
sw/source/core/docnode/node.cxx | 176
sw/source/core/docnode/node2lay.cxx | 244 -
sw/source/core/docnode/nodes.cxx | 174
sw/source/core/docnode/section.cxx | 50
sw/source/core/docnode/swbaslnk.cxx | 8
sw/source/core/draw/dcontact.cxx | 292 -
sw/source/core/draw/dflyobj.cxx | 150
sw/source/core/draw/dpage.cxx | 18
sw/source/core/draw/dview.cxx | 126
sw/source/core/edit/acorrect.cxx | 64
sw/source/core/edit/autofmt.cxx | 130
sw/source/core/edit/edatmisc.cxx | 32
sw/source/core/edit/edattr.cxx | 62
sw/source/core/edit/eddel.cxx | 48
sw/source/core/edit/edfcol.cxx | 6
sw/source/core/edit/edfld.cxx | 12
sw/source/core/edit/edfmt.cxx | 2
sw/source/core/edit/edglbldc.cxx | 52
sw/source/core/edit/edglss.cxx | 22
sw/source/core/edit/editsh.cxx | 216 -
sw/source/core/edit/edlingu.cxx | 460 +-
sw/source/core/edit/ednumber.cxx | 186
sw/source/core/edit/edredln.cxx | 8
sw/source/core/edit/edsect.cxx | 42
sw/source/core/edit/edtab.cxx | 98
sw/source/core/edit/edtox.cxx | 12
sw/source/core/edit/edundo.cxx | 28
sw/source/core/edit/edws.cxx | 30
sw/source/core/fields/authfld.cxx | 8
sw/source/core/fields/cellfml.cxx | 34
sw/source/core/fields/chpfld.cxx | 8
sw/source/core/fields/docufld.cxx | 52
sw/source/core/fields/expfld.cxx | 70
sw/source/core/fields/fldlst.cxx | 6
sw/source/core/fields/postithelper.cxx | 28
sw/source/core/fields/reffld.cxx | 134
sw/source/core/frmedt/fecopy.cxx | 188
sw/source/core/frmedt/fedesc.cxx | 74
sw/source/core/frmedt/fefly1.cxx | 446 +-
sw/source/core/frmedt/feflyole.cxx | 16
sw/source/core/frmedt/feshview.cxx | 512 +-
sw/source/core/frmedt/fetab.cxx | 732 +--
sw/source/core/frmedt/fews.cxx | 528 +-
sw/source/core/frmedt/tblsel.cxx | 900 ++--
sw/source/core/graphic/ndgrf.cxx | 24
sw/source/core/inc/DocumentContentOperationsManager.hxx | 4
sw/source/core/inc/DocumentLayoutManager.hxx | 6
sw/source/core/inc/DocumentSettingManager.hxx | 2
sw/source/core/inc/SwPortionHandler.hxx | 2
sw/source/core/inc/UndoInsert.hxx | 4
sw/source/core/inc/acorrect.hxx | 2
sw/source/core/inc/anchoredobjectposition.hxx | 72
sw/source/core/inc/ascharanchoredobjectposition.hxx | 6
sw/source/core/inc/blink.hxx | 18
sw/source/core/inc/bodyfrm.hxx | 8
sw/source/core/inc/cellfrm.hxx | 20
sw/source/core/inc/cntfrm.hxx | 74
sw/source/core/inc/colfrm.hxx | 10
sw/source/core/inc/dbg_lay.hxx | 20
sw/source/core/inc/dflyobj.hxx | 10
sw/source/core/inc/docfld.hxx | 4
sw/source/core/inc/drawfont.hxx | 28
sw/source/core/inc/dview.hxx | 8
sw/source/core/inc/environmentofanchoredobject.hxx | 12
sw/source/core/inc/fefly.hxx | 2
sw/source/core/inc/flowfrm.hxx | 118
sw/source/core/inc/flyfrm.hxx | 76
sw/source/core/inc/flyfrms.hxx | 56
sw/source/core/inc/fntcache.hxx | 2
sw/source/core/inc/frame.hxx | 676 +--
sw/source/core/inc/frminf.hxx | 16
sw/source/core/inc/frmtool.hxx | 178
sw/source/core/inc/ftnboss.hxx | 90
sw/source/core/inc/ftnfrm.hxx | 82
sw/source/core/inc/hffrm.hxx | 22
sw/source/core/inc/layact.hxx | 64
sw/source/core/inc/layfrm.hxx | 130
sw/source/core/inc/layouter.hxx | 66
sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 22
sw/source/core/inc/mvsave.hxx | 4
sw/source/core/inc/node2lay.hxx | 24
sw/source/core/inc/notxtfrm.hxx | 16
sw/source/core/inc/objectformatter.hxx | 36
sw/source/core/inc/pagefrm.hxx | 136
sw/source/core/inc/pamtyp.hxx | 2
sw/source/core/inc/prevwpage.hxx | 4
sw/source/core/inc/ptqueue.hxx | 4
sw/source/core/inc/rootfrm.hxx | 88
sw/source/core/inc/rowfrm.hxx | 22
sw/source/core/inc/sectfrm.hxx | 64
sw/source/core/inc/swfont.hxx | 8
sw/source/core/inc/swselectionlist.hxx | 10
sw/source/core/inc/tabfrm.hxx | 60
sw/source/core/inc/tblrwcl.hxx | 4
sw/source/core/inc/tocntntanchoredobjectposition.hxx | 26
sw/source/core/inc/tolayoutanchoredobjectposition.hxx | 2
sw/source/core/inc/txtfly.hxx | 48
sw/source/core/inc/txtfrm.hxx | 204 -
sw/source/core/inc/unoport.hxx | 24
sw/source/core/inc/viewimp.hxx | 66
sw/source/core/layout/anchoreddrawobject.cxx | 152
sw/source/core/layout/anchoredobject.cxx | 232 -
sw/source/core/layout/atrfrm.cxx | 290 -
sw/source/core/layout/calcmove.cxx | 934 ++--
sw/source/core/layout/colfrm.cxx | 136
sw/source/core/layout/dbg_lay.cxx | 272 -
sw/source/core/layout/dumpfilter.cxx | 4
sw/source/core/layout/findfrm.cxx | 1024 ++---
sw/source/core/layout/flowfrm.cxx | 974 ++---
sw/source/core/layout/fly.cxx | 1010 ++---
sw/source/core/layout/flycnt.cxx | 632 +--
sw/source/core/layout/flyincnt.cxx | 86
sw/source/core/layout/flylay.cxx | 602 +--
sw/source/core/layout/flypos.cxx | 8
sw/source/core/layout/frmtool.cxx | 1566 ++++----
sw/source/core/layout/ftnfrm.cxx | 1292 +++---
sw/source/core/layout/hffrm.cxx | 274 -
sw/source/core/layout/layact.cxx | 672 +--
sw/source/core/layout/laycache.cxx | 220 -
sw/source/core/layout/layhelp.hxx | 34
sw/source/core/layout/layouter.cxx | 158
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 44
sw/source/core/layout/newfrm.cxx | 220 -
sw/source/core/layout/objectformatter.cxx | 176
sw/source/core/layout/objectformatterlayfrm.cxx | 86
sw/source/core/layout/objectformatterlayfrm.hxx | 20
sw/source/core/layout/objectformattertxtfrm.cxx | 352 -
sw/source/core/layout/objectformattertxtfrm.hxx | 32
sw/source/core/layout/pagechg.cxx | 748 +--
sw/source/core/layout/pagedesc.cxx | 72
sw/source/core/layout/paintfrm.cxx | 1148 ++---
sw/source/core/layout/sectfrm.cxx | 1154 +++---
sw/source/core/layout/softpagebreak.cxx | 48
sw/source/core/layout/ssfrm.cxx | 356 -
sw/source/core/layout/swselectionlist.cxx | 36
sw/source/core/layout/tabfrm.cxx | 1922 +++++-----
sw/source/core/layout/trvlfrm.cxx | 1168 +++---
sw/source/core/layout/unusedf.cxx | 30
sw/source/core/layout/virtoutp.cxx | 16
sw/source/core/layout/virtoutp.hxx | 2
sw/source/core/layout/wsfrm.cxx | 1556 ++++----
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 376 -
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 78
sw/source/core/objectpositioning/environmentofanchoredobject.cxx | 60
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 394 +-
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 38
sw/source/core/ole/ndole.cxx | 10
sw/source/core/table/swnewtable.cxx | 86
sw/source/core/table/swtable.cxx | 214 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 396 +-
sw/source/core/text/atrstck.cxx | 2
sw/source/core/text/blink.cxx | 16
sw/source/core/text/frmcrsr.cxx | 530 +-
sw/source/core/text/frmform.cxx | 464 +-
sw/source/core/text/frminf.cxx | 84
sw/source/core/text/frmpaint.cxx | 138
sw/source/core/text/guess.cxx | 12
sw/source/core/text/inftxt.cxx | 148
sw/source/core/text/inftxt.hxx | 34
sw/source/core/text/itradj.cxx | 32
sw/source/core/text/itratr.cxx | 42
sw/source/core/text/itratr.hxx | 4
sw/source/core/text/itrcrsr.cxx | 152
sw/source/core/text/itrform2.cxx | 220 -
sw/source/core/text/itrform2.hxx | 12
sw/source/core/text/itrpaint.cxx | 30
sw/source/core/text/itrpaint.hxx | 8
sw/source/core/text/itrtxt.cxx | 30
sw/source/core/text/itrtxt.hxx | 56
sw/source/core/text/pordrop.hxx | 2
sw/source/core/text/porexp.cxx | 4
sw/source/core/text/porexp.hxx | 2
sw/source/core/text/porfld.cxx | 46
sw/source/core/text/porfld.hxx | 6
sw/source/core/text/porfly.cxx | 80
sw/source/core/text/porfly.hxx | 26
sw/source/core/text/porftn.hxx | 4
sw/source/core/text/porglue.cxx | 4
sw/source/core/text/porglue.hxx | 2
sw/source/core/text/porlay.cxx | 10
sw/source/core/text/porlay.hxx | 6
sw/source/core/text/porlin.cxx | 12
sw/source/core/text/porlin.hxx | 2
sw/source/core/text/pormulti.cxx | 82
sw/source/core/text/pormulti.hxx | 2
sw/source/core/text/porrst.cxx | 60
sw/source/core/text/porrst.hxx | 2
sw/source/core/text/portxt.cxx | 20
sw/source/core/text/portxt.hxx | 2
sw/source/core/text/redlnitr.cxx | 12
sw/source/core/text/txtcache.cxx | 34
sw/source/core/text/txtcache.hxx | 6
sw/source/core/text/txtdrop.cxx | 36
sw/source/core/text/txtfld.cxx | 34
sw/source/core/text/txtfly.cxx | 232 -
sw/source/core/text/txtfrm.cxx | 568 +-
sw/source/core/text/txtftn.cxx | 484 +-
sw/source/core/text/txthyph.cxx | 18
sw/source/core/text/txtinit.cxx | 12
sw/source/core/text/txtio.cxx | 4
sw/source/core/text/txtpaint.cxx | 12
sw/source/core/text/txtpaint.hxx | 6
sw/source/core/text/txttab.cxx | 44
sw/source/core/text/widorp.cxx | 152
sw/source/core/text/widorp.hxx | 20
sw/source/core/text/xmldump.cxx | 86
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 18
sw/source/core/tox/ToxTextGenerator.cxx | 6
sw/source/core/tox/txmsrt.cxx | 6
sw/source/core/txtnode/SwGrammarContact.cxx | 8
sw/source/core/txtnode/atrfld.cxx | 2
sw/source/core/txtnode/atrflyin.cxx | 70
sw/source/core/txtnode/atrftn.cxx | 44
sw/source/core/txtnode/fntcache.cxx | 76
sw/source/core/txtnode/fntcap.cxx | 50
sw/source/core/txtnode/ndtxt.cxx | 96
sw/source/core/txtnode/swfont.cxx | 28
sw/source/core/txtnode/thints.cxx | 4
sw/source/core/txtnode/txtedt.cxx | 128
sw/source/core/undo/rolbck.cxx | 6
sw/source/core/undo/unattr.cxx | 16
sw/source/core/undo/undel.cxx | 14
sw/source/core/undo/undobj.cxx | 2
sw/source/core/undo/undobj1.cxx | 26
sw/source/core/undo/unfmco.cxx | 2
sw/source/core/undo/unins.cxx | 6
sw/source/core/undo/unsort.cxx | 16
sw/source/core/undo/untbl.cxx | 70
sw/source/core/unocore/unochart.cxx | 156
sw/source/core/unocore/unocrsr.cxx | 40
sw/source/core/unocore/unocrsrhelper.cxx | 42
sw/source/core/unocore/unodraw.cxx | 16
sw/source/core/unocore/unoflatpara.cxx | 14
sw/source/core/unocore/unoframe.cxx | 146
sw/source/core/unocore/unoftn.cxx | 6
sw/source/core/unocore/unoobj.cxx | 194 -
sw/source/core/unocore/unoobj2.cxx | 156
sw/source/core/unocore/unoparagraph.cxx | 18
sw/source/core/unocore/unoport.cxx | 94
sw/source/core/unocore/unoportenum.cxx | 244 -
sw/source/core/unocore/unoredline.cxx | 28
sw/source/core/unocore/unostyle.cxx | 16
sw/source/core/unocore/unotbl.cxx | 430 +-
sw/source/core/unocore/unotext.cxx | 38
sw/source/core/view/pagepreviewlayout.cxx | 60
sw/source/core/view/vdraw.cxx | 10
sw/source/core/view/viewimp.cxx | 92
sw/source/core/view/viewpg.cxx | 20
sw/source/core/view/viewsh.cxx | 170
sw/source/core/view/vnew.cxx | 28
sw/source/core/view/vprint.cxx | 72
sw/source/core/view/vprint.hxx | 2
sw/source/filter/ascii/parasc.cxx | 6
sw/source/filter/basflt/fltini.cxx | 44
sw/source/filter/basflt/fltshell.cxx | 2
sw/source/filter/basflt/shellio.cxx | 64
sw/source/filter/html/css1atr.cxx | 46
sw/source/filter/html/htmlatr.cxx | 24
sw/source/filter/html/htmlcss1.cxx | 58
sw/source/filter/html/htmlctxt.cxx | 34
sw/source/filter/html/htmldrawreader.cxx | 18
sw/source/filter/html/htmldrawwriter.cxx | 8
sw/source/filter/html/htmlfly.cxx | 18
sw/source/filter/html/htmlfly.hxx | 30
sw/source/filter/html/htmlflyt.cxx | 10
sw/source/filter/html/htmlflywriter.cxx | 166
sw/source/filter/html/htmlforw.cxx | 24
sw/source/filter/html/htmlgrin.cxx | 58
sw/source/filter/html/htmlplug.cxx | 94
sw/source/filter/html/htmlsect.cxx | 40
sw/source/filter/html/htmltab.cxx | 66
sw/source/filter/html/htmltabw.cxx | 12
sw/source/filter/html/swhtml.cxx | 62
sw/source/filter/html/swhtml.hxx | 30
sw/source/filter/html/wrthtml.cxx | 16
sw/source/filter/html/wrthtml.hxx | 20
sw/source/filter/inc/msfilter.hxx | 4
sw/source/filter/inc/wrtswtbl.hxx | 2
sw/source/filter/writer/wrtswtbl.cxx | 10
sw/source/filter/ww8/WW8TableInfo.cxx | 28
sw/source/filter/ww8/WW8TableInfo.hxx | 14
sw/source/filter/ww8/attributeoutputbase.hxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 22
sw/source/filter/ww8/docxattributeoutput.hxx | 2
sw/source/filter/ww8/docxsdrexport.cxx | 6
sw/source/filter/ww8/escher.hxx | 6
sw/source/filter/ww8/rtfattributeoutput.cxx | 40
sw/source/filter/ww8/rtfattributeoutput.hxx | 2
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/writerhelper.cxx | 22
sw/source/filter/ww8/writerhelper.hxx | 8
sw/source/filter/ww8/writerwordglue.cxx | 10
sw/source/filter/ww8/wrtw8esh.cxx | 38
sw/source/filter/ww8/wrtw8nds.cxx | 32
sw/source/filter/ww8/wrtww8.cxx | 16
sw/source/filter/ww8/wrtww8.hxx | 8
sw/source/filter/ww8/wrtww8gr.cxx | 2
sw/source/filter/ww8/ww8atr.cxx | 44
sw/source/filter/ww8/ww8attributeoutput.hxx | 2
sw/source/filter/ww8/ww8graf.cxx | 34
sw/source/filter/ww8/ww8graf2.cxx | 6
sw/source/filter/ww8/ww8par.cxx | 52
sw/source/filter/ww8/ww8par.hxx | 22
sw/source/filter/ww8/ww8par2.cxx | 14
sw/source/filter/ww8/ww8par2.hxx | 4
sw/source/filter/ww8/ww8par4.cxx | 6
sw/source/filter/ww8/ww8par6.cxx | 36
sw/source/filter/ww8/ww8scan.cxx | 28
sw/source/filter/ww8/ww8scan.hxx | 4
sw/source/filter/xml/xmlexpit.cxx | 12
sw/source/filter/xml/xmlimp.cxx | 58
sw/source/filter/xml/xmlimpit.cxx | 16
sw/source/filter/xml/xmltble.cxx | 26
sw/source/filter/xml/xmltbli.cxx | 56
sw/source/filter/xml/xmltexte.cxx | 6
sw/source/filter/xml/xmltexti.cxx | 94
sw/source/ui/chrdlg/break.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 14
sw/source/ui/chrdlg/drpcps.cxx | 4
sw/source/ui/chrdlg/pardlg.cxx | 8
sw/source/ui/config/optpage.cxx | 30
sw/source/ui/dbui/dbinsdlg.cxx | 16
sw/source/ui/dbui/mmlayoutpage.cxx | 14
sw/source/ui/dbui/mmoutputpage.cxx | 8
sw/source/ui/dialog/macassgn.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 8
sw/source/ui/dialog/swdlgfact.hxx | 4
sw/source/ui/dialog/uiregionsw.cxx | 36
sw/source/ui/envelp/labelexp.cxx | 4
sw/source/ui/fldui/DropDownFieldDialog.cxx | 2
sw/source/ui/fldui/fldedt.cxx | 14
sw/source/ui/fldui/inpdlg.cxx | 2
sw/source/ui/fldui/javaedit.cxx | 4
sw/source/ui/fmtui/tmpdlg.cxx | 18
sw/source/ui/frmdlg/column.cxx | 50
sw/source/ui/frmdlg/cption.cxx | 8
sw/source/ui/frmdlg/frmdlg.cxx | 34
sw/source/ui/frmdlg/frmpage.cxx | 282 -
sw/source/ui/frmdlg/wrap.cxx | 20
sw/source/ui/index/cntex.cxx | 6
sw/source/ui/index/cnttab.cxx | 2
sw/source/ui/index/swuiidxmrk.cxx | 22
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/misc/num.cxx | 2
sw/source/ui/misc/srtdlg.cxx | 2
sw/source/ui/misc/titlepage.cxx | 4
sw/source/ui/table/rowht.cxx | 10
sw/source/ui/table/tabledlg.cxx | 4
sw/source/ui/table/tautofmt.cxx | 2
sw/source/uibase/app/appenv.cxx | 26
sw/source/uibase/app/apphdl.cxx | 4
sw/source/uibase/app/applab.cxx | 28
sw/source/uibase/app/docsh.cxx | 28
sw/source/uibase/app/docsh2.cxx | 54
sw/source/uibase/app/docst.cxx | 66
sw/source/uibase/config/cfgitems.cxx | 4
sw/source/uibase/config/usrpref.cxx | 4
sw/source/uibase/config/viewopt.cxx | 6
sw/source/uibase/dbui/dbmgr.cxx | 16
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 18
sw/source/uibase/dialog/regionsw.cxx | 4
sw/source/uibase/dochdl/gloshdl.cxx | 6
sw/source/uibase/dochdl/swdtflvr.cxx | 188
sw/source/uibase/docvw/FrameControlsManager.cxx | 44
sw/source/uibase/docvw/HeaderFooterWin.cxx | 4
sw/source/uibase/docvw/PageBreakWin.cxx | 54
sw/source/uibase/docvw/PostItMgr.cxx | 58
sw/source/uibase/docvw/SidebarWin.cxx | 50
sw/source/uibase/docvw/SidebarWinAcc.cxx | 24
sw/source/uibase/docvw/SidebarWinAcc.hxx | 4
sw/source/uibase/docvw/edtdd.cxx | 28
sw/source/uibase/docvw/edtwin.cxx | 584 +--
sw/source/uibase/docvw/edtwin2.cxx | 14
sw/source/uibase/docvw/edtwin3.cxx | 4
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 80
sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 22
sw/source/uibase/fldui/fldmgr.cxx | 8
sw/source/uibase/frmdlg/colex.cxx | 30
sw/source/uibase/frmdlg/colmgr.cxx | 2
sw/source/uibase/frmdlg/frmmgr.cxx | 94
sw/source/uibase/inc/FrameControl.hxx | 14
sw/source/uibase/inc/FrameControlsManager.hxx | 14
sw/source/uibase/inc/HeaderFooterWin.hxx | 2
sw/source/uibase/inc/PageBreakWin.hxx | 4
sw/source/uibase/inc/basesh.hxx | 10
sw/source/uibase/inc/cfgitems.hxx | 4
sw/source/uibase/inc/chrdlg.hxx | 2
sw/source/uibase/inc/colex.hxx | 2
sw/source/uibase/inc/column.hxx | 6
sw/source/uibase/inc/edtwin.hxx | 18
sw/source/uibase/inc/frmdlg.hxx | 8
sw/source/uibase/inc/frmmgr.hxx | 40
sw/source/uibase/inc/frmpage.hxx | 42
sw/source/uibase/inc/initui.hxx | 4
sw/source/uibase/inc/navmgr.hxx | 4
sw/source/uibase/inc/optpage.hxx | 10
sw/source/uibase/inc/pview.hxx | 6
sw/source/uibase/inc/shdwcrsr.hxx | 2
sw/source/uibase/inc/tabsh.hxx | 2
sw/source/uibase/inc/textsh.hxx | 4
sw/source/uibase/inc/uivwimp.hxx | 8
sw/source/uibase/inc/unotools.hxx | 6
sw/source/uibase/inc/wrap.hxx | 2
sw/source/uibase/inc/wrtsh.hxx | 88
sw/source/uibase/lingu/hhcwrp.cxx | 48
sw/source/uibase/lingu/olmenu.cxx | 6
sw/source/uibase/misc/redlndlg.cxx | 6
sw/source/uibase/ribbar/drawbase.cxx | 36
sw/source/uibase/ribbar/inputwin.cxx | 8
sw/source/uibase/shells/basesh.cxx | 178
sw/source/uibase/shells/beziersh.cxx | 4
sw/source/uibase/shells/drwbassh.cxx | 22
sw/source/uibase/shells/frmsh.cxx | 98
sw/source/uibase/shells/grfsh.cxx | 44
sw/source/uibase/shells/langhelper.cxx | 6
sw/source/uibase/shells/listsh.cxx | 4
sw/source/uibase/shells/mediash.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 20
sw/source/uibase/shells/textdrw.cxx | 2
sw/source/uibase/shells/textfld.cxx | 24
sw/source/uibase/shells/textidx.cxx | 4
sw/source/uibase/shells/textsh.cxx | 80
sw/source/uibase/shells/textsh1.cxx | 46
sw/source/uibase/shells/txtattr.cxx | 18
sw/source/uibase/shells/txtcrsr.cxx | 20
sw/source/uibase/table/chartins.cxx | 2
sw/source/uibase/table/tablemgr.cxx | 4
sw/source/uibase/uiview/formatclipboard.cxx | 24
sw/source/uibase/uiview/pview.cxx | 14
sw/source/uibase/uiview/swcli.cxx | 12
sw/source/uibase/uiview/view.cxx | 66
sw/source/uibase/uiview/view0.cxx | 2
sw/source/uibase/uiview/view2.cxx | 94
sw/source/uibase/uiview/viewdlg.cxx | 2
sw/source/uibase/uiview/viewdlg2.cxx | 10
sw/source/uibase/uiview/viewdraw.cxx | 18
sw/source/uibase/uiview/viewling.cxx | 46
sw/source/uibase/uiview/viewmdi.cxx | 18
sw/source/uibase/uiview/viewport.cxx | 30
sw/source/uibase/uiview/viewprt.cxx | 2
sw/source/uibase/uiview/viewsrch.cxx | 36
sw/source/uibase/uiview/viewstat.cxx | 32
sw/source/uibase/uiview/viewtab.cxx | 196 -
sw/source/uibase/uno/unotxdoc.cxx | 108
sw/source/uibase/uno/unotxvw.cxx | 138
sw/source/uibase/utlui/attrdesc.cxx | 8
sw/source/uibase/utlui/content.cxx | 24
sw/source/uibase/utlui/glbltree.cxx | 12
sw/source/uibase/utlui/initui.cxx | 10
sw/source/uibase/utlui/navipi.cxx | 30
sw/source/uibase/utlui/shdwcrsr.cxx | 10
sw/source/uibase/utlui/tmplctrl.cxx | 4
sw/source/uibase/utlui/uitool.cxx | 28
sw/source/uibase/utlui/unotools.cxx | 58
sw/source/uibase/wrtsh/delete.cxx | 86
sw/source/uibase/wrtsh/move.cxx | 238 -
sw/source/uibase/wrtsh/navmgr.cxx | 8
sw/source/uibase/wrtsh/select.cxx | 206 -
sw/source/uibase/wrtsh/wrtsh1.cxx | 148
sw/source/uibase/wrtsh/wrtsh2.cxx | 16
sw/source/uibase/wrtsh/wrtsh3.cxx | 34
sw/source/uibase/wrtsh/wrtsh4.cxx | 36
sw/source/uibase/wrtsh/wrtundo.cxx | 14
sw/uiconfig/swriter/ui/frmaddpage.ui | 2
sw/uiconfig/swriter/ui/frmtypepage.ui | 2
sw/uiconfig/swriter/ui/frmurlpage.ui | 2
651 files changed, 27946 insertions(+), 27946 deletions(-)
New commits:
commit 49c2b9808df8a6b197dec666dfc0cda6321a4306
Author: Robinson Tryon <qubit at runcibility.com>
Date: Wed Nov 25 06:03:10 2015 -0500
bin/rename-sw-abbreviations.sh
This commit renames the most annoying abbreviations in Writer (and
partially in the shared code too).
Change-Id: I77e5134f42f25e3786afa36b7a505c7e3237a9e8
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 74da451..c1d3e30 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 cba6d26..8261c86 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 ab02daa..23f465f 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 3c8324e..b41bdb3 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 4d88b46..c6738fa 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 8f015b0..60a2056 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 94f142c..bbd4872 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 a470513..eaf01f2 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 3d25df8..7b097a2 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 803a398..8b72e4c 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 491920e..def1964 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 a470914..e681a25 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 59b6c84..9889ecb 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 6e7cd83..cd0ce77 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 124e5de..d53a610 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 cdb7df2..0663b21 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 2ba43ff..a75b3f9 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 682c950..3e99628 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 c565b66..73d4242 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 be104eb..c752fa3 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 0724618..37c5201 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 bd9cf54..52fe098 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 2e8c915..d684e9f 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 74605ba..f786d84 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 58041f3..b2dbe78 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 da9420f..f036728 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.
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list