sc/inc/ChartTools.hxx | 3
sc/inc/addincol.hxx | 31
sc/inc/attarray.hxx | 4
sc/inc/cellsuno.hxx | 4
sc/inc/chartuno.hxx | 2
sc/inc/column.hxx | 4
sc/inc/datauno.hxx | 4
sc/inc/dbdocutl.hxx | 5
sc/inc/document.hxx | 2
sc/inc/docuno.hxx | 4
sc/inc/dpcache.hxx | 35
sc/inc/dpdimsave.hxx | 4
sc/inc/dpgroup.hxx | 60 -
sc/inc/dpobject.hxx | 16
sc/inc/dpoutput.hxx | 22
sc/inc/dpresfilter.hxx | 5
sc/inc/dpsave.hxx | 15
sc/inc/dpsdbtab.hxx | 8
sc/inc/dpshttab.hxx | 10
sc/inc/dptabdat.hxx | 51
sc/inc/dptabres.hxx | 138 +-
sc/inc/dptabsrc.hxx | 116 +-
sc/inc/drwlayer.hxx | 2
sc/inc/editutil.hxx | 4
sc/inc/global.hxx | 11
sc/inc/markarr.hxx | 3
sc/inc/markdata.hxx | 4
sc/inc/markmulti.hxx | 4
sc/inc/patattr.hxx | 2
sc/inc/pivot.hxx | 9
sc/inc/scabstdlg.hxx | 8
sc/inc/scextopt.hxx | 4
sc/inc/table.hxx | 2
sc/qa/extras/scannotationsobj.cxx | 4
sc/qa/unit/bugfix-test.cxx | 4
sc/qa/unit/filters-test.cxx | 2
sc/qa/unit/helper/qahelper.cxx | 2
sc/qa/unit/helper/qahelper.hxx | 2
sc/qa/unit/pivottable_filters_test.cxx | 6
sc/qa/unit/subsequent_export-test.cxx | 4
sc/qa/unit/subsequent_filters-test.cxx | 8
sc/qa/unit/ucalc.cxx | 4
sc/qa/unit/ucalc_pivottable.cxx | 6
sc/source/core/data/attarray.cxx | 26
sc/source/core/data/column2.cxx | 64 -
sc/source/core/data/column3.cxx | 10
sc/source/core/data/compressedarray.cxx | 16
sc/source/core/data/dbdocutl.cxx | 4
sc/source/core/data/docpool.cxx | 6
sc/source/core/data/documen3.cxx | 38
sc/source/core/data/documen4.cxx | 2
sc/source/core/data/documen9.cxx | 8
sc/source/core/data/document.cxx | 2
sc/source/core/data/dpcache.cxx | 62 -
sc/source/core/data/dpdimsave.cxx | 22
sc/source/core/data/dpgroup.cxx | 64 -
sc/source/core/data/dpobject.cxx | 72 -
sc/source/core/data/dpoutput.cxx | 116 +-
sc/source/core/data/dpsave.cxx | 38
sc/source/core/data/dpsdbtab.cxx | 8
sc/source/core/data/dpshttab.cxx | 14
sc/source/core/data/dptabdat.cxx | 42
sc/source/core/data/dptabres.cxx | 514
++++-----
sc/source/core/data/dptabsrc.cxx | 260
++---
sc/source/core/data/dputil.cxx | 2
sc/source/core/data/drwlayer.cxx | 70 -
sc/source/core/data/fillinfo.cxx | 16
sc/source/core/data/funcdesc.cxx | 4
sc/source/core/data/global.cxx | 4
sc/source/core/data/markarr.cxx | 2
sc/source/core/data/markdata.cxx | 4
sc/source/core/data/markmulti.cxx | 6
sc/source/core/data/patattr.cxx | 20
sc/source/core/data/pivot2.cxx | 4
sc/source/core/data/postit.cxx | 40
sc/source/core/data/stlsheet.cxx | 2
sc/source/core/data/table1.cxx | 10
sc/source/core/data/table2.cxx | 14
sc/source/core/data/table3.cxx | 4
sc/source/core/data/table4.cxx | 58 -
sc/source/core/data/table5.cxx | 18
sc/source/core/tool/addincol.cxx | 126 +-
sc/source/core/tool/address.cxx | 12
sc/source/core/tool/appoptio.cxx | 6
sc/source/core/tool/autoform.cxx | 2
sc/source/core/tool/compiler.cxx | 52 -
sc/source/core/tool/dbdata.cxx | 8
sc/source/core/tool/detfunc.cxx | 10
sc/source/core/tool/editutil.cxx | 32
sc/source/core/tool/interpr1.cxx | 42
sc/source/core/tool/interpr2.cxx | 10
sc/source/core/tool/interpr3.cxx | 10
sc/source/core/tool/parclass.cxx | 2
sc/source/core/tool/rangeseq.cxx | 36
sc/source/core/tool/unitconv.cxx | 6
sc/source/filter/excel/impop.cxx | 2
sc/source/filter/excel/xeescher.cxx | 6
sc/source/filter/excel/xepivot.cxx | 6
sc/source/filter/excel/xepivotxml.cxx | 38
sc/source/filter/excel/xestyle.cxx | 2
sc/source/filter/excel/xetable.cxx | 2
sc/source/filter/excel/xeview.cxx | 2
sc/source/filter/excel/xichart.cxx | 12
sc/source/filter/excel/xiescher.cxx | 12
sc/source/filter/excel/xipage.cxx | 4
sc/source/filter/excel/xiview.cxx | 8
sc/source/filter/excel/xlescher.cxx | 26
sc/source/filter/excel/xlpage.cxx | 30
sc/source/filter/excel/xltools.cxx | 6
sc/source/filter/html/htmlimp.cxx | 8
sc/source/filter/html/htmlpars.cxx | 16
sc/source/filter/inc/formel.hxx | 4
sc/source/filter/inc/xlroot.hxx | 5
sc/source/filter/inc/xltools.hxx | 6
sc/source/filter/orcus/interface.cxx | 2
sc/source/filter/rtf/eeimpars.cxx | 12
sc/source/filter/rtf/rtfparse.cxx | 2
sc/source/filter/xcl97/xcl97rec.cxx | 2
sc/source/ui/Accessibility/AccessibleCell.cxx | 2
sc/source/ui/Accessibility/AccessibleDocument.cxx | 4
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 22
sc/source/ui/Accessibility/AccessiblePreviewTable.cxx | 10
sc/source/ui/Accessibility/AccessibleText.cxx | 30
sc/source/ui/app/client.cxx | 10
sc/source/ui/app/inputhdl.cxx | 34
sc/source/ui/app/inputwin.cxx | 46
sc/source/ui/app/transobj.cxx | 20
sc/source/ui/attrdlg/scdlgfact.cxx | 8
sc/source/ui/attrdlg/scdlgfact.hxx | 8
sc/source/ui/cctrl/checklistmenu.cxx | 4
sc/source/ui/cctrl/dpcontrol.cxx | 8
sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 76 -
sc/source/ui/dbgui/pvfundlg.cxx | 10
sc/source/ui/dbgui/tpsort.cxx | 2
sc/source/ui/docshell/dbdocimp.cxx | 8
sc/source/ui/docshell/docfunc.cxx | 4
sc/source/ui/docshell/docsh2.cxx | 4
sc/source/ui/docshell/docsh3.cxx | 6
sc/source/ui/docshell/docsh4.cxx | 54 -
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/docsh6.cxx | 6
sc/source/ui/docshell/docsh8.cxx | 14
sc/source/ui/docshell/impex.cxx | 2
sc/source/ui/docshell/pagedata.cxx | 4
sc/source/ui/drawfunc/fuconrec.cxx | 8
sc/source/ui/drawfunc/fudraw.cxx | 4
sc/source/ui/drawfunc/fuins1.cxx | 4
sc/source/ui/drawfunc/fusel2.cxx | 6
sc/source/ui/inc/asciiopt.hxx | 6
sc/source/ui/inc/autofmt.hxx | 8
sc/source/ui/inc/colrowba.hxx | 8
sc/source/ui/inc/dbfunc.hxx | 4
sc/source/ui/inc/gridmerg.hxx | 22
sc/source/ui/inc/gridwin.hxx | 8
sc/source/ui/inc/hdrcont.hxx | 24
sc/source/ui/inc/inputhdl.hxx | 4
sc/source/ui/inc/inputwin.hxx | 30
sc/source/ui/inc/mtrindlg.hxx | 8
sc/source/ui/inc/olinewin.hxx | 46
sc/source/ui/inc/optsolver.hxx | 2
sc/source/ui/inc/output.hxx | 76 -
sc/source/ui/inc/pagedata.hxx | 7
sc/source/ui/inc/pfuncache.hxx | 16
sc/source/ui/inc/preview.hxx | 34
sc/source/ui/inc/prevloc.hxx | 10
sc/source/ui/inc/prevwsh.hxx | 2
sc/source/ui/inc/printfun.hxx | 66 -
sc/source/ui/inc/tabview.hxx | 32
sc/source/ui/inc/tabvwsh.hxx | 4
sc/source/ui/inc/tbzoomsliderctrl.hxx | 4
sc/source/ui/inc/viewdata.hxx | 98 -
sc/source/ui/inc/viewfunc.hxx | 4
sc/source/ui/miscdlgs/crnrdlg.cxx | 4
sc/source/ui/miscdlgs/mtrindlg.cxx | 8
sc/source/ui/miscdlgs/optsolver.cxx | 22
sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 2
sc/source/ui/sidebar/CellLineStyleValueSet.cxx | 10
sc/source/ui/undo/undoblk.cxx | 8
sc/source/ui/unoobj/ChartTools.cxx | 4
sc/source/ui/unoobj/PivotTableDataProvider.cxx | 2
sc/source/ui/unoobj/cellsuno.cxx | 36
sc/source/ui/unoobj/chartuno.cxx | 8
sc/source/ui/unoobj/cursuno.cxx | 4
sc/source/ui/unoobj/dapiuno.cxx | 6
sc/source/ui/unoobj/docuno.cxx | 40
sc/source/ui/unoobj/fmtuno.cxx | 12
sc/source/ui/unoobj/funcuno.cxx | 40
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 14
sc/source/ui/vba/vbahyperlink.hxx | 3
sc/source/ui/vba/vbarange.cxx | 10
sc/source/ui/vba/vbaworksheets.cxx | 2
sc/source/ui/view/cellsh3.cxx | 8
sc/source/ui/view/colrowba.cxx | 14
sc/source/ui/view/dbfunc3.cxx | 36
sc/source/ui/view/drawutil.cxx | 12
sc/source/ui/view/drawvie4.cxx | 6
sc/source/ui/view/gridmerg.cxx | 14
sc/source/ui/view/gridwin.cxx | 102 -
sc/source/ui/view/gridwin2.cxx | 26
sc/source/ui/view/gridwin4.cxx | 110 +-
sc/source/ui/view/gridwin_dbgutil.cxx | 4
sc/source/ui/view/hdrcont.cxx | 62 -
sc/source/ui/view/olinewin.cxx | 84 -
sc/source/ui/view/output.cxx | 272
++---
sc/source/ui/view/output2.cxx | 520
+++++-----
sc/source/ui/view/output3.cxx | 18
sc/source/ui/view/pfuncache.cxx | 22
sc/source/ui/view/preview.cxx | 160 +--
sc/source/ui/view/prevloc.cxx | 46
sc/source/ui/view/prevwsh.cxx | 98 -
sc/source/ui/view/printfun.cxx | 388
+++----
sc/source/ui/view/reffact.cxx | 8
sc/source/ui/view/select.cxx | 8
sc/source/ui/view/tabsplit.cxx | 8
sc/source/ui/view/tabview.cxx | 228 ++--
sc/source/ui/view/tabview2.cxx | 22
sc/source/ui/view/tabview3.cxx | 70 -
sc/source/ui/view/tabview4.cxx | 28
sc/source/ui/view/tabview5.cxx | 12
sc/source/ui/view/tabvwsh3.cxx | 2
sc/source/ui/view/tabvwsha.cxx | 4
sc/source/ui/view/tabvwshb.cxx | 4
sc/source/ui/view/tabvwshh.cxx | 4
sc/source/ui/view/viewdata.cxx | 324
+++---
sc/source/ui/view/viewfun5.cxx | 4
sc/source/ui/view/viewfun7.cxx | 8
sc/source/ui/view/viewfunc.cxx | 8
sw/inc/AnnotationWin.hxx | 18
sw/inc/EnhancedPDFExportHelper.hxx | 2
sw/inc/PostItMgr.hxx | 10
sw/inc/ToxTabStopTokenHandler.hxx | 2
sw/inc/accmap.hxx | 2
sw/inc/anchoredobject.hxx | 2
sw/inc/calc.hxx | 3
sw/inc/crsrsh.hxx | 8
sw/inc/dbfld.hxx | 12
sw/inc/dbmgr.hxx | 3
sw/inc/dcontact.hxx | 8
sw/inc/doc.hxx | 8
sw/inc/editsh.hxx | 6
sw/inc/fesh.hxx | 4
sw/inc/flddat.hxx | 6
sw/inc/fmtfsize.hxx | 2
sw/inc/htmltbl.hxx | 6
sw/inc/mdiexp.hxx | 5
sw/inc/ndgrf.hxx | 4
sw/inc/ndindex.hxx | 12
sw/inc/ndtxt.hxx | 6
sw/inc/node.hxx | 6
sw/inc/pam.hxx | 4
sw/inc/postithelper.hxx | 2
sw/inc/redline.hxx | 2
sw/inc/shellio.hxx | 2
sw/inc/swatrset.hxx | 2
sw/inc/swcrsr.hxx | 6
sw/inc/swrect.hxx | 138 +-
sw/inc/swtable.hxx | 12
sw/inc/tabcol.hxx | 39
sw/inc/toxwrap.hxx | 3
sw/inc/unotxdoc.hxx | 4
sw/inc/view.hxx | 24
sw/inc/viewsh.hxx | 12
sw/inc/viscrs.hxx | 4
sw/qa/extras/layout/layout.cxx | 27
sw/qa/extras/ooxmlexport/ooxmlexport10.cxx | 4
sw/qa/extras/uiwriter/uiwriter2.cxx | 6
sw/qa/extras/unowriter/unowriter.cxx | 2
sw/qa/extras/ww8export/ww8export2.cxx | 6
sw/qa/extras/ww8import/ww8import.cxx | 10
sw/source/core/access/acccontext.cxx | 4
sw/source/core/access/accmap.cxx | 8
sw/source/core/access/acctable.cxx | 12
sw/source/core/attr/swatrset.cxx | 2
sw/source/core/bastyp/bparr.cxx | 4
sw/source/core/bastyp/swrect.cxx | 88 -
sw/source/core/bastyp/swregion.cxx | 8
sw/source/core/bastyp/tabcol.cxx | 4
sw/source/core/crsr/DropDownFormFieldButton.cxx | 5
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/callnk.hxx | 4
sw/source/core/crsr/crsrsh.cxx | 4
sw/source/core/crsr/pam.cxx | 4
sw/source/core/crsr/swcrsr.cxx | 2
sw/source/core/crsr/viscrs.cxx | 10
sw/source/core/doc/CntntIdxStore.cxx | 10
sw/source/core/doc/DocumentContentOperationsManager.cxx | 2
sw/source/core/doc/DocumentListsManager.cxx | 2
sw/source/core/doc/DocumentRedlineManager.cxx | 4
sw/source/core/doc/DocumentStatisticsManager.cxx | 4
sw/source/core/doc/DocumentStylePoolManager.cxx | 22
sw/source/core/doc/doc.cxx | 4
sw/source/core/doc/doccomp.cxx | 32
sw/source/core/doc/docedt.cxx | 4
sw/source/core/doc/docfmt.cxx | 2
sw/source/core/doc/docnum.cxx | 8
sw/source/core/doc/docredln.cxx | 2
sw/source/core/doc/doctxm.cxx | 12
sw/source/core/doc/fmtcol.cxx | 4
sw/source/core/doc/htmltbl.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 20
sw/source/core/doc/number.cxx | 10
sw/source/core/doc/tblafmt.cxx | 2
sw/source/core/doc/tblcpy.cxx | 2
sw/source/core/doc/tblrwcl.cxx | 26
sw/source/core/docnode/ndtbl.cxx | 54 -
sw/source/core/docnode/ndtbl1.cxx | 44
sw/source/core/docnode/node.cxx | 2
sw/source/core/docnode/nodes.cxx | 8
sw/source/core/draw/dcontact.cxx | 8
sw/source/core/draw/dflyobj.cxx | 20
sw/source/core/edit/autofmt.cxx | 2
sw/source/core/edit/edattr.cxx | 2
sw/source/core/edit/editsh.cxx | 8
sw/source/core/edit/ednumber.cxx | 4
sw/source/core/fields/cellfml.cxx | 4
sw/source/core/fields/docufld.cxx | 4
sw/source/core/fields/flddat.cxx | 2
sw/source/core/fields/postithelper.cxx | 4
sw/source/core/frmedt/fefly1.cxx | 12
sw/source/core/frmedt/feshview.cxx | 20
sw/source/core/frmedt/fetab.cxx | 24
sw/source/core/frmedt/fews.cxx | 4
sw/source/core/frmedt/tblsel.cxx | 72 -
sw/source/core/inc/DocumentStatisticsManager.hxx | 3
sw/source/core/inc/UndoNumbering.hxx | 4
sw/source/core/inc/UndoRedline.hxx | 3
sw/source/core/inc/UndoTable.hxx | 5
sw/source/core/inc/cellfrm.hxx | 2
sw/source/core/inc/cntfrm.hxx | 2
sw/source/core/inc/dflyobj.hxx | 4
sw/source/core/inc/drawfont.hxx | 22
sw/source/core/inc/flyfrms.hxx | 2
sw/source/core/inc/fntcache.hxx | 2
sw/source/core/inc/frame.hxx | 124 +-
sw/source/core/inc/frmtool.hxx | 6
sw/source/core/inc/layact.hxx | 2
sw/source/core/inc/layfrm.hxx | 2
sw/source/core/inc/pagefrm.hxx | 2
sw/source/core/inc/rootfrm.hxx | 8
sw/source/core/inc/scriptinfo.hxx | 19
sw/source/core/inc/swcache.hxx | 27
sw/source/core/inc/swfont.hxx | 8
sw/source/core/inc/tabfrm.hxx | 4
sw/source/core/inc/tblrwcl.hxx | 4
sw/source/core/inc/txtfly.hxx | 18
sw/source/core/inc/txtfrm.hxx | 14
sw/source/core/layout/anchoreddrawobject.cxx | 10
sw/source/core/layout/anchoredobject.cxx | 4
sw/source/core/layout/atrfrm.cxx | 6
sw/source/core/layout/calcmove.cxx | 50
sw/source/core/layout/colfrm.cxx | 6
sw/source/core/layout/dbg_lay.cxx | 6
sw/source/core/layout/findfrm.cxx | 4
sw/source/core/layout/flowfrm.cxx | 8
sw/source/core/layout/fly.cxx | 18
sw/source/core/layout/flylay.cxx | 36
sw/source/core/layout/frmtool.cxx | 20
sw/source/core/layout/ftnfrm.cxx | 8
sw/source/core/layout/hffrm.cxx | 2
sw/source/core/layout/layact.cxx | 26
sw/source/core/layout/layhelp.hxx | 2
sw/source/core/layout/newfrm.cxx | 8
sw/source/core/layout/pagechg.cxx | 56 -
sw/source/core/layout/paintfrm.cxx | 106 +-
sw/source/core/layout/sectfrm.cxx | 34
sw/source/core/layout/ssfrm.cxx | 50
sw/source/core/layout/tabfrm.cxx | 120 +-
sw/source/core/layout/trvlfrm.cxx | 32
sw/source/core/layout/wsfrm.cxx | 62 -
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 4
sw/source/core/table/swnewtable.cxx | 158 +--
sw/source/core/table/swtable.cxx | 90 -
sw/source/core/text/EnhancedPDFExportHelper.cxx | 14
sw/source/core/text/frmcrsr.cxx | 10
sw/source/core/text/frmform.cxx | 14
sw/source/core/text/frminf.cxx | 2
sw/source/core/text/frmpaint.cxx | 16
sw/source/core/text/inftxt.cxx | 8
sw/source/core/text/inftxt.hxx | 12
sw/source/core/text/itradj.cxx | 28
sw/source/core/text/itratr.cxx | 50
sw/source/core/text/itrcrsr.cxx | 24
sw/source/core/text/itrform2.cxx | 50
sw/source/core/text/itrform2.hxx | 2
sw/source/core/text/itrpaint.cxx | 4
sw/source/core/text/itrpaint.hxx | 2
sw/source/core/text/itrtxt.hxx | 6
sw/source/core/text/porfld.cxx | 12
sw/source/core/text/porfld.hxx | 8
sw/source/core/text/porfly.cxx | 8
sw/source/core/text/porfly.hxx | 6
sw/source/core/text/porglue.cxx | 2
sw/source/core/text/porglue.hxx | 6
sw/source/core/text/porlay.cxx | 36
sw/source/core/text/porlay.hxx | 12
sw/source/core/text/porlin.cxx | 2
sw/source/core/text/porlin.hxx | 2
sw/source/core/text/pormulti.cxx | 20
sw/source/core/text/pormulti.hxx | 16
sw/source/core/text/porrst.cxx | 4
sw/source/core/text/portxt.cxx | 2
sw/source/core/text/portxt.hxx | 2
sw/source/core/text/txtdrop.cxx | 28
sw/source/core/text/txtfld.cxx | 4
sw/source/core/text/txtfly.cxx | 28
sw/source/core/text/txtfrm.cxx | 48
sw/source/core/text/txtftn.cxx | 6
sw/source/core/text/txttab.cxx | 2
sw/source/core/tox/ToxTabStopTokenHandler.cxx | 8
sw/source/core/tox/toxhlp.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 136 +-
sw/source/core/txtnode/fntcap.cxx | 24
sw/source/core/txtnode/ndtxt.cxx | 10
sw/source/core/txtnode/swfont.cxx | 24
sw/source/core/undo/unnum.cxx | 2
sw/source/core/undo/unovwr.cxx | 6
sw/source/core/undo/untbl.cxx | 4
sw/source/core/unocore/unofield.cxx | 2
sw/source/core/unocore/unostyle.cxx | 2
sw/source/core/unocore/unotbl.cxx | 2
sw/source/core/unocore/unotext.cxx | 2
sw/source/core/view/pagepreviewlayout.cxx | 2
sw/source/core/view/viewpg.cxx | 2
sw/source/core/view/viewsh.cxx | 24
sw/source/core/view/vnew.cxx | 4
sw/source/core/view/vprint.cxx | 6
sw/source/filter/ascii/parasc.cxx | 8
sw/source/filter/ascii/wrtasc.cxx | 2
sw/source/filter/basflt/fltshell.cxx | 8
sw/source/filter/html/css1atr.cxx | 46
sw/source/filter/html/htmlatr.cxx | 2
sw/source/filter/html/htmldrawreader.cxx | 4
sw/source/filter/html/htmlform.cxx | 2
sw/source/filter/html/htmlgrin.cxx | 10
sw/source/filter/html/htmlnumreader.cxx | 2
sw/source/filter/html/htmlplug.cxx | 32
sw/source/filter/html/htmlsect.cxx | 2
sw/source/filter/html/htmltab.cxx | 12
sw/source/filter/html/htmltabw.cxx | 14
sw/source/filter/html/svxcss1.cxx | 80 -
sw/source/filter/html/svxcss1.hxx | 8
sw/source/filter/html/swhtml.cxx | 18
sw/source/filter/html/wrthtml.hxx | 4
sw/source/filter/inc/fltshell.hxx | 16
sw/source/filter/inc/wrtswtbl.hxx | 28
sw/source/filter/writer/writer.cxx | 2
sw/source/filter/writer/wrtswtbl.cxx | 54 -
sw/source/filter/ww8/WW8TableInfo.cxx | 12
sw/source/filter/ww8/WW8TableInfo.hxx | 18
sw/source/filter/ww8/attributeoutputbase.hxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 12
sw/source/filter/ww8/docxsdrexport.cxx | 6
sw/source/filter/ww8/escher.hxx | 2
sw/source/filter/ww8/rtfattributeoutput.cxx | 8
sw/source/filter/ww8/rtfexport.cxx | 2
sw/source/filter/ww8/rtfexport.hxx | 2
sw/source/filter/ww8/rtfsdrexport.cxx | 4
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8esh.cxx | 8
sw/source/filter/ww8/wrtww8.cxx | 20
sw/source/filter/ww8/wrtww8gr.cxx | 4
sw/source/filter/ww8/ww8atr.cxx | 30
sw/source/filter/ww8/ww8graf.cxx | 50
sw/source/filter/ww8/ww8graf2.cxx | 12
sw/source/filter/ww8/ww8par.cxx | 62 -
sw/source/filter/ww8/ww8par.hxx | 54 -
sw/source/filter/ww8/ww8par2.cxx | 8
sw/source/filter/ww8/ww8par2.hxx | 6
sw/source/filter/ww8/ww8par3.cxx | 4
sw/source/filter/ww8/ww8par4.cxx | 6
sw/source/filter/ww8/ww8par5.cxx | 28
sw/source/filter/ww8/ww8par6.cxx | 22
sw/source/filter/ww8/ww8scan.cxx | 94 -
sw/source/filter/ww8/ww8scan.hxx | 96 -
sw/source/filter/ww8/ww8toolbar.cxx | 6
sw/source/filter/xml/xmlexpit.cxx | 2
sw/source/filter/xml/xmlimp.cxx | 8
sw/source/filter/xml/xmltble.cxx | 2
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/chrdlg/drpcps.cxx | 20
sw/source/ui/config/optload.cxx | 2
sw/source/ui/config/optpage.cxx | 22
sw/source/ui/dbui/dbinsdlg.cxx | 8
sw/source/ui/dbui/mmlayoutpage.cxx | 14
sw/source/ui/dialog/uiregionsw.cxx | 6
sw/source/ui/envelp/envfmt.cxx | 32
sw/source/ui/envelp/envlop1.cxx | 36
sw/source/ui/envelp/label1.cxx | 2
sw/source/ui/envelp/labfmt.cxx | 112 +-
sw/source/ui/envelp/labfmt.hxx | 18
sw/source/ui/fldui/flddok.cxx | 2
sw/source/ui/frmdlg/column.cxx | 66 -
sw/source/ui/frmdlg/frmpage.cxx | 16
sw/source/ui/index/cntex.cxx | 4
sw/source/ui/index/cnttab.cxx | 42
sw/source/ui/misc/num.cxx | 32
sw/source/ui/misc/outline.cxx | 46
sw/source/ui/misc/pgfnote.cxx | 6
sw/source/ui/misc/pggrid.cxx | 4
sw/source/ui/table/autoformatpreview.cxx | 2
sw/source/ui/table/tabledlg.cxx | 6
sw/source/ui/vba/vbafield.cxx | 11
sw/source/ui/vba/vbatablehelper.cxx | 2
sw/source/uibase/app/appenv.cxx | 10
sw/source/uibase/app/applab.cxx | 2
sw/source/uibase/app/docsh.cxx | 2
sw/source/uibase/app/docsh2.cxx | 2
sw/source/uibase/app/mainwn.cxx | 6
sw/source/uibase/dbui/dbmgr.cxx | 8
sw/source/uibase/dialog/regionsw.cxx | 6
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 3
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 4
sw/source/uibase/docvw/AnnotationMenuButton.cxx | 6
sw/source/uibase/docvw/AnnotationWin2.cxx | 40
sw/source/uibase/docvw/HeaderFooterWin.cxx | 4
sw/source/uibase/docvw/PageBreakWin.cxx | 12
sw/source/uibase/docvw/PostItMgr.cxx | 82 -
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2
sw/source/uibase/docvw/edtwin.cxx | 26
sw/source/uibase/docvw/edtwin2.cxx | 4
sw/source/uibase/docvw/srcedtw.cxx | 12
sw/source/uibase/frmdlg/colex.cxx | 22
sw/source/uibase/frmdlg/frmmgr.cxx | 10
sw/source/uibase/inc/HeaderFooterWin.hxx | 2
sw/source/uibase/inc/autoformatpreview.hxx | 8
sw/source/uibase/inc/column.hxx | 12
sw/source/uibase/inc/content.hxx | 12
sw/source/uibase/inc/drpcps.hxx | 6
sw/source/uibase/inc/edtwin.hxx | 8
sw/source/uibase/inc/frmmgr.hxx | 12
sw/source/uibase/inc/frmpage.hxx | 2
sw/source/uibase/inc/labrec.hxx | 16
sw/source/uibase/inc/mmconfigitem.hxx | 3
sw/source/uibase/inc/navicont.hxx | 2
sw/source/uibase/inc/numprevw.hxx | 4
sw/source/uibase/inc/pgfnote.hxx | 2
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/inc/shdwcrsr.hxx | 8
sw/source/uibase/inc/srcedtw.hxx | 2
sw/source/uibase/inc/swcont.hxx | 4
sw/source/uibase/inc/swuicnttab.hxx | 2
sw/source/uibase/inc/wrtsh.hxx | 14
sw/source/uibase/lingu/hhcwrp.cxx | 2
sw/source/uibase/misc/swruler.cxx | 18
sw/source/uibase/ribbar/inputwin.cxx | 8
sw/source/uibase/shells/annotsh.cxx | 4
sw/source/uibase/shells/drwbassh.cxx | 4
sw/source/uibase/shells/tabsh.cxx | 22
sw/source/uibase/shells/textidx.cxx | 2
sw/source/uibase/shells/textsh1.cxx | 6
sw/source/uibase/sidebar/PageFormatPanel.cxx | 4
sw/source/uibase/sidebar/PageFormatPanel.hxx | 12
sw/source/uibase/sidebar/PageMarginControl.cxx | 22
sw/source/uibase/sidebar/PageMarginControl.hxx | 26
sw/source/uibase/sidebar/PageMarginUtils.hxx | 64 -
sw/source/uibase/sidebar/PageOrientationControl.cxx | 28
sw/source/uibase/sidebar/PageOrientationControl.hxx | 4
sw/source/uibase/sidebar/StylePresetsPanel.cxx | 2
sw/source/uibase/sidebar/TableEditPanel.cxx | 4
sw/source/uibase/sidebar/ThemePanel.cxx | 14
sw/source/uibase/table/swtablerep.cxx | 2
sw/source/uibase/uitest/uiobject.cxx | 4
sw/source/uibase/uiview/pview.cxx | 16
sw/source/uibase/uiview/scroll.cxx | 6
sw/source/uibase/uiview/srcview.cxx | 18
sw/source/uibase/uiview/swcli.cxx | 8
sw/source/uibase/uiview/view.cxx | 16
sw/source/uibase/uiview/view2.cxx | 22
sw/source/uibase/uiview/viewmdi.cxx | 14
sw/source/uibase/uiview/viewport.cxx | 94 -
sw/source/uibase/uiview/viewstat.cxx | 10
sw/source/uibase/uiview/viewtab.cxx | 148 +-
sw/source/uibase/uno/unotxdoc.cxx | 4
sw/source/uibase/uno/unotxvw.cxx | 4
sw/source/uibase/utlui/attrdesc.cxx | 2
sw/source/uibase/utlui/content.cxx | 4
sw/source/uibase/utlui/numfmtlb.cxx | 2
sw/source/uibase/utlui/shdwcrsr.cxx | 16
sw/source/uibase/utlui/uiitems.cxx | 2
sw/source/uibase/utlui/viewlayoutctrl.cxx | 30
sw/source/uibase/wrtsh/move.cxx | 2
sw/source/uibase/wrtsh/select.cxx | 10
sw/source/uibase/wrtsh/wrtsh1.cxx | 8
585 files changed, 6204 insertions(+), 6174 deletions(-)
New commits:
commit 1e822e401ea8fe950c7fb62172ac61d8396c98e9
Author: Noel <noelgran...@gmail.com>
AuthorDate: Mon Oct 19 15:18:15 2020 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Oct 20 08:04:53 2020 +0200
use tools::Long in sw
Change-Id: I44be72b3a9b14823ec37a3c799cffb4fb4d6e1de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104527
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index e55cda17c41c..d384d200d867 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -83,14 +83,14 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
bool IsProtected() const;
void SetSize( const Size& rNewSize );
- void SetPosSizePixelRect( long nX,
- long nY,
- long nWidth,
- long nHeight,
+ void SetPosSizePixelRect( tools::Long nX,
+ tools::Long nY,
+ tools::Long nWidth,
+ tools::Long nHeight,
const SwRect& aAnchorRect,
- const long PageBorder);
+ const tools::Long PageBorder);
void SetPosAndSize();
- void TranslateTopPosition(const long aAmount);
+ void TranslateTopPosition(const tools::Long aAmount);
void CheckMetaText();
Point const & GetAnchorPos() { return mAnchorRect.Pos(); }
@@ -110,7 +110,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
::sw::sidebarwindows::ShadowOverlayObject* Shadow() { return
mpShadow.get();}
::sw::overlay::OverlayRanges* TextRange() { return
mpTextRangeOverlay.get();}
- long GetPostItTextHeight();
+ tools::Long GetPostItTextHeight();
void SwitchToPostIt(sal_uInt16 aDirection);
void SwitchToFieldPos();
@@ -118,7 +118,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
void ExecuteCommand(sal_uInt16 nSlot);
void InitControls();
void DoResize();
- void ResizeIfNecessary(long aOldHeight, long aNewHeight);
+ void ResizeIfNecessary(tools::Long aOldHeight, tools::Long
aNewHeight);
void SetScrollbar();
void SetVirtualPosSize( const Point& aPoint, const Size&
aSize);
@@ -254,7 +254,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public
vcl::Window
tools::Rectangle mPosSize;
SwRect mAnchorRect;
- long mPageBorder;
+ tools::Long mPageBorder;
bool mbAnchorRectChanged;
bool mbResolvedStateUpdated;
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx
b/sw/inc/EnhancedPDFExportHelper.hxx
index 6aa5867377eb..f5a6d5806a13 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -117,7 +117,7 @@ struct Por_Info
struct lt_TableColumn
{
- bool operator()( long nVal1, long nVal2 ) const
+ bool operator()( tools::Long nVal1, tools::Long nVal2 ) const
{
return nVal1 + ( MINLAY - 1 ) < nVal2;
}
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 6b3d1161cda3..bbcb862b0190 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -63,7 +63,7 @@ struct SwPostItPageItem
{
bool bScrollbar;
sw::sidebarwindows::SidebarPosition eSidebarPosition;
- long lOffset;
+ tools::Long lOffset;
SwRect mPageRect;
std::vector<SwSidebarItem*> mvSidebarItems;
SwPostItPageItem(): bScrollbar(false), eSidebarPosition(
sw::sidebarwindows::SidebarPosition::LEFT ), lOffset(0)
@@ -132,7 +132,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
bool mbWaitingForCalcRects;
VclPtr<sw::annotation::SwAnnotationWin> mpActivePostIt;
bool mbLayout;
- long mbLayoutHeight;
+ tools::Long mbLayoutHeight;
bool mbLayouting;
bool mbReadOnly;
bool mbDeleteNote;
@@ -147,12 +147,12 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
void AddPostIts(bool bCheckExistence = true,bool bFocus =
true);
void RemoveSidebarWin();
void PreparePageContainer();
- void Scroll(const long lScroll,const unsigned long aPage );
+ void Scroll(const tools::Long lScroll,const unsigned long
aPage );
void AutoScroll(const sw::annotation::SwAnnotationWin*
pPostIt,const unsigned long aPage );
bool ScrollbarHit(const unsigned long aPage,const Point
&aPoint);
bool LayoutByPage(
std::vector<sw::annotation::SwAnnotationWin*> &aVisiblePostItList,
const tools::Rectangle& rBorder,
- long lNeededHeight);
+ tools::Long lNeededHeight);
void CheckForRemovedPostIts();
bool ArrowEnabled(sal_uInt16 aDirection,unsigned long
aPage) const;
bool BorderOverPageBorder(unsigned long aPage) const;
@@ -228,7 +228,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener
sw::annotation::SwAnnotationWin* GetNextPostIt( sal_uInt16 aDirection,
sw::annotation::SwAnnotationWin* aPostIt);
- long GetNextBorder();
+ tools::Long GetNextBorder();
sw::annotation::SwAnnotationWin* GetActiveSidebarWin() { return
mpActivePostIt; }
void SetActiveSidebarWin( sw::annotation::SwAnnotationWin* p);
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx
b/sw/inc/ToxTabStopTokenHandler.hxx
index 5282f6897aaf..158c2129b0ef 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -97,7 +97,7 @@ private:
*
* This is the fallback method to determine the position of a tab stop.
*/
- long
+ tools::Long
CalculatePageMarginFromPageDescription(const SwTextNode& targetNode) const;
sal_uInt32 mIndexOfSectionNode;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 29e5fbfd3303..58f758706cbf 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -264,7 +264,7 @@ public:
virtual bool ReplaceChild (
::accessibility::AccessibleShape* pCurrentChild,
const css::uno::Reference< css::drawing::XShape >& _rxShape,
- const long _nIndex,
+ const tools::Long _nIndex,
const ::accessibility::AccessibleShapeTreeInfo& _rShapeTreeInfo
) override;
virtual ::accessibility::AccessibleControlShape*
GetAccControlShapeFromModel
diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx
index bb65029c97f2..5309602f9ef0 100644
--- a/sw/inc/anchoredobject.hxx
+++ b/sw/inc/anchoredobject.hxx
@@ -268,7 +268,7 @@ class SW_DLLPUBLIC SwAnchoredObject
const SwRect& GetLastCharRect() const { return maLastCharRect;}
SwTwips GetRelCharX( const SwFrame* pFrame ) const;
SwTwips GetRelCharY( const SwFrame* pFrame ) const;
- void AddLastCharY( long nDiff );
+ void AddLastCharY( tools::Long nDiff );
void ResetLastCharRectHeight();
// accessor to member <nmLastTopOfLine>
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index b7bb83af26a8..dee45a3cbc1d 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -26,6 +26,7 @@
#include <unotools/syslocale.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/solar.h>
+#include <tools/long.hxx>
#include "swdllapi.h"
class CharClass;
@@ -112,7 +113,7 @@ class SwSbxValue final : public SbxValue
bool m_bDBvalue;
public:
// always default to a number. otherwise it will become a SbxEMPTY
- SwSbxValue( long n = 0 ) : m_bVoid(false), m_bDBvalue(false) { PutLong( n
); }
+ SwSbxValue( tools::Long n = 0 ) : m_bVoid(false), m_bDBvalue(false) {
PutLong( n ); }
SwSbxValue( const double& rD ) : m_bVoid(false), m_bDBvalue(false) {
PutDouble( rD ); }
bool GetBool() const;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index d6888bcac2cb..e4d47805a1bf 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -184,9 +184,9 @@ private:
SwNodeIndex* m_pBoxIdx; ///< for recognizing of the changed
SwTableBox* m_pBoxPtr; ///< table row
- long m_nUpDownX; /**< try to move the cursor on up/down always
+ tools::Long m_nUpDownX; /**< try to move the cursor on
up/down always
in the same column */
- long m_nLeftFramePos;
+ tools::Long m_nLeftFramePos;
sal_uLong m_nCurrentNode; // save CursorPos at Start-Action
sal_Int32 m_nCurrentContent;
SwNodeType m_nCurrentNdTyp;
@@ -344,7 +344,7 @@ public:
void EndAction( const bool bIdleEnd = false, const bool DoSetPosX = false
);
// basic cursor travelling
- long GetUpDownX() const { return m_nUpDownX; }
+ tools::Long GetUpDownX() const { return m_nUpDownX; }
bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, bool bAllowVisual = false )
{ return LeftRight( true, nCnt, nMode, bAllowVisual ); }
@@ -680,7 +680,7 @@ public:
sal_uInt16 nSeqNo );
// get the nth character from the start or end of the current selection
- sal_Unicode GetChar( bool bEnd = true, long nOffset = 0 );
+ sal_Unicode GetChar( bool bEnd = true, tools::Long nOffset = 0 );
bool ExtendSelection( bool bEnd = true, sal_Int32 nCount = 1 );
// Place only the visible cursor at the given position in the document.
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 5d95036246a3..4fabaff6c253 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -31,7 +31,7 @@ class SW_DLLPUBLIC SwDBFieldType final : public
SwValueFieldType
SwDBData m_aDBData;
OUString m_sName; ///< only used in ::GetName() !
OUString m_sColumn;
- long m_nRefCnt;
+ tools::Long m_nRefCnt;
public:
@@ -265,7 +265,7 @@ public:
// Database field.
class SW_DLLPUBLIC SwDBSetNumberField final : public SwDBNameInfField
{
- long m_nNumber;
+ tools::Long m_nNumber;
public:
SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData,
sal_uInt32 nFormat = 0);
@@ -273,16 +273,16 @@ public:
virtual std::unique_ptr<SwField> Copy() const override;
void Evaluate(const SwDoc&);
- inline long GetSetNumber() const;
- inline void SetSetNumber(long nNum);
+ inline tools::Long GetSetNumber() const;
+ inline void SetSetNumber(tools::Long nNum);
virtual bool QueryValue( css::uno::Any& rVal, sal_uInt16 nWhich )
const override;
virtual bool PutValue( const css::uno::Any& rVal, sal_uInt16 nWhich
) override;
};
-inline long SwDBSetNumberField::GetSetNumber() const
+inline tools::Long SwDBSetNumberField::GetSetNumber() const
{ return m_nNumber; }
-inline void SwDBSetNumberField::SetSetNumber(long nNum)
+inline void SwDBSetNumberField::SetSetNumber(tools::Long nNum)
{ m_nNumber = nNum; }
#endif // INCLUDED_SW_INC_DBFLD_HXX
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 26c7fee7432c..94fd5ba3861f 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -21,6 +21,7 @@
#include <rtl/ustring.hxx>
#include <tools/solar.h>
+#include <tools/long.hxx>
#include <i18nlangtag/lang.h>
#include <com/sun/star/util/Date.hpp>
#include "swdllapi.h"
@@ -108,7 +109,7 @@ struct SwDSParam : public SwDBData
css::uno::Sequence< css::uno::Any > aSelection;
bool bScrollable;
bool bEndOfDB;
- long nSelectionIndex;
+ tools::Long nSelectionIndex;
SwDSParam(const SwDBData& rData) :
SwDBData(rData),
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 09fb15b6a8fd..1082ebc70d94 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -264,14 +264,14 @@ class SwDrawVirtObj final : public SdrVirtObj
virtual void AddToHdlList(SdrHdlList& rHdlList) const override;
virtual void NbcMove(const Size& rSiz) override;
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact) override;
- virtual void NbcRotate(const Point& rRef, long nAngle, double sn,
double cs) override;
+ virtual void NbcRotate(const Point& rRef, tools::Long nAngle, double
sn, double cs) override;
virtual void NbcMirror(const Point& rRef1, const Point& rRef2)
override;
- virtual void NbcShear(const Point& rRef, long nAngle, double tn, bool
bVShear) override;
+ virtual void NbcShear(const Point& rRef, tools::Long nAngle, double
tn, bool bVShear) override;
virtual void Move(const Size& rSiz) override;
virtual void Resize(const Point& rRef, const Fraction& xFact, const
Fraction& yFact, bool bUnsetRelative = true) override;
- virtual void Rotate(const Point& rRef, long nAngle, double sn, double
cs) override;
+ virtual void Rotate(const Point& rRef, tools::Long nAngle, double sn,
double cs) override;
virtual void Mirror(const Point& rRef1, const Point& rRef2) override;
- virtual void Shear(const Point& rRef, long nAngle, double tn, bool
bVShear) override;
+ virtual void Shear(const Point& rRef, tools::Long nAngle, double tn,
bool bVShear) override;
virtual void RecalcSnapRect() override;
virtual const tools::Rectangle& GetSnapRect() const override;
virtual void SetSnapRect(const tools::Rectangle& rRect) override;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 115a08a4b17b..fdcc5e4091f0 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1141,8 +1141,8 @@ public:
/** Move selected paragraphs (not only numberings)
according to offsets. (if negative: go to doc start). */
- bool MoveParagraph(SwPaM&, long nOffset, bool bIsOutlMv = false);
- bool MoveParagraphImpl(SwPaM&, long nOffset, bool bIsOutlMv, SwRootFrame
const*);
+ bool MoveParagraph(SwPaM&, tools::Long nOffset, bool bIsOutlMv = false);
+ bool MoveParagraphImpl(SwPaM&, tools::Long nOffset, bool bIsOutlMv,
SwRootFrame const*);
bool NumOrNoNum( const SwNodeIndex& rIdx, bool bDel = false);
@@ -1434,10 +1434,10 @@ public:
bool GenerateHTMLDoc( const OUString& rPath, int nOutlineLevel );
// Compare two documents.
- long CompareDoc( const SwDoc& rDoc );
+ tools::Long CompareDoc( const SwDoc& rDoc );
// Merge two documents.
- long MergeDoc( const SwDoc& rDoc );
+ tools::Long MergeDoc( const SwDoc& rDoc );
bool IsAutoFormatRedline() const { return mbIsAutoFormatRedline;
}
void SetAutoFormatRedline( bool bFlag ) { mbIsAutoFormatRedline =
bFlag; }
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index b2ba48315230..f47edfafa5a1 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -525,7 +525,7 @@ public:
void NumUpDown( bool bDown = true );
- bool MoveParagraph( long nOffset = 1);
+ bool MoveParagraph( tools::Long nOffset = 1);
bool MoveNumParas( bool bUpperLower, bool bUpperLeft );
/// Switch on/off of numbering via Delete/Backspace.
@@ -946,10 +946,10 @@ public:
void UpdateRedlineAttr();
/// Compare two documents.
- long CompareDoc( const SwDoc& rDoc );
+ tools::Long CompareDoc( const SwDoc& rDoc );
/// Merge two documents.
- long MergeDoc( const SwDoc& rDoc );
+ tools::Long MergeDoc( const SwDoc& rDoc );
/// Footnote attributes global to document.
const SwFootnoteInfo& GetFootnoteInfo() const;
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 0639833d0b1e..a363c241d2b1 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -623,7 +623,7 @@ public:
/// Page number of the page containing Point, O if no page.
sal_uInt16 GetPageNumber( const Point &rPoint ) const;
- bool GetPageNumber( long nYPos, bool bAtCursorPos, sal_uInt16& rPhyNum,
sal_uInt16& rVirtNum, OUString &rDisplay ) const;
+ bool GetPageNumber( tools::Long nYPos, bool bAtCursorPos, sal_uInt16&
rPhyNum, sal_uInt16& rVirtNum, OUString &rDisplay ) const;
SwFlyFrameFormat* InsertObject( const svt::EmbeddedObjectRef&,
SfxItemSet* pFlyAttrSet );
@@ -770,7 +770,7 @@ public:
bool IsLastCellInRow() const;
/// Width of current range for column-dialog.
- long GetSectionWidth( SwFormat const & rFormat ) const;
+ tools::Long GetSectionWidth( SwFormat const & rFormat ) const;
void GetConnectableFrameFormats
(SwFrameFormat & rFormat, const OUString & rReference, bool bSuccessors,
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 38c16c9039a3..39c00f68a235 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -45,7 +45,7 @@ public:
class SW_DLLPUBLIC SwDateTimeField final : public SwValueField
{
sal_uInt16 m_nSubType;
- long m_nOffset; // Offset in minutes.
+ tools::Long m_nOffset; // Offset in minutes.
virtual OUString ExpandImpl(SwRootFrame const* pLayout) const
override;
virtual std::unique_ptr<SwField> Copy() const override;
@@ -62,8 +62,8 @@ public:
virtual void SetPar2(const OUString& rStr) override;
virtual OUString GetPar2() const override;
- void SetOffset(long nMinutes) { m_nOffset = nMinutes; }
- long GetOffset() const { return m_nOffset; }
+ void SetOffset(tools::Long nMinutes) { m_nOffset =
nMinutes; }
+ tools::Long GetOffset() const { return
m_nOffset; }
Date GetDate() const;
tools::Time GetTime() const;
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index 2eb3dbf13678..cf890371a2f1 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwFormatFrameSize: public SvxSizeItem
// the object is placed (PrtArea) and to the screen width
// minus borders in BrowseView if the environment is the page.
- void ScaleMetrics(long lMult, long lDiv) override;
+ void ScaleMetrics(tools::Long lMult, tools::Long lDiv) override;
bool HasMetrics() const override;
public:
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 7fad4b0fd087..5b59f2a8d71d 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -280,7 +280,7 @@ public:
sal_uLong GetMin() const { return m_nMin; }
sal_uLong GetMax() const { return m_nMax; }
- inline long GetBrowseWidthMin() const;
+ inline tools::Long GetBrowseWidthMin() const;
bool HasColsOption() const { return m_bColsOption; }
bool HasColTags() const { return m_bColTags; }
@@ -423,9 +423,9 @@ inline void SwHTMLTableLayout::SetCell(
std::unique_ptr<SwHTMLTableLayoutCell> p
m_aCells[static_cast<size_t>(nRow)*m_nCols+nCol] = std::move(pCell);
}
-inline long SwHTMLTableLayout::GetBrowseWidthMin() const
+inline tools::Long SwHTMLTableLayout::GetBrowseWidthMin() const
{
- return static_cast<long>( (!m_nWidthOption || m_bPercentWidthOption) ?
m_nMin : m_nRelTabWidth );
+ return static_cast<tools::Long>( (!m_nWidthOption ||
m_bPercentWidthOption) ? m_nMin : m_nRelTabWidth );
}
void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16
nRight )
diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx
index 3715c6702f78..eee934b66ddf 100644
--- a/sw/inc/mdiexp.hxx
+++ b/sw/inc/mdiexp.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_INC_MDIEXP_HXX
#include <rtl/ustring.hxx>
+#include <tools/long.hxx>
#include "tblenum.hxx"
#include "swdllapi.h"
@@ -41,9 +42,9 @@ extern void PageNumNotify( SwViewShell const * pVwSh,
enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END };
extern void FrameNotify( SwViewShell* pVwSh, FlyMode eMode = FLY_DRAG );
-SW_DLLPUBLIC void StartProgress(const char* pMessId, long nStartVal, long
nEndVal, SwDocShell *pDocSh = nullptr);
+SW_DLLPUBLIC void StartProgress(const char* pMessId, tools::Long nStartVal,
tools::Long nEndVal, SwDocShell *pDocSh = nullptr);
SW_DLLPUBLIC void EndProgress ( SwDocShell const *pDocSh );
-SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell const
*pDocShell );
+SW_DLLPUBLIC void SetProgressState ( tools::Long nPosition, SwDocShell const
*pDocShell );
void RescheduleProgress( SwDocShell const *pDocShell );
void RepaintPagePreview( SwViewShell const * pVwSh, const SwRect& rRect );
diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx
index ee53db6a7c3c..afaf8936558c 100644
--- a/sw/inc/ndgrf.hxx
+++ b/sw/inc/ndgrf.hxx
@@ -82,9 +82,9 @@ public:
void SetGraphic(const Graphic& rGraphic);
/// wrappers for non-const calls at GraphicObject
- void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const
Size& rSz, long nExtraData, OutputDevice* pFirstFrameOutDev)
+ void StartGraphicAnimation(OutputDevice* pOut, const Point& rPt, const
Size& rSz, tools::Long nExtraData, OutputDevice* pFirstFrameOutDev)
{ maGrfObj.StartAnimation(pOut, rPt, rSz, nExtraData, pFirstFrameOutDev); }
- void StopGraphicAnimation(const OutputDevice* pOut, long nExtraData) {
maGrfObj.StopAnimation(pOut, nExtraData); }
+ void StopGraphicAnimation(const OutputDevice* pOut, tools::Long
nExtraData) { maGrfObj.StopAnimation(pOut, nExtraData); }
virtual Size GetTwipSize() const override;
void SetTwipSize( const Size& rSz );
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index 274bc4b2014c..303a7801ca6f 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -56,7 +56,7 @@ public:
{
RegisterIndex( rNds );
};
- SwNodeIndex( const SwNodeIndex& rIdx, long nDiff = 0 )
+ SwNodeIndex( const SwNodeIndex& rIdx, tools::Long nDiff = 0 )
: sw::Ring<SwNodeIndex>()
{
if( nDiff )
@@ -66,7 +66,7 @@ public:
RegisterIndex( m_pNode->GetNodes() );
}
- SwNodeIndex( const SwNode& rNd, long nDiff = 0 )
+ SwNodeIndex( const SwNode& rNd, tools::Long nDiff = 0 )
{
if( nDiff )
m_pNode = rNd.GetNodes()[ rNd.GetIndex() + nDiff ];
@@ -109,7 +109,7 @@ public:
// Enables assignments without creation of a temporary object.
inline SwNodeIndex& Assign( SwNodes const & rNds, sal_uLong );
- inline SwNodeIndex& Assign( const SwNode& rNd, long nOffset = 0 );
+ inline SwNodeIndex& Assign( const SwNode& rNd, tools::Long nOffset = 0 );
// Gets pointer on NodesArray.
inline const SwNodes& GetNodes() const;
@@ -140,9 +140,9 @@ public:
SwNodeRange( SwNodes& rNds, sal_uLong nSttIdx, sal_uLong nEndIdx = 0 )
: aStart( rNds, nSttIdx ), aEnd( rNds, nEndIdx ) {};
- SwNodeRange( const SwNodeIndex& rS, long nSttDiff, const SwNodeIndex& rE,
long nEndDiff = 0 )
+ SwNodeRange( const SwNodeIndex& rS, tools::Long nSttDiff, const
SwNodeIndex& rE, tools::Long nEndDiff = 0 )
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff ) {};
- SwNodeRange( const SwNode& rS, long nSttDiff, const SwNode& rE, long
nEndDiff = 0 )
+ SwNodeRange( const SwNode& rS, tools::Long nSttDiff, const SwNode& rE,
tools::Long nEndDiff = 0 )
: aStart( rS, nSttDiff ), aEnd( rE, nEndDiff ) {};
};
@@ -275,7 +275,7 @@ SwNodeIndex& SwNodeIndex::Assign( SwNodes const & rNds,
sal_uLong nIdx )
return *this;
}
-SwNodeIndex& SwNodeIndex::Assign( const SwNode& rNd, long nOffset )
+SwNodeIndex& SwNodeIndex::Assign( const SwNode& rNd, tools::Long nOffset )
{
*this = rNd;
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index e2d3dde7f887..539db67906cf 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -471,7 +471,7 @@ public:
@return additional indents
*/
- long GetLeftMarginWithNum( bool bTextLeft = false ) const;
+ tools::Long GetLeftMarginWithNum( bool bTextLeft = false ) const;
/**
Returns the combined first line indent of this text node and
@@ -494,7 +494,7 @@ public:
Needed for text formatting
Method considers new list level attributes, which also can provide a
left margin value
*/
- long GetLeftMarginForTabCalculation() const;
+ tools::Long GetLeftMarginForTabCalculation() const;
/** Returns if this text node has a number.
@@ -654,7 +654,7 @@ public:
@return boolean - indicating, if a list tab stop position is provided
*/
- bool GetListTabStopPosition( long& nListTabStopPosition ) const;
+ bool GetListTabStopPosition( tools::Long& nListTabStopPosition ) const;
/** Retrieves the character following the list label, if the paragraph's
list level defines one.
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 7c052e037d7d..e1ed5c9a03ac 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -99,8 +99,8 @@ private:
Merge m_eMerge;
#ifdef DBG_UTIL
- static long s_nSerial;
- long m_nSerial;
+ static tools::Long s_nSerial;
+ tools::Long m_nSerial;
#endif
/// all SwFrameFormat that are anchored at the node
@@ -122,7 +122,7 @@ public:
virtual ~SwNode() override = 0;
#ifdef DBG_UTIL
- long GetSerial() const { return m_nSerial; }
+ tools::Long GetSerial() const { return m_nSerial; }
#endif
sal_uInt16 GetSectionLevel() const;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 8c0a8abe6de9..7e64a4665a9f 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -147,9 +147,9 @@ public:
explicit SwPaM( const SwPosition& rPos, SwPaM* pRing = nullptr );
SwPaM( const SwPosition& rMk, const SwPosition& rPt, SwPaM* pRing =
nullptr );
SwPaM( const SwNodeIndex& rMk, const SwNodeIndex& rPt,
- long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = nullptr );
+ tools::Long nMkOffset = 0, tools::Long nPtOffset = 0, SwPaM* pRing
= nullptr );
SwPaM( const SwNode& rMk, const SwNode& rPt,
- long nMkOffset = 0, long nPtOffset = 0, SwPaM* pRing = nullptr );
+ tools::Long nMkOffset = 0, tools::Long nPtOffset = 0, SwPaM* pRing
= nullptr );
SwPaM( const SwNodeIndex& rMk, sal_Int32 nMkContent,
const SwNodeIndex& rPt, sal_Int32 nPtContent, SwPaM* pRing =
nullptr );
SwPaM( const SwNode& rMk, sal_Int32 nMkContent,
diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx
index 935549ac786d..fb946b969c87 100644
--- a/sw/inc/postithelper.hxx
+++ b/sw/inc/postithelper.hxx
@@ -86,7 +86,7 @@ namespace SwPostItHelper
const SwPosition& rAnchorPos,
const sw::mark::IMark* pAnnotationMark = nullptr );
- long getLayoutHeight( const SwRootFrame* pRoot );
+ tools::Long getLayoutHeight( const SwRootFrame* pRoot );
void setSidebarChanged( SwRootFrame* pRoot, bool bBrowseMode );
unsigned long getPageInfo( SwRect& rPageFrame, const SwRootFrame* , const
Point& );
}
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index 95cab2924272..8fbded6e61f1 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -261,7 +261,7 @@ public:
bool operator<( const SwRangeRedline& ) const;
void dumpAsXml(xmlTextWriterPtr pWriter) const;
- void MaybeNotifyRedlinePositionModification(long nTop);
+ void MaybeNotifyRedlinePositionModification(tools::Long nTop);
};
void MaybeNotifyRedlineModification(SwRangeRedline& rRedline, SwDoc& rDoc);
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index 46529ceb7394..d05293c45365 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -458,7 +458,7 @@ public:
// Stream-specific routines. Do not use in storage-writer!
// Optimizing output on stream.
- static SvStream& OutLong( SvStream& rStrm, long nVal );
+ static SvStream& OutLong( SvStream& rStrm, tools::Long nVal );
static SvStream& OutULong( SvStream& rStrm, sal_uLong nVal );
void SetStream(SvStream *const pStream);
diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx
index fc9f034bcc69..02b16c80b75d 100644
--- a/sw/inc/swatrset.hxx
+++ b/sw/inc/swatrset.hxx
@@ -319,7 +319,7 @@ public:
};
//Helper for filters to find true lineheight of a font
-SW_DLLPUBLIC long AttrSetToLineHeight( const IDocumentSettingAccess&
rIDocumentSettingAccess,
+SW_DLLPUBLIC tools::Long AttrSetToLineHeight( const IDocumentSettingAccess&
rIDocumentSettingAccess,
const SwAttrSet &rSet,
const vcl::RenderContext &rOut, sal_Int16 nScript);
#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 4ed649e85681..9aa390386221 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -72,7 +72,7 @@ class SW_DLLPUBLIC SwCursor : public SwPaM
friend class SwCursorSaveState;
std::vector<SwCursor_SavePos> m_vSavePos; // the current entry is the last
element
- long m_nRowSpanOffset; // required for travelling in tabs with
rowspans
+ tools::Long m_nRowSpanOffset; // required for travelling in tabs
with rowspans
sal_uInt8 m_nCursorBidiLevel; // bidi level of the cursor
bool m_bColumnSelection; // true: cursor is aprt of a column selection
@@ -163,7 +163,7 @@ public:
virtual bool LeftRight( bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode,
bool bAllowVisual, bool bSkipHidden, bool bInsertCursor,
SwRootFrame const* pLayout, bool isFieldNames);
- bool UpDown(bool bUp, sal_uInt16 nCnt, Point const * pPt, long nUpDownX,
SwRootFrame & rLayout);
+ bool UpDown(bool bUp, sal_uInt16 nCnt, Point const * pPt, tools::Long
nUpDownX, SwRootFrame & rLayout);
bool LeftRightMargin(SwRootFrame const& rLayout, bool bLeftMargin, bool
bAPI);
bool IsAtLeftRightMargin(SwRootFrame const& rLayout, bool bLeftMargin,
bool bAPI) const;
bool SttEndDoc( bool bSttDoc );
@@ -214,7 +214,7 @@ public:
bool IsColumnSelection() const { return m_bColumnSelection; }
void SetColumnSelection( bool bNew ) { m_bColumnSelection = bNew; }
- long GetCursorRowSpanOffset() const { return m_nRowSpanOffset; }
+ tools::Long GetCursorRowSpanOffset() const { return m_nRowSpanOffset; }
SwCursor* GetNext() { return dynamic_cast<SwCursor
*>(GetNextInRing()); }
const SwCursor* GetNext() const { return dynamic_cast<SwCursor const
*>(GetNextInRing()); }
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 79a5be6649a9..a9c5a79c023f 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -42,7 +42,7 @@ public:
inline SwRect( const SwRect &rRect );
inline SwRect( const Point& rLT, const Size& rSize );
inline SwRect( const Point& rLT, const Point& rRB );
- inline SwRect( long X, long Y, long Width, long Height );
+ inline SwRect( tools::Long X, tools::Long Y, tools::Long Width,
tools::Long Height );
//SV-SS e.g. SwRect( pWin->GetClipRect() );
SwRect( const tools::Rectangle &rRect );
@@ -50,25 +50,25 @@ public:
//Set-Methods
inline void Chg( const Point& rNP, const Size &rNS );
inline void Pos( const Point& rNew );
- inline void Pos( const long nNewX, const long nNewY );
+ inline void Pos( const tools::Long nNewX, const tools::Long nNewY );
inline void SSize( const Size& rNew );
- inline void SSize( const long nHeight, const long nWidth );
- inline void Width( long nNew );
- inline void Height( long nNew );
- inline void Left( const long nLeft );
- inline void Right( const long nRight );
- inline void Top( const long nTop );
- inline void Bottom( const long nBottom );
+ inline void SSize( const tools::Long nHeight, const tools::Long nWidth );
+ inline void Width( tools::Long nNew );
+ inline void Height( tools::Long nNew );
+ inline void Left( const tools::Long nLeft );
+ inline void Right( const tools::Long nRight );
+ inline void Top( const tools::Long nTop );
+ inline void Bottom( const tools::Long nBottom );
//Get-Methods
inline const Point &Pos() const;
inline const Size &SSize() const;
- inline long Width() const;
- inline long Height() const;
- inline long Left() const;
- inline long Right() const;
- inline long Top() const;
- inline long Bottom() const;
+ inline tools::Long Width() const;
+ inline tools::Long Height() const;
+ inline tools::Long Left() const;
+ inline tools::Long Right() const;
+ inline tools::Long Top() const;
+ inline tools::Long Bottom() const;
// In order to be able to access the members of Pos and SSize from the
layout side.
inline Point &Pos();
@@ -84,7 +84,7 @@ public:
SwRect &Intersection_( const SwRect &rRect );
bool IsInside( const Point& rPOINT ) const;
- bool IsNear(const Point& rPoint, long nTolerance ) const;
+ bool IsNear(const Point& rPoint, tools::Long nTolerance ) const;
bool IsInside( const SwRect& rRect ) const;
bool IsOver( const SwRect& rRect ) const;
inline bool HasArea() const;
@@ -106,32 +106,32 @@ public:
friend SvStream& WriteSwRect( SvStream &rStream, const SwRect &rRect );
void dumpAsXmlAttributes(xmlTextWriterPtr writer) const;
- void Top_( const long nTop );
- void Bottom_( const long nBottom );
- void Left_( const long nLeft );
- void Right_( const long nRight );
- void Width_( const long nNew );
- void Height_( const long nNew );
- long Top_() const;
- long Bottom_() const;
- long Left_() const;
- long Right_() const;
- long Width_() const;
- long Height_() const;
- void SubTop( const long nSub );
- void AddTop( const long nAdd );
- void AddBottom( const long nAdd );
- void AddLeft( const long nAdd );
- void SubLeft( const long nSub );
- void AddRight( const long nAdd );
- void AddWidth( const long nAdd );
- void AddHeight( const long nAdd );
- void SetPosX( const long nNew );
- void SetPosY( const long nNew );
- void SetLeftAndWidth( long nLeft, long nNew );
- void SetTopAndHeight( long nTop, long nNew );
- void SetRightAndWidth( long nRight, long nNew );
- void SetBottomAndHeight( long nBottom, long nNew );
+ void Top_( const tools::Long nTop );
+ void Bottom_( const tools::Long nBottom );
+ void Left_( const tools::Long nLeft );
+ void Right_( const tools::Long nRight );
+ void Width_( const tools::Long nNew );
+ void Height_( const tools::Long nNew );
+ tools::Long Top_() const;
+ tools::Long Bottom_() const;
+ tools::Long Left_() const;
+ tools::Long Right_() const;
+ tools::Long Width_() const;
+ tools::Long Height_() const;
+ void SubTop( const tools::Long nSub );
+ void AddTop( const tools::Long nAdd );
+ void AddBottom( const tools::Long nAdd );
+ void AddLeft( const tools::Long nAdd );
+ void SubLeft( const tools::Long nSub );
+ void AddRight( const tools::Long nAdd );
+ void AddWidth( const tools::Long nAdd );
+ void AddHeight( const tools::Long nAdd );
+ void SetPosX( const tools::Long nNew );
+ void SetPosY( const tools::Long nNew );
+ void SetLeftAndWidth( tools::Long nLeft, tools::Long nNew );
+ void SetTopAndHeight( tools::Long nTop, tools::Long nNew );
+ void SetRightAndWidth( tools::Long nRight, tools::Long nNew );
+ void SetBottomAndHeight( tools::Long nBottom, tools::Long nNew );
void SetUpperLeftCorner( const Point& rNew );
void SetUpperRightCorner( const Point& rNew );
void SetLowerLeftCorner( const Point& rNew );
@@ -141,23 +141,23 @@ public:
Point BottomLeft() const;
Point BottomRight() const;
Size SwappedSize() const;
- long GetLeftDistance( long ) const;
- long GetBottomDistance( long ) const;
- long GetRightDistance( long ) const;
- long GetTopDistance( long ) const;
- bool OverStepLeft( long ) const;
- bool OverStepBottom( long ) const;
- bool OverStepTop( long ) const;
- bool OverStepRight( long ) const;
+ tools::Long GetLeftDistance( tools::Long ) const;
+ tools::Long GetBottomDistance( tools::Long ) const;
+ tools::Long GetRightDistance( tools::Long ) const;
+ tools::Long GetTopDistance( tools::Long ) const;
+ bool OverStepLeft( tools::Long ) const;
+ bool OverStepBottom( tools::Long ) const;
+ bool OverStepTop( tools::Long ) const;
+ bool OverStepRight( tools::Long ) const;
};
-typedef void (SwRect::*SwRectSet)( const long nNew );
+typedef void (SwRect::*SwRectSet)( const tools::Long nNew );
typedef long (SwRect::*SwRectGet)() const;
typedef Point (SwRect::*SwRectPoint)() const;
typedef Size (SwRect::*SwRectSize)() const;
-typedef bool (SwRect::*SwRectMax)( long ) const;
-typedef long (SwRect::*SwRectDist)( long ) const;
-typedef void (SwRect::*SwRectSetTwice)( long, long );
+typedef bool (SwRect::*SwRectMax)( tools::Long ) const;
+typedef long (SwRect::*SwRectDist)( tools::Long ) const;
+typedef void (SwRect::*SwRectSetTwice)( tools::Long, tools::Long );
typedef void (SwRect::*SwRectSetPos)( const Point& );
// Set-Methods
@@ -170,7 +170,7 @@ inline void SwRect::Pos( const Point& rNew )
{
m_Point = rNew;
}
-inline void SwRect::Pos( const long nNewX, const long nNewY )
+inline void SwRect::Pos( const tools::Long nNewX, const tools::Long nNewY )
{
m_Point.setX(nNewX);
m_Point.setY(nNewY);
@@ -179,34 +179,34 @@ inline void SwRect::SSize( const Size& rNew )
{
m_Size = rNew;
}
-inline void SwRect::SSize( const long nNewHeight, const long nNewWidth )
+inline void SwRect::SSize( const tools::Long nNewHeight, const tools::Long
nNewWidth )
{
m_Size.setWidth(nNewWidth);
m_Size.setHeight(nNewHeight);
}
-inline void SwRect::Width( long nNew )
+inline void SwRect::Width( tools::Long nNew )
{
m_Size.setWidth(nNew);
}
-inline void SwRect::Height( long nNew )
+inline void SwRect::Height( tools::Long nNew )
{
m_Size.setHeight(nNew);
}
-inline void SwRect::Left( const long nLeft )
+inline void SwRect::Left( const tools::Long nLeft )
{
m_Size.AdjustWidth( m_Point.getX() - nLeft );
m_Point.setX(nLeft);
}
-inline void SwRect::Right( const long nRight )
+inline void SwRect::Right( const tools::Long nRight )
{
m_Size.setWidth(nRight - m_Point.getX() + 1);
}
-inline void SwRect::Top( const long nTop )
+inline void SwRect::Top( const tools::Long nTop )
{
m_Size.AdjustHeight( m_Point.getY() - nTop );
m_Point.setY(nTop);
}
-inline void SwRect::Bottom( const long nBottom )
+inline void SwRect::Bottom( const tools::Long nBottom )
{
m_Size.setHeight(nBottom - m_Point.getY() + 1);
}
@@ -224,27 +224,27 @@ inline const Size &SwRect::SSize() const
{
return m_Size;
}
-inline long SwRect::Width() const
+inline tools::Long SwRect::Width() const
{
return m_Size.Width();
}
-inline long SwRect::Height() const
+inline tools::Long SwRect::Height() const
{
return m_Size.Height();
}
-inline long SwRect::Left() const
+inline tools::Long SwRect::Left() const
{
return m_Point.X();
}
-inline long SwRect::Right() const
+inline tools::Long SwRect::Right() const
{
return m_Size.getWidth() ? m_Point.getX() + m_Size.getWidth() - 1 :
m_Point.getX();
}
-inline long SwRect::Top() const
+inline tools::Long SwRect::Top() const
{
return m_Point.Y();
}
-inline long SwRect::Bottom() const
+inline tools::Long SwRect::Bottom() const
{
return m_Size.getHeight() ? m_Point.getY() + m_Size.getHeight() - 1 :
m_Point.getY();
}
@@ -322,7 +322,7 @@ inline SwRect::SwRect( const Point& rLT, const Point& rRB )
:
m_Size( rRB.X() - rLT.X() + 1, rRB.Y() - rLT.Y() + 1 )
{
}
-inline SwRect::SwRect( long X, long Y, long W, long H ) :
+inline SwRect::SwRect( tools::Long X, tools::Long Y, tools::Long W,
tools::Long H ) :
m_Point( X, Y ),
m_Size( W, H )
{
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 9694db0113ef..a101cfeeb85e 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -165,7 +165,7 @@ private:
bool InsertRow_( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, bool bBehind
);
bool NewInsertCol( SwDoc&, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool
);
void FindSuperfluousRows_( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine*
);
- void AdjustWidths( const long nOld, const long nNew );
+ void AdjustWidths( const tools::Long nOld, const tools::Long nNew );
void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld,
const SwTableBox *pStart, bool bCurRowOnly );
void ConvertSubtableBox(sal_uInt16 const nRow, sal_uInt16 const nBox);
@@ -241,8 +241,8 @@ public:
}
bool PrepareMerge( const SwPaM& rPam, SwSelBoxes& rBoxes,
SwSelBoxes& rMerged, SwTableBox** ppMergeBox, SwUndoTableMerge* pUndo
);
- void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax )
const;
- void PrepareDeleteCol( long nMin, long nMax );
+ void ExpandColumnSelection( SwSelBoxes& rBoxes, tools::Long &rMin,
tools::Long &rMax ) const;
+ void PrepareDeleteCol( tools::Long nMin, tools::Long nMax );
bool InsertCol( SwDoc&, const SwSelBoxes& rBoxes,
sal_uInt16 nCnt, bool bBehind );
@@ -404,7 +404,7 @@ class SW_DLLPUBLIC SwTableBox: public SwClient
//Client of FrameFormat.
std::unique_ptr<Color> mpUserColor;
std::unique_ptr<Color> mpNumFormatColor;
- long mnRowSpan;
+ tools::Long mnRowSpan;
bool mbDummyFlag;
/// Do we contain any direct formatting?
@@ -483,8 +483,8 @@ public:
inline void SetSaveUserColor(const Color* p );
inline void SetSaveNumFormatColor( const Color* p );
- long getRowSpan() const;
- void setRowSpan( long nNewRowSpan );
+ tools::Long getRowSpan() const;
+ void setRowSpan( tools::Long nNewRowSpan );
bool getDummyFlag() const;
void setDummyFlag( bool bDummy );
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 0a4a990c378c..ec9c9b101859 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -23,12 +23,13 @@
#include <memory>
#include "swdllapi.h"
+#include <tools/long.hxx>
struct SwTabColsEntry
{
- long nPos;
- long nMin;
- long nMax;
+ tools::Long nPos;
+ tools::Long nMin;
+ tools::Long nMax;
bool bHidden; // For each entry a flag, hidden or not.
// If the flag bHidden is true column separator
// is not in current line. It must maintained
@@ -39,12 +40,12 @@ typedef std::vector< SwTabColsEntry > SwTabColsEntries;
class SW_DLLPUBLIC SwTabCols
{
- long m_nLeftMin; // Leftmost border (reference point) for
+ tools::Long m_nLeftMin; // Leftmost border (reference point) for
// document coordinates.
// All other values are relative to this point!
- long m_nLeft; // Left border of table.
- long m_nRight; // Right border of table.
- long m_nRightMax; // Maximum right border of table.
+ tools::Long m_nLeft; // Left border of table.
+ tools::Long m_nRight; // Right border of table.
+ tools::Long m_nRightMax; // Maximum right border of table.
bool m_bLastRowAllowedToChange; // If the last row of the table frame
// is split across pages, it may not
@@ -59,29 +60,29 @@ public:
SwTabCols( sal_uInt16 nSize = 0 );
SwTabCols( const SwTabCols& );
SwTabCols &operator=( const SwTabCols& );
- long& operator[]( size_t nPos ) { return m_aData[nPos].nPos; }
- long operator[]( size_t nPos ) const { return m_aData[nPos].nPos; }
+ tools::Long& operator[]( size_t nPos ) { return m_aData[nPos].nPos; }
+ tools::Long operator[]( size_t nPos ) const { return m_aData[nPos].nPos; }
size_t Count() const { return m_aData.size(); }
bool IsHidden( size_t nPos ) const { return m_aData[nPos].bHidden;
}
void SetHidden( size_t nPos, bool bValue ) { m_aData[nPos].bHidden =
bValue; }
- void Insert( long nValue, bool bValue, size_t nPos );
- void Insert( long nValue, long nMin, long nMax, bool bValue, size_t nPos );
+ void Insert( tools::Long nValue, bool bValue, size_t nPos );
+ void Insert( tools::Long nValue, tools::Long nMin, tools::Long nMax, bool
bValue, size_t nPos );
void Remove( size_t nPos, size_t nCount = 1 );
const SwTabColsEntry& GetEntry( size_t nPos ) const { return
m_aData[nPos]; }
SwTabColsEntry& GetEntry( size_t nPos ) { return m_aData[nPos]; }
- long GetLeftMin() const { return m_nLeftMin; }
- long GetLeft() const { return m_nLeft; }
- long GetRight() const { return m_nRight; }
- long GetRightMax()const { return m_nRightMax;}
+ tools::Long GetLeftMin() const { return m_nLeftMin; }
+ tools::Long GetLeft() const { return m_nLeft; }
+ tools::Long GetRight() const { return m_nRight; }
+ tools::Long GetRightMax()const { return m_nRightMax;}
- void SetLeftMin ( long nNew ) { m_nLeftMin = nNew; }
- void SetLeft ( long nNew ) { m_nLeft = nNew; }
- void SetRight ( long nNew ) { m_nRight = nNew; }
- void SetRightMax( long nNew ) { m_nRightMax = nNew;}
+ void SetLeftMin ( tools::Long nNew ) { m_nLeftMin = nNew; }
+ void SetLeft ( tools::Long nNew ) { m_nLeft = nNew; }
+ void SetRight ( tools::Long nNew ) { m_nRight = nNew; }
+ void SetRightMax( tools::Long nNew ) { m_nRightMax = nNew;}
bool IsLastRowAllowedToChange() const { return m_bLastRowAllowedToChange; }
void SetLastRowAllowedToChange( bool bNew ) { m_bLastRowAllowedToChange =
bNew; }
diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx
index 71feadb6fcf5..63a09b323ff0 100644
--- a/sw/inc/toxwrap.hxx
+++ b/sw/inc/toxwrap.hxx
@@ -22,6 +22,7 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
+#include <tools/long.hxx>
#include "swdllapi.h"
namespace com::sun::star::i18n { class XExtendedIndexEntrySupplier; }
@@ -47,7 +48,7 @@ public:
GetAlgorithmList( const css::lang::Locale& rLcl ) const;
bool LoadAlgorithm( const css::lang::Locale& rLcl,
- const OUString& sSortAlgorithm, long nOptions )
const;
+ const OUString& sSortAlgorithm, tools::Long
nOptions ) const;
sal_Int16 CompareIndexEntry( const OUString& rText1, const OUString&
rTextReading1,
const css::lang::Locale& rLcl1,
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index c44174cbe99b..1f814a915b05 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -393,8 +393,8 @@ public:
int nOutputHeight,
int nTilePosX,
int nTilePosY,
- long nTileWidth,
- long nTileHeight ) override;
+ tools::Long nTileWidth,
+ tools::Long nTileHeight ) override;
/// @see vcl::ITiledRenderable::getDocumentSize().
virtual Size getDocumentSize() override;
/// @see vcl::ITiledRenderable::setPart().
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 85ab3f1c930f..8513b6c7e171 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -73,9 +73,9 @@ namespace com::sun::star::view { class XSelectionSupplier; }
namespace sfx2 { class FileDialogHelper; }
namespace sw::mark { class IFieldmark; }
-const long nLeftOfst = -370;
-const long nScrollX = 30;
-const long nScrollY = 30;
+const tools::Long nLeftOfst = -370;
+const tools::Long nScrollX = 30;
+const tools::Long nScrollY = 30;
#define MINZOOM 20
#define MAXZOOM 600
@@ -264,8 +264,8 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
DECL_DLLPRIVATE_LINK( TimeoutHdl, Timer*, void );
- inline long GetXScroll() const;
- inline long GetYScroll() const;
+ inline tools::Long GetXScroll() const;
+ inline tools::Long GetYScroll() const;
SAL_DLLPRIVATE Point AlignToPixel(const Point& rPt) const;
SAL_DLLPRIVATE void CalcPt( Point* pPt,const tools::Rectangle&
rRect,
sal_uInt16 nRangeX,
@@ -371,7 +371,7 @@ public:
virtual SdrView* GetDrawView() const override;
virtual bool HasUIFeature(SfxShellFeature nFeature) const
override;
virtual void ShowCursor( bool bOn = true ) override;
- virtual ErrCode DoVerb( long nVerb ) override;
+ virtual ErrCode DoVerb( tools::Long nVerb ) override;
virtual sal_uInt16 SetPrinter( SfxPrinter* pNew,
SfxPrinterChangeFlags nDiff =
SFX_PRINTER_ALL) override;
@@ -415,8 +415,8 @@ public:
sal_uInt16 nRangeX = USHRT_MAX,
sal_uInt16 nRangeY = USHRT_MAX);
- long SetVScrollMax(long lMax);
- long SetHScrollMax(long lMax);
+ tools::Long SetVScrollMax(tools::Long lMax);
+ tools::Long SetHScrollMax(tools::Long lMax);
void SpellError(LanguageType eLang);
bool ExecSpellPopup( const Point& rPt );
@@ -576,11 +576,11 @@ public:
bool JumpToSwMark( const OUString& rMark );
- long InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName,
+ tools::Long InsertDoc( sal_uInt16 nSlotId, const OUString& rFileName,
const OUString& rFilterName, sal_Int16 nVersion = 0 );
void ExecuteInsertDoc( SfxRequest& rRequest, const SfxPoolItem* pItem );
- long InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium> pMedium,
sal_Int16 nVersion );
+ tools::Long InsertMedium( sal_uInt16 nSlotId, std::unique_ptr<SfxMedium>
pMedium, sal_Int16 nVersion );
DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper *, void );
// status methods for clipboard.
@@ -674,12 +674,12 @@ public:
void SetOldDrwCat(const OUString& sStr);
};
-inline long SwView::GetXScroll() const
+inline tools::Long SwView::GetXScroll() const
{
return (m_aVisArea.GetWidth() * nScrollX) / 100;
}
-inline long SwView::GetYScroll() const
+inline tools::Long SwView::GetYScroll() const
{
return (m_aVisArea.GetHeight() * nScrollY) / 100;
}
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 57fae99e99ba..e5a6ae810a49 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -73,8 +73,8 @@ namespace vcl
// Define for flags needed in ctor or layers below.
// Currently the Preview flag is needed for DrawPage.
-#define VSHELLFLAG_ISPREVIEW (long(0x1))
-#define VSHELLFLAG_SHARELAYOUT (long(0x2))
+#define VSHELLFLAG_ISPREVIEW (tools::Long(0x1))
+#define VSHELLFLAG_SHARELAYOUT (tools::Long(0x2))
typedef std::shared_ptr<SwRootFrame> SwRootFramePtr;
typedef struct _xmlTextWriter* xmlTextWriterPtr;
@@ -233,7 +233,7 @@ public:
Sets the pOut so that the rRect is always painted over the entire
pOut, ie. starts in 0,0 and ends in width/height.
*/
- void PaintTile(VirtualDevice &rDevice, int contextWidth, int
contextHeight, int tilePosX, int tilePosY, long tileWidth, long tileHeight);
+ void PaintTile(VirtualDevice &rDevice, int contextWidth, int
contextHeight, int tilePosX, int tilePosY, tools::Long tileWidth, tools::Long
tileHeight);
bool IsPaintInProgress() const { return mbPaintInProgress; }
bool IsDrawingLayerPaintInProgress() const { return
!mPrePostPaintRegions.empty(); }
@@ -243,7 +243,7 @@ public:
// The passed rect is situated on pixel borders
// in order to avoid pixel errors when scrolling.
virtual void VisPortChgd( const SwRect & );
- bool SmoothScroll( long lXDiff, long lYDiff, const tools::Rectangle*
);//Browser
+ bool SmoothScroll( tools::Long lXDiff, tools::Long lYDiff, const
tools::Rectangle* );//Browser
void EnableSmooth( bool b ) { mbEnableSmooth = b; }
const SwRect& VisArea() const;
@@ -540,10 +540,10 @@ public:
SwAccessibleMap* GetAccessibleMap();
SwViewShell( SwViewShell&, vcl::Window *pWin, OutputDevice *pOut = nullptr,
- long nFlags = 0 );
+ tools::Long nFlags = 0 );
SwViewShell( SwDoc& rDoc, vcl::Window *pWin,
const SwViewOption *pOpt, OutputDevice *pOut = nullptr,
- long nFlags = 0 );
+ tools::Long nFlags = 0 );
virtual ~SwViewShell() override;
sal_Int32 GetPageNumAndSetOffsetForPDF( OutputDevice& rOut, const SwRect&
rRect ) const;
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 36cf0ceb8eef..95c013b233ca 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -71,7 +71,7 @@ class SwSelPaintRects : public SwRects
friend void InitCore();
friend void FinitCore();
- static long s_nPixPtX, s_nPixPtY;
+ static tools::Long s_nPixPtX, s_nPixPtY;
static MapMode *s_pMapMode;
const SwCursorShell* m_pCursorShell;
@@ -110,7 +110,7 @@ public:
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
static void Get1PixelInLogic( const SwViewShell& rSh,
- long* pX = nullptr, long* pY = nullptr );
+ tools::Long* pX = nullptr, tools::Long* pY
= nullptr );
};
class SW_DLLPUBLIC SwShellCursor : public virtual SwCursor, public
SwSelPaintRects
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 428878d8e85b..95891b40d7b1 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -851,15 +851,15 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025)
CPPUNIT_ASSERT(pFrameFormat);
// The shape has these values to copy to the associated text frame after
modification::
- const long nLPaddng =
xShapeProps->getPropertyValue("TextLeftDistance").get<long>();
- const long nRPaddng =
xShapeProps->getPropertyValue("TextRightDistance").get<long>();
- const long nTPaddng =
xShapeProps->getPropertyValue("TextUpperDistance").get<long>();
- const long nBPaddng =
xShapeProps->getPropertyValue("TextLowerDistance").get<long>();
+ const tools::Long nLPaddng =
xShapeProps->getPropertyValue("TextLeftDistance").get<long>();
+ const tools::Long nRPaddng =
xShapeProps->getPropertyValue("TextRightDistance").get<long>();
+ const tools::Long nTPaddng =
xShapeProps->getPropertyValue("TextUpperDistance").get<long>();
+ const tools::Long nBPaddng =
xShapeProps->getPropertyValue("TextLowerDistance").get<long>();
- CPPUNIT_ASSERT_EQUAL(long(1000), nLPaddng);
- CPPUNIT_ASSERT_EQUAL(long(2000), nRPaddng);
- CPPUNIT_ASSERT_EQUAL(long(3000), nTPaddng);
- CPPUNIT_ASSERT_EQUAL(long(4001), nBPaddng);
+ CPPUNIT_ASSERT_EQUAL(tools::Long(1000), nLPaddng);
+ CPPUNIT_ASSERT_EQUAL(tools::Long(2000), nRPaddng);
+ CPPUNIT_ASSERT_EQUAL(tools::Long(3000), nTPaddng);
+ CPPUNIT_ASSERT_EQUAL(tools::Long(4001), nBPaddng);
// TODO: modify shape distance via UNO with text frame synchronization
// Check the textbox as well:
@@ -867,10 +867,13 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, TestTdf137025)
CPPUNIT_ASSERT(xTxFrm);
uno::Reference<beans::XPropertySet> xFrameProps(xTxFrm, uno::UNO_QUERY);
- const long nFrameLeftPaddng =
xFrameProps->getPropertyValue("LeftBorderDistance").get<long>();
- const long nFrameRightPaddng =
xFrameProps->getPropertyValue("RightBorderDistance").get<long>();
- const long nFrameTopPaddng =
xFrameProps->getPropertyValue("TopBorderDistance").get<long>();
- const long nFrameBottomPaddng
+ const tools::Long nFrameLeftPaddng
+ = xFrameProps->getPropertyValue("LeftBorderDistance").get<long>();
+ const tools::Long nFrameRightPaddng
+ = xFrameProps->getPropertyValue("RightBorderDistance").get<long>();
+ const tools::Long nFrameTopPaddng
+ = xFrameProps->getPropertyValue("TopBorderDistance").get<long>();
+ const tools::Long nFrameBottomPaddng
= xFrameProps->getPropertyValue("BottomBorderDistance").get<long>();
// Check if the shape and frame have different setting
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 27a651d2dde7..5b22f0ea274b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -820,7 +820,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf123104, "tdf123104.docx")
// See SwXCell::getPropertyValue(), we really put 'long' into an Any there.
// Without the accompanying fix in place, this test would have failed with
'Expected: 3;Actual :
// 2', i.e. the vertical merge covered one less cell, resulting in a cell
with white background.
- CPPUNIT_ASSERT_EQUAL(static_cast<long>(3), getProperty<long>(xCell,
"RowSpan"));
+ CPPUNIT_ASSERT_EQUAL(static_cast<tools::Long>(3),
getProperty<tools::Long>(xCell, "RowSpan"));
}
DECLARE_OOXMLEXPORT_TEST(testFdo85542, "fdo85542.docx")
@@ -1174,7 +1174,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf97371, "tdf97371.docx")
SdrPage* pPage =
pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
SdrObject* pShape = pPage->GetObj(0);
SdrObject* pTextBox = pPage->GetObj(1);
- long nDiff = std::abs(pShape->GetSnapRect().Top() -
pTextBox->GetSnapRect().Top());
+ tools::Long nDiff = std::abs(pShape->GetSnapRect().Top() -
pTextBox->GetSnapRect().Top());
// The top of the two shapes were 410 and 3951, now it should be 3950 and
3951.
CPPUNIT_ASSERT(nDiff < 10);
}
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index f2969c14402f..8e7a9adffd62 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -2396,8 +2396,8 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testImageComment)
const SwSortedObjs& rAnchored = *pTextFrame->GetDrawObjs();
CPPUNIT_ASSERT_GREATER(static_cast<size_t>(0), rAnchored.size());
SwAnchoredObject* pObject = rAnchored[0];
- long nFrameLeft = pObject->GetObjRect().Left();
- long nFrameTop = pObject->GetObjRect().Top();
+ tools::Long nFrameLeft = pObject->GetObjRect().Left();
+ tools::Long nFrameTop = pObject->GetObjRect().Top();
// Make sure that the anchor points to the bottom left corner of the image.
// Without the accompanying fix in place, this test would have failed with:
@@ -2878,7 +2878,7 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf105330)
// Without the accompanying fix in place, height was only 1 twips
(practically invisible).
// Require at least 12pt height (font size under the cursor), in twips.
CPPUNIT_ASSERT_GREATEREQUAL(
- static_cast<long>(240),
+ static_cast<tools::Long>(240),
pWrtShell->GetVisibleCursor()->GetTextCursor().GetSize().getHeight());
}
diff --git a/sw/qa/extras/unowriter/unowriter.cxx
b/sw/qa/extras/unowriter/unowriter.cxx
index 5d17fc33a1f5..895728bd412f 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -747,7 +747,7 @@ CPPUNIT_TEST_FIXTURE(SwUnoWriter, testImageCommentAtChar)
for (const auto& pItem : *pPostItMgr)
{
const SwRect& rAnchor = pItem->mpPostIt->GetAnchorRect();
- CPPUNIT_ASSERT_GREATEREQUAL(static_cast<long>(5892), rAnchor.Left());
+ CPPUNIT_ASSERT_GREATEREQUAL(static_cast<tools::Long>(5892),
rAnchor.Left());
}
}
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx
b/sw/qa/extras/ww8export/ww8export2.cxx
index f811fc5200e1..bded9504b579 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -279,7 +279,7 @@ DECLARE_WW8EXPORT_TEST(testTdf80635_pageRightRTL,
"tdf80635_pageRightRTL.doc")
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation",
text::HoriOrientation::LEFT_AND_WIDTH, getProperty<sal_Int16>(xTable,
"HoriOrient"));
- CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(3500),
getProperty<long>(xTable, "LeftMargin"), 100);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", tools::Long(3500),
getProperty<tools::Long>(xTable, "LeftMargin"), 100);
CPPUNIT_ASSERT_EQUAL_MESSAGE("Did you fix me? Text probably should wrap
here", 2, getPages() );
// If so, replace test with the table set to a greater preferred width so
that the text shouldn't wrap
}
@@ -301,7 +301,7 @@ DECLARE_WW8EXPORT_TEST(testTdf80635_marginLeft,
"tdf80635_marginLeft.doc")
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// This was just the GetMinLeft of -199
- CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(-2950),
getProperty<long>(xTable, "LeftMargin"), 100);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", tools::Long(-2950),
getProperty<tools::Long>(xTable, "LeftMargin"), 100);
}
DECLARE_WW8EXPORT_TEST(testTdf80635_pageLeft, "tdf80635_pageLeft.doc")
@@ -311,7 +311,7 @@ DECLARE_WW8EXPORT_TEST(testTdf80635_pageLeft,
"tdf80635_pageLeft.doc")
uno::Reference<container::XIndexAccess>
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
uno::Reference<text::XTextTable> xTable(xTables->getByIndex(0),
uno::UNO_QUERY);
// This was just the GetMinLeft of -199
- CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", long(-2750),
getProperty<long>(xTable, "LeftMargin"), 100);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE("Table Indent", tools::Long(-2750),
getProperty<tools::Long>(xTable, "LeftMargin"), 100);
}
DECLARE_WW8EXPORT_TEST(testTdf99197_defaultLTR, "tdf99197_defaultLTR.doc")
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 9afe9cbb4cb4..9cbae7f83a3a 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -160,8 +160,8 @@ DECLARE_WW8IMPORT_TEST(testTdf121734, "tdf121734.doc")
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
rFormat.GetItemState(RES_LR_SPACE, false, &pItem));
auto pLR = static_cast<const SvxLRSpaceItem*>(pItem);
CPPUNIT_ASSERT(pLR);
- CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetLeft());
- CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetRight());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(0), pLR->GetLeft());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(0), pLR->GetRight());
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
rFormat.GetItemState(RES_UL_SPACE, false, &pItem));
auto pUL = static_cast<const SvxULSpaceItem*>(pItem);
@@ -197,7 +197,7 @@ DECLARE_WW8IMPORT_TEST(testTdf125281, "tdf125281.doc")
// Without the accompanying fix in place, this test would have failed, as
pref size was 0 till
// an actual Paint() was performed (and even then, it was wrong).
- long nExpected = 25664;
+ tools::Long nExpected = 25664;
CPPUNIT_ASSERT_EQUAL(nExpected, rGraphic.GetPrefSize().getWidth());
// Without the accompanying fix in place, this test would have failed, as
setting the pref size
@@ -227,8 +227,8 @@ DECLARE_WW8IMPORT_TEST(testTdf122425_1, "tdf122425_1.doc")
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
rFormat.GetItemState(RES_LR_SPACE, false, &pItem));
auto pLR = static_cast<const SvxLRSpaceItem*>(pItem);
CPPUNIT_ASSERT(pLR);
- CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetLeft());
- CPPUNIT_ASSERT_EQUAL(long(0), pLR->GetRight());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(0), pLR->GetLeft());
+ CPPUNIT_ASSERT_EQUAL(tools::Long(0), pLR->GetRight());
CPPUNIT_ASSERT_EQUAL(SfxItemState::SET,
rFormat.GetItemState(RES_UL_SPACE, false, &pItem));
auto pUL = static_cast<const SvxULSpaceItem*>(pItem);
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index 14c76002e73a..e36b89a890b0 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -793,8 +793,8 @@ void SAL_CALL
SwAccessibleContext::removeAccessibleEventListener(
static bool lcl_PointInRectangle(const awt::Point & aPoint,
const awt::Rectangle & aRect)
{
- long nDiffX = aPoint.X - aRect.X;
- long nDiffY = aPoint.Y - aRect.Y;
+ tools::Long nDiffX = aPoint.X - aRect.X;
+ tools::Long nDiffY = aPoint.Y - aRect.Y;
return
nDiffX >= 0 && nDiffX < aRect.Width && nDiffY >= 0 &&
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index ce88aa618665..f45c30224b41 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -3125,7 +3125,7 @@ Size SwAccessibleMap::LogicToPixel( const Size& rSize )
const
bool SwAccessibleMap::ReplaceChild (
::accessibility::AccessibleShape* pCurrentChild,
const uno::Reference< drawing::XShape >& _rxShape,
- const long /*_nIndex*/,
+ const tools::Long /*_nIndex*/,
const ::accessibility::AccessibleShapeTreeInfo& /*_rShapeTreeInfo*/
)
{
@@ -3240,10 +3240,10 @@ Point SwAccessibleMap::PixelToCore( const Point& rPoint
) const
return aPoint;
}
-static long lcl_CorrectCoarseValue(long aCoarseValue, long aFineValue,
- long aRefValue, bool bToLower)
+static tools::Long lcl_CorrectCoarseValue(tools::Long aCoarseValue,
tools::Long aFineValue,
+ tools::Long aRefValue, bool bToLower)
{
- long aResult = aCoarseValue;
+ tools::Long aResult = aCoarseValue;
if (bToLower)
{
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 457e5451dc3b..4a1ff7d98656 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1567,10 +1567,10 @@ sal_Bool SAL_CALL SwAccessibleTable::selectRow(
sal_Int32 row )
if( isAccessibleColumnSelected( row ) )
return true;
- long lColumnCount = getAccessibleColumnCount();
- for(long lCol = 0; lCol < lColumnCount; lCol ++)
+ tools::Long lColumnCount = getAccessibleColumnCount();
+ for(tools::Long lCol = 0; lCol < lColumnCount; lCol ++)
{
- long lChildIndex = getAccessibleIndex(row, lCol);
+ tools::Long lChildIndex = getAccessibleIndex(row, lCol);
selectAccessibleChild(lChildIndex);
}
@@ -1583,11 +1583,11 @@ sal_Bool SAL_CALL SwAccessibleTable::selectColumn(
sal_Int32 column )
if( isAccessibleColumnSelected( column ) )
return true;
- long lRowCount = getAccessibleRowCount();
+ tools::Long lRowCount = getAccessibleRowCount();
- for(long lRow = 0; lRow < lRowCount; lRow ++)
+ for(tools::Long lRow = 0; lRow < lRowCount; lRow ++)
{
- long lChildIndex = getAccessibleIndex(lRow, column);
+ tools::Long lChildIndex = getAccessibleIndex(lRow, column);
selectAccessibleChild(lChildIndex);
}
return true;
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index e2c96e069879..6ebd4120989c 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -75,7 +75,7 @@ void SwAttrPool::createAndAddSecondaryPools()
// #75371# change DefaultItems for the SdrEdgeObj distance items
// to TWIPS.
// 1/100th mm in twips
- const long nDefEdgeDist = (500 * 72) / 127;
+ const tools::Long nDefEdgeDist = (500 * 72) / 127;
pSdrPool->SetPoolDefaultItem(SdrEdgeNode1HorzDistItem(nDefEdgeDist));
pSdrPool->SetPoolDefaultItem(SdrEdgeNode1VertDistItem(nDefEdgeDist));
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 1e8ecaa83a3b..6b7aa28edb44 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -18,7 +18,7 @@
*/
#include <bparr.hxx>
-
+#include <tools/long.hxx>
#include <limits.h>
#include <string.h>
@@ -413,7 +413,7 @@ sal_uInt16 BigPtrArray::Compress()
sal_uInt16 nFirstChgPos = USHRT_MAX; // at which position was the 1st
change?
// convert fill percentage into number of remaining elements
- short const nMax = MAXENTRY - long(MAXENTRY) * COMPRESSLVL / 100;
+ short const nMax = MAXENTRY - tools::Long(MAXENTRY) * COMPRESSLVL / 100;
for( sal_uInt16 cur = 0; cur < m_nBlock; ++cur )
{
diff --git a/sw/source/core/bastyp/swrect.cxx b/sw/source/core/bastyp/swrect.cxx
index d443c85d99c3..3809c2113c04 100644
--- a/sw/source/core/bastyp/swrect.cxx
+++ b/sw/source/core/bastyp/swrect.cxx
@@ -44,7 +44,7 @@ SwRect& SwRect::Union( const SwRect& rRect )
Top( rRect.Top() );
if ( Left() > rRect.Left() )
Left( rRect.Left() );
- long n = rRect.Right();
+ tools::Long n = rRect.Right();
if ( Right() < n )
Right( n );
n = rRect.Bottom();
@@ -63,7 +63,7 @@ SwRect& SwRect::Intersection( const SwRect& rRect )
Left( rRect.Left() );
if ( Top() < rRect.Top() )
Top( rRect.Top() );
- long n = rRect.Right();
+ tools::Long n = rRect.Right();
if ( Right() > n )
Right( n );
n = rRect.Bottom();
@@ -82,7 +82,7 @@ SwRect& SwRect::Intersection_( const SwRect& rOther )
// get smaller right and lower, and greater left and upper edge
auto left = std::max( m_Point.X(), rOther.m_Point.X() );
auto top = std::max( m_Point.Y(), rOther.m_Point.Y() );
- long right = std::min( m_Point.X() + m_Size.Width(), rOther.m_Point.X() +
rOther.m_Size.Width() );
+ tools::Long right = std::min( m_Point.X() + m_Size.Width(),
rOther.m_Point.X() + rOther.m_Size.Width() );
auto bottom = std::min( m_Point.Y() + m_Size.Height(), rOther.m_Point.Y()
+ rOther.m_Size.Height() );
*this = SwRect( left, top, right - left, bottom - top );
@@ -92,10 +92,10 @@ SwRect& SwRect::Intersection_( const SwRect& rOther )
bool SwRect::IsInside( const SwRect& rRect ) const
{
- const long nRight = Right();
- const long nBottom = Bottom();
- const long nrRight = rRect.Right();
- const long nrBottom= rRect.Bottom();
+ const tools::Long nRight = Right();
+ const tools::Long nBottom = Bottom();
+ const tools::Long nrRight = rRect.Right();
+ const tools::Long nrBottom= rRect.Bottom();
return (Left() <= rRect.Left()) && (rRect.Left()<= nRight) &&
(Left() <= nrRight) && (nrRight <= nRight) &&
(Top() <= rRect.Top()) && (rRect.Top() <= nBottom) &&
@@ -111,7 +111,7 @@ bool SwRect::IsInside( const Point& rPoint ) const
}
// mouse moving of table borders
-bool SwRect::IsNear( const Point& rPoint, long nTolerance ) const
+bool SwRect::IsNear( const Point& rPoint, tools::Long nTolerance ) const
{
bool bIsNearby = (((Left() - nTolerance) <= rPoint.X()) &&
((Top() - nTolerance) <= rPoint.Y()) &&
@@ -143,30 +143,30 @@ void SwRect::Justify()
}
// Similar to the inline methods, but we need the function pointers
-void SwRect::Width_( const long nNew ) { m_Size.setWidth(nNew); }
-void SwRect::Height_( const long nNew ) { m_Size.setHeight(nNew); }
-void SwRect::Left_( const long nLeft ){ m_Size.AdjustWidth(m_Point.getX() -
nLeft ); m_Point.setX(nLeft); }
-void SwRect::Right_( const long nRight ){ m_Size.setWidth(nRight -
m_Point.getX()); }
-void SwRect::Top_( const long nTop ){ m_Size.AdjustHeight(m_Point.getY() -
nTop ); m_Point.setY(nTop); }
-void SwRect::Bottom_( const long nBottom ){ m_Size.setHeight(nBottom -
m_Point.getY()); }
-
-long SwRect::Width_() const{ return m_Size.getWidth(); }
-long SwRect::Height_() const{ return m_Size.getHeight(); }
-long SwRect::Left_() const{ return m_Point.getX(); }
-long SwRect::Right_() const{ return m_Point.getX() + m_Size.getWidth(); }
-long SwRect::Top_() const{ return m_Point.getY(); }
-long SwRect::Bottom_() const{ return m_Point.getY() + m_Size.getHeight(); }
-
-void SwRect::AddWidth( const long nAdd ) { m_Size.AdjustWidth(nAdd ); }
-void SwRect::AddHeight( const long nAdd ) { m_Size.AdjustHeight(nAdd ); }
-void SwRect::AddLeft( const long nAdd ){ m_Size.AdjustWidth(-nAdd );
m_Point.setX(m_Point.getX() + nAdd); }
-void SwRect::SubLeft( const long nSub ){ m_Size.AdjustWidth(nSub );
m_Point.setX(m_Point.getX() - nSub); }
-void SwRect::AddRight( const long nAdd ){ m_Size.AdjustWidth(nAdd ); }
-void SwRect::AddTop( const long nAdd ){ m_Size.AdjustHeight(-nAdd );
m_Point.setY(m_Point.getY() + nAdd); }
-void SwRect::SubTop( const long nSub ){ m_Size.AdjustHeight(nSub );
m_Point.setY(m_Point.getY() - nSub); }
-void SwRect::AddBottom( const long nAdd ){ m_Size.AdjustHeight(nAdd ); }
-void SwRect::SetPosX( const long nNew ){ m_Point.setX(nNew); }
-void SwRect::SetPosY( const long nNew ){ m_Point.setY(nNew); }
+void SwRect::Width_( const tools::Long nNew ) { m_Size.setWidth(nNew); }
+void SwRect::Height_( const tools::Long nNew ) { m_Size.setHeight(nNew); }
+void SwRect::Left_( const tools::Long nLeft ){
m_Size.AdjustWidth(m_Point.getX() - nLeft ); m_Point.setX(nLeft); }
+void SwRect::Right_( const tools::Long nRight ){ m_Size.setWidth(nRight -
m_Point.getX()); }
+void SwRect::Top_( const tools::Long nTop ){
m_Size.AdjustHeight(m_Point.getY() - nTop ); m_Point.setY(nTop); }
+void SwRect::Bottom_( const tools::Long nBottom ){ m_Size.setHeight(nBottom -
m_Point.getY()); }
+
+tools::Long SwRect::Width_() const{ return m_Size.getWidth(); }
+tools::Long SwRect::Height_() const{ return m_Size.getHeight(); }
+tools::Long SwRect::Left_() const{ return m_Point.getX(); }
+tools::Long SwRect::Right_() const{ return m_Point.getX() + m_Size.getWidth();
}
+tools::Long SwRect::Top_() const{ return m_Point.getY(); }
+tools::Long SwRect::Bottom_() const{ return m_Point.getY() +
m_Size.getHeight(); }
+
+void SwRect::AddWidth( const tools::Long nAdd ) { m_Size.AdjustWidth(nAdd ); }
+void SwRect::AddHeight( const tools::Long nAdd ) { m_Size.AdjustHeight(nAdd );
}
+void SwRect::AddLeft( const tools::Long nAdd ){ m_Size.AdjustWidth(-nAdd );
m_Point.setX(m_Point.getX() + nAdd); }
+void SwRect::SubLeft( const tools::Long nSub ){ m_Size.AdjustWidth(nSub );
m_Point.setX(m_Point.getX() - nSub); }
+void SwRect::AddRight( const tools::Long nAdd ){ m_Size.AdjustWidth(nAdd ); }
+void SwRect::AddTop( const tools::Long nAdd ){ m_Size.AdjustHeight(-nAdd );
m_Point.setY(m_Point.getY() + nAdd); }
+void SwRect::SubTop( const tools::Long nSub ){ m_Size.AdjustHeight(nSub );
m_Point.setY(m_Point.getY() - nSub); }
+void SwRect::AddBottom( const tools::Long nAdd ){ m_Size.AdjustHeight(nAdd ); }
+void SwRect::SetPosX( const tools::Long nNew ){ m_Point.setX(nNew); }
+void SwRect::SetPosY( const tools::Long nNew ){ m_Point.setY(nNew); }
Size SwRect::Size_() const { return SSize(); }
Size SwRect::SwappedSize() const { return Size( m_Size.getHeight(),
m_Size.getWidth() ); }
@@ -177,36 +177,36 @@ Point SwRect::BottomLeft() const { return Point(
m_Point.getX(), m_Point.getY()
Point SwRect::BottomRight() const
{ return Point( m_Point.getX() + m_Size.getWidth(), m_Point.getY() +
m_Size.getHeight() ); }
-long SwRect::GetLeftDistance( long nLimit ) const { return m_Point.getX() -
nLimit; }
-long SwRect::GetBottomDistance( long nLim ) const { return nLim -
m_Point.getY() - m_Size.getHeight();}
-long SwRect::GetTopDistance( long nLimit ) const { return m_Point.getY() -
nLimit; }
-long SwRect::GetRightDistance( long nLim ) const { return nLim -
m_Point.getX() - m_Size.getWidth(); }
+tools::Long SwRect::GetLeftDistance( tools::Long nLimit ) const { return
m_Point.getX() - nLimit; }
+tools::Long SwRect::GetBottomDistance( tools::Long nLim ) const { return nLim
- m_Point.getY() - m_Size.getHeight();}
+tools::Long SwRect::GetTopDistance( tools::Long nLimit ) const { return
m_Point.getY() - nLimit; }
+tools::Long SwRect::GetRightDistance( tools::Long nLim ) const { return nLim -
m_Point.getX() - m_Size.getWidth(); }
-bool SwRect::OverStepLeft( long nLimit ) const
+bool SwRect::OverStepLeft( tools::Long nLimit ) const
{ return nLimit > m_Point.getX() && m_Point.getX() + m_Size.getWidth() >
nLimit; }
-bool SwRect::OverStepBottom( long nLimit ) const
+bool SwRect::OverStepBottom( tools::Long nLimit ) const
{ return nLimit > m_Point.getY() && m_Point.getY() + m_Size.getHeight() >
nLimit; }
-bool SwRect::OverStepTop( long nLimit ) const
+bool SwRect::OverStepTop( tools::Long nLimit ) const
{ return nLimit > m_Point.getY() && m_Point.getY() + m_Size.getHeight() >
nLimit; }
-bool SwRect::OverStepRight( long nLimit ) const
+bool SwRect::OverStepRight( tools::Long nLimit ) const
{ return nLimit > m_Point.getX() && m_Point.getX() + m_Size.getWidth() >
nLimit; }
-void SwRect::SetLeftAndWidth( long nLeft, long nNew )
+void SwRect::SetLeftAndWidth( tools::Long nLeft, tools::Long nNew )
{
m_Point.setX(nLeft);
m_Size.setWidth(nNew);
}
-void SwRect::SetTopAndHeight( long nTop, long nNew )
+void SwRect::SetTopAndHeight( tools::Long nTop, tools::Long nNew )
{
m_Point.setY(nTop);
m_Size.setHeight(nNew);
}
-void SwRect::SetRightAndWidth( long nRight, long nNew )
+void SwRect::SetRightAndWidth( tools::Long nRight, tools::Long nNew )
{
m_Point.setX(nRight - nNew);
m_Size.setWidth(nNew);
}
-void SwRect::SetBottomAndHeight( long nBottom, long nNew )
+void SwRect::SetBottomAndHeight( tools::Long nBottom, tools::Long nNew )
{
m_Point.setY(nBottom - nNew);
m_Size.setHeight(nNew);
diff --git a/sw/source/core/bastyp/swregion.cxx
b/sw/source/core/bastyp/swregion.cxx
index f2fb006d9006..09e07757b236 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -74,10 +74,10 @@ void SwRegionRects::operator-=( const SwRect &rRect )
// now split; only those rectangles should be left over that are in
// the "old" but not in the "new" area; hence, not in intersection.
- long nTmp = aInter.Top() - aTmp.Top();
+ tools::Long nTmp = aInter.Top() - aTmp.Top();
if ( 0 < nTmp )
{
- const long nOldVal = aTmp.Height();
+ const tools::Long nOldVal = aTmp.Height();
aTmp.Height(nTmp);
InsertRect( aTmp, i, bDel );
aTmp.Height( nOldVal );
@@ -92,7 +92,7 @@ void SwRegionRects::operator-=( const SwRect &rRect )
nTmp = aInter.Left() - aTmp.Left();
if ( 0 < nTmp )
{
- const long nOldVal = aTmp.Width();
+ const tools::Long nOldVal = aTmp.Width();
aTmp.Width( nTmp );
InsertRect( aTmp, i, bDel );
aTmp.Width( nOldVal );
@@ -171,7 +171,7 @@ void SwRegionRects::Compress()
// paints), the area of the union can be a little bit larger:
// ( 9622 * 141.5 = 1361513 ~= a quarter (1/4) centimeter wider
// than the width of an A4 page
- const long nFuzzy = 1361513;
+ const tools::Long nFuzzy = 1361513;
SwRect aUnion( (*this)[i] );
aUnion.Union( (*this)[j] );
SwRect aInter( (*this)[i] );
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index 0ecbb10693fd..cb01a5e3c3ae 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -55,7 +55,7 @@ SwTabCols &SwTabCols::operator=( const SwTabCols& rCpy )
return *this;
}
-void SwTabCols::Insert( long nValue, long nMin, long nMax,
+void SwTabCols::Insert( tools::Long nValue, tools::Long nMin, tools::Long nMax,
bool bValue, size_t nPos )
{
SwTabColsEntry aEntry;
@@ -66,7 +66,7 @@ void SwTabCols::Insert( long nValue, long nMin, long nMax,
m_aData.insert( m_aData.begin() + nPos, aEntry );
}
-void SwTabCols::Insert( long nValue, bool bValue, size_t nPos )
+void SwTabCols::Insert( tools::Long nValue, bool bValue, size_t nPos )
{
SwTabColsEntry aEntry;
aEntry.nPos = nValue;
diff --git a/sw/source/core/crsr/DropDownFormFieldButton.cxx
b/sw/source/core/crsr/DropDownFormFieldButton.cxx
index 9d7453dae5ff..5a876f907f96 100644
--- a/sw/source/core/crsr/DropDownFormFieldButton.cxx
+++ b/sw/source/core/crsr/DropDownFormFieldButton.cxx
@@ -57,13 +57,14 @@ private:
DECL_STATIC_LINK(SwFieldDialog, KeyInputHdl, const KeyEvent&, bool);
public:
- SwFieldDialog(SwEditWin* parent, sw::mark::IFieldmark* fieldBM, long
nMinListWidth);
+ SwFieldDialog(SwEditWin* parent, sw::mark::IFieldmark* fieldBM,
tools::Long nMinListWidth);
virtual ~SwFieldDialog() override;
virtual void dispose() override;
};
}
-SwFieldDialog::SwFieldDialog(SwEditWin* parent, sw::mark::IFieldmark* fieldBM,
long nMinListWidth)
+SwFieldDialog::SwFieldDialog(SwEditWin* parent, sw::mark::IFieldmark* fieldBM,
+ tools::Long nMinListWidth)
: FloatingWindow(parent, WB_BORDER | WB_SYSTEMWINDOW)
, m_xListBox(VclPtr<SwFieldListBox>::Create(this))
, m_pFieldmark(fieldBM)
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index a59c9c6aac61..8c585524470e 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -220,7 +220,7 @@ SwCallLink::~SwCallLink() COVERITY_NOEXCEPT_FALSE
m_rShell.GetFlyMacroLnk().Call( pFlyFrame->GetFormat() );
}
-long SwCallLink::getLayoutFrame(const SwRootFrame* pRoot,
+tools::Long SwCallLink::getLayoutFrame(const SwRootFrame* pRoot,
SwTextNode const & rNd, sal_Int32 nCntPos, bool /*bCalcFrame*/)
{
SwTextFrame* pFrame = static_cast<SwTextFrame*>(rNd.getLayoutFrame(pRoot,
nullptr, nullptr));
diff --git a/sw/source/core/crsr/callnk.hxx b/sw/source/core/crsr/callnk.hxx
index 24149191711a..713f469bb6cc 100644
--- a/sw/source/core/crsr/callnk.hxx
+++ b/sw/source/core/crsr/callnk.hxx
@@ -34,13 +34,13 @@ public:
sal_uLong m_nNode;
sal_Int32 m_nContent;
SwNodeType m_nNodeType;
- long m_nLeftFramePos;
+ tools::Long m_nLeftFramePos;
bool m_bHasSelection;
explicit SwCallLink( SwCursorShell & rSh );
~SwCallLink() COVERITY_NOEXCEPT_FALSE;
- static long getLayoutFrame( const SwRootFrame*, SwTextNode const & rNd,
sal_Int32 nCntPos, bool bCalcFrame );
+ static tools::Long getLayoutFrame( const SwRootFrame*, SwTextNode const &
rNd, sal_Int32 nCntPos, bool bCalcFrame );
};
#endif // INCLUDED_SW_SOURCE_CORE_CRSR_CALLNK_HXX
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 72269f071b84..80cc4f69da90 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -2578,7 +2578,7 @@ OUString SwCursorShell::GetSelText() const
@param bEnd Start counting from the end? From start otherwise.
@param nOffset position of the character
*/
-sal_Unicode SwCursorShell::GetChar( bool bEnd, long nOffset )
+sal_Unicode SwCursorShell::GetChar( bool bEnd, tools::Long nOffset )
{
if( IsTableMode() ) // not possible in table mode
return 0;
@@ -3063,7 +3063,7 @@ void SwCursorShell::MakeSelVisible()
if( m_aCursorHeight.Y() < m_aCharRect.Height() && m_aCharRect.Height() >
VisArea().Height() )
{
SwRect aTmp( m_aCharRect );
- long nDiff = m_aCharRect.Height() - VisArea().Height();
+ tools::Long nDiff = m_aCharRect.Height() - VisArea().Height();
if( nDiff < m_aCursorHeight.getX() )
aTmp.Top( nDiff + m_aCharRect.Top() );
else
diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx
index aae189370d0a..3d759416a387 100644
--- a/sw/source/core/crsr/pam.cxx
+++ b/sw/source/core/crsr/pam.cxx
@@ -350,7 +350,7 @@ SwPaM::SwPaM( const SwPosition& rMark, const SwPosition&
rPoint, SwPaM* pRing )
}
SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex& rPoint,
- long nMarkOffset, long nPointOffset, SwPaM* pRing )
+ tools::Long nMarkOffset, tools::Long nPointOffset, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rMark )
, m_Bound2( rPoint )
@@ -371,7 +371,7 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex&
rPoint,
}
SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint,
- long nMarkOffset, long nPointOffset, SwPaM* pRing )
+ tools::Long nMarkOffset, tools::Long nPointOffset, SwPaM* pRing )
: Ring( pRing )
, m_Bound1( rMark )
, m_Bound2( rPoint )
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index e3c45e3b808e..4086ae11e899 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1960,7 +1960,7 @@ void SwCursor::DoSetBidiLevelUpDown()
}
bool SwCursor::UpDown( bool bUp, sal_uInt16 nCnt,
- Point const * pPt, long nUpDownX,
+ Point const * pPt, tools::Long nUpDownX,
SwRootFrame & rLayout)
{
SwTableCursor* pTableCursor = dynamic_cast<SwTableCursor*>(this);
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index c4d88972bb70..a72e4836b3ca 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -63,8 +63,8 @@
// MapMode. This is done so that on ShowCursor the same size does not have to
be
// expensively determined again and again.
-long SwSelPaintRects::s_nPixPtX = 0;
-long SwSelPaintRects::s_nPixPtY = 0;
+tools::Long SwSelPaintRects::s_nPixPtX = 0;
+tools::Long SwSelPaintRects::s_nPixPtY = 0;
MapMode* SwSelPaintRects::s_pMapMode = nullptr;
// Starting from here: classes / methods for the non-text-cursor
@@ -129,7 +129,7 @@ OString buildHyperlinkJSON(const OUString& sText, const
OUString& sLink)
void SwVisibleCursor::SetPosAndShow(SfxViewShell const * pViewShell)
{
SwRect aRect;
- long nTmpY = m_pCursorShell->m_aCursorHeight.getY();
+ tools::Long nTmpY = m_pCursorShell->m_aCursorHeight.getY();
if( 0 > nTmpY )
{
nTmpY = -nTmpY;
@@ -175,7 +175,7 @@ void SwVisibleCursor::SetPosAndShow(SfxViewShell const *
pViewShell)
const OutputDevice *pOut = m_pCursorShell->GetOut();
if ( pOut )
{
- long nSize =
pOut->GetSettings().GetStyleSettings().GetCursorSize();
+ tools::Long nSize =
pOut->GetSettings().GetStyleSettings().GetCursorSize();
Size aSize( nSize, nSize );
aSize = pOut->PixelToLogic( aSize );
aRect.Left( aRect.Left() - aSize.Width() );
@@ -589,7 +589,7 @@ void SwSelPaintRects::Invalidate( const SwRect& rRect )
// check current MapMode of the shell and set possibly the static members.
// Optional set the parameters pX, pY
void SwSelPaintRects::Get1PixelInLogic( const SwViewShell& rSh,
- long* pX, long* pY )
+ tools::Long* pX, tools::Long* pY )
{
const OutputDevice* pOut = rSh.GetWin();
if ( ! pOut )
diff --git a/sw/source/core/doc/CntntIdxStore.cxx
b/sw/source/core/doc/CntntIdxStore.cxx
index 0656d172b9de..c37221e189e8 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -71,7 +71,7 @@ namespace
}
struct MarkEntry
{
- long int m_nIdx;
+ tools::Long m_nIdx;
bool m_bOther;
sal_Int32 m_nContent;
#if 0
@@ -243,7 +243,7 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc& rDoc, sal_uLong
nNode, sal_Int32 nCon
{
if(pBkmk->GetMarkPos().nContent.GetIndex() < nContent)
{
- const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
+ const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
else // if a bookmark position is equal nContent, the other
position
@@ -255,10 +255,10 @@ void ContentIdxStoreImpl::SaveBkmks(SwDoc& rDoc,
sal_uLong nNode, sal_Int32 nCon
{
if(bMarkPosEqual)
{ // the other position is before, the (main) position is equal
- const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
+ const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), false,
pBkmk->GetMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
- const MarkEntry aEntry = { static_cast<long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), true,
pBkmk->GetOtherMarkPos().nContent.GetIndex() };
+ const MarkEntry aEntry = { static_cast<tools::Long>(ppBkmk -
pMarkAccess->getAllMarksBegin()), true,
pBkmk->GetOtherMarkPos().nContent.GetIndex() };
m_aBkmkEntries.push_back(aEntry);
}
}
@@ -286,7 +286,7 @@ void ContentIdxStoreImpl::RestoreBkmks(SwDoc& rDoc,
updater_t const & rUpdater)
void ContentIdxStoreImpl::SaveRedlines(SwDoc& rDoc, sal_uLong nNode, sal_Int32
nContent)
{
SwRedlineTable const & rRedlineTable =
rDoc.getIDocumentRedlineAccess().GetRedlineTable();
- long int nIdx = 0;
+ tools::Long nIdx = 0;
for (const SwRangeRedline* pRdl : rRedlineTable)
{
int nPointPos = lcl_RelativePosition( *pRdl->GetPoint(), nNode,
nContent );
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx
b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index ded1dc72fe1e..473e0dbe491b 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -3766,7 +3766,7 @@ void DocumentContentOperationsManager::CopyFlyInFlyImpl(
}
else
{
- long nOffset = newPos.nNode.GetIndex() - rRg.aStart.GetIndex();
+ tools::Long nOffset = newPos.nNode.GetIndex() -
rRg.aStart.GetIndex();
SwNodeIndex aIdx( rStartIdx, nOffset );
newPos.nNode = aIdx;
}
diff --git a/sw/source/core/doc/DocumentListsManager.cxx
b/sw/source/core/doc/DocumentListsManager.cxx
index d74e924fde95..177489aedfb2 100644
--- a/sw/source/core/doc/DocumentListsManager.cxx
+++ b/sw/source/core/doc/DocumentListsManager.cxx
@@ -180,7 +180,7 @@ DocumentListsManager::~DocumentListsManager()
OUString DocumentListsManager::MakeListIdUnique( const OUString&
aSuggestedUniqueListId )
{
- long nHitCount = 0;
+ tools::Long nHitCount = 0;
OUString aTmpStr = aSuggestedUniqueListId;
while ( getListByName( aTmpStr ) )
{
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx
b/sw/source/core/doc/DocumentRedlineManager.cxx
index 206a81a928b2..a3496039ab0f 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2509,7 +2509,7 @@ SwRedlineTable::size_type
DocumentRedlineManager::GetRedlinePos( const SwNode& r
const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
nMk = pTmp->GetMark()->nNode.GetIndex();
- if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; }
+ if( nPt < nMk ) { tools::Long nTmp = nMk; nMk = nPt; nPt = nTmp; }
if( ( RedlineType::Any == nType || nType == pTmp->GetType()) &&
nMk <= nNdIdx && nNdIdx <= nPt )
@@ -2726,7 +2726,7 @@ void
DocumentRedlineManager::AcceptRedlineParagraphFormatting( const SwPaM &rPam
const SwRangeRedline* pTmp = (*mpRedlineTable)[ n ];
sal_uLong nPt = pTmp->GetPoint()->nNode.GetIndex(),
nMk = pTmp->GetMark()->nNode.GetIndex();
- if( nPt < nMk ) { long nTmp = nMk; nMk = nPt; nPt = nTmp; }
+ if( nPt < nMk ) { tools::Long nTmp = nMk; nMk = nPt; nPt = nTmp; }
if( RedlineType::ParagraphFormat == pTmp->GetType() &&
( (nSttIdx <= nMk && nMk <= nEndIdx) || (nSttIdx <= nPt && nPt <=
nEndIdx) ) )
diff --git a/sw/source/core/doc/DocumentStatisticsManager.cxx
b/sw/source/core/doc/DocumentStatisticsManager.cxx
index 5d9a6faa94f4..91ca7aa498e9 100644
--- a/sw/source/core/doc/DocumentStatisticsManager.cxx
+++ b/sw/source/core/doc/DocumentStatisticsManager.cxx
@@ -102,7 +102,7 @@ void DocumentStatisticsManager::UpdateDocStat( bool
bCompleteAsync, bool bFields
}
// returns true while there is more to do
-bool DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool
bFields)
+bool DocumentStatisticsManager::IncrementalDocStatCalculate(tools::Long
nChars, bool bFields)
{
mbInitialized = true;
mpDocStat->Reset();
@@ -116,7 +116,7 @@ bool
DocumentStatisticsManager::IncrementalDocStatCalculate(long nChars, bool bF
{
case SwNodeType::Text:
{
- long const nOldChars(mpDocStat->nChar);
+ tools::Long const nOldChars(mpDocStat->nChar);
SwTextNode *pText = static_cast< SwTextNode * >( pNd );
if (pText->CountWords(*mpDocStat, 0, pText->GetText().getLength()))
{
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 0244670d288e..5c2fdf4cf16e 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -106,15 +106,15 @@ namespace
PT_7, PT_7, PT_7, PT_7, PT_7 // HTML mode
};
- long lcl_GetRightMargin( SwDoc& rDoc )
+ tools::Long lcl_GetRightMargin( SwDoc& rDoc )
{
// Make sure that the printer settings are taken over to the standard
// page style
const SwFrameFormat& rPgDscFormat = rDoc.GetPageDesc( 0 ).GetMaster();
const SvxLRSpaceItem& rLR = rPgDscFormat.GetLRSpace();
- const long nLeft = rLR.GetLeft();
- const long nRight = rLR.GetRight();
- const long nWidth = rPgDscFormat.GetFrameSize().GetWidth();
+ const tools::Long nLeft = rLR.GetLeft();
+ const tools::Long nRight = rLR.GetRight();
+ const tools::Long nWidth = rPgDscFormat.GetFrameSize().GetWidth();
return nWidth - nLeft - nRight;
}
@@ -238,7 +238,7 @@ namespace
}
if( bTab )
{
- long nRightMargin = lcl_GetRightMargin( rDoc );
+ tools::Long nRightMargin = lcl_GetRightMargin( rDoc );
SvxTabStopItem aTStops( 0, 0, SvxTabAdjust::Default,
RES_PARATR_TABSTOP );
aTStops.Insert( SvxTabStop( nRightMargin - nLeft,
SvxTabAdjust::Right,
@@ -908,7 +908,7 @@ SwTextFormatColl*
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
aLN.SetCountLines( false );
aSet.Put( aLN );
- long nRightMargin = lcl_GetRightMargin( m_rDoc );
+ tools::Long nRightMargin = lcl_GetRightMargin( m_rDoc );
SvxTabStopItem aTStops( 0, 0, SvxTabAdjust::Default,
RES_PARATR_TABSTOP );
aTStops.Insert( SvxTabStop( nRightMargin / 2,
SvxTabAdjust::Center ) );
@@ -1573,7 +1573,7 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool(
sal_uInt16 nId )
case RES_POOLCHR_RUBYTEXT:
{
- long nH = GetDfltAttr( RES_CHRATR_CJK_FONTSIZE )->GetHeight() / 2;
+ tools::Long nH = GetDfltAttr( RES_CHRATR_CJK_FONTSIZE
)->GetHeight() / 2;
SetAllScriptItem( aSet, SvxFontHeightItem( nH, 100,
RES_CHRATR_FONTSIZE));
aSet.Put(SvxUnderlineItem( LINESTYLE_NONE, RES_CHRATR_UNDERLINE ));
aSet.Put(SvxEmphasisMarkItem( FontEmphasisMark::NONE,
RES_CHRATR_EMPHASIS_MARK) );
@@ -2032,7 +2032,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
aFormat.SetIncludeUpperLevels( 1 );
aFormat.SetSuffix( "." );
- long const nOffs = 397; // 0.70 cm
+ tools::Long const nOffs = 397; // 0.70 cm
if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
{
@@ -2052,7 +2052,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
}
else if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
- long nPos = (n+1) * nOffs;
+ tools::Long nPos = (n+1) * nOffs;
aFormat.SetListtabPos(nPos + 357);
aFormat.SetIndentAt(nPos + 357);
}
@@ -2210,7 +2210,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
}
else if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
- long nPos = nOffs2 + ((n-3) * static_cast<long>(nOffs));
+ tools::Long nPos = nOffs2 + ((n-3) *
static_cast<tools::Long>(nOffs));
aFormat.SetListtabPos(nPos);
aFormat.SetIndentAt(nPos);
}
@@ -2344,7 +2344,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool(
sal_uInt16 nId )
}
else if ( eNumberFormatPositionAndSpaceMode ==
SvxNumberFormat::LABEL_ALIGNMENT )
{
- long nPos = ((n & 1) +1) * static_cast<long>(nOffs);
+ tools::Long nPos = ((n & 1) +1) *
static_cast<tools::Long>(nOffs);
aFormat.SetListtabPos(nPos);
aFormat.SetIndentAt(nPos);
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 87aecbdf908d..7fda1705f0f0 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1229,13 +1229,13 @@ void SwDoc::Summary(SwDoc& rExtDoc, sal_uInt8 nLevel,
sal_uInt8 nPara, bool bImp
SwNodeIndex aEndOfDoc( rExtDoc.GetNodes().GetEndOfContent(), -1 );
for( SwOutlineNodes::size_type i = 0; i < rOutNds.size(); ++i )
{
- ::SetProgressState( static_cast<long>(i), GetDocShell() );
+ ::SetProgressState( static_cast<tools::Long>(i), GetDocShell() );
const sal_uLong nIndex = rOutNds[ i ]->GetIndex();
const int nLvl = GetNodes()[ nIndex
]->GetTextNode()->GetAttrOutlineLevel()-1;
if( nLvl > nLevel )
continue;
- long nEndOfs = 1;
+ tools::Long nEndOfs = 1;
sal_uInt8 nWish = nPara;
sal_uLong nNextOutNd = i + 1 < rOutNds.size() ?
rOutNds[ i + 1 ]->GetIndex() : GetNodes().Count();
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index 6c4ff48e09ff..1b81e89ab4c8 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -226,7 +226,7 @@ private:
CompareData &m_rData1, &m_rData2;
const MovedData &m_rMoved1, &m_rMoved2;
std::unique_ptr<long[]> m_pMemory;
- long *m_pFDiag, *m_pBDiag;
+ tools::Long *m_pFDiag, *m_pBDiag;
void Compare( sal_uLong nStt1, sal_uLong nEnd1, sal_uLong nStt2,
sal_uLong nEnd2 );
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
