[Libreoffice-commits] core.git: 2 commits - chart2/source configure.ac cui/source editeng/source filter/source include/editeng include/filter include/svl include/svtools include/svx sc/source sd/source sfx2/sdi starmath/sdi svl/source svtools/source svx/sdi svx/source sw/inc sw/qa sw/README sw/sdi sw/source sw/uiconfig
Christian Lohmaier
lohmaier+LibreOffice at googlemail.com
Wed May 20 04:08:39 PDT 2015
chart2/source/controller/main/ShapeController.cxx | 4
configure.ac | 2
cui/source/dialogs/hltpbase.cxx | 4
cui/source/inc/macroass.hxx | 8
cui/source/inc/numpages.hxx | 14
cui/source/inc/paragrph.hxx | 4
cui/source/tabpages/autocdlg.cxx | 42
cui/source/tabpages/numpages.cxx | 26
cui/source/tabpages/paragrph.cxx | 54
cui/source/tabpages/tabstpge.cxx | 2
editeng/source/editeng/editattr.hxx | 4
editeng/source/editeng/editdbg.cxx | 4
editeng/source/editeng/editdoc.cxx | 4
editeng/source/editeng/editeng.cxx | 6
editeng/source/editeng/editobj.cxx | 4
editeng/source/editeng/impedit2.cxx | 8
editeng/source/editeng/impedit3.cxx | 16
editeng/source/editeng/impedit4.cxx | 4
editeng/source/items/frmitems.cxx | 68
editeng/source/items/numitem.cxx | 2
editeng/source/items/paraitem.cxx | 18
editeng/source/items/svxfont.cxx | 2
editeng/source/misc/acorrcfg.cxx | 20
editeng/source/misc/swafopt.cxx | 24
editeng/source/outliner/outliner.cxx | 12
editeng/source/rtf/rtfitem.cxx | 8
editeng/source/rtf/svxrtf.cxx | 8
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/svdfppt.cxx | 4
include/editeng/acorrcfg.hxx | 4
include/editeng/formatbreakitem.hxx | 18
include/editeng/keepitem.hxx | 12
include/editeng/lrspitem.hxx | 20
include/editeng/memberids.hrc | 2
include/editeng/numitem.hxx | 6
include/editeng/outliner.hxx | 10
include/editeng/protitem.hxx | 6
include/editeng/spltitem.hxx | 16
include/editeng/svxacorr.hxx | 4
include/editeng/svxfont.hxx | 2
include/editeng/svxrtf.hxx | 2
include/editeng/swafopt.hxx | 18
include/filter/msfilter/msdffimp.hxx | 8
include/svl/zforlist.hxx | 4
include/svtools/svparser.hxx | 2
include/svx/clipboardctl.hxx | 2
include/svx/clipfmtitem.hxx | 12
include/svx/hlnkitem.hxx | 2
include/svx/optgrid.hxx | 24
sc/source/core/tool/viewopti.cxx | 36
sc/source/ui/app/scmod.cxx | 2
sc/source/ui/app/typemap.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 6
sc/source/ui/drawfunc/drtxtob1.cxx | 4
sc/source/ui/inc/cellsh.hxx | 4
sc/source/ui/unoobj/confuno.cxx | 16
sc/source/ui/view/cellsh.cxx | 6
sc/source/ui/view/cellsh1.cxx | 2
sc/source/ui/view/drawview.cxx | 10
sc/source/ui/view/editsh.cxx | 2
sc/source/ui/view/viewdata.cxx | 16
sd/source/core/drawdoc4.cxx | 2
sd/source/core/sdpage.cxx | 2
sd/source/core/stlpool.cxx | 2
sd/source/core/stlsheet.cxx | 8
sd/source/filter/xml/sdtransform.cxx | 4
sd/source/ui/app/optsitem.cxx | 84
sd/source/ui/app/sdmod2.cxx | 4
sd/source/ui/func/fuparagr.cxx | 2
sd/source/ui/inc/DrawViewShell.hxx | 4
sd/source/ui/inc/optsitem.hxx | 24
sd/source/ui/view/drviews3.cxx | 30
sd/source/ui/view/drviews7.cxx | 10
sd/source/ui/view/frmview.cxx | 8
sfx2/sdi/sfx.sdi | 2
sfx2/sdi/sfxitems.sdi | 2
starmath/sdi/smitems.sdi | 6
svl/source/numbers/zforlist.cxx | 6
svtools/source/svrtf/svparser.cxx | 2
svx/sdi/svx.sdi | 6
svx/sdi/svxitems.sdi | 6
svx/source/dialog/fntctrl.cxx | 6
svx/source/dialog/svxruler.cxx | 26
svx/source/items/clipfmtitem.cxx | 44
svx/source/items/hlnkitem.cxx | 4
svx/source/mnuctrls/clipboardctl.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 20
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 24
svx/source/styles/CommonStylePreviewRenderer.cxx | 2
svx/source/svdraw/svdedxv.cxx | 6
sw/README | 32
sw/inc/AnnotationWin.hxx | 6
sw/inc/EnhancedPDFExportHelper.hxx | 42
sw/inc/HandleAnchorNodeChg.hxx | 16
sw/inc/IDocumentContentOperations.hxx | 34
sw/inc/IDocumentFieldsAccess.hxx | 62
sw/inc/IDocumentLayoutAccess.hxx | 12
sw/inc/IDocumentMarkAccess.hxx | 6
sw/inc/IDocumentOutlineNodes.hxx | 8
sw/inc/IDocumentRedlineAccess.hxx | 14
sw/inc/IDocumentSettingAccess.hxx | 4
sw/inc/IDocumentState.hxx | 4
sw/inc/IDocumentStylePoolAccess.hxx | 20
sw/inc/IGrammarContact.hxx | 14
sw/inc/PostItMgr.hxx | 22
sw/inc/SidebarWin.hxx | 4
sw/inc/SwNodeNum.hxx | 12
sw/inc/SwStyleNameMapper.hxx | 28
sw/inc/SwUndoField.hxx | 4
sw/inc/ToxLinkProcessor.hxx | 8
sw/inc/ToxTabStopTokenHandler.hxx | 10
sw/inc/ToxTextGenerator.hxx | 24
sw/inc/accmap.hxx | 10
sw/inc/anchoreddrawobject.hxx | 4
sw/inc/anchoredobject.hxx | 24
sw/inc/breakit.hxx | 4
sw/inc/calc.hxx | 8
sw/inc/cellatr.hxx | 50
sw/inc/cellfml.hxx | 34
sw/inc/charatr.hxx | 66
sw/inc/charfmt.hxx | 22
sw/inc/chpfld.hxx | 10
sw/inc/cmdid.h | 2
sw/inc/crsrsh.hxx | 172
sw/inc/crstate.hxx | 20
sw/inc/cshtyp.hxx | 10
sw/inc/dbfld.hxx | 24
sw/inc/dbgoutsw.hxx | 28
sw/inc/dbmgr.hxx | 14
sw/inc/dcontact.hxx | 46
sw/inc/doc.hxx | 462 +-
sw/inc/docary.hxx | 80
sw/inc/docstat.hxx | 2
sw/inc/docstyle.hxx | 24
sw/inc/docufld.hxx | 74
sw/inc/editsh.hxx | 196 -
sw/inc/expfld.hxx | 100
sw/inc/fchrfmt.hxx | 22
sw/inc/fesh.hxx | 112
sw/inc/fldbas.hxx | 34
sw/inc/flddat.hxx | 2
sw/inc/fldui.hrc | 2
sw/inc/fldupde.hxx | 2
sw/inc/flypos.hxx | 8
sw/inc/fmtanchr.hxx | 20
sw/inc/fmtautofmt.hxx | 10
sw/inc/fmtclbl.hxx | 10
sw/inc/fmtclds.hxx | 16
sw/inc/fmtcnct.hxx | 28
sw/inc/fmtcntnt.hxx | 24
sw/inc/fmtcol.hxx | 118
sw/inc/fmtcolfunc.hxx | 24
sw/inc/fmteiro.hxx | 10
sw/inc/fmtflcnt.hxx | 24
sw/inc/fmtfld.hxx | 46
sw/inc/fmtfollowtextflow.hxx | 10
sw/inc/fmtfordr.hxx | 14
sw/inc/fmtfsize.hxx | 12
sw/inc/fmtftn.hxx | 28
sw/inc/fmtftntx.hxx | 48
sw/inc/fmthdft.hxx | 54
sw/inc/fmtinfmt.hxx | 68
sw/inc/fmtline.hxx | 10
sw/inc/fmtlsplt.hxx | 10
sw/inc/fmtmeta.hxx | 60
sw/inc/fmtornt.hxx | 28
sw/inc/fmtpdsc.hxx | 18
sw/inc/fmtrfmrk.hxx | 20
sw/inc/fmtrowsplt.hxx | 10
sw/inc/fmtruby.hxx | 38
sw/inc/fmtsrnd.hxx | 18
sw/inc/fmturl.hxx | 16
sw/inc/fmtwrapinfluenceonobjpos.hxx | 20
sw/inc/format.hxx | 130
sw/inc/frmatr.hxx | 36
sw/inc/frmfmt.hxx | 98
sw/inc/ftnidx.hxx | 32
sw/inc/ftninfo.hxx | 46
sw/inc/grfatr.hxx | 26
sw/inc/hfspacingitem.hxx | 2
sw/inc/hhcwrp.hxx | 2
sw/inc/hintids.hxx | 38
sw/inc/hints.hxx | 60
sw/inc/htmltbl.hxx | 6
sw/inc/lineinfo.hxx | 6
sw/inc/mdiexp.hxx | 2
sw/inc/modcfg.hxx | 80
sw/inc/modeltoviewhelper.hxx | 6
sw/inc/ndarr.hxx | 84
sw/inc/ndgrf.hxx | 16
sw/inc/ndhints.hxx | 72
sw/inc/ndnotxt.hxx | 32
sw/inc/ndole.hxx | 20
sw/inc/ndtxt.hxx | 176
sw/inc/ndtyp.hxx | 2
sw/inc/node.hxx | 134
sw/inc/numrule.hxx | 74
sw/inc/pagedesc.hxx | 82
sw/inc/pam.hxx | 44
sw/inc/paratr.hxx | 72
sw/inc/poolfmt.awk | 6
sw/inc/poolfmt.hxx | 2
sw/inc/postithelper.hxx | 16
sw/inc/printdata.hxx | 6
sw/inc/redline.hxx | 18
sw/inc/reffld.hxx | 30
sw/inc/rubylist.hxx | 8
sw/inc/section.hxx | 58
sw/inc/shellio.hxx | 50
sw/inc/shellres.hxx | 20
sw/inc/splargs.hxx | 26
sw/inc/sw3convert.hxx | 2
sw/inc/swabstdlg.hxx | 40
sw/inc/swatrset.hxx | 122
sw/inc/swbaslnk.hxx | 10
sw/inc/swcrsr.hxx | 48
sw/inc/swddetbl.hxx | 8
sw/inc/swevent.hxx | 26
sw/inc/swmodule.hxx | 10
sw/inc/swscanner.hxx | 6
sw/inc/swserv.hxx | 4
sw/inc/swtable.hxx | 134
sw/inc/swtblfmt.hxx | 48
sw/inc/swtypes.hxx | 8
sw/inc/tblafmt.hxx | 70
sw/inc/tblenum.hxx | 28
sw/inc/tblsel.hxx | 46
sw/inc/textboxhelper.hxx | 50
sw/inc/tgrditem.hxx | 2
sw/inc/tox.hxx | 16
sw/inc/toxwrap.hxx | 6
sw/inc/txatbase.hxx | 98
sw/inc/txatritr.hxx | 20
sw/inc/txtannotationfld.hxx | 8
sw/inc/txtatr.hxx | 62
sw/inc/txtflcnt.hxx | 18
sw/inc/txtfld.hxx | 58
sw/inc/txtftn.hxx | 26
sw/inc/txtinet.hxx | 40
sw/inc/txtrfmrk.hxx | 22
sw/inc/txttxmrk.hxx | 26
sw/inc/undobj.hxx | 74
sw/inc/unochart.hxx | 10
sw/inc/unocoll.hxx | 16
sw/inc/unocrsr.hxx | 8
sw/inc/unocrsrhelper.hxx | 20
sw/inc/unodraw.hxx | 6
sw/inc/unofieldcoll.hxx | 2
sw/inc/unoframe.hxx | 34
sw/inc/unomid.h | 6
sw/inc/unoparagraph.hxx | 10
sw/inc/unosett.hxx | 14
sw/inc/unotbl.hxx | 60
sw/inc/unotextbodyhf.hxx | 6
sw/inc/unotextrange.hxx | 4
sw/inc/unotxdoc.hxx | 2
sw/inc/usrfld.hxx | 8
sw/inc/viewopt.hxx | 12
sw/inc/viewsh.hxx | 16
sw/inc/viscrs.hxx | 18
sw/qa/complex/accessibility/AccessibleRelationSet.java | 12
sw/qa/complex/writer/CheckCrossReferences.java | 112
sw/qa/complex/writer/CheckTable.java | 2
sw/qa/core/macros-test.cxx | 38
sw/qa/core/test_ToxLinkProcessor.cxx | 16
sw/qa/core/test_ToxTextGenerator.cxx | 8
sw/qa/core/uwriter.cxx | 314 -
sw/qa/extras/globalfilter/globalfilter.cxx | 6
sw/qa/extras/htmlimport/htmlimport.cxx | 12
sw/qa/extras/inc/swmodeltestbase.hxx | 12
sw/qa/extras/mailmerge/mailmerge.cxx | 34
sw/qa/extras/odfimport/odfimport.cxx | 74
sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 2
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/qa/extras/tiledrendering/tiledrendering.cxx | 8
sw/qa/extras/uiwriter/uiwriter.cxx | 134
sw/qa/python/check_table.py | 2
sw/sdi/_textsh.sdi | 124
sw/sdi/drwtxtsh.sdi | 38
sw/sdi/switems.sdi | 8
sw/sdi/swriter.sdi | 6
sw/sdi/tabsh.sdi | 4
sw/source/core/SwNumberTree/SwNodeNum.cxx | 108
sw/source/core/access/acccell.cxx | 16
sw/source/core/access/acccell.hxx | 4
sw/source/core/access/acccontext.cxx | 28
sw/source/core/access/accdoc.cxx | 76
sw/source/core/access/accembedded.cxx | 6
sw/source/core/access/accfootnote.cxx | 26
sw/source/core/access/accfootnote.hxx | 6
sw/source/core/access/accframe.cxx | 8
sw/source/core/access/accframebase.cxx | 42
sw/source/core/access/accfrmobj.cxx | 12
sw/source/core/access/accfrmobjmap.cxx | 4
sw/source/core/access/accfrmobjslist.cxx | 4
sw/source/core/access/accgraphic.cxx | 2
sw/source/core/access/acchyperlink.cxx | 60
sw/source/core/access/acchyperlink.hxx | 4
sw/source/core/access/acchypertextdata.hxx | 8
sw/source/core/access/accmap.cxx | 106
sw/source/core/access/accnotextframe.cxx | 26
sw/source/core/access/accnotextframe.hxx | 4
sw/source/core/access/accnotexthyperlink.cxx | 12
sw/source/core/access/accnotexthyperlink.hxx | 4
sw/source/core/access/accpara.cxx | 278 -
sw/source/core/access/accpara.hxx | 10
sw/source/core/access/accportions.cxx | 32
sw/source/core/access/accportions.hxx | 10
sw/source/core/access/accselectionhelper.cxx | 6
sw/source/core/access/acctable.cxx | 32
sw/source/core/access/acctextframe.cxx | 20
sw/source/core/access/parachangetrackinginfo.cxx | 70
sw/source/core/access/parachangetrackinginfo.hxx | 6
sw/source/core/access/textmarkuphelper.cxx | 16
sw/source/core/access/textmarkuphelper.hxx | 6
sw/source/core/attr/cellatr.cxx | 98
sw/source/core/attr/fmtfollowtextflow.cxx | 6
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 38
sw/source/core/attr/format.cxx | 244 -
sw/source/core/attr/hints.cxx | 30
sw/source/core/attr/swatrset.cxx | 48
sw/source/core/bastyp/breakit.cxx | 32
sw/source/core/bastyp/calc.cxx | 34
sw/source/core/bastyp/init.cxx | 130
sw/source/core/bastyp/swtypes.cxx | 10
sw/source/core/crsr/annotationmark.cxx | 32
sw/source/core/crsr/bookmrk.cxx | 30
sw/source/core/crsr/callnk.cxx | 64
sw/source/core/crsr/callnk.hxx | 8
sw/source/core/crsr/crossrefbookmark.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 474 +-
sw/source/core/crsr/crstrvl.cxx | 848 ++--
sw/source/core/crsr/findattr.cxx | 164
sw/source/core/crsr/findcoll.cxx | 36
sw/source/core/crsr/findfmt.cxx | 12
sw/source/core/crsr/findtxt.cxx | 108
sw/source/core/crsr/pam.cxx | 186 -
sw/source/core/crsr/paminit.cxx | 12
sw/source/core/crsr/swcrsr.cxx | 424 +-
sw/source/core/crsr/trvlcol.cxx | 16
sw/source/core/crsr/trvlfnfl.cxx | 172
sw/source/core/crsr/trvlreg.cxx | 32
sw/source/core/crsr/trvltbl.cxx | 304 -
sw/source/core/crsr/viscrs.cxx | 148
sw/source/core/doc/CntntIdxStore.cxx | 186 -
sw/source/core/doc/DocumentChartDataProviderManager.cxx | 4
sw/source/core/doc/DocumentContentOperationsManager.cxx | 1130 +++---
sw/source/core/doc/DocumentDeviceManager.cxx | 2
sw/source/core/doc/DocumentDrawModelManager.cxx | 14
sw/source/core/doc/DocumentFieldsManager.cxx | 968 ++---
sw/source/core/doc/DocumentLayoutManager.cxx | 174
sw/source/core/doc/DocumentLinksAdministrationManager.cxx | 88
sw/source/core/doc/DocumentListItemsManager.cxx | 6
sw/source/core/doc/DocumentOutlineNodesManager.cxx | 14
sw/source/core/doc/DocumentRedlineManager.cxx | 480 +-
sw/source/core/doc/DocumentSettingManager.cxx | 22
sw/source/core/doc/DocumentStateManager.cxx | 10
sw/source/core/doc/DocumentStatisticsManager.cxx | 26
sw/source/core/doc/DocumentStylePoolManager.cxx | 646 +--
sw/source/core/doc/DocumentTimerManager.cxx | 28
sw/source/core/doc/SwStyleNameMapper.cxx | 84
sw/source/core/doc/dbgoutsw.cxx | 110
sw/source/core/doc/doc.cxx | 340 -
sw/source/core/doc/docbasic.cxx | 24
sw/source/core/doc/docbm.cxx | 66
sw/source/core/doc/docchart.cxx | 64
sw/source/core/doc/doccomp.cxx | 176
sw/source/core/doc/doccorr.cxx | 50
sw/source/core/doc/docdesc.cxx | 242 -
sw/source/core/doc/docdraw.cxx | 128
sw/source/core/doc/docedt.cxx | 274 -
sw/source/core/doc/docfld.cxx | 460 +-
sw/source/core/doc/docfly.cxx | 384 +-
sw/source/core/doc/docfmt.cxx | 774 ++--
sw/source/core/doc/docftn.cxx | 300 -
sw/source/core/doc/docglbl.cxx | 62
sw/source/core/doc/docglos.cxx | 26
sw/source/core/doc/doclay.cxx | 682 +--
sw/source/core/doc/docnew.cxx | 272 -
sw/source/core/doc/docnum.cxx | 436 +-
sw/source/core/doc/docredln.cxx | 282 -
sw/source/core/doc/docruby.cxx | 20
sw/source/core/doc/docsort.cxx | 148
sw/source/core/doc/docstat.cxx | 4
sw/source/core/doc/doctxm.cxx | 512 +-
sw/source/core/doc/extinput.cxx | 26
sw/source/core/doc/fmtcol.cxx | 204 -
sw/source/core/doc/ftnidx.cxx | 178
sw/source/core/doc/gctable.cxx | 72
sw/source/core/doc/htmltbl.cxx | 78
sw/source/core/doc/lineinfo.cxx | 20
sw/source/core/doc/notxtfrm.cxx | 98
sw/source/core/doc/number.cxx | 470 +-
sw/source/core/doc/poolfmt.cxx | 16
sw/source/core/doc/swserv.cxx | 14
sw/source/core/doc/tblafmt.cxx | 302 -
sw/source/core/doc/tblcpy.cxx | 216 -
sw/source/core/doc/tblrwcl.cxx | 1126 +++---
sw/source/core/doc/textboxhelper.cxx | 192 -
sw/source/core/doc/visiturl.cxx | 16
sw/source/core/docnode/ndcopy.cxx | 190 -
sw/source/core/docnode/ndnotxt.cxx | 86
sw/source/core/docnode/ndnum.cxx | 20
sw/source/core/docnode/ndsect.cxx | 346 -
sw/source/core/docnode/ndsect.hxx | 2
sw/source/core/docnode/ndtbl.cxx | 1834 +++++-----
sw/source/core/docnode/ndtbl1.cxx | 304 -
sw/source/core/docnode/node.cxx | 482 +-
sw/source/core/docnode/node2lay.cxx | 40
sw/source/core/docnode/nodes.cxx | 322 -
sw/source/core/docnode/section.cxx | 292 -
sw/source/core/docnode/swbaslnk.cxx | 76
sw/source/core/draw/dcontact.cxx | 206 -
sw/source/core/draw/dflyobj.cxx | 66
sw/source/core/draw/dpage.cxx | 28
sw/source/core/draw/dview.cxx | 42
sw/source/core/edit/acorrect.cxx | 118
sw/source/core/edit/autofmt.cxx | 804 ++--
sw/source/core/edit/edatmisc.cxx | 28
sw/source/core/edit/edattr.cxx | 206 -
sw/source/core/edit/eddel.cxx | 22
sw/source/core/edit/edfcol.cxx | 46
sw/source/core/edit/edfld.cxx | 198 -
sw/source/core/edit/edfldexp.cxx | 20
sw/source/core/edit/edfmt.cxx | 74
sw/source/core/edit/edglbldc.cxx | 40
sw/source/core/edit/edglss.cxx | 80
sw/source/core/edit/editsh.cxx | 222 -
sw/source/core/edit/edlingu.cxx | 76
sw/source/core/edit/ednumber.cxx | 124
sw/source/core/edit/edredln.cxx | 10
sw/source/core/edit/edsect.cxx | 60
sw/source/core/edit/edtab.cxx | 154
sw/source/core/edit/edtox.cxx | 22
sw/source/core/edit/edundo.cxx | 22
sw/source/core/edit/edws.cxx | 18
sw/source/core/fields/authfld.cxx | 52
sw/source/core/fields/cellfml.cxx | 446 +-
sw/source/core/fields/chpfld.cxx | 52
sw/source/core/fields/dbfld.cxx | 62
sw/source/core/fields/ddefld.cxx | 78
sw/source/core/fields/ddetbl.cxx | 58
sw/source/core/fields/docufld.cxx | 394 +-
sw/source/core/fields/expfld.cxx | 250 -
sw/source/core/fields/fldbas.cxx | 150
sw/source/core/fields/flddat.cxx | 6
sw/source/core/fields/fldlst.cxx | 68
sw/source/core/fields/macrofld.cxx | 4
sw/source/core/fields/postithelper.cxx | 34
sw/source/core/fields/reffld.cxx | 348 -
sw/source/core/fields/tblcalc.cxx | 66
sw/source/core/fields/usrfld.cxx | 24
sw/source/core/frmedt/fecopy.cxx | 316 -
sw/source/core/frmedt/fedesc.cxx | 20
sw/source/core/frmedt/fefly1.cxx | 526 +-
sw/source/core/frmedt/feflyole.cxx | 4
sw/source/core/frmedt/feshview.cxx | 258 -
sw/source/core/frmedt/fetab.cxx | 286 -
sw/source/core/frmedt/fews.cxx | 112
sw/source/core/frmedt/tblsel.cxx | 364 -
sw/source/core/graphic/ndgrf.cxx | 40
sw/source/core/inc/DocumentContentOperationsManager.hxx | 40
sw/source/core/inc/DocumentFieldsManager.hxx | 58
sw/source/core/inc/DocumentLayoutManager.hxx | 6
sw/source/core/inc/DocumentOutlineNodesManager.hxx | 6
sw/source/core/inc/DocumentRedlineManager.hxx | 22
sw/source/core/inc/DocumentSettingManager.hxx | 6
sw/source/core/inc/DocumentStateManager.hxx | 6
sw/source/core/inc/DocumentStylePoolManager.hxx | 12
sw/source/core/inc/MarkManager.hxx | 2
sw/source/core/inc/SwPortionHandler.hxx | 6
sw/source/core/inc/SwUndoFmt.hxx | 124
sw/source/core/inc/SwXMLTextBlocks.hxx | 6
sw/source/core/inc/UndoAttribute.hxx | 58
sw/source/core/inc/UndoCore.hxx | 48
sw/source/core/inc/UndoDelete.hxx | 18
sw/source/core/inc/UndoDraw.hxx | 22
sw/source/core/inc/UndoInsert.hxx | 24
sw/source/core/inc/UndoNumbering.hxx | 2
sw/source/core/inc/UndoOverwrite.hxx | 8
sw/source/core/inc/UndoRedline.hxx | 6
sw/source/core/inc/UndoSection.hxx | 14
sw/source/core/inc/UndoSort.hxx | 6
sw/source/core/inc/UndoSplitMove.hxx | 20
sw/source/core/inc/UndoTable.hxx | 184 -
sw/source/core/inc/acorrect.hxx | 6
sw/source/core/inc/anchoredobjectposition.hxx | 14
sw/source/core/inc/annotationmark.hxx | 4
sw/source/core/inc/ascharanchoredobjectposition.hxx | 8
sw/source/core/inc/blink.hxx | 4
sw/source/core/inc/bodyfrm.hxx | 2
sw/source/core/inc/cntfrm.hxx | 76
sw/source/core/inc/colfrm.hxx | 4
sw/source/core/inc/dflyobj.hxx | 6
sw/source/core/inc/docedt.hxx | 2
sw/source/core/inc/docfld.hxx | 128
sw/source/core/inc/docsort.hxx | 6
sw/source/core/inc/doctxm.hxx | 30
sw/source/core/inc/drawfont.hxx | 8
sw/source/core/inc/flowfrm.hxx | 14
sw/source/core/inc/flyfrm.hxx | 36
sw/source/core/inc/flyfrms.hxx | 36
sw/source/core/inc/frame.hxx | 136
sw/source/core/inc/frminf.hxx | 20
sw/source/core/inc/frmtool.hxx | 30
sw/source/core/inc/ftnboss.hxx | 110
sw/source/core/inc/ftnfrm.hxx | 74
sw/source/core/inc/hffrm.hxx | 6
sw/source/core/inc/layact.hxx | 34
sw/source/core/inc/layfrm.hxx | 62
sw/source/core/inc/layouter.hxx | 18
sw/source/core/inc/movedfwdfrmsbyobjpos.hxx | 14
sw/source/core/inc/mvsave.hxx | 52
sw/source/core/inc/notxtfrm.hxx | 8
sw/source/core/inc/objectformatter.hxx | 8
sw/source/core/inc/pagefrm.hxx | 88
sw/source/core/inc/pamtyp.hxx | 28
sw/source/core/inc/rolbck.hxx | 122
sw/source/core/inc/rootfrm.hxx | 32
sw/source/core/inc/scriptinfo.hxx | 38
sw/source/core/inc/sectfrm.hxx | 62
sw/source/core/inc/swblocks.hxx | 10
sw/source/core/inc/swfont.hxx | 16
sw/source/core/inc/swselectionlist.hxx | 2
sw/source/core/inc/tabfrm.hxx | 16
sw/source/core/inc/tblrwcl.hxx | 78
sw/source/core/inc/tocntntanchoredobjectposition.hxx | 10
sw/source/core/inc/txmsrt.hxx | 54
sw/source/core/inc/txtfly.hxx | 78
sw/source/core/inc/txtfrm.hxx | 238 -
sw/source/core/inc/undoflystrattr.hxx | 6
sw/source/core/inc/unoevent.hxx | 6
sw/source/core/inc/unofield.hxx | 10
sw/source/core/inc/unoflatpara.hxx | 6
sw/source/core/inc/unofootnote.hxx | 6
sw/source/core/inc/unometa.hxx | 4
sw/source/core/inc/unoparaframeenum.hxx | 4
sw/source/core/inc/unoport.hxx | 14
sw/source/core/inc/unorefmark.hxx | 6
sw/source/core/inc/unosection.hxx | 8
sw/source/core/inc/unotextmarkup.hxx | 8
sw/source/core/inc/viewimp.hxx | 14
sw/source/core/layout/anchoreddrawobject.cxx | 78
sw/source/core/layout/anchoredobject.cxx | 86
sw/source/core/layout/atrfrm.cxx | 892 ++--
sw/source/core/layout/calcmove.cxx | 268 -
sw/source/core/layout/colfrm.cxx | 78
sw/source/core/layout/dbg_lay.cxx | 24
sw/source/core/layout/dumpfilter.cxx | 2
sw/source/core/layout/findfrm.cxx | 370 +-
sw/source/core/layout/flowfrm.cxx | 366 -
sw/source/core/layout/fly.cxx | 374 +-
sw/source/core/layout/flycnt.cxx | 256 -
sw/source/core/layout/flyincnt.cxx | 38
sw/source/core/layout/flylay.cxx | 102
sw/source/core/layout/flypos.cxx | 20
sw/source/core/layout/frmtool.cxx | 590 +--
sw/source/core/layout/ftnfrm.cxx | 1398 +++----
sw/source/core/layout/hffrm.cxx | 60
sw/source/core/layout/layact.cxx | 446 +-
sw/source/core/layout/laycache.cxx | 44
sw/source/core/layout/layouter.cxx | 72
sw/source/core/layout/movedfwdfrmsbyobjpos.cxx | 20
sw/source/core/layout/newfrm.cxx | 62
sw/source/core/layout/objectformatter.cxx | 48
sw/source/core/layout/objectformattertxtfrm.cxx | 238 -
sw/source/core/layout/objectformattertxtfrm.hxx | 24
sw/source/core/layout/pagechg.cxx | 372 +-
sw/source/core/layout/pagedesc.cxx | 64
sw/source/core/layout/paintfrm.cxx | 224 -
sw/source/core/layout/sectfrm.cxx | 458 +-
sw/source/core/layout/softpagebreak.cxx | 16
sw/source/core/layout/sortedobjs.cxx | 38
sw/source/core/layout/ssfrm.cxx | 68
sw/source/core/layout/swselectionlist.cxx | 10
sw/source/core/layout/tabfrm.cxx | 308 -
sw/source/core/layout/trvlfrm.cxx | 522 +-
sw/source/core/layout/unusedf.cxx | 4
sw/source/core/layout/wsfrm.cxx | 410 +-
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 82
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 28
sw/source/core/objectpositioning/environmentofanchoredobject.cxx | 2
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 130
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 26
sw/source/core/ole/ndole.cxx | 32
sw/source/core/para/paratr.cxx | 48
sw/source/core/sw3io/sw3convert.cxx | 56
sw/source/core/sw3io/swacorr.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 30
sw/source/core/swg/SwXMLTextBlocks1.cxx | 8
sw/source/core/swg/swblocks.cxx | 38
sw/source/core/table/swnewtable.cxx | 128
sw/source/core/table/swtable.cxx | 810 ++--
sw/source/core/text/EnhancedPDFExportHelper.cxx | 234 -
sw/source/core/text/atrhndl.hxx | 24
sw/source/core/text/atrstck.cxx | 94
sw/source/core/text/blink.cxx | 6
sw/source/core/text/frmcrsr.cxx | 260 -
sw/source/core/text/frmform.cxx | 338 -
sw/source/core/text/frminf.cxx | 90
sw/source/core/text/frmpaint.cxx | 126
sw/source/core/text/guess.cxx | 128
sw/source/core/text/guess.hxx | 12
sw/source/core/text/inftxt.cxx | 406 +-
sw/source/core/text/inftxt.hxx | 240 -
sw/source/core/text/itradj.cxx | 76
sw/source/core/text/itratr.cxx | 192 -
sw/source/core/text/itratr.hxx | 26
sw/source/core/text/itrcrsr.cxx | 222 -
sw/source/core/text/itrform2.cxx | 480 +-
sw/source/core/text/itrform2.hxx | 94
sw/source/core/text/itrpaint.cxx | 60
sw/source/core/text/itrpaint.hxx | 24
sw/source/core/text/itrtxt.cxx | 62
sw/source/core/text/itrtxt.hxx | 110
sw/source/core/text/pordrop.hxx | 14
sw/source/core/text/porexp.cxx | 58
sw/source/core/text/porexp.hxx | 28
sw/source/core/text/porfld.cxx | 282 -
sw/source/core/text/porfld.hxx | 72
sw/source/core/text/porfly.cxx | 66
sw/source/core/text/porfly.hxx | 16
sw/source/core/text/porftn.hxx | 44
sw/source/core/text/porglue.cxx | 28
sw/source/core/text/porglue.hxx | 6
sw/source/core/text/porhyph.hxx | 18
sw/source/core/text/porlay.cxx | 200 -
sw/source/core/text/porlay.hxx | 26
sw/source/core/text/porlin.cxx | 34
sw/source/core/text/porlin.hxx | 42
sw/source/core/text/pormulti.cxx | 348 -
sw/source/core/text/pormulti.hxx | 66
sw/source/core/text/porref.cxx | 12
sw/source/core/text/porref.hxx | 10
sw/source/core/text/porrst.cxx | 126
sw/source/core/text/porrst.hxx | 30
sw/source/core/text/portab.hxx | 12
sw/source/core/text/portox.cxx | 12
sw/source/core/text/portox.hxx | 10
sw/source/core/text/portxt.cxx | 178
sw/source/core/text/portxt.hxx | 68
sw/source/core/text/redlnitr.cxx | 56
sw/source/core/text/redlnitr.hxx | 8
sw/source/core/text/txtcache.cxx | 68
sw/source/core/text/txtcache.hxx | 20
sw/source/core/text/txtdrop.cxx | 164
sw/source/core/text/txtfld.cxx | 280 -
sw/source/core/text/txtfly.cxx | 204 -
sw/source/core/text/txtfrm.cxx | 554 +--
sw/source/core/text/txtftn.cxx | 644 +--
sw/source/core/text/txthyph.cxx | 104
sw/source/core/text/txtinit.cxx | 18
sw/source/core/text/txtio.cxx | 206 -
sw/source/core/text/txtpaint.cxx | 2
sw/source/core/text/txtpaint.hxx | 4
sw/source/core/text/txttab.cxx | 44
sw/source/core/text/widorp.cxx | 66
sw/source/core/text/widorp.hxx | 32
sw/source/core/text/xmldump.cxx | 32
sw/source/core/tox/ToxLinkProcessor.cxx | 8
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 24
sw/source/core/tox/ToxTextGenerator.cxx | 88
sw/source/core/tox/tox.cxx | 24
sw/source/core/tox/toxhlp.cxx | 14
sw/source/core/tox/txmsrt.cxx | 200 -
sw/source/core/txtnode/SwGrammarContact.cxx | 54
sw/source/core/txtnode/atrfld.cxx | 354 -
sw/source/core/txtnode/atrflyin.cxx | 150
sw/source/core/txtnode/atrftn.cxx | 224 -
sw/source/core/txtnode/atrref.cxx | 34
sw/source/core/txtnode/atrtox.cxx | 16
sw/source/core/txtnode/chrfmt.cxx | 12
sw/source/core/txtnode/fmtatr2.cxx | 418 +-
sw/source/core/txtnode/fntcache.cxx | 104
sw/source/core/txtnode/fntcap.cxx | 44
sw/source/core/txtnode/modeltoviewhelper.cxx | 14
sw/source/core/txtnode/ndhints.cxx | 76
sw/source/core/txtnode/ndtxt.cxx | 1574 ++++----
sw/source/core/txtnode/swfntcch.cxx | 10
sw/source/core/txtnode/swfont.cxx | 32
sw/source/core/txtnode/thints.cxx | 824 ++--
sw/source/core/txtnode/txatbase.cxx | 32
sw/source/core/txtnode/txatritr.cxx | 24
sw/source/core/txtnode/txtatr2.cxx | 188 -
sw/source/core/txtnode/txtedt.cxx | 256 -
sw/source/core/undo/SwUndoField.cxx | 24
sw/source/core/undo/SwUndoFmt.cxx | 224 -
sw/source/core/undo/SwUndoPageDesc.cxx | 196 -
sw/source/core/undo/rolbck.cxx | 528 +-
sw/source/core/undo/unattr.cxx | 370 +-
sw/source/core/undo/undel.cxx | 304 -
sw/source/core/undo/undobj.cxx | 266 -
sw/source/core/undo/undobj1.cxx | 318 -
sw/source/core/undo/undoflystrattr.cxx | 14
sw/source/core/undo/undraw.cxx | 276 -
sw/source/core/undo/unfmco.cxx | 32
sw/source/core/undo/unins.cxx | 208 -
sw/source/core/undo/unmove.cxx | 164
sw/source/core/undo/unnum.cxx | 42
sw/source/core/undo/unovwr.cxx | 116
sw/source/core/undo/unredln.cxx | 60
sw/source/core/undo/unsect.cxx | 94
sw/source/core/undo/unsort.cxx | 56
sw/source/core/undo/unspnd.cxx | 60
sw/source/core/undo/untbl.cxx | 1532 ++++----
sw/source/core/undo/untblk.cxx | 146
sw/source/core/unocore/SwXTextDefaults.cxx | 16
sw/source/core/unocore/unochart.cxx | 382 +-
sw/source/core/unocore/unocoll.cxx | 216 -
sw/source/core/unocore/unocrsr.cxx | 40
sw/source/core/unocore/unocrsrhelper.cxx | 246 -
sw/source/core/unocore/unodraw.cxx | 352 -
sw/source/core/unocore/unoevent.cxx | 16
sw/source/core/unocore/unofield.cxx | 612 +--
sw/source/core/unocore/unoflatpara.cxx | 102
sw/source/core/unocore/unoframe.cxx | 646 +--
sw/source/core/unocore/unoftn.cxx | 130
sw/source/core/unocore/unoidx.cxx | 198 -
sw/source/core/unocore/unomap.cxx | 12
sw/source/core/unocore/unoobj.cxx | 152
sw/source/core/unocore/unoobj2.cxx | 206 -
sw/source/core/unocore/unoparagraph.cxx | 174
sw/source/core/unocore/unoport.cxx | 30
sw/source/core/unocore/unoportenum.cxx | 118
sw/source/core/unocore/unoredline.cxx | 30
sw/source/core/unocore/unoredlines.cxx | 22
sw/source/core/unocore/unorefmk.cxx | 214 -
sw/source/core/unocore/unosect.cxx | 234 -
sw/source/core/unocore/unosett.cxx | 414 +-
sw/source/core/unocore/unosrch.cxx | 10
sw/source/core/unocore/unostyle.cxx | 248 -
sw/source/core/unocore/unotbl.cxx | 896 ++--
sw/source/core/unocore/unotext.cxx | 290 -
sw/source/core/unocore/unotextmarkup.cxx | 62
sw/source/core/view/printdata.cxx | 2
sw/source/core/view/vdraw.cxx | 2
sw/source/core/view/viewimp.cxx | 22
sw/source/core/view/viewsh.cxx | 90
sw/source/core/view/vnew.cxx | 30
sw/source/core/view/vprint.cxx | 64
sw/source/filter/ascii/ascatr.cxx | 54
sw/source/filter/ascii/parasc.cxx | 20
sw/source/filter/ascii/wrtasc.cxx | 10
sw/source/filter/basflt/fltini.cxx | 58
sw/source/filter/basflt/fltshell.cxx | 116
sw/source/filter/basflt/iodetect.cxx | 14
sw/source/filter/basflt/shellio.cxx | 104
sw/source/filter/html/css1atr.cxx | 454 +-
sw/source/filter/html/htmlatr.cxx | 552 +--
sw/source/filter/html/htmlbas.cxx | 12
sw/source/filter/html/htmlcss1.cxx | 330 -
sw/source/filter/html/htmlctxt.cxx | 28
sw/source/filter/html/htmldrawreader.cxx | 24
sw/source/filter/html/htmldrawwriter.cxx | 12
sw/source/filter/html/htmlfld.cxx | 174
sw/source/filter/html/htmlfldw.cxx | 172
sw/source/filter/html/htmlfly.cxx | 24
sw/source/filter/html/htmlfly.hxx | 10
sw/source/filter/html/htmlflywriter.cxx | 346 -
sw/source/filter/html/htmlform.cxx | 148
sw/source/filter/html/htmlforw.cxx | 28
sw/source/filter/html/htmlftn.cxx | 144
sw/source/filter/html/htmlgrin.cxx | 188 -
sw/source/filter/html/htmlnum.cxx | 16
sw/source/filter/html/htmlnum.hxx | 6
sw/source/filter/html/htmlnumreader.cxx | 194 -
sw/source/filter/html/htmlnumwriter.cxx | 28
sw/source/filter/html/htmlplug.cxx | 114
sw/source/filter/html/htmlsect.cxx | 192 -
sw/source/filter/html/htmltab.cxx | 540 +-
sw/source/filter/html/htmltabw.cxx | 114
sw/source/filter/html/svxcss1.cxx | 20
sw/source/filter/html/swcss1.hxx | 52
sw/source/filter/html/swhtml.cxx | 536 +-
sw/source/filter/html/swhtml.hxx | 60
sw/source/filter/html/wrthtml.cxx | 186 -
sw/source/filter/html/wrthtml.hxx | 130
sw/source/filter/inc/fltini.hxx | 6
sw/source/filter/inc/fltshell.hxx | 26
sw/source/filter/inc/msfilter.hxx | 34
sw/source/filter/inc/wrt_fn.hxx | 4
sw/source/filter/inc/wrtswtbl.hxx | 2
sw/source/filter/inc/wwstyles.hxx | 4
sw/source/filter/rtf/swparrtf.cxx | 32
sw/source/filter/writer/writer.cxx | 34
sw/source/filter/writer/wrt_fn.cxx | 4
sw/source/filter/writer/wrtswtbl.cxx | 30
sw/source/filter/ww8/WW8TableInfo.cxx | 54
sw/source/filter/ww8/WW8TableInfo.hxx | 16
sw/source/filter/ww8/attributeoutputbase.hxx | 120
sw/source/filter/ww8/docxattributeoutput.cxx | 412 +-
sw/source/filter/ww8/docxattributeoutput.hxx | 86
sw/source/filter/ww8/docxexport.cxx | 82
sw/source/filter/ww8/docxexport.hxx | 26
sw/source/filter/ww8/docxexportfilter.cxx | 6
sw/source/filter/ww8/docxfootnotes.hxx | 10
sw/source/filter/ww8/docxsdrexport.cxx | 136
sw/source/filter/ww8/docxsdrexport.hxx | 18
sw/source/filter/ww8/docxtablestyleexport.cxx | 126
sw/source/filter/ww8/escher.hxx | 46
sw/source/filter/ww8/rtfattributeoutput.cxx | 346 -
sw/source/filter/ww8/rtfattributeoutput.hxx | 72
sw/source/filter/ww8/rtfexport.cxx | 176
sw/source/filter/ww8/rtfexport.hxx | 44
sw/source/filter/ww8/rtfexportfilter.cxx | 6
sw/source/filter/ww8/rtfsdrexport.cxx | 24
sw/source/filter/ww8/rtfsdrexport.hxx | 6
sw/source/filter/ww8/rtfstringbuffer.cxx | 14
sw/source/filter/ww8/rtfstringbuffer.hxx | 8
sw/source/filter/ww8/sprmids.hxx | 4
sw/source/filter/ww8/styles.cxx | 4
sw/source/filter/ww8/writerhelper.cxx | 134
sw/source/filter/ww8/writerhelper.hxx | 112
sw/source/filter/ww8/writerwordglue.cxx | 158
sw/source/filter/ww8/writerwordglue.hxx | 8
sw/source/filter/ww8/wrtw8esh.cxx | 454 +-
sw/source/filter/ww8/wrtw8nds.cxx | 488 +-
sw/source/filter/ww8/wrtw8num.cxx | 220 -
sw/source/filter/ww8/wrtw8sty.cxx | 538 +-
sw/source/filter/ww8/wrtww8.cxx | 490 +-
sw/source/filter/ww8/wrtww8.hxx | 362 -
sw/source/filter/ww8/wrtww8gr.cxx | 30
sw/source/filter/ww8/ww8atr.cxx | 958 ++---
sw/source/filter/ww8/ww8attributeoutput.hxx | 56
sw/source/filter/ww8/ww8glsy.cxx | 32
sw/source/filter/ww8/ww8graf.cxx | 258 -
sw/source/filter/ww8/ww8graf2.cxx | 66
sw/source/filter/ww8/ww8par.cxx | 648 +--
sw/source/filter/ww8/ww8par.hxx | 212 -
sw/source/filter/ww8/ww8par2.cxx | 384 +-
sw/source/filter/ww8/ww8par2.hxx | 4
sw/source/filter/ww8/ww8par3.cxx | 300 -
sw/source/filter/ww8/ww8par4.cxx | 32
sw/source/filter/ww8/ww8par5.cxx | 368 +-
sw/source/filter/ww8/ww8par6.cxx | 432 +-
sw/source/filter/ww8/ww8scan.cxx | 356 -
sw/source/filter/ww8/ww8scan.hxx | 102
sw/source/filter/ww8/ww8struc.hxx | 4
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 4
sw/source/filter/xml/swxml.cxx | 42
sw/source/filter/xml/wrtxml.cxx | 2
sw/source/filter/xml/xmlexp.cxx | 6
sw/source/filter/xml/xmlexp.hxx | 26
sw/source/filter/xml/xmlexpit.cxx | 32
sw/source/filter/xml/xmlfmt.cxx | 34
sw/source/filter/xml/xmlfmte.cxx | 36
sw/source/filter/xml/xmlimp.cxx | 92
sw/source/filter/xml/xmlimp.hxx | 2
sw/source/filter/xml/xmlimpit.cxx | 30
sw/source/filter/xml/xmliteme.cxx | 6
sw/source/filter/xml/xmlmeta.cxx | 2
sw/source/filter/xml/xmltble.cxx | 260 -
sw/source/filter/xml/xmltbli.cxx | 238 -
sw/source/filter/xml/xmltbli.hxx | 18
sw/source/filter/xml/xmltexte.cxx | 30
sw/source/filter/xml/xmltexte.hxx | 4
sw/source/filter/xml/xmltexti.cxx | 126
sw/source/filter/xml/xmltexti.hxx | 4
sw/source/ui/chrdlg/break.cxx | 14
sw/source/ui/chrdlg/chardlg.cxx | 30
sw/source/ui/chrdlg/drpcps.cxx | 80
sw/source/ui/chrdlg/numpara.cxx | 10
sw/source/ui/chrdlg/pardlg.cxx | 2
sw/source/ui/chrdlg/swuiccoll.cxx | 20
sw/source/ui/chrdlg/tblnumfm.cxx | 2
sw/source/ui/config/optload.cxx | 68
sw/source/ui/config/optpage.cxx | 162
sw/source/ui/dbui/addresslistdialog.cxx | 4
sw/source/ui/dbui/dbinsdlg.cxx | 578 +--
sw/source/ui/dbui/mmlayoutpage.cxx | 72
sw/source/ui/dbui/mmlayoutpage.hxx | 8
sw/source/ui/dbui/mmoutputpage.cxx | 8
sw/source/ui/dbui/selectdbtabledialog.cxx | 10
sw/source/ui/dialog/docstdlg.cxx | 2
sw/source/ui/dialog/macassgn.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 96
sw/source/ui/dialog/swdlgfact.hxx | 48
sw/source/ui/dialog/uiregionsw.cxx | 376 +-
sw/source/ui/envelp/envfmt.cxx | 100
sw/source/ui/envelp/envfmt.hxx | 10
sw/source/ui/envelp/envlop1.cxx | 10
sw/source/ui/envelp/envprt.cxx | 8
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labelexp.cxx | 20
sw/source/ui/envelp/labfmt.cxx | 40
sw/source/ui/envelp/labfmt.hxx | 12
sw/source/ui/envelp/mailmrge.cxx | 38
sw/source/ui/fldui/DropDownFieldDialog.cxx | 2
sw/source/ui/fldui/FldRefTreeListBox.cxx | 8
sw/source/ui/fldui/FldRefTreeListBox.hxx | 4
sw/source/ui/fldui/changedb.cxx | 6
sw/source/ui/fldui/flddb.cxx | 94
sw/source/ui/fldui/flddb.hxx | 8
sw/source/ui/fldui/flddinf.cxx | 70
sw/source/ui/fldui/flddinf.hxx | 6
sw/source/ui/fldui/flddok.cxx | 132
sw/source/ui/fldui/flddok.hxx | 6
sw/source/ui/fldui/fldedt.cxx | 112
sw/source/ui/fldui/fldfunc.cxx | 120
sw/source/ui/fldui/fldfunc.hxx | 6
sw/source/ui/fldui/fldpage.cxx | 102
sw/source/ui/fldui/fldpage.hxx | 24
sw/source/ui/fldui/fldref.cxx | 300 -
sw/source/ui/fldui/fldref.hxx | 24
sw/source/ui/fldui/fldtdlg.cxx | 52
sw/source/ui/fldui/fldvar.cxx | 244 -
sw/source/ui/fldui/fldvar.hxx | 8
sw/source/ui/fldui/inpdlg.cxx | 56
sw/source/ui/fldui/javaedit.cxx | 28
sw/source/ui/fmtui/tmpdlg.cxx | 30
sw/source/ui/frmdlg/column.cxx | 76
sw/source/ui/frmdlg/cption.cxx | 110
sw/source/ui/frmdlg/frmdlg.cxx | 2
sw/source/ui/frmdlg/frmpage.cxx | 154
sw/source/ui/frmdlg/wrap.cxx | 22
sw/source/ui/index/cnttab.cxx | 36
sw/source/ui/index/swuiidxmrk.cxx | 44
sw/source/ui/misc/docfnote.cxx | 98
sw/source/ui/misc/glossary.cxx | 6
sw/source/ui/misc/impfnote.hxx | 6
sw/source/ui/misc/insfnote.cxx | 34
sw/source/ui/misc/linenum.cxx | 32
sw/source/ui/misc/num.cxx | 210 -
sw/source/ui/misc/outline.cxx | 284 -
sw/source/ui/misc/pgfnote.cxx | 54
sw/source/ui/misc/srtdlg.cxx | 48
sw/source/ui/misc/titlepage.cxx | 48
sw/source/ui/table/convert.cxx | 42
sw/source/ui/table/instable.cxx | 54
sw/source/ui/table/mergetbl.cxx | 8
sw/source/ui/table/rowht.cxx | 4
sw/source/ui/table/splittbl.cxx | 12
sw/source/ui/table/tabledlg.cxx | 346 -
sw/source/ui/table/tautofmt.cxx | 222 -
sw/source/ui/vba/vbaselection.cxx | 14
sw/source/ui/vba/vbatablehelper.cxx | 12
sw/source/uibase/app/appenv.cxx | 50
sw/source/uibase/app/appenv.hxx | 2
sw/source/uibase/app/apphdl.cxx | 8
sw/source/uibase/app/applab.cxx | 100
sw/source/uibase/app/appopt.cxx | 16
sw/source/uibase/app/docsh.cxx | 38
sw/source/uibase/app/docsh2.cxx | 42
sw/source/uibase/app/docshini.cxx | 20
sw/source/uibase/app/docst.cxx | 128
sw/source/uibase/app/docstyle.cxx | 656 +--
sw/source/uibase/app/swmodul1.cxx | 20
sw/source/uibase/app/swmodule.cxx | 4
sw/source/uibase/config/StoredChapterNumbering.cxx | 20
sw/source/uibase/config/cfgitems.cxx | 14
sw/source/uibase/config/modcfg.cxx | 58
sw/source/uibase/config/uinums.cxx | 124
sw/source/uibase/config/usrpref.cxx | 6
sw/source/uibase/config/viewopt.cxx | 8
sw/source/uibase/dbui/dbmgr.cxx | 82
sw/source/uibase/dbui/dbtree.cxx | 16
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx | 2
sw/source/uibase/dialog/regionsw.cxx | 6
sw/source/uibase/dochdl/gloshdl.cxx | 42
sw/source/uibase/dochdl/swdtflvr.cxx | 200 -
sw/source/uibase/docvw/AnnotationWin.cxx | 94
sw/source/uibase/docvw/HeaderFooterWin.cxx | 30
sw/source/uibase/docvw/PageBreakWin.cxx | 16
sw/source/uibase/docvw/PostItMgr.cxx | 276 -
sw/source/uibase/docvw/SidebarTxtControl.cxx | 64
sw/source/uibase/docvw/SidebarTxtControl.hxx | 6
sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 72
sw/source/uibase/docvw/SidebarTxtControlAcc.hxx | 10
sw/source/uibase/docvw/SidebarWin.cxx | 62
sw/source/uibase/docvw/edtdd.cxx | 4
sw/source/uibase/docvw/edtwin.cxx | 496 +-
sw/source/uibase/docvw/edtwin2.cxx | 162
sw/source/uibase/docvw/edtwin3.cxx | 4
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 4
sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 4
sw/source/uibase/docvw/romenu.cxx | 14
sw/source/uibase/fldui/fldmgr.cxx | 484 +-
sw/source/uibase/fldui/fldwrap.cxx | 22
sw/source/uibase/fldui/xfldui.cxx | 18
sw/source/uibase/frmdlg/colex.cxx | 2
sw/source/uibase/frmdlg/colmgr.cxx | 38
sw/source/uibase/frmdlg/frmmgr.cxx | 40
sw/source/uibase/inc/basesh.hxx | 8
sw/source/uibase/inc/cfgitems.hxx | 2
sw/source/uibase/inc/changedb.hxx | 6
sw/source/uibase/inc/chrdlg.hxx | 2
sw/source/uibase/inc/colex.hxx | 4
sw/source/uibase/inc/colmgr.hxx | 24
sw/source/uibase/inc/content.hxx | 20
sw/source/uibase/inc/conttree.hxx | 2
sw/source/uibase/inc/convert.hxx | 12
sw/source/uibase/inc/cption.hxx | 4
sw/source/uibase/inc/dbinsdlg.hxx | 54
sw/source/uibase/inc/drwtxtsh.hxx | 2
sw/source/uibase/inc/edtwin.hxx | 6
sw/source/uibase/inc/envlop.hxx | 8
sw/source/uibase/inc/fldedt.hxx | 10
sw/source/uibase/inc/fldmgr.hxx | 64
sw/source/uibase/inc/fldtdlg.hxx | 6
sw/source/uibase/inc/fldwrap.hxx | 18
sw/source/uibase/inc/formatclipboard.hxx | 2
sw/source/uibase/inc/frmdlg.hxx | 4
sw/source/uibase/inc/frmmgr.hxx | 34
sw/source/uibase/inc/frmpage.hxx | 6
sw/source/uibase/inc/inpdlg.hxx | 10
sw/source/uibase/inc/inputwin.hxx | 12
sw/source/uibase/inc/insfnote.hxx | 2
sw/source/uibase/inc/instable.hxx | 12
sw/source/uibase/inc/javaedit.hxx | 8
sw/source/uibase/inc/macassgn.hxx | 2
sw/source/uibase/inc/mailmrge.hxx | 4
sw/source/uibase/inc/mergetbl.hxx | 6
sw/source/uibase/inc/numfmtlb.hxx | 4
sw/source/uibase/inc/optload.hxx | 4
sw/source/uibase/inc/optpage.hxx | 14
sw/source/uibase/inc/outline.hxx | 8
sw/source/uibase/inc/redlndlg.hxx | 10
sw/source/uibase/inc/regionsw.hxx | 36
sw/source/uibase/inc/splittbl.hxx | 8
sw/source/uibase/inc/srtdlg.hxx | 6
sw/source/uibase/inc/swdtflvr.hxx | 20
sw/source/uibase/inc/swtablerep.hxx | 6
sw/source/uibase/inc/swuiccoll.hxx | 6
sw/source/uibase/inc/tablemgr.hxx | 20
sw/source/uibase/inc/tautofmt.hxx | 28
sw/source/uibase/inc/tblnumfm.hxx | 4
sw/source/uibase/inc/textsh.hxx | 4
sw/source/uibase/inc/titlepage.hxx | 2
sw/source/uibase/inc/uiitems.hxx | 16
sw/source/uibase/inc/uinums.hxx | 26
sw/source/uibase/inc/uitool.hxx | 4
sw/source/uibase/inc/usrpref.hxx | 24
sw/source/uibase/inc/view.hxx | 30
sw/source/uibase/inc/wrtsh.hxx | 52
sw/source/uibase/index/toxmgr.cxx | 6
sw/source/uibase/lingu/hhcwrp.cxx | 68
sw/source/uibase/lingu/olmenu.cxx | 24
sw/source/uibase/lingu/sdrhhcwrap.cxx | 2
sw/source/uibase/misc/redlndlg.cxx | 38
sw/source/uibase/ribbar/drawbase.cxx | 8
sw/source/uibase/ribbar/inputwin.cxx | 50
sw/source/uibase/shells/annotsh.cxx | 12
sw/source/uibase/shells/basesh.cxx | 238 -
sw/source/uibase/shells/drawsh.cxx | 20
sw/source/uibase/shells/drwbassh.cxx | 24
sw/source/uibase/shells/drwtxtex.cxx | 12
sw/source/uibase/shells/frmsh.cxx | 122
sw/source/uibase/shells/grfsh.cxx | 24
sw/source/uibase/shells/langhelper.cxx | 50
sw/source/uibase/shells/listsh.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 140
sw/source/uibase/shells/textdrw.cxx | 4
sw/source/uibase/shells/textfld.cxx | 138
sw/source/uibase/shells/textidx.cxx | 6
sw/source/uibase/shells/textsh.cxx | 58
sw/source/uibase/shells/textsh1.cxx | 134
sw/source/uibase/shells/textsh2.cxx | 6
sw/source/uibase/shells/txtattr.cxx | 64
sw/source/uibase/shells/txtcrsr.cxx | 22
sw/source/uibase/shells/txtnum.cxx | 18
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2
sw/source/uibase/sidebar/ThemePanel.cxx | 18
sw/source/uibase/table/chartins.cxx | 16
sw/source/uibase/table/swtablerep.cxx | 4
sw/source/uibase/table/tablemgr.cxx | 36
sw/source/uibase/table/tablepg.hxx | 8
sw/source/uibase/uiview/formatclipboard.cxx | 94
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/view.cxx | 14
sw/source/uibase/uiview/view0.cxx | 6
sw/source/uibase/uiview/view1.cxx | 6
sw/source/uibase/uiview/view2.cxx | 54
sw/source/uibase/uiview/viewdlg2.cxx | 30
sw/source/uibase/uiview/viewdraw.cxx | 6
sw/source/uibase/uiview/viewling.cxx | 18
sw/source/uibase/uiview/viewmdi.cxx | 12
sw/source/uibase/uiview/viewport.cxx | 2
sw/source/uibase/uiview/viewsrch.cxx | 12
sw/source/uibase/uiview/viewstat.cxx | 18
sw/source/uibase/uiview/viewtab.cxx | 224 -
sw/source/uibase/uno/SwXDocumentSettings.cxx | 8
sw/source/uibase/uno/unoatxt.cxx | 22
sw/source/uibase/uno/unomod.cxx | 4
sw/source/uibase/uno/unotxdoc.cxx | 152
sw/source/uibase/uno/unotxvw.cxx | 38
sw/source/uibase/utlui/attrdesc.cxx | 68
sw/source/uibase/utlui/content.cxx | 136
sw/source/uibase/utlui/glbltree.cxx | 8
sw/source/uibase/utlui/initui.cxx | 28
sw/source/uibase/utlui/navipi.cxx | 38
sw/source/uibase/utlui/numfmtlb.cxx | 48
sw/source/uibase/utlui/uiitems.cxx | 58
sw/source/uibase/utlui/uitool.cxx | 124
sw/source/uibase/web/wview.cxx | 6
sw/source/uibase/wrtsh/delete.cxx | 26
sw/source/uibase/wrtsh/move.cxx | 16
sw/source/uibase/wrtsh/select.cxx | 52
sw/source/uibase/wrtsh/wrtsh1.cxx | 214 -
sw/source/uibase/wrtsh/wrtsh2.cxx | 118
sw/source/uibase/wrtsh/wrtsh3.cxx | 4
sw/uiconfig/swriter/ui/autoformattable.ui | 2
sw/uiconfig/swriter/ui/flddbpage.ui | 2
sw/uiconfig/swriter/ui/flddocinfopage.ui | 2
sw/uiconfig/swriter/ui/flddocumentpage.ui | 2
sw/uiconfig/swriter/ui/fldfuncpage.ui | 2
sw/uiconfig/swriter/ui/fldrefpage.ui | 4
sw/uiconfig/swriter/ui/fldvarpage.ui | 2
1108 files changed, 50157 insertions(+), 50157 deletions(-)
New commits:
commit 7cb97e0a51bd2913707ae67841e2ceccafc4cd13
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Wed May 20 13:08:26 2015 +0200
bump product version to 5.1.0.0.alpha1+
Change-Id: Ib77d7879b0d845bdccc523467f654b836704cdcf
diff --git a/configure.ac b/configure.ac
index a71b565..b9e2658 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea.
-AC_INIT([LibreOffice],[5.0.0.0.alpha1+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[5.1.0.0.alpha1+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit ab465b90f6c6da5595393a0ba73f33a1e71a2b65
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date: Wed May 20 13:05:49 2015 +0200
bin/rename-sw-abbreviations.sh
renames the most annoying abbreviations in Writer (and partially
in the shared code too).
Change-Id: I9a62759138126c1537cc5c985ba05cf54d6132d9
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index e0176be..77fff3f 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -582,8 +582,8 @@ void ShapeController::executeDispatch_ParagraphDialog()
0 );
aNewAttr.Put( aAttr );
aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
- aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
- aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) );
+ aNewAttr.Put( SvxFormatBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
+ aNewAttr.Put( SvxFormatSplitItem( true, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 3be79e6..4472404 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -313,7 +313,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
if ( pHyperlinkItem->GetMacroEvents() )
{
// get macros from itemset
- const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTbl();
+ const SvxMacroTableDtor* pMacroTbl = pHyperlinkItem->GetMacroTable();
SvxMacroItem aItem ( GetWhich(SID_ATTR_MACROITEM) );
if( pMacroTbl )
aItem.SetMacroTable( *pMacroTbl );
@@ -381,7 +381,7 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
const SvxHyperlinkItem *pHyperlinkItem = static_cast<const SvxHyperlinkItem *>(
GetItemSet().GetItem (SID_HYPERLINK_GETLINK));
- return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTbl());
+ return const_cast<SvxMacroTableDtor*>(pHyperlinkItem->GetMacroTable());
}
// try to detect the current protocol that is used in rStrURL
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index a5a5b4f..9cb85a1 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -61,8 +61,8 @@ public:
void AddEvent( const OUString & rEventName, sal_uInt16 nEventId );
- const SvxMacroTableDtor& GetMacroTbl() const;
- void SetMacroTbl( const SvxMacroTableDtor& rTbl );
+ const SvxMacroTableDtor& GetMacroTable() const;
+ void SetMacroTable( const SvxMacroTableDtor& rTbl );
void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) SAL_OVERRIDE;
@@ -77,12 +77,12 @@ public:
bool IsReadOnly() const SAL_OVERRIDE;
};
-inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
+inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTable() const
{
return aTbl;
}
-inline void _SfxMacroTabPage::SetMacroTbl( const SvxMacroTableDtor& rTbl )
+inline void _SfxMacroTabPage::SetMacroTable( const SvxMacroTableDtor& rTbl )
{
aTbl = rTbl;
}
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 032ad45..21c9753 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -138,7 +138,7 @@ class SvxBulletPickTabPage : public SfxTabPage
bool bPreset : 1;
sal_uInt16 nNumItemId;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
protected:
DECL_LINK(NumSelectHdl_Impl, void *);
DECL_LINK(DoubleClickHdl_Impl, void *);
@@ -156,7 +156,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtName(const OUString& rName){sBulletCharFmtName = rName;}
+ void SetCharFormatName(const OUString& rName){sBulletCharFormatName = rName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -170,7 +170,7 @@ class SvxNumPickTabPage : public SfxTabPage
VclPtr<SvxNumValueSet> m_pExamplesVS;
OUString sNumCharFmtName;
- OUString sBulletCharFmtName;
+ OUString sBulletCharFormatName;
SvxNumSettingsArr_Impl aNumSettingsArrays[NUM_VALUSET_COUNT]; // is initialized with the five formats
@@ -200,9 +200,9 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) SAL_OVERRIDE;
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
- void SetCharFmtNames(const OUString& rCharName, const OUString& rBulName)
+ void SetCharFormatNames(const OUString& rCharName, const OUString& rBulName)
{ sNumCharFmtName = rCharName;
- sBulletCharFmtName = rBulName;}
+ sBulletCharFormatName = rBulName;}
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
};
@@ -298,7 +298,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
VclPtr<SvxNumberingPreview> m_pPreviewWIN;
OUString m_sNumCharFmtName;
- OUString m_sBulletCharFmtName;
+ OUString m_sBulletCharFormatName;
Timer aInvalidateTimer;
@@ -365,7 +365,7 @@ public:
void SetCharFmts(const OUString& rNumName, const OUString& rBulletName)
{
m_sNumCharFmtName = rNumName;
- m_sBulletCharFmtName = rBulletName;
+ m_sBulletCharFormatName = rBulletName;
}
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 7662a9d..0c55af1 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -183,8 +183,8 @@ public:
[Items]
<SvxHyphenZoneItem><SID_ATTR_PARA_HYPHENZONE>
- <SvxFmtBreakItem><SID_ATTR_PARA_PAGEBREAK>
- <SvxFmtSplitItem><SID_ATTR_PARA_SPLIT>
+ <SvxFormatBreakItem><SID_ATTR_PARA_PAGEBREAK>
+ <SvxFormatSplitItem><SID_ATTR_PARA_SPLIT>
<SvxWidowsItem><SID_ATTR_PARA_WIDOWS>
<SvxOrphansItem><SID_ATTR_PARA_ORPHANS>
*/
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 09f6226..c4a9177 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -97,7 +97,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(vcl::Window* pParent, const SfxItemSet* _pSet )
{
// remove smart tag tab page if no extensions are installed
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
if ( !pOpt || !pOpt->pSmartTagMgr || 0 == pOpt->pSmartTagMgr->NumberOfRecognizers() )
RemoveTabPage("smarttags");
@@ -521,7 +521,7 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
{
bool bModified = false;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
long nFlags = pAutoCorrect->GetFlags();
bool bCheck = m_pCheckLB->IsChecked(USE_REPLACE_TABLE, CBCOL_FIRST);
@@ -610,18 +610,18 @@ bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
m_pCheckLB->IsChecked(REPLACE_DASHES, CBCOL_SECOND));
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_AT_STT_END, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesAtSttEnd != bCheck;
- pOpt->bAFmtByInpDelSpacesAtSttEnd = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesAtSttEnd != bCheck;
+ pOpt->bAFormatByInpDelSpacesAtSttEnd = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST);
- bModified |= pOpt->bAFmtDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatDelSpacesBetweenLines = bCheck;
bCheck = m_pCheckLB->IsChecked(DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND);
- bModified |= pOpt->bAFmtByInpDelSpacesBetweenLines != bCheck;
- pOpt->bAFmtByInpDelSpacesBetweenLines = bCheck;
+ bModified |= pOpt->bAFormatByInpDelSpacesBetweenLines != bCheck;
+ pOpt->bAFormatByInpDelSpacesBetweenLines = bCheck;
if(bModified || nFlags != pAutoCorrect->GetFlags())
{
@@ -641,7 +641,7 @@ void OfaSwAutoFmtOptionsPage::ActivatePage( const SfxItemSet& )
void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const long nFlags = pAutoCorrect->GetFlags();
m_pCheckLB->SetUpdateMode(false);
@@ -683,10 +683,10 @@ void OfaSwAutoFmtOptionsPage::Reset( const SfxItemSet* )
m_pCheckLB->CheckEntryPos( DETECT_URL, CBCOL_SECOND, 0 != (nFlags & SetINetAttr) );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_FIRST, pOpt->bChgToEnEmDash );
m_pCheckLB->CheckEntryPos( REPLACE_DASHES, CBCOL_SECOND, 0 != (nFlags & ChgToEnEmDash) );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFmtDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesAtSttEnd );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFmtDelSpacesBetweenLines );
- m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFmtByInpDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_FIRST, pOpt->bAFormatDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_AT_STT_END, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesAtSttEnd );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_FIRST, pOpt->bAFormatDelSpacesBetweenLines );
+ m_pCheckLB->CheckEntryPos( DEL_SPACES_BETWEEN_LINES, CBCOL_SECOND, pOpt->bAFormatByInpDelSpacesBetweenLines );
m_pCheckLB->CheckEntryPos( DEL_EMPTY_NODE, CBCOL_FIRST, pOpt->bDelEmptyNode );
m_pCheckLB->CheckEntryPos( REPLACE_USER_COLL, CBCOL_FIRST, pOpt->bChgUserColl );
m_pCheckLB->CheckEntryPos( REPLACE_BULLETS, CBCOL_FIRST, pOpt->bChgEnumNum );
@@ -1926,7 +1926,7 @@ bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
bool bModified = false;
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
bool bCheck = m_pSwCheckLB->IsChecked(ADD_NONBRK_SPACE, CBCOL_FIRST);
bModified |= pOpt->bAddNonBrkSpace != bCheck;
@@ -1991,7 +1991,7 @@ void OfaQuoteTabPage::Reset( const SfxItemSet* )
// Initialize the Sw options
if (m_pSwCheckLB->IsVisible())
{
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pSwCheckLB->SetUpdateMode( false );
m_pSwCheckLB->Clear();
@@ -2254,7 +2254,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
{
bool bModified = false, bCheck;
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
sal_uInt16 nVal;
bCheck = m_pCBActiv->IsChecked();
@@ -2306,7 +2306,7 @@ bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
void OfaAutoCompleteTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
m_pCBActiv->Check( pOpt->bAutoCompleteWords );
m_pCBCollect->Check( pOpt->bAutoCmpltCollectWords );
@@ -2640,7 +2640,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, SelectHdl)
bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust!
@@ -2683,7 +2683,7 @@ bool OfaSmartTagOptionsTabPage::FillItemSet( SfxItemSet* )
void OfaSmartTagOptionsTabPage::Reset( const SfxItemSet* )
{
SvxAutoCorrect* pAutoCorrect = SvxAutoCorrCfg::Get().GetAutoCorrect();
- SvxSwAutoFmtFlags *pOpt = &pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags *pOpt = &pAutoCorrect->GetSwFlags();
const SmartTagMgr* pSmartTagMgr = pOpt->pSmartTagMgr;
// robust, should not happen!
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 86930e2..4d721af 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -362,7 +362,7 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( aEmptyStr );
else
aFmt.SetSuffix(_pSet->sSuffix);
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
pActNum->SetLevel(i, aFmt);
@@ -520,7 +520,7 @@ IMPL_LINK_NOARG(SvxBulletPickTabPage, NumSelectHdl_Impl)
aFmt.SetSuffix( OUString() );
aFmt.SetBulletFont(&rActBulletFont);
aFmt.SetBulletChar(cChar );
- aFmt.SetCharFmtName(sBulletCharFmtName);
+ aFmt.SetCharFormatName(sBulletCharFormatName);
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
pActNum->SetLevel(i, aFmt);
@@ -548,7 +548,7 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SFX_ITEMSET_ARG (&aSet,pBulletCharFmt,SfxStringItem,SID_BULLET_CHAR_FMT,false);
if (pBulletCharFmt)
- SetCharFmtName( pBulletCharFmt->GetValue());
+ SetCharFormatName( pBulletCharFmt->GetValue());
}
@@ -773,14 +773,14 @@ IMPL_LINK_NOARG(SvxNumPickTabPage, NumSelectHdl_Impl)
aFmt.SetBulletChar( !pLevelSettings->sBulletChar.isEmpty()
? pLevelSettings->sBulletChar[0]
: 0 );
- aFmt.SetCharFmtName( sBulletCharFmtName );
+ aFmt.SetCharFormatName( sBulletCharFormatName );
// #62069# // #92724#
aFmt.SetBulletRelSize(45);
}
else
{
aFmt.SetIncludeUpperLevels(sal::static_int_cast< sal_uInt8 >(0 != nUpperLevelOrChar ? pActNum->GetLevelCount() : 0));
- aFmt.SetCharFmtName(sNumCharFmtName);
+ aFmt.SetCharFormatName(sNumCharFmtName);
// #62069# // #92724#
aFmt.SetBulletRelSize(100);
// #i93908#
@@ -808,7 +808,7 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
if (pNumCharFmt &&pBulletCharFmt)
- SetCharFmtNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
+ SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
SvxBitmapPickTabPage::SvxBitmapPickTabPage(vcl::Window* pParent,
@@ -986,7 +986,7 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, NumSelectHdl_Impl)
aFmt.SetNumberingType(nSetNumberingType);
aFmt.SetPrefix( aEmptyStr );
aFmt.SetSuffix( aEmptyStr );
- aFmt.SetCharFmtName( sNumCharFmtName );
+ aFmt.SetCharFormatName( sNumCharFmtName );
Graphic aGraphic;
if(GalleryExplorer::GetGraphicObj( GALLERY_THEME_BULLETS, nIdx, &aGraphic))
@@ -1611,7 +1611,7 @@ void SvxNumOptionsTabPage::InitControls()
if(SAL_MAX_UINT16 == nLvl)
{
nLvl = i;
- sFirstCharFmt = aNumFmtArr[i]->GetCharFmtName();
+ sFirstCharFmt = aNumFmtArr[i]->GetCharFormatName();
eFirstOrient = aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap)
aFirstSize = aNumFmtArr[i]->GetGraphicSize();
@@ -1624,7 +1624,7 @@ void SvxNumOptionsTabPage::InitControls()
bSamePrefix = aNumFmtArr[i]->GetPrefix() == aNumFmtArr[nLvl]->GetPrefix();
bSameSuffix = aNumFmtArr[i]->GetSuffix() == aNumFmtArr[nLvl]->GetSuffix();
bAllLevel &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[nLvl]->GetIncludeUpperLevels();
- bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFmtName();
+ bSameCharFmt &= sFirstCharFmt == aNumFmtArr[i]->GetCharFormatName();
bSameVOrient &= eFirstOrient == aNumFmtArr[i]->GetVertOrient();
if(bShowBitmap && bSameSize)
bSameSize &= aNumFmtArr[i]->GetGraphicSize() == aFirstSize;
@@ -1933,7 +1933,7 @@ IMPL_LINK( SvxNumOptionsTabPage, NumberTypeSelectHdl_Impl, ListBox *, pBox )
// allocation of the drawing pattern is automatic
if(bAutomaticCharStyles)
{
- sSelectStyle = m_sBulletCharFmtName;
+ sSelectStyle = m_sBulletCharFormatName;
}
}
else
@@ -2118,7 +2118,7 @@ IMPL_LINK_TYPED( SvxNumOptionsTabPage, GraphicHdl_Impl, MenuButton *, pButton, v
if(nActNumLvl & nMask)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
- aNumFmt.SetCharFmtName(m_sNumCharFmtName);
+ aNumFmt.SetCharFormatName(m_sNumCharFmtName);
aNumFmt.SetGraphic(aGrfName);
// set size for a later comparison
@@ -2355,11 +2355,11 @@ IMPL_LINK_NOARG(SvxNumOptionsTabPage, CharFmtHdl_Impl)
{
SvxNumberFormat aNumFmt(pActNum->GetLevel(i));
if( 0 == nEntryPos )
- aNumFmt.SetCharFmtName(aEmptyStr);
+ aNumFmt.SetCharFormatName(aEmptyStr);
else
{
if(SVX_NUM_BITMAP != (aNumFmt.GetNumberingType()&(~LINK_TOKEN)))
- aNumFmt.SetCharFmtName(sEntry);
+ aNumFmt.SetCharFormatName(sEntry);
}
pActNum->SetLevel(i, aNumFmt);
}
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 94c0070..d128a30 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -319,10 +319,10 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
static_cast<const SvxLRSpaceItem&>(GetItemSet().GetParent()->Get( nWhich ));
if ( m_pLeftIndent->IsRelative() )
- aMargin.SetTxtLeft( rOldItem.GetTxtLeft(),
+ aMargin.SetTextLeft( rOldItem.GetTextLeft(),
(sal_uInt16)m_pLeftIndent->GetValue() );
else
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
if ( m_pRightIndent->IsRelative() )
aMargin.SetRight( rOldItem.GetRight(),
@@ -331,21 +331,21 @@ bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
if ( m_pFLineIndent->IsRelative() )
- aMargin.SetTxtFirstLineOfst( rOldItem.GetTxtFirstLineOfst(),
+ aMargin.SetTextFirstLineOfst( rOldItem.GetTextFirstLineOfst(),
(sal_uInt16)m_pFLineIndent->GetValue() );
else
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
else
{
- aMargin.SetTxtLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
+ aMargin.SetTextLeft( GetCoreValue( *m_pLeftIndent, eUnit ) );
aMargin.SetRight( GetCoreValue( *m_pRightIndent, eUnit ) );
- aMargin.SetTxtFirstLineOfst(
+ aMargin.SetTextFirstLineOfst(
(sal_uInt16)GetCoreValue( *m_pFLineIndent, eUnit ) );
}
aMargin.SetAutoFirst(m_pAutoCB->IsChecked());
- if ( aMargin.GetTxtFirstLineOfst() < 0 )
+ if ( aMargin.GetTextFirstLineOfst() < 0 )
bNullTab = true;
eState = GetItemSet().GetItemState( nWhich );
@@ -452,7 +452,7 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
{
m_pLeftIndent->SetRelative();
SetFieldUnit( *m_pLeftIndent, eFUnit );
- SetMetricValue( *m_pLeftIndent, rOldItem.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rOldItem.GetTextLeft(), eUnit );
}
if ( rOldItem.GetPropRight() != 100 )
@@ -467,17 +467,17 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
SetMetricValue( *m_pRightIndent, rOldItem.GetRight(), eUnit );
}
- if ( rOldItem.GetPropTxtFirstLineOfst() != 100 )
+ if ( rOldItem.GetPropTextFirstLineOfst() != 100 )
{
m_pFLineIndent->SetRelative( true );
- m_pFLineIndent->SetValue( rOldItem.GetPropTxtFirstLineOfst() );
+ m_pFLineIndent->SetValue( rOldItem.GetPropTextFirstLineOfst() );
}
else
{
m_pFLineIndent->SetRelative();
m_pFLineIndent->SetMin(-9999);
SetFieldUnit( *m_pFLineIndent, eFUnit );
- SetMetricValue( *m_pFLineIndent, rOldItem.GetTxtFirstLineOfst(),
+ SetMetricValue( *m_pFLineIndent, rOldItem.GetTextFirstLineOfst(),
eUnit );
}
m_pAutoCB->Check(rOldItem.IsAutoFirst());
@@ -487,9 +487,9 @@ void SvxStdParagraphTabPage::Reset( const SfxItemSet* rSet )
const SvxLRSpaceItem& rSpace =
static_cast<const SvxLRSpaceItem&>(rSet->Get( _nWhich ));
- SetMetricValue( *m_pLeftIndent, rSpace.GetTxtLeft(), eUnit );
+ SetMetricValue( *m_pLeftIndent, rSpace.GetTextLeft(), eUnit );
SetMetricValue( *m_pRightIndent, rSpace.GetRight(), eUnit );
- SetMetricValue( *m_pFLineIndent, rSpace.GetTxtFirstLineOfst(), eUnit );
+ SetMetricValue( *m_pFLineIndent, rSpace.GetTextFirstLineOfst(), eUnit );
m_pAutoCB->Check(rSpace.IsAutoFirst());
}
AutoHdl_Impl(m_pAutoCB);
@@ -1430,7 +1430,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( bIsPageModel )
// if PageModel is turned on, always turn off PageBreak
- rOutSet->Put( SvxFmtBreakItem( SVX_BREAK_NONE, _nWhich ) );
+ rOutSet->Put( SvxFormatBreakItem( SVX_BREAK_NONE, _nWhich ) );
else
{
eState = m_pPageBreakBox->GetState();
@@ -1441,9 +1441,9 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
m_pBreakTypeLB->IsValueChangedFromSaved() ||
m_pBreakPositionLB->IsValueChangedFromSaved() )
{
- const SvxFmtBreakItem rOldBreak(
- static_cast<const SvxFmtBreakItem&>(GetItemSet().Get( _nWhich )));
- SvxFmtBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
+ const SvxFormatBreakItem rOldBreak(
+ static_cast<const SvxFormatBreakItem&>(GetItemSet().Get( _nWhich )));
+ SvxFormatBreakItem aBreak(rOldBreak.GetBreak(), rOldBreak.Which());
switch ( eState )
{
@@ -1476,7 +1476,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_PAGEBREAK );
if ( eState != m_pPageBreakBox->GetSavedValue() ||
- !pOld || !( *static_cast<const SvxFmtBreakItem*>(pOld) == aBreak ) )
+ !pOld || !( *static_cast<const SvxFormatBreakItem*>(pOld) == aBreak ) )
{
bModified = true;
rOutSet->Put( aBreak );
@@ -1492,10 +1492,10 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
{
pOld = GetOldItem( *rOutSet, SID_ATTR_PARA_SPLIT );
- if ( !pOld || static_cast<const SvxFmtSplitItem*>(pOld)->GetValue() !=
+ if ( !pOld || static_cast<const SvxFormatSplitItem*>(pOld)->GetValue() !=
( eState == TRISTATE_FALSE ) )
{
- rOutSet->Put( SvxFmtSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
+ rOutSet->Put( SvxFormatSplitItem( eState == TRISTATE_FALSE, _nWhich ) );
bModified = true;
}
}
@@ -1507,7 +1507,7 @@ bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
if ( m_pKeepParaBox->IsValueChangedFromSaved() )
{
// if the status has changed, putting is necessary
- rOutSet->Put( SvxFmtKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
+ rOutSet->Put( SvxFormatKeepItem( eState == TRISTATE_TRUE, _nWhich ) );
bModified = true;
}
@@ -1655,8 +1655,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtBreakItem& rPageBreak =
- static_cast<const SvxFmtBreakItem&>(rSet->Get( _nWhich ));
+ const SvxFormatBreakItem& rPageBreak =
+ static_cast<const SvxFormatBreakItem&>(rSet->Get( _nWhich ));
SvxBreak eBreak = (SvxBreak)rPageBreak.GetValue();
@@ -1727,8 +1727,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
m_pKeepParaBox->EnableTriState( false );
- const SvxFmtKeepItem& rKeep =
- static_cast<const SvxFmtKeepItem&>(rSet->Get( _nWhich ));
+ const SvxFormatKeepItem& rKeep =
+ static_cast<const SvxFormatKeepItem&>(rSet->Get( _nWhich ));
if ( rKeep.GetValue() )
m_pKeepParaBox->SetState( TRISTATE_TRUE );
@@ -1745,8 +1745,8 @@ void SvxExtParagraphTabPage::Reset( const SfxItemSet* rSet )
if ( eItemState >= SfxItemState::DEFAULT )
{
- const SvxFmtSplitItem& rSplit =
- static_cast<const SvxFmtSplitItem&>(rSet->Get( _nWhich ));
+ const SvxFormatSplitItem& rSplit =
+ static_cast<const SvxFormatSplitItem&>(rSet->Get( _nWhich ));
m_pKeepTogetherBox->EnableTriState( false );
if ( !rSplit.GetValue() )
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 9dd3c07..6bef883 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -233,7 +233,7 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
if (SfxItemState::SET != rSet->GetItemState(GetWhich(SID_ATTR_LRSPACE), true, &pLRSpace))
pLRSpace = GetOldItem(*rSet, SID_ATTR_LRSPACE);
- if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTxtFirstLineOfst() < 0)
+ if (pLRSpace && static_cast<const SvxLRSpaceItem*>(pLRSpace)->GetTextFirstLineOfst() < 0)
{
SvxTabStop aNull(0, SVX_TAB_ADJUST_DEFAULT);
aNewTabs.Insert(aNull);
diff --git a/editeng/source/editeng/editattr.hxx b/editeng/source/editeng/editattr.hxx
index c5f7a3b..fb210c6 100644
--- a/editeng/source/editeng/editattr.hxx
+++ b/editeng/source/editeng/editattr.hxx
@@ -375,8 +375,8 @@ public:
{ return !(operator == ( rAttr ) ); }
virtual void SetFont( SvxFont& rFont, OutputDevice* pOutDev ) SAL_OVERRIDE;
- Color*& GetTxtColor() { return pTxtColor; }
- Color*& GetFldColor() { return pFldColor; }
+ Color*& GetTextColor() { return pTxtColor; }
+ Color*& GetFieldColor() { return pFldColor; }
const OUString& GetFieldValue() const { return aFieldValue;}
void SetFieldValue(const OUString& rVal);
diff --git a/editeng/source/editeng/editdbg.cxx b/editeng/source/editeng/editdbg.cxx
index fa1f99a..d59654f 100644
--- a/editeng/source/editeng/editdbg.cxx
+++ b/editeng/source/editeng/editdbg.cxx
@@ -70,9 +70,9 @@ OString DbgOutItem(const SfxItemPool& rPool, const SfxPoolItem& rItem)
case EE_PARA_OUTLLRSPACE:
case EE_PARA_LRSPACE:
aDebStr.append("FI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst()));
+ aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst()));
aDebStr.append(", LI=");
- aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft()));
+ aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft()));
aDebStr.append(", RI=");
aDebStr.append(static_cast<sal_Int32>(static_cast<const SvxLRSpaceItem&>(rItem).GetRight()));
break;
diff --git a/editeng/source/editeng/editdoc.cxx b/editeng/source/editeng/editdoc.cxx
index c9fe975..6f447b9 100644
--- a/editeng/source/editeng/editdoc.cxx
+++ b/editeng/source/editeng/editdoc.cxx
@@ -878,8 +878,8 @@ void ConvertItem( SfxPoolItem& rPoolItem, MapUnit eSourceUnit, MapUnit eDestUnit
{
DBG_ASSERT( rPoolItem.IsA( TYPE( SvxLRSpaceItem ) ), "ConvertItem: invalid Item!" );
SvxLRSpaceItem& rItem = static_cast<SvxLRSpaceItem&>(rPoolItem);
- rItem.SetTxtFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTxtFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
- rItem.SetTxtLeft( OutputDevice::LogicToLogic( rItem.GetTxtLeft(), eSourceUnit, eDestUnit ) );
+ rItem.SetTextFirstLineOfst( sal::static_int_cast< short >( OutputDevice::LogicToLogic( rItem.GetTextFirstLineOfst(), eSourceUnit, eDestUnit ) ) );
+ rItem.SetTextLeft( OutputDevice::LogicToLogic( rItem.GetTextLeft(), eSourceUnit, eDestUnit ) );
rItem.SetRight( OutputDevice::LogicToLogic( rItem.GetRight(), eSourceUnit, eDestUnit ) );
}
break;
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 3a356ab..a119b58 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1922,11 +1922,11 @@ Point EditEngine::GetDocPosTopLeft( sal_Int32 nParagraph )
else
{
const SvxLRSpaceItem& rLRItem = pImpEditEngine->GetLRSpaceItem( pPPortion->GetNode() );
-// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst()) );
+// TL_NF_LR aPoint.X() = pImpEditEngine->GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst()) );
sal_Int32 nSpaceBefore = 0;
pImpEditEngine->GetSpaceBeforeAndMinLabelWidth( pPPortion->GetNode(), &nSpaceBefore );
- short nX = (short)(rLRItem.GetTxtLeft()
- + rLRItem.GetTxtFirstLineOfst()
+ short nX = (short)(rLRItem.GetTextLeft()
+ + rLRItem.GetTextFirstLineOfst()
+ nSpaceBefore);
aPoint.X() = pImpEditEngine->GetXValue( nX
);
diff --git a/editeng/source/editeng/editobj.cxx b/editeng/source/editeng/editobj.cxx
index c4f3afc..ecee5b6 100644
--- a/editeng/source/editeng/editobj.cxx
+++ b/editeng/source/editeng/editobj.cxx
@@ -1564,14 +1564,14 @@ void EditTextObjectImpl::CreateData( SvStream& rIStream )
{
ContentInfo& rC = aContents[i];
const SvxLRSpaceItem& rLRSpace = static_cast<const SvxLRSpaceItem&>(rC.GetParaAttribs().Get(EE_PARA_LRSPACE));
- if ( rLRSpace.GetTxtLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
+ if ( rLRSpace.GetTextLeft() && ( rC.GetParaAttribs().GetItemState( EE_PARA_TABS ) == SfxItemState::SET ) )
{
const SvxTabStopItem& rTabs = static_cast<const SvxTabStopItem&>(rC.GetParaAttribs().Get(EE_PARA_TABS));
SvxTabStopItem aNewTabs( 0, 0, SVX_TAB_ADJUST_LEFT, EE_PARA_TABS );
for ( sal_uInt16 t = 0; t < rTabs.Count(); t++ )
{
const SvxTabStop& rT = rTabs[ t ];
- aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTxtLeft(),
+ aNewTabs.Insert( SvxTabStop( rT.GetTabPos() - rLRSpace.GetTextLeft(),
rT.GetAdjustment(), rT.GetDecimal(), rT.GetFill() ) );
}
rC.GetParaAttribs().Put( aNewTabs );
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index bfded82..87a1f94 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -2943,12 +2943,12 @@ bool ImpEditEngine::UpdateFields()
rField.Reset();
if ( aStatus.MarkFields() )
- rField.GetFldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
+ rField.GetFieldColor() = new Color( GetColorConfig().GetColorValue( svtools::WRITERFIELDSHADINGS ).nColor );
OUString aFldValue =
GetEditEnginePtr()->CalcFieldValue(
static_cast<const SvxFieldItem&>(*rField.GetItem()),
- nPara, rField.GetStart(), rField.GetTxtColor(), rField.GetFldColor());
+ nPara, rField.GetStart(), rField.GetTextColor(), rField.GetFieldColor());
rField.SetFieldValue(aFldValue);
if (rField != *pCurrent)
@@ -3089,10 +3089,10 @@ sal_uInt32 ImpEditEngine::CalcTextWidth( bool bIgnoreExtraSpace )
// width, here not preferred. I general, it is best not leave it
// to StartPosX, also the right indents have to be taken into
// account!
- nCurWidth = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+ nCurWidth = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
if ( nLine == 0 )
{
- long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+ long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
nCurWidth -= nFI;
if ( pPortion->GetBulletX() > nCurWidth )
{
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 1a8ac4d..fb071e0 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -737,10 +737,10 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
sal_Int32 nPortionStart = 0;
sal_Int32 nPortionEnd = 0;
- long nStartX = GetXValue( rLRItem.GetTxtLeft() + nSpaceBeforeAndMinLabelWidth );
+ long nStartX = GetXValue( rLRItem.GetTextLeft() + nSpaceBeforeAndMinLabelWidth );
if ( nIndex == 0 )
{
- long nFI = GetXValue( rLRItem.GetTxtFirstLineOfst() );
+ long nFI = GetXValue( rLRItem.GetTextFirstLineOfst() );
nStartX += nFI;
if ( !nLine && ( pParaPortion->GetBulletX() > nStartX ) )
@@ -907,9 +907,9 @@ bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
if ( aStatus.DoStretch() && ( nStretchX != 100 ) )
nCurPos = nCurPos*100/std::max(static_cast<sal_Int32>(nStretchX), static_cast<sal_Int32>(1));
- short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTxtLeft()/* + rLRItem.GetTxtLeft()*/ + nSpaceBeforeAndMinLabelWidth);
- aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/, aEditDoc.GetDefTab() );
- aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTxtLeft()*/ ) );
+ short nAllSpaceBeforeText = static_cast< short >(rLRItem.GetTextLeft()/* + rLRItem.GetTextLeft()*/ + nSpaceBeforeAndMinLabelWidth);
+ aCurrentTab.aTabStop = pNode->GetContentAttribs().FindTabStop( nCurPos - nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/, aEditDoc.GetDefTab() );
+ aCurrentTab.nTabPos = GetXValue( (long) ( aCurrentTab.aTabStop.GetTabPos() + nAllSpaceBeforeText /*rLRItem.GetTextLeft()*/ ) );
aCurrentTab.bValid = false;
// Switch direction in R2L para...
@@ -1577,12 +1577,12 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
sal_Int32 nSpaceBeforeAndMinLabelWidth = GetSpaceBeforeAndMinLabelWidth( pParaPortion->GetNode(), &nSpaceBefore );
const SvxLRSpaceItem& rLRItem = GetLRSpaceItem( pParaPortion->GetNode() );
const SvxLineSpacingItem& rLSItem = static_cast<const SvxLineSpacingItem&>(pParaPortion->GetNode()->GetContentAttribs().GetItem( EE_PARA_SBL ));
- short nStartX = GetXValue( (short)(rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBefore));
+ short nStartX = GetXValue( (short)(rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBefore));
Rectangle aBulletArea = Rectangle( Point(), Point() );
if ( bLineBreak )
{
- nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+ nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
}
else
{
@@ -1593,7 +1593,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
pParaPortion->SetBulletX( 0 ); // If Bullet set incorrectly.
if ( pParaPortion->GetBulletX() > nStartX )
{
- nStartX = (short)GetXValue( rLRItem.GetTxtLeft() + rLRItem.GetTxtFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
+ nStartX = (short)GetXValue( rLRItem.GetTextLeft() + rLRItem.GetTextFirstLineOfst() + nSpaceBeforeAndMinLabelWidth );
if ( pParaPortion->GetBulletX() > nStartX )
nStartX = pParaPortion->GetBulletX();
}
diff --git a/editeng/source/editeng/impedit4.cxx b/editeng/source/editeng/impedit4.cxx
index 0fb7962..8cd007a 100644
--- a/editeng/source/editeng/impedit4.cxx
+++ b/editeng/source/editeng/impedit4.cxx
@@ -723,11 +723,11 @@ void ImpEditEngine::WriteItemAsRTF( const SfxPoolItem& rItem, SvStream& rOutput,
case EE_PARA_LRSPACE:
{
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_FI );
- sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTxtFirstLineOfst();
+ sal_Int32 nTxtFirst = static_cast<const SvxLRSpaceItem&>(rItem).GetTextFirstLineOfst();
nTxtFirst = LogicToTwips( nTxtFirst );
rOutput.WriteInt32AsString( nTxtFirst );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_LI );
- sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTxtLeft());
+ sal_uInt32 nTxtLeft = static_cast< sal_uInt32 >(static_cast<const SvxLRSpaceItem&>(rItem).GetTextLeft());
nTxtLeft = (sal_uInt32)LogicToTwips( nTxtLeft );
rOutput.WriteInt32AsString( nTxtLeft );
rOutput.WriteCharPtr( OOO_STRING_SVTOOLS_RTF_RI );
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 50db586..d872838 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -149,8 +149,8 @@ TYPEINIT1_FACTORY(SvxBrushItem, SfxPoolItem, new SvxBrushItem(0));
TYPEINIT1_FACTORY(SvxShadowItem, SfxPoolItem, new SvxShadowItem(0));
TYPEINIT1_FACTORY(SvxBoxItem, SfxPoolItem, new SvxBoxItem(0));
TYPEINIT1_FACTORY(SvxBoxInfoItem, SfxPoolItem, new SvxBoxInfoItem(0));
-TYPEINIT1_FACTORY(SvxFmtBreakItem, SfxEnumItem, new SvxFmtBreakItem(SVX_BREAK_NONE, 0));
-TYPEINIT1_FACTORY(SvxFmtKeepItem, SfxBoolItem, new SvxFmtKeepItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatBreakItem, SfxEnumItem, new SvxFormatBreakItem(SVX_BREAK_NONE, 0));
+TYPEINIT1_FACTORY(SvxFormatKeepItem, SfxBoolItem, new SvxFormatKeepItem(false, 0));
TYPEINIT1_FACTORY(SvxLineItem, SfxPoolItem, new SvxLineItem(0));
TYPEINIT1_FACTORY(SvxFrameDirectionItem, SfxUInt16Item, new SvxFrameDirectionItem(FRMDIR_HORI_LEFT_TOP, 0));
@@ -496,7 +496,7 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
break;
case MID_TXT_LMARGIN :
- SetTxtLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
+ SetTextLeft( bConvert ? convertMm100ToTwip(nVal) : nVal );
break;
case MID_R_MARGIN:
@@ -518,11 +518,11 @@ bool SvxLRSpaceItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
break;
case MID_FIRST_LINE_INDENT :
- SetTxtFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal));
+ SetTextFirstLineOfst((short)(bConvert ? convertMm100ToTwip(nVal) : nVal));
break;
case MID_FIRST_LINE_REL_INDENT:
- SetPropTxtFirstLineOfst ( (sal_uInt16)nVal );
+ SetPropTextFirstLineOfst ( (sal_uInt16)nVal );
break;
case MID_FIRST_AUTO:
@@ -557,11 +557,11 @@ bool SvxLRSpaceItem::operator==( const SfxPoolItem& rAttr ) const
const SvxLRSpaceItem& rOther = static_cast<const SvxLRSpaceItem&>(rAttr);
return (
- nFirstLineOfst == rOther.GetTxtFirstLineOfst() &&
- nTxtLeft == rOther.GetTxtLeft() &&
+ nFirstLineOfst == rOther.GetTextFirstLineOfst() &&
+ nTxtLeft == rOther.GetTextLeft() &&
nLeftMargin == rOther.GetLeft() &&
nRightMargin == rOther.GetRight() &&
- nPropFirstLineOfst == rOther.GetPropTxtFirstLineOfst() &&
+ nPropFirstLineOfst == rOther.GetPropTextFirstLineOfst() &&
nPropLeftMargin == rOther.GetPropLeft() &&
nPropRightMargin == rOther.GetPropRight() &&
bAutoFirst == rOther.IsAutoFirst() &&
@@ -673,7 +673,7 @@ bool SvxLRSpaceItem::GetPresentation
SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
short nSaveFI = nFirstLineOfst;
- const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create()
+ const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( 0 ); // nLeftMargin is manipulated together with this, see Create()
sal_uInt16 nMargin = 0;
if( nLeftMargin > 0 )
@@ -713,7 +713,7 @@ SvStream& SvxLRSpaceItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) con
}
}
- const_cast<SvxLRSpaceItem*>(this)->SetTxtFirstLineOfst( nSaveFI );
+ const_cast<SvxLRSpaceItem*>(this)->SetTextFirstLineOfst( nSaveFI );
return rStrm;
}
@@ -1268,7 +1268,7 @@ SvStream& SvxProtectItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
sal_Int8 cProt = 0;
if( IsPosProtected() ) cProt |= 0x01;
if( IsSizeProtected() ) cProt |= 0x02;
- if( IsCntntProtected() ) cProt |= 0x04;
+ if( IsContentProtected() ) cProt |= 0x04;
rStrm.WriteSChar( cProt );
return rStrm;
}
@@ -1282,7 +1282,7 @@ SfxPoolItem* SvxProtectItem::Create( SvStream& rStrm, sal_uInt16 ) const
SvxProtectItem* pAttr = new SvxProtectItem( Which() );
pAttr->SetPosProtect( ( cFlags & 0x01 ) != 0 );
pAttr->SetSizeProtect( ( cFlags & 0x02 ) != 0 );
- pAttr->SetCntntProtect( ( cFlags & 0x04 ) != 0 );
+ pAttr->SetContentProtect( ( cFlags & 0x04 ) != 0 );
return pAttr;
}
@@ -2937,18 +2937,18 @@ bool SvxBoxInfoItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
return true;
}
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
-bool SvxFmtBreakItem::operator==( const SfxPoolItem& rAttr ) const
+bool SvxFormatBreakItem::operator==( const SfxPoolItem& rAttr ) const
{
DBG_ASSERT( SfxPoolItem::operator==( rAttr ), "unequal types" );
- return GetValue() == static_cast<const SvxFmtBreakItem&>( rAttr ).GetValue();
+ return GetValue() == static_cast<const SvxFormatBreakItem&>( rAttr ).GetValue();
}
-bool SvxFmtBreakItem::GetPresentation
+bool SvxFormatBreakItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
@@ -2962,14 +2962,14 @@ bool SvxFmtBreakItem::GetPresentation
-OUString SvxFmtBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
+OUString SvxFormatBreakItem::GetValueTextByPos( sal_uInt16 nPos ) const
{
DBG_ASSERT( nPos < SVX_BREAK_END, "enum overflow!" );
return EE_RESSTR(RID_SVXITEMS_BREAK_BEGIN + nPos);
}
-bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
+bool SvxFormatBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) const
{
style::BreakType eBreak = style::BreakType_NONE;
switch ( (SvxBreak)GetValue() )
@@ -2986,7 +2986,7 @@ bool SvxFmtBreakItem::QueryValue( uno::Any& rVal, sal_uInt8 /*nMemberId*/ ) cons
return true;
}
-bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
+bool SvxFormatBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
{
style::BreakType nBreak;
@@ -3017,14 +3017,14 @@ bool SvxFmtBreakItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ )
-SfxPoolItem* SvxFmtBreakItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatBreakItem::Clone( SfxItemPool* ) const
{
- return new SvxFmtBreakItem( *this );
+ return new SvxFormatBreakItem( *this );
}
-SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
+SvStream& SvxFormatBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) const
{
rStrm.WriteSChar( GetValue() );
if( FMTBREAK_NOAUTO > nItemVersion )
@@ -3034,44 +3034,44 @@ SvStream& SvxFmtBreakItem::Store( SvStream& rStrm , sal_uInt16 nItemVersion ) co
-sal_uInt16 SvxFmtBreakItem::GetVersion( sal_uInt16 nFFVer ) const
+sal_uInt16 SvxFormatBreakItem::GetVersion( sal_uInt16 nFFVer ) const
{
DBG_ASSERT( SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ||
SOFFICE_FILEFORMAT_50==nFFVer,
- "SvxFmtBreakItem: Is there a new file format? ");
+ "SvxFormatBreakItem: Is there a new file format? ");
return SOFFICE_FILEFORMAT_31==nFFVer ||
SOFFICE_FILEFORMAT_40==nFFVer ? 0 : FMTBREAK_NOAUTO;
}
-SfxPoolItem* SvxFmtBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
+SfxPoolItem* SvxFormatBreakItem::Create( SvStream& rStrm, sal_uInt16 nVersion ) const
{
sal_Int8 eBreak, bDummy;
rStrm.ReadSChar( eBreak );
if( FMTBREAK_NOAUTO > nVersion )
rStrm.ReadSChar( bDummy );
- return new SvxFmtBreakItem( (const SvxBreak)eBreak, Which() );
+ return new SvxFormatBreakItem( (const SvxBreak)eBreak, Which() );
}
-sal_uInt16 SvxFmtBreakItem::GetValueCount() const
+sal_uInt16 SvxFormatBreakItem::GetValueCount() const
{
return SVX_BREAK_END; // SVX_BREAK_PAGE_BOTH + 1
}
-// class SvxFmtKeepItem -------------------------------------------------
+// class SvxFormatKeepItem -------------------------------------------------
-SfxPoolItem* SvxFmtKeepItem::Clone( SfxItemPool* ) const
+SfxPoolItem* SvxFormatKeepItem::Clone( SfxItemPool* ) const
{
- return new SvxFmtKeepItem( *this );
+ return new SvxFormatKeepItem( *this );
}
-SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
@@ -3079,16 +3079,16 @@ SvStream& SvxFmtKeepItem::Store( SvStream& rStrm , sal_uInt16 /*nItemVersion*/ )
-SfxPoolItem* SvxFmtKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatKeepItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsKeep;
rStrm.ReadSChar( bIsKeep );
- return new SvxFmtKeepItem( bIsKeep != 0, Which() );
+ return new SvxFormatKeepItem( bIsKeep != 0, Which() );
}
-bool SvxFmtKeepItem::GetPresentation
+bool SvxFormatKeepItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index c788224..6b846e7 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -565,7 +565,7 @@ OUString SvxNumberFormat::CreateRomanString( sal_uLong nNo, bool bUpper )
return sRet;
}
-OUString SvxNumberFormat::GetCharFmtName()const
+OUString SvxNumberFormat::GetCharFormatName()const
{
return sCharStyleName;
}
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 758e248..452704b 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -59,7 +59,7 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0));
+TYPEINIT1_FACTORY(SvxFormatSplitItem, SfxBoolItem, new SvxFormatSplitItem(false, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
@@ -1208,19 +1208,19 @@ void SvxTabStopItem::Insert( const SvxTabStopItem* pTabs, sal_uInt16 nStart,
-// class SvxFmtSplitItem -------------------------------------------------
-SvxFmtSplitItem::~SvxFmtSplitItem()
+// class SvxFormatSplitItem -------------------------------------------------
+SvxFormatSplitItem::~SvxFormatSplitItem()
{
}
-SfxPoolItem* SvxFmtSplitItem::Clone( SfxItemPool * ) const
+SfxPoolItem* SvxFormatSplitItem::Clone( SfxItemPool * ) const
{
- return new SvxFmtSplitItem( *this );
+ return new SvxFormatSplitItem( *this );
}
-SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
+SvStream& SvxFormatSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ ) const
{
rStrm.WriteSChar( (sal_Int8)GetValue() );
return rStrm;
@@ -1228,16 +1228,16 @@ SvStream& SvxFmtSplitItem::Store( SvStream& rStrm, sal_uInt16 /*nItemVersion*/ )
-SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
+SfxPoolItem* SvxFormatSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsSplit;
rStrm.ReadSChar( bIsSplit );
- return new SvxFmtSplitItem( bIsSplit != 0, Which() );
+ return new SvxFormatSplitItem( bIsSplit != 0, Which() );
}
-bool SvxFmtSplitItem::GetPresentation
+bool SvxFormatSplitItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
SfxMapUnit /*eCoreUnit*/,
diff --git a/editeng/source/items/svxfont.cxx b/editeng/source/items/svxfont.cxx
index da7e918..7de20d1 100644
--- a/editeng/source/items/svxfont.cxx
+++ b/editeng/source/items/svxfont.cxx
@@ -434,7 +434,7 @@ Size SvxFont::QuickGetTextSize( const OutputDevice *pOut, const OUString &rTxt,
}
-Size SvxFont::GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+Size SvxFont::GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx, const sal_Int32 nLen ) const
{
sal_Int32 nTmp = nLen;
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 3971ce8..325e787 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -398,7 +398,7 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
if(aValues.getLength() == aNames.getLength())
{
- SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
if(pValues[nProp].hasValue())
@@ -461,16 +461,16 @@ void SvxSwAutoCorrCfg::Load(bool bInit)
sal::static_int_cast< sal_uInt8 >(nVal);
}
break; // "Format/Option/CombineValue",
- case 23: rSwFlags.bAFmtDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
- case 24: rSwFlags.bAFmtDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
+ case 23: rSwFlags.bAFormatDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesAtStartEnd",
+ case 24: rSwFlags.bAFormatDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/Option/DelSpacesBetween",
case 25: rParent.bAutoFmtByInput = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/Enable",
case 26: rSwFlags.bChgToEnEmDash = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeDash",
case 27: rSwFlags.bSetNumRule = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ApplyNumbering/Enable",
case 28: rSwFlags.bSetBorder = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToBorders",
case 29: rSwFlags.bCreateTable = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ChangeToTable",
case 30: rSwFlags.bReplaceStyles = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/ReplaceStyle",
- case 31: rSwFlags.bAFmtByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
- case 32: rSwFlags.bAFmtByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
+ case 31: rSwFlags.bAFormatByInpDelSpacesAtSttEnd = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesAtStartEnd",
+ case 32: rSwFlags.bAFormatByInpDelSpacesBetweenLines = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Format/ByInput/DelSpacesBetween",
case 33: rSwFlags.bAutoCompleteWords = *static_cast<sal_Bool const *>(pValues[nProp].getValue()); break; // "Completion/Enable",
case 34:
{
@@ -554,7 +554,7 @@ void SvxSwAutoCorrCfg::ImplCommit()
const Type& rType = cppu::UnoType<bool>::get();
sal_Bool bVal;
- SvxSwAutoFmtFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
+ SvxSwAutoFormatFlags& rSwFlags = rParent.pAutoCorrect->GetSwFlags();
for(int nProp = 0; nProp < aNames.getLength(); nProp++)
{
switch(nProp)
@@ -597,16 +597,16 @@ void SvxSwAutoCorrCfg::ImplCommit()
case 22:
pValues[nProp] <<= (sal_Int32)rSwFlags.nRightMargin;
break; // "Format/Option/CombineValue",
- case 23: bVal = rSwFlags.bAFmtDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
- case 24: bVal = rSwFlags.bAFmtDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
+ case 23: bVal = rSwFlags.bAFormatDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesAtStartEnd",
+ case 24: bVal = rSwFlags.bAFormatDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/Option/DelSpacesBetween",
case 25: bVal = rParent.bAutoFmtByInput; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/Enable",
case 26: bVal = rSwFlags.bChgToEnEmDash; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeDash",
case 27: bVal = rSwFlags.bSetNumRule; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ApplyNumbering/Enable",
case 28: bVal = rSwFlags.bSetBorder; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToBorders",
case 29: bVal = rSwFlags.bCreateTable; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ChangeToTable",
case 30: bVal = rSwFlags.bReplaceStyles; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/ReplaceStyle",
- case 31: bVal = rSwFlags.bAFmtByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
- case 32: bVal = rSwFlags.bAFmtByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
+ case 31: bVal = rSwFlags.bAFormatByInpDelSpacesAtSttEnd; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesAtStartEnd",
+ case 32: bVal = rSwFlags.bAFormatByInpDelSpacesBetweenLines; pValues[nProp].setValue(&bVal, rType); break; // "Format/ByInput/DelSpacesBetween",
case 33: bVal = rSwFlags.bAutoCompleteWords; pValues[nProp].setValue(&bVal, rType); break; // "Completion/Enable",
case 34:
pValues[nProp] <<= (sal_Int32)rSwFlags.nAutoCmpltWordLen;
diff --git a/editeng/source/misc/swafopt.cxx b/editeng/source/misc/swafopt.cxx
index 74645ed..31f085c 100644
--- a/editeng/source/misc/swafopt.cxx
+++ b/editeng/source/misc/swafopt.cxx
@@ -21,7 +21,7 @@
#include <tools/gen.hxx>
#include <vcl/keycodes.hxx>
-SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
+SvxSwAutoFormatFlags::SvxSwAutoFormatFlags()
: aBulletFont( OUString("StarSymbol"),
Size( 0, 14 ) )
{
@@ -36,10 +36,10 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
bChgToEnEmDash =
bChgWeightUnderl =
bSetINetAttr =
- bAFmtDelSpacesAtSttEnd =
- bAFmtDelSpacesBetweenLines =
- bAFmtByInpDelSpacesAtSttEnd =
- bAFmtByInpDelSpacesBetweenLines =
+ bAFormatDelSpacesAtSttEnd =
+ bAFormatDelSpacesBetweenLines =
+ bAFormatByInpDelSpacesAtSttEnd =
+ bAFormatByInpDelSpacesBetweenLines =
bDummy = true;
bReplaceStyles =
@@ -52,7 +52,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
bSetBorder =
bCreateTable =
bSetNumRule =
- bAFmtByInput =
+ bAFormatByInput =
bRightMargin =
bAutoCompleteWords =
bAutoCmpltCollectWords =
@@ -81,7 +81,7 @@ SvxSwAutoFmtFlags::SvxSwAutoFmtFlags()
}
-SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFlags )
+SvxSwAutoFormatFlags& SvxSwAutoFormatFlags::operator=( const SvxSwAutoFormatFlags& rAFFlags )
{
bAutoCorrect = rAFFlags.bAutoCorrect;
bCptlSttSntnc = rAFFlags.bCptlSttSntnc;
@@ -92,7 +92,7 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
bChgEnumNum = rAFFlags.bChgEnumNum;
bDelEmptyNode = rAFFlags.bDelEmptyNode;
bSetNumRule = rAFFlags.bSetNumRule;
- bAFmtByInput = rAFFlags.bAFmtByInput;
+ bAFormatByInput = rAFFlags.bAFormatByInput;
bAddNonBrkSpace = rAFFlags.bAddNonBrkSpace;
bChgOrdinalNumber = rAFFlags.bChgOrdinalNumber;
@@ -102,10 +102,10 @@ SvxSwAutoFmtFlags& SvxSwAutoFmtFlags::operator=( const SvxSwAutoFmtFlags& rAFFla
bSetBorder = rAFFlags.bSetBorder;
bCreateTable = rAFFlags.bCreateTable;
bReplaceStyles = rAFFlags.bReplaceStyles;
- bAFmtDelSpacesAtSttEnd = rAFFlags.bAFmtDelSpacesAtSttEnd;
- bAFmtDelSpacesBetweenLines = rAFFlags.bAFmtDelSpacesBetweenLines;
- bAFmtByInpDelSpacesAtSttEnd = rAFFlags.bAFmtByInpDelSpacesAtSttEnd;
- bAFmtByInpDelSpacesBetweenLines = rAFFlags.bAFmtByInpDelSpacesBetweenLines;
+ bAFormatDelSpacesAtSttEnd = rAFFlags.bAFormatDelSpacesAtSttEnd;
+ bAFormatDelSpacesBetweenLines = rAFFlags.bAFormatDelSpacesBetweenLines;
+ bAFormatByInpDelSpacesAtSttEnd = rAFFlags.bAFormatByInpDelSpacesAtSttEnd;
+ bAFormatByInpDelSpacesBetweenLines = rAFFlags.bAFormatByInpDelSpacesBetweenLines;
bDummy = rAFFlags.bDummy;
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 8f704bb..b573ea1 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -679,17 +679,17 @@ OUString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara,
EditFieldInfo aFldInfo( this, rField, nPara, nPos );
// The FldColor is preset with COL_LIGHTGRAY.
if ( rpFldColor )
- aFldInfo.SetFldColor( *rpFldColor );
+ aFldInfo.SetFieldColor( *rpFldColor );
aCalcFieldValueHdl.Call( &aFldInfo );
- if ( aFldInfo.GetTxtColor() )
+ if ( aFldInfo.GetTextColor() )
{
delete rpTxtColor;
- rpTxtColor = new Color( *aFldInfo.GetTxtColor() );
+ rpTxtColor = new Color( *aFldInfo.GetTextColor() );
}
delete rpFldColor;
- rpFldColor = aFldInfo.GetFldColor() ? new Color( *aFldInfo.GetFldColor() ) : 0;
+ rpFldColor = aFldInfo.GetFieldColor() ? new Color( *aFldInfo.GetFieldColor() ) : 0;
return aFldInfo.GetRepresentation();
}
@@ -1578,9 +1578,9 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
const SvxLRSpaceItem& rLR = static_cast<const SvxLRSpaceItem&>( pEditEngine->GetParaAttrib( nPara, bOutlineMode ? EE_PARA_OUTLLRSPACE : EE_PARA_LRSPACE ) );
- aTopLeft.X() = rLR.GetTxtLeft() + rLR.GetTxtFirstLineOfst() + nSpaceBefore;
+ aTopLeft.X() = rLR.GetTextLeft() + rLR.GetTextFirstLineOfst() + nSpaceBefore;
- long nBulletWidth = std::max( (long) -rLR.GetTxtFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
+ long nBulletWidth = std::max( (long) -rLR.GetTextFirstLineOfst(), (long) ((-pFmt->GetFirstLineOffset()) + pFmt->GetCharTextDistance()) );
if ( nBulletWidth < aBulletSize.Width() ) // The Bullet creates its space
nBulletWidth = aBulletSize.Width();
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index fdfda07..67a574b 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -303,14 +303,14 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_KEEP:
if( aPardMap.nSplit )
{
- pSet->Put( SvxFmtSplitItem( false, aPardMap.nSplit ));
+ pSet->Put( SvxFormatSplitItem( false, aPardMap.nSplit ));
}
break;
case RTF_KEEPN:
if( aPardMap.nKeep )
{
- pSet->Put( SvxFmtKeepItem( true, aPardMap.nKeep ));
+ pSet->Put( SvxFormatKeepItem( true, aPardMap.nKeep ));
}
break;
@@ -358,7 +358,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
CalcValue();
nSz = sal_uInt16(nTokenValue);
}
- aLR.SetTxtFirstLineOfst( nSz );
+ aLR.SetTextFirstLineOfst( nSz );
pSet->Put( aLR );
}
break;
@@ -375,7 +375,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
CalcValue();
nSz = sal_uInt16(nTokenValue);
}
- aLR.SetTxtLeft( nSz );
+ aLR.SetTextLeft( nSz );
pSet->Put( aLR );
}
break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 552c52a..56ef736 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -129,7 +129,7 @@ SvParserState SvxRTFParser::CallParser()
sBaseURL.clear();
// generate the correct WhichId table from the set WhichIds.
- BuildWhichTbl();
+ BuildWhichTable();
return SvRTFParser::CallParser();
}
@@ -1089,7 +1089,7 @@ void SvxRTFParser::SetAttrInDoc( SvxRTFItemStackType & )
{
}
-void SvxRTFParser::BuildWhichTbl()
+void SvxRTFParser::BuildWhichTable()
{
aWhichMap.clear();
aWhichMap.push_back( 0 );
@@ -1097,8 +1097,8 @@ void SvxRTFParser::BuildWhichTbl()
// Building a Which-Map 'rWhichMap' from an array of
// 'pWhichIds' from Which-Ids. It has the long 'nWhichIds'.
// The Which-Map is not going to be deleted.
- SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
- SvParser::BuildWhichTbl( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
+ SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPardMap), sizeof(aPardMap) / sizeof(sal_uInt16) );
+ SvParser::BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16*>(&aPlainMap), sizeof(aPlainMap) / sizeof(sal_uInt16) );
}
const SfxItemSet& SvxRTFParser::GetRTFDefaults()
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 506c449..9e88ceb 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5460,7 +5460,7 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream& rSt,
void SvxMSDffManager::StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
short nHdFtSection) const
{
sal_uInt16 nShpCnt = pShapeOrders->size();
@@ -5481,7 +5481,7 @@ void SvxMSDffManager::StoreShapeOrder(sal_uLong nId,
void SvxMSDffManager::ExchangeInShapeOrder( SdrObject* pOldObject,
sal_uLong nTxBx,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
SdrObject* pObject) const
{
sal_uInt16 nShpCnt = pShapeOrders->size();
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 42f3c2d..4536cda 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6094,14 +6094,14 @@ void PPTParagraphObj::ApplyTo( SfxItemSet& rSet, boost::optional< sal_Int16 >&
sal_uInt16 nAbsLSpace = (sal_uInt16)( ( (sal_uInt32)_nTextOfs * 2540 ) / 576 );
sal_uInt16 nFirstLineOffset = nAbsLSpace - (sal_uInt16)( ( (sal_uInt32)_nBulletOfs * 2540 ) / 576 );
aLRSpaceItem.SetLeft( nAbsLSpace );
- aLRSpaceItem.SetTxtFirstLineOfstValue( -nFirstLineOffset );
+ aLRSpaceItem.SetTextFirstLineOfstValue( -nFirstLineOffset );
rSet.Put( aLRSpaceItem );
}
else
{
SvxLRSpaceItem aLRSpaceItem( EE_PARA_LRSPACE );
aLRSpaceItem.SetLeft( 0 );
- aLRSpaceItem.SetTxtFirstLineOfstValue( 0 );
+ aLRSpaceItem.SetTextFirstLineOfstValue( 0 );
rSet.Put( aLRSpaceItem );
}
if ( GetAttrib( PPT_ParaAttr_Adjust, nVal, nDestinationInstance ) )
diff --git a/include/editeng/acorrcfg.hxx b/include/editeng/acorrcfg.hxx
index 1a90fb3..e2fd887 100644
--- a/include/editeng/acorrcfg.hxx
+++ b/include/editeng/acorrcfg.hxx
@@ -96,8 +96,8 @@ public:
// the pointer is transferred to the possession of the ConfigItems!
void SetAutoCorrect( SvxAutoCorrect* );
- bool IsAutoFmtByInput() const { return bAutoFmtByInput; }
- void SetAutoFmtByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
+ bool IsAutoFormatByInput() const { return bAutoFmtByInput; }
+ void SetAutoFormatByInput( bool bSet ) { bAutoFmtByInput = bSet;aSwConfig.SetModified();}
bool IsSaveRelFile() const { return bFileRel; }
void SetSaveRelFile( bool bSet ) { bFileRel = bSet; aSwConfig.SetModified(); }
diff --git a/include/editeng/formatbreakitem.hxx b/include/editeng/formatbreakitem.hxx
index 65a1bf1..7dee5d6 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -24,7 +24,7 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtBreakItem -------------------------------------------------
+// class SvxFormatBreakItem -------------------------------------------------
/* [Description]
@@ -33,15 +33,15 @@
*/
#define FMTBREAK_NOAUTO ((sal_uInt16)0x0001)
-class EDITENG_DLLPUBLIC SvxFmtBreakItem : public SfxEnumItem
+class EDITENG_DLLPUBLIC SvxFormatBreakItem : public SfxEnumItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
+ inline SvxFormatBreakItem( const SvxBreak eBrk /*= SVX_BREAK_NONE*/,
const sal_uInt16 nWhich );
- inline SvxFmtBreakItem( const SvxFmtBreakItem& rBreak );
- inline SvxFmtBreakItem& operator=( const SvxFmtBreakItem& rCpy );
+ inline SvxFormatBreakItem( const SvxFormatBreakItem& rBreak );
+ inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
// "pure virtual Methods" from SfxPoolItem
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -69,17 +69,17 @@ public:
};
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxBreak eBreak,
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxBreak eBreak,
const sal_uInt16 _nWhich ) :
SfxEnumItem( _nWhich, (sal_uInt16)eBreak )
{}
-inline SvxFmtBreakItem::SvxFmtBreakItem( const SvxFmtBreakItem& rBreak ) :
+inline SvxFormatBreakItem::SvxFormatBreakItem( const SvxFormatBreakItem& rBreak ) :
SfxEnumItem( rBreak )
{}
-inline SvxFmtBreakItem& SvxFmtBreakItem::operator=(
- const SvxFmtBreakItem& rBreak )
+inline SvxFormatBreakItem& SvxFormatBreakItem::operator=(
+ const SvxFormatBreakItem& rBreak )
{
SetValue( rBreak.GetValue() );
return *this;
diff --git a/include/editeng/keepitem.hxx b/include/editeng/keepitem.hxx
index 1092311..4646cf7 100644
--- a/include/editeng/keepitem.hxx
+++ b/include/editeng/keepitem.hxx
@@ -23,21 +23,21 @@
#include <editeng/editengdllapi.h>
-// class SvxFmtKeepItem ------------------------------------------------
+// class SvxFormatKeepItem ------------------------------------------------
/* [Description]
This item describes a logical variable "keep paragraphs together?".
*/
-class EDITENG_DLLPUBLIC SvxFmtKeepItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatKeepItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- inline SvxFmtKeepItem( const bool bKeep /*= false*/,
+ inline SvxFormatKeepItem( const bool bKeep /*= false*/,
const sal_uInt16 _nWhich );
- inline SvxFmtKeepItem& operator=( const SvxFmtKeepItem& rSplit );
+ inline SvxFormatKeepItem& operator=( const SvxFormatKeepItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -50,11 +50,11 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtKeepItem::SvxFmtKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
+inline SvxFormatKeepItem::SvxFormatKeepItem( const bool bKeep, const sal_uInt16 _nWhich ) :
SfxBoolItem( _nWhich, bKeep )
{}
-inline SvxFmtKeepItem& SvxFmtKeepItem::operator=( const SvxFmtKeepItem& rKeep )
+inline SvxFormatKeepItem& SvxFormatKeepItem::operator=( const SvxFormatKeepItem& rKeep )
{
SetValue( rKeep.GetValue() );
return *this;
diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 123264e..4e1b079 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -36,7 +36,7 @@
0 coordinate for the first line indent:
UI UI LAYOUT UI/TEXT UI/TEXT (Where?)
- SetTxtLeft SetTxtFirst GetLeft GetTxtLeft GetTxtFirst (What?)
+ SetTextLeft SetTxtFirst GetLeft GetTextLeft GetTxtFirst (What?)
500 -500 0 500 -500 (How much?)
500 0 500 500 0
500 +500 500 500 +500
@@ -115,16 +115,16 @@ public:
inline sal_uInt16 GetPropRight() const { return nPropRightMargin;}
// The UI/text interface:
- inline void SetTxtLeft( const long nL, const sal_uInt16 nProp = 100 );
- inline long GetTxtLeft() const { return nTxtLeft; }
+ inline void SetTextLeft( const long nL, const sal_uInt16 nProp = 100 );
+ inline long GetTextLeft() const { return nTxtLeft; }
- inline void SetTxtFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
- inline short GetTxtFirstLineOfst() const { return nFirstLineOfst; }
- inline void SetPropTxtFirstLineOfst( const sal_uInt16 nProp = 100 )
+ inline void SetTextFirstLineOfst( const short nF, const sal_uInt16 nProp = 100 );
+ inline short GetTextFirstLineOfst() const { return nFirstLineOfst; }
+ inline void SetPropTextFirstLineOfst( const sal_uInt16 nProp = 100 )
{ nPropFirstLineOfst = nProp; }
- inline sal_uInt16 GetPropTxtFirstLineOfst() const
+ inline sal_uInt16 GetPropTextFirstLineOfst() const
{ return nPropFirstLineOfst; }
- inline void SetTxtFirstLineOfstValue( const short nValue )
+ inline void SetTextFirstLineOfstValue( const short nValue )
{ nFirstLineOfst = nValue; }
void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
};
@@ -159,7 +159,7 @@ inline void SvxLRSpaceItem::SetRight( const long nR, const sal_uInt16 nProp )
nRightMargin = (nR * nProp) / 100;
nPropRightMargin = nProp;
}
-inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
+inline void SvxLRSpaceItem::SetTextFirstLineOfst( const short nF,
const sal_uInt16 nProp )
{
nFirstLineOfst = short((long(nF) * nProp ) / 100);
@@ -167,7 +167,7 @@ inline void SvxLRSpaceItem::SetTxtFirstLineOfst( const short nF,
AdjustLeft();
}
-inline void SvxLRSpaceItem::SetTxtLeft( const long nL, const sal_uInt16 nProp )
+inline void SvxLRSpaceItem::SetTextLeft( const long nL, const sal_uInt16 nProp )
{
if (0 == nL)
{
diff --git a/include/editeng/memberids.hrc b/include/editeng/memberids.hrc
index 1e9e623..d3768a8 100644
--- a/include/editeng/memberids.hrc
+++ b/include/editeng/memberids.hrc
@@ -172,7 +172,7 @@
#define MID_BACK_COLOR_TRANSPARENCY 10
#define MID_SHADING_VALUE 11
-//SvxFmtBreakItem
+//SvxFormatBreakItem
#define MID_BREAK_BEFORE 0
#define MID_BREAK_AFTER 1
diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index ae7b315..bcf8b29b0 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -71,7 +71,7 @@ public:
void SetShowSymbol(bool bSet) {bShowSymbol = bSet;}
bool IsShowSymbol()const{return bShowSymbol;}
- bool IsTxtFmt() const
+ bool IsTextFormat() const
{
return com::sun::star::style::NumberingType::NUMBER_NONE != nNumType &&
com::sun::star::style::NumberingType::CHAR_SPECIAL != nNumType &&
@@ -163,8 +163,8 @@ public:
void SetSuffix(const OUString& rSet) { sSuffix = rSet;}
const OUString& GetSuffix() const { return sSuffix;}
- void SetCharFmtName(const OUString& rSet){ sCharStyleName = rSet; }
- virtual OUString GetCharFmtName()const;
+ void SetCharFormatName(const OUString& rSet){ sCharStyleName = rSet; }
+ virtual OUString GetCharFormatName()const;
void SetBulletFont(const vcl::Font* pFont);
const vcl::Font* GetBulletFont() const {return pBulletFont;}
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 4b47cae..5a2dbe9 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -524,14 +524,14 @@ public:
const SvxFieldItem& GetField() const { return rFldItem; }
- Color* GetTxtColor() const { return pTxtColor; }
- void SetTxtColor( const Color& rColor )
+ Color* GetTextColor() const { return pTxtColor; }
+ void SetTextColor( const Color& rColor )
{ delete pTxtColor; pTxtColor = new Color( rColor ); }
- Color* GetFldColor() const { return pFldColor; }
- void SetFldColor( const Color& rColor )
+ Color* GetFieldColor() const { return pFldColor; }
+ void SetFieldColor( const Color& rColor )
{ delete pFldColor; pFldColor = new Color( rColor ); }
- void ClearFldColor()
+ void ClearFieldColor()
{ delete pFldColor; pFldColor = 0; }
sal_Int32 GetPara() const { return nPara; }
diff --git a/include/editeng/protitem.hxx b/include/editeng/protitem.hxx
index 66fa1a3..119a8dd 100644
--- a/include/editeng/protitem.hxx
+++ b/include/editeng/protitem.hxx
@@ -57,10 +57,10 @@ public:
virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const SAL_OVERRIDE;
virtual SvStream& Store(SvStream &, sal_uInt16 nItemVersion ) const SAL_OVERRIDE;
- bool IsCntntProtected() const { return bCntnt; }
+ bool IsContentProtected() const { return bCntnt; }
bool IsSizeProtected() const { return bSize; }
bool IsPosProtected() const { return bPos; }
- void SetCntntProtect( bool bNew ) { bCntnt = bNew; }
+ void SetContentProtect( bool bNew ) { bCntnt = bNew; }
void SetSizeProtect ( bool bNew ) { bSize = bNew; }
void SetPosProtect ( bool bNew ) { bPos = bNew; }
@@ -77,7 +77,7 @@ inline SvxProtectItem::SvxProtectItem( const sal_uInt16 nId )
inline SvxProtectItem &SvxProtectItem::operator=( const SvxProtectItem &rCpy )
{
- bCntnt = rCpy.IsCntntProtected();
+ bCntnt = rCpy.IsContentProtected();
bSize = rCpy.IsSizeProtected();
bPos = rCpy.IsPosProtected();
return *this;
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index f84ce3b..c5c8b76 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -24,22 +24,22 @@
class SvXMLUnitConverter;
-// class SvxFmtSplitItem -------------------------------------------------
+// class SvxFormatSplitItem -------------------------------------------------
/* [Description]
This item describes a logical variable "split paragraph yes or no".
*/
-class EDITENG_DLLPUBLIC SvxFmtSplitItem : public SfxBoolItem
+class EDITENG_DLLPUBLIC SvxFormatSplitItem : public SfxBoolItem
{
public:
TYPEINFO_OVERRIDE();
- virtual ~SvxFmtSplitItem();
+ virtual ~SvxFormatSplitItem();
- inline SvxFmtSplitItem( const bool bSplit /*= true*/,
+ inline SvxFormatSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );
- inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
+ inline SvxFormatSplitItem& operator=( const SvxFormatSplitItem& rSplit );
// "pure virtual Methods" from SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
@@ -52,12 +52,12 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const SAL_OVERRIDE;
};
-inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFormatSplitItem::SvxFormatSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
SfxBoolItem( nWh, bSplit )
{}
-inline SvxFmtSplitItem& SvxFmtSplitItem::operator=(
- const SvxFmtSplitItem& rSplit )
+inline SvxFormatSplitItem& SvxFormatSplitItem::operator=(
+ const SvxFormatSplitItem& rSplit )
{
SetValue( rSplit.GetValue() );
return *this;
diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index d4438d4..18fb82a 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -232,7 +232,7 @@ class EDITENG_DLLPUBLIC SvxAutoCorrect
OUString sShareAutoCorrFile, sUserAutoCorrFile;
- SvxSwAutoFmtFlags aSwFlags; // StarWriter AutoFormat Flags
+ SvxSwAutoFormatFlags aSwFlags; // StarWriter AutoFormat Flags
// all languages in a table
boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLists>* pLangTable;
@@ -328,7 +328,7 @@ public:
// Query/Set the current settings of AutoCorrect
long GetFlags() const { return nFlags; }
- inline SvxSwAutoFmtFlags& GetSwFlags() { return aSwFlags;}
+ inline SvxSwAutoFormatFlags& GetSwFlags() { return aSwFlags;}
bool IsAutoCorrFlag( long nFlag ) const
{ return (nFlags & nFlag) != 0; }
void SetAutoCorrFlag( long nFlag, bool bOn = true );
diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx
index 51a0c0d..c84df967 100644
--- a/include/editeng/svxfont.hxx
+++ b/include/editeng/svxfont.hxx
@@ -89,7 +89,7 @@ public:
Size GetPhysTxtSize( const OutputDevice *pOut, const OUString &rTxt );
- Size GetTxtSize( const OutputDevice *pOut, const OUString &rTxt,
+ Size GetTextSize( const OutputDevice *pOut, const OUString &rTxt,
const sal_Int32 nIdx = 0, const sal_Int32 nLen = SAL_MAX_INT32 ) const;
void QuickDrawText( OutputDevice *pOut, const Point &rPos, const OUString &rTxt,
diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 39290ec..42098f6 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -225,7 +225,7 @@ class EDITENG_DLLPUBLIC SvxRTFParser : public SvRTFParser
// Execute pard / plain
void RTFPardPlain( bool bPard, SfxItemSet** ppSet );
- void BuildWhichTbl();
+ void BuildWhichTable();
enum RTF_CharTypeDef
{
diff --git a/include/editeng/swafopt.hxx b/include/editeng/swafopt.hxx
index 7bfcb35..5cf829d 100644
--- a/include/editeng/swafopt.hxx
+++ b/include/editeng/swafopt.hxx
@@ -59,7 +59,7 @@ public:
} // namespace editeng
// Class of options for AutoFormat
-struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
+struct EDITENG_DLLPUBLIC SvxSwAutoFormatFlags
{
vcl::Font aBulletFont;
vcl::Font aByInputBulletFont;
@@ -83,7 +83,7 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bChgUserColl : 1;
bool bChgEnumNum : 1;
- bool bAFmtByInput : 1;
+ bool bAFormatByInput : 1;
bool bDelEmptyNode : 1;
bool bSetNumRule : 1;
@@ -109,10 +109,10 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bool bAutoCmpltAppendBlanc : 1;
bool bAutoCmpltShowAsTip : 1;
- bool bAFmtDelSpacesAtSttEnd : 1;
- bool bAFmtDelSpacesBetweenLines : 1;
- bool bAFmtByInpDelSpacesAtSttEnd : 1;
- bool bAFmtByInpDelSpacesBetweenLines : 1;
+ bool bAFormatDelSpacesAtSttEnd : 1;
+ bool bAFormatDelSpacesBetweenLines : 1;
+ bool bAFormatByInpDelSpacesAtSttEnd : 1;
+ bool bAFormatByInpDelSpacesBetweenLines : 1;
bool bAutoCmpltKeepList : 1;
@@ -122,9 +122,9 @@ struct EDITENG_DLLPUBLIC SvxSwAutoFmtFlags
bDummy8 : 1
;
- SvxSwAutoFmtFlags();
- SvxSwAutoFmtFlags( const SvxSwAutoFmtFlags& rAFFlags ) { *this = rAFFlags; }
- SvxSwAutoFmtFlags& operator=( const SvxSwAutoFmtFlags& );
+ SvxSwAutoFormatFlags();
+ SvxSwAutoFormatFlags( const SvxSwAutoFormatFlags& rAFFlags ) { *this = rAFFlags; }
+ SvxSwAutoFormatFlags& operator=( const SvxSwAutoFormatFlags& );
};
#endif
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx
index fc54ade..a3572ca 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -55,7 +55,7 @@ class Polygon;
namespace tools { class PolyPolygon; }
class FmFormModel;
class SdrModel;
-class SwFlyFrmFmt;
+class SwFlyFrameFormat;
struct SvxMSDffBLIPInfo;
struct SvxMSDffShapeInfo;
@@ -695,12 +695,12 @@ public:
void StoreShapeOrder(sal_uLong nId,
sal_uLong nTxBx,
SdrObject* pObject,
- SwFlyFrmFmt* pFly = 0,
+ SwFlyFrameFormat* pFly = 0,
short nHdFtSection = 0) const;
void ExchangeInShapeOrder(SdrObject* pOldObject,
sal_uLong nTxBx,
- SwFlyFrmFmt* pFly,
+ SwFlyFrameFormat* pFly,
SdrObject* pObject) const;
void RemoveFromShapeOrder( SdrObject* pObject ) const;
@@ -778,7 +778,7 @@ struct SvxMSDffShapeOrder
{
sal_uLong nShapeId; ///< shape id used in PLCF SPA and in mso_fbtSp (FSP)
sal_uLong nTxBxComp; ///< chain or box number in the Text-Box-Story (or NULL)
- SwFlyFrmFmt* pFly; ///< format of frame that was inserted as a replacement
+ SwFlyFrameFormat* pFly; ///< format of frame that was inserted as a replacement
///< for a Sdr-Text object in Writer - needed for
///< chaining!
short nHdFtSection; ///< used by Writer to find out if linked frames are in
diff --git a/include/svl/zforlist.hxx b/include/svl/zforlist.hxx
index bc553c0..0127662 100644
--- a/include/svl/zforlist.hxx
+++ b/include/svl/zforlist.hxx
@@ -593,9 +593,9 @@ public:
SvNumberFormatterIndexTable* MergeFormatter(SvNumberFormatter& rNewTable);
/// Whether a merge table is present or not
- bool HasMergeFmtTbl() const;
+ bool HasMergeFormatTable() const;
/// Return the new format index for an old format index, if a merge table exists
- sal_uInt32 GetMergeFmtIndex( sal_uInt32 nOldFmt ) const;
+ sal_uInt32 GetMergeFormatIndex( sal_uInt32 nOldFmt ) const;
/** Convert the ugly old tools' Table type bloated with new'ed sal_uInt32
entries merge table to ::std::map with old index key and new index key.
diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx
index b8705dc..eabdf18 100644
--- a/include/svtools/svparser.hxx
+++ b/include/svtools/svparser.hxx
@@ -169,7 +169,7 @@ public:
// build a Which-Map 'rWhichMap' from an array of WhichIds
// 'pWhichIds'. It has the length 'nWhichIds'.
// The WhichMap is not deleted.
- static void BuildWhichTbl( std::vector<sal_uInt16> &rWhichMap,
+ static void BuildWhichTable( std::vector<sal_uInt16> &rWhichMap,
sal_uInt16 *pWhichIds,
sal_uInt16 nWhichIds );
};
diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx
index 64ed0d9..6b00c35 100644
--- a/include/svx/clipboardctl.hxx
+++ b/include/svx/clipboardctl.hxx
@@ -28,7 +28,7 @@
#include <svx/svxdllapi.h>
class PopupMenu;
-class SvxClipboardFmtItem;
+class SvxClipboardFormatItem;
class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipBoardControl : public SfxToolBoxControl
{
diff --git a/include/svx/clipfmtitem.hxx b/include/svx/clipfmtitem.hxx
index e8a9453..052ed8f 100644
--- a/include/svx/clipfmtitem.hxx
+++ b/include/svx/clipfmtitem.hxx
@@ -24,11 +24,11 @@
#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
-struct SvxClipboardFmtItem_Impl;
+struct SvxClipboardFormatItem_Impl;
-class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFmtItem : public SfxPoolItem
+class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxClipboardFormatItem : public SfxPoolItem
{
- SvxClipboardFmtItem_Impl* pImpl;
+ SvxClipboardFormatItem_Impl* pImpl;
protected:
virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE;
@@ -36,9 +36,9 @@ protected:
public:
TYPEINFO_OVERRIDE();
- SvxClipboardFmtItem( sal_uInt16 nId = 0 );
- SvxClipboardFmtItem( const SvxClipboardFmtItem& );
- virtual ~SvxClipboardFmtItem();
+ SvxClipboardFormatItem( sal_uInt16 nId = 0 );
+ SvxClipboardFormatItem( const SvxClipboardFormatItem& );
+ virtual ~SvxClipboardFormatItem();
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const SAL_OVERRIDE;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) SAL_OVERRIDE;
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index a448aa1..06c4af7 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -87,7 +87,7 @@ public:
void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
void SetMacroTable( const SvxMacroTableDtor& rTbl );
- const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTable; }
+ const SvxMacroTableDtor* GetMacroTable() const { return pMacroTable; }
void SetMacroEvents (const sal_uInt16 nEvents) { nMacroEvents = nEvents; }
sal_uInt16 GetMacroEvents() const { return nMacroEvents; }
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 9aeee8d..68b8072 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -48,23 +48,23 @@ public:
SvxOptionsGrid();
~SvxOptionsGrid();
- void SetFldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
- void SetFldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
- void SetFldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
- void SetFldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
- void SetFldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
- void SetFldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
+ void SetFieldDrawX( sal_uInt32 nSet){nFldDrawX = nSet;}
+ void SetFieldDivisionX(sal_uInt32 nSet){nFldDivisionX = nSet;}
+ void SetFieldDrawY ( sal_uInt32 nSet){nFldDrawY = nSet;}
+ void SetFieldDivisionY(sal_uInt32 nSet){nFldDivisionY = nSet;}
+ void SetFieldSnapX( sal_uInt32 nSet){nFldSnapX = nSet;}
+ void SetFieldSnapY ( sal_uInt32 nSet){nFldSnapY = nSet;}
void SetUseGridSnap( bool bSet ) {bUseGridsnap = bSet;}
void SetSynchronize( bool bSet ) {bSynchronize = bSet;}
void SetGridVisible( bool bSet ) {bGridVisible = bSet;}
void SetEqualGrid( bool bSet ) {bEqualGrid = bSet;}
- sal_uInt32 GetFldDrawX( ) const { return nFldDrawX; }
- sal_uInt32 GetFldDivisionX() const { return nFldDivisionX;}
- sal_uInt32 GetFldDrawY ( ) const { return nFldDrawY; }
- sal_uInt32 GetFldDivisionY() const { return nFldDivisionY;}
- sal_uInt32 GetFldSnapX( ) const { return nFldSnapX; }
- sal_uInt32 GetFldSnapY ( ) const { return nFldSnapY; }
+ sal_uInt32 GetFieldDrawX( ) const { return nFldDrawX; }
+ sal_uInt32 GetFieldDivisionX() const { return nFldDivisionX;}
+ sal_uInt32 GetFieldDrawY ( ) const { return nFldDrawY; }
+ sal_uInt32 GetFieldDivisionY() const { return nFldDivisionY;}
+ sal_uInt32 GetFieldSnapX( ) const { return nFldSnapX; }
+ sal_uInt32 GetFieldSnapY ( ) const { return nFldSnapY; }
bool GetUseGridSnap( ) const { return bUseGridsnap; }
bool GetSynchronize( ) const { return bSynchronize; }
bool GetGridVisible( ) const { return bGridVisible; }
diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx
index 32f6223..f1c529a 100644
--- a/sc/source/core/tool/viewopti.cxx
+++ b/sc/source/core/tool/viewopti.cxx
@@ -178,12 +178,12 @@ SvxGridItem* ScViewOptions::CreateGridItem( sal_uInt16 nId /* = SID_ATTR_GRID_OP
{
SvxGridItem* pItem = new SvxGridItem( nId );
- pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() );
- pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() );
- pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() );
- pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() );
- pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() );
- pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() );
+ pItem->SetFieldDrawX ( aGridOpt.GetFieldDrawX() );
+ pItem->SetFieldDivisionX ( aGridOpt.GetFieldDivisionX() );
+ pItem->SetFieldDrawY ( aGridOpt.GetFieldDrawY() );
+ pItem->SetFieldDivisionY ( aGridOpt.GetFieldDivisionY() );
+ pItem->SetFieldSnapX ( aGridOpt.GetFieldSnapX() );
+ pItem->SetFieldSnapY ( aGridOpt.GetFieldSnapY() );
pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() );
pItem->SetSynchronize ( aGridOpt.GetSynchronize() );
pItem->SetGridVisible ( aGridOpt.GetGridVisible() );
@@ -483,22 +483,22 @@ ScViewCfg::ScViewCfg() :
switch(nProp)
{
case SCGRIDOPT_RESOLU_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawX( nIntVal );
break;
case SCGRIDOPT_RESOLU_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDrawY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDrawY( nIntVal );
break;
case SCGRIDOPT_SUBDIV_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionX( nIntVal );
break;
case SCGRIDOPT_SUBDIV_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldDivisionY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldDivisionY( nIntVal );
break;
case SCGRIDOPT_OPTION_X:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapX( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapX( nIntVal );
break;
case SCGRIDOPT_OPTION_Y:
- if (pValues[nProp] >>= nIntVal) aGrid.SetFldSnapY( nIntVal );
+ if (pValues[nProp] >>= nIntVal) aGrid.SetFieldSnapY( nIntVal );
break;
case SCGRIDOPT_SNAPTOGRID:
aGrid.SetUseGridSnap( ScUnoHelpFunctions::GetBoolFromAny( pValues[nProp] ) );
@@ -624,22 +624,22 @@ IMPL_LINK_NOARG(ScViewCfg, GridCommitHdl)
switch(nProp)
{
case SCGRIDOPT_RESOLU_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawX();
break;
case SCGRIDOPT_RESOLU_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDrawY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDrawY();
break;
case SCGRIDOPT_SUBDIV_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionX();
break;
case SCGRIDOPT_SUBDIV_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldDivisionY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldDivisionY();
break;
case SCGRIDOPT_OPTION_X:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapX();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapX();
break;
case SCGRIDOPT_OPTION_Y:
- pValues[nProp] <<= (sal_Int32) rGrid.GetFldSnapY();
+ pValues[nProp] <<= (sal_Int32) rGrid.GetFieldSnapY();
break;
case SCGRIDOPT_SNAPTOGRID:
ScUnoHelpFunctions::SetBoolInAny( pValues[nProp], rGrid.GetUseGridSnap() );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index f2b7b1b..c135b53 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2172,7 +2172,7 @@ IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
svtools::ColorConfigEntry eEntry =
INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
- pInfo->SetTxtColor( GetColorConfig().GetColorValue(eEntry).nColor );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list