summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Driesner <cd@openoffice.org>2011-01-17 15:06:54 +0100
committerCarsten Driesner <cd@openoffice.org>2011-01-17 15:06:54 +0100
commit7f33ed417b2e29e5470724ea76967f64699a2662 (patch)
treeabfa1432c5ffffe4c7502d4ddcaee918c584c69c
parent80731dbfcb48a2ffec30a4b2abe1ba8ada8f0169 (diff)
removetooltypes01: #i112600# Remove tools types from sw
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx16
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx2
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx12
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx4
-rw-r--r--sw/inc/PostItMgr.hxx8
-rw-r--r--sw/inc/SidebarWin.hxx10
-rw-r--r--sw/inc/SwAppletImpl.hxx6
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx2
-rw-r--r--sw/inc/SwUndoField.hxx10
-rw-r--r--sw/inc/SwUndoFmt.hxx10
-rw-r--r--sw/inc/accessibilityoptions.hxx24
-rw-r--r--sw/inc/acmplwrd.hxx22
-rw-r--r--sw/inc/authfld.hxx44
-rw-r--r--sw/inc/authratr.hxx6
-rw-r--r--sw/inc/bparr.hxx44
-rw-r--r--sw/inc/breakit.hxx4
-rw-r--r--sw/inc/calbck.hxx40
-rw-r--r--sw/inc/calc.hxx22
-rw-r--r--sw/inc/ccoll.hxx14
-rw-r--r--sw/inc/cellatr.hxx22
-rw-r--r--sw/inc/cellfml.hxx24
-rw-r--r--sw/inc/charatr.hxx132
-rw-r--r--sw/inc/charfmt.hxx4
-rw-r--r--sw/inc/chpfld.hxx20
-rw-r--r--sw/inc/crsrsh.hxx432
-rw-r--r--sw/inc/crsskip.hxx6
-rw-r--r--sw/inc/crstate.hxx102
-rw-r--r--sw/inc/cshtyp.hxx8
-rw-r--r--sw/inc/dbfld.hxx88
-rw-r--r--sw/inc/dbmgr.hxx106
-rw-r--r--sw/inc/dcontact.hxx8
-rw-r--r--sw/inc/ddefld.hxx24
-rw-r--r--sw/inc/doc.hxx244
-rw-r--r--sw/inc/docary.hxx26
-rw-r--r--sw/inc/docsh.hxx72
-rw-r--r--sw/inc/docstat.hxx18
-rw-r--r--sw/inc/docstyle.hxx64
-rw-r--r--sw/inc/docufld.hxx178
-rw-r--r--sw/inc/dpage.hxx6
-rw-r--r--sw/inc/edglbldc.hxx6
-rw-r--r--sw/inc/edimp.hxx18
-rw-r--r--sw/inc/editsh.hxx352
-rw-r--r--sw/inc/errhdl.hxx8
-rw-r--r--sw/inc/expfld.hxx144
-rw-r--r--sw/inc/extinput.hxx10
-rw-r--r--sw/inc/fchrfmt.hxx6
-rw-r--r--sw/inc/fesh.hxx334
-rw-r--r--sw/inc/fldbas.hxx76
-rw-r--r--sw/inc/flddat.hxx20
-rw-r--r--sw/inc/flddropdown.hxx10
-rw-r--r--sw/inc/flypos.hxx10
-rw-r--r--sw/inc/fmtanchr.hxx18
-rw-r--r--sw/inc/fmtautofmt.hxx6
-rw-r--r--sw/inc/fmtclbl.hxx6
-rw-r--r--sw/inc/fmtclds.hxx80
-rw-r--r--sw/inc/fmtcnct.hxx6
-rw-r--r--sw/inc/fmtcntnt.hxx4
-rw-r--r--sw/inc/fmtcol.hxx54
-rw-r--r--sw/inc/fmteiro.hxx8
-rw-r--r--sw/inc/fmtfld.hxx6
-rw-r--r--sw/inc/fmtfollowtextflow.hxx6
-rw-r--r--sw/inc/fmtfordr.hxx6
-rw-r--r--sw/inc/fmtfsize.hxx20
-rw-r--r--sw/inc/fmtftn.hxx8
-rw-r--r--sw/inc/fmtftntx.hxx26
-rw-r--r--sw/inc/fmthdft.hxx24
-rw-r--r--sw/inc/fmtinfmt.hxx24
-rw-r--r--sw/inc/fmtline.hxx18
-rw-r--r--sw/inc/fmtlsplt.hxx6
-rwxr-xr-xsw/inc/fmtmeta.hxx6
-rw-r--r--sw/inc/fmtornt.hxx30
-rw-r--r--sw/inc/fmtpdsc.hxx22
-rw-r--r--sw/inc/fmtrowsplt.hxx6
-rw-r--r--sw/inc/fmtruby.hxx26
-rw-r--r--sw/inc/fmtsrnd.hxx30
-rw-r--r--sw/inc/fmturl.hxx14
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx8
-rw-r--r--sw/inc/format.hxx298
-rw-r--r--sw/inc/frmatr.hxx52
-rw-r--r--sw/inc/frmfmt.hxx20
-rw-r--r--sw/inc/ftnidx.hxx6
-rw-r--r--sw/inc/ftninfo.hxx6
-rw-r--r--sw/inc/grfatr.hxx104
-rw-r--r--sw/inc/hfspacingitem.hxx8
-rw-r--r--sw/inc/hhcwrp.hxx8
-rw-r--r--sw/inc/hintids.hxx52
-rw-r--r--sw/inc/hints.hxx24
-rw-r--r--sw/inc/htmltbl.hxx330
-rw-r--r--sw/inc/index.hxx34
-rw-r--r--sw/inc/inetfld.hxx6
-rw-r--r--sw/inc/io.hxx4
-rw-r--r--sw/inc/iodetect.hxx16
-rw-r--r--sw/inc/itabenum.hxx20
-rw-r--r--sw/inc/lineinfo.hxx44
-rw-r--r--sw/inc/list.hxx2
-rw-r--r--sw/inc/mdiexp.hxx16
-rw-r--r--sw/inc/modcfg.hxx106
-rw-r--r--sw/inc/ndarr.hxx76
-rw-r--r--sw/inc/ndgrf.hxx68
-rw-r--r--sw/inc/ndhints.hxx34
-rw-r--r--sw/inc/ndindex.hxx110
-rw-r--r--sw/inc/ndnotxt.hxx30
-rw-r--r--sw/inc/ndole.hxx20
-rw-r--r--sw/inc/ndtxt.hxx122
-rw-r--r--sw/inc/ndtyp.hxx24
-rw-r--r--sw/inc/newhdl.hxx6
-rw-r--r--sw/inc/node.hxx168
-rw-r--r--sw/inc/numrule.hxx92
-rw-r--r--sw/inc/pagedesc.hxx84
-rw-r--r--sw/inc/pageiter.hxx8
-rw-r--r--sw/inc/pam.hxx56
-rw-r--r--sw/inc/paratr.hxx110
-rw-r--r--sw/inc/poolfmt.hxx42
-rw-r--r--sw/inc/postithelper.hxx2
-rw-r--r--sw/inc/pvprtdat.hxx44
-rw-r--r--sw/inc/redline.hxx78
-rw-r--r--sw/inc/redlnaut.hxx2
-rw-r--r--sw/inc/reffld.hxx22
-rw-r--r--sw/inc/rolbck.hxx106
-rw-r--r--sw/inc/section.hxx14
-rw-r--r--sw/inc/shellio.hxx258
-rw-r--r--sw/inc/shellres.hxx4
-rw-r--r--sw/inc/sortopt.hxx12
-rw-r--r--sw/inc/swabstdlg.hxx102
-rw-r--r--sw/inc/swacorr.hxx4
-rw-r--r--sw/inc/swatrset.hxx244
-rw-r--r--sw/inc/swbaslnk.hxx30
-rw-r--r--sw/inc/swcalwrp.hxx4
-rw-r--r--sw/inc/swcli.hxx8
-rw-r--r--sw/inc/swcrsr.hxx176
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swerror.h4
-rw-r--r--sw/inc/swevent.hxx2
-rw-r--r--sw/inc/swgstr.hxx40
-rw-r--r--sw/inc/swmodule.hxx6
-rw-r--r--sw/inc/swrect.hxx34
-rw-r--r--sw/inc/swregion.hxx8
-rw-r--r--sw/inc/swserv.hxx8
-rw-r--r--sw/inc/swtable.hxx150
-rw-r--r--sw/inc/swtypes.hxx20
-rw-r--r--sw/inc/swunohelper.hxx16
-rw-r--r--sw/inc/swurl.hxx2
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx28
-rw-r--r--sw/inc/tblafmt.hxx66
-rw-r--r--sw/inc/tblenum.hxx2
-rw-r--r--sw/inc/tblsel.hxx30
-rw-r--r--sw/inc/tgrditem.hxx50
-rw-r--r--sw/inc/tox.hxx186
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/txatbase.hxx4
-rw-r--r--sw/inc/txatritr.hxx4
-rw-r--r--sw/inc/txtatr.hxx10
-rw-r--r--sw/inc/txtftn.hxx12
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/undobj.hxx466
-rw-r--r--sw/inc/unoatxt.hxx16
-rw-r--r--sw/inc/unochart.hxx2
-rw-r--r--sw/inc/unocoll.hxx18
-rw-r--r--sw/inc/unocrsr.hxx24
-rw-r--r--sw/inc/unocrsrhelper.hxx4
-rw-r--r--sw/inc/unodraw.hxx4
-rw-r--r--sw/inc/unoevtlstnr.hxx2
-rw-r--r--sw/inc/unofield.hxx12
-rw-r--r--sw/inc/unoflatpara.hxx6
-rw-r--r--sw/inc/unoframe.hxx8
-rw-r--r--sw/inc/unomailmerge.hxx6
-rw-r--r--sw/inc/unoprnms.hxx6
-rw-r--r--sw/inc/unoredline.hxx2
-rw-r--r--sw/inc/unoredlines.hxx8
-rw-r--r--sw/inc/unosett.hxx12
-rw-r--r--sw/inc/unosrch.hxx2
-rw-r--r--sw/inc/unostyle.hxx8
-rw-r--r--sw/inc/unotbl.hxx16
-rw-r--r--sw/inc/unotextrange.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx8
-rw-r--r--sw/inc/usrfld.hxx44
-rw-r--r--[-rwxr-xr-x]sw/inc/viewopt.hxx430
-rw-r--r--sw/inc/viewsh.hxx6
-rw-r--r--sw/inc/viscrs.hxx28
-rw-r--r--sw/inc/wdocsh.hxx6
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx22
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx14
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx20
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accmap.cxx2
-rw-r--r--sw/source/core/access/accpara.cxx50
-rw-r--r--sw/source/core/access/accpara.hxx2
-rw-r--r--sw/source/core/access/accportions.cxx48
-rw-r--r--sw/source/core/access/accportions.hxx24
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx10
-rw-r--r--sw/source/core/attr/calbck.cxx40
-rw-r--r--sw/source/core/attr/cellatr.cxx12
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx4
-rw-r--r--sw/source/core/attr/format.cxx98
-rw-r--r--sw/source/core/attr/hints.cxx40
-rw-r--r--sw/source/core/attr/swatrset.cxx38
-rw-r--r--sw/source/core/bastyp/bparr.cxx92
-rw-r--r--sw/source/core/bastyp/breakit.cxx12
-rw-r--r--sw/source/core/bastyp/calc.cxx140
-rw-r--r--sw/source/core/bastyp/index.cxx10
-rw-r--r--sw/source/core/bastyp/init.cxx86
-rw-r--r--sw/source/core/bastyp/swcache.cxx46
-rw-r--r--sw/source/core/bastyp/swrect.cxx18
-rw-r--r--sw/source/core/bastyp/swregion.cxx32
-rw-r--r--sw/source/core/bastyp/tabcol.cxx20
-rw-r--r--sw/source/core/crsr/callnk.cxx14
-rw-r--r--sw/source/core/crsr/callnk.hxx10
-rw-r--r--sw/source/core/crsr/crsrsh.cxx494
-rw-r--r--sw/source/core/crsr/crstrvl.cxx306
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx30
-rw-r--r--sw/source/core/crsr/findattr.cxx234
-rw-r--r--sw/source/core/crsr/findcoll.cxx14
-rw-r--r--sw/source/core/crsr/findfmt.cxx14
-rw-r--r--sw/source/core/crsr/findtxt.cxx68
-rw-r--r--sw/source/core/crsr/pam.cxx224
-rw-r--r--sw/source/core/crsr/paminit.cxx14
-rw-r--r--sw/source/core/crsr/swcrsr.cxx446
-rw-r--r--sw/source/core/crsr/trvlcol.cxx8
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx60
-rw-r--r--sw/source/core/crsr/trvlreg.cxx74
-rw-r--r--sw/source/core/crsr/trvltbl.cxx122
-rw-r--r--sw/source/core/crsr/unocrsr.cxx32
-rw-r--r--sw/source/core/crsr/viscrs.cxx86
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx8
-rw-r--r--sw/source/core/doc/acmplwrd.cxx58
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx40
-rw-r--r--sw/source/core/doc/doc.cxx236
-rw-r--r--sw/source/core/doc/docbasic.cxx22
-rw-r--r--sw/source/core/doc/docbm.cxx104
-rw-r--r--sw/source/core/doc/docchart.cxx12
-rw-r--r--sw/source/core/doc/doccomp.cxx328
-rw-r--r--sw/source/core/doc/doccorr.cxx24
-rw-r--r--sw/source/core/doc/docdde.cxx42
-rw-r--r--sw/source/core/doc/docdesc.cxx126
-rw-r--r--sw/source/core/doc/docdraw.cxx44
-rw-r--r--sw/source/core/doc/docedt.cxx46
-rw-r--r--sw/source/core/doc/docfld.cxx302
-rw-r--r--sw/source/core/doc/docfly.cxx100
-rw-r--r--sw/source/core/doc/docfmt.cxx280
-rw-r--r--sw/source/core/doc/docftn.cxx52
-rw-r--r--sw/source/core/doc/docglbl.cxx66
-rw-r--r--sw/source/core/doc/docglos.cxx12
-rw-r--r--sw/source/core/doc/doclay.cxx34
-rw-r--r--sw/source/core/doc/docnew.cxx58
-rw-r--r--sw/source/core/doc/docnum.cxx386
-rw-r--r--sw/source/core/doc/docredln.cxx466
-rw-r--r--sw/source/core/doc/docruby.cxx38
-rw-r--r--sw/source/core/doc/docsort.cxx162
-rw-r--r--sw/source/core/doc/docstat.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx248
-rw-r--r--sw/source/core/doc/extinput.cxx14
-rw-r--r--sw/source/core/doc/fmtcol.cxx94
-rw-r--r--sw/source/core/doc/ftnidx.cxx68
-rw-r--r--sw/source/core/doc/gctable.cxx128
-rw-r--r--sw/source/core/doc/htmltbl.cxx486
-rw-r--r--sw/source/core/doc/lineinfo.cxx10
-rw-r--r--sw/source/core/doc/list.cxx8
-rw-r--r--sw/source/core/doc/notxtfrm.cxx100
-rw-r--r--sw/source/core/doc/number.cxx164
-rw-r--r--sw/source/core/doc/poolfmt.cxx396
-rw-r--r--sw/source/core/doc/sortopt.cxx10
-rw-r--r--sw/source/core/doc/swserv.cxx38
-rw-r--r--sw/source/core/doc/tblafmt.cxx224
-rw-r--r--sw/source/core/doc/tblcpy.cxx208
-rw-r--r--sw/source/core/doc/tblrwcl.cxx992
-rw-r--r--sw/source/core/doc/visiturl.cxx12
-rw-r--r--sw/source/core/docnode/ndcopy.cxx156
-rw-r--r--sw/source/core/docnode/ndindex.cxx6
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx64
-rw-r--r--sw/source/core/docnode/ndnum.cxx28
-rw-r--r--sw/source/core/docnode/ndsect.cxx150
-rw-r--r--sw/source/core/docnode/ndtbl.cxx746
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx302
-rw-r--r--sw/source/core/docnode/node.cxx258
-rw-r--r--sw/source/core/docnode/node2lay.cxx54
-rw-r--r--sw/source/core/docnode/nodes.cxx276
-rw-r--r--sw/source/core/docnode/section.cxx152
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx86
-rw-r--r--sw/source/core/draw/dcontact.cxx58
-rw-r--r--sw/source/core/draw/dflyobj.cxx46
-rw-r--r--sw/source/core/draw/dpage.cxx12
-rw-r--r--sw/source/core/draw/drawdoc.cxx16
-rw-r--r--sw/source/core/draw/dview.cxx86
-rw-r--r--sw/source/core/edit/acorrect.cxx66
-rw-r--r--sw/source/core/edit/autofmt.cxx448
-rw-r--r--sw/source/core/edit/edatmisc.cxx12
-rw-r--r--sw/source/core/edit/edattr.cxx112
-rw-r--r--sw/source/core/edit/eddel.cxx34
-rw-r--r--sw/source/core/edit/edfcol.cxx16
-rw-r--r--sw/source/core/edit/edfld.cxx88
-rw-r--r--sw/source/core/edit/edfldexp.cxx16
-rw-r--r--sw/source/core/edit/edfmt.cxx22
-rw-r--r--sw/source/core/edit/edglbldc.cxx70
-rw-r--r--sw/source/core/edit/edglss.cxx52
-rw-r--r--sw/source/core/edit/editsh.cxx120
-rw-r--r--sw/source/core/edit/edlingu.cxx50
-rw-r--r--sw/source/core/edit/ednumber.cxx144
-rw-r--r--sw/source/core/edit/edredln.cxx26
-rw-r--r--sw/source/core/edit/edsect.cxx32
-rw-r--r--sw/source/core/edit/edtab.cxx82
-rw-r--r--sw/source/core/edit/edtox.cxx76
-rw-r--r--sw/source/core/edit/edundo.cxx44
-rw-r--r--sw/source/core/except/dbgloop.cxx10
-rw-r--r--sw/source/core/except/errhdl.cxx22
-rw-r--r--sw/source/core/fields/authfld.cxx96
-rw-r--r--sw/source/core/fields/cellfml.cxx92
-rw-r--r--sw/source/core/fields/chpfld.cxx18
-rw-r--r--sw/source/core/fields/dbfld.cxx112
-rw-r--r--sw/source/core/fields/ddefld.cxx40
-rw-r--r--sw/source/core/fields/ddetbl.cxx18
-rw-r--r--sw/source/core/fields/docufld.cxx84
-rw-r--r--sw/source/core/fields/expfld.cxx138
-rw-r--r--sw/source/core/fields/fldbas.cxx88
-rw-r--r--sw/source/core/fields/flddat.cxx24
-rw-r--r--sw/source/core/fields/flddropdown.cxx8
-rw-r--r--sw/source/core/fields/fldlst.cxx28
-rw-r--r--sw/source/core/fields/macrofld.cxx24
-rw-r--r--sw/source/core/fields/reffld.cxx86
-rw-r--r--sw/source/core/fields/scrptfld.cxx10
-rw-r--r--sw/source/core/fields/tblcalc.cxx18
-rw-r--r--sw/source/core/fields/usrfld.cxx14
-rw-r--r--sw/source/core/frmedt/fecopy.cxx176
-rw-r--r--sw/source/core/frmedt/fedesc.cxx34
-rw-r--r--sw/source/core/frmedt/fefly1.cxx30
-rw-r--r--sw/source/core/frmedt/feflyole.cxx12
-rw-r--r--sw/source/core/frmedt/feshview.cxx286
-rw-r--r--sw/source/core/frmedt/fetab.cxx312
-rw-r--r--sw/source/core/frmedt/fews.cxx108
-rw-r--r--sw/source/core/frmedt/tblsel.cxx372
-rw-r--r--sw/source/core/graphic/grfatr.cxx74
-rw-r--r--sw/source/core/graphic/ndgrf.cxx112
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx6
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx10
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx58
-rw-r--r--sw/source/core/inc/acorrect.hxx34
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx2
-rw-r--r--sw/source/core/inc/blink.hxx16
-rw-r--r--sw/source/core/inc/cellfrm.hxx4
-rw-r--r--sw/source/core/inc/cntfrm.hxx44
-rw-r--r--sw/source/core/inc/dbg_lay.hxx20
-rw-r--r--sw/source/core/inc/dbgloop.hxx4
-rw-r--r--sw/source/core/inc/dflyobj.hxx16
-rw-r--r--sw/source/core/inc/docfld.hxx32
-rw-r--r--sw/source/core/inc/docsort.hxx60
-rw-r--r--sw/source/core/inc/doctxm.hxx10
-rw-r--r--sw/source/core/inc/drawdev.hxx28
-rw-r--r--sw/source/core/inc/drawfont.hxx154
-rw-r--r--sw/source/core/inc/dview.hxx8
-rw-r--r--sw/source/core/inc/flowfrm.hxx94
-rw-r--r--sw/source/core/inc/flyfrm.hxx114
-rw-r--r--sw/source/core/inc/flyfrms.hxx18
-rw-r--r--sw/source/core/inc/fntcache.hxx46
-rw-r--r--sw/source/core/inc/frame.hxx376
-rw-r--r--sw/source/core/inc/frminf.hxx12
-rw-r--r--sw/source/core/inc/frmtool.hxx152
-rw-r--r--sw/source/core/inc/ftnboss.hxx12
-rw-r--r--sw/source/core/inc/ftnfrm.hxx22
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/layact.hxx148
-rw-r--r--sw/source/core/inc/laycache.hxx4
-rw-r--r--sw/source/core/inc/layfrm.hxx32
-rw-r--r--sw/source/core/inc/layouter.hxx10
-rw-r--r--sw/source/core/inc/mvsave.hxx32
-rw-r--r--sw/source/core/inc/node2lay.hxx6
-rw-r--r--sw/source/core/inc/noteurl.hxx6
-rw-r--r--sw/source/core/inc/notxtfrm.hxx12
-rw-r--r--sw/source/core/inc/pagefrm.hxx122
-rw-r--r--sw/source/core/inc/pamtyp.hxx50
-rw-r--r--sw/source/core/inc/rootfrm.hxx106
-rw-r--r--sw/source/core/inc/rowfrm.hxx24
-rw-r--r--sw/source/core/inc/scriptinfo.hxx48
-rw-r--r--sw/source/core/inc/sectfrm.hxx60
-rw-r--r--sw/source/core/inc/swblocks.hxx136
-rw-r--r--sw/source/core/inc/swcache.hxx68
-rw-r--r--sw/source/core/inc/swfont.hxx354
-rw-r--r--sw/source/core/inc/tabfrm.hxx82
-rw-r--r--sw/source/core/inc/tblrwcl.hxx92
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx88
-rw-r--r--sw/source/core/inc/txtfrm.hxx48
-rw-r--r--sw/source/core/inc/txttypes.hxx4
-rwxr-xr-xsw/source/core/inc/unometa.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx44
-rw-r--r--sw/source/core/inc/wrong.hxx28
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx118
-rw-r--r--sw/source/core/layout/calcmove.cxx276
-rw-r--r--sw/source/core/layout/colfrm.cxx74
-rw-r--r--sw/source/core/layout/dbg_lay.cxx126
-rw-r--r--sw/source/core/layout/findfrm.cxx82
-rw-r--r--sw/source/core/layout/flowfrm.cxx326
-rw-r--r--sw/source/core/layout/fly.cxx182
-rw-r--r--sw/source/core/layout/flycnt.cxx104
-rw-r--r--sw/source/core/layout/flyincnt.cxx30
-rw-r--r--sw/source/core/layout/flylay.cxx82
-rw-r--r--sw/source/core/layout/flypos.cxx14
-rw-r--r--sw/source/core/layout/frmtool.cxx278
-rw-r--r--sw/source/core/layout/ftnfrm.cxx284
-rw-r--r--sw/source/core/layout/hffrm.cxx38
-rw-r--r--sw/source/core/layout/layact.cxx374
-rw-r--r--sw/source/core/layout/laycache.cxx226
-rw-r--r--sw/source/core/layout/layhelp.hxx76
-rw-r--r--sw/source/core/layout/layouter.cxx36
-rw-r--r--sw/source/core/layout/newfrm.cxx34
-rw-r--r--sw/source/core/layout/objectformatter.cxx4
-rw-r--r--sw/source/core/layout/pagechg.cxx202
-rw-r--r--sw/source/core/layout/pagedesc.cxx24
-rw-r--r--sw/source/core/layout/paintfrm.cxx386
-rw-r--r--sw/source/core/layout/sectfrm.cxx332
-rw-r--r--sw/source/core/layout/softpagebreak.cxx4
-rw-r--r--sw/source/core/layout/ssfrm.cxx76
-rw-r--r--sw/source/core/layout/tabfrm.cxx484
-rw-r--r--sw/source/core/layout/trvlfrm.cxx304
-rw-r--r--sw/source/core/layout/unusedf.cxx26
-rw-r--r--sw/source/core/layout/virtoutp.cxx24
-rw-r--r--sw/source/core/layout/virtoutp.hxx8
-rw-r--r--sw/source/core/layout/wsfrm.cxx256
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx14
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx14
-rw-r--r--sw/source/core/ole/ndole.cxx72
-rw-r--r--sw/source/core/para/paratr.cxx12
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx30
-rw-r--r--sw/source/core/sw3io/swacorr.cxx12
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx124
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx34
-rw-r--r--sw/source/core/swg/swblocks.cxx200
-rw-r--r--sw/source/core/table/swnewtable.cxx372
-rw-r--r--sw/source/core/table/swtable.cxx398
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx52
-rw-r--r--sw/source/core/text/atrhndl.hxx24
-rw-r--r--sw/source/core/text/atrstck.cxx64
-rw-r--r--sw/source/core/text/blink.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx22
-rw-r--r--sw/source/core/text/frmform.cxx8
-rw-r--r--sw/source/core/text/frmpaint.cxx2
-rw-r--r--sw/source/core/text/guess.cxx18
-rw-r--r--sw/source/core/text/inftxt.cxx104
-rw-r--r--sw/source/core/text/inftxt.hxx42
-rw-r--r--sw/source/core/text/itradj.cxx28
-rw-r--r--sw/source/core/text/itratr.cxx38
-rw-r--r--sw/source/core/text/itratr.hxx6
-rw-r--r--sw/source/core/text/itrcrsr.cxx48
-rw-r--r--sw/source/core/text/itrform2.cxx58
-rw-r--r--sw/source/core/text/itrform2.hxx4
-rw-r--r--sw/source/core/text/itrpaint.cxx22
-rw-r--r--sw/source/core/text/itrtxt.cxx16
-rw-r--r--sw/source/core/text/itrtxt.hxx4
-rw-r--r--sw/source/core/text/pordrop.hxx6
-rw-r--r--sw/source/core/text/porexp.hxx8
-rw-r--r--sw/source/core/text/porfld.cxx62
-rw-r--r--sw/source/core/text/porfld.hxx12
-rw-r--r--sw/source/core/text/porfly.cxx12
-rw-r--r--sw/source/core/text/porftn.hxx4
-rw-r--r--sw/source/core/text/porglue.cxx2
-rw-r--r--sw/source/core/text/porlay.cxx164
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.cxx16
-rw-r--r--sw/source/core/text/pormulti.cxx78
-rw-r--r--sw/source/core/text/pormulti.hxx24
-rw-r--r--sw/source/core/text/porrst.cxx4
-rw-r--r--sw/source/core/text/porrst.hxx4
-rw-r--r--sw/source/core/text/portab.hxx6
-rw-r--r--sw/source/core/text/portxt.cxx18
-rw-r--r--sw/source/core/text/redlnitr.cxx6
-rw-r--r--sw/source/core/text/redlnitr.hxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx30
-rw-r--r--sw/source/core/text/txtfld.cxx4
-rw-r--r--sw/source/core/text/txtfly.cxx24
-rw-r--r--sw/source/core/text/txtfly.hxx2
-rw-r--r--sw/source/core/text/txtfrm.cxx36
-rw-r--r--sw/source/core/text/txtftn.cxx26
-rw-r--r--sw/source/core/text/txthyph.cxx2
-rw-r--r--sw/source/core/text/txttab.cxx12
-rw-r--r--sw/source/core/text/widorp.cxx2
-rw-r--r--sw/source/core/text/wrong.cxx14
-rw-r--r--sw/source/core/tox/tox.cxx130
-rw-r--r--sw/source/core/tox/toxhlp.cxx2
-rw-r--r--sw/source/core/tox/txmsrt.cxx106
-rw-r--r--sw/source/core/txtnode/atrfld.cxx16
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx10
-rw-r--r--sw/source/core/txtnode/atrftn.cxx40
-rw-r--r--sw/source/core/txtnode/atrtox.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx74
-rw-r--r--sw/source/core/txtnode/fntcache.cxx198
-rw-r--r--sw/source/core/txtnode/fntcap.cxx60
-rw-r--r--sw/source/core/txtnode/ndhints.cxx60
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx398
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx166
-rw-r--r--sw/source/core/txtnode/thints.cxx228
-rw-r--r--sw/source/core/txtnode/txatritr.cxx14
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx38
-rw-r--r--sw/source/core/txtnode/txtedt.cxx166
-rw-r--r--sw/source/core/undo/SwUndoField.cxx12
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx90
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx56
-rw-r--r--sw/source/core/undo/docundo.cxx112
-rw-r--r--sw/source/core/undo/rolbck.cxx126
-rw-r--r--sw/source/core/undo/unattr.cxx60
-rw-r--r--sw/source/core/undo/undel.cxx130
-rw-r--r--sw/source/core/undo/undobj.cxx136
-rw-r--r--sw/source/core/undo/undobj1.cxx38
-rw-r--r--sw/source/core/undo/undraw.cxx56
-rw-r--r--sw/source/core/undo/unfmco.cxx2
-rw-r--r--sw/source/core/undo/unins.cxx84
-rw-r--r--sw/source/core/undo/unmove.cxx26
-rw-r--r--sw/source/core/undo/unnum.cxx48
-rw-r--r--sw/source/core/undo/unovwr.cxx60
-rw-r--r--sw/source/core/undo/unredln.cxx62
-rw-r--r--sw/source/core/undo/unsect.cxx12
-rw-r--r--sw/source/core/undo/unsort.cxx30
-rw-r--r--sw/source/core/undo/unspnd.cxx12
-rw-r--r--sw/source/core/undo/untbl.cxx358
-rw-r--r--sw/source/core/undo/untblk.cxx34
-rw-r--r--sw/source/core/unocore/swunohelper.cxx52
-rw-r--r--sw/source/core/unocore/unochart.cxx12
-rw-r--r--sw/source/core/unocore/unocoll.cxx22
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx24
-rw-r--r--sw/source/core/unocore/unodraw.cxx16
-rw-r--r--sw/source/core/unocore/unoevent.cxx4
-rw-r--r--sw/source/core/unocore/unofield.cxx62
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx18
-rw-r--r--sw/source/core/unocore/unoframe.cxx40
-rw-r--r--sw/source/core/unocore/unoidx.cxx12
-rw-r--r--sw/source/core/unocore/unomap.cxx2
-rw-r--r--sw/source/core/unocore/unoobj.cxx56
-rw-r--r--sw/source/core/unocore/unoobj2.cxx34
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx12
-rw-r--r--sw/source/core/unocore/unoport.cxx8
-rw-r--r--sw/source/core/unocore/unoportenum.cxx54
-rw-r--r--sw/source/core/unocore/unoprnms.cxx4
-rw-r--r--sw/source/core/unocore/unoredline.cxx10
-rw-r--r--sw/source/core/unocore/unoredlines.cxx12
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx10
-rw-r--r--sw/source/core/unocore/unosett.cxx70
-rw-r--r--sw/source/core/unocore/unosrch.cxx4
-rw-r--r--sw/source/core/unocore/unostyle.cxx54
-rw-r--r--sw/source/core/unocore/unotbl.cxx114
-rw-r--r--sw/source/core/unocore/unotext.cxx20
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx12
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx6
-rw-r--r--sw/source/core/view/printdata.cxx4
-rw-r--r--sw/source/core/view/vdraw.cxx26
-rw-r--r--sw/source/core/view/viewimp.cxx28
-rw-r--r--sw/source/core/view/viewpg.cxx2
-rw-r--r--sw/source/core/view/viewsh.cxx276
-rw-r--r--sw/source/core/view/vnew.cxx18
-rw-r--r--sw/source/core/view/vprint.cxx54
-rw-r--r--sw/source/filter/ascii/ascatr.cxx14
-rw-r--r--sw/source/filter/ascii/parasc.cxx24
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx20
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx2074
-rw-r--r--sw/source/filter/basflt/iodetect.cxx82
-rw-r--r--sw/source/filter/basflt/shellio.cxx134
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx10
-rw-r--r--sw/source/filter/html/css1atr.cxx330
-rw-r--r--sw/source/filter/html/htmlatr.cxx464
-rw-r--r--sw/source/filter/html/htmlbas.cxx24
-rw-r--r--sw/source/filter/html/htmlcss1.cxx416
-rw-r--r--sw/source/filter/html/htmlctxt.cxx108
-rw-r--r--sw/source/filter/html/htmlfld.cxx88
-rw-r--r--sw/source/filter/html/htmlfldw.cxx54
-rw-r--r--sw/source/filter/html/htmlfly.cxx254
-rw-r--r--sw/source/filter/html/htmlfly.hxx38
-rw-r--r--sw/source/filter/html/htmlflyt.cxx12
-rw-r--r--sw/source/filter/html/htmlform.cxx12
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/html/htmlftn.cxx70
-rw-r--r--sw/source/filter/html/htmlgrin.cxx186
-rw-r--r--sw/source/filter/html/htmlnum.cxx12
-rw-r--r--sw/source/filter/html/htmlplug.cxx124
-rw-r--r--sw/source/filter/html/htmlsect.cxx4
-rw-r--r--sw/source/filter/html/htmltab.cxx10
-rw-r--r--sw/source/filter/html/htmltabw.cxx6
-rw-r--r--sw/source/filter/html/parcss1.cxx154
-rw-r--r--sw/source/filter/html/svxcss1.cxx642
-rw-r--r--sw/source/filter/html/swcss1.hxx94
-rw-r--r--sw/source/filter/html/swhtml.cxx580
-rw-r--r--sw/source/filter/html/swhtml.hxx4
-rw-r--r--sw/source/filter/html/wrthtml.cxx16
-rw-r--r--sw/source/filter/html/wrthtml.hxx6
-rw-r--r--sw/source/filter/inc/fltbase.hxx26
-rw-r--r--sw/source/filter/inc/fltglbls.hxx46
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx240
-rw-r--r--sw/source/filter/inc/msfilter.hxx12
-rw-r--r--sw/source/filter/inc/rtf.hxx70
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx142
-rw-r--r--sw/source/filter/rtf/rtffld.cxx58
-rw-r--r--sw/source/filter/rtf/rtffly.cxx182
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx118
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx96
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx424
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx56
-rw-r--r--sw/source/filter/writer/writer.cxx78
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx10
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx194
-rw-r--r--sw/source/filter/ww1/fltshell.cxx376
-rw-r--r--sw/source/filter/ww1/w1class.cxx354
-rw-r--r--sw/source/filter/ww1/w1class.hxx646
-rw-r--r--sw/source/filter/ww1/w1filter.cxx212
-rw-r--r--sw/source/filter/ww1/w1par.cxx16
-rw-r--r--sw/source/filter/ww1/w1par.hxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx144
-rw-r--r--sw/source/filter/ww1/w1struct.hxx524
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx6
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx6
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx46
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx108
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx42
-rw-r--r--sw/source/filter/ww8/docxexport.cxx14
-rw-r--r--sw/source/filter/ww8/docxexport.hxx10
-rw-r--r--sw/source/filter/ww8/dump/dump8.cxx6
-rw-r--r--sw/source/filter/ww8/dump/dump8a.cxx382
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.cxx64
-rw-r--r--sw/source/filter/ww8/dump/msvbasic.hxx22
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.cxx6
-rw-r--r--sw/source/filter/ww8/dump/ww8darr.hxx4
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.cxx50
-rw-r--r--sw/source/filter/ww8/dump/ww8dout.hxx2
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.cxx598
-rw-r--r--sw/source/filter/ww8/dump/ww8scan.hxx892
-rw-r--r--sw/source/filter/ww8/dump/ww8struc.hxx290
-rw-r--r--sw/source/filter/ww8/escher.hxx32
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx104
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx44
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx92
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx36
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx2
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx12
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx8
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx46
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx8
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx16
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx190
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx130
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx134
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx270
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx374
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx348
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx78
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx378
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx50
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx18
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx10
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx290
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx26
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx72
-rw-r--r--sw/source/filter/ww8/ww8par.cxx324
-rw-r--r--sw/source/filter/ww8/ww8par.hxx398
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx334
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx68
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx74
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx50
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx142
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx478
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx636
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx940
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx300
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx6
-rw-r--r--sw/source/filter/xml/swxml.cxx28
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx8
-rw-r--r--sw/source/filter/xml/xmlitem.cxx6
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx4
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx4
-rw-r--r--sw/source/filter/xml/xmltbli.cxx8
-rw-r--r--sw/source/filter/xml/xmltbli.hxx2
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/ui/app/appenv.cxx76
-rw-r--r--sw/source/ui/app/apphdl.cxx16
-rw-r--r--sw/source/ui/app/appopt.cxx86
-rw-r--r--sw/source/ui/app/docsh.cxx162
-rw-r--r--sw/source/ui/app/docsh2.cxx240
-rw-r--r--sw/source/ui/app/docshini.cxx44
-rw-r--r--sw/source/ui/app/docst.cxx136
-rw-r--r--sw/source/ui/app/docstyle.cxx414
-rw-r--r--sw/source/ui/app/mainwn.cxx12
-rw-r--r--sw/source/ui/app/swmodul1.cxx12
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/app/swwait.cxx18
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx12
-rw-r--r--sw/source/ui/cctrl/popbox.cxx4
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx30
-rw-r--r--sw/source/ui/chrdlg/break.cxx38
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx12
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx32
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx124
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx60
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx26
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx46
-rw-r--r--sw/source/ui/config/barcfg.cxx4
-rw-r--r--sw/source/ui/config/caption.cxx28
-rw-r--r--sw/source/ui/config/cfgitems.cxx36
-rw-r--r--sw/source/ui/config/fontcfg.cxx16
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx2
-rw-r--r--sw/source/ui/config/modcfg.cxx44
-rw-r--r--sw/source/ui/config/optcomp.cxx80
-rw-r--r--sw/source/ui/config/optload.cxx106
-rw-r--r--sw/source/ui/config/optpage.cxx350
-rw-r--r--sw/source/ui/config/prtopt.cxx2
-rw-r--r--sw/source/ui/config/uinums.cxx114
-rw-r--r--sw/source/ui/config/usrpref.cxx34
-rw-r--r--sw/source/ui/config/viewopt.cxx44
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx8
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx16
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx210
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx290
-rw-r--r--sw/source/ui/dbui/dbtree.cxx32
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx4
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx64
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx20
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx20
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx32
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx2
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx38
-rw-r--r--sw/source/ui/dialog/abstract.cxx8
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx56
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx14
-rw-r--r--sw/source/ui/dialog/macassgn.cxx14
-rw-r--r--sw/source/ui/dialog/regionsw.cxx44
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx2
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx108
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx112
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx388
-rwxr-xr-xsw/source/ui/dochdl/gloshdl.cxx190
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx378
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx10
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx8
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx12
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx10
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx30
-rw-r--r--sw/source/ui/docvw/edtdd.cxx84
-rw-r--r--sw/source/ui/docvw/edtwin.cxx882
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx38
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx24
-rw-r--r--sw/source/ui/docvw/romenu.cxx86
-rw-r--r--sw/source/ui/docvw/romenu.hxx8
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx110
-rw-r--r--sw/source/ui/envelp/envfmt.cxx70
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envimg.cxx14
-rw-r--r--sw/source/ui/envelp/envlop1.cxx46
-rw-r--r--sw/source/ui/envelp/envprt.cxx20
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx8
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx4
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx52
-rw-r--r--sw/source/ui/envelp/labfmt.hxx6
-rw-r--r--sw/source/ui/envelp/labimg.cxx6
-rw-r--r--sw/source/ui/envelp/labprt.cxx12
-rw-r--r--sw/source/ui/envelp/labprt.hxx2
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx46
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx4
-rw-r--r--sw/source/ui/fldui/changedb.cxx18
-rw-r--r--sw/source/ui/fldui/flddb.cxx78
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx98
-rw-r--r--sw/source/ui/fldui/flddinf.hxx10
-rw-r--r--sw/source/ui/fldui/flddok.cxx132
-rw-r--r--sw/source/ui/fldui/flddok.hxx12
-rw-r--r--sw/source/ui/fldui/fldedt.cxx22
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx130
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx6
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx288
-rw-r--r--sw/source/ui/fldui/fldpage.cxx46
-rw-r--r--sw/source/ui/fldui/fldpage.hxx44
-rw-r--r--sw/source/ui/fldui/fldref.cxx148
-rw-r--r--sw/source/ui/fldui/fldref.hxx6
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx28
-rw-r--r--sw/source/ui/fldui/fldvar.cxx248
-rw-r--r--sw/source/ui/fldui/fldvar.hxx16
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx28
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx14
-rw-r--r--sw/source/ui/fldui/javaedit.cxx14
-rw-r--r--sw/source/ui/fldui/xfldui.cxx10
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx52
-rw-r--r--sw/source/ui/frmdlg/colex.cxx74
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx34
-rw-r--r--sw/source/ui/frmdlg/column.cxx210
-rw-r--r--sw/source/ui/frmdlg/cption.cxx8
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx18
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx54
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx446
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx90
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx2
-rw-r--r--sw/source/ui/inc/abstract.hxx4
-rwxr-xr-xsw/source/ui/inc/annotsh.hxx2
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx2
-rw-r--r--sw/source/ui/inc/basesh.hxx4
-rw-r--r--sw/source/ui/inc/bmpwin.hxx16
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx10
-rw-r--r--sw/source/ui/inc/break.hxx10
-rw-r--r--sw/source/ui/inc/caption.hxx40
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx14
-rw-r--r--sw/source/ui/inc/cfgitems.hxx132
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx10
-rw-r--r--sw/source/ui/inc/cnttab.hxx8
-rw-r--r--sw/source/ui/inc/colex.hxx8
-rw-r--r--sw/source/ui/inc/colmgr.hxx44
-rw-r--r--sw/source/ui/inc/column.hxx36
-rw-r--r--sw/source/ui/inc/conarc.hxx8
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx8
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx8
-rw-r--r--sw/source/ui/inc/conrect.hxx10
-rw-r--r--sw/source/ui/inc/content.hxx66
-rw-r--r--sw/source/ui/inc/conttree.hxx120
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx16
-rw-r--r--sw/source/ui/inc/dbtree.hxx10
-rw-r--r--sw/source/ui/inc/docfnote.hxx2
-rw-r--r--sw/source/ui/inc/docstdlg.hxx2
-rw-r--r--sw/source/ui/inc/drawbase.hxx26
-rw-r--r--sw/source/ui/inc/drpcps.hxx12
-rw-r--r--sw/source/ui/inc/drwbassh.hxx8
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx6
-rw-r--r--sw/source/ui/inc/dselect.hxx4
-rw-r--r--sw/source/ui/inc/edtwin.hxx90
-rw-r--r--sw/source/ui/inc/envimg.hxx4
-rw-r--r--sw/source/ui/inc/envlop.hxx6
-rw-r--r--sw/source/ui/inc/fldedt.hxx4
-rw-r--r--sw/source/ui/inc/fldmgr.hxx80
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx16
-rw-r--r--sw/source/ui/inc/fldwrap.hxx10
-rw-r--r--sw/source/ui/inc/fontcfg.hxx12
-rw-r--r--sw/source/ui/inc/formedt.hxx6
-rw-r--r--sw/source/ui/inc/frmdlg.hxx18
-rw-r--r--sw/source/ui/inc/frmmgr.hxx20
-rw-r--r--sw/source/ui/inc/frmpage.hxx84
-rw-r--r--sw/source/ui/inc/glosbib.hxx2
-rw-r--r--sw/source/ui/inc/glosdoc.hxx24
-rw-r--r--sw/source/ui/inc/gloshdl.hxx50
-rw-r--r--sw/source/ui/inc/gloslst.hxx16
-rw-r--r--sw/source/ui/inc/glossary.hxx12
-rw-r--r--sw/source/ui/inc/glshell.hxx4
-rw-r--r--sw/source/ui/inc/initui.hxx2
-rw-r--r--sw/source/ui/inc/inpdlg.hxx2
-rw-r--r--sw/source/ui/inc/inputwin.hxx26
-rw-r--r--sw/source/ui/inc/insfnote.hxx10
-rw-r--r--sw/source/ui/inc/insrule.hxx6
-rw-r--r--sw/source/ui/inc/instable.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx10
-rw-r--r--sw/source/ui/inc/label.hxx8
-rwxr-xr-xsw/source/ui/inc/langhelper.hxx8
-rw-r--r--sw/source/ui/inc/linenum.hxx2
-rw-r--r--sw/source/ui/inc/macassgn.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx2
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/ui/inc/mailmrge.hxx8
-rw-r--r--sw/source/ui/inc/mergetbl.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx10
-rw-r--r--sw/source/ui/inc/multmrk.hxx2
-rw-r--r--sw/source/ui/inc/navicont.hxx8
-rw-r--r--sw/source/ui/inc/navipi.hxx36
-rw-r--r--sw/source/ui/inc/num.hxx20
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx32
-rw-r--r--sw/source/ui/inc/numpara.hxx8
-rw-r--r--sw/source/ui/inc/numprevw.hxx10
-rw-r--r--sw/source/ui/inc/olmenu.hxx4
-rw-r--r--sw/source/ui/inc/optcomp.hxx8
-rw-r--r--sw/source/ui/inc/optload.hxx12
-rw-r--r--sw/source/ui/inc/optpage.hxx56
-rw-r--r--sw/source/ui/inc/outline.hxx16
-rw-r--r--sw/source/ui/inc/pgfnote.hxx4
-rw-r--r--sw/source/ui/inc/pggrid.hxx4
-rw-r--r--sw/source/ui/inc/prcntfld.hxx10
-rw-r--r--sw/source/ui/inc/pview.hxx56
-rw-r--r--sw/source/ui/inc/redlndlg.hxx36
-rw-r--r--sw/source/ui/inc/regionsw.hxx22
-rw-r--r--sw/source/ui/inc/scroll.hxx24
-rw-r--r--sw/source/ui/inc/selglos.hxx8
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx10
-rw-r--r--sw/source/ui/inc/split.hxx4
-rw-r--r--sw/source/ui/inc/splittbl.hxx4
-rw-r--r--sw/source/ui/inc/srcedtw.hxx30
-rw-r--r--sw/source/ui/inc/srcview.hxx20
-rw-r--r--sw/source/ui/inc/srtdlg.hxx4
-rw-r--r--sw/source/ui/inc/swcont.hxx16
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx66
-rw-r--r--sw/source/ui/inc/swlbox.hxx30
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx2
-rw-r--r--sw/source/ui/inc/swtablerep.hxx46
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx8
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx54
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx8
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx14
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/ui/inc/syncbtn.hxx2
-rw-r--r--sw/source/ui/inc/tabledlg.hxx4
-rw-r--r--sw/source/ui/inc/tablemgr.hxx18
-rw-r--r--sw/source/ui/inc/tabsh.hxx4
-rw-r--r--sw/source/ui/inc/tautofmt.hxx12
-rw-r--r--sw/source/ui/inc/tblctrl.hxx2
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx6
-rw-r--r--sw/source/ui/inc/textcontrolcombo.hxx10
-rw-r--r--sw/source/ui/inc/textsh.hxx2
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx14
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toxmgr.hxx104
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx16
-rw-r--r--sw/source/ui/inc/uinums.hxx20
-rw-r--r--sw/source/ui/inc/uitool.hxx14
-rw-r--r--sw/source/ui/inc/uivwimp.hxx2
-rw-r--r--sw/source/ui/inc/unotools.hxx2
-rw-r--r--sw/source/ui/inc/unotxvw.hxx16
-rw-r--r--sw/source/ui/inc/usrpref.hxx18
-rw-r--r--sw/source/ui/inc/view.hxx208
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx6
-rw-r--r--sw/source/ui/inc/workctrl.hxx28
-rw-r--r--sw/source/ui/inc/wrap.hxx30
-rw-r--r--sw/source/ui/inc/wrtsh.hxx358
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx12
-rw-r--r--sw/source/ui/index/cnttab.cxx80
-rw-r--r--sw/source/ui/index/multmrk.cxx4
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx48
-rw-r--r--sw/source/ui/index/toxmgr.cxx50
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx8
-rw-r--r--sw/source/ui/lingu/olmenu.cxx58
-rw-r--r--sw/source/ui/misc/bookmark.cxx42
-rw-r--r--sw/source/ui/misc/docfnote.cxx52
-rw-r--r--sw/source/ui/misc/glosbib.cxx88
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx22
-rw-r--r--sw/source/ui/misc/glshell.cxx26
-rw-r--r--sw/source/ui/misc/impfnote.hxx8
-rw-r--r--sw/source/ui/misc/insfnote.cxx52
-rw-r--r--sw/source/ui/misc/insrule.cxx8
-rw-r--r--sw/source/ui/misc/linenum.cxx28
-rw-r--r--sw/source/ui/misc/num.cxx164
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx20
-rw-r--r--sw/source/ui/misc/outline.cxx220
-rw-r--r--sw/source/ui/misc/pgfnote.cxx46
-rw-r--r--sw/source/ui/misc/pggrid.cxx18
-rw-r--r--sw/source/ui/misc/redlndlg.cxx226
-rw-r--r--sw/source/ui/misc/srtdlg.cxx82
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx16
-rw-r--r--sw/source/ui/ribbar/conarc.cxx18
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/conform.cxx28
-rw-r--r--sw/source/ui/ribbar/conpoly.cxx18
-rw-r--r--sw/source/ui/ribbar/conrect.cxx34
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx138
-rw-r--r--sw/source/ui/ribbar/dselect.cxx18
-rwxr-xr-xsw/source/ui/ribbar/inputwin.cxx92
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx4
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx10
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx108
-rwxr-xr-xsw/source/ui/shells/annotsh.cxx80
-rw-r--r--sw/source/ui/shells/basesh.cxx358
-rw-r--r--sw/source/ui/shells/beziersh.cxx30
-rw-r--r--sw/source/ui/shells/drawdlg.cxx38
-rw-r--r--sw/source/ui/shells/drawsh.cxx44
-rw-r--r--sw/source/ui/shells/drwbassh.cxx100
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx30
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx68
-rw-r--r--sw/source/ui/shells/frmsh.cxx100
-rw-r--r--sw/source/ui/shells/grfsh.cxx74
-rwxr-xr-x[-rw-r--r--]sw/source/ui/shells/langhelper.cxx38
-rw-r--r--sw/source/ui/shells/listsh.cxx28
-rw-r--r--sw/source/ui/shells/mediash.cxx12
-rw-r--r--sw/source/ui/shells/tabsh.cxx240
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx144
-rw-r--r--sw/source/ui/shells/textglos.cxx26
-rw-r--r--sw/source/ui/shells/textidx.cxx26
-rw-r--r--sw/source/ui/shells/textsh.cxx134
-rw-r--r--sw/source/ui/shells/textsh1.cxx194
-rw-r--r--sw/source/ui/shells/textsh2.cxx22
-rw-r--r--sw/source/ui/shells/txtattr.cxx86
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx98
-rw-r--r--sw/source/ui/shells/txtnum.cxx36
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx14
-rw-r--r--sw/source/ui/table/chartins.cxx6
-rw-r--r--sw/source/ui/table/colwd.cxx12
-rw-r--r--sw/source/ui/table/convert.cxx24
-rw-r--r--sw/source/ui/table/instable.cxx16
-rw-r--r--sw/source/ui/table/mergetbl.cxx2
-rw-r--r--sw/source/ui/table/swtablerep.cxx38
-rw-r--r--sw/source/ui/table/tabledlg.cxx364
-rw-r--r--sw/source/ui/table/tablemgr.cxx48
-rw-r--r--sw/source/ui/table/tablepg.hxx40
-rw-r--r--sw/source/ui/table/tautofmt.cxx118
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx56
-rw-r--r--sw/source/ui/uiview/pview.cxx252
-rw-r--r--sw/source/ui/uiview/scroll.cxx26
-rw-r--r--sw/source/ui/uiview/srcview.cxx116
-rw-r--r--sw/source/ui/uiview/swcli.cxx6
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx14
-rw-r--r--sw/source/ui/uiview/view.cxx68
-rw-r--r--sw/source/ui/uiview/view0.cxx18
-rw-r--r--sw/source/ui/uiview/view1.cxx20
-rw-r--r--sw/source/ui/uiview/view2.cxx292
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx8
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx12
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx20
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx8
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx12
-rwxr-xr-xsw/source/ui/uiview/viewling.cxx6
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx70
-rw-r--r--sw/source/ui/uiview/viewport.cxx242
-rw-r--r--sw/source/ui/uiview/viewprt.cxx42
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx128
-rw-r--r--sw/source/ui/uiview/viewstat.cxx8
-rw-r--r--sw/source/ui/uiview/viewtab.cxx376
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx4
-rw-r--r--sw/source/ui/uno/swdet2.cxx6
-rw-r--r--sw/source/ui/uno/swdetect.cxx18
-rw-r--r--sw/source/ui/uno/swdetect.hxx4
-rw-r--r--sw/source/ui/uno/unoatxt.cxx26
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx38
-rw-r--r--sw/source/ui/uno/unomod.cxx30
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx122
-rw-r--r--sw/source/ui/uno/unotxvw.cxx28
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx38
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx18
-rw-r--r--sw/source/ui/utlui/condedit.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx28
-rw-r--r--sw/source/ui/utlui/glbltree.cxx230
-rw-r--r--sw/source/ui/utlui/gloslst.cxx76
-rw-r--r--sw/source/ui/utlui/initui.cxx18
-rw-r--r--sw/source/ui/utlui/navicfg.cxx4
-rw-r--r--sw/source/ui/utlui/navipi.cxx182
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx80
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx10
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx10
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx6
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx14
-rw-r--r--sw/source/ui/utlui/uiitems.cxx24
-rw-r--r--sw/source/ui/utlui/uitool.cxx104
-rw-r--r--sw/source/ui/utlui/unotools.cxx8
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx14
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx6
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx2
-rw-r--r--sw/source/ui/vba/vbafield.cxx10
-rw-r--r--sw/source/ui/vba/vbaselection.cxx2
-rw-r--r--sw/source/ui/web/wview.cxx22
-rw-r--r--sw/source/ui/wrtsh/delete.cxx36
-rw-r--r--sw/source/ui/wrtsh/move.cxx180
-rw-r--r--sw/source/ui/wrtsh/select.cxx232
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx148
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx70
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx16
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx60
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx18
1080 files changed, 39029 insertions, 39029 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 333c591243ad..209fea22da72 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -148,7 +148,7 @@ class SwTaggedPDFHelper
// This will be incremented for each BeginTag() call.
// It denotes the number of tags to close during EndStructureElements();
- BYTE nEndStructureElement;
+ sal_uInt8 nEndStructureElement;
// If an already existing tag is reopened for follows of flow frames,
// this value stores the tag id which has to be restored.
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 693a24466b9d..e35c31cf2697 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -91,10 +91,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
@param rVal the value
@param nMId
- @retval TRUE putting of value was successful
- @retval FALSE else
+ @retval sal_True putting of value was successful
+ @retval sal_False else
*/
- virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, USHORT nWhich) = 0;
+ virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0;
// rufe das Update der Expression Felder auf; alle Ausdruecke werden
// neu berechnet.
@@ -105,10 +105,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
@param rDstFmtFld field to update
@param rSrcFld field containing the new values
@param pMsgHnt
- @param bUpdateTblFlds TRUE: update table fields, too.
+ @param bUpdateTblFlds sal_True: update table fields, too.
- @retval TRUE update was successful
- @retval FALSE else
+ @retval sal_True update was successful
+ @retval sal_False else
*/
virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
@@ -151,7 +151,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
SwNode (see parameter pChk) is (?) part of the private
data structure of SwDoc and should not be exposed
*/
- virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen) = 0;
+ virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) = 0;
/**
*/
@@ -162,7 +162,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
// eine erzeugte Liste aller Felder mit uebergegeben werden.
// (ist die Adresse != 0, und der Pointer == 0 wird eine neue
// Liste returnt.)
- virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt) = 0;
+ virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
/**
*/
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index c3e6855f3c81..44fd8c148044 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -58,7 +58,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
/** FME 2005-02-25 #i42634# Moved common code of SwReader::Read() and
SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
*/
- virtual void UpdateLinks(BOOL bUI) = 0;
+ virtual void UpdateLinks(sal_Bool bUI) = 0;
/** SS fuers Linken von Dokumentteilen
*/
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index ed893dc1cf4a..078b405f0ce4 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -49,7 +49,7 @@
class SwNode;
class String;
-typedef USHORT RedlineMode_t;
+typedef sal_uInt16 RedlineMode_t;
namespace nsRedlineMode_t
{
const RedlineMode_t REDLINE_NONE = 0; // no RedlineMode
@@ -70,7 +70,7 @@ namespace nsRedlineMode_t
const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400;
}
-typedef USHORT RedlineType_t;
+typedef sal_uInt16 RedlineType_t;
namespace nsRedlineType_t
{
// die RedlineTypen gehen von 0 bis 127
@@ -92,16 +92,16 @@ class IDocumentRedlineAccess
{
// Static helper functions
public:
- static bool IsShowChanges(const USHORT eM)
+ static bool IsShowChanges(const sal_uInt16 eM)
{ return (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsHideChanges(const USHORT eM)
+ static bool IsHideChanges(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_SHOW_INSERT == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsShowOriginal(const USHORT eM)
+ static bool IsShowOriginal(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_SHOW_DELETE == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsRedlineOn(const USHORT eM)
+ static bool IsRedlineOn(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_ON == (eM & (nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE )); }
public:
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 25b1c57f9a0b..214b9769ed32 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -129,7 +129,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
a list of forbidden characters.
*/
virtual const com::sun::star::i18n::ForbiddenCharacters*
- getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const = 0;
+ getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const = 0;
/** Set the forbidden characters.
@@ -139,7 +139,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
@param rForbiddenCharacters
[in] the new list of forbidden characters for language lang.
*/
- virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang,
+ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
/*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0;
/** Get the forbidden character table and creates one if necessary.
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 485a9a5733f7..17000a4657c7 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -156,7 +156,7 @@ class SwPostItMgr: public SfxListener
SwEditWin* mpEditWin;
std::list< SwSidebarItem*> mvPostItFlds;
std::vector<SwPostItPageItem*> mPages;
- ULONG mnEventId;
+ sal_uLong mnEventId;
bool mbWaitingForCalcRects;
sw::sidebarwindows::SwSidebarWin* mpActivePostIt;
bool mbLayout;
@@ -184,7 +184,7 @@ class SwPostItMgr: public SfxListener
const Rectangle aBorder,
long lNeededHeight);
void CheckForRemovedPostIts();
- bool ArrowEnabled(USHORT aDirection,unsigned long aPage) const;
+ bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const;
bool BorderOverPageBorder(unsigned long aPage) const;
bool HasScrollbars() const;
void Focus(SfxBroadcaster& rBC);
@@ -247,11 +247,11 @@ class SwPostItMgr: public SfxListener
Rectangle GetTopScrollRect(const unsigned long aPage) const;
bool IsHit(const Point &aPointPixel);
- Color GetArrowColor(USHORT aDirection,unsigned long aPage) const;
+ Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const;
sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const;
- sw::sidebarwindows::SwSidebarWin* GetNextPostIt( USHORT aDirection,
+ sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection,
sw::sidebarwindows::SwSidebarWin* aPostIt);
long GetNextBorder();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 729dc18a780b..00649f211f51 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -98,7 +98,7 @@ class SwSidebarWin : public Window
long GetPostItTextHeight();
- void SwitchToPostIt(USHORT aDirection);
+ void SwitchToPostIt(sal_uInt16 aDirection);
virtual void SwitchToFieldPos();
virtual sal_uInt32 MoveCaret() = 0;
@@ -112,7 +112,7 @@ class SwSidebarWin : public Window
virtual Date GetDate() = 0;
virtual Time GetTime() = 0;
- void ExecuteCommand(USHORT nSlot);
+ void ExecuteCommand(sal_uInt16 nSlot);
void InitControls();
void HidePostIt();
void DoResize();
@@ -130,8 +130,8 @@ class SwSidebarWin : public Window
void ResetAttributes();
void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition);
- void SetReadonly(BOOL bSet);
- BOOL IsReadOnly() { return mbReadonly;}
+ void SetReadonly(sal_Bool bSet);
+ sal_Bool IsReadOnly() { return mbReadonly;}
bool IsPreview() { return nFlags & PB_Preview;}
void SetColor(Color aColorDark,Color aColorLight, Color aColorAnchor);
@@ -204,7 +204,7 @@ class SwSidebarWin : public Window
SwView& mrView;
const SwPostItBits nFlags;
- ULONG mnEventId;
+ sal_uLong mnEventId;
OutlinerView* mpOutlinerView;
Outliner* mpOutliner;
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index c5d052f660b2..0ad636adf67f 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -59,12 +59,12 @@ class SwApplet_Impl
String sAlt;
public:
- static USHORT GetOptionType( const String& rName, BOOL bApplet );
- SwApplet_Impl( SfxItemPool& rPool, USHORT nWhich1, USHORT nWhich2 );
+ static sal_uInt16 GetOptionType( const String& rName, sal_Bool bApplet );
+ SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 );
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
~SwApplet_Impl();
void CreateApplet( const String& rCode, const String& rName,
- BOOL bMayScript, const String& rCodeBase,
+ sal_Bool bMayScript, const String& rCodeBase,
const String& rBaseURL );
#ifdef SOLAR_JAVA
sal_Bool CreateApplet( const String& rBaseURL );
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 92959457e534..1bb40de8ba91 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -30,7 +30,7 @@
/* When using the NameMapper to translate pool ids to UI or programmatic
* names, this enum is used to define which family is required */
-typedef USHORT SwGetPoolIdFromName;
+typedef sal_uInt16 SwGetPoolIdFromName;
namespace nsSwGetPoolIdFromName
{
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index 33f5cfd85e49..b24f867120ef 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -35,7 +35,7 @@ class SwMsgPoolItem;
class SwUndoField : public SwUndo
{
- ULONG nNodeIndex;
+ sal_uLong nNodeIndex;
xub_StrLen nOffset;
protected:
@@ -51,12 +51,12 @@ class SwUndoFieldFromDoc : public SwUndoField
{
SwField * pOldField, * pNewField;
SwMsgPoolItem * pHnt;
- BOOL bUpdate;
+ sal_Bool bUpdate;
public:
SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField,
const SwField & aNewField,
- SwMsgPoolItem * pHnt, BOOL bUpdate,
+ SwMsgPoolItem * pHnt, sal_Bool bUpdate,
SwUndoId nId = UNDO_FIELD );
virtual ~SwUndoFieldFromDoc();
@@ -68,13 +68,13 @@ public:
class SwUndoFieldFromAPI : public SwUndoField
{
com::sun::star::uno::Any aOldVal, aNewVal;
- USHORT nWhich;
+ sal_uInt16 nWhich;
public:
SwUndoFieldFromAPI(const SwPosition & rPos,
const com::sun::star::uno::Any & rOldVal,
const com::sun::star::uno::Any & rNewVal,
- USHORT nWhich);
+ sal_uInt16 nWhich);
virtual ~SwUndoFieldFromAPI();
virtual void Undo(SwUndoIter & rIt);
diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx
index ea23724fa817..157d87d2f26d 100644
--- a/sw/inc/SwUndoFmt.hxx
+++ b/sw/inc/SwUndoFmt.hxx
@@ -44,8 +44,8 @@ protected:
SwDoc * pDoc;
mutable String sNewName;
SfxItemSet * pNewSet;
- USHORT nId; // FmtId related
- BOOL bAuto;
+ sal_uInt16 nId; // FmtId related
+ sal_Bool bAuto;
public:
@@ -70,8 +70,8 @@ protected:
SwDoc * pDoc;
String sOldName;
SfxItemSet aOldSet;
- USHORT nId; // FmtId related
- BOOL bAuto;
+ sal_uInt16 nId; // FmtId related
+ sal_Bool bAuto;
public:
SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc);
@@ -172,7 +172,7 @@ public:
class SwUndoFrmFmtCreate : public SwUndoFmtCreate
{
- BOOL bAuto;
+ sal_Bool bAuto;
public:
SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom,
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 79be20d8cc07..08256b4c5e79 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -31,23 +31,23 @@
struct SwAccessibilityOptions
{
- BOOL bIsAlwaysAutoColor :1;
- BOOL bIsStopAnimatedText :1;
- BOOL bIsStopAnimatedGraphics :1;
+ sal_Bool bIsAlwaysAutoColor :1;
+ sal_Bool bIsStopAnimatedText :1;
+ sal_Bool bIsStopAnimatedGraphics :1;
SwAccessibilityOptions() :
- bIsAlwaysAutoColor(FALSE),
- bIsStopAnimatedText(FALSE),
- bIsStopAnimatedGraphics(FALSE) {}
+ bIsAlwaysAutoColor(sal_False),
+ bIsStopAnimatedText(sal_False),
+ bIsStopAnimatedGraphics(sal_False) {}
- inline BOOL IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; }
- inline void SetAlwaysAutoColor( BOOL b ) { bIsAlwaysAutoColor = b; }
+ inline sal_Bool IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; }
+ inline void SetAlwaysAutoColor( sal_Bool b ) { bIsAlwaysAutoColor = b; }
- inline BOOL IsStopAnimatedGraphics() const { return bIsStopAnimatedText;}
- inline void SetStopAnimatedGraphics( BOOL b ) { bIsStopAnimatedText = b; }
+ inline sal_Bool IsStopAnimatedGraphics() const { return bIsStopAnimatedText;}
+ inline void SetStopAnimatedGraphics( sal_Bool b ) { bIsStopAnimatedText = b; }
- inline BOOL IsStopAnimatedText() const { return bIsStopAnimatedGraphics; }
- inline void SetStopAnimatedText( BOOL b ) { bIsStopAnimatedGraphics = b;}
+ inline sal_Bool IsStopAnimatedText() const { return bIsStopAnimatedGraphics; }
+ inline void SetStopAnimatedText( sal_Bool b ) { bIsStopAnimatedGraphics = b;}
};
#endif
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 8dda01f28493..af0cb98e4e6f 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -43,27 +43,27 @@ class SwAutoCompleteWord
SvPtrarr aLRULst;
SwAutoCompleteWord_Impl* pImpl;
- USHORT nMaxCount, nMinWrdLen;
- BOOL bLockWordLst;
+ sal_uInt16 nMaxCount, nMinWrdLen;
+ sal_Bool bLockWordLst;
void DocumentDying(const SwDoc& rDoc);
public:
- SwAutoCompleteWord( USHORT nWords = 500, USHORT nMWrdLen = 10 );
+ SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 );
~SwAutoCompleteWord();
- BOOL InsertWord( const String& rWord, SwDoc& rDoc );
+ sal_Bool InsertWord( const String& rWord, SwDoc& rDoc );
- BOOL GetRange( const String& rWord, USHORT& rStt, USHORT& rEnd ) const;
+ sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const;
- const String& operator[]( USHORT n ) const { return *aWordLst[ n ]; }
+ const String& operator[]( sal_uInt16 n ) const { return *aWordLst[ n ]; }
- BOOL IsLockWordLstLocked() const { return bLockWordLst; }
- void SetLockWordLstLocked( BOOL bFlag ) { bLockWordLst = bFlag; }
+ sal_Bool IsLockWordLstLocked() const { return bLockWordLst; }
+ void SetLockWordLstLocked( sal_Bool bFlag ) { bLockWordLst = bFlag; }
- void SetMaxCount( USHORT n );
+ void SetMaxCount( sal_uInt16 n );
- USHORT GetMinWordLen() const { return nMinWrdLen; }
- void SetMinWordLen( USHORT n );
+ sal_uInt16 GetMinWordLen() const { return nMinWrdLen; }
+ void SetMinWordLen( sal_uInt16 n );
const SvStringsISortDtor& GetWordList() const { return aWordLst; }
void CheckChangedList( const SvStringsISortDtor& rNewLst );
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 71f8a201243f..03ef2af83cea 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -41,11 +41,11 @@ class SwAuthDataArr;
class SwAuthEntry
{
String aAuthFields[AUTH_FIELD_END];
- USHORT nRefCount;
+ sal_uInt16 nRefCount;
public:
SwAuthEntry() : nRefCount(0){}
SwAuthEntry( const SwAuthEntry& rCopy );
- BOOL operator==(const SwAuthEntry& rComp);
+ sal_Bool operator==(const SwAuthEntry& rComp);
inline const String& GetAuthorField(ToxAuthorityField ePos)const;
inline void SetAuthorField(ToxAuthorityField ePos,
@@ -53,7 +53,7 @@ public:
void AddRef() { ++nRefCount; }
void RemoveRef() { --nRefCount; }
- USHORT GetRefCount() { return nRefCount; }
+ sal_uInt16 GetRefCount() { return nRefCount; }
};
/* -----------------20.10.99 16:49-------------------
@@ -61,10 +61,10 @@ public:
struct SwTOXSortKey
{
ToxAuthorityField eField;
- BOOL bSortAscending;
+ sal_Bool bSortAscending;
SwTOXSortKey() :
eField(AUTH_FIELD_END),
- bSortAscending(TRUE){}
+ bSortAscending(sal_True){}
};
/* -----------------14.09.99 16:15-------------------
@@ -81,8 +81,8 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
SortKeyArr* m_pSortKeyArr;
sal_Unicode m_cPrefix;
sal_Unicode m_cSuffix;
- BOOL m_bIsSequence :1;
- BOOL m_bSortByDocument :1;
+ sal_Bool m_bIsSequence :1;
+ sal_Bool m_bSortByDocument :1;
LanguageType m_eLanguage;
String m_sSortAlgorithm;
@@ -97,14 +97,14 @@ public:
virtual SwFieldType* Copy() const;
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
SwDoc* GetDoc(){ return m_pDoc; }
void RemoveField(long nHandle);
long AddField(const String& rFieldContents);
- BOOL AddField(long nHandle);
+ sal_Bool AddField(long nHandle);
void DelSequenceArray()
{
m_pSequArr->Remove(0, m_pSequArr->Count());
@@ -117,13 +117,13 @@ public:
bool ChangeEntryContent(const SwAuthEntry* pNewEntry);
// import interface
- USHORT AppendField(const SwAuthEntry& rInsert);
- long GetHandle(USHORT nPos);
+ sal_uInt16 AppendField(const SwAuthEntry& rInsert);
+ long GetHandle(sal_uInt16 nPos);
- USHORT GetSequencePos(long nHandle);
+ sal_uInt16 GetSequencePos(long nHandle);
- BOOL IsSequence() const {return m_bIsSequence;}
- void SetSequence(BOOL bSet)
+ sal_Bool IsSequence() const {return m_bIsSequence;}
+ void SetSequence(sal_Bool bSet)
{
DelSequenceArray();
m_bIsSequence = bSet;
@@ -137,16 +137,16 @@ public:
sal_Unicode GetPrefix() const { return m_cPrefix;}
sal_Unicode GetSuffix() const { return m_cSuffix;}
- BOOL IsSortByDocument() const {return m_bSortByDocument;}
- void SetSortByDocument(BOOL bSet)
+ sal_Bool IsSortByDocument() const {return m_bSortByDocument;}
+ void SetSortByDocument(sal_Bool bSet)
{
DelSequenceArray();
m_bSortByDocument = bSet;
}
- USHORT GetSortKeyCount() const ;
- const SwTOXSortKey* GetSortKey(USHORT nIdx) const ;
- void SetSortKeys(USHORT nKeyCount, SwTOXSortKey nKeys[]);
+ sal_uInt16 GetSortKeyCount() const ;
+ const SwTOXSortKey* GetSortKey(sal_uInt16 nIdx) const ;
+ void SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey nKeys[]);
//initui.cxx
static const String& GetAuthFieldName(ToxAuthorityField eType);
@@ -180,8 +180,8 @@ public:
virtual void SetPar1(const String& rStr);
virtual SwFieldType* ChgTyp( SwFieldType* );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
long GetHandle() const { return m_nHandle; }
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index f8fe69818439..06ffbe633ac2 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -37,13 +37,13 @@
class SW_DLLPUBLIC AuthorCharAttr
{
public:
- USHORT nItemId;
- USHORT nAttr;
+ sal_uInt16 nItemId;
+ sal_uInt16 nAttr;
ColorData nColor;
AuthorCharAttr();
- inline BOOL operator == ( const AuthorCharAttr& rAttr ) const
+ inline sal_Bool operator == ( const AuthorCharAttr& rAttr ) const
{
return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
nColor == rAttr.nColor;
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 31a98adef990..731dddd2e3fe 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -39,19 +39,19 @@ class BigPtrEntry
{
friend class BigPtrArray;
BlockInfo* pBlock;
- USHORT nOffset;
+ sal_uInt16 nOffset;
public:
virtual ~BigPtrEntry() {}
protected:
BigPtrEntry() : pBlock(0), nOffset(0) {}
- inline ULONG GetPos() const;
+ inline sal_uLong GetPos() const;
inline BigPtrArray& GetArray() const;
};
typedef BigPtrEntry* ElementPtr;
-typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
+typedef sal_Bool (*FnForEach)( const ElementPtr&, void* pArgs );
// 1000 Eintrge pro Block = etwas weniger als 4K
#define MAXENTRY 1000
@@ -67,51 +67,51 @@ typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
struct BlockInfo { // Block-Info:
BigPtrArray* pBigArr; // in diesem Array steht der Block
ElementPtr* pData; // Datenblock
- ULONG nStart, nEnd; // Start- und EndIndex
- USHORT nElem; // Anzahl Elemente
+ sal_uLong nStart, nEnd; // Start- und EndIndex
+ sal_uInt16 nElem; // Anzahl Elemente
};
class SW_DLLPUBLIC BigPtrArray
{
BlockInfo** ppInf; // Block-Infos
- ULONG nSize; // Anzahl Elemente
- USHORT nMaxBlock; // akt. max Anzahl Bloecke
- USHORT nBlock; // Anzahl Bloecke
- USHORT nCur; // letzter Block
+ sal_uLong nSize; // Anzahl Elemente
+ sal_uInt16 nMaxBlock; // akt. max Anzahl Bloecke
+ sal_uInt16 nBlock; // Anzahl Bloecke
+ sal_uInt16 nCur; // letzter Block
- USHORT Index2Block( ULONG ) const; // Blocksuche
- BlockInfo* InsBlock( USHORT ); // Block einfuegen
- void BlockDel( USHORT ); // es wurden Bloecke geloescht
- void UpdIndex( USHORT ); // Indexe neu berechnen
+ sal_uInt16 Index2Block( sal_uLong ) const; // Blocksuche
+ BlockInfo* InsBlock( sal_uInt16 ); // Block einfuegen
+ void BlockDel( sal_uInt16 ); // es wurden Bloecke geloescht
+ void UpdIndex( sal_uInt16 ); // Indexe neu berechnen
protected:
// fuelle alle Bloecke auf.
// Der short gibt in Prozent an, wie voll die Bloecke werden sollen.
// Der ReturnWert besagt, das irgendetwas "getan" wurde
- USHORT Compress( short = COMPRESSLVL );
+ sal_uInt16 Compress( short = COMPRESSLVL );
public:
BigPtrArray();
~BigPtrArray();
- ULONG Count() const { return nSize; }
+ sal_uLong Count() const { return nSize; }
- void Insert( const ElementPtr& r, ULONG pos );
- void Remove( ULONG pos, ULONG n = 1 );
- void Move( ULONG from, ULONG to );
- void Replace( ULONG pos, const ElementPtr& r);
+ void Insert( const ElementPtr& r, sal_uLong pos );
+ void Remove( sal_uLong pos, sal_uLong n = 1 );
+ void Move( sal_uLong from, sal_uLong to );
+ void Replace( sal_uLong pos, const ElementPtr& r);
- ElementPtr operator[]( ULONG ) const;
+ ElementPtr operator[]( sal_uLong ) const;
void ForEach( FnForEach fn, void* pArgs = NULL )
{
ForEach( 0, nSize, fn, pArgs );
}
- void ForEach( ULONG nStart, ULONG nEnd, FnForEach fn, void* pArgs = NULL );
+ void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs = NULL );
};
-inline ULONG BigPtrEntry::GetPos() const
+inline sal_uLong BigPtrEntry::GetPos() const
{
DBG_ASSERT( this == pBlock->pData[ nOffset ], "Element nicht im Block" );
return pBlock->nStart + nOffset;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 4c016593fab6..9427b4d26c6e 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -108,8 +108,8 @@ public:
return *m_pForbidden;
}
- USHORT GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const;
- USHORT GetAllScriptsOfText( const String& rTxt ) const;
+ sal_uInt16 GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const;
+ sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const;
};
#define SW_BREAKITER() SwBreakIt::Get()
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 6ce5e181947a..407688df2a5f 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -65,14 +65,14 @@ class SW_DLLPUBLIC SwClient
friend class SwClientIter;
SwClient *pLeft, *pRight; // fuer die AVL-Sortierung
- BOOL bModifyLocked : 1; // wird in SwModify::Modify benutzt,
+ sal_Bool bModifyLocked : 1; // wird in SwModify::Modify benutzt,
// eigentlich ein Member des SwModify
// aber aus Platzgruenden hier.
- BOOL bInModify : 1; // ist in einem Modify. (Debug!!!)
- BOOL bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden"
- BOOL bInCache : 1; // Ist im BorderAttrCache des Layout,
+ sal_Bool bInModify : 1; // ist in einem Modify. (Debug!!!)
+ sal_Bool bInDocDTOR : 1; // Doc wird zerstoert, nicht "abmelden"
+ sal_Bool bInCache : 1; // Ist im BorderAttrCache des Layout,
// Traegt sich dann im Modify aus!
- BOOL bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung
+ sal_Bool bInSwFntCache : 1; // Ist im SwFont-Cache der Formatierung
protected:
SwModify *pRegisteredIn;
@@ -92,17 +92,17 @@ public:
//werden.
TYPEINFO();
- void LockModify() { bModifyLocked = TRUE; }
- void UnlockModify() { bModifyLocked = FALSE; }
- void SetInCache( BOOL bNew ) { bInCache = bNew; }
- void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; }
- BOOL IsModifyLocked() const { return bModifyLocked; }
- BOOL IsInDocDTOR() const { return bInDocDTOR; }
- BOOL IsInCache() const { return bInCache; }
- BOOL IsInSwFntCache() const { return bInSwFntCache; }
+ void LockModify() { bModifyLocked = sal_True; }
+ void UnlockModify() { bModifyLocked = sal_False; }
+ void SetInCache( sal_Bool bNew ) { bInCache = bNew; }
+ void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; }
+ sal_Bool IsModifyLocked() const { return bModifyLocked; }
+ sal_Bool IsInDocDTOR() const { return bInDocDTOR; }
+ sal_Bool IsInCache() const { return bInCache; }
+ sal_Bool IsInSwFntCache() const { return bInSwFntCache; }
// erfrage vom Client Informationen
- virtual BOOL GetInfo( SfxPoolItem& ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& ) const;
private:
SwClient( const SwClient& );
@@ -111,7 +111,7 @@ private:
inline SwClient::SwClient() :
pLeft(0), pRight(0), pRegisteredIn(0)
-{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = FALSE; }
+{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = sal_False; }
// ----------
@@ -144,13 +144,13 @@ public:
const SwClient* GetDepends() const { return pRoot; }
// erfrage vom Client Informationen
- virtual BOOL GetInfo( SfxPoolItem& ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& ) const;
- void SetInDocDTOR() { bInDocDTOR = TRUE; }
+ void SetInDocDTOR() { bInDocDTOR = sal_True; }
- void CheckCaching( const USHORT nWhich );
+ void CheckCaching( const sal_uInt16 nWhich );
- BOOL IsLastDepend() const
+ sal_Bool IsLastDepend() const
{ return pRoot && !pRoot->pLeft && !pRoot->pRight; }
private:
@@ -185,7 +185,7 @@ public:
virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue );
// erfrage vom Client Informationen
- virtual BOOL GetInfo( SfxPoolItem & ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem & ) const;
private:
// forbidden and not implemented (see @ SwClient).
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 4db19fc9a29d..996f6edb2b2a 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -133,7 +133,7 @@ public:
// Strings sonderbehandeln
- BOOL GetBool() const;
+ sal_Bool GetBool() const;
// Strings sonderbehandeln BOOLs sonderbehandeln
double GetDouble() const;
SwSbxValue& MakeDouble();
@@ -163,9 +163,9 @@ struct SwCalcExp : public SwHash
};
SwHash* Find( const String& rSrch, SwHash** ppTable,
- USHORT nTblSize, USHORT* pPos = 0 );
+ sal_uInt16 nTblSize, sal_uInt16* pPos = 0 );
-void DeleteHashTable( SwHash** ppTable, USHORT nTblSize );
+void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize );
// falls _CalcOp != 0, dann ist das ein gueltiger Operator
struct _CalcOp;
@@ -190,7 +190,7 @@ class SwCalc
const LocaleDataWrapper* pLclData;
CharClass* pCharClass;
- USHORT nListPor;
+ sal_uInt16 nListPor;
SwCalcOper eCurrOper;
SwCalcOper eCurrListOper;
SwCalcError eError;
@@ -201,7 +201,7 @@ class SwCalc
SwSbxValue Term();
SwSbxValue Prim();
- BOOL ParseTime( USHORT*, USHORT*, USHORT* );
+ sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* );
String GetColumnName( const String& rName );
String GetDBName( const String& rName );
@@ -215,20 +215,20 @@ public:
~SwCalc();
SwSbxValue Calculate( const String &rStr );
- String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE );
- String GetStrResult( double, BOOL bRound = TRUE );
+ String GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True );
+ String GetStrResult( double, sal_Bool bRound = sal_True );
SwCalcExp* VarInsert( const String& r );
- SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 );
+ SwCalcExp* VarLook( const String &rStr, sal_uInt16 ins = 0 );
void VarChange( const String& rStr, const SwSbxValue& rValue );
void VarChange( const String& rStr, double );
SwHash** GetVarTable() { return VarTable; }
- BOOL Push( const VoidPtr pPtr );
+ sal_Bool Push( const VoidPtr pPtr );
void Pop( const VoidPtr pPtr );
void SetCalcError( SwCalcError eErr ) { eError = eErr; }
- BOOL IsCalcError() const { return 0 != eError; }
+ sal_Bool IsCalcError() const { return 0 != eError; }
static bool Str2Double( const String& rStr, xub_StrLen& rPos,
double& rVal,
@@ -236,7 +236,7 @@ public:
static bool Str2Double( const String& rStr, xub_StrLen& rPos,
double& rVal, SwDoc *const pDoc );
- SW_DLLPUBLIC static BOOL IsValidVarName( const String& rStr,
+ SW_DLLPUBLIC static sal_Bool IsValidVarName( const String& rStr,
String* pValidName = 0 );
};
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index d91c20409d0a..8e99f943360f 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -53,8 +53,8 @@
struct CollName {
// const char* pStr;
- ULONG nCnd;
- ULONG nSubCond;
+ sal_uLong nCnd;
+ sal_uLong nSubCond;
};
//***********************************************************
@@ -63,8 +63,8 @@ struct CollName {
struct CommandStruct
{
- ULONG nCnd;
- ULONG nSubCond;
+ sal_uLong nCnd;
+ sal_uLong nSubCond;
};
//***********************************************************
@@ -81,7 +81,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem
String sStyles[COND_COMMAND_COUNT];
public:
- SwCondCollItem(USHORT nWhich = FN_COND_COLL);
+ SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL);
~SwCondCollItem();
TYPEINFO();
@@ -91,8 +91,8 @@ public:
static const CommandStruct* GetCmds();
- const String& GetStyle(USHORT nPos) const;
- void SetStyle( const String* pStyle, USHORT nPos);
+ const String& GetStyle(sal_uInt16 nPos) const;
+ void SetStyle( const String* pStyle, sal_uInt16 nPos);
};
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index b870da64231f..30f5f3bdc925 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -36,10 +36,10 @@
class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
{
- BOOL bAuto; // automatisch vergebenes Flag
+ sal_Bool bAuto; // automatisch vergebenes Flag
public:
- SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT,
- BOOL bAuto = FALSE );
+ SwTblBoxNumFormat( sal_uInt32 nFormat = NUMBERFORMAT_TEXT,
+ sal_Bool bAuto = sal_False );
// "pure virtual Methoden" vom SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
@@ -52,8 +52,8 @@ public:
return *this;
}
- BOOL GetAutoFlag() const { return bAuto; }
- void SetAutoFlag( BOOL bFlag = TRUE ) { bAuto = bFlag; }
+ sal_Bool GetAutoFlag() const { return bAuto; }
+ void SetAutoFlag( sal_Bool bFlag = sal_True ) { bAuto = bFlag; }
};
class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
@@ -110,20 +110,20 @@ public:
//***************************************************************************
-inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
+inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
-inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const
{ return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
-inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
//***************************************************************************
-inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
+inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const
{ return aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwFmt::GetTblBoxValue(sal_Bool bInP) const
{ return aSet.GetTblBoxValue(bInP); }
#endif
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index df24004a64fb..169058938f56 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -43,7 +43,7 @@ class String;
class SwTblCalcPara
{
const SwTableBox* pLastTblBox;
- USHORT nStackCnt, nMaxSize;
+ sal_uInt16 nStackCnt, nMaxSize;
public:
SwTableSortBoxes *pBoxStk; // Stack fuers erkennen von Rekursionen !
@@ -53,9 +53,9 @@ public:
SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
~SwTblCalcPara();
- BOOL CalcWithStackOverflow();
- BOOL IsStackOverFlow() const { return nMaxSize == nStackCnt; }
- BOOL IncStackCnt() { return nMaxSize == ++nStackCnt; }
+ sal_Bool CalcWithStackOverflow();
+ sal_Bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
+ sal_Bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
};
@@ -98,7 +98,7 @@ protected:
String sFormel; // akt. Formel
NameType eNmType; // akt. Darstellungs Art
- BOOL bValidValue; // TRUE: Formel neu berechnen
+ sal_Bool bValidValue; // sal_True: Formel neu berechnen
// suche den Node, in dem die Formel steht:
// TextFeld -> TextNode,
@@ -114,7 +114,7 @@ protected:
*rCalcPara.pTbl, &rCalcPara );
}
- static USHORT GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
+ static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
public:
@@ -138,25 +138,25 @@ public:
void ToSplitMergeBoxNm( SwTableFmlUpdate& rTblUpd );
// ist gerade eine intern Darstellung aktiv
- BOOL IsIntrnlName() const { return eNmType == INTRNL_NAME; }
+ sal_Bool IsIntrnlName() const { return eNmType == INTRNL_NAME; }
// erfrage die akt. Darstellung der Formel
NameType GetNameType() const { return eNmType; }
// erfrage/setze das Flag, ob der akt. Wert gueltig ist
- BOOL IsValid() const { return bValidValue; }
- inline void ChgValid( BOOL bNew ) { bValidValue = bNew; }
+ sal_Bool IsValid() const { return bValidValue; }
+ inline void ChgValid( sal_Bool bNew ) { bValidValue = bNew; }
const String& GetFormula() const { return sFormel; }
void SetFormula( const String& rNew )
{
sFormel = rNew;
- bValidValue = FALSE;
+ bValidValue = sal_False;
eNmType = EXTRNL_NAME;
}
- USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
+ sal_uInt16 GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
// sind alle Boxen gueltig, auf die sich die Formel bezieht?
- BOOL HasValidBoxes() const;
+ sal_Bool HasValidBoxes() const;
};
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index f9c4e113ea61..ba0040797a74 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -36,79 +36,79 @@
* AMA 12.10.94: Umstellung auf SvxItems.
******************************************************************************/
-inline const SvxPostureItem &SwAttrSet::GetPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); }
-inline const SvxPostureItem &SwAttrSet::GetCJKPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetCJKPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_CJK_POSTURE,bInP); }
-inline const SvxPostureItem &SwAttrSet::GetCTLPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetCTLPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_CTL_POSTURE,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_WEIGHT,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetCJKWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetCJKWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_CJK_WEIGHT,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetCTLWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetCTLWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_CTL_WEIGHT,bInP); }
-inline const SvxShadowedItem &SwAttrSet::GetShadowed(BOOL bInP) const
+inline const SvxShadowedItem &SwAttrSet::GetShadowed(sal_Bool bInP) const
{ return (const SvxShadowedItem&)Get( RES_CHRATR_SHADOWED,bInP); }
-inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(BOOL bInP) const
+inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(sal_Bool bInP) const
{ return (const SvxAutoKernItem&)Get( RES_CHRATR_AUTOKERN,bInP); }
-inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(BOOL bInP) const
+inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(sal_Bool bInP) const
{ return (const SvxWordLineModeItem&)Get( RES_CHRATR_WORDLINEMODE,bInP); }
-inline const SvxContourItem &SwAttrSet::GetContour(BOOL bInP) const
+inline const SvxContourItem &SwAttrSet::GetContour(sal_Bool bInP) const
{ return (const SvxContourItem&)Get( RES_CHRATR_CONTOUR,bInP); }
-inline const SvxKerningItem &SwAttrSet::GetKerning(BOOL bInP) const
+inline const SvxKerningItem &SwAttrSet::GetKerning(sal_Bool bInP) const
{ return (const SvxKerningItem&)Get( RES_CHRATR_KERNING,bInP); }
-inline const SvxUnderlineItem &SwAttrSet::GetUnderline(BOOL bInP) const
+inline const SvxUnderlineItem &SwAttrSet::GetUnderline(sal_Bool bInP) const
{ return (const SvxUnderlineItem&)Get( RES_CHRATR_UNDERLINE,bInP); }
-inline const SvxOverlineItem &SwAttrSet::GetOverline(BOOL bInP) const
+inline const SvxOverlineItem &SwAttrSet::GetOverline(sal_Bool bInP) const
{ return (const SvxOverlineItem&)Get( RES_CHRATR_OVERLINE,bInP); }
-inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(BOOL bInP) const
+inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(sal_Bool bInP) const
{ return (const SvxCrossedOutItem&)Get( RES_CHRATR_CROSSEDOUT,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_FONTSIZE,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CJK_FONTSIZE,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
-inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const
+inline const SvxPropSizeItem &SwAttrSet::GetPropSize(sal_Bool bInP) const
{ return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); }
-inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
-inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetCJKFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); }
-inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetCTLFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CTL_FONT,bInP); }
-inline const SvxColorItem &SwAttrSet::GetColor(BOOL bInP) const
+inline const SvxColorItem &SwAttrSet::GetColor(sal_Bool bInP) const
{ return (const SvxColorItem&)Get( RES_CHRATR_COLOR,bInP); }
-inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(BOOL bInP) const
+inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(sal_Bool bInP) const
{ return (const SvxCharSetColorItem&)Get( RES_CHRATR_CHARSETCOLOR,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_LANGUAGE,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_CJK_LANGUAGE,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); }
-inline const SvxEscapementItem &SwAttrSet::GetEscapement(BOOL bInP) const
+inline const SvxEscapementItem &SwAttrSet::GetEscapement(sal_Bool bInP) const
{ return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); }
-inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(sal_Bool bInP) const
{ return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); }
-inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(sal_Bool bInP) const
{ return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); }
-inline const SvxBlinkItem &SwAttrSet::GetBlink(BOOL bInP) const
+inline const SvxBlinkItem &SwAttrSet::GetBlink(sal_Bool bInP) const
{ return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
-inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const
+inline const SvxBrushItem &SwAttrSet::GetChrBackground( sal_Bool bInP ) const
{ return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); }
-inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const
+inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( sal_Bool bInP ) const
{ return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
-inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( sal_Bool bInP ) const
{ return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); }
-inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const
+inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( sal_Bool bInP ) const
{ return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); }
-inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const
+inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( sal_Bool bInP ) const
{ return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); }
-inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const
+inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( sal_Bool bInP ) const
{ return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); }
-inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const
+inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( sal_Bool bInP ) const
{ return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); }
/******************************************************************************
@@ -116,63 +116,63 @@ inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const
* AMA: 12.10.94: Umstellung auf SvxItems.
******************************************************************************/
-inline const SvxPostureItem &SwFmt::GetPosture(BOOL bInP) const
+inline const SvxPostureItem &SwFmt::GetPosture(sal_Bool bInP) const
{ return aSet.GetPosture(bInP); }
-inline const SvxWeightItem &SwFmt::GetWeight(BOOL bInP) const
+inline const SvxWeightItem &SwFmt::GetWeight(sal_Bool bInP) const
{ return aSet.GetWeight(bInP); }
-inline const SvxShadowedItem &SwFmt::GetShadowed(BOOL bInP) const
+inline const SvxShadowedItem &SwFmt::GetShadowed(sal_Bool bInP) const
{ return aSet.GetShadowed(bInP); }
-inline const SvxAutoKernItem &SwFmt::GetAutoKern(BOOL bInP) const
+inline const SvxAutoKernItem &SwFmt::GetAutoKern(sal_Bool bInP) const
{ return aSet.GetAutoKern(bInP); }
-inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(BOOL bInP) const
+inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(sal_Bool bInP) const
{ return aSet.GetWordLineMode(bInP); }
-inline const SvxContourItem &SwFmt::GetContour(BOOL bInP) const
+inline const SvxContourItem &SwFmt::GetContour(sal_Bool bInP) const
{ return aSet.GetContour(bInP); }
-inline const SvxKerningItem &SwFmt::GetKerning(BOOL bInP) const
+inline const SvxKerningItem &SwFmt::GetKerning(sal_Bool bInP) const
{ return aSet.GetKerning(bInP); }
-inline const SvxUnderlineItem &SwFmt::GetUnderline(BOOL bInP) const
+inline const SvxUnderlineItem &SwFmt::GetUnderline(sal_Bool bInP) const
{ return aSet.GetUnderline(bInP); }
-inline const SvxOverlineItem &SwFmt::GetOverline(BOOL bInP) const
+inline const SvxOverlineItem &SwFmt::GetOverline(sal_Bool bInP) const
{ return aSet.GetOverline(bInP); }
-inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(BOOL bInP) const
+inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(sal_Bool bInP) const
{ return aSet.GetCrossedOut(bInP); }
-inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwFmt::GetSize(sal_Bool bInP) const
{ return aSet.GetSize(bInP); }
-inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const
+inline const SvxPropSizeItem &SwFmt::GetPropSize(sal_Bool bInP) const
{ return aSet.GetPropSize(bInP); }
-inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetFont(sal_Bool bInP) const
{ return aSet.GetFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetCJKFont(sal_Bool bInP) const
{ return aSet.GetCJKFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCTLFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetCTLFont(sal_Bool bInP) const
{ return aSet.GetCTLFont(bInP); }
-inline const SvxColorItem &SwFmt::GetColor(BOOL bInP) const
+inline const SvxColorItem &SwFmt::GetColor(sal_Bool bInP) const
{ return aSet.GetColor(bInP); }
- inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(BOOL bInP) const
+ inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(sal_Bool bInP) const
{ return aSet.GetCharSetColor(bInP); }
-inline const SvxLanguageItem &SwFmt::GetLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwFmt::GetLanguage(sal_Bool bInP) const
{ return aSet.GetLanguage(bInP); }
-inline const SvxEscapementItem &SwFmt::GetEscapement(BOOL bInP) const
+inline const SvxEscapementItem &SwFmt::GetEscapement(sal_Bool bInP) const
{ return aSet.GetEscapement(bInP); }
-inline const SvxCaseMapItem &SwFmt::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem &SwFmt::GetCaseMap(sal_Bool bInP) const
{ return aSet.GetCaseMap(bInP); }
-inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(sal_Bool bInP) const
{ return aSet.GetNoHyphenHere(bInP); }
-inline const SvxBlinkItem &SwFmt::GetBlink(BOOL bInP) const
+inline const SvxBlinkItem &SwFmt::GetBlink(sal_Bool bInP) const
{ return aSet.GetBlink(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrBackground(BOOL bInP) const
+inline const SvxBrushItem &SwFmt::GetChrBackground(sal_Bool bInP) const
{ return aSet.GetChrBackground(bInP); }
-inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( BOOL bInP ) const
+inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( sal_Bool bInP ) const
{ return aSet.GetEmphasisMark(bInP); }
-inline const SvxTwoLinesItem &SwFmt::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem &SwFmt::Get2Lines( sal_Bool bInP ) const
{ return aSet.Get2Lines(bInP); }
-inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( BOOL bInP ) const
+inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( sal_Bool bInP ) const
{ return aSet.GetCharScaleW(bInP); }
-inline const SvxCharRotateItem &SwFmt::GetCharRotate( BOOL bInP ) const
+inline const SvxCharRotateItem &SwFmt::GetCharRotate( sal_Bool bInP ) const
{ return aSet.GetCharRotate(bInP); }
-inline const SvxCharReliefItem &SwFmt::GetCharRelief( BOOL bInP ) const
+inline const SvxCharReliefItem &SwFmt::GetCharRelief( sal_Bool bInP ) const
{ return aSet.GetCharRelief(bInP); }
-inline const SvxCharHiddenItem &SwFmt::GetCharHidden( BOOL bInP ) const
+inline const SvxCharHiddenItem &SwFmt::GetCharHidden( sal_Bool bInP ) const
{ return aSet.GetCharHidden(bInP); }
#endif
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index a3e4b22a0b88..3b018fcff186 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -51,8 +51,8 @@ public:
namespace CharFmt
{
extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
- extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, USHORT nWhich );
- extern BOOL IsItemIncluded( const USHORT nWhich, const SwTxtAttr *pAttr );
+ extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
+ extern sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
}
#endif
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 5d63c866c68d..195b76f163d1 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -67,7 +67,7 @@ public:
class SW_DLLPUBLIC SwChapterField : public SwField
{
friend class SwChapterFieldType;
- BYTE nLevel;
+ sal_uInt8 nLevel;
String sTitle, sNumber, sPre, sPost;
virtual String Expand() const;
@@ -79,24 +79,24 @@ public:
// --> OD 2008-02-14 #i53420#
// void ChangeExpansion( const SwFrm*,
// const SwTxtNode*,
-// BOOL bSrchNum = FALSE);
+// sal_Bool bSrchNum = sal_False);
void ChangeExpansion( const SwFrm*,
const SwCntntNode*,
- BOOL bSrchNum = FALSE);
+ sal_Bool bSrchNum = sal_False);
// <--
- void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
+ void ChangeExpansion(const SwTxtNode &rNd, sal_Bool bSrchNum);
- inline BYTE GetLevel() const;
- inline void SetLevel(BYTE);
+ inline sal_uInt8 GetLevel() const;
+ inline void SetLevel(sal_uInt8);
inline const String& GetNumber() const;
inline const String& GetTitle() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BYTE SwChapterField::GetLevel() const { return nLevel; }
-inline void SwChapterField::SetLevel(BYTE nLev) { nLevel = nLev; }
+inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; }
+inline void SwChapterField::SetLevel(sal_uInt8 nLev) { nLevel = nLev; }
inline const String& SwChapterField::GetNumber() const { return sNumber; }
inline const String& SwChapterField::GetTitle() const { return sTitle; }
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 22cb3613502e..567bc5746c8b 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -139,7 +139,7 @@ struct SwContentAtPos
}
// befindet sich der Node in einem geschuetzten Bereich?
- BOOL IsInProtectSect() const;
+ sal_Bool IsInProtectSect() const;
bool IsInRTLText()const;
};
@@ -160,7 +160,7 @@ class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify
friend class SwChgLinkFlag;
//Braucht den Crsr als IntrnlCrsr.
- friend BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
+ friend sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
public: // public, damit defaultet werden kann !!
@@ -204,9 +204,9 @@ private:
long nUpDownX; // versuche den Cursor bei Up/Down immer in
// der gleichen Spalte zu bewegen
long nLeftFrmPos;
- ULONG nAktNode; // save CursorPos at Start-Action
+ sal_uLong nAktNode; // save CursorPos at Start-Action
xub_StrLen nAktCntnt;
- USHORT nAktNdTyp;
+ sal_uInt16 nAktNdTyp;
bool bAktSelection;
/*
@@ -215,8 +215,8 @@ private:
* auf den akt. Cursor kein Update. Dadurch koennen "komplizierte"
* Cursorbewegungen (ueber Find()) realisiert werden.
*/
- USHORT nCrsrMove;
- USHORT nBasicActionCnt; // Actions, die vom Basic geklammert wurden
+ sal_uInt16 nCrsrMove;
+ sal_uInt16 nBasicActionCnt; // Actions, die vom Basic geklammert wurden
CrsrMoveState eMvState; // Status fuers Crsr-Travelling - GetCrsrOfst
// --> OD 2008-04-02 #refactorlists#
@@ -224,35 +224,35 @@ private:
int nMarkedListLevel;
// <--
- BOOL bHasFocus : 1; // Shell ist in einem Window "aktiv"
- BOOL bSVCrsrVis : 1; // SV-Cursor Un-/Sichtbar
- BOOL bChgCallFlag : 1; // Attributaenderung innerhalb von
+ sal_Bool bHasFocus : 1; // Shell ist in einem Window "aktiv"
+ sal_Bool bSVCrsrVis : 1; // SV-Cursor Un-/Sichtbar
+ sal_Bool bChgCallFlag : 1; // Attributaenderung innerhalb von
// Start- und EndAction
- BOOL bVisPortChgd : 1; // befindet sich im VisPortChg-Aufruf
+ sal_Bool bVisPortChgd : 1; // befindet sich im VisPortChg-Aufruf
// (wird im Invalidate vom Cursor benutzt)
- BOOL bCallChgLnk : 1; // Flag fuer abgeleitete Klassen:
- // TRUE -> ChgLnk callen
+ sal_Bool bCallChgLnk : 1; // Flag fuer abgeleitete Klassen:
+ // sal_True -> ChgLnk callen
// Zugriff nur ueber SwChgLinkFlag
- BOOL bAllProtect : 1; // Flag fuer Bereiche
- // TRUE -> alles geschuetzt / versteckt
- BOOL bInCMvVisportChgd : 1; // Flag fuer CrsrMoves
- // TRUE -> die Sicht wurde verschoben
- BOOL bGCAttr : 1; // TRUE -> es existieren nichtaufgespannte Attr.
- BOOL bIgnoreReadonly : 1; // TRUE -> Beim naechsten EndAction trotz
+ sal_Bool bAllProtect : 1; // Flag fuer Bereiche
+ // sal_True -> alles geschuetzt / versteckt
+ sal_Bool bInCMvVisportChgd : 1; // Flag fuer CrsrMoves
+ // sal_True -> die Sicht wurde verschoben
+ sal_Bool bGCAttr : 1; // sal_True -> es existieren nichtaufgespannte Attr.
+ sal_Bool bIgnoreReadonly : 1; // sal_True -> Beim naechsten EndAction trotz
// Readonly den Crsr sichtbar machen.
- BOOL bSelTblCells : 1; // TRUE -> Zellen uebers InputWin selektieren
- BOOL bAutoUpdateCells : 1; // TRUE -> Zellen werden autoformatiert
- BOOL bBasicHideCrsr : 1; // TRUE -> HideCrsr vom Basic
- BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor darf in ReadOnly-Bereiche
- BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr
+ sal_Bool bSelTblCells : 1; // sal_True -> Zellen uebers InputWin selektieren
+ sal_Bool bAutoUpdateCells : 1; // sal_True -> Zellen werden autoformatiert
+ sal_Bool bBasicHideCrsr : 1; // sal_True -> HideCrsr vom Basic
+ sal_Bool bSetCrsrInReadOnly : 1;// sal_True -> Cursor darf in ReadOnly-Bereiche
+ sal_Bool bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr
// OD 11.02.2003 #100556# - flag to allow/avoid execution of marcos (default: true)
bool mbMacroExecAllowed : 1;
- SW_DLLPRIVATE void UpdateCrsr( USHORT eFlags
+ SW_DLLPRIVATE void UpdateCrsr( sal_uInt16 eFlags
=SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
- BOOL bIdleEnd = FALSE );
+ sal_Bool bIdleEnd = sal_False );
SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
@@ -273,21 +273,21 @@ private:
// <- #i27615#
// private method(s) accessed from public inline method(s) must be exported.
- BOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
- SW_DLLPRIVATE BOOL UpDown( BOOL, USHORT );
- SW_DLLPRIVATE BOOL LRMargin( BOOL, BOOL bAPI = FALSE );
- SW_DLLPRIVATE BOOL IsAtLRMargin( BOOL, BOOL bAPI = FALSE ) const;
+ sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool );
+ SW_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
+ SW_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
+ SW_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
-typedef BOOL (SwCursor:: *FNCrsr)();
- SW_DLLPRIVATE BOOL CallCrsrFN( FNCrsr );
+typedef sal_Bool (SwCursor:: *FNCrsr)();
+ SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
- SW_DLLPRIVATE const SwRedline* _GotoRedline( USHORT nArrPos, BOOL bSelect );
+ SW_DLLPRIVATE const SwRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
protected:
- inline SwMoveFnCollection* MakeFindRange( USHORT, USHORT, SwPaM* ) const;
+ inline SwMoveFnCollection* MakeFindRange( sal_uInt16, sal_uInt16, SwPaM* ) const;
/*
* Compare-Methode for the StackCursor and the current Cursor.
@@ -309,11 +309,11 @@ protected:
const xub_StrLen nOffset = 0 );
// --> FME 2004-07-30 #i32329# Enhanced table selection
- BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+ sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
// <--
// --> FME 2005-01-31 #i41424# Only update the marked number levels if necessary
- bool SetInFrontOfLabel( BOOL bNew );
+ bool SetInFrontOfLabel( sal_Bool bNew );
// <--
void RefreshBlockCursor();
@@ -334,7 +334,7 @@ public:
// neuen Cusror erzeugen und den alten anhaengen
SwPaM * CreateCrsr();
// loesche den aktuellen Cursor und der folgende wird zum Aktuellen
- BOOL DestroyCrsr();
+ sal_Bool DestroyCrsr();
// TableCursor in normale Cursor verwandeln, Tablemode aufheben
void TblCrsrToCursor();
// enter block mode, change normal cursor into block cursor
@@ -347,8 +347,8 @@ public:
// only for usage in special cases allowed!
void ExtendedSelectAll();
- SwPaM* GetCrsr( BOOL bMakeTblCrsr = TRUE ) const;
- inline SwCursor* GetSwCrsr( BOOL bMakeTblCrsr = TRUE ) const;
+ SwPaM* GetCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
+ inline SwCursor* GetSwCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
// nur den akt. Cursor returnen
SwShellCrsr* _GetCrsr() { return pCurCrsr; }
const SwShellCrsr* _GetCrsr() const { return pCurCrsr; }
@@ -367,43 +367,43 @@ public:
// Start der Klammerung, SV-Cursor und selektierte Bereiche hiden
void StartAction();
// Ende der Klammerung, SV-Cursor und selektierte Bereiche anzeigen
- void EndAction( const BOOL bIdleEnd = FALSE );
+ void EndAction( const sal_Bool bIdleEnd = sal_False );
// Basiscursortravelling
long GetUpDownX() const { return nUpDownX; }
- BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
- { return LeftRight( TRUE, nCnt, nMode, bAllowVisual ); }
- BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
- { return LeftRight( FALSE, nCnt, nMode, bAllowVisual ); }
- BOOL Up( USHORT nCnt = 1 ) { return UpDown( TRUE, nCnt ); }
- BOOL Down( USHORT nCnt = 1 ) { return UpDown( FALSE, nCnt ); }
- BOOL LeftMargin() { return LRMargin( TRUE ); }
- BOOL RightMargin(BOOL bAPI = FALSE) { return LRMargin( FALSE, bAPI ); }
- BOOL SttEndDoc( BOOL bStt );
-
- BOOL MovePage( SwWhichPage, SwPosPage );
- BOOL MovePara( SwWhichPara, SwPosPara );
- BOOL MoveSection( SwWhichSection, SwPosSection );
- BOOL MoveTable( SwWhichTable, SwPosTable );
- BOOL MoveColumn( SwWhichColumn, SwPosColumn );
- BOOL MoveRegion( SwWhichRegion, SwPosRegion );
+ sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False )
+ { return LeftRight( sal_True, nCnt, nMode, bAllowVisual ); }
+ sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False )
+ { return LeftRight( sal_False, nCnt, nMode, bAllowVisual ); }
+ sal_Bool Up( sal_uInt16 nCnt = 1 ) { return UpDown( sal_True, nCnt ); }
+ sal_Bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( sal_False, nCnt ); }
+ sal_Bool LeftMargin() { return LRMargin( sal_True ); }
+ sal_Bool RightMargin(sal_Bool bAPI = sal_False) { return LRMargin( sal_False, bAPI ); }
+ sal_Bool SttEndDoc( sal_Bool bStt );
+
+ sal_Bool MovePage( SwWhichPage, SwPosPage );
+ sal_Bool MovePara( SwWhichPara, SwPosPara );
+ sal_Bool MoveSection( SwWhichSection, SwPosSection );
+ sal_Bool MoveTable( SwWhichTable, SwPosTable );
+ sal_Bool MoveColumn( SwWhichColumn, SwPosColumn );
+ sal_Bool MoveRegion( SwWhichRegion, SwPosRegion );
// die Suchfunktionen
- ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
- BOOL bSearchInNotes,
+ sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt,
+ sal_Bool bSearchInNotes,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
- FindRanges eRng, int bReplace = FALSE );
+ sal_Bool& bCancel,
+ FindRanges eRng, int bReplace = sal_False );
- ULONG Find( const SwTxtFmtColl& rFmtColl,
+ sal_uLong Find( const SwTxtFmtColl& rFmtColl,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
+ sal_Bool& bCancel,
FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );
- ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections,
+ sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
+ sal_Bool& bCancel,
FindRanges eRng,
const com::sun::star::util::SearchOptions* pSearchOpt = 0,
const SfxItemSet* rReplSet = 0 );
@@ -412,7 +412,7 @@ public:
// returnt
// CRSR_POSCHG: wenn der ob der SPoint vom Layout korrigiert wurde.
// CRSR_POSOLD: wenn der Crsr nicht veraendert wurde
- int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true );
+ int SetCrsr( const Point &rPt, sal_Bool bOnlyText = sal_False, bool bBlock = true );
/*
@@ -431,35 +431,35 @@ public:
// Bereiche
inline void SetMark();
- inline BOOL HasMark();
+ inline sal_Bool HasMark();
void ClearMark();
/**
Ensure point and mark of the current PaM are in a specific order.
- @param bPointFirst TRUE: If the point is behind the mark then
- swap the PaM. FALSE: If the mark is behind the point then swap
+ @param bPointFirst sal_True: If the point is behind the mark then
+ swap the PaM. sal_False: If the mark is behind the point then swap
the PaM.
*/
- void NormalizePam(BOOL bPointFirst = TRUE);
+ void NormalizePam(sal_Bool bPointFirst = sal_True);
void SwapPam();
- BOOL ChgCurrPam( const Point & rPt,
- BOOL bTstOnly = TRUE, //Nur testen, nicht setzen
- BOOL bTstHit = FALSE ); //Nur genaue Treffer
+ sal_Bool ChgCurrPam( const Point & rPt,
+ sal_Bool bTstOnly = sal_True, //Nur testen, nicht setzen
+ sal_Bool bTstHit = sal_False ); //Nur genaue Treffer
void KillPams();
// erzeuge eine Kopie vom Cursor und speicher diese im Stack
void Push();
/*
* Loescht einen Cursor (gesteuert durch bOldCrsr)
- * - vom Stack oder ( bOldCrsr = TRUE )
+ * - vom Stack oder ( bOldCrsr = sal_True )
* - den aktuellen und der auf dem Stack stehende wird zum aktuellen
*
* Return: es war auf dem Stack noch einer vorhanden
*/
- BOOL Pop( BOOL bOldCrsr = TRUE );
+ sal_Bool Pop( sal_Bool bOldCrsr = sal_True );
/*
* Verbinde zwei Cursor miteinander.
* Loesche vom Stack den obersten und setzen dessen Mark im Aktuellen.
@@ -468,11 +468,11 @@ public:
#if !defined(DBG_UTIL)
void SttCrsrMove() { ++nCrsrMove; StartAction(); }
- void EndCrsrMove( const BOOL bIdleEnd = FALSE )
+ void EndCrsrMove( const sal_Bool bIdleEnd = sal_False )
{ EndAction( bIdleEnd ); --nCrsrMove; }
#else
void SttCrsrMove();
- void EndCrsrMove( const BOOL bIdleEnd = FALSE );
+ void EndCrsrMove( const sal_Bool bIdleEnd = sal_False );
#endif
/*
@@ -481,34 +481,34 @@ public:
* tierten Bereiche wieder angezeigt. (Bereiche muessen neu berechnet
* werden!)
*/
- BOOL HasShFcs() const { return bHasFocus; }
+ sal_Bool HasShFcs() const { return bHasFocus; }
void ShLooseFcs();
- void ShGetFcs( BOOL bUpdate = TRUE );
+ void ShGetFcs( sal_Bool bUpdate = sal_True );
// Methoden zum Anzeigen bzw. Verstecken des sichtbaren Text-Cursors
void ShowCrsr();
void HideCrsr();
// Methoden zum Anzeigen bzw. Verstecken der selektierten Bereiche mit
// dem sichtbaren Cursor
- void ShowCrsrs( BOOL bCrsrVis );
+ void ShowCrsrs( sal_Bool bCrsrVis );
void HideCrsrs();
- BOOL IsOverwriteCrsr() const { return bOverwriteCrsr; }
- void SetOverwriteCrsr( BOOL bFlag ) { bOverwriteCrsr = bFlag; }
+ sal_Bool IsOverwriteCrsr() const { return bOverwriteCrsr; }
+ void SetOverwriteCrsr( sal_Bool bFlag ) { bOverwriteCrsr = bFlag; }
// gebe den aktuellen Frame, in dem der Cursor steht, zurueck
- SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const;
+ SwCntntFrm *GetCurrFrm( const sal_Bool bCalcFrm = sal_True ) const;
- //TRUE wenn der Crsr wenn der Crsr wegen Readonly gehidet ist,
- //FALSE wenn der arbeitet (trotz Readonly).
- BOOL IsCrsrReadonly() const;
+ //sal_True wenn der Crsr wenn der Crsr wegen Readonly gehidet ist,
+ //sal_False wenn der arbeitet (trotz Readonly).
+ sal_Bool IsCrsrReadonly() const;
// Cursor steht in etwas geschuetztem oder in die Selektion umspannt
// etwas geschuetztes.
- BOOL HasReadonlySel() const;
+ sal_Bool HasReadonlySel() const;
// darf der Cursor in ReadOnlyBereiche?
- BOOL IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
- void SetReadOnlyAvailable( BOOL bFlag );
- BOOL IsOverReadOnlyPos( const Point& rPt ) const;
+ sal_Bool IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
+ void SetReadOnlyAvailable( sal_Bool bFlag );
+ sal_Bool IsOverReadOnlyPos( const Point& rPt ) const;
// Methoden fuer aFlyMacroLnk
void SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; }
@@ -527,21 +527,21 @@ public:
// Abfrage, ob der aktuelle Cursor eine Selektion aufspannt,
// also, ob Mark gesetzt und SPoint und Mark unterschiedlich sind.
- BOOL HasSelection() const;
+ sal_Bool HasSelection() const;
// Abfrage, ob ueberhaupt eine Selektion existiert, sprich der akt. Cursor
// aufgespannt oder nicht der einzigste ist.
- inline BOOL IsSelection() const;
+ inline sal_Bool IsSelection() const;
// returns if multiple cursors are available
- inline BOOL IsMultiSelection() const;
+ inline sal_Bool IsMultiSelection() const;
// Abfrage, ob ein kompletter Absatz selektiert wurde
- BOOL IsSelFullPara() const;
+ sal_Bool IsSelFullPara() const;
// Abfrage, ob die Selektion in einem Absatz ist
- inline BOOL IsSelOnePara() const;
+ inline sal_Bool IsSelOnePara() const;
//Sollte fuer das Clipboard der WaitPtr geschaltet werden.
- BOOL ShouldWait() const;
+ sal_Bool ShouldWait() const;
/*
* liefert das SRectangle, auf dem der Cursor steht.
@@ -551,27 +551,27 @@ public:
* liefert zurueck, ob der Cursor sich ganz oder teilweise im
* sichtbaren Bereich befindet.
*/
- BOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
+ sal_Bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
// gebe die aktuelle Seitennummer zurueck:
- // TRUE: in der der Cursor steht
- // FALSE: die am oberen Rand sichtbar ist
- void GetPageNum( USHORT &rnPhyNum, USHORT &rnVirtNum,
- BOOL bAtCrsrPos = TRUE, const BOOL bCalcFrm = TRUE );
+ // sal_True: in der der Cursor steht
+ // sal_False: die am oberen Rand sichtbar ist
+ void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
+ sal_Bool bAtCrsrPos = sal_True, const sal_Bool bCalcFrm = sal_True );
// bestimme in welche Richtung "leere Seiten" behandelt werden!
// (wird benutzt im PhyPage.. )
- USHORT GetNextPrevPageNum( BOOL bNext = TRUE );
+ sal_uInt16 GetNextPrevPageNum( sal_Bool bNext = sal_True );
// setze den Cursor auf die Seite "nPage" an den Anfang
- BOOL GotoPage( USHORT nPage );
+ sal_Bool GotoPage( sal_uInt16 nPage );
// gebe alle Dokumentseiten zurueck
- USHORT GetPageCnt();
+ sal_uInt16 GetPageCnt();
// Gehe zur naechsten Selection
- BOOL GoNextCrsr();
+ sal_Bool GoNextCrsr();
// gehe zur vorherigen Selection
- BOOL GoPrevCrsr();
+ sal_Bool GoPrevCrsr();
// at CurCrsr.SPoint
::sw::mark::IMark* SetBookmark(
@@ -603,51 +603,51 @@ public:
String GetText() const;
// pruefe ob vom aktuellen Crsr der SPoint/Mark in einer Tabelle stehen
- inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
+ inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const;
// erfrage die Document - Layout - Position vom akt. Crsr
- inline Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
- inline BOOL IsCrsrPtAtEnd() const;
+ inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const;
+ inline sal_Bool IsCrsrPtAtEnd() const;
inline const SwPaM* GetTblCrs() const;
inline SwPaM* GetTblCrs();
- BOOL IsTblComplex() const;
- BOOL IsTblComplexForChart();
+ sal_Bool IsTblComplex() const;
+ sal_Bool IsTblComplexForChart();
// erfrage die akt. TabellenSelektion als Text
String GetBoxNms() const;
// setze Crsr in die naechsten/vorherigen Celle
- BOOL GoNextCell( BOOL bAppendLine = TRUE );
- BOOL GoPrevCell();
+ sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True );
+ sal_Bool GoPrevCell();
// gehe zu dieser Box (wenn vorhanden und in Tabelle!)
- BOOL GotoTable( const String& rName );
+ sal_Bool GotoTable( const String& rName );
// select a table row, column or box (based on the current cursor)
- BOOL SelTblRow() { return _SelTblRowOrCol( true ); }
- BOOL SelTblCol() { return _SelTblRowOrCol( false ); }
- BOOL SelTblBox();
+ sal_Bool SelTblRow() { return _SelTblRowOrCol( true ); }
+ sal_Bool SelTblCol() { return _SelTblRowOrCol( false ); }
+ sal_Bool SelTblBox();
// --> FME 2004-07-30 #i32329# Enhanced table selection
- BOOL SelTbl();
+ sal_Bool SelTbl();
// <--
// zum naechsten/vorhergehenden Punkt auf gleicher Ebene
- BOOL GotoNextNum();
- BOOL GotoPrevNum();
+ sal_Bool GotoNextNum();
+ sal_Bool GotoPrevNum();
// zu diesem Gliederungspunkt
- BOOL GotoOutline( const String& rName );
+ sal_Bool GotoOutline( const String& rName );
// zum naechsten/vorhergehenden oder angegebenen OultineNode
- void GotoOutline( USHORT nIdx );
+ void GotoOutline( sal_uInt16 nIdx );
// suche die "Outline-Position" im Nodes-Array vom akt. Kaiptel
- USHORT GetOutlinePos( BYTE nLevel = UCHAR_MAX );
+ sal_uInt16 GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX );
// selektiere den angeben Bereich von OutlineNodes. Optional
- // inclusive der Childs. Die USHORT sind die Positionen im
+ // inclusive der Childs. Die sal_uInt16 sind die Positionen im
// OutlineNds-Array!! (EditShell)
- BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
- BOOL bWithChilds = FALSE );
+ sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
+ sal_Bool bWithChilds = sal_False );
- BOOL GotoNextOutline(); // naechster Node mit Outline-Num.
- BOOL GotoPrevOutline(); // vorheriger Node mit Outline-Num.
+ sal_Bool GotoNextOutline(); // naechster Node mit Outline-Num.
+ sal_Bool GotoPrevOutline(); // vorheriger Node mit Outline-Num.
/** Delivers the current shell cursor
@@ -673,131 +673,131 @@ public:
// ist der Crsr in einer Tabelle und ist die Selection ueber
// zwei Spalten
- BOOL IsTableMode() const { return 0 != pTblCrsr; }
+ sal_Bool IsTableMode() const { return 0 != pTblCrsr; }
// erfrage den Tabellen Crsr; ausserhalb von Tabellen immer 0
const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; }
SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; }
- USHORT UpdateTblSelBoxes();
+ sal_uInt16 UpdateTblSelBoxes();
- BOOL GotoFtnTxt(); // springe aus dem Content zur Fussnote
- BOOL GotoFtnAnchor(); // springe aus der Fussnote zum Anker
- BOOL GotoPrevFtnAnchor();
- BOOL GotoNextFtnAnchor();
+ sal_Bool GotoFtnTxt(); // springe aus dem Content zur Fussnote
+ sal_Bool GotoFtnAnchor(); // springe aus der Fussnote zum Anker
+ sal_Bool GotoPrevFtnAnchor();
+ sal_Bool GotoNextFtnAnchor();
- BOOL GotoFlyAnchor(); // springe aus dem Rahmen zum Anker
- BOOL GotoHeaderTxt(); // springe aus dem Content zum Header
- BOOL GotoFooterTxt(); // springe aus dem Content zum Footer
+ sal_Bool GotoFlyAnchor(); // springe aus dem Rahmen zum Anker
+ sal_Bool GotoHeaderTxt(); // springe aus dem Content zum Header
+ sal_Bool GotoFooterTxt(); // springe aus dem Content zum Footer
// springe in den Header/Footer des angegebenen oder akt. PageDesc
- BOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX,
- BOOL bInHeader = TRUE );
- // is point of cursor in header/footer. pbInHeader return TRUE if it is
+ sal_Bool SetCrsrInHdFt( sal_uInt16 nDescNo = USHRT_MAX,
+ sal_Bool bInHeader = sal_True );
+ // is point of cursor in header/footer. pbInHeader return sal_True if it is
// in a headerframe otherwise in a footerframe
- BOOL IsInHeaderFooter( BOOL* pbInHeader = 0 ) const;
+ sal_Bool IsInHeaderFooter( sal_Bool* pbInHeader = 0 ) const;
// springe zum naechsten Verzeichnis [mit dem Namen]
- BOOL GotoNextTOXBase( const String* = 0 );
+ sal_Bool GotoNextTOXBase( const String* = 0 );
// springe zum vorherigen Verzeichnis [mit dem Namen]
- BOOL GotoPrevTOXBase( const String* = 0 );
- BOOL GotoTOXMarkBase(); // springe zum Verzeichnis vom TOXMark
+ sal_Bool GotoPrevTOXBase( const String* = 0 );
+ sal_Bool GotoTOXMarkBase(); // springe zum Verzeichnis vom TOXMark
// springe zum naechsten (vorherigen) Verzeichniseintrag
- BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE );
+ sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True );
// Zur naechsten/ vorherigen Verzeichnismarke dieses Typs traveln
const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );
// springe zum naechsten (vorherigen) Tabellenformel
// optional auch nur zu kaputten Formeln springen
- BOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE,
- BOOL bOnlyErrors = FALSE );
+ sal_Bool GotoNxtPrvTblFormula( sal_Bool bNext = sal_True,
+ sal_Bool bOnlyErrors = sal_False );
// jump to the next / previous hyperlink - inside text and also
// on graphics
- BOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE );
+ sal_Bool SelectNxtPrvHyperlink( sal_Bool bNext = sal_True );
// springe zu dieser Refmark
- BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
- USHORT nSeqNo = 0 );
+ sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0,
+ sal_uInt16 nSeqNo = 0 );
// hole vom Start/Ende der akt. Selection das nte Zeichen
- sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 );
+ sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 );
// erweiter die akt. Selection am Anfang/Ende um n Zeichen
- BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 );
+ sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, xub_StrLen nCount = 1 );
// setze nur den sichtbaren Cursor an die angegebene Dokument-Pos.
- // returnt FALSE: wenn der ob der SPoint vom Layout korrigiert wurde.
+ // returnt sal_False: wenn der ob der SPoint vom Layout korrigiert wurde.
// (wird zum Anzeigen von Drag&Drop/Copy-Cursor benoetigt)
- BOOL SetVisCrsr( const Point &rPt );
+ sal_Bool SetVisCrsr( const Point &rPt );
inline void UnSetVisCrsr();
// springe zum nachsten/vorherigen Feld des entsprechenden Types
- BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext,
- USHORT nSubType = USHRT_MAX,
- USHORT nResType = USHRT_MAX );
+ sal_Bool MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
+ sal_uInt16 nSubType = USHRT_MAX,
+ sal_uInt16 nResType = USHRT_MAX );
// springe genau zu diesem Feld
- BOOL GotoFld( const SwFmtFld& rFld );
+ sal_Bool GotoFld( const SwFmtFld& rFld );
// returne die Anzahl der Cursor im Ring (Flag besagt ob man nur
// aufgepspannte haben will - sprich etwas selektiert ist (Basic))
- USHORT GetCrsrCnt( BOOL bAll = TRUE ) const;
+ sal_uInt16 GetCrsrCnt( sal_Bool bAll = sal_True ) const;
// Char Travelling - Methoden (in crstrvl1.cxx)
- BOOL GoStartWord();
- BOOL GoEndWord();
- BOOL GoNextWord();
- BOOL GoPrevWord();
- BOOL GoNextSentence();
- BOOL GoPrevSentence();
- BOOL GoStartSentence();
- BOOL GoEndSentence();
- BOOL SelectWord( const Point* pPt = 0 );
- BOOL ExpandToSentenceBorders();
+ sal_Bool GoStartWord();
+ sal_Bool GoEndWord();
+ sal_Bool GoNextWord();
+ sal_Bool GoPrevWord();
+ sal_Bool GoNextSentence();
+ sal_Bool GoPrevSentence();
+ sal_Bool GoStartSentence();
+ sal_Bool GoEndSentence();
+ sal_Bool SelectWord( const Point* pPt = 0 );
+ sal_Bool ExpandToSentenceBorders();
// Position vom akt. Cursor erfragen
- BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
- BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- BOOL IsStartSentence() const;
- BOOL IsEndSentence() const;
- BOOL IsSttPara() const;
- BOOL IsEndPara() const;
- BOOL IsStartOfDoc() const;
- BOOL IsEndOfDoc() const;
- BOOL IsInFrontOfLabel() const;
- BOOL IsAtLeftMargin() const { return IsAtLRMargin( TRUE ); }
- BOOL IsAtRightMargin(BOOL bAPI = FALSE) const { return IsAtLRMargin( FALSE, bAPI ); }
+ sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
+ sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+ sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+ sal_Bool IsStartSentence() const;
+ sal_Bool IsEndSentence() const;
+ sal_Bool IsSttPara() const;
+ sal_Bool IsEndPara() const;
+ sal_Bool IsStartOfDoc() const;
+ sal_Bool IsEndOfDoc() const;
+ sal_Bool IsInFrontOfLabel() const;
+ sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True ); }
+ sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return IsAtLRMargin( sal_False, bAPI ); }
// loesche alle erzeugten Crsr, setze den Tabellen-Crsr und den letzten
// Cursor auf seinen TextNode (oder StartNode?).
// Beim naechsten ::GetCrsr werden sie wieder alle erzeugt.
// Wird fuers Drag&Drop/ClipBorad-Paste in Tabellen benoetigt.
- BOOL ParkTblCrsr();
+ sal_Bool ParkTblCrsr();
// gibt es nicht aufgespannte Attribute?
- BOOL IsGCAttr() const { return bGCAttr; }
- void ClearGCAttr() { bGCAttr = FALSE; }
- void UpdateAttr() { bGCAttr = TRUE; }
+ sal_Bool IsGCAttr() const { return bGCAttr; }
+ void ClearGCAttr() { bGCAttr = sal_False; }
+ void UpdateAttr() { bGCAttr = sal_True; }
// ist das gesamte Dokument geschuetzt/versteckt?? (fuer UI,..)
- BOOL IsAllProtect() const { return bAllProtect; }
+ sal_Bool IsAllProtect() const { return bAllProtect; }
#ifdef SW_CRSR_TIMER
- // setze das Flag am VisCrsr, ob dieser ueber Timer getriggert (TRUE)
- // oder direkt (FALSE) angezeigt wird. (default ist Timer getriggert)
- BOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE );
+ // setze das Flag am VisCrsr, ob dieser ueber Timer getriggert (sal_True)
+ // oder direkt (sal_False) angezeigt wird. (default ist Timer getriggert)
+ sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True );
#endif
- BOOL BasicActionPend() const { return nBasicActionCnt != nStartAction; }
+ sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; }
// springe zum benannten Bereich
- BOOL GotoRegion( const String& rName );
+ sal_Bool GotoRegion( const String& rName );
// zeige die aktuelle Selektion an
virtual void MakeSelVisible();
// setzte den Cursor auf einen NICHT geschuetzten/versteckten Node
- BOOL FindValidCntntNode( BOOL bOnlyText = FALSE );
+ sal_Bool FindValidCntntNode( sal_Bool bOnlyText = sal_False );
- BOOL GetContentAtPos( const Point& rPt,
+ sal_Bool GetContentAtPos( const Point& rPt,
SwContentAtPos& rCntntAtPos,
- BOOL bSetCrsr = FALSE,
+ sal_Bool bSetCrsr = sal_False,
SwRect* pFldRect = 0 );
// --> OD 2008-06-19 #i90516#
@@ -816,40 +816,40 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const;
- BOOL IsPageAtPos( const Point &rPt ) const;
+ sal_Bool IsPageAtPos( const Point &rPt ) const;
// Attribut selelktieren
- BOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand, const SwTxtAttr* pAttr = 0 );
- BOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
+ sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pAttr = 0 );
+ sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr );
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
- BOOL CheckTblBoxCntnt( const SwPosition* pPos = 0 );
+ sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
void ClearTblBoxCntnt();
- BOOL EndAllTblBoxEdit();
+ sal_Bool EndAllTblBoxEdit();
// wird gerufen, wenn eine Tabellenselektion im UpdateCrsr erzeugt wird,
// ohne das die UI davon etaws weiss
virtual void NewCoreSelection();
- void SetSelTblCells( BOOL bFlag ) { bSelTblCells = bFlag; }
- BOOL IsSelTblCells() const { return bSelTblCells; }
+ void SetSelTblCells( sal_Bool bFlag ) { bSelTblCells = bFlag; }
+ sal_Bool IsSelTblCells() const { return bSelTblCells; }
- BOOL IsAutoUpdateCells() const { return bAutoUpdateCells; }
- void SetAutoUpdateCells( BOOL bFlag ) { bAutoUpdateCells = bFlag; }
+ sal_Bool IsAutoUpdateCells() const { return bAutoUpdateCells; }
+ void SetAutoUpdateCells( sal_Bool bFlag ) { bAutoUpdateCells = bFlag; }
- BOOL GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
+ sal_Bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
SwRect& rRect, short& rOrient );
- BOOL SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
+ sal_Bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
const SwRedline* SelNextRedline();
const SwRedline* SelPrevRedline();
- const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE );
+ const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False );
// is cursor or the point in/over a vertical formatted text?
- BOOL IsInVerticalText( const Point* pPt = 0 ) const;
+ sal_Bool IsInVerticalText( const Point* pPt = 0 ) const;
// is cursor or the point in/over a right to left formatted text?
- BOOL IsInRightToLeftText( const Point* pPt = 0 ) const;
+ sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const;
// If the current cursor position is inside a hidden range, the hidden range
// is selected and true is returned:
@@ -886,12 +886,12 @@ public:
// Cursor Inlines:
inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
- USHORT nStt, USHORT nEnd, SwPaM* pPam ) const
+ sal_uInt16 nStt, sal_uInt16 nEnd, SwPaM* pPam ) const
{
return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
}
-inline SwCursor* SwCrsrShell::GetSwCrsr( BOOL bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( sal_Bool bMakeTblCrsr ) const
{
return (SwCursor*)GetCrsr( bMakeTblCrsr );
}
@@ -900,35 +900,35 @@ inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
inline void SwCrsrShell::SetMark() { pCurCrsr->SetMark(); }
-inline BOOL SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
+inline sal_Bool SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
-inline BOOL SwCrsrShell::IsSelection() const
+inline sal_Bool SwCrsrShell::IsSelection() const
{
return IsTableMode() || pCurCrsr->HasMark() ||
pCurCrsr->GetNext() != pCurCrsr;
}
-inline BOOL SwCrsrShell::IsMultiSelection() const
+inline sal_Bool SwCrsrShell::IsMultiSelection() const
{
return pCurCrsr->GetNext() != pCurCrsr;
}
-inline BOOL SwCrsrShell::IsSelOnePara() const
+inline sal_Bool SwCrsrShell::IsSelOnePara() const
{
return pCurCrsr == pCurCrsr->GetNext() &&
pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode;
}
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const
+inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const
{
return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
}
-inline BOOL SwCrsrShell::IsCrsrPtAtEnd() const
+inline sal_Bool SwCrsrShell::IsCrsrPtAtEnd() const
{
return pCurCrsr->End() == pCurCrsr->GetPoint();
}
-inline Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
+inline Point& SwCrsrShell::GetCrsrDocPos( sal_Bool bPoint ) const
{
return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
}
@@ -946,7 +946,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs()
inline void SwCrsrShell::UnSetVisCrsr()
{
pVisCrsr->Hide();
- pVisCrsr->SetDragCrsr( FALSE );
+ pVisCrsr->SetDragCrsr( sal_False );
}
#endif // _CRSRSH_HXX
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 84d9650c5eca..c89d871c9940 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -35,8 +35,8 @@
// the same, but in complex text cell skip over legatures and char skip
// into it.
// These defines exist only to cut off the dependicies to I18N project.
-const USHORT CRSR_SKIP_CHARS = 0;
-const USHORT CRSR_SKIP_CELLS = 1;
-const USHORT CRSR_SKIP_HIDDEN = 2;
+const sal_uInt16 CRSR_SKIP_CHARS = 0;
+const sal_uInt16 CRSR_SKIP_CELLS = 1;
+const sal_uInt16 CRSR_SKIP_HIDDEN = 2;
#endif
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index de32f44c8f85..cf2e55118ab7 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -44,10 +44,10 @@ enum SwFillMode
struct SwFillCrsrPos
{
SwRect aCrsr; // Position und Groesse des Shadowcursors
- USHORT nParaCnt; // Anzahl der einzufuegenden Absaetze
- USHORT nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs
- USHORT nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen
- USHORT nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche
+ sal_uInt16 nParaCnt; // Anzahl der einzufuegenden Absaetze
+ sal_uInt16 nTabCnt; // Anzahl der Tabs bzw. Groesse des Einzugs
+ sal_uInt16 nSpaceCnt; // Anzahl der einzufuegenden Leerzeichen
+ sal_uInt16 nColumnCnt; // Anzahl der notwendigen Spaltenumbrueche
sal_Int16 eOrient; // Absatzausrichtung
SwFillMode eMode; // Gewuenschte Auffuellregel
SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) :
@@ -69,7 +69,7 @@ struct Sw2LinesPos
SwRect aLine; // Position and size of the line
SwRect aPortion; // Position and size of the multi portion
SwRect aPortion2; // needed for nested multi portions
- BYTE nMultiType; // Multiportion type
+ sal_uInt8 nMultiType; // Multiportion type
};
/**
@@ -110,8 +110,8 @@ struct Sw2LinesPos
struct SwSpecialPos
{
xub_StrLen nCharOfst;
- USHORT nLineOfst;
- BYTE nExtendRange;
+ sal_uInt16 nLineOfst;
+ sal_uInt8 nExtendRange;
// #i27615#
SwSpecialPos() : nCharOfst(0), nLineOfst(0),
@@ -138,32 +138,32 @@ struct SwCrsrMoveState
SwSpecialPos* pSpecialPos; // for positions inside fields
Point aRealHeight; // enthaelt dann die Position/Hoehe des Cursors
CrsrMoveState eState;
- BYTE nCursorBidiLevel;
- BOOL bStop :1;
- BOOL bRealHeight :1; // Soll die reale Hoehe berechnet werden?
- BOOL bFieldInfo :1; // Sollen Felder erkannt werden?
- BOOL bPosCorr :1; // Point musste korrigiert werden
- BOOL bFtnNoInfo :1; // Fussnotennumerierung erkannt
- BOOL bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern
+ sal_uInt8 nCursorBidiLevel;
+ sal_Bool bStop :1;
+ sal_Bool bRealHeight :1; // Soll die reale Hoehe berechnet werden?
+ sal_Bool bFieldInfo :1; // Sollen Felder erkannt werden?
+ sal_Bool bPosCorr :1; // Point musste korrigiert werden
+ sal_Bool bFtnNoInfo :1; // Fussnotennumerierung erkannt
+ sal_Bool bExactOnly :1; // GetCrsrOfst nur nach Exakten Treffern
// suchen lassen, sprich niemals in das
// GetCntntPos laufen.
- BOOL bFillRet :1; // wird nur im FillModus temp. genutzt
- BOOL bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden
- BOOL bRealWidth :1; // Calculation of the width required
- BOOL b2Lines :1; // Check 2line portions and fill p2Lines
- BOOL bNoScroll :1; // No scrolling of undersized textframes
- BOOL bPosMatchesBounds :1; // GetCrsrOfst should not return the next
+ sal_Bool bFillRet :1; // wird nur im FillModus temp. genutzt
+ sal_Bool bSetInReadOnly :1; // ReadOnlyBereiche duerfen betreten werden
+ sal_Bool bRealWidth :1; // Calculation of the width required
+ sal_Bool b2Lines :1; // Check 2line portions and fill p2Lines
+ sal_Bool bNoScroll :1; // No scrolling of undersized textframes
+ sal_Bool bPosMatchesBounds :1; // GetCrsrOfst should not return the next
// position if screen position is inside second
// have of bound rect
- BOOL bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <--
+ sal_Bool bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <--
// #i27615#
/**
cursor in front of label
*/
- BOOL bInFrontOfLabel :1;
- BOOL bInNumPortion :1; // point is in number portion #i23726#
+ sal_Bool bInFrontOfLabel :1;
+ sal_Bool bInNumPortion :1; // point is in number portion #i23726#
int nInNumPostionOffset; // distance from number portion's start
SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) :
@@ -172,20 +172,20 @@ struct SwCrsrMoveState
pSpecialPos( NULL ),
eState( eSt ),
nCursorBidiLevel( 0 ),
- bStop( FALSE ),
- bRealHeight( FALSE ),
- bFieldInfo( FALSE ),
- bPosCorr( FALSE ),
- bFtnNoInfo( FALSE ),
- bExactOnly( FALSE ),
- bSetInReadOnly( FALSE ),
- bRealWidth( FALSE ),
- b2Lines( FALSE ),
- bNoScroll( FALSE ),
- bPosMatchesBounds( FALSE ),
- bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <--
- bInFrontOfLabel( FALSE ), // #i27615#
- bInNumPortion(FALSE), // #i26726#
+ bStop( sal_False ),
+ bRealHeight( sal_False ),
+ bFieldInfo( sal_False ),
+ bPosCorr( sal_False ),
+ bFtnNoInfo( sal_False ),
+ bExactOnly( sal_False ),
+ bSetInReadOnly( sal_False ),
+ bRealWidth( sal_False ),
+ b2Lines( sal_False ),
+ bNoScroll( sal_False ),
+ bPosMatchesBounds( sal_False ),
+ bCntntCheck( sal_False ), // --> FME 2005-05-13 #i43742# <--
+ bInFrontOfLabel( sal_False ), // #i27615#
+ bInNumPortion(sal_False), // #i26726#
nInNumPostionOffset(0) // #i26726#
{}
SwCrsrMoveState( SwFillCrsrPos *pInitFill ) :
@@ -193,20 +193,20 @@ struct SwCrsrMoveState
pSpecialPos( NULL ),
eState( MV_SETONLYTEXT ),
nCursorBidiLevel( 0 ),
- bStop( FALSE ),
- bRealHeight( FALSE ),
- bFieldInfo( FALSE ),
- bPosCorr( FALSE ),
- bFtnNoInfo( FALSE ),
- bExactOnly( FALSE ),
- bSetInReadOnly( FALSE ),
- bRealWidth( FALSE ),
- b2Lines( FALSE ),
- bNoScroll( FALSE ),
- bPosMatchesBounds( FALSE ),
- bCntntCheck( FALSE ), // --> FME 2005-05-13 #i43742# <--
- bInFrontOfLabel( FALSE ), // #i27615#
- bInNumPortion(FALSE), // #i23726#
+ bStop( sal_False ),
+ bRealHeight( sal_False ),
+ bFieldInfo( sal_False ),
+ bPosCorr( sal_False ),
+ bFtnNoInfo( sal_False ),
+ bExactOnly( sal_False ),
+ bSetInReadOnly( sal_False ),
+ bRealWidth( sal_False ),
+ b2Lines( sal_False ),
+ bNoScroll( sal_False ),
+ bPosMatchesBounds( sal_False ),
+ bCntntCheck( sal_False ), // --> FME 2005-05-13 #i43742# <--
+ bInFrontOfLabel( sal_False ), // #i27615#
+ bInNumPortion(sal_False), // #i23726#
nInNumPostionOffset(0) // #i23726#
{}
};
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index a99df015a7c1..b015337b4085 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -49,19 +49,19 @@ extern SwPosPage fnPageStart, fnPageEnd;
// Richtungsparameter fuer MovePara ( wird in SwPaM initialisiert )
typedef SwMoveFnCollection* SwPosPara;
-typedef BOOL (*SwWhichPara)( SwPaM&, SwPosPara );
+typedef sal_Bool (*SwWhichPara)( SwPaM&, SwPosPara );
extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
extern SwPosPara fnParaStart, fnParaEnd;
// Richtungsparameter fuer MoveSection
typedef SwMoveFnCollection* SwPosSection;
-typedef BOOL (*SwWhichSection)( SwPaM&, SwPosSection );
+typedef sal_Bool (*SwWhichSection)( SwPaM&, SwPosSection );
extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext;
extern SwPosSection fnSectionStart, fnSectionEnd;
// Richtungsparameter fuer MoveTable
typedef SwMoveFnCollection* SwPosTable;
-typedef BOOL (*SwWhichTable)( SwPaM&, SwPosTable, BOOL bInReadOnly );
+typedef sal_Bool (*SwWhichTable)( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext;
extern SwPosTable fnTableStart, fnTableEnd;
@@ -73,7 +73,7 @@ extern SwPosColumn fnColumnStart, fnColumnEnd;
// Richtungsparameter fuer MoveRegion (Bereiche!)
typedef SwMoveFnCollection* SwPosRegion;
-typedef BOOL (*SwWhichRegion)( SwPaM&, SwPosRegion, BOOL bInReadOnly );
+typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
extern SwPosRegion fnRegionStart, fnRegionEnd;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index c13c766e1147..135553da1b64 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -60,8 +60,8 @@ public:
const String& GetColumnName() const {return sColumn;}
const SwDBData& GetDBData() const {return aDBData;}
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -74,16 +74,16 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
{
String aContent;
String sFieldCode; // contains Word's field code
- USHORT nSubType;
- BOOL bIsInBodyTxt : 1;
- BOOL bValidValue : 1;
- BOOL bInitialized : 1;
+ sal_uInt16 nSubType;
+ sal_Bool bIsInBodyTxt : 1;
+ sal_Bool bValidValue : 1;
+ sal_Bool bInitialized : 1;
virtual String Expand() const;
virtual SwField* Copy() const;
public:
- SwDBField(SwDBFieldType*, ULONG nFmt = 0);
+ SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
virtual ~SwDBField();
virtual SwFieldType* ChgTyp( SwFieldType* );
@@ -91,13 +91,13 @@ public:
// Der aktuelle Text
inline void SetExpansion(const String& rStr);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
virtual String GetFieldName() const;
// fuer Berechnungen in Ausdruecken
- void ChgValue( double d, BOOL bVal );
+ void ChgValue( double d, sal_Bool bVal );
// Evaluierung ueber den DBMgr String rauspulen
void Evaluate();
@@ -107,11 +107,11 @@ public:
void InitContent();
void InitContent(const String& rExpansion);
- inline void ChgBodyTxtFlag( BOOL bIsInBody );
+ inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
- inline BOOL IsInitialized() const { return bInitialized; }
- inline void ClearInitialized() { bInitialized = FALSE; }
- inline void SetInitialized() { bInitialized = TRUE; }
+ inline sal_Bool IsInitialized() const { return bInitialized; }
+ inline void ClearInitialized() { bInitialized = sal_False; }
+ inline void SetInitialized() { bInitialized = sal_True; }
// Name erfragen
virtual const String& GetPar1() const;
@@ -124,15 +124,15 @@ public:
// DBName
inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
inline void SwDBField::SetExpansion(const String& rStr)
{ aContent = rStr; }
// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
-inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
+inline void SwDBField::ChgBodyTxtFlag( sal_Bool bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
/*--------------------------------------------------------------------
@@ -142,13 +142,13 @@ inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
class SW_DLLPUBLIC SwDBNameInfField : public SwField
{
SwDBData aDBData;
- USHORT nSubType;
+ sal_uInt16 nSubType;
protected:
const SwDBData& GetDBData() const {return aDBData;}
SwDBData& GetDBData() {return aDBData;}
- SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0);
public:
// DBName
@@ -159,10 +159,10 @@ public:
virtual String GetFieldName() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
};
@@ -186,7 +186,7 @@ public:
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
{
String aCond;
- BOOL bCondValid;
+ sal_Bool bCondValid;
public:
SwDBNextSetField( SwDBNextSetFieldType*,
@@ -196,20 +196,20 @@ public:
virtual SwField* Copy() const;
void Evaluate(SwDoc*);
- inline void SetCondValid(BOOL bCond);
- inline BOOL IsCondValid() const;
+ inline void SetCondValid(sal_Bool bCond);
+ inline sal_Bool IsCondValid() const;
// Condition
virtual const String& GetPar1() const;
virtual void SetPar1(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BOOL SwDBNextSetField::IsCondValid() const
+inline sal_Bool SwDBNextSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNextSetField::SetCondValid(BOOL bCond)
+inline void SwDBNextSetField::SetCondValid(sal_Bool bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -235,7 +235,7 @@ class SwDBNumSetField : public SwDBNameInfField
{
String aCond;
String aPar2;
- BOOL bCondValid;
+ sal_Bool bCondValid;
public:
SwDBNumSetField(SwDBNumSetFieldType*, const String& rCond, const String& rDBNum, const SwDBData& rDBData);
@@ -243,8 +243,8 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- inline BOOL IsCondValid() const;
- inline void SetCondValid(BOOL bCond);
+ inline sal_Bool IsCondValid() const;
+ inline void SetCondValid(sal_Bool bCond);
void Evaluate(SwDoc*);
// Condition
@@ -256,14 +256,14 @@ public:
virtual void SetPar2(const String& rStr);
// Die Datensatznummer steht in nFormat !!
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BOOL SwDBNumSetField::IsCondValid() const
+inline sal_Bool SwDBNumSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNumSetField::SetCondValid(BOOL bCond)
+inline void SwDBNumSetField::SetCondValid(sal_Bool bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -276,7 +276,7 @@ class SwDBNameFieldType : public SwFieldType
public:
SwDBNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(sal_uLong) const;
virtual SwFieldType* Copy() const;
};
@@ -287,12 +287,12 @@ public:
class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
{
public:
- SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -316,7 +316,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
long nNumber;
public:
- SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -324,8 +324,8 @@ public:
inline long GetSetNumber() const;
inline void SetSetNumber(long nNum);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
inline long SwDBSetNumberField::GetSetNumber() const
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index fd2f694f5e3f..bc017ddbec5b 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -112,16 +112,16 @@ struct SwDSParam : public SwDBData
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement> xStatement;
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> xResultSet;
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aSelection;
- BOOL bScrollable;
- BOOL bEndOfDB;
- BOOL bAfterSelection;
+ sal_Bool bScrollable;
+ sal_Bool bEndOfDB;
+ sal_Bool bAfterSelection;
long nSelectionIndex;
SwDSParam(const SwDBData& rData) :
SwDBData(rData),
- bScrollable(FALSE),
- bEndOfDB(FALSE),
- bAfterSelection(FALSE),
+ bScrollable(sal_False),
+ bEndOfDB(sal_False),
+ bAfterSelection(sal_False),
nSelectionIndex(0)
{}
@@ -131,16 +131,16 @@ struct SwDSParam : public SwDBData
SwDBData(rData),
xResultSet(xResSet),
aSelection(rSelection),
- bScrollable(TRUE),
- bEndOfDB(FALSE),
- bAfterSelection(FALSE),
+ bScrollable(sal_True),
+ bEndOfDB(sal_False),
+ bAfterSelection(sal_False),
nSelectionIndex(0)
{}
void CheckEndOfDB()
{
if(bEndOfDB)
- bAfterSelection = TRUE;
+ bAfterSelection = sal_True;
}
};
typedef SwDSParam* SwDSParamPtr;
@@ -148,7 +148,7 @@ SV_DECL_PTRARR_DEL(SwDSParamArr, SwDSParamPtr, 0, 5)
struct SwMergeDescriptor
{
- USHORT nMergeType;
+ sal_uInt16 nMergeType;
SwWrtShell& rSh;
const ::svx::ODataAccessDescriptor& rDescriptor;
String sSaveToFilter; //export filter to save resulting files
@@ -174,7 +174,7 @@ struct SwMergeDescriptor
::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aPrintOptions;
- SwMergeDescriptor( USHORT nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) :
+ SwMergeDescriptor( sal_uInt16 nType, SwWrtShell& rShell, ::svx::ODataAccessDescriptor& rDesc ) :
nMergeType(nType),
rSh(rShell),
rDescriptor(rDesc),
@@ -200,21 +200,21 @@ friend class SwConnectionDisposedListener_Impl;
String sEMailAddrFld; // Mailing: Spaltenname der E-Mail Adresse
String sSubject; // Mailing: Subject
String sAttached; // Mailing: Attachte Files
- USHORT nMergeType;
- BOOL bInitDBFields : 1; // TRUE: Datenbank an Feldern beim Mergen
- BOOL bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic
- BOOL bCancel : 1; // Serienbrief-Save abgebrochen
-
- BOOL bInMerge : 1; //merge process active
- BOOL bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API)
- BOOL bMergeLock : 1; // prevent update of database fields while document is
+ sal_uInt16 nMergeType;
+ sal_Bool bInitDBFields : 1; // sal_True: Datenbank an Feldern beim Mergen
+ sal_Bool bSingleJobs : 1; // Einzelne Druckjobs bei Aufruf aus Basic
+ sal_Bool bCancel : 1; // Serienbrief-Save abgebrochen
+
+ sal_Bool bInMerge : 1; //merge process active
+ sal_Bool bMergeSilent : 1; // suppress display of dialogs/boxes (used when called over API)
+ sal_Bool bMergeLock : 1; // prevent update of database fields while document is
// actually printed at the ViewShell
SwDSParamArr aDataSourceParams;
SwNewDBMgr_Impl* pImpl;
const SwXMailMerge* pMergeEvtSrc; // != 0 if mail merge events are to be send
- SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, BOOL bCreate);
- SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, BOOL bCreate);
+ SW_DLLPRIVATE SwDSParam* FindDSData(const SwDBData& rData, sal_Bool bCreate);
+ SW_DLLPRIVATE SwDSParam* FindDSConnection(const ::rtl::OUString& rSource, sal_Bool bCreate);
SW_DLLPRIVATE DECL_LINK( PrtCancelHdl, Button * );
@@ -226,36 +226,36 @@ friend class SwConnectionDisposedListener_Impl;
SW_DLLPRIVATE void ImportDBEntry(SwWrtShell* pSh);
// merge to file _and_ merge to e-Mail
- SW_DLLPRIVATE BOOL MergeMailFiles(SwWrtShell* pSh,
+ SW_DLLPRIVATE sal_Bool MergeMailFiles(SwWrtShell* pSh,
const SwMergeDescriptor& rMergeDescriptor );
- SW_DLLPRIVATE BOOL ToNextRecord(SwDSParam* pParam);
+ SW_DLLPRIVATE sal_Bool ToNextRecord(SwDSParam* pParam);
public:
SwNewDBMgr();
~SwNewDBMgr();
// Art des aktellen Mergens. Siehe DBMgrOptions-enum
- inline USHORT GetMergeType() const { return nMergeType; }
- inline void SetMergeType( USHORT nTyp ) { nMergeType = nTyp; }
+ inline sal_uInt16 GetMergeType() const { return nMergeType; }
+ inline void SetMergeType( sal_uInt16 nTyp ) { nMergeType = nTyp; }
// MailMergeEvent source
const SwXMailMerge * GetMailMergeEvtSrc() const { return pMergeEvtSrc; }
void SetMailMergeEvtSrc( const SwXMailMerge *pSrc ) { pMergeEvtSrc = pSrc; }
- inline BOOL IsMergeSilent() const { return bMergeSilent != 0; }
- inline void SetMergeSilent( BOOL bVal ) { bMergeSilent = bVal; }
+ inline sal_Bool IsMergeSilent() const { return bMergeSilent != 0; }
+ inline void SetMergeSilent( sal_Bool bVal ) { bMergeSilent = bVal; }
// Mischen von Datensaetzen in Felder
- BOOL MergeNew( const SwMergeDescriptor& rMergeDesc );
- BOOL Merge(SwWrtShell* pSh);
+ sal_Bool MergeNew( const SwMergeDescriptor& rMergeDesc );
+ sal_Bool Merge(SwWrtShell* pSh);
// Datenbankfelder mit fehlendem Datenbankname initialisieren
- inline BOOL IsInitDBFields() const { return bInitDBFields; }
- inline void SetInitDBFields(BOOL b) { bInitDBFields = b; }
+ inline sal_Bool IsInitDBFields() const { return bInitDBFields; }
+ inline void SetInitDBFields(sal_Bool b) { bInitDBFields = b; }
// Serienbriefe einzelnd oder alle zusammen drucken/speichern
- inline BOOL IsSingleJobs() const { return bSingleJobs; }
- inline void SetSingleJobs(BOOL b) { bSingleJobs = b; }
+ inline sal_Bool IsSingleJobs() const { return bSingleJobs; }
+ inline void SetSingleJobs(sal_Bool b) { bSingleJobs = b; }
// Mailing
// email-Daten setzen
@@ -265,22 +265,22 @@ public:
// Listbox mit allen Tabellennamen einer Datenbank fuellen
- BOOL GetTableNames(ListBox* pListBox, const String& rDBName );
+ sal_Bool GetTableNames(ListBox* pListBox, const String& rDBName );
// Listbox mit allen Spaltennamen einer Datenbanktabelle fuellen
- BOOL GetColumnNames(ListBox* pListBox,
- const String& rDBName, const String& rTableName, BOOL bAppend = FALSE);
- BOOL GetColumnNames(ListBox* pListBox,
+ sal_Bool GetColumnNames(ListBox* pListBox,
+ const String& rDBName, const String& rTableName, sal_Bool bAppend = sal_False);
+ sal_Bool GetColumnNames(ListBox* pListBox,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
- const String& rTableName, BOOL bAppend = FALSE);
+ const String& rTableName, sal_Bool bAppend = sal_False);
- ULONG GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
+ sal_uLong GetColumnFmt( ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDataSource> xSource,
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> xConnection,
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> xColumn,
SvNumberFormatter* pNFmtr,
long nLanguage );
- ULONG GetColumnFmt( const String& rDBName,
+ sal_uLong GetColumnFmt( const String& rDBName,
const String& rTableName,
const String& rColNm,
SvNumberFormatter* pNFmtr,
@@ -289,25 +289,25 @@ public:
const String& rTableName,
const String& rColNm );
- inline BOOL IsInMerge() const { return bInMerge; }
+ inline sal_Bool IsInMerge() const { return bInMerge; }
void EndMerge();
void ExecuteFormLetter(SwWrtShell& rSh,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties,
- BOOL bWithDataSourceBrowser = FALSE);
+ sal_Bool bWithDataSourceBrowser = sal_False);
void InsertText(SwWrtShell& rSh,
const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue>& rProperties);
// check if a data source is open
- BOOL IsDataSourceOpen(const String& rDataSource,
+ sal_Bool IsDataSourceOpen(const String& rDataSource,
const String& rTableOrQuery, sal_Bool bMergeOnly);
// open the source while fields are updated - for the calculator only!
- BOOL OpenDataSource(const String& rDataSource, const String& rTableOrQuery,
+ sal_Bool OpenDataSource(const String& rDataSource, const String& rTableOrQuery,
sal_Int32 nCommandType = -1, bool bCreate = false);
sal_uInt32 GetSelectedRecordId(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
- BOOL GetColumnCnt(const String& rSourceName, const String& rTableName,
+ sal_Bool GetColumnCnt(const String& rSourceName, const String& rTableName,
const String& rColumnName, sal_uInt32 nAbsRecordId, long nLanguage,
String& rResult, double* pNumber);
//create and store or find an already stored connection to a data source for use
@@ -316,19 +316,19 @@ public:
RegisterConnection(::rtl::OUString& rSource);
const SwDSParam* CreateDSData(const SwDBData& rData)
- {return FindDSData(rData, TRUE);}
+ {return FindDSData(rData, sal_True);}
const SwDSParamArr& GetDSParamArray() const {return aDataSourceParams;}
//close all data sources - after fields were updated
- void CloseAll(BOOL bIncludingMerge = TRUE);
+ void CloseAll(sal_Bool bIncludingMerge = sal_True);
- BOOL GetMergeColumnCnt(const String& rColumnName, USHORT nLanguage,
+ sal_Bool GetMergeColumnCnt(const String& rColumnName, sal_uInt16 nLanguage,
String &rResult, double *pNumber, sal_uInt32 *pFormat);
- BOOL ToNextMergeRecord();
- BOOL ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
+ sal_Bool ToNextMergeRecord();
+ sal_Bool ToNextRecord(const String& rDataSource, const String& rTableOrQuery, sal_Int32 nCommandType = -1);
- BOOL ExistsNextRecord()const;
+ sal_Bool ExistsNextRecord()const;
sal_uInt32 GetSelectedRecordId();
sal_Bool ToRecordId(sal_Int32 nSet);
@@ -346,7 +346,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier>
GetColumnSupplier(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>,
const String& rTableOrQuery,
- BYTE eTableOrQuery = SW_DB_SELECT_UNKNOWN);
+ sal_uInt8 eTableOrQuery = SW_DB_SELECT_UNKNOWN);
static ::com::sun::star::uno::Sequence<rtl::OUString> GetExistingDatabaseNames();
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 5406fb042e95..7d5fec3e37c0 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -84,8 +84,8 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj );
// OD 2004-03-31 #i26791# - change return type
SwContact* GetUserCall( const SdrObject* );
-// liefert TRUE falls das SrdObject ein Marquee-Object (Lauftext) ist
-BOOL IsMarqueeTextObj( const SdrObject& rObj );
+// liefert sal_True falls das SrdObject ein Marquee-Object (Lauftext) ist
+sal_Bool IsMarqueeTextObj( const SdrObject& rObj );
//Basisklasse fuer die folgenden KontaktObjekte (Rahmen+Zeichenobjekte)
class SwContact : public SdrObjUserCall, public SwClient
@@ -346,7 +346,7 @@ class SwDrawVirtObj : public SdrVirtObj
virtual ::basegfx::B2DPolyPolygon TakeXorPoly() const;
virtual ::basegfx::B2DPolyPolygon TakeContour() const;
virtual SdrHdl* GetHdl(sal_uInt32 nHdlNum) const;
- virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, USHORT nPlNum) const;
+ virtual SdrHdl* GetPlusHdl(const SdrHdl& rHdl, sal_uInt16 nPlNum) const;
virtual void NbcMove(const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
virtual void NbcRotate(const Point& rRef, long nWink, double sn, double cs);
@@ -421,7 +421,7 @@ class SwDrawContact : public SwContact
// method <_Changed(..)>
bool mbUserCallActive : 1;
// event type, which is handled for <mpSdrObjHandledByCurrentUserCall>.
- // Note: value only valid, if <mbUserCallActive> is TRUE.
+ // Note: value only valid, if <mbUserCallActive> is sal_True.
SdrUserCallType meEventTypeOfCurrentUserCall;
friend class NestedUserCallHdl;
diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 87b8a9f53dea..6fb7a76c3728 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -45,35 +45,35 @@ class SW_DLLPUBLIC SwDDEFieldType : public SwFieldType
::sfx2::SvBaseLinkRef refLink;
SwDoc* pDoc;
- USHORT nRefCnt;
- BOOL bCRLFFlag : 1;
- BOOL bDeleted : 1;
+ sal_uInt16 nRefCnt;
+ sal_Bool bCRLFFlag : 1;
+ sal_Bool bDeleted : 1;
SW_DLLPRIVATE void _RefCntChgd();
public:
SwDDEFieldType( const String& rName, const String& rCmd,
- USHORT = sfx2::LINKUPDATE_ONCALL );
+ sal_uInt16 = sfx2::LINKUPDATE_ONCALL );
~SwDDEFieldType();
const String& GetExpansion() const { return aExpansion; }
void SetExpansion( const String& rStr ) { aExpansion = rStr,
- bCRLFFlag = FALSE; }
+ bCRLFFlag = sal_False; }
virtual SwFieldType* Copy() const;
virtual const String& GetName() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
String GetCmd() const;
void SetCmd( const String& rStr );
- USHORT GetType() const { return refLink->GetUpdateMode(); }
- void SetType( USHORT nType ) { refLink->SetUpdateMode( nType ); }
+ sal_uInt16 GetType() const { return refLink->GetUpdateMode(); }
+ void SetType( sal_uInt16 nType ) { refLink->SetUpdateMode( nType ); }
- BOOL IsDeleted() const { return bDeleted; }
- void SetDeleted( BOOL b ) { bDeleted = b; }
+ sal_Bool IsDeleted() const { return bDeleted; }
+ void SetDeleted( sal_Bool b ) { bDeleted = b; }
void UpdateNow() { refLink->Update(); }
void Disconnect() { refLink->Disconnect(); }
@@ -88,7 +88,7 @@ public:
void IncRefCnt() { if( !nRefCnt++ && pDoc ) _RefCntChgd(); }
void DecRefCnt() { if( !--nRefCnt && pDoc ) _RefCntChgd(); }
- void SetCRLFDelFlag( BOOL bFlag = TRUE ) { bCRLFFlag = bFlag; }
+ void SetCRLFDelFlag( sal_Bool bFlag = sal_True ) { bCRLFFlag = bFlag; }
};
/*--------------------------------------------------------------------
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 736fbb70a3b5..34d060850a3c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -458,43 +458,43 @@ private:
SdrLayerID nInvisibleHell;
SdrLayerID nInvisibleControls;
- bool mbGlossDoc : 1; //TRUE: ist ein Textbaustein Dokument
- bool mbModified : 1; //TRUE: Dokument ist veraendert
- bool mbDtor : 1; //TRUE: ist im SwDoc DTOR
+ bool mbGlossDoc : 1; //sal_True: ist ein Textbaustein Dokument
+ bool mbModified : 1; //sal_True: Dokument ist veraendert
+ bool mbDtor : 1; //sal_True: ist im SwDoc DTOR
// leider auch temporaer von
// SwSwgReader::InLayout(), wenn fehlerhafte
// Frames geloescht werden muessen
- bool mbUndo : 1; // TRUE: Undo eingeschaltet
- bool mbGroupUndo : 1; // TRUE: Undos werden gruppiert
- bool mbPageNums : 1; // TRUE: es gibt virtuelle Seitennummern
- bool mbLoaded : 1; // TRUE: ein geladenes Doc
- bool mbUpdateExpFld : 1; // TRUE: Expression-Felder updaten
- bool mbNewDoc : 1; // TRUE: neues Doc
- bool mbNewFldLst : 1; // TRUE: Felder-Liste neu aufbauen
- bool mbCopyIsMove : 1; // TRUE: Copy ist ein verstecktes Move
- bool mbNoDrawUndoObj : 1; // TRUE: keine DrawUndoObjecte speichern
- bool mbVisibleLinks : 1; // TRUE: Links werden sichtbar eingefuegt
- bool mbBrowseMode : 1; // TRUE: Dokument im BrowseModus anzeigen
- bool mbInReading : 1; // TRUE: Dokument wird gerade gelesen
- bool mbInXMLImport : 1; // TRUE: During xml import, attribute portion building is not necessary
- bool mbUpdateTOX : 1; // TRUE: nach Dokument laden die TOX Updaten
- bool mbInLoadAsynchron : 1; // TRUE: Dokument wird gerade asynchron geladen
- bool mbHTMLMode : 1; // TRUE: Dokument ist im HTMLMode
- bool mbInCallModified : 1; // TRUE: im Set/Reset-Modified Link
- bool mbIsGlobalDoc : 1; // TRUE: es ist ein GlobalDokument
- bool mbGlblDocSaveLinks : 1; // TRUE: im GlobalDoc. gelinkte Sect. mit speichern
- bool mbIsLabelDoc : 1; // TRUE: es ist ein Etiketten-Dokument
- bool mbIsAutoFmtRedline : 1; // TRUE: die Redlines werden vom Autoformat aufgezeichnet
- bool mbOLEPrtNotifyPending : 1; // TRUE: Printer ist geaendert und beim
+ bool mbUndo : 1; // sal_True: Undo eingeschaltet
+ bool mbGroupUndo : 1; // sal_True: Undos werden gruppiert
+ bool mbPageNums : 1; // sal_True: es gibt virtuelle Seitennummern
+ bool mbLoaded : 1; // sal_True: ein geladenes Doc
+ bool mbUpdateExpFld : 1; // sal_True: Expression-Felder updaten
+ bool mbNewDoc : 1; // sal_True: neues Doc
+ bool mbNewFldLst : 1; // sal_True: Felder-Liste neu aufbauen
+ bool mbCopyIsMove : 1; // sal_True: Copy ist ein verstecktes Move
+ bool mbNoDrawUndoObj : 1; // sal_True: keine DrawUndoObjecte speichern
+ bool mbVisibleLinks : 1; // sal_True: Links werden sichtbar eingefuegt
+ bool mbBrowseMode : 1; // sal_True: Dokument im BrowseModus anzeigen
+ bool mbInReading : 1; // sal_True: Dokument wird gerade gelesen
+ bool mbInXMLImport : 1; // sal_True: During xml import, attribute portion building is not necessary
+ bool mbUpdateTOX : 1; // sal_True: nach Dokument laden die TOX Updaten
+ bool mbInLoadAsynchron : 1; // sal_True: Dokument wird gerade asynchron geladen
+ bool mbHTMLMode : 1; // sal_True: Dokument ist im HTMLMode
+ bool mbInCallModified : 1; // sal_True: im Set/Reset-Modified Link
+ bool mbIsGlobalDoc : 1; // sal_True: es ist ein GlobalDokument
+ bool mbGlblDocSaveLinks : 1; // sal_True: im GlobalDoc. gelinkte Sect. mit speichern
+ bool mbIsLabelDoc : 1; // sal_True: es ist ein Etiketten-Dokument
+ bool mbIsAutoFmtRedline : 1; // sal_True: die Redlines werden vom Autoformat aufgezeichnet
+ bool mbOLEPrtNotifyPending : 1; // sal_True: Printer ist geaendert und beim
// Erzeugen der ::com::sun::star::sdbcx::View ist eine Benachrichtigung
// der OLE-Objekte PrtOLENotify() notwendig.
bool mbAllOLENotify : 1; // True: Benachrichtigung aller Objekte ist notwendig
bool mbIsRedlineMove : 1; // True: die Redlines werden in/aus der Section verschoben
bool mbInsOnlyTxtGlssry : 1; // True: insert 'only text' glossary into doc
bool mbContains_MSVBasic : 1; // True: MS-VBasic exist is in our storage
- bool mbPurgeOLE : 1; // TRUE: Purge OLE-Objects
- bool mbKernAsianPunctuation : 1; // TRUE: kerning also for ASIAN punctuation
- bool mbReadlineChecked : 1; // TRUE: if the query was already shown
+ bool mbPurgeOLE : 1; // sal_True: Purge OLE-Objects
+ bool mbKernAsianPunctuation : 1; // sal_True: kerning also for ASIAN punctuation
+ bool mbReadlineChecked : 1; // sal_True: if the query was already shown
bool mbLinksUpdated : 1; // OD 2005-02-11 #i38810#
// flag indicating, that the links have been updated.
bool mbClipBoard : 1; // true: this document represents the clipboard
@@ -502,7 +502,7 @@ private:
// (clipboard docs only)
#ifdef DBG_UTIL
- bool mbXMLExport : 1; // TRUE: during XML export
+ bool mbXMLExport : 1; // sal_True: during XML export
#endif
// --> OD 2006-03-21 #b6375613#
@@ -521,59 +521,59 @@ private:
// HISTORY OF THE COMPATIBILITY FLAGS:
//
// SO5:
- // mbParaSpaceMax def = FALSE, TRUE since SO8
- // mbParaSpaceMaxAtPages def = FALSE, TRUE since SO8
+ // mbParaSpaceMax def = sal_False, sal_True since SO8
+ // mbParaSpaceMaxAtPages def = sal_False, sal_True since SO8
//
// SO6:
- // mbTabCompat def = FALSE, TRUE since SO8
+ // mbTabCompat def = sal_False, sal_True since SO8
//
// SO7:
- // mbUseVirtualDevice def = TRUE
- // mbAddFlyOffsets def = FALSE, hidden
+ // mbUseVirtualDevice def = sal_True
+ // mbAddFlyOffsets def = sal_False, hidden
//
// SO7pp1:
- // bOldNumbering def = FALSE, hidden
+ // bOldNumbering def = sal_False, hidden
//
// SO8:
- // mbAddExternalLeading def = TRUE
- // mbUseHiResolutionVirtualDevice def = TRUE, hidden
- // mbOldLineSpacing def = FALSE
- // mbAddParaSpacingToTableCells def = TRUE
- // mbUseFormerObjectPos def = FALSE
- // mbUseFormerTextWrapping def = FALSE
- // mbConsiderWrapOnObjPos def = FALSE
+ // mbAddExternalLeading def = sal_True
+ // mbUseHiResolutionVirtualDevice def = sal_True, hidden
+ // mbOldLineSpacing def = sal_False
+ // mbAddParaSpacingToTableCells def = sal_True
+ // mbUseFormerObjectPos def = sal_False
+ // mbUseFormerTextWrapping def = sal_False
+ // mbConsiderWrapOnObjPos def = sal_False
//
// SO8pp1:
- // mbIgnoreFirstLineIndentInNumbering def = FALSE, hidden
- // mbDoNotJustifyLinesWithManualBreak def = FALSE, hidden
- // mbDoNotResetParaAttrsForNumFont def = FALSE, hidden
+ // mbIgnoreFirstLineIndentInNumbering def = sal_False, hidden
+ // mbDoNotJustifyLinesWithManualBreak def = sal_False, hidden
+ // mbDoNotResetParaAttrsForNumFont def = sal_False, hidden
//
// SO8pp3
- // mbDoNotCaptureDrawObjsOnPage def = FALSE, hidden
+ // mbDoNotCaptureDrawObjsOnPage def = sal_False, hidden
// - Relevant for drawing objects, which don't follow the text flow, but
// whose position is outside the page area:
- // FALSE: Such drawing objects are captured on the page area of its anchor.
- // TRUE: Such drawing objects can leave the page area, they aren't captured.
- // mbTableRowKeep def = FALSE, hidden
- // mbIgnoreTabsAndBlanksForLineCalculation def = FALSE, hidden
- // mbClipAsCharacterAnchoredWriterFlyFrame def = FALSE, hidden
+ // sal_False: Such drawing objects are captured on the page area of its anchor.
+ // sal_True: Such drawing objects can leave the page area, they aren't captured.
+ // mbTableRowKeep def = sal_False, hidden
+ // mbIgnoreTabsAndBlanksForLineCalculation def = sal_False, hidden
+ // mbClipAsCharacterAnchoredWriterFlyFrame def = sal_False, hidden
// - Introduced in order to re-activate clipping of as-character anchored
// Writer fly frames in method <SwFlyInCntFrm::MakeAll()> for documents,
// which are created with version prior SO8/OOo 2.0
//
// SO8pp4
- // mbUnixForceZeroExtLeading def = FALSE, hidden
+ // mbUnixForceZeroExtLeading def = sal_False, hidden
//
// SO8pu8
- // mbOldPrinterMetrics def = FALSE, hidden
+ // mbOldPrinterMetrics def = sal_False, hidden
//
// SO9
// #i24363# tab stops relative to indent
- // mbTabRelativeToIndent def = TRUE, hidden
+ // mbTabRelativeToIndent def = sal_True, hidden
// #i89181# suppress tab stop at left indent for paragraphs in lists, whose
// list level position and space mode equals LABEL_ALIGNMENT and whose list
// label is followed by a tab character.
- // mbTabAtLeftIndentForParagraphsInList def = FALSE, hidden
+ // mbTabAtLeftIndentForParagraphsInList def = sal_False, hidden
bool mbParaSpaceMax : 1;
bool mbParaSpaceMaxAtPages : 1;
@@ -587,7 +587,7 @@ private:
bool mbUseFormerObjectPos : 1; // OD 2004-03-12 #i11860#
bool mbUseFormerTextWrapping : 1; // FME 2005-05-11 #108724#
bool mbConsiderWrapOnObjPos : 1; // OD 2004-05-05 #i28701#
- // TRUE: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
+ // sal_True: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos'
bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972#
// non-ui-compatibility flags:
@@ -650,7 +650,7 @@ private:
sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms );
// --> OD 2005-01-13 #i40550#
- typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, BOOL, BOOL );
+ typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool, sal_Bool );
// <--
SwFmt* CopyFmt( const SwFmt& rFmt, const SvPtrarr& rFmtArr,
FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
@@ -704,8 +704,8 @@ private:
// Charts der angegebenen Tabelle updaten
void _UpdateCharts( const SwTable& rTbl, ViewShell& rVSh ) const;
- BOOL _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
- USHORT nMode );
+ sal_Bool _SelectNextRubyChars( SwPaM& rPam, SwRubyListEntry& rRubyEntry,
+ sal_uInt16 nMode );
// unser eigener 'IdlTimer' ruft folgende Methode
DECL_LINK( DoIdleJobs, Timer * );
@@ -713,9 +713,9 @@ private:
DECL_LINK( DoUpdateAllCharts, Timer * );
DECL_LINK( DoUpdateModifiedOLE, Timer * );
- SwFmt *_MakeCharFmt(const String &, SwFmt *, BOOL, BOOL );
- SwFmt *_MakeFrmFmt(const String &, SwFmt *, BOOL, BOOL );
- SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, BOOL, BOOL );
+ SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
+ SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
+ SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
void InitTOXTypes();
void Paste( const SwDoc& );
@@ -750,8 +750,8 @@ public:
*/
virtual bool get(/*[in]*/ DocumentSettingId id) const;
virtual void set(/*[in]*/ DocumentSettingId id, /*[in]*/ bool value);
- virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const;
- virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters );
+ virtual const com::sun::star::i18n::ForbiddenCharacters* getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const;
+ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters );
virtual vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable();
virtual const vos::ORef<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const;
virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const;
@@ -850,7 +850,7 @@ public:
virtual void SetVisibleLinks(bool bFlag);
virtual sfx2::LinkManager& GetLinkManager();
virtual const sfx2::LinkManager& GetLinkManager() const;
- virtual void UpdateLinks(BOOL bUI);
+ virtual void UpdateLinks(sal_Bool bUI);
virtual bool GetData(const String& rItem, const String& rMimeType, ::com::sun::star::uno::Any& rValue) const;
virtual bool SetData(const String& rItem, const String& rMimeType, const ::com::sun::star::uno::Any& rValue);
virtual ::sfx2::SvLinkSource* CreateLinkSource(const String& rItem);
@@ -867,7 +867,7 @@ public:
virtual void RemoveFldType(sal_uInt16 nFld);
virtual void UpdateFlds( SfxPoolItem* pNewHt, bool bCloseDB);
virtual void InsDeletedFldType(SwFieldType &);
- virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, USHORT nWhich);
+ virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich);
virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds);
virtual void UpdateRefFlds(SfxPoolItem* pHt);
virtual void UpdateTblFlds(SfxPoolItem* pHt);
@@ -878,9 +878,9 @@ public:
virtual void UnlockExpFlds();
virtual bool IsExpFldsLocked() const;
virtual SwDocUpdtFld& GetUpdtFlds() const;
- virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen);
+ virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen);
virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime);
- virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt);
+ virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt);
virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld);
virtual void FldsToExpand(SwHash**& ppTbl, sal_uInt16& rTblSize, const _SetGetExpFld& rToThisFld);
virtual bool IsNewFldLst() const;
@@ -1100,18 +1100,18 @@ public:
// im FlySet/FrmFmt mit gueltiger CntntPos gesetzt ist
/* #109161# new parameter bCalledFromShell
- TRUE: An existing adjust item at pAnchorPos is propagated to
+ sal_True: An existing adjust item at pAnchorPos is propagated to
the content node of the new fly section. That propagation only
takes place if there is no adjust item in the paragraph style
for the new fly section.
- FALSE: no propagation
+ sal_False: no propagation
*/
SwFlyFrmFmt* MakeFlySection( RndStdIds eAnchorType,
const SwPosition* pAnchorPos,
const SfxItemSet* pSet = 0,
SwFrmFmt *pParent = 0,
- BOOL bCalledFromShell = FALSE );
+ sal_Bool bCalledFromShell = sal_False );
SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet,
const SwSelBoxes* pSelBoxes = 0,
SwFrmFmt *pParent = 0 );
@@ -1226,7 +1226,7 @@ public:
const SvUShortsSort* = 0,
const bool bSendDataChangedEvents = true );
// <--
- void RstTxtAttrs(const SwPaM &rRg, BOOL bInclRefToxMark = FALSE );
+ void RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark = sal_False );
// Setze das Attribut im angegebenen Format. Ist Undo aktiv, wird
// das alte in die Undo-History aufgenommen
@@ -1235,7 +1235,7 @@ public:
// --> OD 2008-02-12 #newlistlevelattrs#
// method to reset a certain attribute at the given format
- void ResetAttrAtFormat( const USHORT nWhichId,
+ void ResetAttrAtFormat( const sal_uInt16 nWhichId,
SwFmt& rChangedFormat );
// <--
@@ -1274,18 +1274,18 @@ public:
void RemoveAllFmtLanguageDependencies();
SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
- BOOL bBroadcast = FALSE, BOOL bAuto = TRUE);
- void DelFrmFmt( SwFrmFmt *pFmt, BOOL bBroadcast = FALSE );
+ sal_Bool bBroadcast = sal_False, sal_Bool bAuto = sal_True);
+ void DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast = sal_False );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
{ return (SwFrmFmt*)FindFmtByName( (SvPtrarr&)*pFrmFmtTbl, rName ); }
// --> OD 2005-01-13 #i40550#
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
- BOOL bBroadcast = FALSE,
- BOOL bAuto = TRUE );
+ sal_Bool bBroadcast = sal_False,
+ sal_Bool bAuto = sal_True );
// <--
- void DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
- void DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE);
+ void DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
+ void DelCharFmt(SwCharFmt* pFmt, sal_Bool bBroadcast = sal_False);
SwCharFmt* FindCharFmtByName( const String& rName ) const
{ return (SwCharFmt*)FindFmtByName( (SvPtrarr&)*pCharFmtTbl, rName ); }
@@ -1296,14 +1296,14 @@ public:
// --> OD 2005-01-13 #i40550#
SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- BOOL bBroadcast = FALSE,
- BOOL bAuto = TRUE );
+ sal_Bool bBroadcast = sal_False,
+ sal_Bool bAuto = sal_True );
// <--
SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- BOOL bBroadcast = FALSE);
- void DelTxtFmtColl(sal_uInt16 nFmt, BOOL bBroadcast = FALSE);
- void DelTxtFmtColl( SwTxtFmtColl* pColl, BOOL bBroadcast = FALSE );
+ sal_Bool bBroadcast = sal_False);
+ void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
+ void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = sal_False );
// --> OD 2007-11-06 #i62675#
// Add 4th optional parameter <bResetListAttrs>.
// 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard
@@ -1410,18 +1410,18 @@ public:
SwPageDesc& _GetPageDesc( sal_uInt16 i ) const { return *aPageDescs[i]; }
void ChgPageDesc( const String & rName, const SwPageDesc& );
void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
- BOOL FindPageDesc( const String & rName, sal_uInt16 * pFound );
+ sal_Bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
// -> #116530#
- void DelPageDesc( const String & rName, BOOL bBroadcast = FALSE);
- void DelPageDesc( sal_uInt16 i, BOOL bBroadcast = FALSE );
+ void DelPageDesc( const String & rName, sal_Bool bBroadcast = sal_False);
+ void DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast = sal_False );
// <- #116530#
void PreDelPageDesc(SwPageDesc * pDel); // #i7983#
// -> #116530#
sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
- BOOL bRegardLanguage = TRUE,
- BOOL bBroadcast = FALSE);
+ sal_Bool bRegardLanguage = sal_True,
+ sal_Bool bBroadcast = sal_False);
void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
- USHORT nOp);
+ sal_uInt16 nOp);
// <- #116530#
@@ -1443,7 +1443,7 @@ public:
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0,
sal_Bool bExpand = sal_False );
- const SwTOXBaseSection* InsertTableOf( ULONG nSttNd, ULONG nEndNd,
+ const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0 );
const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const;
@@ -1533,7 +1533,7 @@ public:
// arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren
// --> OD 2005-02-18 #i42921# - re-use unused 3rd parameter
// --> OD 2008-02-08 #newlistlevelattrs#
- // Add optional parameter <bResetIndentAttrs> - default value FALSE.
+ // Add optional parameter <bResetIndentAttrs> - default value sal_False.
// If <bResetIndentAttrs> equals true, the indent attributes "before text"
// and "first line indent" are additionally reset at the provided PaM, if
// the list style makes use of the new list level attributes.
@@ -1582,7 +1582,7 @@ public:
// add optional parameter <eDefaultNumberFormatPositionAndSpaceMode>
sal_uInt16 MakeNumRule( const String &rName,
const SwNumRule* pCpy = 0,
- BOOL bBroadcast = FALSE,
+ sal_Bool bBroadcast = sal_False,
const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode =
SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
// <--
@@ -1592,8 +1592,8 @@ public:
// loeschen geht nur, wenn die ::com::sun::star::chaos::Rule niemand benutzt!
// #106897#
sal_Bool RenameNumRule(const String & aOldName, const String & aNewName,
- BOOL bBroadcast = FALSE);
- sal_Bool DelNumRule( const String& rName, BOOL bBroadCast = FALSE );
+ sal_Bool bBroadcast = sal_False);
+ sal_Bool DelNumRule( const String& rName, sal_Bool bBroadCast = sal_False );
String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
void UpdateNumRule(); // alle invaliden Updaten
@@ -1615,12 +1615,12 @@ public:
OD 2008-03-18 #refactorlists# - add output parameter <sListId>
\param rPos position to start search
- \param bForward - TRUE: search forward
- - FALSE: search backward
- \param bNum - TRUE: search for enumeration
- - FALSE: search for itemize
- \param bOutline - TRUE: search for outline numbering rule
- - FALSE: search for non-outline numbering rule
+ \param bForward - sal_True: search forward
+ - sal_False: search backward
+ \param bNum - sal_True: search for enumeration
+ - sal_False: search for itemize
+ \param bOutline - sal_True: search for outline numbering rule
+ - sal_False: search for non-outline numbering rule
\param nNonEmptyAllowed number of non-empty paragraphs allowed between
rPos and found paragraph
@@ -1666,20 +1666,20 @@ public:
// Positionen der Spalten!! (nicht deren Breite!)
/* #109161# new parameter bCalledFromShell:
- TRUE: called from shell -> propagate existing adjust item at
+ sal_True: called from shell -> propagate existing adjust item at
rPos to every new cell. A existing adjust item in the table
heading or table contents paragraph style prevent that
propagation.
- FALSE: do not propagate
+ sal_False: do not propagate
*/
const SwTable* InsertTable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER
const SwPosition& rPos, sal_uInt16 nRows,
sal_uInt16 nCols, short eAdjust,
const SwTableAutoFmt* pTAFmt = 0,
const SvUShorts* pColArr = 0,
- BOOL bCalledFromShell = FALSE,
- BOOL bNewModel = TRUE );
+ sal_Bool bCalledFromShell = sal_False,
+ sal_Bool bNewModel = sal_True );
// steht der Index in einer Tabelle, dann returne den TableNode sonst 0
SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx );
@@ -1724,7 +1724,7 @@ public:
const SwCursor* pCrsr, const SwCellFrm* pBoxFrm = 0 );
void GetTabRows( SwTabCols &rFill, const SwCursor* pCrsr,
const SwCellFrm* pBoxFrm = 0 ) const;
- void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const SwCursor* pCrsr,
+ void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const SwCursor* pCrsr,
const SwCellFrm* pBoxFrm = 0 );
@@ -1732,14 +1732,14 @@ public:
void SetTabCols(SwTable& rTab, const SwTabCols &rNew, const SwTabCols &rOld,
const SwTableBox *pStart, sal_Bool bCurRowOnly);
- void SetRowsToRepeat( SwTable &rTable, USHORT nSet );
+ void SetRowsToRepeat( SwTable &rTable, sal_uInt16 nSet );
// AutoFormat fuer die Tabelle/TabellenSelection
sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew );
// Erfrage wie attributiert ist
sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet );
// setze das InsertDB als Tabelle Undo auf:
- void AppendUndoForInsertFromDB( const SwPaM& rPam, BOOL bIsTable );
+ void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable );
// setze die Spalten/Zeilen/ZTellen Breite/Hoehe
sal_Bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
SwTwips nAbsDiff, SwTwips nRelDiff );
@@ -1792,7 +1792,7 @@ public:
// returne dieses.
SwFlyFrmFmt* InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
const String& rNumberingSeparator,
- const sal_Bool bBefore, const sal_uInt16 nId, const ULONG nIdx,
+ const sal_Bool bBefore, const sal_uInt16 nId, const sal_uLong nIdx,
const String& rCharacterStyle,
const sal_Bool bCpyBrd = sal_True );
SwFlyFrmFmt* InsertDrawLabel(
@@ -1907,7 +1907,7 @@ public:
//restore the invisible content if it's available on the undo stack
sal_Bool RestoreInvisibleContent();
// replace fields by text - mailmerge support
- BOOL ConvertFieldsToText();
+ sal_Bool ConvertFieldsToText();
// erzeuge Anhand der vorgebenen Collection Teildokumente
// falls keine angegeben ist, nehme die Kapitelvorlage der 1. Ebene
@@ -2008,10 +2008,10 @@ public:
void SetContainsMSVBasic( bool bFlag ) { mbContains_MSVBasic = bFlag; }
// Interface for the list of Ruby - texts/attributes
- USHORT FillRubyList( const SwPaM& rPam, SwRubyList& rList,
- USHORT nMode );
- USHORT SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
- USHORT nMode );
+ sal_uInt16 FillRubyList( const SwPaM& rPam, SwRubyList& rList,
+ sal_uInt16 nMode );
+ sal_uInt16 SetRubyList( const SwPaM& rPam, const SwRubyList& rList,
+ sal_uInt16 nMode );
void ReadLayoutCache( SvStream& rStream );
void WriteLayoutCache( SvStream& rStream );
@@ -2036,12 +2036,12 @@ public:
@param sListId list Id of the list whose level has to be marked/unmarked
@param nListLevel level to mark
- @param bValue - TRUE mark the level
- - FALSE unmark the level
+ @param bValue - sal_True mark the level
+ - sal_False unmark the level
*/
void MarkListLevel( const String& sListId,
const int nListLevel,
- const BOOL bValue );
+ const sal_Bool bValue );
/** Marks/Unmarks a list level of a certain list
@@ -2050,19 +2050,19 @@ public:
@param rList list whose level has to be marked/unmarked
@param nListLevel level to mark
- @param bValue - TRUE mark the level
- - FALSE unmark the level
+ @param bValue - sal_True mark the level
+ - sal_False unmark the level
*/
void MarkListLevel( SwList& rList,
const int nListLevel,
- const BOOL bValue );
+ const sal_Bool bValue );
// <- #i27615#
// Change a format undoable.
void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
void RenameFmt(SwFmt & rFmt, const String & sNewName,
- BOOL bBroadcast = FALSE);
+ sal_Bool bBroadcast = sal_False);
// Change a TOX undoable.
void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
@@ -2088,7 +2088,7 @@ public:
String GetPaMDescr(const SwPaM & rPaM) const;
// -> #i23726#
- BOOL IsFirstOfNumRule(SwPosition & rPos);
+ sal_Bool IsFirstOfNumRule(SwPosition & rPos);
// <- #i23726#
// --> #i31958# access methods for XForms model(s)
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 2b5ad3fd5203..015e8bee557a 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -91,28 +91,28 @@ SV_DECL_PTRARR_SORT_DEL( _SwRedlineTbl, SwRedlinePtr, 0, 16 )
class SwRedlineTbl : private _SwRedlineTbl
{
public:
- SwRedlineTbl( BYTE nSize = 0, BYTE nG = 16 )
+ SwRedlineTbl( sal_uInt8 nSize = 0, sal_uInt8 nG = 16 )
: _SwRedlineTbl( nSize, nG ) {}
~SwRedlineTbl() {}
- BOOL SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); }
+ sal_Bool SavePtrInArr( SwRedlinePtr p ) { return _SwRedlineTbl::Insert( p ); }
- BOOL Insert( SwRedlinePtr& p, BOOL bIns = TRUE );
- BOOL Insert( SwRedlinePtr& p, USHORT& rInsPos, BOOL bIns = TRUE );
- BOOL InsertWithValidRanges( SwRedlinePtr& p, USHORT* pInsPos = 0 );
+ sal_Bool Insert( SwRedlinePtr& p, sal_Bool bIns = sal_True );
+ sal_Bool Insert( SwRedlinePtr& p, sal_uInt16& rInsPos, sal_Bool bIns = sal_True );
+ sal_Bool InsertWithValidRanges( SwRedlinePtr& p, sal_uInt16* pInsPos = 0 );
- void Remove( USHORT nP, USHORT nL = 1 );
- void DeleteAndDestroy( USHORT nP, USHORT nL=1 );
+ void Remove( sal_uInt16 nP, sal_uInt16 nL = 1 );
+ void DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL=1 );
// suche den naechsten oder vorherigen Redline mit dergleichen Seq.No
// Mit dem Lookahead kann die Suche eingeschraenkt werden. 0 oder
// USHRT_MAX suchen im gesamten Array.
- USHORT FindNextOfSeqNo( USHORT nSttPos, USHORT nLookahead = 20 ) const;
- USHORT FindPrevOfSeqNo( USHORT nSttPos, USHORT nLookahead = 20 ) const;
- USHORT FindNextSeqNo( USHORT nSeqNo, USHORT nSttPos,
- USHORT nLookahead = 20 ) const;
- USHORT FindPrevSeqNo( USHORT nSeqNo, USHORT nSttPos,
- USHORT nLookahead = 20 ) const;
+ sal_uInt16 FindNextOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const;
+ sal_uInt16 FindPrevOfSeqNo( sal_uInt16 nSttPos, sal_uInt16 nLookahead = 20 ) const;
+ sal_uInt16 FindNextSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+ sal_uInt16 nLookahead = 20 ) const;
+ sal_uInt16 FindPrevSeqNo( sal_uInt16 nSeqNo, sal_uInt16 nSttPos,
+ sal_uInt16 nLookahead = 20 ) const;
using _SwRedlineTbl::Count;
using _SwRedlineTbl::operator[];
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 3dd338a5e129..1b6091668c67 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -99,28 +99,28 @@ class SW_DLLPUBLIC SwDocShell: public SfxObjectShell, public SfxListener
SW_DLLPRIVATE virtual sal_Bool SaveAs( SfxMedium& rMedium );
SW_DLLPRIVATE virtual sal_Bool SaveCompleted( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage );
- SW_DLLPRIVATE virtual USHORT PrepareClose( BOOL bUI = TRUE, BOOL bForBrowsing = FALSE );
+ SW_DLLPRIVATE virtual sal_uInt16 PrepareClose( sal_Bool bUI = sal_True, sal_Bool bForBrowsing = sal_False );
// DocInfo dem Doc melden
//
SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog(
Window *pParent, const SfxItemSet &);
// OLE-Geraffel
- SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, USHORT);
+ SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16);
// Methoden fuer StyleSheets
- SW_DLLPRIVATE USHORT Edit( const String &rName, const String& rParent, USHORT nFamily,
- USHORT nMask, BOOL bNew,
- BOOL bColumn = FALSE,
+ SW_DLLPRIVATE sal_uInt16 Edit( const String &rName, const String& rParent, sal_uInt16 nFamily,
+ sal_uInt16 nMask, sal_Bool bNew,
+ sal_Bool bColumn = sal_False,
SwWrtShell* pActShell = 0,
- BOOL bBasic = FALSE );
- SW_DLLPRIVATE USHORT Delete(const String &rName, USHORT nFamily);
- SW_DLLPRIVATE USHORT ApplyStyles(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0,
- USHORT nMode = 0 );
- SW_DLLPRIVATE USHORT DoWaterCan( const String &rName, USHORT nFamily);
- SW_DLLPRIVATE USHORT UpdateStyle(const String &rName, USHORT nFamily, SwWrtShell* pShell = 0);
- SW_DLLPRIVATE USHORT MakeByExample(const String &rName,
- USHORT nFamily, USHORT nMask, SwWrtShell* pShell = 0);
+ sal_Bool bBasic = sal_False );
+ SW_DLLPRIVATE sal_uInt16 Delete(const String &rName, sal_uInt16 nFamily);
+ SW_DLLPRIVATE sal_uInt16 ApplyStyles(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0,
+ sal_uInt16 nMode = 0 );
+ SW_DLLPRIVATE sal_uInt16 DoWaterCan( const String &rName, sal_uInt16 nFamily);
+ SW_DLLPRIVATE sal_uInt16 UpdateStyle(const String &rName, sal_uInt16 nFamily, SwWrtShell* pShell = 0);
+ SW_DLLPRIVATE sal_uInt16 MakeByExample(const String &rName,
+ sal_uInt16 nFamily, sal_uInt16 nMask, SwWrtShell* pShell = 0);
SW_DLLPRIVATE void InitDraw();
SW_DLLPRIVATE void SubInitNew(); // fuer InitNew und HtmlSourceModus
@@ -162,14 +162,14 @@ public:
// OLE-Geraffel
virtual void SetVisArea( const Rectangle &rRect );
- virtual Rectangle GetVisArea( USHORT nAspect ) const;
+ virtual Rectangle GetVisArea( sal_uInt16 nAspect ) const;
virtual Printer *GetDocumentPrinter();
virtual OutputDevice* GetDocumentRefDev();
virtual void OnDocumentPrinterChanged( Printer * pNewPrinter );
- virtual ULONG GetMiscStatus() const;
+ virtual sal_uLong GetMiscStatus() const;
virtual void PrepareReload();
- virtual void SetModified( BOOL = TRUE );
+ virtual void SetModified( sal_Bool = sal_True );
// Dispatcher
void Execute(SfxRequest &);
@@ -192,24 +192,24 @@ public:
void UpdateChildWindows();
// globaler IO
- virtual BOOL Save();
+ virtual sal_Bool Save();
// fuer VorlagenPI
virtual SfxStyleSheetBasePool* GetStyleSheetPool();
// Fuer Organizer
- virtual BOOL Insert(SfxObjectShell &rSource,
- USHORT nSourceIdx1,
- USHORT nSourceIdx2,
- USHORT nSourceIdx3,
- USHORT& nIdx1,
- USHORT& nIdx2,
- USHORT& nIdx3,
- USHORT& nRemovedIdx);
-
- virtual BOOL Remove(USHORT nIdx1,
- USHORT nIdx2 = INDEX_IGNORE,
- USHORT nIdx3 = INDEX_IGNORE);
+ virtual sal_Bool Insert(SfxObjectShell &rSource,
+ sal_uInt16 nSourceIdx1,
+ sal_uInt16 nSourceIdx2,
+ sal_uInt16 nSourceIdx3,
+ sal_uInt16& nIdx1,
+ sal_uInt16& nIdx2,
+ sal_uInt16& nIdx3,
+ sal_uInt16& nRemovedIdx);
+
+ virtual sal_Bool Remove(sal_uInt16 nIdx1,
+ sal_uInt16 nIdx2 = INDEX_IGNORE,
+ sal_uInt16 nIdx3 = INDEX_IGNORE);
virtual Bitmap GetStyleFamilyBitmap( SfxStyleFamily eFamily, BmpColorMode eColorMode );
@@ -247,11 +247,11 @@ public:
virtual void LoadStyles( SfxObjectShell& rSource );
- void _LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument );
+ void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument );
// Seitenvorlagedialog anzeigen, ggf. auf Spaltenpage
void FormatPage( const String& rPage,
- BOOL bColumn = FALSE,
+ sal_Bool bColumn = sal_False,
SwWrtShell* pActShell = 0 );
// --> OD 2006-11-07 #i59688#
@@ -275,13 +275,13 @@ public:
//Activate wait cursor for all windows of this document
//Optionally all dispatcher could be Locked
//Usually locking should be done using the class: SwWaitObject!
- void EnterWait( BOOL bLockDispatcher );
- void LeaveWait( BOOL bLockDispatcher );
+ void EnterWait( sal_Bool bLockDispatcher );
+ void LeaveWait( sal_Bool bLockDispatcher );
- void ToggleBrowserMode(BOOL bOn, SwView* pView = 0);
+ void ToggleBrowserMode(sal_Bool bOn, SwView* pView = 0);
- ULONG LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt,
- BOOL bUnoCall );
+ sal_uLong LoadStylesFromFile( const String& rURL, SwgReaderOption& rOpt,
+ sal_Bool bUnoCall );
void InvalidateModel();
void ReactivateModel();
diff --git a/sw/inc/docstat.hxx b/sw/inc/docstat.hxx
index edcf4abad52a..5d40357524c8 100644
--- a/sw/inc/docstat.hxx
+++ b/sw/inc/docstat.hxx
@@ -33,17 +33,17 @@
struct SW_DLLPUBLIC SwDocStat
{
- USHORT nTbl;
- USHORT nGrf;
- USHORT nOLE;
- ULONG nPage;
+ sal_uInt16 nTbl;
+ sal_uInt16 nGrf;
+ sal_uInt16 nOLE;
+ sal_uLong nPage;
/// paragraphs for document statistic: non-empty and non-hidden ones
- ULONG nPara;
+ sal_uLong nPara;
/// all paragraphs, including empty/hidden ones
- ULONG nAllPara;
- ULONG nWord;
- ULONG nChar;
- BOOL bModified;
+ sal_uLong nAllPara;
+ sal_uLong nWord;
+ sal_uLong nChar;
+ sal_Bool bModified;
SwDocStat();
void Reset();
diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx
index 91c44278878d..d8840a72a8d7 100644
--- a/sw/inc/docstyle.hxx
+++ b/sw/inc/docstyle.hxx
@@ -74,7 +74,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
SwDoc& rDoc;
SfxItemSet aCoreSet;
- BOOL bPhysical;
+ sal_Bool bPhysical;
// leere Huelse zum richtigen StyleSheet (Core) machen
@@ -87,7 +87,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase
FillPhysical
};
- SW_DLLPRIVATE BOOL FillStyleSheet( FillStyleType eFType );
+ SW_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType );
protected:
virtual ~SwDocStyleSheet();
@@ -97,20 +97,20 @@ public:
const String& rName,
SwDocStyleSheetPool& rPool,
SfxStyleFamily eFam,
- USHORT nMask);
+ sal_uInt16 nMask);
SwDocStyleSheet( const SwDocStyleSheet& );
void Reset();
- void SetMask(USHORT nMsk) { nMask = nMsk; }
+ void SetMask(sal_uInt16 nMsk) { nMask = nMsk; }
void SetFamily(SfxStyleFamily eFam) { nFamily = eFam; }
- BOOL IsPhysical() const { return bPhysical; }
- void SetPhysical(BOOL bPhys);
+ sal_Bool IsPhysical() const { return bPhysical; }
+ void SetPhysical(sal_Bool bPhys);
// --> OD 2008-02-11 #newlistlevelattrs#
- // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value FALSE,
+ // add optional parameter <bResetIndentAttrsAtParagraphStyle>, default value sal_False,
// which indicates that the indent attributes at a paragraph style should
// be reset in case that a list style is applied to the paragraph style and
// no indent attributes are applied.
@@ -127,8 +127,8 @@ public:
virtual const String& GetParent() const;
virtual const String& GetFollow() const;
- virtual ULONG GetHelpId( String& rFile );
- virtual void SetHelpId( const String& r, ULONG nId );
+ virtual sal_uLong GetHelpId( String& rFile );
+ virtual void SetHelpId( const String& r, sal_uLong nId );
// Vorbelegen der member ohne physikalischen Zugriff
// wird vom StyleSheetPool benutzt
@@ -138,13 +138,13 @@ public:
void PresetParent(const String& rName){ aParent = rName; }
void PresetFollow(const String& rName){ aFollow = rName; }
- virtual BOOL SetName( const String& rStr);
- virtual BOOL SetParent( const String& rStr);
- virtual BOOL SetFollow( const String& rStr);
+ virtual sal_Bool SetName( const String& rStr);
+ virtual sal_Bool SetParent( const String& rStr);
+ virtual sal_Bool SetFollow( const String& rStr);
- virtual BOOL HasFollowSupport() const;
- virtual BOOL HasParentSupport() const;
- virtual BOOL HasClearParentSupport() const;
+ virtual sal_Bool HasFollowSupport() const;
+ virtual sal_Bool HasParentSupport() const;
+ virtual sal_Bool HasClearParentSupport() const;
virtual String GetDescription();
virtual String GetDescription(SfxMapUnit eUnit);
@@ -155,7 +155,7 @@ public:
const SwNumRule* GetNumRule();
void SetNumRule(const SwNumRule& rRule);
- virtual BOOL IsUsed() const;
+ virtual sal_Bool IsUsed() const;
};
/*--------------------------------------------------------------------
@@ -167,21 +167,21 @@ class SwStyleSheetIterator : public SfxStyleSheetIterator, public SfxListener
rtl::Reference< SwDocStyleSheet > mxIterSheet;
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
SwPoolFmtList aLst;
- USHORT nLastPos;
- BOOL bFirstCalled;
+ sal_uInt16 nLastPos;
+ sal_Bool bFirstCalled;
void AppendStyleList(const SvStringsDtor& rLst,
- BOOL bUsed,
- USHORT nSection,
+ sal_Bool bUsed,
+ sal_uInt16 nSection,
char cType);
public:
SwStyleSheetIterator( SwDocStyleSheetPool* pBase,
- SfxStyleFamily eFam, USHORT n=0xFFFF );
+ SfxStyleFamily eFam, sal_uInt16 n=0xFFFF );
virtual ~SwStyleSheetIterator();
- virtual USHORT Count();
- virtual SfxStyleSheetBase *operator[](USHORT nIdx);
+ virtual sal_uInt16 Count();
+ virtual SfxStyleSheetBase *operator[](sal_uInt16 nIdx);
virtual SfxStyleSheetBase* First();
virtual SfxStyleSheetBase* Next();
virtual SfxStyleSheetBase* Find(const UniString& rStr);
@@ -197,34 +197,34 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool
{
rtl::Reference< SwDocStyleSheet > mxStyleSheet;
SwDoc& rDoc;
- BOOL bOrganizer : 1; // TRUE: fuer den Organizer
+ sal_Bool bOrganizer : 1; // sal_True: fuer den Organizer
- virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, USHORT nMask);
+ virtual SfxStyleSheetBase* Create( const String&, SfxStyleFamily, sal_uInt16 nMask);
virtual SfxStyleSheetBase* Create( const SfxStyleSheetBase& );
using SfxStyleSheetBasePool::Find;
public:
- SwDocStyleSheetPool( SwDoc&, BOOL bOrganizer = FALSE );
+ SwDocStyleSheetPool( SwDoc&, sal_Bool bOrganizer = sal_False );
virtual void Replace( SfxStyleSheetBase& rSource,
SfxStyleSheetBase& rTarget );
- virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, USHORT nMask, USHORT nPos = 0xffff);
+ virtual SfxStyleSheetBase& Make(const String&, SfxStyleFamily, sal_uInt16 nMask, sal_uInt16 nPos = 0xffff);
virtual SfxStyleSheetBase* Find( const String&, SfxStyleFamily eFam,
- USHORT n=0xFFFF );
+ sal_uInt16 n=0xFFFF );
- virtual BOOL SetParent( SfxStyleFamily eFam, const String &rStyle,
+ virtual sal_Bool SetParent( SfxStyleFamily eFam, const String &rStyle,
const String &rParent );
virtual void Remove( SfxStyleSheetBase* pStyle);
- void SetOrganizerMode( BOOL bMode ) { bOrganizer = bMode; }
- BOOL IsOrganizerMode() const { return bOrganizer; }
+ void SetOrganizerMode( sal_Bool bMode ) { bOrganizer = bMode; }
+ sal_Bool IsOrganizerMode() const { return bOrganizer; }
virtual SfxStyleSheetIterator* CreateIterator( SfxStyleFamily,
- USHORT nMask );
+ sal_uInt16 nMask );
SwDoc& GetDoc() const { return rDoc; }
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 3607ad0cd970..af61eeec61dd 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -150,15 +150,15 @@ enum SwJumpEditFormat
class SwPageNumberFieldType : public SwFieldType
{
sal_Int16 nNumberingType;
- USHORT nNum, nMax;
- BOOL bVirtuell;
+ sal_uInt16 nNum, nMax;
+ sal_Bool bVirtuell;
public:
SwPageNumberFieldType();
String& Expand( sal_uInt32 nFmt, short nOff, const String&, String& rRet ) const;
- void ChangeExpansion( SwDoc* pDoc, USHORT nNum, USHORT nMax,
- BOOL bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+ void ChangeExpansion( SwDoc* pDoc, sal_uInt16 nNum, sal_uInt16 nMax,
+ sal_Bool bVirtPageNum, const sal_Int16* pNumFmt = 0 );
virtual SwFieldType* Copy() const;
};
@@ -169,11 +169,11 @@ public:
class SW_DLLPUBLIC SwPageNumberField : public SwField
{
String sUserStr;
- USHORT nSubType;
+ sal_uInt16 nSubType;
short nOffset;
public:
- SwPageNumberField(SwPageNumberFieldType*, USHORT nSub = PG_RANDOM,
+ SwPageNumberField(SwPageNumberFieldType*, sal_uInt16 nSub = PG_RANDOM,
sal_uInt32 nFmt = 0, short nOff = 0);
virtual String Expand() const;
@@ -182,10 +182,10 @@ public:
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- virtual USHORT GetSubType() const;
- // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ // virtual void SetSubType(sal_uInt16 nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
const String& GetUserString() const { return sUserStr; }
void SetUserString( const String& rS ) { sUserStr = rS; }
@@ -200,7 +200,7 @@ class SwAuthorFieldType : public SwFieldType
public:
SwAuthorFieldType();
- String Expand(ULONG) const;
+ String Expand(sal_uLong) const;
virtual SwFieldType* Copy() const;
};
@@ -221,8 +221,8 @@ public:
inline void SetExpansion(const String& rStr) { aContent = rStr; }
inline const String& GetContent() const { return aContent; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -235,7 +235,7 @@ class SwFileNameFieldType : public SwFieldType
public:
SwFileNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(sal_uLong) const;
virtual SwFieldType* Copy() const;
};
@@ -256,8 +256,8 @@ public:
inline void SetExpansion(const String& rStr) { aContent = rStr; }
inline const String& GetContent() const { return aContent; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -270,7 +270,7 @@ class SwTemplNameFieldType : public SwFieldType
public:
SwTemplNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(sal_uLong) const;
virtual SwFieldType* Copy() const;
};
@@ -285,8 +285,8 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
@@ -301,7 +301,7 @@ class SwDocStatFieldType : public SwFieldType
public:
SwDocStatFieldType(SwDoc*);
- String Expand(USHORT nSubType, sal_uInt32 nFmt) const;
+ String Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const;
virtual SwFieldType* Copy() const;
inline void SetNumFormat( sal_Int16 eFmt ) { nNumberingType = eFmt; }
@@ -313,21 +313,21 @@ public:
class SW_DLLPUBLIC SwDocStatField : public SwField
{
- USHORT nSubType;
+ sal_uInt16 nSubType;
public:
SwDocStatField( SwDocStatFieldType*,
- USHORT nSubType = 0, sal_uInt32 nFmt = 0);
+ sal_uInt16 nSubType = 0, sal_uInt32 nFmt = 0);
void ChangeExpansion( const SwFrm* pFrm );
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nSub);
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -336,14 +336,14 @@ public:
class SwHiddenTxtFieldType : public SwFieldType
{
- BOOL bHidden;
+ sal_Bool bHidden;
public:
- SwHiddenTxtFieldType(BOOL bSetHidden = TRUE);
+ SwHiddenTxtFieldType(sal_Bool bSetHidden = sal_True);
virtual SwFieldType* Copy() const;
- void SetHiddenFlag( BOOL bSetHidden = TRUE );
- inline BOOL GetHiddenFlag() const { return bHidden; }
+ void SetHiddenFlag( sal_Bool bSetHidden = sal_True );
+ inline sal_Bool GetHiddenFlag() const { return bHidden; }
};
/*--------------------------------------------------------------------
@@ -352,39 +352,39 @@ public:
class SwHiddenTxtField : public SwField
{
- String aTRUETxt; // Text wenn Bedingung TRUE
+ String aTRUETxt; // Text wenn Bedingung sal_True
String aFALSETxt; // Wenn Bedingung falsch
String aContent; // Ausgewerteter DB-Text
String aCond; // Bedingung
- USHORT nSubType;
+ sal_uInt16 nSubType;
- BOOL bCanToggle : 1; // kann das Feld einzeln getoggelt werden?
- BOOL bIsHidden : 1; // ist es nicht sichtbar?
- BOOL bValid : 1; // DB-Feld evaluiert?
+ sal_Bool bCanToggle : 1; // kann das Feld einzeln getoggelt werden?
+ sal_Bool bIsHidden : 1; // ist es nicht sichtbar?
+ sal_Bool bValid : 1; // DB-Feld evaluiert?
virtual String Expand() const;
virtual SwField* Copy() const;
public:
SwHiddenTxtField( SwHiddenTxtFieldType*,
- BOOL bConditional,
+ sal_Bool bConditional,
const String& rCond,
const String& rTxt,
- BOOL bHidden = FALSE,
- USHORT nSubType = TYP_HIDDENTXTFLD);
+ sal_Bool bHidden = sal_False,
+ sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
SwHiddenTxtField( SwHiddenTxtFieldType*,
const String& rCond,
const String& rTrue,
const String& rFalse,
- USHORT nSubType = TYP_HIDDENTXTFLD);
+ sal_uInt16 nSubType = TYP_HIDDENTXTFLD);
virtual String GetFieldName() const;
void Evaluate(SwDoc*);
- inline void SetValue(BOOL bHidden) { bIsHidden = bHidden; }
+ inline void SetValue(sal_Bool bHidden) { bIsHidden = bHidden; }
String GetColumnName(const String& rName);
String GetDBName(const String& rName, SwDoc *pDoc);
@@ -397,10 +397,10 @@ public:
virtual String GetPar2() const;
- virtual USHORT GetSubType() const;
- // virtual void SetSubType(USHORT nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ // virtual void SetSubType(sal_uInt16 nSub); // OM: entfernt, da unbenoetigt und gefaehrlich
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -422,7 +422,7 @@ public:
class SwHiddenParaField : public SwField
{
String aCond;
- BOOL bIsHidden:1;
+ sal_Bool bIsHidden:1;
public:
// Direkte Eingabe alten Wert loeschen
SwHiddenParaField(SwHiddenParaFieldType*, const String& rCond);
@@ -430,14 +430,14 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- void SetHidden(BOOL bHidden) { bIsHidden = bHidden; }
- BOOL IsHidden() const { return bIsHidden; }
+ void SetHidden(sal_Bool bHidden) { bIsHidden = bHidden; }
+ sal_Bool IsHidden() const { return bIsHidden; }
// Bedingung erfragen/setzen
virtual const String& GetPar1() const;
virtual void SetPar1(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -462,7 +462,7 @@ class SW_DLLPUBLIC SwMacroField : public SwField
{
String aMacro;
String aText;
- BOOL bIsScriptURL;
+ sal_Bool bIsScriptURL;
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -486,14 +486,14 @@ public:
// Macrotext
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
static void CreateMacroString( String& rMacro,
const String& rMacroName,
const String& rLibraryName );
- static BOOL isScriptURL( const String& str );
+ static sal_Bool isScriptURL( const String& str );
};
@@ -549,8 +549,8 @@ public:
sal_uInt32 GetNumberOfParagraphs() const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
virtual String GetDescription() const;
};
@@ -563,13 +563,13 @@ class SwDocInfoFieldType : public SwValueFieldType
public:
SwDocInfoFieldType(SwDoc* pDc);
- String Expand(USHORT nSubType, sal_uInt32 nFormat, USHORT nLang, const String& rName) const;
+ String Expand(sal_uInt16 nSubType, sal_uInt32 nFormat, sal_uInt16 nLang, const String& rName) const;
virtual SwFieldType* Copy() const;
};
class SW_DLLPUBLIC SwDocInfoField : public SwValueField
{
- USHORT nSubType;
+ sal_uInt16 nSubType;
String aContent;
String aName;
@@ -577,18 +577,18 @@ class SW_DLLPUBLIC SwDocInfoField : public SwValueField
virtual SwField* Copy() const;
public:
- SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, sal_uInt32 nFmt=0);
- SwDocInfoField(SwDocInfoFieldType*, USHORT nSub, const String& rName, const String& rValue, sal_uInt32 nFmt=0);
+ SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const String& rName, sal_uInt32 nFmt=0);
+ SwDocInfoField(SwDocInfoFieldType*, sal_uInt16 nSub, const String& rName, const String& rValue, sal_uInt32 nFmt=0);
- virtual void SetSubType(USHORT);
- virtual USHORT GetSubType() const;
- virtual void SetLanguage(USHORT nLng);
+ virtual void SetSubType(sal_uInt16);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetLanguage(sal_uInt16 nLng);
virtual String GetFieldName() const;
String GetName() const { return aName; }
void SetName( const String& rName ) { aName = rName; }
inline void SetExpansion(const String& rStr) { aContent = rStr; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -604,28 +604,28 @@ public:
inline void SetData(const String& rStr) { aData = rStr; }
- String Expand(USHORT nSubType, sal_uInt32 nFormat) const;
+ String Expand(sal_uInt16 nSubType, sal_uInt32 nFormat) const;
virtual SwFieldType* Copy() const;
};
class SwExtUserField : public SwField
{
String aContent;
- USHORT nType;
+ sal_uInt16 nType;
public:
- SwExtUserField(SwExtUserFieldType*, USHORT nSub, sal_uInt32 nFmt=0);
+ SwExtUserField(SwExtUserFieldType*, sal_uInt16 nSub, sal_uInt32 nFmt=0);
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nSub);
inline void SetExpansion(const String& rStr) { aContent = rStr; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
@@ -650,11 +650,11 @@ public:
class SwRefPageSetField : public SwField
{
short nOffset;
- BOOL bOn;
+ sal_Bool bOn;
public:
SwRefPageSetField( SwRefPageSetFieldType*, short nOff = 0,
- BOOL bOn = TRUE );
+ sal_Bool bOn = sal_True );
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -662,12 +662,12 @@ public:
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- BOOL IsOn() const { return bOn; }
+ sal_Bool IsOn() const { return bOn; }
short GetOffset() const { return nOffset; }
void SetOffset( short nOff ) { nOffset = nOff; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -687,7 +687,7 @@ public:
// ueberlagert, um alle RefPageGet-Felder zu updaten
virtual void Modify( SfxPoolItem *, SfxPoolItem * );
- USHORT MakeSetList( _SetGetExpFlds& rTmpLst );
+ sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst );
SwDoc* GetDoc() const { return pDoc; }
};
@@ -708,8 +708,8 @@ public:
void SetText( const String& rTxt ) { sTxt = rTxt; }
void ChangeExpansion( const SwFrm* pFrm, const SwTxtFld* pFld );
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -748,8 +748,8 @@ public:
SwCharFmt* GetCharFmt() const
{ return ((SwJumpEditFieldType*)GetTyp())->GetCharFmt(); }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -775,11 +775,11 @@ class SwScriptField : public SwField
String sCode; // der Code als Text
// der Code als JavaCode ?
- BOOL bCodeURL; // Code enthaelt URL eines Scripts
+ sal_Bool bCodeURL; // Code enthaelt URL eines Scripts
public:
SwScriptField( SwScriptFieldType*, const String& rType,
- const String& rCode, BOOL bURL=FALSE );
+ const String& rCode, sal_Bool bURL=sal_False );
virtual String GetDescription() const;
@@ -793,10 +793,10 @@ public:
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- BOOL IsCodeURL() const { return bCodeURL; }
- void SetCodeURL( BOOL bURL ) { bCodeURL = bURL; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ sal_Bool IsCodeURL() const { return bCodeURL; }
+ void SetCodeURL( sal_Bool bURL ) { bCodeURL = bURL; }
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -831,8 +831,8 @@ public:
virtual const String& GetPar1() const;
virtual void SetPar1(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx
index 6b791acf178a..84a1b2c99ba1 100644
--- a/sw/inc/dpage.hxx
+++ b/sw/inc/dpage.hxx
@@ -42,18 +42,18 @@ class SwDPage : public FmFormPage, public SdrObjUserCall
SwDoc& rDoc;
public:
- SwDPage(SwDrawDocument& rNewModel, BOOL bMasterPage=FALSE);
+ SwDPage(SwDrawDocument& rNewModel, sal_Bool bMasterPage=sal_False);
~SwDPage();
// #i3694#
// This GetOffset() method is not needed anymore, it even leads to errors.
// virtual Point GetOffset() const;
- virtual SdrObject* ReplaceObject( SdrObject* pNewObj, ULONG nObjNum );
+ virtual SdrObject* ReplaceObject( SdrObject* pNewObj, sal_uLong nObjNum );
virtual const SdrPageGridFrameList* GetGridFrameList(const SdrPageView* pPV,
const Rectangle *pRect) const;
- BOOL RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
+ sal_Bool RequestHelp( Window* pWindow, SdrView* pView, const HelpEvent& rEvt );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage();
};
diff --git a/sw/inc/edglbldc.hxx b/sw/inc/edglbldc.hxx
index dd3187614ec4..23e63a8483d8 100644
--- a/sw/inc/edglbldc.hxx
+++ b/sw/inc/edglbldc.hxx
@@ -42,14 +42,14 @@ enum GlobalDocContentType {
class SwGlblDocContent
{
GlobalDocContentType eType;
- ULONG nDocPos;
+ sal_uLong nDocPos;
union {
const SwTOXBase* pTOX;
const SwSection* pSect;
} PTR;
public:
- SwGlblDocContent( ULONG nPos );
+ SwGlblDocContent( sal_uLong nPos );
SwGlblDocContent( const SwTOXBaseSection* pTOX );
SwGlblDocContent( const SwSection* pSect );
@@ -59,7 +59,7 @@ public:
{ return GLBLDOC_SECTION == eType ? PTR.pSect : 0; }
const SwTOXBase* GetTOX() const
{ return GLBLDOC_TOXBASE == eType ? PTR.pTOX : 0; }
- ULONG GetDocPos() const { return nDocPos; }
+ sal_uLong GetDocPos() const { return nDocPos; }
// fuers Sortieren
inline int operator==( const SwGlblDocContent& rCmp ) const
diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx
index 60d6fbe99419..16a2a3ecb2f5 100644
--- a/sw/inc/edimp.hxx
+++ b/sw/inc/edimp.hxx
@@ -52,15 +52,15 @@ class SwNodeIndex;
struct SwPamRange
{
- ULONG nStart, nEnd;
+ sal_uLong nStart, nEnd;
SwPamRange() : nStart( 0 ), nEnd( 0 ) {}
- SwPamRange( ULONG nS, ULONG nE ) : nStart( nS ), nEnd( nE ) {}
+ SwPamRange( sal_uLong nS, sal_uLong nE ) : nStart( nS ), nEnd( nE ) {}
- BOOL operator==( const SwPamRange& rRg )
- { return nStart == rRg.nStart ? TRUE : FALSE; }
- BOOL operator<( const SwPamRange& rRg )
- { return nStart < rRg.nStart ? TRUE : FALSE; }
+ sal_Bool operator==( const SwPamRange& rRg )
+ { return nStart == rRg.nStart ? sal_True : sal_False; }
+ sal_Bool operator<( const SwPamRange& rRg )
+ { return nStart < rRg.nStart ? sal_True : sal_False; }
};
SV_DECL_VARARR_SORT( _SwPamRanges, SwPamRange, 0, 1 )
@@ -71,11 +71,11 @@ public:
SwPamRanges( const SwPaM& rRing );
void Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 );
- SwPaM& SetPam( USHORT nArrPos, SwPaM& rPam );
+ SwPaM& SetPam( sal_uInt16 nArrPos, SwPaM& rPam );
- USHORT Count() const
+ sal_uInt16 Count() const
{ return _SwPamRanges::Count(); }
- SwPamRange operator[]( USHORT nPos ) const
+ SwPamRange operator[]( sal_uInt16 nPos ) const
{ return _SwPamRanges::operator[](nPos); }
};
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 85201ff9b5b9..4b979416cc31 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -147,7 +147,7 @@ SV_DECL_PTRARR_DEL( SwGetINetAttrs, SwGetINetAttr*, 0, 5 )
#define CNT_TXT 0x0001
#define CNT_GRF 0x0002
#define CNT_OLE 0x0010
-/* Teste einen USHORT auf eine bestimmte Inhaltsform */
+/* Teste einen sal_uInt16 auf eine bestimmte Inhaltsform */
#define CNT_HasTxt(USH) ((USH)&CNT_TXT)
#define CNT_HasGrf(USH) ((USH)&CNT_GRF)
#define CNT_HasOLE(USH) ((USH)&CNT_OLE)
@@ -171,7 +171,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
*/
SW_DLLPRIVATE SwGrfNode *_GetGrfNode() const ;
- SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, BOOL* pUndo = 0 );
+ SW_DLLPRIVATE void DeleteSel( SwPaM& rPam, sal_Bool* pUndo = 0 );
SW_DLLPRIVATE void _SetSectionAttr( SwSectionFmt& rSectFmt, const SfxItemSet& rSet );
@@ -180,7 +180,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell
public:
// Editieren (immer auf allen selektierten Bereichen)
- void Insert( sal_Unicode, BOOL bOnlyCurrCrsr = FALSE );
+ void Insert( sal_Unicode, sal_Bool bOnlyCurrCrsr = sal_False );
void Insert2( const String &, const bool bForceExpandHints = false );
void Overwrite( const String & );
@@ -190,14 +190,14 @@ public:
// ein ( nicht \& )
// z.B.: Fnd: "zzz", Repl: "xx\t\\t..&..\&"
// --> "xx\t<Tab>..zzz..&"
- BOOL Replace( const String& rNewStr, BOOL bRegExpRplc = FALSE );
+ sal_Bool Replace( const String& rNewStr, sal_Bool bRegExpRplc = sal_False );
// loescht den Inhalt aller Bereiche;
// werden ganze Nodes selektiert, werden die Nodes geloescht
long Delete();
// remove a complete paragraph
- BOOL DelFullPara();
+ sal_Bool DelFullPara();
// change text to Upper/Lower/Hiragana/Katagana/...
void TransliterateText( sal_uInt32 nType );
@@ -207,16 +207,16 @@ public:
// loesche den nicht sichtbaren Content aus dem Document, wie z.B.:
// versteckte Bereiche, versteckte Absaetze
- BOOL RemoveInvisibleContent();
+ sal_Bool RemoveInvisibleContent();
// replace fields by text - mailmerge support
- BOOL ConvertFieldsToText();
+ sal_Bool ConvertFieldsToText();
// set all numbering start points to a fixed value - mailmerge support
void SetNumberingRestart();
// embedded alle lokalen Links (Bereiche/Grafiken)
- USHORT GetLinkUpdMode(BOOL bDocSettings = FALSE) const;
- void SetLinkUpdMode( USHORT nMode );
+ sal_uInt16 GetLinkUpdMode(sal_Bool bDocSettings = sal_False) const;
+ void SetLinkUpdMode( sal_uInt16 nMode );
// kopiere den Inhalt aller Bereiche an die akt. Cursor-Position
// in die angegebene Shell
@@ -228,19 +228,19 @@ public:
// der FEShell stehen!
// kopiere alle Selectionen und das Doc
//JP 21.10.96: und fuer die SVX-Autokorrektur
- BOOL _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
+ sal_Bool _CopySelToDoc( SwDoc* pInsDoc, SwNodeIndex* pNdInsPos = 0 );
- long SplitNode( BOOL bAutoFormat = FALSE, BOOL bCheckTableStart = TRUE );
+ long SplitNode( sal_Bool bAutoFormat = sal_False, sal_Bool bCheckTableStart = sal_True );
sal_Bool AppendTxtNode();
void AutoFmtBySplitNode();
// ist der Cursor in einem INetAttribut, dann wird das komplett
// geloescht; inclusive des Hinweistextes (wird beim Drag&Drop gebraucht)
- BOOL DelINetAttrWithText();
+ sal_Bool DelINetAttrWithText();
// ist der Cursor am Ende einer Zeichenvorlage, an der das DontExpand-Flag
- // noch nicht gesetzt ist, wird dies gesetzt ( => return TRUE; )
- BOOL DontExpandFmt();
+ // noch nicht gesetzt ist, wird dies gesetzt ( => return sal_True; )
+ sal_Bool DontExpandFmt();
// Anwenden / Entfernen von Attributen
// liefert Attribute im angeforderten AttributSet. Wenn nicht eindeutig
@@ -249,42 +249,42 @@ public:
// Renaming method to <GetCurAttr(..)> indicating that the attributes at
// the current cursors are retrieved.
// Introduce 2nd optional parameter <bMergeIndentValuesOfNumRule>.
- // If <bMergeIndentValuesOfNumRule> == TRUE, the indent attributes of
+ // If <bMergeIndentValuesOfNumRule> == sal_True, the indent attributes of
// the corresponding list level of an applied list style is merged into
// the requested item set as a LR-SPACE item, if corresponding node has not
// its own indent attributes and the position-and-space mode of the list
// level is SvxNumberFormat::LABEL_ALIGNMENT.
- BOOL GetCurAttr( SfxItemSet& ,
+ sal_Bool GetCurAttr( SfxItemSet& ,
const bool bMergeIndentValuesOfNumRule = false ) const;
// <--
- void SetAttr( const SfxPoolItem&, USHORT nFlags = 0 );
- void SetAttr( const SfxItemSet&, USHORT nFlags = 0 );
+ void SetAttr( const SfxPoolItem&, sal_uInt16 nFlags = 0 );
+ void SetAttr( const SfxItemSet&, sal_uInt16 nFlags = 0 );
// Setze das Attribut als neues default Attribut im Dokument.
void SetDefault( const SfxPoolItem& );
// Erfrage das Default Attribut vom Dokument.
- const SfxPoolItem& GetDefault( USHORT nFmtHint ) const;
+ const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
void ResetAttr( const SvUShortsSort* pAttrs = 0 );
void GCAttr();
// returns the scripttpye of the selection
- USHORT GetScriptType() const;
+ sal_uInt16 GetScriptType() const;
// returns the language at current cursor position
- USHORT GetCurLang() const;
+ sal_uInt16 GetCurLang() const;
// TABLE
- USHORT GetTblFrmFmtCount( BOOL bUsed = FALSE ) const;
- SwFrmFmt& GetTblFrmFmt(USHORT nFmt, BOOL bUsed = FALSE ) const;
+ sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed = sal_False ) const;
+ SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed = sal_False ) const;
String GetUniqueTblName() const;
// CHAR
- USHORT GetCharFmtCount() const;
- SwCharFmt& GetCharFmt(USHORT nFmt) const;
+ sal_uInt16 GetCharFmtCount() const;
+ SwCharFmt& GetCharFmt(sal_uInt16 nFmt) const;
SwCharFmt* GetCurCharFmt() const;
- void FillByEx(SwCharFmt*, BOOL bReset = FALSE);
+ void FillByEx(SwCharFmt*, sal_Bool bReset = sal_False);
SwCharFmt* MakeCharFmt( const String& rName, SwCharFmt* pDerivedFrom = 0 );
SwCharFmt* FindCharFmtByName( const String& rName ) const;
@@ -301,8 +301,8 @@ public:
// TXT
SwTxtFmtColl& GetDfltTxtFmtColl() const;
- USHORT GetTxtFmtCollCount() const;
- SwTxtFmtColl& GetTxtFmtColl( USHORT nTxtFmtColl) const;
+ sal_uInt16 GetTxtFmtCollCount() const;
+ SwTxtFmtColl& GetTxtFmtColl( sal_uInt16 nTxtFmtColl) const;
SwTxtFmtColl* GetCurTxtFmtColl() const;
// --> OD 2007-11-06 #i62675#
// Add 2nd optional parameter <bResetListAttrs> - see also <SwDoc::SetTxtFmtColl(..)>
@@ -311,24 +311,24 @@ public:
// <--
SwTxtFmtColl *MakeTxtFmtColl(const String &rFmtCollName,
SwTxtFmtColl *pDerivedFrom = 0);
- void FillByEx(SwTxtFmtColl*, BOOL bReset = FALSE);
+ void FillByEx(SwTxtFmtColl*, sal_Bool bReset = sal_False);
SwTxtFmtColl* FindTxtFmtCollByName( const String& rName ) const;
// Gebe die "Auto-Collection" mit der Id zurueck. Existiert
// sie noch nicht, dann erzuege sie
- SwTxtFmtColl* GetTxtCollFromPool( USHORT nId );
+ SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId );
// return das geforderte automatische Format - Basis-Klasse !
- SwFmt* GetFmtFromPool( USHORT nId );
+ SwFmt* GetFmtFromPool( sal_uInt16 nId );
// returne die geforderte automatische Seiten-Vorlage
- SwPageDesc* GetPageDescFromPool( USHORT nId );
+ SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
// erfrage ob die Absatz-/Zeichen-/Rahmen-/Seiten - Vorlage benutzt wird
- BOOL IsUsed( const SwModify& ) const;
+ sal_Bool IsUsed( const SwModify& ) const;
// returne das geforderte automatische Format
- SwFrmFmt* GetFrmFmtFromPool( USHORT nId )
+ SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
{ return (SwFrmFmt*)SwEditShell::GetFmtFromPool( nId ); }
- SwCharFmt* GetCharFmtFromPool( USHORT nId )
+ SwCharFmt* GetCharFmtFromPool( sal_uInt16 nId )
{ return (SwCharFmt*)SwEditShell::GetFmtFromPool( nId ); }
// Felder
@@ -337,12 +337,12 @@ public:
void UpdateFlds( SwField & ); // ein einzelnes Feld
- USHORT GetFldTypeCount(USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
- SwFieldType* GetFldType(USHORT nId, USHORT nResId = USHRT_MAX, BOOL bUsed = FALSE) const;
- SwFieldType* GetFldType(USHORT nResId, const String& rName) const;
+ sal_uInt16 GetFldTypeCount(sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const;
+ SwFieldType* GetFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX, sal_Bool bUsed = sal_False) const;
+ SwFieldType* GetFldType(sal_uInt16 nResId, const String& rName) const;
- void RemoveFldType(USHORT nId, USHORT nResId = USHRT_MAX);
- void RemoveFldType(USHORT nResId, const String& rName);
+ void RemoveFldType(sal_uInt16 nId, sal_uInt16 nResId = USHRT_MAX);
+ void RemoveFldType(sal_uInt16 nResId, const String& rName);
void FieldToText( SwFieldType* pType );
@@ -357,16 +357,16 @@ public:
void GetAllUsedDB( SvStringsDtor& rDBNameList,
SvStringsDtor* pAllDBNames = 0 );
- BOOL IsAnyDatabaseFieldInDoc()const;
+ sal_Bool IsAnyDatabaseFieldInDoc()const;
//check whether DB fields point to an available data source and returns it
- BOOL IsFieldDataSourceAvailable(String& rUsedDataSource) const;
- void UpdateExpFlds(BOOL bCloseDB = FALSE);// nur alle ExpressionFelder updaten
- void SetFixFields( BOOL bOnlyTimeDate = FALSE,
+ sal_Bool IsFieldDataSourceAvailable(String& rUsedDataSource) const;
+ void UpdateExpFlds(sal_Bool bCloseDB = sal_False);// nur alle ExpressionFelder updaten
+ void SetFixFields( sal_Bool bOnlyTimeDate = sal_False,
const DateTime* pNewDateTime = 0 );
void LockExpFlds();
void UnlockExpFlds();
- SwFldUpdateFlags GetFldUpdateFlags(BOOL bDocSettings = FALSE) const;
+ SwFldUpdateFlags GetFldUpdateFlags(sal_Bool bDocSettings = sal_False) const;
void SetFldUpdateFlags( SwFldUpdateFlags eFlags );
// fuer die Evaluierung der DBFelder (neuer DB-Manager)
@@ -375,7 +375,7 @@ public:
SwFieldType* InsertFldType(const SwFieldType &);
// Aenderungen am Dokument?
- BOOL IsModified() const;
+ sal_Bool IsModified() const;
void SetModified();
void ResetModified();
void SetUndoNoResetModified();
@@ -388,31 +388,31 @@ public:
void DeleteTOXMark(SwTOXMark* pMark);
// Alle Markierungen am aktuellen SPoint ermitteln
- USHORT GetCurTOXMarks(SwTOXMarks& rMarks) const ;
+ sal_uInt16 GetCurTOXMarks(SwTOXMarks& rMarks) const ;
// Verzeichnis einfuegen, und bei Bedarf erneuern
void InsertTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
- BOOL UpdateTableOf(const SwTOXBase& rTOX,
+ sal_Bool UpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
const SwTOXBase* GetCurTOX() const;
- const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, BOOL bCreate = FALSE );
+ const SwTOXBase* GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate = sal_False );
void SetDefaultTOXBase(const SwTOXBase& rBase);
- BOOL IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
- void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly);
+ sal_Bool IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
+ void SetTOXBaseReadonly(const SwTOXBase& rTOXBase, sal_Bool bReadonly);
- USHORT GetTOXCount() const;
- const SwTOXBase* GetTOX( USHORT nPos ) const;
- BOOL DeleteTOX( const SwTOXBase& rTOXBase, BOOL bDelNodes = FALSE );
+ sal_uInt16 GetTOXCount() const;
+ const SwTOXBase* GetTOX( sal_uInt16 nPos ) const;
+ sal_Bool DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes = sal_False );
// nach einlesen einer Datei alle Verzeichnisse updaten
- void SetUpdateTOX( BOOL bFlag = TRUE );
- BOOL IsUpdateTOX() const;
+ void SetUpdateTOX( sal_Bool bFlag = sal_True );
+ sal_Bool IsUpdateTOX() const;
// Verzeichnis-Typen verwalten
- USHORT GetTOXTypeCount(TOXTypes eTyp) const;
- const SwTOXType* GetTOXType(TOXTypes eTyp, USHORT nId) const;
+ sal_uInt16 GetTOXTypeCount(TOXTypes eTyp) const;
+ const SwTOXType* GetTOXType(TOXTypes eTyp, sal_uInt16 nId) const;
void InsertTOXType(const SwTOXType& rTyp);
//AutoMark file
@@ -421,25 +421,25 @@ public:
void ApplyAutoMark();
// Schluessel fuer die Indexverwaltung
- USHORT GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
+ sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const;
void SetOutlineNumRule(const SwNumRule&);
const SwNumRule* GetOutlineNumRule() const;
// Gliederung - hoch-/runterstufen
- BOOL OutlineUpDown( short nOffset = 1 );
+ sal_Bool OutlineUpDown( short nOffset = 1 );
// Gliederung - hoch-/runtermoven
- BOOL MoveOutlinePara( short nOffset = 1);
+ sal_Bool MoveOutlinePara( short nOffset = 1);
// Outlines and SubOutline are protected ?
- BOOL IsProtectedOutlinePara() const;
+ sal_Bool IsProtectedOutlinePara() const;
// Numerierung Aufzaehlunglisten
- // liefert Regelwerk der aktuellen Aufzaehlung (FALSE sonst)
+ // liefert Regelwerk der aktuellen Aufzaehlung (sal_False sonst)
const SwNumRule* GetCurNumRule() const;
// setzt, wenn noch keine Numerierung, sonst wird geaendert
// arbeitet mit alten und neuen Regeln, nur Differenzen aktualisieren
// --> OD 2008-02-08 #newlistlevelattrs#
- // Add optional parameter <bResetIndentAttrs> (default value FALSE).
+ // Add optional parameter <bResetIndentAttrs> (default value sal_False).
// If <bResetIndentAttrs> equals true, the indent attributes "before text"
// and "first line indent" are additionally reset at the current selection,
// if the list style makes use of the new list level attributes.
@@ -447,7 +447,7 @@ public:
// introduce parameters <bCreateNewList> and <sContinuedListId>
// <bCreateNewList> indicates, if a new list is created by applying the
// given list style.
- // If <bCreateNewList> equals FALSE, <sContinuedListId> may contain the
+ // If <bCreateNewList> equals sal_False, <sContinuedListId> may contain the
// list Id of a list, which has to be continued by applying the given list style
void SetCurNumRule( const SwNumRule&,
const bool bCreateNewList /*= false*/,
@@ -455,16 +455,16 @@ public:
const bool bResetIndentAttrs = false );
// <--
// Absaetze ohne Numerierung, aber mit Einzuegen
- BOOL NoNum();
+ sal_Bool NoNum();
// Loeschen, Splitten der Aufzaehlungsliste
void DelNumRules();
// Hoch-/Runterstufen
- BOOL NumUpDown( BOOL bDown = TRUE );
+ sal_Bool NumUpDown( sal_Bool bDown = sal_True );
// Hoch-/Runtermoven sowohl innerhalb als auch ausserhalb von Numerierungen
- BOOL MoveParagraph( long nOffset = 1);
- BOOL MoveNumParas( BOOL bUpperLower, BOOL bUpperLeft );
+ sal_Bool MoveParagraph( long nOffset = 1);
+ sal_Bool MoveNumParas( sal_Bool bUpperLower, sal_Bool bUpperLeft );
// No-/Numerierung ueber Delete/Backspace ein/abschalten #115901#
- BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE);
+ sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True);
// -> #i23726#
// --> OD 2008-06-09 #i90078#
// Remove unused default parameter <nLevel> and <bRelative>.
@@ -473,17 +473,17 @@ public:
// Adjust method name
void SetIndent(short nIndent, const SwPosition & rPos);
// <--
- BOOL IsFirstOfNumRule() const;
- BOOL IsFirstOfNumRule(const SwPaM & rPaM) const;
+ sal_Bool IsFirstOfNumRule() const;
+ sal_Bool IsFirstOfNumRule(const SwPaM & rPaM) const;
// <- #i23726#
- BOOL IsNoNum( BOOL bChkStart = TRUE ) const;
+ sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const;
// returne den Num-Level des Nodes, in dem sich der Point vom
// Cursor befindet. Return kann sein :
// - NO_NUMBERING, 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1
// --> OD 2008-02-29 #refactorlists# - removed <pHasChilds>
-// BYTE GetNumLevel( BOOL* pHasChilds = 0 ) const;
- BYTE GetNumLevel() const;
+// sal_uInt8 GetNumLevel( sal_Bool* pHasChilds = 0 ) const;
+ sal_uInt8 GetNumLevel() const;
// <--
// detect highest and lowest level to check moving of outline levels
void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower );
@@ -493,21 +493,21 @@ public:
int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei
// -> i29560
- BOOL HasNumber() const;
- BOOL HasBullet() const;
+ sal_Bool HasNumber() const;
+ sal_Bool HasBullet() const;
// <- i29560
- String GetUniqueNumRuleName( const String* pChkStr = 0, BOOL bAutoNum = TRUE ) const;
+ String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const;
void ChgNumRuleFmts( const SwNumRule& rRule );
// setze und erfrage, ob an aktueller PointPos eine Numerierung mit
// dem StartFlag startet
- void SetNumRuleStart( BOOL bFlag = TRUE );
- BOOL IsNumRuleStart() const;
- void SetNodeNumStart( USHORT nStt );
+ void SetNumRuleStart( sal_Bool bFlag = sal_True );
+ sal_Bool IsNumRuleStart() const;
+ void SetNodeNumStart( sal_uInt16 nStt );
// --> OD 2008-02-29 #refactorlists#
- USHORT GetNodeNumStart() const;
+ sal_uInt16 GetNodeNumStart() const;
// <--
- BOOL ReplaceNumRule( const String& rOldRule, const String& rNewRule );
+ sal_Bool ReplaceNumRule( const String& rOldRule, const String& rNewRule );
// Searches for a text node with a numbering rule.
// --> OD 2008-03-18 #refactorlists# - add output parameter <sListId>
// in case a list style is found, <sListId> holds the list id, to which the
@@ -522,10 +522,10 @@ public:
// Undo
// UndoHistory am Dokument pflegen
// bei Save, SaveAs, Create wird UndoHistory zurueckgesetzt ???
- void DoUndo( BOOL bOn = TRUE );
- BOOL DoesUndo() const;
- void DoGroupUndo( BOOL bUn = TRUE );
- BOOL DoesGroupUndo() const;
+ void DoUndo( sal_Bool bOn = sal_True );
+ sal_Bool DoesUndo() const;
+ void DoGroupUndo( sal_Bool bUn = sal_True );
+ sal_Bool DoesGroupUndo() const;
void DelAllUndoObj();
// macht rueckgaengig:
@@ -539,8 +539,8 @@ public:
String GetUndoIdsStr( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const;
// abfragen/setzen der Anzahl von wiederherstellbaren Undo-Actions
- static USHORT GetUndoActionCount();
- static void SetUndoActionCount( USHORT nNew );
+ static sal_uInt16 GetUndoActionCount();
+ static void SetUndoActionCount( sal_uInt16 nNew );
// Redo
// liefert die Id der letzten Redofaehigen Aktion zurueck
@@ -557,11 +557,11 @@ public:
// 0 letzte Aktion, sonst Aktionen bis zum Start der Klammerung nUndoId
// mit KillPaMs, ClearMark
- BOOL Undo(SwUndoId nUndoId = UNDO_EMPTY, USHORT nCnt = 1 );
+ sal_Bool Undo(SwUndoId nUndoId = UNDO_EMPTY, sal_uInt16 nCnt = 1 );
// wiederholt
- USHORT Repeat( USHORT nCount );
+ sal_uInt16 Repeat( sal_uInt16 nCount );
// wiederholt
- USHORT Redo( USHORT nCnt = 1 );
+ sal_uInt16 Redo( sal_uInt16 nCnt = 1 );
// fuer alle Sichten auf dieses Dokument
void StartAllAction();
void EndAllAction();
@@ -570,17 +570,17 @@ public:
void CalcLayout();
// Inhaltsform bestimmen, holen, liefert Type am CurCrsr->SPoint
- USHORT GetCntType() const;
- BOOL HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ...
+ sal_uInt16 GetCntType() const;
+ sal_Bool HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ...
/* Anwenden der ViewOptions mit Start-/EndAction */
inline void ApplyViewOptions( const SwViewOption &rOpt );
// Text innerhalb der Selektion erfragen
- // Returnwert liefert FALSE, wenn der selektierte Bereich
+ // Returnwert liefert sal_False, wenn der selektierte Bereich
// zu gross ist, um in den Stringpuffer kopiert zu werden
// oder andere Fehler auftreten
- BOOL GetSelectedText( String &rBuf,
+ sal_Bool GetSelectedText( String &rBuf,
int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK );
/*
@@ -589,11 +589,11 @@ public:
* gleiche Graphic zeigt), sonst gibt's was auf die Finger
*/
// --> OD 2005-02-09 #119353# - robust
- const Graphic* GetGraphic( BOOL bWait = TRUE ) const;
+ const Graphic* GetGraphic( sal_Bool bWait = sal_True ) const;
const GraphicObject* GetGraphicObj() const;
// <--
- BOOL IsGrfSwapOut( BOOL bOnlyLinked = FALSE ) const;
- USHORT GetGraphicType() const;
+ sal_Bool IsGrfSwapOut( sal_Bool bOnlyLinked = sal_False ) const;
+ sal_uInt16 GetGraphicType() const;
const PolyPolygon *GetGraphicPolygon() const;
void SetGraphicPolygon( const PolyPolygon *pPoly );
@@ -604,9 +604,9 @@ public:
/*
* liefert die Groesse einer Graphic in Twips, wenn der Cursor
- * auf einer Graphic steht; BOOL liefert FALSE, wenn s.o.
+ * auf einer Graphic steht; sal_Bool liefert sal_False, wenn s.o.
*/
- BOOL GetGrfSize(Size&) const;
+ sal_Bool GetGrfSize(Size&) const;
/*
* liefert den Namen und den Filter einer Graphic, wenn der Cursor
* auf einer Graphic steht, sonst gibt's was auf die Finger!
@@ -632,7 +632,7 @@ public:
// remove default parameter, because method always called this default value
Graphic GetIMapGraphic() const; //liefert eine Graphic fuer alle Flys!
// <--
- const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const;
+ const SwFlyFrmFmt* FindFlyByName( const String& rName, sal_uInt8 nNdTyp = 0 ) const;
//liefert ein ClientObject, wenn CurCrsr->Point() auf einen
//SwOLENode zeigt (und Mark nicht gesetzt ist oder auf das
@@ -640,7 +640,7 @@ public:
//Finger.
svt::EmbeddedObjectRef& GetOLEObject() const;
//Gibt es ein OleObject mit diesem Namen (SwFmt)?
- BOOL HasOLEObj( const String &rName ) const;
+ sal_Bool HasOLEObj( const String &rName ) const;
//Liefert den Pointer auf die Daten des Chart, indem sich der Crsr
//befindet.
@@ -657,14 +657,14 @@ public:
void InsertGlossary( SwTextBlocks& rGlossary, const String& );
// aktuelle Selektion zum Textbaustein machen und ins
// Textbausteindokument einfuegen, einschliesslich Vorlagen
- USHORT MakeGlossary( SwTextBlocks& rToFill, const String& rName,
- const String& rShortName, BOOL bSaveRelFile = FALSE,
+ sal_uInt16 MakeGlossary( SwTextBlocks& rToFill, const String& rName,
+ const String& rShortName, sal_Bool bSaveRelFile = sal_False,
const String* pOnlyTxt=0 );
// speicher den gesamten Inhalt des Docs als Textbaustein
- USHORT SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName,
+ sal_uInt16 SaveGlossaryDoc( SwTextBlocks& rGlossary, const String& rName,
const String& rShortName,
- BOOL bSaveRelFile = FALSE,
- BOOL bOnlyTxt = FALSE );
+ sal_Bool bSaveRelFile = sal_False,
+ sal_Bool bOnlyTxt = sal_False );
// Linguistik
// Selektionen sichern
@@ -672,7 +672,7 @@ public:
// Selektionen wiederherstellen
void HyphEnd();
com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>
- HyphContinue( USHORT* pPageCnt, USHORT* pPageSt );
+ HyphContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
// zu trennendes Wort ignorieren
void HyphIgnore();
@@ -682,30 +682,30 @@ public:
//Tabelle
const SwTable& InsertTable( const SwInsertTableOptions& rInsTblOpts, // ALL_TBL_INS_ATTR
- USHORT nRows, USHORT nCols,
+ sal_uInt16 nRows, sal_uInt16 nCols,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
const SwTableAutoFmt* pTAFmt = 0 );
void InsertDDETable( const SwInsertTableOptions& rInsTblOpts, // HEADLINE_NO_BORDER
SwDDEFieldType* pDDEType,
- USHORT nRows, USHORT nCols,
+ sal_uInt16 nRows, sal_uInt16 nCols,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL );
void UpdateTable();
void SetTableName( SwFrmFmt& rTblFmt, const String &rNewName );
SwFrmFmt *GetTableFmt();
- BOOL TextToTable( const SwInsertTableOptions& rInsTblOpts, //ALL_TBL_INS_ATTR
+ sal_Bool TextToTable( const SwInsertTableOptions& rInsTblOpts, //ALL_TBL_INS_ATTR
sal_Unicode cCh,
sal_Int16 eAdj = com::sun::star::text::HoriOrientation::FULL,
const SwTableAutoFmt* pTAFmt = 0 );
- BOOL TableToText( sal_Unicode cCh );
- BOOL IsTextToTableAvailable() const;
+ sal_Bool TableToText( sal_Unicode cCh );
+ sal_Bool IsTextToTableAvailable() const;
- BOOL GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
+ sal_Bool GetTblBoxFormulaAttrs( SfxItemSet& rSet ) const;
void SetTblBoxFormulaAttrs( const SfxItemSet& rSet );
- BOOL IsTableBoxTextFormat() const;
+ sal_Bool IsTableBoxTextFormat() const;
String GetTableBoxText() const;
// Change Modus erfragen/setzen
@@ -713,15 +713,15 @@ public:
void SetTblChgMode( TblChgMode eMode );
// Tabelle an der Cursor Position aufsplitten
- BOOL SplitTable( USHORT eMode );
+ sal_Bool SplitTable( sal_uInt16 eMode );
// Tabellen verbinden
// CanMerge kann feststellen, ob Prev oder Next moeglich ist. Wird
// der Pointer pChkNxtPrv uebergeben, wird festgestellt in welche
// Richtung es moeglich ist.
- BOOL CanMergeTable( BOOL bWithPrev = TRUE, BOOL* pChkNxtPrv = 0 ) const;
- BOOL MergeTable( BOOL bWithPrev = TRUE, USHORT nMode = 0 );
+ sal_Bool CanMergeTable( sal_Bool bWithPrev = sal_True, sal_Bool* pChkNxtPrv = 0 ) const;
+ sal_Bool MergeTable( sal_Bool bWithPrev = sal_True, sal_uInt16 nMode = 0 );
// setze das InsertDB als Tabelle Undo auf:
- void AppendUndoForInsertFromDB( BOOL bIsTable );
+ void AppendUndoForInsertFromDB( sal_Bool bIsTable );
/*
functions used for spell checking and text conversion
@@ -733,7 +733,7 @@ public:
// Selektionen wiederherstellen
void SpellEnd( SwConversionArgs *pConvArgs = 0, bool bRestoreSelection = true );
::com::sun::star::uno::Any SpellContinue(
- USHORT* pPageCnt, USHORT* pPageSt,
+ sal_uInt16* pPageCnt, sal_uInt16* pPageSt,
SwConversionArgs *pConvArgs = 0 );
// spells on a sentence basis - the SpellPortions are needed
@@ -750,9 +750,9 @@ public:
// check SwSpellIter data to see if the last sentence got grammar checked
bool HasLastSentenceGotGrammarChecked() const;
// Is text conversion active somewhere else?
- BOOL HasConvIter() const;
+ sal_Bool HasConvIter() const;
// Is hyphenation active somewhere else?
- BOOL HasHyphIter() const;
+ sal_Bool HasHyphIter() const;
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellAlternatives >
@@ -773,12 +773,12 @@ public:
// returne die Namen aller im Doc gesetzten Referenzen
// Ist der ArrayPointer 0 dann returne nur, ob im Doc. eine RefMark
// gesetzt ist
- USHORT GetRefMarks( SvStringsDtor* = 0 ) const;
+ sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const;
// rufe die Autokorrektur auf
- void AutoCorrect( SvxAutoCorrect& rACorr, BOOL bInsertMode = TRUE,
+ void AutoCorrect( SvxAutoCorrect& rACorr, sal_Bool bInsertMode = sal_True,
sal_Unicode cChar = ' ' );
- BOOL GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord );
+ sal_Bool GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord );
// dann setze nach entsprechenden Regeln unsere Vorlagen
void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 );
@@ -789,49 +789,49 @@ public:
// errechnet die Selektion
String Calculate();
- BOOL InsertURL( const SwFmtINetFmt& rFmt, const String& rStr,
- BOOL bKeepSelection = FALSE );
- USHORT GetINetAttrs( SwGetINetAttrs& rArr );
+ sal_Bool InsertURL( const SwFmtINetFmt& rFmt, const String& rStr,
+ sal_Bool bKeepSelection = sal_False );
+ sal_uInt16 GetINetAttrs( SwGetINetAttrs& rArr );
//SS Fuer holen/ersetzen DropCap-Inhalt
- String GetDropTxt( const USHORT nChars ) const;
+ String GetDropTxt( const sal_uInt16 nChars ) const;
void ReplaceDropTxt( const String &rStr );
// may an outline be moved or copied?
// Check whether it's in text body, not in table, and not read-only (move)
- BOOL IsOutlineMovable( USHORT nIdx ) const;
- BOOL IsOutlineCopyable( USHORT nIdx ) const;
+ sal_Bool IsOutlineMovable( sal_uInt16 nIdx ) const;
+ sal_Bool IsOutlineCopyable( sal_uInt16 nIdx ) const;
- USHORT GetLineCount( BOOL bActPos = TRUE );
+ sal_uInt16 GetLineCount( sal_Bool bActPos = sal_True );
// erfrage und setze den Fussnoten-Text/Nummer. Set.. auf akt. SSelection!
- BOOL GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
+ sal_Bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 );
bool SetCurFtn( const SwFmtFtn& rFillFtn );
bool HasFtns( bool bEndNotes = false ) const;
-//z.Zt nicht benoetigt USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const;
+//z.Zt nicht benoetigt sal_uInt16 GetFtnCnt( sal_Bool bEndNotes = sal_False ) const;
// gebe Liste aller Fussnoten und deren Anfangstexte
- USHORT GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
+ sal_uInt16 GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false );
SwSection const* InsertSection(
SwSectionData & rNewData, SfxItemSet const*const = 0 );
- BOOL IsInsRegionAvailable() const;
+ sal_Bool IsInsRegionAvailable() const;
const SwSection* GetCurrSection() const;
// liefert wie GetCurrSection() den aktuellen Bereich, allerdings geht diese Funktion
// ueber die Frames und erwischt dabei auch den Bereich, wenn der Cursor in einer
// Fussnote steht, deren Referenz in einem spaltigen Bereich steckt.
// Wenn man bOutOfTab setzt, wird der Bereich gesucht,
// der die Tabelle umfasst, nicht etwa ein innerer.
- const SwSection* GetAnySection( BOOL bOutOfTab = FALSE, const Point* pPt = 0 ) const;
+ const SwSection* GetAnySection( sal_Bool bOutOfTab = sal_False, const Point* pPt = 0 ) const;
- USHORT GetSectionFmtCount() const;
- USHORT GetSectionFmtPos( const SwSectionFmt& ) const;
- const SwSectionFmt& GetSectionFmt(USHORT nFmt) const;
- void DelSectionFmt( USHORT nFmt );
+ sal_uInt16 GetSectionFmtCount() const;
+ sal_uInt16 GetSectionFmtPos( const SwSectionFmt& ) const;
+ const SwSectionFmt& GetSectionFmt(sal_uInt16 nFmt) const;
+ void DelSectionFmt( sal_uInt16 nFmt );
void UpdateSection(sal_uInt16 const nSect, SwSectionData &,
SfxItemSet const*const = 0);
- BOOL IsAnySectionInDoc( BOOL bChkReadOnly = FALSE,
- BOOL bChkHidden = FALSE,
- BOOL BChkTOX = FALSE ) const;
+ sal_Bool IsAnySectionInDoc( sal_Bool bChkReadOnly = sal_False,
+ sal_Bool bChkHidden = sal_False,
+ sal_Bool BChkTOX = sal_False ) const;
String GetUniqueSectionName( const String* pChkStr = 0 ) const;
@@ -841,7 +841,7 @@ public:
// search inside the cursor selection for full selected sections.
// if any part of section in the selection return 0.
// if more than one in the selection return the count
- USHORT GetFullSelectedSectionCount() const;
+ sal_uInt16 GetFullSelectedSectionCount() const;
// special insert: Insert a new text node just before or after a section or
// table, if the cursor is positioned at the start/end of said
@@ -852,16 +852,16 @@ public:
bool CanSpecialInsert() const;
// Optimierung UI
- void SetNewDoc(BOOL bNew = TRUE);
+ void SetNewDoc(sal_Bool bNew = sal_True);
sfx2::LinkManager& GetLinkManager();
inline const sfx2::LinkManager& GetLinkManager() const;
// linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von
// Numerierungen), optional kann man "um" den Offset stufen oder "auf"
- // die Position gestuft werden (bModulus = TRUE)
- BOOL IsMoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE ) const;
- void MoveLeftMargin( BOOL bRight = TRUE, BOOL bModulus = TRUE );
+ // die Position gestuft werden (bModulus = sal_True)
+ sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True ) const;
+ void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus = sal_True );
// Numberformatter vom Doc erfragen
SvNumberFormatter* GetNumberFormatter();
@@ -869,36 +869,36 @@ public:
{ return ((SwEditShell*)this)->GetNumberFormatter(); }
// Schnitstellen fuers GlobalDokument
- BOOL IsGlobalDoc() const;
- void SetGlblDocSaveLinks( BOOL bFlag = TRUE );
- BOOL IsGlblDocSaveLinks() const;
- USHORT GetGlobalDocContent( SwGlblDocContents& rArr ) const;
- BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos,
+ sal_Bool IsGlobalDoc() const;
+ void SetGlblDocSaveLinks( sal_Bool bFlag = sal_True );
+ sal_Bool IsGlblDocSaveLinks() const;
+ sal_uInt16 GetGlobalDocContent( SwGlblDocContents& rArr ) const;
+ sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos,
SwSectionData & rNew );
- BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos,
+ sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos,
const SwTOXBase& rTOX );
- BOOL InsertGlobalDocContent( const SwGlblDocContent& rPos );
- BOOL DeleteGlobalDocContent( const SwGlblDocContents& rArr,
- USHORT nPos );
- BOOL MoveGlobalDocContent( const SwGlblDocContents& rArr ,
- USHORT nFromPos, USHORT nToPos,
- USHORT nNewPos );
- BOOL GotoGlobalDocContent( const SwGlblDocContent& rPos );
+ sal_Bool InsertGlobalDocContent( const SwGlblDocContent& rPos );
+ sal_Bool DeleteGlobalDocContent( const SwGlblDocContents& rArr,
+ sal_uInt16 nPos );
+ sal_Bool MoveGlobalDocContent( const SwGlblDocContents& rArr ,
+ sal_uInt16 nFromPos, sal_uInt16 nToPos,
+ sal_uInt16 nNewPos );
+ sal_Bool GotoGlobalDocContent( const SwGlblDocContent& rPos );
// alles fuers Redlining
- USHORT GetRedlineMode() const;
- void SetRedlineMode( USHORT eMode );
- BOOL IsRedlineOn() const;
- USHORT GetRedlineCount() const;
- const SwRedline& GetRedline( USHORT nPos ) const;
- BOOL AcceptRedline( USHORT nPos );
- BOOL RejectRedline( USHORT nPos );
+ sal_uInt16 GetRedlineMode() const;
+ void SetRedlineMode( sal_uInt16 eMode );
+ sal_Bool IsRedlineOn() const;
+ sal_uInt16 GetRedlineCount() const;
+ const SwRedline& GetRedline( sal_uInt16 nPos ) const;
+ sal_Bool AcceptRedline( sal_uInt16 nPos );
+ sal_Bool RejectRedline( sal_uInt16 nPos );
// suche das Redline zu diesem Data und returne die Pos im Array
// USHRT_MAX wird returnt, falls nicht vorhanden
- USHORT FindRedlineOfData( const SwRedlineData& ) const;
+ sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const;
// Kommentar am Redline an der Position setzen
- BOOL SetRedlineComment( const String& rS );
+ sal_Bool SetRedlineComment( const String& rS );
const SwRedline* GetCurrRedline() const;
// Redline Anzeigeattribute wurden geaendert, Views updaten
@@ -920,13 +920,13 @@ public:
void SetLineNumberInfo( const SwLineNumberInfo& rInfo);
// Etiketten: Bereiche synchronisieren
- void SetLabelDoc( BOOL bFlag = TRUE );
- BOOL IsLabelDoc() const;
+ void SetLabelDoc( sal_Bool bFlag = sal_True );
+ sal_Bool IsLabelDoc() const;
// Schnittstelle fuer die TextInputDaten - ( fuer die Texteingabe
// von japanischen/chinesischen Zeichen)
SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage);
- String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE);
+ String DeleteExtTextInput( SwExtTextInput* pDel = 0, sal_Bool bInsText = sal_True);
// SwExtTextInput* GetExtTextInput() const;
void SetExtTextInputData( const CommandExtTextInputData& );
@@ -935,7 +935,7 @@ public:
// returns a scaling factor of selected text. Used for the rotated
// character attribut dialog.
- USHORT GetScalingOfSelectedText() const;
+ sal_uInt16 GetScalingOfSelectedText() const;
// ctor/dtor
SwEditShell( SwDoc&, Window*, const SwViewOption *pOpt = 0 );
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
index 222de5caaa10..31002c1875c8 100644
--- a/sw/inc/errhdl.hxx
+++ b/sw/inc/errhdl.hxx
@@ -33,7 +33,7 @@
#include <sal/types.h>
#include "swdllapi.h"
-extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam
+extern sal_Bool bAssert; // sal_True, wenn eine ASSERT-Box hochkam
// -----------------------------------------------------------------------
@@ -41,8 +41,8 @@ extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam
// wo der Fehler auftrat.
// Die Funktion darf nicht direkt benutzt werden!
// -----------------------------------------------------------------------
-SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, USHORT );
-SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
+SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, sal_uInt16 );
+SW_DLLPUBLIC void AssertFail( sal_uInt16, const sal_Char*, sal_uInt16 );
#define ASSERT( cond, message ) \
if( !(cond) ) { \
@@ -58,7 +58,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
#define ASSERT_ID( cond, id ) \
if( !(cond) ) { \
const char *_pFileName = __FILE__; \
- ::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
+ ::AssertFail( (sal_uInt16)id, _pFileName, __LINE__ ); \
}
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index 32fdbe202462..38d9c56b3213 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -47,14 +47,14 @@ class SwEditShell;
const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos,
const SwFrm& rFrm );
// Wandlung Address -> Adressen
-void ReplacePoint(String& sTmpName, BOOL bWithCommandType = FALSE);
+void ReplacePoint(String& sTmpName, sal_Bool bWithCommandType = sal_False);
struct _SeqFldLstElem
{
String sDlgEntry;
- USHORT nSeqNo;
+ sal_uInt16 nSeqNo;
- _SeqFldLstElem( const String& rStr, USHORT nNo )
+ _SeqFldLstElem( const String& rStr, sal_uInt16 nNo )
: sDlgEntry( rStr ), nSeqNo( nNo )
{}
};
@@ -65,8 +65,8 @@ class SW_DLLPUBLIC SwSeqFldList : public _SwSeqFldList
public:
SwSeqFldList() : _SwSeqFldList( 10, 10 ) {}
- BOOL InsertSort( _SeqFldLstElem* );
- BOOL SeekEntry( const _SeqFldLstElem& , USHORT* pPos = 0 );
+ sal_Bool InsertSort( _SeqFldLstElem* );
+ sal_Bool SeekEntry( const _SeqFldLstElem& , sal_uInt16* pPos = 0 );
};
/*--------------------------------------------------------------------
@@ -93,8 +93,8 @@ public:
class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
{
String sExpand;
- BOOL bIsInBodyTxt;
- USHORT nSubType;
+ sal_Bool bIsInBodyTxt;
+ sal_uInt16 nSubType;
bool bLateInitialization; // #i82544#
@@ -103,18 +103,18 @@ class SW_DLLPUBLIC SwGetExpField : public SwFormulaField
public:
SwGetExpField( SwGetExpFieldType*, const String& rFormel,
- USHORT nSubType = nsSwGetSetExpType::GSE_EXPR, ULONG nFmt = 0);
+ sal_uInt16 nSubType = nsSwGetSetExpType::GSE_EXPR, sal_uLong nFmt = 0);
virtual void SetValue( const double& rVal );
- virtual void SetLanguage(USHORT nLng);
+ virtual void SetLanguage(sal_uInt16 nLng);
inline const String& GetExpStr() const;
inline void ChgExpStr(const String& rExpand);
// wird von der Formatierung abgefragt
- inline BOOL IsInBodyTxt() const;
+ inline sal_Bool IsInBodyTxt() const;
// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
- inline void ChgBodyTxtFlag( BOOL bIsInBody );
+ inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
// fuer Felder in Header/Footer/Footnotes/Flys:
// (wird nur von der Formatierung aufgerufen!!)
void ChangeExpansion( const SwFrm&, const SwTxtFld& );
@@ -125,12 +125,12 @@ public:
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- static USHORT GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc);
+ static sal_uInt16 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc& rDoc);
// #i82544#
void SetLateInitialization() { bLateInitialization = true;}
};
@@ -142,11 +142,11 @@ inline const String& SwGetExpField::GetExpStr() const
{ return sExpand; }
// wird von der Formatierung abgefragt
-inline BOOL SwGetExpField::IsInBodyTxt() const
+inline sal_Bool SwGetExpField::IsInBodyTxt() const
{ return bIsInBodyTxt; }
// wird von UpdateExpFlds gesetzt (dort ist die Node-Position bekannt)
-inline void SwGetExpField::ChgBodyTxtFlag( BOOL bIsInBody )
+inline void SwGetExpField::ChgBodyTxtFlag( sal_Bool bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
@@ -162,59 +162,59 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType
const SwNode* pOutlChgNd;
// sal_Unicode cDelim;
String sDelim;
- USHORT nType;
- BYTE nLevel;
- BOOL bDeleted;
+ sal_uInt16 nType;
+ sal_uInt8 nLevel;
+ sal_Bool bDeleted;
public:
SwSetExpFieldType( SwDoc* pDoc, const String& rName,
- USHORT nType = nsSwGetSetExpType::GSE_EXPR );
+ sal_uInt16 nType = nsSwGetSetExpType::GSE_EXPR );
virtual SwFieldType* Copy() const;
virtual const String& GetName() const;
- inline void SetType(USHORT nTyp);
- inline USHORT GetType() const;
+ inline void SetType(sal_uInt16 nTyp);
+ inline sal_uInt16 GetType() const;
- void SetSeqFormat(ULONG nFormat);
- ULONG GetSeqFormat();
+ void SetSeqFormat(sal_uLong nFormat);
+ sal_uLong GetSeqFormat();
- BOOL IsDeleted() const { return bDeleted; }
- void SetDeleted( BOOL b ) { bDeleted = b; }
+ sal_Bool IsDeleted() const { return bDeleted; }
+ void SetDeleted( sal_Bool b ) { bDeleted = b; }
// ueberlagert, weil das Set-Field selbst dafuer sorgt, das
// es aktualisiert wird.
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
inline const String& GetSetRefName() const;
- USHORT SetSeqRefNo( SwSetExpField& rFld );
+ sal_uInt16 SetSeqRefNo( SwSetExpField& rFld );
- USHORT GetSeqFldList( SwSeqFldList& rList );
- String MakeSeqName( USHORT nSeqNo );
+ sal_uInt16 GetSeqFldList( SwSeqFldList& rList );
+ String MakeSeqName( sal_uInt16 nSeqNo );
// Seqencefelder ggfs. Kapitelweise numerieren
// sal_Unicode GetDelimiter() const { return cDelim; }
// void SetDelimiter( sal_Unicode c ) { cDelim = c; }
const String& GetDelimiter() const { return sDelim; }
void SetDelimiter( const String& s ) { sDelim = s; }
- BYTE GetOutlineLvl() const { return nLevel; }
- void SetOutlineLvl( BYTE n ) { nLevel = n; }
+ sal_uInt8 GetOutlineLvl() const { return nLevel; }
+ void SetOutlineLvl( sal_uInt8 n ) { nLevel = n; }
void SetChapter( SwSetExpField& rFld, const SwNode& rNd );
// Member nur fuers SwDoc::UpdateExpFld - wird nur waehrend der Laufzeit
// von SequencefeldTypen benoetigt!!!
const SwNode* GetOutlineChgNd() const { return pOutlChgNd; }
void SetOutlineChgNd( const SwNode* p ) { pOutlChgNd = p; }
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline void SwSetExpFieldType::SetType( USHORT nTyp )
+inline void SwSetExpFieldType::SetType( sal_uInt16 nTyp )
{
nType = nTyp;
EnableFormat( !(nType & (nsSwGetSetExpType::GSE_SEQ|nsSwGetSetExpType::GSE_STRING)));
}
-inline USHORT SwSetExpFieldType::GetType() const
+inline sal_uInt16 SwSetExpFieldType::GetType() const
{ return nType; }
inline const String& SwSetExpFieldType::GetSetRefName() const
@@ -230,15 +230,15 @@ class SW_DLLPUBLIC SwSetExpField : public SwFormulaField
String sExpand;
String aPText;
String aSeqText;
- BOOL bInput;
- USHORT nSeqNo;
- USHORT nSubType;
+ sal_Bool bInput;
+ sal_uInt16 nSeqNo;
+ sal_uInt16 nSubType;
virtual String Expand() const;
virtual SwField* Copy() const;
public:
- SwSetExpField(SwSetExpFieldType*, const String& rFormel, ULONG nFmt = 0);
+ SwSetExpField(SwSetExpFieldType*, const String& rFormel, sal_uLong nFmt = 0);
virtual void SetValue( const double& rVal );
@@ -249,19 +249,19 @@ public:
inline void SetPromptText(const String& rStr);
inline const String& GetPromptText() const;
- inline void SetInputFlag(BOOL bInp);
- inline BOOL GetInputFlag() const;
+ inline void SetInputFlag(sal_Bool bInp);
+ inline sal_Bool GetInputFlag() const;
virtual String GetFieldName() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
- inline BOOL IsSequenceFld() const;
+ inline sal_Bool IsSequenceFld() const;
// fuer SequenceFelder - logische Nummer
- inline void SetSeqNumber( USHORT n ) { nSeqNo = n; }
- inline USHORT GetSeqNumber() const { return nSeqNo; }
+ inline void SetSeqNumber( sal_uInt16 n ) { nSeqNo = n; }
+ inline sal_uInt16 GetSeqNumber() const { return nSeqNo; }
// Der Name nur erfragen
virtual const String& GetPar1() const;
@@ -269,8 +269,8 @@ public:
// Die Formel
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
inline const String& SwSetExpField::GetExpStr() const
@@ -285,13 +285,13 @@ inline void SwSetExpField::SetPromptText(const String& rStr)
inline const String& SwSetExpField::GetPromptText() const
{ return aPText; }
-inline void SwSetExpField::SetInputFlag(BOOL bInp)
+inline void SwSetExpField::SetInputFlag(sal_Bool bInp)
{ bInput = bInp; }
-inline BOOL SwSetExpField::GetInputFlag() const
+inline sal_Bool SwSetExpField::GetInputFlag() const
{ return bInput; }
-inline BOOL SwSetExpField::IsSequenceFld() const
+inline sal_Bool SwSetExpField::IsSequenceFld() const
{ return 0 != (nsSwGetSetExpType::GSE_SEQ & ((SwSetExpFieldType*)GetTyp())->GetType()); }
/*--------------------------------------------------------------------
@@ -319,7 +319,7 @@ class SW_DLLPUBLIC SwInputField : public SwField
String aPText;
String aHelp;
String aToolTip;
- USHORT nSubType;
+ sal_uInt16 nSubType;
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -327,8 +327,8 @@ class SW_DLLPUBLIC SwInputField : public SwField
public:
// Direkte Eingabe ueber Dialog alten Wert loeschen
SwInputField(SwInputFieldType*, const String& rContent ,
- const String& rPrompt, USHORT nSubType = 0,
- ULONG nFmt = 0);
+ const String& rPrompt, sal_uInt16 nSubType = 0,
+ sal_uLong nFmt = 0);
virtual String GetFieldName() const;
@@ -346,12 +346,12 @@ public:
virtual String GetToolTip() const;
virtual void SetToolTip(const String & rStr);
- virtual BOOL isFormField() const;
+ virtual sal_Bool isFormField() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nSub);
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -361,20 +361,20 @@ public:
class SwInputFieldList
{
public:
- SwInputFieldList( SwEditShell* pShell, BOOL bBuildTmpLst = FALSE );
+ SwInputFieldList( SwEditShell* pShell, sal_Bool bBuildTmpLst = sal_False );
~SwInputFieldList();
- USHORT Count() const;
- SwField* GetField(USHORT nId);
+ sal_uInt16 Count() const;
+ SwField* GetField(sal_uInt16 nId);
- void GotoFieldPos(USHORT nId);
+ void GotoFieldPos(sal_uInt16 nId);
void PushCrsr();
void PopCrsr();
// vergleiche TmpLst mit akt Feldern. Alle neue kommen in die SortLst
// damit sie geupdatet werden koennen. Returnt die Anzahl.
// (Fuer Textbausteine: nur seine Input-Felder aktualisieren)
- USHORT BuildSortLst();
+ sal_uInt16 BuildSortLst();
// Alle unselektierten Felder aus Liste entfernen
void RemoveUnselectedFlds();
@@ -406,7 +406,7 @@ public:
class SwTblField : public SwValueField, public SwTableFormula
{
String sExpand;
- USHORT nSubType;
+ sal_uInt16 nSubType;
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -418,11 +418,11 @@ class SwTblField : public SwValueField, public SwTableFormula
public:
SwTblField( SwTblFieldType*, const String& rFormel,
- USHORT nSubType = 0, ULONG nFmt = 0);
+ sal_uInt16 nSubType = 0, sal_uLong nFmt = 0);
virtual void SetValue( const double& rVal );
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
const String& GetExpStr() const { return sExpand; }
void ChgExpStr(const String& rStr) { sExpand = rStr; }
@@ -435,8 +435,8 @@ public:
// Die Formel
virtual String GetPar2() const;
virtual void SetPar2(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx
index b3a07efa1906..dba9bb5b5e2c 100644
--- a/sw/inc/extinput.hxx
+++ b/sw/inc/extinput.hxx
@@ -40,8 +40,8 @@ class SwExtTextInput : public SwPaM
{
SvUShorts aAttrs;
String sOverwriteText;
- BOOL bInsText : 1;
- BOOL bIsOverwriteCursor : 1;
+ sal_Bool bInsText : 1;
+ sal_Bool bIsOverwriteCursor : 1;
LanguageType eInputLanguage;
public:
SwExtTextInput( const SwPaM& rPam, Ring* pRing = 0 );
@@ -49,9 +49,9 @@ public:
void SetInputData( const CommandExtTextInputData& rData );
const SvUShorts& GetAttrs() const { return aAttrs; }
- void SetInsText( BOOL bFlag ) { bInsText = bFlag; }
- BOOL IsOverwriteCursor() const { return bIsOverwriteCursor; }
- void SetOverwriteCursor( BOOL bFlag );
+ void SetInsText( sal_Bool bFlag ) { bInsText = bFlag; }
+ sal_Bool IsOverwriteCursor() const { return bIsOverwriteCursor; }
+ void SetOverwriteCursor( sal_Bool bFlag );
void SetLanguage(LanguageType eSet) { eInputLanguage = eSet;}
};
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index ee557e8eeaba..0b9cc9150227 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -69,12 +69,12 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
// an das SwTxtCharFmt weiterleiten (vom SwClient)
virtual void Modify( SfxPoolItem*, SfxPoolItem* );
- virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 873b28225204..3beaff17ade8 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -72,41 +72,41 @@ namespace svx
// return values for GetFrmType() und GetSelFrmType().
//! values can be combined via logival or
-#define FRMTYPE_NONE (USHORT) 0
-#define FRMTYPE_PAGE (USHORT) 1
-#define FRMTYPE_HEADER (USHORT) 2
-#define FRMTYPE_FOOTER (USHORT) 4
-#define FRMTYPE_BODY (USHORT) 8
-#define FRMTYPE_COLUMN (USHORT) 16
-#define FRMTYPE_TABLE (USHORT) 32
-#define FRMTYPE_FLY_FREE (USHORT) 64
-#define FRMTYPE_FLY_ATCNT (USHORT) 128
-#define FRMTYPE_FLY_INCNT (USHORT) 256
-#define FRMTYPE_FOOTNOTE (USHORT) 512
-#define FRMTYPE_FTNPAGE (USHORT) 1024
-#define FRMTYPE_FLY_ANY (USHORT) 2048
-#define FRMTYPE_DRAWOBJ (USHORT) 4096
-#define FRMTYPE_COLSECT (USHORT) 8192
-#define FRMTYPE_COLSECTOUTTAB (USHORT) 16384
+#define FRMTYPE_NONE (sal_uInt16) 0
+#define FRMTYPE_PAGE (sal_uInt16) 1
+#define FRMTYPE_HEADER (sal_uInt16) 2
+#define FRMTYPE_FOOTER (sal_uInt16) 4
+#define FRMTYPE_BODY (sal_uInt16) 8
+#define FRMTYPE_COLUMN (sal_uInt16) 16
+#define FRMTYPE_TABLE (sal_uInt16) 32
+#define FRMTYPE_FLY_FREE (sal_uInt16) 64
+#define FRMTYPE_FLY_ATCNT (sal_uInt16) 128
+#define FRMTYPE_FLY_INCNT (sal_uInt16) 256
+#define FRMTYPE_FOOTNOTE (sal_uInt16) 512
+#define FRMTYPE_FTNPAGE (sal_uInt16) 1024
+#define FRMTYPE_FLY_ANY (sal_uInt16) 2048
+#define FRMTYPE_DRAWOBJ (sal_uInt16) 4096
+#define FRMTYPE_COLSECT (sal_uInt16) 8192
+#define FRMTYPE_COLSECTOUTTAB (sal_uInt16) 16384
#define FRMTYPE_ANYCOLSECT ( FRMTYPE_COLSECT | FRMTYPE_COLSECTOUTTAB )
//! values can be combined via logival or
-#define GOTOOBJ_DRAW_CONTROL (USHORT) 1
-#define GOTOOBJ_DRAW_SIMPLE (USHORT) 2
-#define GOTOOBJ_DRAW_ANY (USHORT) 3
-#define GOTOOBJ_FLY_FRM (USHORT) 4
-#define GOTOOBJ_FLY_GRF (USHORT) 8
-#define GOTOOBJ_FLY_OLE (USHORT) 16
-#define GOTOOBJ_FLY_ANY (USHORT) 28
-#define GOTOOBJ_GOTO_ANY (USHORT) 31
+#define GOTOOBJ_DRAW_CONTROL (sal_uInt16) 1
+#define GOTOOBJ_DRAW_SIMPLE (sal_uInt16) 2
+#define GOTOOBJ_DRAW_ANY (sal_uInt16) 3
+#define GOTOOBJ_FLY_FRM (sal_uInt16) 4
+#define GOTOOBJ_FLY_GRF (sal_uInt16) 8
+#define GOTOOBJ_FLY_OLE (sal_uInt16) 16
+#define GOTOOBJ_FLY_ANY (sal_uInt16) 28
+#define GOTOOBJ_GOTO_ANY (sal_uInt16) 31
//! values can be combined via logival or
-#define FLYPROTECT_CONTENT (USHORT) 1 // kann verodert werden!
-#define FLYPROTECT_SIZE (USHORT) 2
-#define FLYPROTECT_POS (USHORT) 4
-#define FLYPROTECT_PARENT (USHORT) 8 // nur Parents untersuchen
-#define FLYPROTECT_FIXED (USHORT) 16 // nur nicht aufhebbarer Schutz
+#define FLYPROTECT_CONTENT (sal_uInt16) 1 // kann verodert werden!
+#define FLYPROTECT_SIZE (sal_uInt16) 2
+#define FLYPROTECT_POS (sal_uInt16) 4
+#define FLYPROTECT_PARENT (sal_uInt16) 8 // nur Parents untersuchen
+#define FLYPROTECT_FIXED (sal_uInt16) 16 // nur nicht aufhebbarer Schutz
// z.B. durch OLE-Server, gilt auch
// fuer Dialog
@@ -187,7 +187,7 @@ class SdrDropMarkerOverlay;
class SW_DLLPUBLIC SwFEShell : public SwEditShell
{
SdrDropMarkerOverlay *pChainFrom, *pChainTo;
- BOOL bCheckForOLEInCaption;
+ sal_Bool bCheckForOLEInCaption;
SW_DLLPRIVATE SwFlyFrm *FindFlyFrm() const;
SW_DLLPRIVATE SwFlyFrm *FindFlyFrm( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
@@ -205,26 +205,26 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const;
//0 == in keiner Spalte
- SW_DLLPRIVATE USHORT _GetCurColNum( const SwFrm *pFrm,
+ SW_DLLPRIVATE sal_uInt16 _GetCurColNum( const SwFrm *pFrm,
SwGetCurColNumPara* pPara ) const;
SW_DLLPRIVATE void _GetTabCols( SwTabCols &rToFill, const SwFrm *pBox ) const;
SW_DLLPRIVATE void _GetTabRows( SwTabCols &rToFill, const SwFrm *pBox ) const;
- SW_DLLPRIVATE BOOL ImpEndCreate();
+ SW_DLLPRIVATE sal_Bool ImpEndCreate();
SW_DLLPRIVATE ObjCntType GetObjCntType( const SdrObject& rObj ) const;
// Methoden fuers kopieren von DrawObjecten
- SW_DLLPRIVATE BOOL CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
- const Point& rInsPt, BOOL bIsMove,
- BOOL bSelectInsert );
+ SW_DLLPRIVATE sal_Bool CopyDrawSel( SwFEShell* pDestShell, const Point& rSttPt,
+ const Point& rInsPt, sal_Bool bIsMove,
+ sal_Bool bSelectInsert );
// get list of marked SdrObjects;
// helper method for GetSelFrmType, IsSelContainsControl
SW_DLLPRIVATE const SdrMarkList* _GetMarkList() const;
- SW_DLLPRIVATE BOOL CheckHeadline( bool bRepeat ) const;
+ SW_DLLPRIVATE sal_Bool CheckHeadline( bool bRepeat ) const;
using SwEditShell::Copy;
@@ -238,15 +238,15 @@ public:
virtual ~SwFEShell();
// Copy und Paste Methoden fuer das interne Clipboard
- BOOL Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 );
- BOOL Paste( SwDoc* pClpDoc, BOOL bIncludingPageFrames = sal_False);
+ sal_Bool Copy( SwDoc* pClpDoc, const String* pNewClpTxt = 0 );
+ sal_Bool Paste( SwDoc* pClpDoc, sal_Bool bIncludingPageFrames = sal_False);
//paste some pages into another doc - used in mailmerge
- BOOL PastePages( SwFEShell& rToFill, USHORT nStartPage, USHORT nEndPage);
+ sal_Bool PastePages( SwFEShell& rToFill, sal_uInt16 nStartPage, sal_uInt16 nEndPage);
// Copy-Methode fuer Drag&Drop
- BOOL Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
- BOOL bIsMove = FALSE, BOOL bSelectInsert = TRUE );
+ sal_Bool Copy( SwFEShell*, const Point& rSttPt, const Point& rInsPt,
+ sal_Bool bIsMove = sal_False, sal_Bool bSelectInsert = sal_True );
- void SelectFlyFrm( SwFlyFrm& rFrm, BOOL bNew = FALSE );
+ void SelectFlyFrm( SwFlyFrm& rFrm, sal_Bool bNew = sal_False );
// befindet sich der selektierte Rahmen innerhalb eines anderen?
const SwFrmFmt* IsFlyInFly();
@@ -255,14 +255,14 @@ public:
//Wenn ein Objekt angegeben wurde, so wird genau diese Markiert (anstatt
//ueber die Position zu suchen.
- BOOL SelectObj( const Point& rSelPt, BYTE nFlag = 0, SdrObject *pObj = 0 );
+ sal_Bool SelectObj( const Point& rSelPt, sal_uInt8 nFlag = 0, SdrObject *pObj = 0 );
void DelSelectedObj();
//Selektion nach oben unten bewegen (Z-Order).
- //TRUE == ganz nach oben/unten
- //FALSE == einen ueberholen
- void SelectionToTop ( BOOL bTop = TRUE );
- void SelectionToBottom( BOOL bBottom = TRUE );
+ //sal_True == ganz nach oben/unten
+ //sal_False == einen ueberholen
+ void SelectionToTop ( sal_Bool bTop = sal_True );
+ void SelectionToBottom( sal_Bool bBottom = sal_True );
short GetLayerId() const; //1 Heaven, 0 Hell, -1 Uneindeutig
void SelectionToHeaven(); //Ueber dem Dokument
@@ -279,7 +279,7 @@ public:
// the draw object.
sal_Bool ShouldObjectBeSelected(const Point& rPt);
- sal_Bool MoveAnchor( USHORT nDir );
+ sal_Bool MoveAnchor( sal_uInt16 nDir );
// Returns if Upper of frame at current position is section frame
// Currently only used by the rules. To be replaced by something more
@@ -288,10 +288,10 @@ public:
//Returnwerte siehe oben FrmType.
//pPt: Crsr bzw. DocPos; bStopAtFly: Bei Flys anhalten oder ueber den Anchor weitergehen
- // Obgleich (0,TRUE) eine Art Standard ist, sind die Parameter nicht defaultet, damit
+ // Obgleich (0,sal_True) eine Art Standard ist, sind die Parameter nicht defaultet, damit
// bei jeder Benutzung insbesondere das bStopAtFly bewusst genutzt wird.
- USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
- USHORT GetSelFrmType() const; //Selektion (Drawing)
+ sal_uInt16 GetFrmType( const Point *pPt, sal_Bool bStopAtFly ) const;
+ sal_uInt16 GetSelFrmType() const; //Selektion (Drawing)
/** #108784# check whether selected frame contains a control;
* companion method to GetSelFrmType, used for preventing
@@ -323,9 +323,9 @@ public:
// Groesse von Drawobjekten setzen
void SetObjRect( const SwRect& rRect );
- long BeginDrag( const Point *pPt, BOOL bProp );
- long Drag ( const Point *pPt, BOOL bProp );
- long EndDrag ( const Point *pPt, BOOL bProp );
+ long BeginDrag( const Point *pPt, sal_Bool bProp );
+ long Drag ( const Point *pPt, sal_Bool bProp );
+ long EndDrag ( const Point *pPt, sal_Bool bProp );
void BreakDrag();
//Methoden fuer die Statuszeile.
@@ -348,13 +348,13 @@ public:
const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const;
//Welcher Schutz ist am selektierten Objekt gesetzt?
- //!! returns several flags in BYTE
- BYTE IsSelObjProtected( USHORT /*FLYPROTECT_...*/ eType ) const;
+ //!! returns several flags in sal_uInt8
+ sal_uInt8 IsSelObjProtected( sal_uInt16 /*FLYPROTECT_...*/ eType ) const;
//Liefert neben der Grafik in rName bei gelinkten Grafiken den Namen mit
//Pfad und sonst den Grafiknamen. rbLink ist TRU bei gelinkten Grafiken.
const Graphic *GetGrfAtPos( const Point &rDocPos,
- String &rName, BOOL &rbLink ) const;
+ String &rName, sal_Bool &rbLink ) const;
// --> OD 2009-07-13 #i73249#
const String GetObjTitle() const;
@@ -365,33 +365,33 @@ public:
//SS fuer Rahmen --------------------------------------------
- BOOL IsFrmSelected() const;
- BOOL GetFlyFrmAttr( SfxItemSet &rSet ) const;
- BOOL SetFlyFrmAttr( SfxItemSet &rSet );
- BOOL ResetFlyFrmAttr( USHORT nWhich, const SfxItemSet* pSet = 0 );
- const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, BOOL bAnchValid = FALSE,
+ sal_Bool IsFrmSelected() const;
+ sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
+ sal_Bool SetFlyFrmAttr( SfxItemSet &rSet );
+ sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
+ const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid = sal_False,
SwFrmFmt *pParent = 0 );
void SetFlyPos( const Point &rAbsPos);
- Point FindAnchorPos( const Point &rAbsPos, BOOL bMoveIt = FALSE );
+ Point FindAnchorPos( const Point &rAbsPos, sal_Bool bMoveIt = sal_False );
// determines whether a frame or its environment is vertically formatted and right-to-left
- BOOL IsFrmVertical(BOOL bEnvironment, BOOL& bRightToLeft) const;
+ sal_Bool IsFrmVertical(sal_Bool bEnvironment, sal_Bool& bRightToLeft) const;
SwFrmFmt* GetCurFrmFmt() const; //Wenn Rahmen, dann Rahmenvorlage, sonst 0
- void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen
+ void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point* pDocPos = 0 ); //Wenn Rahmen, dann Rahmenvorlage setzen
const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
// finde/loeschen den Fly, in dem der Cursor steht
SwFrmFmt* WizzardGetFly();
//Selebstaendiges selektieren von Flys
- BOOL GotoNextFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
- { return GotoObj( TRUE, eType ); }
- BOOL GotoPrevFly( USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY)
- { return GotoObj( FALSE, eType); }
+ sal_Bool GotoNextFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY )
+ { return GotoObj( sal_True, eType ); }
+ sal_Bool GotoPrevFly( sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_FLY_ANY)
+ { return GotoObj( sal_False, eType); }
//iterieren ueber Flys - fuer Basic-Collections
- USHORT GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const;
- const SwFrmFmt* GetFlyNum(USHORT nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const;
+ sal_uInt16 GetFlyCount( FlyCntType eType = FLYCNTTYPE_ALL ) const;
+ const SwFrmFmt* GetFlyNum(sal_uInt16 nIdx, FlyCntType eType = FLYCNTTYPE_ALL) const;
//Wenn ein fly selectiert ist, zieht er den Crsr in den ersten CntntFrm
const SwFrmFmt* SelFlyGrabCrsr();
@@ -429,8 +429,8 @@ public:
void MakeObjVisible( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& ) const;
// check resize of OLE-Object
- BOOL IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; }
- void SetCheckForOLEInCaption( BOOL bFlag ) { bCheckForOLEInCaption = bFlag; }
+ sal_Bool IsCheckForOLEInCaption() const { return bCheckForOLEInCaption; }
+ void SetCheckForOLEInCaption( sal_Bool bFlag ) { bCheckForOLEInCaption = bFlag; }
// setze am selektierten FlyFrame einen Namen
void SetFlyName( const String& rName );
@@ -445,8 +445,8 @@ public:
String GetUniqueFrameName() const;
// springe zum benannten Rahmen (Grafik/OLE)
- BOOL GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
- BOOL bSelFrame = TRUE );
+ sal_Bool GotoFly( const String& rName, FlyCntType eType = FLYCNTTYPE_ALL,
+ sal_Bool bSelFrame = sal_True );
// steht an der Position eine Grafik mit einer URL ?
const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, String* pURL = 0,
String *pTargetFrameName = 0,
@@ -470,16 +470,16 @@ public:
void CheckUnboundObjects();
//Achtung: Uneindeutikeiten bei Mehrfachselektionen.
- BOOL GetObjAttr( SfxItemSet &rSet ) const;
- BOOL SetObjAttr( const SfxItemSet &rSet );
+ sal_Bool GetObjAttr( SfxItemSet &rSet ) const;
+ sal_Bool SetObjAttr( const SfxItemSet &rSet );
- const SdrObject* GetBestObject( BOOL bNext, USHORT eType = GOTOOBJ_DRAW_ANY, BOOL bFlat = TRUE, const ::svx::ISdrObjectFilter* pFilter = NULL );
- BOOL GotoObj( BOOL bNext, USHORT /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY);
+ const SdrObject* GetBestObject( sal_Bool bNext, sal_uInt16 eType = GOTOOBJ_DRAW_ANY, sal_Bool bFlat = sal_True, const ::svx::ISdrObjectFilter* pFilter = NULL );
+ sal_Bool GotoObj( sal_Bool bNext, sal_uInt16 /*GOTOOBJ_...*/ eType = GOTOOBJ_DRAW_ANY);
//Setzen vom DragMode (z.B. Rotate), tut nix bei Rahmenselektion.
- void SetDragMode( UINT16 eSdrDragMode );
+ void SetDragMode( sal_uInt16 eSdrDragMode );
- USHORT IsObjSelected() const; //Liefert gleich die Anzahl der Objekte,
+ sal_uInt16 IsObjSelected() const; //Liefert gleich die Anzahl der Objekte,
//zaehlt aber nicht die Objekte in Gruppen.
sal_Bool IsObjSelected( const SdrObject& rObj ) const;
@@ -496,22 +496,22 @@ public:
//selektiert.
//Mit BreakCreate wird der Vorgang abgebrochen, dann ist kein Objekt
//mehr selektiert.
- BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos );
- BOOL BeginCreate( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, UINT32 eObjInventor, const Point &);
+ sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Point &rPos );
+ sal_Bool BeginCreate( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, sal_uInt32 eObjInventor, const Point &);
void MoveCreate ( const Point &rPos );
- BOOL EndCreate ( UINT16 eSdrCreateCmd );
+ sal_Bool EndCreate ( sal_uInt16 eSdrCreateCmd );
void BreakCreate();
- BOOL IsDrawCreate() const;
- void CreateDefaultShape( UINT16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, USHORT nSlotId);
+ sal_Bool IsDrawCreate() const;
+ void CreateDefaultShape( sal_uInt16 /*SdrObjKind ?*/ eSdrObjectKind, const Rectangle& rRect, sal_uInt16 nSlotId);
// Funktionen f�r Rubberbox, um Draw-Objekte zu selektieren
- BOOL BeginMark( const Point &rPos );
+ sal_Bool BeginMark( const Point &rPos );
void MoveMark ( const Point &rPos );
- BOOL EndMark ();
+ sal_Bool EndMark ();
void BreakMark();
//Gruppe erzeugen, aufloesen, nix bei Rahmenselektion.
- BOOL IsGroupSelected(); //Kann auch eine Mischselektion sein!
+ sal_Bool IsGroupSelected(); //Kann auch eine Mischselektion sein!
void GroupSelection(); //Hinterher ist die Gruppe selektiert.
void UnGroupSelection(); //Die Einzelobjekte sind Selektiert
//Es koennen noch immer Gruppen dabei sein.
@@ -519,25 +519,25 @@ public:
// OD 27.06.2003 #108784# - change return type.
bool IsGroupAllowed() const;
- void MirrorSelection( BOOL bHorizontal ); //Bei FALSE Vertikal
+ void MirrorSelection( sal_Bool bHorizontal ); //Bei sal_False Vertikal
//frmatr.hxx. Hier kein enum wg. Abhaengigkeiten
- //Der BOOL ist nur fuer internen Gebrauch! Anker wird nur - anhand der
+ //Der sal_Bool ist nur fuer internen Gebrauch! Anker wird nur - anhand der
//aktuellen Dokumentposition - neu gesetzt aber nicht umgesetzt.
- void ChgAnchor( int eAnchorId, BOOL bSameOnly = FALSE,
- BOOL bPosCorr = TRUE );
+ void ChgAnchor( int eAnchorId, sal_Bool bSameOnly = sal_False,
+ sal_Bool bPosCorr = sal_True );
- BOOL SetDrawingAttr( SfxItemSet &rSet );
+ sal_Bool SetDrawingAttr( SfxItemSet &rSet );
// hole die selectierten DrawObj als Grafik (MetaFile/Bitmap)
// Return-Wert besagt ob konvertiert wurde!!
- BOOL GetDrawObjGraphic( ULONG nFmt, Graphic& rGrf ) const;
+ sal_Bool GetDrawObjGraphic( sal_uLong nFmt, Graphic& rGrf ) const;
- void Paste( SvStream& rStm, USHORT nAction, const Point* pPt = 0 );
- BOOL Paste( const Graphic &rGrf );
- BOOL Paste( SotDataObject& rObj, const Point& rPt );
+ void Paste( SvStream& rStm, sal_uInt16 nAction, const Point* pPt = 0 );
+ sal_Bool Paste( const Graphic &rGrf );
+ sal_Bool Paste( SotDataObject& rObj, const Point& rPt );
- BOOL IsAlignPossible() const;
+ sal_Bool IsAlignPossible() const;
void SetCalcFieldValueHdl(Outliner* pOutliner);
void Insert(const String& rGrfName,
@@ -551,7 +551,7 @@ public:
void InsertDrawObj( SdrObject& rDrawObj,
const Point& rInsertPosition );
- BOOL ReplaceSdrObj( const String& rGrfName, const String& rFltName,
+ sal_Bool ReplaceSdrObj( const String& rGrfName, const String& rFltName,
const Graphic* pGrf = 0 );
// --> #i972#
@@ -566,26 +566,26 @@ public:
//------------------------------------------
//Auskunft ueber naechstliegenden Inhalt zum uebergebenen Point
- Point GetCntntPos( const Point& rPoint, BOOL bNext ) const;
+ Point GetCntntPos( const Point& rPoint, sal_Bool bNext ) const;
//convert document position into position relative to the current page
Point GetRelativePagePosition(const Point& rDocPos);
//Layout-Selektion Hiden/Zeigen und aufruf an die CrsrSh weiterreichen.
void ShLooseFcs();
- void ShGetFcs( BOOL bUpdate = TRUE );
+ void ShGetFcs( sal_Bool bUpdate = sal_True );
//PageDescriptor-Schnittstelle
void ChgCurPageDesc( const SwPageDesc& );
- USHORT GetCurPageDesc( const BOOL bCalcFrm = TRUE ) const;
- USHORT GetMousePageDesc( const Point &rPt ) const;
- USHORT GetPageDescCnt() const;
+ sal_uInt16 GetCurPageDesc( const sal_Bool bCalcFrm = sal_True ) const;
+ sal_uInt16 GetMousePageDesc( const Point &rPt ) const;
+ sal_uInt16 GetPageDescCnt() const;
SwPageDesc* FindPageDescByName( const String& rName,
- BOOL bGetFromPool = FALSE,
- USHORT* pPos = 0 );
+ sal_Bool bGetFromPool = sal_False,
+ sal_uInt16* pPos = 0 );
- const SwPageDesc& GetPageDesc( USHORT i ) const;
- void ChgPageDesc( USHORT i, const SwPageDesc& );
+ const SwPageDesc& GetPageDesc( sal_uInt16 i ) const;
+ void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
// if inside all selection only one PageDesc, return this.
// Otherwise return 0 pointer
const SwPageDesc* GetSelectedPageDescs() const;
@@ -597,37 +597,37 @@ public:
//Seitennummer der Seite in der der Point liegt, 0 wenn keine
//getroffen ist.
- USHORT GetPageNumber( const Point &rPoint ) const;
- BOOL GetPageNumber( long nYPos, BOOL bAtCrsrPos, USHORT& rPhyNum, USHORT& rVirtNum, String &rDisplay ) const;
+ sal_uInt16 GetPageNumber( const Point &rPoint ) const;
+ sal_Bool GetPageNumber( long nYPos, sal_Bool bAtCrsrPos, sal_uInt16& rPhyNum, sal_uInt16& rVirtNum, String &rDisplay ) const;
SwFlyFrmFmt* InsertObject( const svt::EmbeddedObjectRef&,
const SfxItemSet* pFlyAttrSet = 0,
const SfxItemSet* pGrfAttrSet = 0,
SwFrmFmt* = 0 );
- BOOL FinishOLEObj(); // Server wird beendet
+ sal_Bool FinishOLEObj(); // Server wird beendet
//Attribute der Tabelle besorgen/setzen.
void GetTblAttr( SfxItemSet & ) const;
void SetTblAttr( const SfxItemSet & );
//Tabelle vollstaendig selektiert?
- BOOL HasWholeTabSelection() const;
+ sal_Bool HasWholeTabSelection() const;
//Ist der Inhalt einer Tabellenzelle oder mindestens eine Tabellenzelle
//vollstaendig selektiert ist
- BOOL HasBoxSelection() const;
+ sal_Bool HasBoxSelection() const;
- BOOL InsertRow( USHORT nCnt, BOOL bBehind );
- BOOL InsertCol( USHORT nCnt, BOOL bBehind ); // 0 == am Ende
- BOOL DeleteCol();
- BOOL DeleteRow();
+ sal_Bool InsertRow( sal_uInt16 nCnt, sal_Bool bBehind );
+ sal_Bool InsertCol( sal_uInt16 nCnt, sal_Bool bBehind ); // 0 == am Ende
+ sal_Bool DeleteCol();
+ sal_Bool DeleteRow();
- BOOL DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle.
+ sal_Bool DeleteTblSel(); //Aktuelle Selektion, ggf. die ganze Tabelle.
- USHORT MergeTab(); //Merged selektierte Tabellenteile zusammen
+ sal_uInt16 MergeTab(); //Merged selektierte Tabellenteile zusammen
//Fehler ueber enum zurueck
// Zelle Vertikal oder Horizontal splitten.
- BOOL SplitTab( BOOL nVert = TRUE, USHORT nCnt = 1, BOOL bSameHeight = FALSE );
- BOOL Sort(const SwSortOptions&); //Sortieren.
+ sal_Bool SplitTab( sal_Bool nVert = sal_True, sal_uInt16 nCnt = 1, sal_Bool bSameHeight = sal_False );
+ sal_Bool Sort(const SwSortOptions&); //Sortieren.
void SetRowHeight( const SwFmtFrmSize &rSz );
//Der Pointer muss vom Aufrufer zerstoert werden wenn != 0
@@ -636,34 +636,34 @@ public:
void SetRowSplit( const SwFmtRowSplit &rSz );
void GetRowSplit( SwFmtRowSplit *&rpSz ) const;
- void SetBoxAlign( USHORT nOrient );
- USHORT GetBoxAlign() const; //USHRT_MAX fuer uneindeutig!
+ void SetBoxAlign( sal_uInt16 nOrient );
+ sal_uInt16 GetBoxAlign() const; //USHRT_MAX fuer uneindeutig!
//Ausgleichen der Zeilenhoehen. Mit bTstOnly festellen ob mehr als eine
//Zeile markiert ist.
- BOOL BalanceRowHeight( BOOL bTstOnly );
+ sal_Bool BalanceRowHeight( sal_Bool bTstOnly );
void SetTabBorders( const SfxItemSet& rSet );
void GetTabBorders( SfxItemSet& rSet) const;
- void SetTabLineStyle(const Color* pColor, BOOL bSetLine = FALSE, const SvxBorderLine* pBorderLine = NULL);
+ void SetTabLineStyle(const Color* pColor, sal_Bool bSetLine = sal_False, const SvxBorderLine* pBorderLine = NULL);
void SetTabBackground( const SvxBrushItem &rNew );
void GetTabBackground( SvxBrushItem &rToFill ) const;
void SetBoxBackground( const SvxBrushItem &rNew );
- BOOL GetBoxBackground( SvxBrushItem &rToFill ) const; //FALSE uneindeutig
+ sal_Bool GetBoxBackground( SvxBrushItem &rToFill ) const; //sal_False uneindeutig
void SetBoxDirection( const SvxFrameDirectionItem& rNew );
- BOOL GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE uneindeutig
+ sal_Bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //sal_False uneindeutig
void SetRowBackground( const SvxBrushItem &rNew );
- BOOL GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE uneindeutig
+ sal_Bool GetRowBackground( SvxBrushItem &rToFill ) const; //sal_False uneindeutig
- BYTE WhichMouseTabCol( const Point &rPt ) const;
+ sal_uInt8 WhichMouseTabCol( const Point &rPt ) const;
void GetTabCols( SwTabCols &rToFill ) const; //Spalten- und Randinfo.
- void SetTabCols( const SwTabCols &rNew, BOOL bCurRowOnly = TRUE );
+ void SetTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly = sal_True );
void GetMouseTabCols( SwTabCols &rToFill, const Point &rPt ) const;
- void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
+ void SetMouseTabCols( const SwTabCols &rNew, sal_Bool bCurRowOnly,
const Point &rPt );
// --> FME 2004-07-30 #i20126# Enhanced table selection
@@ -673,82 +673,82 @@ public:
// #i24134# adjustment of table rows via Ruler
void GetTabRows( SwTabCols &rToFill ) const;
- void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly );
+ void SetTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly );
void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
- void SetMouseTabRows( const SwTabCols &rNew, BOOL bCurColOnly, const Point &rPt );
+ void SetMouseTabRows( const SwTabCols &rNew, sal_Bool bCurColOnly, const Point &rPt );
void ProtectCells(); //Falls eine Tabselektion besteht, wird sie ver-
// nichtet, wenn der Cursor nicht in Readonly darf
void UnProtectCells(); // auf die Tabellenselektin
void UnProtectTbls(); //bei allen Tabellen in der Selektion den Schutz aufheben
- BOOL HasTblAnyProtection( const String* pTblName = 0,
- BOOL* pFullTblProtection = 0 );
- BOOL CanUnProtectCells() const;
+ sal_Bool HasTblAnyProtection( const String* pTblName = 0,
+ sal_Bool* pFullTblProtection = 0 );
+ sal_Bool CanUnProtectCells() const;
- USHORT GetRowsToRepeat() const;
- void SetRowsToRepeat( USHORT nNumOfRows );
- USHORT GetVirtPageNum( const BOOL bCalcFrm = TRUE );
+ sal_uInt16 GetRowsToRepeat() const;
+ void SetRowsToRepeat( sal_uInt16 nNumOfRows );
+ sal_uInt16 GetVirtPageNum( const sal_Bool bCalcFrm = sal_True );
//returns the number of table rows currently selected
//if the selection start at the top of the table
- USHORT GetRowSelectionFromTop() const;
+ sal_uInt16 GetRowSelectionFromTop() const;
- BOOL IsInRepeatedHeadline() const { return CheckHeadline( true ); }
- BOOL IsInHeadline() const { return CheckHeadline( false ); }
+ sal_Bool IsInRepeatedHeadline() const { return CheckHeadline( true ); }
+ sal_Bool IsInHeadline() const { return CheckHeadline( false ); }
//Stellt die Breiten der Zellen so ein, dass der Inhalt moeglichst
//nicht umgebrochen werden muss.
//bBalance sorgt fuer einen Ausgleich der markierten Spalten.
- void AdjustCellWidth( BOOL bBalance = FALSE );
+ void AdjustCellWidth( sal_Bool bBalance = sal_False );
//Nicht erlaubt, wenn nur leere Zellen selektiert sind.
- BOOL IsAdjustCellWidthAllowed( BOOL bBalance = FALSE ) const;
+ sal_Bool IsAdjustCellWidthAllowed( sal_Bool bBalance = sal_False ) const;
//Ausgleich der Zellenbreiten, mit bTstOnly feststellen, ob mehr als
//eine Zelle markiert ist.
- BOOL BalanceCellWidth( BOOL bTstOnly );
+ sal_Bool BalanceCellWidth( sal_Bool bTstOnly );
// AutoFormat fuer die Tabelle/TabellenSelection
- BOOL SetTableAutoFmt( const SwTableAutoFmt& rNew );
+ sal_Bool SetTableAutoFmt( const SwTableAutoFmt& rNew );
// Erfrage wie attributiert ist
- BOOL GetTableAutoFmt( SwTableAutoFmt& rGet );
+ sal_Bool GetTableAutoFmt( SwTableAutoFmt& rGet );
// aender eine Zellenbreite/-Hoehe/Spaltenbreite/Zeilenhoehe
- BOOL SetColRowWidthHeight( USHORT eType, USHORT nDiff = 283 );
+ sal_Bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 );
// Autosumme
- BOOL GetAutoSum( String& rFml ) const;
+ sal_Bool GetAutoSum( String& rFml ) const;
//Phy: Tatsaechliche Seitenanzahl.
//Virt: Vom User evtl. gesetzten Offset mit einbeziehen.
- USHORT GetPhyPageNum();
+ sal_uInt16 GetPhyPageNum();
// Setzt an der aktuellen Postion einen neuen Page Offset
- void SetNewPageOffset( USHORT nOffset );
- void SetPageOffset( USHORT nOffset ); //Aendert den letzten Page Offset
- USHORT GetPageOffset() const; //Liefert den letzten Page Offset
+ void SetNewPageOffset( sal_uInt16 nOffset );
+ void SetPageOffset( sal_uInt16 nOffset ); //Aendert den letzten Page Offset
+ sal_uInt16 GetPageOffset() const; //Liefert den letzten Page Offset
//SS fuer Beschriftungen
void InsertLabel( const SwLabelType eType, const String &rTxt, const String& rSeparator,
const String& rNumberSeparator,
- const BOOL bBefore, const USHORT nId,
+ const sal_Bool bBefore, const sal_uInt16 nId,
const String& rCharacterStyle,
- const BOOL bCpyBrd = TRUE );
+ const sal_Bool bCpyBrd = sal_True );
//Das Lineal will auch noch etwas von uns wissen.
- USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte
- USHORT GetCurMouseColNum( const Point &rPt,
+ sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == in keiner Spalte
+ sal_uInt16 GetCurMouseColNum( const Point &rPt,
SwGetCurColNumPara* pPara = 0 ) const;
- USHORT GetCurTabColNum() const; //0 == in keiner Tabelle
- USHORT GetCurMouseTabColNum( const Point &rPt ) const;
- USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte
+ sal_uInt16 GetCurTabColNum() const; //0 == in keiner Tabelle
+ sal_uInt16 GetCurMouseTabColNum( const Point &rPt ) const;
+ sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // aktuelle aeussere Spalte
- BOOL IsTableRightToLeft() const;
- BOOL IsMouseTableRightToLeft( const Point &rPt ) const;
- BOOL IsTableVertical() const;
+ sal_Bool IsTableRightToLeft() const;
+ sal_Bool IsMouseTableRightToLeft( const Point &rPt ) const;
+ sal_Bool IsTableVertical() const;
- BOOL IsLastCellInRow() const;
+ sal_Bool IsLastCellInRow() const;
// Die Breite des aktuellen Bereichs fuer Spaltendialog
long GetSectionWidth( SwFmt& rFmt ) const;
void GetConnectableFrmFmts
- (SwFrmFmt & rFmt, const String & rReference, BOOL bSuccessors,
+ (SwFrmFmt & rFmt, const String & rReference, sal_Bool bSuccessors,
::std::vector< String > & aPrevPageVec,
::std::vector< String > & aThisPageVec,
::std::vector< String > & aNextPageVec,
@@ -787,7 +787,7 @@ public:
// -> #i23726#
SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
- BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
+ sal_Bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
// <- #i23726#
// --> OD 2005-02-21 #i42921#
bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index fd570f623eaf..fc375b3401c3 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -193,7 +193,7 @@ enum SwVarFormat
};
-typedef USHORT SwGetSetExpType;
+typedef sal_uInt16 SwGetSetExpType;
namespace nsSwGetSetExpType
{
const SwGetSetExpType GSE_STRING = 0x0001; // String
@@ -203,7 +203,7 @@ namespace nsSwGetSetExpType
const SwGetSetExpType GSE_FORMULA = 0x0010; // Formel
}
-typedef USHORT SwExtendedSubType;
+typedef sal_uInt16 SwExtendedSubType;
namespace nsSwExtendedSubType
{
const SwExtendedSubType SUB_CMD = 0x0100; // Kommando anzeigen
@@ -234,17 +234,17 @@ enum SwDateTimeSubType
};
-extern USHORT __FAR_DATA aTypeTab[];
+extern sal_uInt16 __FAR_DATA aTypeTab[];
/*--------------------------------------------------------------------
Beschreibung: Allgemeine Tools
--------------------------------------------------------------------*/
-String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
+String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
-//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
-//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
-String FormatNumber(USHORT nNum, sal_uInt32 nFormat);
+//String ExpandDate(const Date& rDate, sal_uLong nFmt, sal_uInt16 nLang);
+//String ExpandTime(const Time& rTime, sal_uLong nFmt, sal_uInt16 nLang);
+String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat);
/*--------------------------------------------------------------------
Beschreibung: Instanzen von SwFields und Abgeleiteten kommen 0-n mal vor.
@@ -257,7 +257,7 @@ DBG_NAMEEX(SwFieldType)
class SW_DLLPUBLIC SwFieldType : public SwModify
{
- USHORT nWhich;
+ sal_uInt16 nWhich;
friend void _FinitUI(); // um den Pointer zu loeschen!
static SvStringsDtor* pFldNames;
@@ -266,22 +266,22 @@ class SW_DLLPUBLIC SwFieldType : public SwModify
protected:
// single argument ctors shall be explicit.
- explicit SwFieldType( USHORT nWhichId );
+ explicit SwFieldType( sal_uInt16 nWhichId );
public:
#ifdef DBG_UTIL
virtual ~SwFieldType();
#endif
- static const String& GetTypeStr( USHORT nTypeId );
+ static const String& GetTypeStr( sal_uInt16 nTypeId );
// nur in abgeleiteten Klassen
virtual const String& GetName() const;
virtual SwFieldType* Copy() const = 0;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
- USHORT Which() const { return nWhich; }
+ sal_uInt16 Which() const { return nWhich; }
inline void UpdateFlds() const;
};
@@ -302,8 +302,8 @@ class SW_DLLPUBLIC SwField
{
private:
mutable String m_Cache; /// #i85766# cached expansion (for clipboard)
- USHORT nLang; // Immer ueber SetLanguage aendern!
- BOOL bIsAutomaticLanguage;
+ sal_uInt16 nLang; // Immer ueber SetLanguage aendern!
+ sal_Bool bIsAutomaticLanguage;
sal_uInt32 nFormat;
SwFieldType* pType;
@@ -314,7 +314,7 @@ private:
protected:
void SetFormat(sal_uInt32 nSet) {nFormat = nSet;}
- SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM);
+ SwField(SwFieldType* pTyp, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM);
public:
virtual ~SwField();
@@ -340,7 +340,7 @@ public:
SwField * CopyField() const;
// ResId
- USHORT Which() const
+ sal_uInt16 Which() const
#ifndef DBG_UTIL
{ return pType->Which(); }
#else
@@ -348,13 +348,13 @@ public:
#endif
// TYP_ID
- USHORT GetTypeId() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT);
+ sal_uInt16 GetTypeId() const;
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16);
// Sprache an der Feldposition
- inline USHORT GetLanguage() const;
- virtual void SetLanguage(USHORT nLng);
+ inline sal_uInt16 GetLanguage() const;
+ virtual void SetLanguage(sal_uInt16 nLng);
// Parameter fuer Dialog und BASIC erfragen
inline sal_uInt32 GetFormat() const;
@@ -367,15 +367,15 @@ public:
virtual void SetPar1(const String& rStr);
virtual void SetPar2(const String& rStr);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
// hat das Feld eine Action auf dem ClickHandler ? (z.B. INetFelder,..)
- BOOL HasClickHdl() const;
+ sal_Bool HasClickHdl() const;
// ist es ein Fix-Feld?
- BOOL IsFixed() const;
+ sal_Bool IsFixed() const;
- BOOL IsAutomaticLanguage() const { return bIsAutomaticLanguage;}
- void SetAutomaticLanguage(BOOL bSet){bIsAutomaticLanguage = bSet;}
+ sal_Bool IsAutomaticLanguage() const { return bIsAutomaticLanguage;}
+ void SetAutomaticLanguage(sal_Bool bSet){bIsAutomaticLanguage = bSet;}
virtual String GetDescription() const;
};
@@ -386,7 +386,7 @@ inline SwFieldType* SwField::GetTyp() const
inline sal_uInt32 SwField::GetFormat() const
{ return nFormat; }
-inline USHORT SwField::GetLanguage() const
+inline sal_uInt16 SwField::GetLanguage() const
{ return nLang; }
/*--------------------------------------------------------------------
@@ -397,20 +397,20 @@ inline USHORT SwField::GetLanguage() const
class SwValueFieldType : public SwFieldType
{
SwDoc* pDoc;
- BOOL bUseFormat; // Numberformatter verwenden
+ sal_Bool bUseFormat; // Numberformatter verwenden
protected:
- SwValueFieldType( SwDoc* pDocPtr, USHORT nWhichId );
+ SwValueFieldType( SwDoc* pDocPtr, sal_uInt16 nWhichId );
SwValueFieldType( const SwValueFieldType& rTyp );
public:
inline SwDoc* GetDoc() const { return pDoc; }
inline void SetDoc(SwDoc* pNewDoc) { pDoc = pNewDoc; }
- inline BOOL UseFormat() const { return bUseFormat; }
- inline void EnableFormat(BOOL bFormat = TRUE) { bUseFormat = bFormat; }
+ inline sal_Bool UseFormat() const { return bUseFormat; }
+ inline void EnableFormat(sal_Bool bFormat = sal_True) { bUseFormat = bFormat; }
- String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const;
+ String ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const;
void DoubleToString(String &rValue, const double &rVal, LanguageType eLng) const;
void DoubleToString(String &rValue, const double &rVal, sal_uInt32 nFmt) const;
};
@@ -421,23 +421,23 @@ class SW_DLLPUBLIC SwValueField : public SwField
// String sExpand;
protected:
- SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
+ SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, sal_uInt16 nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
SwValueField( const SwValueField& rFld );
public:
virtual ~SwValueField();
virtual SwFieldType* ChgTyp( SwFieldType* );
- virtual void SetLanguage(USHORT nLng);
+ virtual void SetLanguage(sal_uInt16 nLng);
// os: wozu war das denn da?
-// virtual void ChangeFormat(ULONG n);
+// virtual void ChangeFormat(sal_uLong n);
inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
virtual double GetValue() const;
virtual void SetValue( const double& rVal );
- inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, USHORT nLng=0) const
+ inline String ExpandValue(const double& rVal, sal_uInt32 nFmt, sal_uInt16 nLng=0) const
{ return ((SwValueFieldType*)GetTyp())->ExpandValue(rVal, nFmt, nLng); }
static sal_uInt32 GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt32 nFmt);
diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx
index 1196f0f1264d..b5f7292d32ba 100644
--- a/sw/inc/flddat.hxx
+++ b/sw/inc/flddat.hxx
@@ -112,37 +112,37 @@ public:
class SW_DLLPUBLIC SwDateTimeField : public SwValueField
{
- USHORT nSubType;
+ sal_uInt16 nSubType;
long nOffset; // Offset in Minuten
virtual String Expand() const;
virtual SwField* Copy() const;
public:
- SwDateTimeField(SwDateTimeFieldType* pType, USHORT nSubType = DATEFLD,
- ULONG nFmt = 0, USHORT nLng = 0);
+ SwDateTimeField(SwDateTimeFieldType* pType, sal_uInt16 nSubType = DATEFLD,
+ sal_uLong nFmt = 0, sal_uInt16 nLng = 0);
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nSub);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nSub);
virtual double GetValue() const;
virtual void SetPar2(const String& rStr);
virtual String GetPar2() const;
- inline BOOL IsDate() const
+ inline sal_Bool IsDate() const
{ return (nSubType & DATEFLD) != 0; }
inline void SetOffset(long nMinutes) { nOffset = nMinutes; }
inline long GetOffset() const { return nOffset; }
- Date GetDate(BOOL bUseOffset = FALSE) const;
- Time GetTime(BOOL bUseOffset = FALSE) const;
+ Date GetDate(sal_Bool bUseOffset = sal_False) const;
+ Time GetTime(sal_Bool bUseOffset = sal_False) const;
void SetDateTime(const DateTime& rDT);
static double GetDateTime(SwDoc* pDoc, const DateTime& rDT);
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, USHORT nMId ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, USHORT nMId );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId );
};
#endif // SW_FLDDAT_HXX
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index e3e40a82b940..b18a8fa22b9b 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -220,10 +220,10 @@ public:
@param rItem the item to be set
- @retval TRUE the selected item was successfully set
- @retval TRUE failure (empty selection)
+ @retval sal_True the selected item was successfully set
+ @retval sal_True failure (empty selection)
*/
- BOOL SetSelectedItem(const String & rItem);
+ sal_Bool SetSelectedItem(const String & rItem);
/**
Sets the name of the field.
@@ -256,7 +256,7 @@ public:
- FIELD_PROP_PAR3 Get the help text of the field.
- FIELD_PROP_PAR4 Get the tool tip of the field.
*/
- virtual BOOL QueryValue(com::sun::star::uno::Any &rVal, USHORT nWhichId) const;
+ virtual sal_Bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const;
/**
API: Sets a property value on the dropdown field.
@@ -268,7 +268,7 @@ public:
- FIELD_PROP_PAR3 Set the help text of the field.
- FIELD_PROP_PAR4 Set the tool tip of the field.
*/
- virtual BOOL PutValue(const com::sun::star::uno::Any &rVal, USHORT nWhichId);
+ virtual sal_Bool PutValue(const com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId);
};
#endif
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index c2ebb0d81950..488e49ad2f9e 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -40,18 +40,18 @@ class SW_DLLPUBLIC SwPosFlyFrm
const SwFrmFmt* pFrmFmt; // das FlyFrmFmt
// SwPosition* pPos; // Position in den ContentNode
SwNodeIndex* pNdIdx; // es reicht ein Index auf den Node
- UINT32 nOrdNum;
+ sal_uInt32 nOrdNum;
public:
- SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos );
+ SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos );
virtual ~SwPosFlyFrm(); // virtual fuer die Writer (DLL !!)
// operatoren fuer das Sort-Array
- BOOL operator==( const SwPosFlyFrm& );
- BOOL operator<( const SwPosFlyFrm& );
+ sal_Bool operator==( const SwPosFlyFrm& );
+ sal_Bool operator<( const SwPosFlyFrm& );
const SwFrmFmt& GetFmt() const { return *pFrmFmt; }
const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- UINT32 GetOrdNum() const { return nOrdNum; }
+ sal_uInt32 GetOrdNum() const { return nOrdNum; }
};
typedef SwPosFlyFrm* SwPosFlyFrmPtr;
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 3b505952e4d9..3c91bad86b60 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -35,7 +35,7 @@
struct SwPosition;
class IntlWrapper;
-#define IVER_FMTANCHOR_LONGIDX ((USHORT)1)
+#define IVER_FMTANCHOR_LONGIDX ((sal_uInt16)1)
//FlyAnchor, Anker des Freifliegenden Rahmen ----
@@ -45,14 +45,14 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
//Index fuer Absatzgebundene Rahmen.
//Position fuer Zeichengebundene Rahmen
RndStdIds nAnchorId;
- USHORT nPageNum; //Seitennummer bei Seitengeb. Rahmen.
+ sal_uInt16 nPageNum; //Seitennummer bei Seitengeb. Rahmen.
// OD 2004-05-05 #i28701# - getting anchor positions ordered
sal_uInt32 mnOrder;
static sal_uInt32 mnOrderCounter;
public:
- SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, USHORT nPageNum = 0 );
+ SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, sal_uInt16 nPageNum = 0 );
SwFmtAnchor( const SwFmtAnchor &rCpy );
~SwFmtAnchor();
@@ -68,24 +68,24 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
RndStdIds GetAnchorId() const { return nAnchorId; }
- USHORT GetPageNum() const { return nPageNum; }
+ sal_uInt16 GetPageNum() const { return nPageNum; }
const SwPosition *GetCntntAnchor() const { return pCntntAnchor; }
// OD 2004-05-05 #i28701#
sal_uInt32 GetOrder() const;
void SetType( RndStdIds nRndId ) { nAnchorId = nRndId; }
- void SetPageNum( USHORT nNew ) { nPageNum = nNew; }
+ void SetPageNum( sal_uInt16 nNew ) { nPageNum = nNew; }
void SetAnchor( const SwPosition *pPos );
};
-inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
+inline const SwFmtAnchor &SwAttrSet::GetAnchor(sal_Bool bInP) const
{ return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
- inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
+ inline const SwFmtAnchor &SwFmt::GetAnchor(sal_Bool bInP) const
{ return aSet.GetAnchor(bInP); }
#endif
diff --git a/sw/inc/fmtautofmt.hxx b/sw/inc/fmtautofmt.hxx
index a230943f2ab0..ce16b775b82d 100644
--- a/sw/inc/fmtautofmt.hxx
+++ b/sw/inc/fmtautofmt.hxx
@@ -40,7 +40,7 @@ class SwFmtAutoFmt: public SfxPoolItem
boost::shared_ptr<SfxItemSet> mpHandle;
public:
- SwFmtAutoFmt( USHORT nWhich = RES_TXTATR_AUTOFMT );
+ SwFmtAutoFmt( sal_uInt16 nWhich = RES_TXTATR_AUTOFMT );
// single argument ctors shall be explicit.
virtual ~SwFmtAutoFmt();
@@ -63,8 +63,8 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
void SetStyleHandle( boost::shared_ptr<SfxItemSet> pHandle ) { mpHandle = pHandle; }
const boost::shared_ptr<SfxItemSet> GetStyleHandle() const { return mpHandle; }
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 63dbe1f57dc6..8feb5293c141 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -36,7 +36,7 @@
class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem
{
public:
- SwFmtNoBalancedColumns( BOOL bFlag = FALSE )
+ SwFmtNoBalancedColumns( sal_Bool bFlag = sal_False )
: SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {}
// "pure virtual Methoden" vom SfxPoolItem
@@ -44,10 +44,10 @@ public:
};
-inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(BOOL bInP) const
+inline const SwFmtNoBalancedColumns &SwAttrSet::GetBalancedColumns(sal_Bool bInP) const
{ return (const SwFmtNoBalancedColumns&)Get( RES_COLUMNBALANCE, bInP ); }
-inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(BOOL bInP) const
+inline const SwFmtNoBalancedColumns &SwFmt::GetBalancedColumns(sal_Bool bInP) const
{ return aSet.GetBalancedColumns( bInP ); }
#endif
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 1efcd900f358..8a649ed5b80f 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -37,31 +37,31 @@
class SwColumn
{
- USHORT nWish; //Wunschbreite incl. Raender.
+ sal_uInt16 nWish; //Wunschbreite incl. Raender.
//Verhaelt sich proportional zum Verhaeltniss:
//Wunschbreite der Umgebung / aktuelle Breite der Spalte
- USHORT nUpper; //Oberer Rand
- USHORT nLower; //Unterer Rand
- USHORT nLeft; //Linker Rand
- USHORT nRight; //Rechter Rand
+ sal_uInt16 nUpper; //Oberer Rand
+ sal_uInt16 nLower; //Unterer Rand
+ sal_uInt16 nLeft; //Linker Rand
+ sal_uInt16 nRight; //Rechter Rand
public:
SwColumn();
- BOOL operator==( const SwColumn & );
+ sal_Bool operator==( const SwColumn & );
- void SetWishWidth( USHORT nNew ) { nWish = nNew; }
- void SetUpper( USHORT nNew ) { nUpper = nNew; }
- void SetLower( USHORT nNew ) { nLower = nNew; }
- void SetLeft ( USHORT nNew ) { nLeft = nNew; }
- void SetRight( USHORT nNew ) { nRight = nNew; }
+ void SetWishWidth( sal_uInt16 nNew ) { nWish = nNew; }
+ void SetUpper( sal_uInt16 nNew ) { nUpper = nNew; }
+ void SetLower( sal_uInt16 nNew ) { nLower = nNew; }
+ void SetLeft ( sal_uInt16 nNew ) { nLeft = nNew; }
+ void SetRight( sal_uInt16 nNew ) { nRight = nNew; }
- USHORT GetWishWidth() const { return nWish; }
- USHORT GetUpper() const { return nUpper; }
- USHORT GetLower() const { return nLower; }
- USHORT GetLeft () const { return nLeft; }
- USHORT GetRight() const { return nRight; }
+ sal_uInt16 GetWishWidth() const { return nWish; }
+ sal_uInt16 GetUpper() const { return nUpper; }
+ sal_uInt16 GetLower() const { return nLower; }
+ sal_uInt16 GetLeft () const { return nLeft; }
+ sal_uInt16 GetRight() const { return nRight; }
};
typedef SwColumn* SwColumnPtr;
@@ -78,17 +78,17 @@ enum SwColLineAdj
class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
{
// Pen aPen; //Pen fuer die Linine zwischen den Spalten
- ULONG nLineWidth; //width of the separator line
+ sal_uLong nLineWidth; //width of the separator line
Color aLineColor; //color of the separator line
- BYTE nLineHeight; //Prozentuale Hoehe der Linien
+ sal_uInt8 nLineHeight; //Prozentuale Hoehe der Linien
//(Relativ zu der Hoehe der Spalten incl. UL).
SwColLineAdj eAdj; //Linie wird oben, mittig oder unten ausgerichtet.
SwColumns aColumns; //Informationen fuer die einzelnen Spalten.
- USHORT nWidth; //Gesamtwunschbreite aller Spalten.
+ sal_uInt16 nWidth; //Gesamtwunschbreite aller Spalten.
- BOOL bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen
+ sal_Bool bOrtho; //Nur wenn dieses Flag gesetzt ist wird beim setzen
//der GutterWidth eine 'optische Verteilung'
//vorgenommen.
//Es muss zurueckgesetzt werden wenn an den
@@ -97,7 +97,7 @@ class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem
//gemischt (optisch verteilt).
//Das Flag ist initial gesetzt.
- SW_DLLPRIVATE void Calc( USHORT nGutterWidth, USHORT nAct );
+ SW_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct );
public:
SwFmtCol();
@@ -115,64 +115,64 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
const SwColumns &GetColumns() const { return aColumns; }
SwColumns &GetColumns() { return aColumns; }
- USHORT GetNumCols() const { return aColumns.Count(); }
+ sal_uInt16 GetNumCols() const { return aColumns.Count(); }
// const Pen& GetLinePen() const { return aPen; }
- ULONG GetLineWidth() const { return nLineWidth;}
+ sal_uLong GetLineWidth() const { return nLineWidth;}
const Color& GetLineColor() const { return aLineColor;}
SwColLineAdj GetLineAdj() const { return eAdj; }
- BOOL IsOrtho() const { return bOrtho; }
- USHORT GetWishWidth() const { return nWidth; }
- BYTE GetLineHeight()const { return nLineHeight; }
+ sal_Bool IsOrtho() const { return bOrtho; }
+ sal_uInt16 GetWishWidth() const { return nWidth; }
+ sal_uInt8 GetLineHeight()const { return nLineHeight; }
//Return USHRT_MAX wenn uneindeutig.
//Return die kleinste Breite wenn bMin True ist.
- USHORT GetGutterWidth( BOOL bMin = FALSE ) const;
+ sal_uInt16 GetGutterWidth( sal_Bool bMin = sal_False ) const;
// void SetLinePen( const Pen& rNew ) { aPen = rNew; }
- void SetLineWidth(ULONG nLWidth) { nLineWidth = nLWidth;}
+ void SetLineWidth(sal_uLong nLWidth) { nLineWidth = nLWidth;}
void SetLineColor(const Color& rCol ) { aLineColor = rCol;}
- void SetLineHeight( BYTE nNew ) { nLineHeight = nNew; }
+ void SetLineHeight( sal_uInt8 nNew ) { nLineHeight = nNew; }
void SetLineAdj( SwColLineAdj eNew ){ eAdj = eNew; }
- void SetWishWidth( USHORT nNew ) { nWidth = nNew; }
+ void SetWishWidth( sal_uInt16 nNew ) { nWidth = nNew; }
//Mit dieser Funktion koennen die Spalten (immer wieder) initialisert
//werden. Das Ortho Flag wird automatisch gesetzt.
- void Init( USHORT nNumCols, USHORT nGutterWidth, USHORT nAct );
+ void Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct );
//Stellt die Raender fuer die Spalten in aColumns ein.
//Wenn das Flag bOrtho gesetzt ist, werden die Spalten neu optisch
//verteilt. Ist das Flag nicht gesetzt werden die Spaltenbreiten nicht
//veraendert und die Raender werden einfach eingestellt.
- void SetGutterWidth( USHORT nNew, USHORT nAct );
+ void SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct );
//Verteilt ebenfalls automatisch neu wenn das Flag gesetzt wird;
//nur dann wird auch der zweite Param. benoetigt und beachtet.
- void SetOrtho( BOOL bNew, USHORT nGutterWidth, USHORT nAct );
+ void SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct );
//Fuer den Reader
- void _SetOrtho( BOOL bNew ) { bOrtho = bNew; }
+ void _SetOrtho( sal_Bool bNew ) { bOrtho = bNew; }
//Berechnet die aktuelle Breite der Spalte nCol.
//Das Verhaeltniss von Wunschbreite der Spalte zum Returnwert ist
//proportional zum Verhaeltniss des Gesamtwunschwertes zu nAct.
- USHORT CalcColWidth( USHORT nCol, USHORT nAct ) const;
+ sal_uInt16 CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const;
//Wie oben, aber es wir die Breite der PrtArea - also das was fuer
//den Anwender die Spalte ist - geliefert.
- USHORT CalcPrtColWidth( USHORT nCol, USHORT nAct ) const;
+ sal_uInt16 CalcPrtColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const;
};
-inline const SwFmtCol &SwAttrSet::GetCol(BOOL bInP) const
+inline const SwFmtCol &SwAttrSet::GetCol(sal_Bool bInP) const
{ return (const SwFmtCol&)Get( RES_COL,bInP); }
-inline const SwFmtCol &SwFmt::GetCol(BOOL bInP) const
+inline const SwFmtCol &SwFmt::GetCol(sal_Bool bInP) const
{ return aSet.GetCol(bInP); }
#endif
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index 55e2212985c0..28252ff1c99c 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -59,7 +59,7 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
SwFlyFrmFmt* GetPrev() const { return (SwFlyFrmFmt*)aPrev.GetRegisteredIn(); }
SwFlyFrmFmt* GetNext() const { return (SwFlyFrmFmt*)aNext.GetRegisteredIn(); }
@@ -77,10 +77,10 @@ SwFmtChain &SwFmtChain::operator=( const SwFmtChain &rCpy )
}
-inline const SwFmtChain &SwAttrSet::GetChain(BOOL bInP) const
+inline const SwFmtChain &SwAttrSet::GetChain(sal_Bool bInP) const
{ return (const SwFmtChain&)Get( RES_CHAIN,bInP); }
-inline const SwFmtChain &SwFmt::GetChain(BOOL bInP) const
+inline const SwFmtChain &SwFmt::GetChain(sal_Bool bInP) const
{ return aSet.GetChain(bInP); }
#endif
diff --git a/sw/inc/fmtcntnt.hxx b/sw/inc/fmtcntnt.hxx
index 0f8449cac766..af4e8a3f3b8f 100644
--- a/sw/inc/fmtcntnt.hxx
+++ b/sw/inc/fmtcntnt.hxx
@@ -56,10 +56,10 @@ public:
void SetNewCntntIdx( const SwNodeIndex *pIdx );
};
-inline const SwFmtCntnt &SwAttrSet::GetCntnt(BOOL bInP) const
+inline const SwFmtCntnt &SwAttrSet::GetCntnt(sal_Bool bInP) const
{ return (const SwFmtCntnt&)Get( RES_CNTNT,bInP); }
-inline const SwFmtCntnt &SwFmt::GetCntnt(BOOL bInP) const
+inline const SwFmtCntnt &SwFmt::GetCntnt(sal_Bool bInP) const
{ return aSet.GetCntnt(bInP); }
#endif
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index aba9b8533c0a..f7725cb6294a 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -38,16 +38,16 @@ class SwFmtColl : public SwFmt
{
protected:
SwFmtColl( SwAttrPool& rPool, const sal_Char* pFmtName,
- const USHORT* pWhichRanges, SwFmtColl* pDerFrom,
- USHORT nFmtWhich )
+ const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
+ sal_uInt16 nFmtWhich )
: SwFmt( rPool, pFmtName, pWhichRanges, pDerFrom, nFmtWhich )
- { SetAuto( FALSE ); }
+ { SetAuto( sal_False ); }
SwFmtColl( SwAttrPool& rPool, const String &rFmtName,
- const USHORT* pWhichRanges, SwFmtColl* pDerFrom,
- USHORT nFmtWhich )
+ const sal_uInt16* pWhichRanges, SwFmtColl* pDerFrom,
+ sal_uInt16 nFmtWhich )
: SwFmt( rPool, rFmtName, pWhichRanges, pDerFrom, nFmtWhich )
- { SetAuto( FALSE ); }
+ { SetAuto( sal_False ); }
private:
@@ -68,14 +68,14 @@ class SW_DLLPUBLIC SwTxtFmtColl: public SwFmtColl
// <--
protected:
- //BYTE nOutlineLevel; //<-#outline level, removed by zhaojianwei
+ //sal_uInt8 nOutlineLevel; //<-#outline level, removed by zhaojianwei
bool mbAssignedToOutlineStyle;//<-#outline level added by zhaojianwei
SwTxtFmtColl *pNextTxtFmtColl;
SwTxtFmtColl( SwAttrPool& rPool, const sal_Char* pFmtCollName,
SwTxtFmtColl* pDerFrom = 0,
- USHORT nFmtWh = RES_TXTFMTCOLL )
+ sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
: SwFmtColl( rPool, pFmtCollName, aTxtFmtCollSetRange,
pDerFrom, nFmtWh ),
// --> OD 2007-01-24 #i73790#
@@ -87,7 +87,7 @@ protected:
SwTxtFmtColl( SwAttrPool& rPool, const String &rFmtCollName,
SwTxtFmtColl* pDerFrom = 0,
- USHORT nFmtWh = RES_TXTFMTCOLL )
+ sal_uInt16 nFmtWh = RES_TXTFMTCOLL )
: SwFmtColl( rPool, rFmtCollName, aTxtFmtCollSetRange,
pDerFrom, nFmtWh ),
// --> OD 2007-01-24 #i73790#
@@ -106,7 +106,7 @@ public:
inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext);
SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; }
- BOOL IsAtDocNodeSet() const;
+ sal_Bool IsAtDocNodeSet() const;
// --> OD 2006-11-22 #i71574#
//<-#outline level,zhaojianwei
@@ -125,14 +125,14 @@ public:
// --> OD 2008-03-04 #refactorlists#
// override to recognize changes on the <SwNumRuleItem> and register/unregister
// the paragragh style at the corresponding <SwNumRule> instance
- virtual BOOL SetFmtAttr( const SfxPoolItem& rAttr );
- virtual BOOL SetFmtAttr( const SfxItemSet& rSet );
- virtual BOOL ResetFmtAttr( USHORT nWhich1, USHORT nWhich2 = 0 );
+ virtual sal_Bool SetFmtAttr( const SfxPoolItem& rAttr );
+ virtual sal_Bool SetFmtAttr( const SfxItemSet& rSet );
+ virtual sal_Bool ResetFmtAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 );
// <--
// --> OD 2007-01-24 #i73790#
// override <ResetAllFmtAttr()> to stay assigned to list level of outline style
- virtual USHORT ResetAllFmtAttr();
+ virtual sal_uInt16 ResetAllFmtAttr();
inline bool StayAssignedToListLevelOfOutlineStyle() const
{
@@ -152,15 +152,15 @@ public:
Attset fuer die Char-Attribute angelegt werden; damit die Vererbung
und der Zugriff auf die gesetzen Attribute richtig funktioniert!!
- virtual BOOL SetDerivedFrom( SwFmtColl* pDerFrom = 0 );
+ virtual sal_Bool SetDerivedFrom( SwFmtColl* pDerFrom = 0 );
inline SwCharFmt* GetCharFmt() const;
- inline BOOL IsCharFmtSet() const;
+ inline sal_Bool IsCharFmtSet() const;
void SetCharFmt(SwCharFmt *);
void ResetCharFmt();
-inline BOOL SwTxtFmtColl::IsCharFmtSet() const
+inline sal_Bool SwTxtFmtColl::IsCharFmtSet() const
{
- return aCharDepend.GetRegisteredIn() ? TRUE : FALSE;
+ return aCharDepend.GetRegisteredIn() ? sal_True : sal_False;
}
inline SwCharFmt* SwTxtFmtColl::GetCharFmt() const
{
@@ -220,10 +220,10 @@ enum Master_CollConditions
class SW_DLLPUBLIC SwCollCondition : public SwClient
{
- ULONG nCondition;
+ sal_uLong nCondition;
union
{
- ULONG nSubCondition;
+ sal_uLong nSubCondition;
String* pFldExpression;
} aSubCondition;
@@ -231,9 +231,9 @@ public:
TYPEINFO(); //Bereits in Basisklasse Client drin.
- SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
- ULONG nSubCond = 0 );
- SwCollCondition( SwTxtFmtColl* pColl, ULONG nMasterCond,
+ SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
+ sal_uLong nSubCond = 0 );
+ SwCollCondition( SwTxtFmtColl* pColl, sal_uLong nMasterCond,
const String& rSubExp );
virtual ~SwCollCondition();
@@ -248,12 +248,12 @@ public:
int operator!=( const SwCollCondition& rCmp ) const
{ return ! (*this == rCmp); }
- ULONG GetCondition() const { return nCondition; }
- ULONG GetSubCondition() const { return aSubCondition.nSubCondition; }
+ sal_uLong GetCondition() const { return nCondition; }
+ sal_uLong GetSubCondition() const { return aSubCondition.nSubCondition; }
const String* GetFldExpression() const
{ return aSubCondition.pFldExpression; }
- void SetCondition( ULONG nCond, ULONG nSubCond );
+ void SetCondition( sal_uLong nCond, sal_uLong nSubCond );
SwTxtFmtColl* GetTxtFmtColl() const { return (SwTxtFmtColl*)GetRegisteredIn(); }
};
@@ -287,7 +287,7 @@ public:
const SwCollCondition* HasCondition( const SwCollCondition& rCond ) const;
const SwFmtCollConditions& GetCondColls() const { return aCondColls; }
void InsertCondition( const SwCollCondition& rCond );
- BOOL RemoveCondition( const SwCollCondition& rCond );
+ sal_Bool RemoveCondition( const SwCollCondition& rCond );
void SetConditions( const SwFmtCollConditions& );
};
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index b3b98373905e..476708948e60 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -38,8 +38,8 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtEditInReadonly : public SfxBoolItem
{
public:
- SwFmtEditInReadonly( USHORT nId = RES_EDIT_IN_READONLY,
- BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {}
+ SwFmtEditInReadonly( sal_uInt16 nId = RES_EDIT_IN_READONLY,
+ sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {}
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -50,10 +50,10 @@ public:
const IntlWrapper* pIntl = 0 ) const;
};
-inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(BOOL bInP) const
+inline const SwFmtEditInReadonly &SwAttrSet::GetEditInReadonly(sal_Bool bInP) const
{ return (const SwFmtEditInReadonly&)Get( RES_EDIT_IN_READONLY,bInP); }
-inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(BOOL bInP) const
+inline const SwFmtEditInReadonly &SwFmt::GetEditInReadonly(sal_Bool bInP) const
{ return aSet.GetEditInReadonly(bInP); }
#endif
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 0e1932f9605b..a6289406c505 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -69,7 +69,7 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
- virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
const SwField *GetFld() const { return pField; }
SwField *GetFld() { return pField; }
@@ -87,8 +87,8 @@ public:
const SwTxtFld *GetTxtFld() const { return pTxtAttr; }
SwTxtFld *GetTxtFld() { return pTxtAttr; }
- BOOL IsFldInDoc() const;
- BOOL IsProtect() const;
+ sal_Bool IsFldInDoc() const;
+ sal_Bool IsProtect() const;
};
class SW_DLLPUBLIC SwFmtFldHint : public SfxHint
diff --git a/sw/inc/fmtfollowtextflow.hxx b/sw/inc/fmtfollowtextflow.hxx
index 5a5792978c93..878b59e5ccf6 100644
--- a/sw/inc/fmtfollowtextflow.hxx
+++ b/sw/inc/fmtfollowtextflow.hxx
@@ -38,7 +38,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtFollowTextFlow : public SfxBoolItem
{
public:
- SwFmtFollowTextFlow( BOOL bFlag = FALSE )
+ SwFmtFollowTextFlow( sal_Bool bFlag = sal_False )
: SfxBoolItem( RES_FOLLOW_TEXT_FLOW, bFlag ) {}
TYPEINFO();
@@ -55,10 +55,10 @@ public:
#if !(defined(MACOSX) && ( __GNUC__ < 3 ))
// GrP moved to gcc_outl.cxx; revisit with gcc3
-inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(BOOL bInP) const
+inline const SwFmtFollowTextFlow &SwAttrSet::GetFollowTextFlow(sal_Bool bInP) const
{ return (const SwFmtFollowTextFlow&)Get( RES_FOLLOW_TEXT_FLOW, bInP ); }
-inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(BOOL bInP) const
+inline const SwFmtFollowTextFlow &SwFmt::GetFollowTextFlow(sal_Bool bInP) const
{ return aSet.GetFollowTextFlow( bInP ); }
#endif
diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx
index a79788555c72..04647edc1e68 100644
--- a/sw/inc/fmtfordr.hxx
+++ b/sw/inc/fmtfordr.hxx
@@ -51,7 +51,7 @@ public:
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
- virtual USHORT GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); }
};
@@ -62,10 +62,10 @@ inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy )
return *this;
}
-inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(BOOL bInP) const
+inline const SwFmtFillOrder &SwAttrSet::GetFillOrder(sal_Bool bInP) const
{ return (const SwFmtFillOrder&)Get( RES_FILL_ORDER,bInP); }
-inline const SwFmtFillOrder &SwFmt::GetFillOrder(BOOL bInP) const
+inline const SwFmtFillOrder &SwFmt::GetFillOrder(sal_Bool bInP) const
{ return aSet.GetFillOrder(bInP); }
#endif
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index df6d99910e91..ec3b7458ef6a 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -52,8 +52,8 @@ class SW_DLLPUBLIC SwFmtFrmSize: public SfxPoolItem
Size aSize;
SwFrmSize eFrmHeightType;
SwFrmSize eFrmWidthType;
- BYTE nWidthPercent; //Fuer Tabellen kann die Breite in Prozent
- BYTE nHeightPercent; //angegeben sein.
+ sal_uInt8 nWidthPercent; //Fuer Tabellen kann die Breite in Prozent
+ sal_uInt8 nHeightPercent; //angegeben sein.
//Fuer Rahmen koennen Hoehe und/oder Breite
//in Prozent angegeben sein. Wenn nur eine
//der Angaben in Prozent angeben ist, kann
@@ -80,8 +80,8 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
SwFrmSize GetHeightSizeType() const { return eFrmHeightType; }
void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; }
@@ -97,16 +97,16 @@ public:
void SetHeight( const SwTwips nNew ) { aSize.Height() = nNew; }
void SetWidth ( const SwTwips nNew ) { aSize.Width() = nNew; }
- BYTE GetHeightPercent() const{ return nHeightPercent; }
- BYTE GetWidthPercent() const { return nWidthPercent; }
- void SetHeightPercent( BYTE n ) { nHeightPercent = n; }
- void SetWidthPercent ( BYTE n ) { nWidthPercent = n; }
+ sal_uInt8 GetHeightPercent() const{ return nHeightPercent; }
+ sal_uInt8 GetWidthPercent() const { return nWidthPercent; }
+ void SetHeightPercent( sal_uInt8 n ) { nHeightPercent = n; }
+ void SetWidthPercent ( sal_uInt8 n ) { nWidthPercent = n; }
};
-inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(BOOL bInP) const
+inline const SwFmtFrmSize &SwAttrSet::GetFrmSize(sal_Bool bInP) const
{ return (const SwFmtFrmSize&)Get( RES_FRM_SIZE,bInP); }
-inline const SwFmtFrmSize &SwFmt::GetFrmSize(BOOL bInP) const
+inline const SwFmtFrmSize &SwFmt::GetFrmSize(sal_Bool bInP) const
{ return aSet.GetFrmSize(bInP); }
#endif
diff --git a/sw/inc/fmtftn.hxx b/sw/inc/fmtftn.hxx
index 381703302585..9a470ddfa1df 100644
--- a/sw/inc/fmtftn.hxx
+++ b/sw/inc/fmtftn.hxx
@@ -41,7 +41,7 @@ class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem
friend class SwTxtFtn;
SwTxtFtn* pTxtAttr; //mein TextAttribut
String aNumber; //Benutzerdefinierte 'Nummer'
- USHORT nNumber; //Automatische Nummerierung
+ sal_uInt16 nNumber; //Automatische Nummerierung
bool m_bEndNote; // is it an End note?
// geschuetzter CopyCtor
@@ -57,11 +57,11 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const;
const String &GetNumStr() const { return aNumber; }
- const USHORT &GetNumber() const { return nNumber; }
+ const sal_uInt16 &GetNumber() const { return nNumber; }
bool IsEndNote() const { return m_bEndNote;}
void SetNumStr( const String& rStr ) { aNumber = rStr; }
- void SetNumber( USHORT nNo ) { nNumber = nNo; }
+ void SetNumber( sal_uInt16 nNo ) { nNumber = nNo; }
void SetEndNote( bool b );
void SetNumber( const SwFmtFtn& rFtn )
@@ -73,7 +73,7 @@ public:
void GetFtnText( String& rStr ) const;
// returnt den anzuzeigenden String der Fuss-/Endnote
- String GetViewNumStr( const SwDoc& rDoc, BOOL bInclStrs = FALSE ) const;
+ String GetViewNumStr( const SwDoc& rDoc, sal_Bool bInclStrs = sal_False ) const;
};
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index f44cbc0f12c5..f3472108de97 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -48,11 +48,11 @@ class SW_DLLPUBLIC SwFmtFtnEndAtTxtEnd : public SfxEnumItem
String sPrefix;
String sSuffix;
SvxNumberType aFmt;
- USHORT nOffset;
+ sal_uInt16 nOffset;
protected:
- SwFmtFtnEndAtTxtEnd( USHORT nWhichL, SwFtnEndPosEnum ePos )
- : SfxEnumItem( nWhichL, sal::static_int_cast< USHORT >(ePos) ), nOffset( 0 )
+ SwFmtFtnEndAtTxtEnd( sal_uInt16 nWhichL, SwFtnEndPosEnum ePos )
+ : SfxEnumItem( nWhichL, sal::static_int_cast< sal_uInt16 >(ePos) ), nOffset( 0 )
{}
SwFmtFtnEndAtTxtEnd( const SwFmtFtnEndAtTxtEnd& rAttr )
: SfxEnumItem( rAttr ), sPrefix( rAttr.sPrefix ),
@@ -61,12 +61,12 @@ protected:
{}
public:
- virtual USHORT GetValueCount() const;
+ virtual sal_uInt16 GetValueCount() const;
virtual int operator==( const SfxPoolItem& ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
// will be used at time??
// void FillVariable( SbxVariable &rVar,
@@ -81,7 +81,7 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- inline BOOL IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
+ inline sal_Bool IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
@@ -90,8 +90,8 @@ public:
const SvxNumberType& GetSwNumType() const { return aFmt; }
- USHORT GetOffset() const { return nOffset; }
- void SetOffset( USHORT nOff ) { nOffset = nOff; }
+ sal_uInt16 GetOffset() const { return nOffset; }
+ void SetOffset( sal_uInt16 nOff ) { nOffset = nOff; }
const String& GetPrefix() const { return sPrefix; }
void SetPrefix(const String& rSet) { sPrefix = rSet; }
@@ -122,15 +122,15 @@ public:
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
};
-inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(BOOL bInP) const
+inline const SwFmtFtnAtTxtEnd &SwAttrSet::GetFtnAtTxtEnd(sal_Bool bInP) const
{ return (const SwFmtFtnAtTxtEnd&)Get( RES_FTN_AT_TXTEND, bInP); }
-inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(BOOL bInP) const
+inline const SwFmtEndAtTxtEnd &SwAttrSet::GetEndAtTxtEnd(sal_Bool bInP) const
{ return (const SwFmtEndAtTxtEnd&)Get( RES_END_AT_TXTEND, bInP); }
-inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(BOOL bInP) const
+inline const SwFmtFtnAtTxtEnd &SwFmt::GetFtnAtTxtEnd(sal_Bool bInP) const
{ return aSet.GetFtnAtTxtEnd(bInP); }
-inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(BOOL bInP) const
+inline const SwFmtEndAtTxtEnd &SwFmt::GetEndAtTxtEnd(sal_Bool bInP) const
{ return aSet.GetEndAtTxtEnd(bInP); }
#endif
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 14c71d6a0264..c8773d61d1d5 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -41,10 +41,10 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient
{
- BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
+ sal_Bool bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
public:
- SwFmtHeader( BOOL bOn = FALSE );
+ SwFmtHeader( sal_Bool bOn = sal_False );
SwFmtHeader( SwFrmFmt *pHeaderFmt );
SwFmtHeader( const SwFmtHeader &rCpy );
~SwFmtHeader();
@@ -64,8 +64,8 @@ public:
const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)pRegisteredIn; }
SwFrmFmt *GetHeaderFmt() { return (SwFrmFmt*)pRegisteredIn; }
- BOOL IsActive() const { return bActive; }
- void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
+ sal_Bool IsActive() const { return bActive; }
+ void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; }
};
//Fusszeile, fuer Seitenformate
@@ -73,10 +73,10 @@ public:
class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient
{
- BOOL bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
+ sal_Bool bActive; //Nur zur Steuerung (Erzeugung des Inhaltes)
public:
- SwFmtFooter( BOOL bOn = FALSE );
+ SwFmtFooter( sal_Bool bOn = sal_False );
SwFmtFooter( SwFrmFmt *pFooterFmt );
SwFmtFooter( const SwFmtFooter &rCpy );
~SwFmtFooter();
@@ -96,18 +96,18 @@ public:
const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)pRegisteredIn; }
SwFrmFmt *GetFooterFmt() { return (SwFrmFmt*)pRegisteredIn; }
- BOOL IsActive() const { return bActive; }
- void SetActive( BOOL bNew = TRUE ) { bActive = bNew; }
+ sal_Bool IsActive() const { return bActive; }
+ void SetActive( sal_Bool bNew = sal_True ) { bActive = bNew; }
};
-inline const SwFmtHeader &SwAttrSet::GetHeader(BOOL bInP) const
+inline const SwFmtHeader &SwAttrSet::GetHeader(sal_Bool bInP) const
{ return (const SwFmtHeader&)Get( RES_HEADER,bInP); }
-inline const SwFmtFooter &SwAttrSet::GetFooter(BOOL bInP) const
+inline const SwFmtFooter &SwAttrSet::GetFooter(sal_Bool bInP) const
{ return (const SwFmtFooter&)Get( RES_FOOTER,bInP); }
-inline const SwFmtHeader &SwFmt::GetHeader(BOOL bInP) const
+inline const SwFmtHeader &SwFmt::GetHeader(sal_Bool bInP) const
{ return aSet.GetHeader(bInP); }
-inline const SwFmtFooter &SwFmt::GetFooter(BOOL bInP) const
+inline const SwFmtFooter &SwFmt::GetFooter(sal_Bool bInP) const
{ return aSet.GetFooter(bInP); }
#endif
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index 75fc863b147d..bfb6d35d2e76 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -49,8 +49,8 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem
String aName; // Name des Links
SvxMacroTableDtor* pMacroTbl;
SwTxtINetFmt* pTxtAttr; // mein TextAttribut
- USHORT nINetId;
- USHORT nVisitedId;
+ sal_uInt16 nINetId;
+ sal_uInt16 nVisitedId;
public:
SwFmtINetFmt( const String& rURL, const String& rTarget );
SwFmtINetFmt( const SwFmtINetFmt& rAttr );
@@ -68,10 +68,10 @@ public:
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
- BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal,
- BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal,
+ sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal,
+ sal_uInt8 nMemberId = 0 );
const SwTxtINetFmt* GetTxtINetFmt() const { return pTxtAttr; }
@@ -90,19 +90,19 @@ public:
const String& GetVisitedFmt() const { return aVisitedFmt; }
void SetVisitedFmt( const String& rNm ) { aVisitedFmt = rNm; }
- USHORT GetINetFmtId() const { return nINetId; }
- void SetINetFmtId( USHORT nNew ) { nINetId = nNew; }
+ sal_uInt16 GetINetFmtId() const { return nINetId; }
+ void SetINetFmtId( sal_uInt16 nNew ) { nINetId = nNew; }
- USHORT GetVisitedFmtId() const { return nVisitedId; }
- void SetVisitedFmtId( USHORT nNew ) { nVisitedId = nNew; }
+ sal_uInt16 GetVisitedFmtId() const { return nVisitedId; }
+ void SetVisitedFmtId( sal_uInt16 nNew ) { nVisitedId = nNew; }
// setze eine neue oder loesche die akt. MakroTabelle
void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 );
const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; }
// setze / erfrage ein Makro
- void SetMacro( USHORT nEvent, const SvxMacro& rMacro );
- const SvxMacro* GetMacro( USHORT nEvent ) const;
+ void SetMacro( sal_uInt16 nEvent, const SvxMacro& rMacro );
+ const SvxMacro* GetMacro( sal_uInt16 nEvent ) const;
};
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 7ae0e80d0350..fb04ec8ed94d 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -37,8 +37,8 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem
{
- ULONG nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert
- ULONG bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden.
+ sal_uLong nStartValue :24; //Startwert fuer den Absatz, 0 == kein Startwert
+ sal_uLong bCountLines :1; //Zeilen des Absatzes sollen mitgezaehlt werden.
public:
SwFmtLineNumber();
@@ -54,17 +54,17 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- ULONG GetStartValue() const { return nStartValue; }
- BOOL IsCount() const { return bCountLines != 0; }
+ sal_uLong GetStartValue() const { return nStartValue; }
+ sal_Bool IsCount() const { return bCountLines != 0; }
- void SetStartValue( ULONG nNew ) { nStartValue = nNew; }
- void SetCountLines( BOOL b ) { bCountLines = b; }
+ void SetStartValue( sal_uLong nNew ) { nStartValue = nNew; }
+ void SetCountLines( sal_Bool b ) { bCountLines = b; }
};
-inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(BOOL bInP) const
+inline const SwFmtLineNumber &SwAttrSet::GetLineNumber(sal_Bool bInP) const
{ return (const SwFmtLineNumber&)Get( RES_LINENUMBER,bInP); }
#endif
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index cfe9172ea02f..1ac109d067ef 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -37,7 +37,7 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtLayoutSplit : public SfxBoolItem
{
public:
- SwFmtLayoutSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
+ SwFmtLayoutSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_LAYOUT_SPLIT, bSplit ) {}
// "pure virtual Methoden" vom SfxPoolItem
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
@@ -48,10 +48,10 @@ public:
const IntlWrapper* pIntl = 0 ) const;
};
-inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(BOOL bInP) const
+inline const SwFmtLayoutSplit &SwAttrSet::GetLayoutSplit(sal_Bool bInP) const
{ return (const SwFmtLayoutSplit&)Get( RES_LAYOUT_SPLIT,bInP); }
-inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(BOOL bInP) const
+inline const SwFmtLayoutSplit &SwFmt::GetLayoutSplit(sal_Bool bInP) const
{ return aSet.GetLayoutSplit(bInP); }
#endif
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index d09df11bb1aa..b486434d19df 100755
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -108,12 +108,12 @@ private:
SwTxtMeta * GetTxtAttr() { return m_pTxtAttr; }
void SetTxtAttr(SwTxtMeta * const i_pTxtAttr);
- explicit SwFmtMeta( const USHORT i_nWhich );
+ explicit SwFmtMeta( const sal_uInt16 i_nWhich );
public:
// takes ownership
explicit SwFmtMeta( ::boost::shared_ptr< ::sw::Meta > const & i_pMeta,
- const USHORT i_nWhich );
+ const sal_uInt16 i_nWhich );
virtual ~SwFmtMeta();
// SfxPoolItem
@@ -123,7 +123,7 @@ public:
/// notify clients registered at m_pMeta that this meta is being (re-)moved
void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
- static SwFmtMeta * CreatePoolDefault( const USHORT i_nWhich );
+ static SwFmtMeta * CreatePoolDefault( const sal_uInt16 i_nWhich );
::sw::Meta * GetMeta() { return m_pMeta.get(); }
/// this method <em>must</em> be called when the hint is actually copied
void DoCopy( SwFmtMeta & rOriginalMeta );
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 098177d4bd9b..aa6389992a3d 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -39,7 +39,7 @@
class IntlWrapper;
-#define IVER_VERTORIENT_REL ((USHORT)0x0001)
+#define IVER_VERTORIENT_REL ((sal_uInt16)0x0001)
class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
{
@@ -60,8 +60,8 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
sal_Int16 GetVertOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
@@ -75,19 +75,19 @@ public:
//SwFmtHoriOrient, wie und woran orientiert --
// sich der FlyFrm in der Hoizontalen ----------
-#define IVER_HORIORIENT_TOGGLE ((USHORT)0x0001)
-#define IVER_HORIORIENT_REL ((USHORT)0x0002)
+#define IVER_HORIORIENT_TOGGLE ((sal_uInt16)0x0001)
+#define IVER_HORIORIENT_REL ((sal_uInt16)0x0002)
class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
{
SwTwips nXPos; //Enthaelt _immer_ die aktuelle RelPos.
sal_Int16 eOrient;
sal_Int16 eRelation;
- BOOL bPosToggle : 1; // auf geraden Seiten Position spiegeln
+ sal_Bool bPosToggle : 1; // auf geraden Seiten Position spiegeln
public:
TYPEINFO();
SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
- sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, BOOL bPos = FALSE );
+ sal_Int16 eRel = com::sun::star::text::RelOrientation::PRINT_AREA, sal_Bool bPos = sal_False );
inline SwFmtHoriOrient &operator=( const SwFmtHoriOrient &rCpy );
// "pure virtual Methoden" vom SfxPoolItem
@@ -98,8 +98,8 @@ public:
SfxMapUnit ePresMetric,
String &rText,
const IntlWrapper* pIntl = 0 ) const;
- virtual BOOL QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
- virtual BOOL PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+ virtual sal_Bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
+ virtual sal_Bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
sal_Int16 GetHoriOrient() const { return eOrient; }
sal_Int16 GetRelationOrient() const { return eRelation; }
@@ -109,8 +109,8 @@ public:
SwTwips GetPos() const { return nXPos; }
void SetPos( SwTwips nNew ) { nXPos = nNew; }
- BOOL IsPosToggle() const { re