diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 16:51:14 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-14 16:51:14 +0000 |
| commit | ed40f62e64564d2b22c9285cfdc6778aeac8fd68 (patch) | |
| tree | 1a29a28c991a80ec1f3c6de1ce0cd28d4996fe21 /sw/inc | |
| parent | 6cd7d7c69ce62fbf788fc4e971cb14ab24d4c5ed (diff) | |
| parent | 20529755b301c7af2c5ab461329b2d979b2cdbff (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts:
starmath/inc/applicat.hxx
starmath/inc/dialog.hxx
starmath/inc/document.hxx
starmath/inc/edit.hxx
starmath/inc/format.hxx
starmath/inc/node.hxx
starmath/inc/parse.hxx
starmath/inc/rect.hxx
starmath/inc/smdll.hxx
starmath/inc/smmod.hxx
starmath/inc/starmath.hrc
starmath/inc/symbol.hxx
starmath/inc/toolbox.hxx
starmath/inc/utility.hxx
starmath/inc/view.hxx
starmath/prj/build.lst
starmath/qa/cppunit/version.map
starmath/sdi/smslots.sdi
starmath/source/accessibility.cxx
starmath/source/cfgitem.cxx
starmath/source/cfgitem.hxx
starmath/source/config.cxx
starmath/source/dialog.cxx
starmath/source/document.cxx
starmath/source/edit.cxx
starmath/source/format.cxx
starmath/source/makefile.mk
starmath/source/math_pch.cxx
starmath/source/mathmlexport.cxx
starmath/source/mathmlimport.cxx
starmath/source/mathtype.cxx
starmath/source/node.cxx
starmath/source/parse.cxx
starmath/source/rect.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
starmath/source/smdll.cxx
starmath/source/smmod.cxx
starmath/source/smres.src
starmath/source/symbol.cxx
starmath/source/toolbox.cxx
starmath/source/unomodel.cxx
starmath/source/utility.cxx
starmath/source/view.cxx
sw/JunitTest_sw_unoapi.mk
sw/Library_swd.mk
sw/Makefile
sw/inc/IDocumentFieldsAccess.hxx
sw/inc/IDocumentSettingAccess.hxx
sw/inc/IDocumentUndoRedo.hxx
sw/inc/IShellCursorSupplier.hxx
sw/inc/SwUndoField.hxx
sw/inc/acmplwrd.hxx
sw/inc/authfld.hxx
sw/inc/bparr.hxx
sw/inc/calbck.hxx
sw/inc/calc.hxx
sw/inc/ccoll.hxx
sw/inc/cellatr.hxx
sw/inc/cellfml.hxx
sw/inc/chpfld.hxx
sw/inc/cmdid.h
sw/inc/crsrsh.hxx
sw/inc/crstate.hxx
sw/inc/dbfld.hxx
sw/inc/dbmgr.hxx
sw/inc/dcontact.hxx
sw/inc/ddefld.hxx
sw/inc/doc.hxx
sw/inc/docary.hxx
sw/inc/docsh.hxx
sw/inc/docstat.hxx
sw/inc/docstyle.hxx
sw/inc/docufld.hxx
sw/inc/editsh.hxx
sw/inc/errhdl.hxx
sw/inc/expfld.hxx
sw/inc/fchrfmt.hxx
sw/inc/fesh.hxx
sw/inc/fldbas.hxx
sw/inc/flddat.hxx
sw/inc/flddropdown.hxx
sw/inc/flypos.hxx
sw/inc/fmtanchr.hxx
sw/inc/fmtautofmt.hxx
sw/inc/fmtclds.hxx
sw/inc/fmtcnct.hxx
sw/inc/fmtcol.hxx
sw/inc/fmtfsize.hxx
sw/inc/fmtftn.hxx
sw/inc/fmtftntx.hxx
sw/inc/fmthdft.hxx
sw/inc/fmtinfmt.hxx
sw/inc/fmtline.hxx
sw/inc/fmtornt.hxx
sw/inc/fmtpdsc.hxx
sw/inc/fmtruby.hxx
sw/inc/fmtsrnd.hxx
sw/inc/fmturl.hxx
sw/inc/fmtwrapinfluenceonobjpos.hxx
sw/inc/format.hxx
sw/inc/frmatr.hxx
sw/inc/frmfmt.hxx
sw/inc/grfatr.hxx
sw/inc/helpid.h
sw/inc/hintids.hxx
sw/inc/hints.hxx
sw/inc/htmltbl.hxx
sw/inc/inetfld.hxx
sw/inc/io.hxx
sw/inc/iodetect.hxx
sw/inc/itabenum.hxx
sw/inc/ndarr.hxx
sw/inc/ndgrf.hxx
sw/inc/ndindex.hxx
sw/inc/ndnotxt.hxx
sw/inc/ndole.hxx
sw/inc/ndtxt.hxx
sw/inc/ndtyp.hxx
sw/inc/node.hxx
sw/inc/numrule.hxx
sw/inc/pagedesc.hxx
sw/inc/pagepreviewlayout.hxx
sw/inc/pam.hxx
sw/inc/paratr.hxx
sw/inc/poolfmt.awk
sw/inc/poolfmt.hxx
sw/inc/printdata.hxx
sw/inc/reffld.hxx
sw/inc/shellio.hxx
sw/inc/shellres.hxx
sw/inc/swabstdlg.hxx
sw/inc/swatrset.hxx
sw/inc/swerror.h
sw/inc/swprtopt.hxx
sw/inc/swtable.hxx
sw/inc/swtypes.hxx
sw/inc/tblafmt.hxx
sw/inc/tgrditem.hxx
sw/inc/tox.hxx
sw/inc/undobj.hxx
sw/inc/unocoll.hxx
sw/inc/unoframe.hxx
sw/inc/unoprnms.hxx
sw/inc/usrfld.hxx
sw/inc/viewopt.hxx
sw/inc/viewsh.hxx
sw/inc/viscrs.hxx
sw/prj/build.lst
sw/qa/complex/accessibility/makefile.mk
sw/qa/core/Test-BigPtrArray.cxx
sw/qa/core/makefile.mk
sw/sdi/makefile.mk
sw/source/core/access/makefile.mk
sw/source/core/access/textmarkuphelper.cxx
sw/source/core/attr/calbck.cxx
sw/source/core/attr/cellatr.cxx
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
sw/source/core/attr/format.cxx
sw/source/core/attr/hints.cxx
sw/source/core/bastyp/calc.cxx
sw/source/core/bastyp/init.cxx
sw/source/core/bastyp/makefile.mk
sw/source/core/bastyp/swcache.cxx
sw/source/core/crsr/bookmrk.cxx
sw/source/core/crsr/callnk.cxx
sw/source/core/crsr/crsrsh.cxx
sw/source/core/crsr/crstrvl.cxx
sw/source/core/crsr/findattr.cxx
sw/source/core/crsr/findcoll.cxx
sw/source/core/crsr/makefile.mk
sw/source/core/crsr/pam.cxx
sw/source/core/crsr/swcrsr.cxx
sw/source/core/crsr/trvltbl.cxx
sw/source/core/crsr/unocrsr.cxx
sw/source/core/crsr/viscrs.cxx
sw/source/core/doc/acmplwrd.cxx
sw/source/core/doc/doc.cxx
sw/source/core/doc/docbm.cxx
sw/source/core/doc/doccomp.cxx
sw/source/core/doc/docdesc.cxx
sw/source/core/doc/docdraw.cxx
sw/source/core/doc/docedt.cxx
sw/source/core/doc/docfld.cxx
sw/source/core/doc/docfly.cxx
sw/source/core/doc/docfmt.cxx
sw/source/core/doc/docftn.cxx
sw/source/core/doc/docglbl.cxx
sw/source/core/doc/docglos.cxx
sw/source/core/doc/doclay.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/doc/docredln.cxx
sw/source/core/doc/docruby.cxx
sw/source/core/doc/docsort.cxx
sw/source/core/doc/docstat.cxx
sw/source/core/doc/doctxm.cxx
sw/source/core/doc/fmtcol.cxx
sw/source/core/doc/gctable.cxx
sw/source/core/doc/htmltbl.cxx
sw/source/core/doc/makefile.mk
sw/source/core/doc/number.cxx
sw/source/core/doc/poolfmt.cxx
sw/source/core/doc/tblafmt.cxx
sw/source/core/doc/tblcpy.cxx
sw/source/core/doc/tblrwcl.cxx
sw/source/core/docnode/makefile.mk
sw/source/core/docnode/ndcopy.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndsect.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/docnode/ndtbl1.cxx
sw/source/core/docnode/node.cxx
sw/source/core/docnode/node2lay.cxx
sw/source/core/docnode/nodes.cxx
sw/source/core/docnode/section.cxx
sw/source/core/docnode/swbaslnk.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/draw/dflyobj.cxx
sw/source/core/draw/drawdoc.cxx
sw/source/core/draw/dview.cxx
sw/source/core/draw/makefile.mk
sw/source/core/edit/autofmt.cxx
sw/source/core/edit/edattr.cxx
sw/source/core/edit/eddel.cxx
sw/source/core/edit/edfcol.cxx
sw/source/core/edit/edfld.cxx
sw/source/core/edit/edfldexp.cxx
sw/source/core/edit/edfmt.cxx
sw/source/core/edit/edglss.cxx
sw/source/core/edit/editsh.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/edit/edsect.cxx
sw/source/core/edit/edtab.cxx
sw/source/core/edit/edtox.cxx
sw/source/core/edit/edundo.cxx
sw/source/core/edit/makefile.mk
sw/source/core/except/dbgloop.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/authfld.cxx
sw/source/core/fields/cellfml.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/dbfld.cxx
sw/source/core/fields/ddefld.cxx
sw/source/core/fields/ddetbl.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/fields/expfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/fields/flddat.cxx
sw/source/core/fields/flddropdown.cxx
sw/source/core/fields/macrofld.cxx
sw/source/core/fields/makefile.mk
sw/source/core/fields/reffld.cxx
sw/source/core/fields/scrptfld.cxx
sw/source/core/fields/tblcalc.cxx
sw/source/core/fields/usrfld.cxx
sw/source/core/frmedt/fecopy.cxx
sw/source/core/frmedt/fedesc.cxx
sw/source/core/frmedt/fefly1.cxx
sw/source/core/frmedt/feshview.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/frmedt/fews.cxx
sw/source/core/frmedt/makefile.mk
sw/source/core/frmedt/tblsel.cxx
sw/source/core/graphic/grfatr.cxx
sw/source/core/inc/SwUndoFmt.hxx
sw/source/core/inc/SwUndoTOXChange.hxx
sw/source/core/inc/anchoredobjectposition.hxx
sw/source/core/inc/dbgloop.hxx
sw/source/core/inc/drawfont.hxx
sw/source/core/inc/flowfrm.hxx
sw/source/core/inc/frame.hxx
sw/source/core/inc/frmtool.hxx
sw/source/core/inc/layact.hxx
sw/source/core/inc/layfrm.hxx
sw/source/core/inc/notxtfrm.hxx
sw/source/core/inc/rolbck.hxx
sw/source/core/inc/rootfrm.hxx
sw/source/core/inc/scriptinfo.hxx
sw/source/core/inc/swblocks.hxx
sw/source/core/inc/swcache.hxx
sw/source/core/inc/tabfrm.hxx
sw/source/core/inc/txmsrt.hxx
sw/source/core/inc/undoflystrattr.hxx
sw/source/core/inc/viewimp.hxx
sw/source/core/layout/atrfrm.cxx
sw/source/core/layout/calcmove.cxx
sw/source/core/layout/dbg_lay.cxx
sw/source/core/layout/findfrm.cxx
sw/source/core/layout/flowfrm.cxx
sw/source/core/layout/fly.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/flyincnt.cxx
sw/source/core/layout/flylay.cxx
sw/source/core/layout/frmtool.cxx
sw/source/core/layout/ftnfrm.cxx
sw/source/core/layout/layact.cxx
sw/source/core/layout/laycache.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/objectformatter.cxx
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/pagedesc.cxx
sw/source/core/layout/paintfrm.cxx
sw/source/core/layout/sectfrm.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/layout/trvlfrm.cxx
sw/source/core/layout/unusedf.cxx
sw/source/core/layout/wsfrm.cxx
sw/source/core/makefile.mk
sw/source/core/objectpositioning/anchoredobjectposition.cxx
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx
sw/source/core/objectpositioning/makefile.mk
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/para/makefile.mk
sw/source/core/para/paratr.cxx
sw/source/core/sw3io/makefile.mk
sw/source/core/sw3io/sw3convert.cxx
sw/source/core/swg/SwXMLTextBlocks.cxx
sw/source/core/swg/makefile.mk
sw/source/core/swg/swblocks.cxx
sw/source/core/table/swnewtable.cxx
sw/source/core/table/swtable.cxx
sw/source/core/text/EnhancedPDFExportHelper.cxx
sw/source/core/text/atrstck.cxx
sw/source/core/text/frmcrsr.cxx
sw/source/core/text/frmform.cxx
sw/source/core/text/itrcrsr.cxx
sw/source/core/text/itrform2.cxx
sw/source/core/text/makefile.mk
sw/source/core/text/porlay.cxx
sw/source/core/text/pormulti.cxx
sw/source/core/text/txtfld.cxx
sw/source/core/text/txtfrm.cxx
sw/source/core/text/txtio.cxx
sw/source/core/tox/makefile.mk
sw/source/core/tox/txmsrt.cxx
sw/source/core/txtnode/fmtatr2.cxx
sw/source/core/txtnode/fntcache.cxx
sw/source/core/txtnode/fntcap.cxx
sw/source/core/txtnode/makefile.mk
sw/source/core/txtnode/ndhints.cxx
sw/source/core/txtnode/ndtxt.cxx
sw/source/core/txtnode/swfont.cxx
sw/source/core/txtnode/thints.cxx
sw/source/core/txtnode/txtatr2.cxx
sw/source/core/txtnode/txtedt.cxx
sw/source/core/undo/SwUndoField.cxx
sw/source/core/undo/SwUndoPageDesc.cxx
sw/source/core/undo/SwUndoTOXChange.cxx
sw/source/core/undo/docundo.cxx
sw/source/core/undo/makefile.mk
sw/source/core/undo/rolbck.cxx
sw/source/core/undo/unbkmk.cxx
sw/source/core/undo/undel.cxx
sw/source/core/undo/undobj.cxx
sw/source/core/undo/undobj1.cxx
sw/source/core/undo/unfmco.cxx
sw/source/core/undo/unins.cxx
sw/source/core/undo/unnum.cxx
sw/source/core/undo/unoutl.cxx
sw/source/core/undo/unredln.cxx
sw/source/core/undo/unsect.cxx
sw/source/core/undo/unsort.cxx
sw/source/core/undo/unspnd.cxx
sw/source/core/undo/untbl.cxx
sw/source/core/unocore/makefile.mk
sw/source/core/unocore/swunohelper.cxx
sw/source/core/unocore/unobkm.cxx
sw/source/core/unocore/unocoll.cxx
sw/source/core/unocore/unocrsrhelper.cxx
sw/source/core/unocore/unodraw.cxx
sw/source/core/unocore/unofield.cxx
sw/source/core/unocore/unoframe.cxx
sw/source/core/unocore/unomap.cxx
sw/source/core/unocore/unoprnms.cxx
sw/source/core/unocore/unoredlines.cxx
sw/source/core/unocore/unosett.cxx
sw/source/core/unocore/unosrch.cxx
sw/source/core/unocore/unostyle.cxx
sw/source/core/unocore/unotbl.cxx
sw/source/core/view/vdraw.cxx
sw/source/core/view/viewimp.cxx
sw/source/core/view/viewpg.cxx
sw/source/core/view/viewsh.cxx
sw/source/core/view/vnew.cxx
sw/source/core/view/vprint.cxx
sw/source/filter/ascii/ascatr.cxx
sw/source/filter/ascii/makefile.mk
sw/source/filter/ascii/wrtasc.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/basflt/iodetect.cxx
sw/source/filter/basflt/makefile.mk
sw/source/filter/html/SwAppletImpl.cxx
sw/source/filter/html/css1atr.cxx
sw/source/filter/html/htmlatr.cxx
sw/source/filter/html/htmlbas.cxx
sw/source/filter/html/htmlcss1.cxx
sw/source/filter/html/htmlfly.cxx
sw/source/filter/html/htmlftn.cxx
sw/source/filter/html/htmlgrin.cxx
sw/source/filter/html/htmlnum.cxx
sw/source/filter/html/htmlplug.cxx
sw/source/filter/html/htmltab.cxx
sw/source/filter/html/makefile.mk
sw/source/filter/html/parcss1.cxx
sw/source/filter/html/svxcss1.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/inc/msfilter.hxx
sw/source/filter/inc/wrtswtbl.hxx
sw/source/filter/rtf/makefile.mk
sw/source/filter/rtf/rtffly.cxx
sw/source/filter/rtf/rtfnum.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/filter/rtf/swparrtf.cxx
sw/source/filter/rtf/swparrtf.hxx
sw/source/filter/writer/makefile.mk
sw/source/filter/writer/writer.cxx
sw/source/filter/writer/wrt_fn.cxx
sw/source/filter/writer/wrtswtbl.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/makefile.mk
sw/source/filter/ww1/w1class.cxx
sw/source/filter/ww1/w1class.hxx
sw/source/filter/ww1/w1filter.cxx
sw/source/filter/ww1/w1par.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww1/w1struct.hxx
sw/source/filter/ww8/README-rtf.txt
sw/source/filter/ww8/attributeoutputbase.hxx
sw/source/filter/ww8/docxattributeoutput.cxx
sw/source/filter/ww8/docxattributeoutput.hxx
sw/source/filter/ww8/docxexport.cxx
sw/source/filter/ww8/docxexport.hxx
sw/source/filter/ww8/docxexportfilter.cxx
sw/source/filter/ww8/dump/dump8.cxx
sw/source/filter/ww8/dump/dump8a.cxx
sw/source/filter/ww8/dump/msvbasic.cxx
sw/source/filter/ww8/dump/msvbasic.hxx
sw/source/filter/ww8/dump/ww8darr.cxx
sw/source/filter/ww8/dump/ww8darr.hxx
sw/source/filter/ww8/dump/ww8dout.cxx
sw/source/filter/ww8/dump/ww8dout.hxx
sw/source/filter/ww8/dump/ww8scan.cxx
sw/source/filter/ww8/dump/ww8scan.hxx
sw/source/filter/ww8/dump/ww8struc.hxx
sw/source/filter/ww8/makefile.mk
sw/source/filter/ww8/rtfattributeoutput.cxx
sw/source/filter/ww8/rtfattributeoutput.hxx
sw/source/filter/ww8/rtfexport.cxx
sw/source/filter/ww8/rtfexport.hxx
sw/source/filter/ww8/rtfexportfilter.cxx
sw/source/filter/ww8/rtfexportfilter.hxx
sw/source/filter/ww8/rtfimportfilter.cxx
sw/source/filter/ww8/rtfimportfilter.hxx
sw/source/filter/ww8/rtfsdrexport.cxx
sw/source/filter/ww8/rtfsdrexport.hxx
sw/source/filter/ww8/writerhelper.cxx
sw/source/filter/ww8/writerwordglue.cxx
sw/source/filter/ww8/wrtw8esh.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/wrtw8sty.cxx
sw/source/filter/ww8/wrtww8.cxx
sw/source/filter/ww8/wrtww8.hxx
sw/source/filter/ww8/wrtww8gr.cxx
sw/source/filter/ww8/ww8atr.cxx
sw/source/filter/ww8/ww8attributeoutput.hxx
sw/source/filter/ww8/ww8graf.cxx
sw/source/filter/ww8/ww8graf.hxx
sw/source/filter/ww8/ww8graf2.cxx
sw/source/filter/ww8/ww8par.cxx
sw/source/filter/ww8/ww8par.hxx
sw/source/filter/ww8/ww8par2.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/ww8/ww8scan.cxx
sw/source/filter/ww8/ww8scan.hxx
sw/source/filter/ww8/ww8struc.hxx
sw/source/filter/xml/makefile.mk
sw/source/filter/xml/xmlimpit.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/app/appenv.cxx
sw/source/ui/app/apphdl.cxx
sw/source/ui/app/applab.cxx
sw/source/ui/app/appopt.cxx
sw/source/ui/app/docsh.cxx
sw/source/ui/app/docsh2.cxx
sw/source/ui/app/docshini.cxx
sw/source/ui/app/docst.cxx
sw/source/ui/app/docstyle.cxx
sw/source/ui/app/makefile.mk
sw/source/ui/app/mn.src
sw/source/ui/app/swmodul1.cxx
sw/source/ui/cctrl/makefile.mk
sw/source/ui/cctrl/swlbox.cxx
sw/source/ui/chrdlg/break.cxx
sw/source/ui/chrdlg/ccoll.cxx
sw/source/ui/chrdlg/chardlg.cxx
sw/source/ui/chrdlg/drpcps.cxx
sw/source/ui/chrdlg/makefile.mk
sw/source/ui/chrdlg/numpara.cxx
sw/source/ui/chrdlg/pardlg.cxx
sw/source/ui/chrdlg/swuiccoll.cxx
sw/source/ui/config/barcfg.cxx
sw/source/ui/config/caption.cxx
sw/source/ui/config/cfgitems.cxx
sw/source/ui/config/fontcfg.cxx
sw/source/ui/config/mailconfigpage.cxx
sw/source/ui/config/makefile.mk
sw/source/ui/config/modcfg.cxx
sw/source/ui/config/optcomp.cxx
sw/source/ui/config/optload.cxx
sw/source/ui/config/optpage.cxx
sw/source/ui/config/prtopt.cxx
sw/source/ui/config/uinums.cxx
sw/source/ui/config/usrpref.cxx
sw/source/ui/config/viewopt.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/dbmgr.cxx
sw/source/ui/dbui/dbtree.cxx
sw/source/ui/dbui/makefile.mk
sw/source/ui/dbui/mmaddressblockpage.cxx
sw/source/ui/dbui/mmdocselectpage.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dbui/swdbtoolsclient.cxx
sw/source/ui/dialog/abstract.cxx
sw/source/ui/dialog/ascfldlg.cxx
sw/source/ui/dialog/macassgn.cxx
sw/source/ui/dialog/makefile.mk
sw/source/ui/dialog/regionsw.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/dialog/swdlgfact.hxx
sw/source/ui/dialog/uiregionsw.cxx
sw/source/ui/dochdl/gloshdl.cxx
sw/source/ui/dochdl/makefile.mk
sw/source/ui/dochdl/swdtflvr.cxx
sw/source/ui/docvw/PostItMgr.cxx
sw/source/ui/docvw/SidebarWin.cxx
sw/source/ui/docvw/edtdd.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/edtwin2.cxx
sw/source/ui/docvw/edtwin3.cxx
sw/source/ui/docvw/makefile.mk
sw/source/ui/docvw/romenu.cxx
sw/source/ui/docvw/romenu.hxx
sw/source/ui/docvw/srcedtw.cxx
sw/source/ui/envelp/envfmt.cxx
sw/source/ui/envelp/envimg.cxx
sw/source/ui/envelp/envlop1.cxx
sw/source/ui/envelp/envprt.cxx
sw/source/ui/envelp/label1.cxx
sw/source/ui/envelp/labfmt.cxx
sw/source/ui/envelp/labprt.cxx
sw/source/ui/envelp/mailmrge.cxx
sw/source/ui/envelp/makefile.mk
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldedt.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.cxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldtdlg.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/inpdlg.cxx
sw/source/ui/fldui/makefile.mk
sw/source/ui/fmtui/makefile.mk
sw/source/ui/fmtui/tmpdlg.cxx
sw/source/ui/frmdlg/colmgr.cxx
sw/source/ui/frmdlg/column.cxx
sw/source/ui/frmdlg/cption.cxx
sw/source/ui/frmdlg/frmdlg.cxx
sw/source/ui/frmdlg/frmmgr.cxx
sw/source/ui/frmdlg/frmpage.cxx
sw/source/ui/frmdlg/makefile.mk
sw/source/ui/frmdlg/wrap.cxx
sw/source/ui/globdoc/makefile.mk
sw/source/ui/inc/bmpwin.hxx
sw/source/ui/inc/colmgr.hxx
sw/source/ui/inc/column.hxx
sw/source/ui/inc/envimg.hxx
sw/source/ui/inc/envlop.hxx
sw/source/ui/inc/frmpage.hxx
sw/source/ui/inc/inputwin.hxx
sw/source/ui/inc/javaedit.hxx
sw/source/ui/inc/num.hxx
sw/source/ui/inc/optpage.hxx
sw/source/ui/inc/regionsw.hxx
sw/source/ui/inc/split.hxx
sw/source/ui/inc/swlbox.hxx
sw/source/ui/inc/swmn_tmpl.hrc
sw/source/ui/inc/swuiidxmrk.hxx
sw/source/ui/inc/tabsh.hxx
sw/source/ui/inc/toxmgr.hxx
sw/source/ui/inc/uiitems.hxx
sw/source/ui/inc/view.hxx
sw/source/ui/inc/workctrl.hxx
sw/source/ui/inc/wrap.hxx
sw/source/ui/inc/wrtsh.hxx
sw/source/ui/index/cnttab.cxx
sw/source/ui/index/makefile.mk
sw/source/ui/index/toxmgr.cxx
sw/source/ui/lingu/hhcwrp.cxx
sw/source/ui/lingu/makefile.mk
sw/source/ui/lingu/olmenu.cxx
sw/source/ui/misc/bookmark.cxx
sw/source/ui/misc/docfnote.cxx
sw/source/ui/misc/glosbib.cxx
sw/source/ui/misc/glosdoc.cxx
sw/source/ui/misc/glshell.cxx
sw/source/ui/misc/insfnote.cxx
sw/source/ui/misc/linenum.cxx
sw/source/ui/misc/makefile.mk
sw/source/ui/misc/num.cxx
sw/source/ui/misc/numberingtypelistbox.cxx
sw/source/ui/misc/outline.cxx
sw/source/ui/misc/pgfnote.cxx
sw/source/ui/misc/pggrid.cxx
sw/source/ui/misc/redlndlg.cxx
sw/source/ui/misc/srtdlg.cxx
sw/source/ui/misc/swmodalredlineacceptdlg.cxx
sw/source/ui/ribbar/conarc.cxx
sw/source/ui/ribbar/drawbase.cxx
sw/source/ui/ribbar/inputwin.cxx
sw/source/ui/ribbar/inputwin.src
sw/source/ui/ribbar/makefile.mk
sw/source/ui/ribbar/tbxanchr.cxx
sw/source/ui/ribbar/workctrl.cxx
sw/source/ui/ribbar/workctrl.src
sw/source/ui/shells/annotsh.cxx
sw/source/ui/shells/basesh.cxx
sw/source/ui/shells/beziersh.cxx
sw/source/ui/shells/drawdlg.cxx
sw/source/ui/shells/drwbassh.cxx
sw/source/ui/shells/drwtxtex.cxx
sw/source/ui/shells/drwtxtsh.cxx
sw/source/ui/shells/frmsh.cxx
sw/source/ui/shells/grfsh.cxx
sw/source/ui/shells/grfshex.cxx
sw/source/ui/shells/makefile.mk
sw/source/ui/shells/tabsh.cxx
sw/source/ui/shells/textfld.cxx
sw/source/ui/shells/textglos.cxx
sw/source/ui/shells/textsh.cxx
sw/source/ui/shells/textsh1.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/shells/txtnum.cxx
sw/source/ui/table/convert.cxx
sw/source/ui/table/instable.cxx
sw/source/ui/table/makefile.mk
sw/source/ui/table/swtablerep.cxx
sw/source/ui/table/tabledlg.cxx
sw/source/ui/table/tablemgr.cxx
sw/source/ui/table/tablepg.hxx
sw/source/ui/table/tautofmt.cxx
sw/source/ui/uiview/formatclipboard.cxx
sw/source/ui/uiview/makefile.mk
sw/source/ui/uiview/pview.cxx
sw/source/ui/uiview/pview.src
sw/source/ui/uiview/scroll.cxx
sw/source/ui/uiview/srcview.cxx
sw/source/ui/uiview/swcli.cxx
sw/source/ui/uiview/uivwimp.cxx
sw/source/ui/uiview/view.cxx
sw/source/ui/uiview/view1.cxx
sw/source/ui/uiview/view2.cxx
sw/source/ui/uiview/viewcoll.cxx
sw/source/ui/uiview/viewdlg2.cxx
sw/source/ui/uiview/viewling.cxx
sw/source/ui/uiview/viewmdi.cxx
sw/source/ui/uiview/viewport.cxx
sw/source/ui/uiview/viewprt.cxx
sw/source/ui/uiview/viewsrch.cxx
sw/source/ui/uiview/viewtab.cxx
sw/source/ui/uno/SwXDocumentSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.cxx
sw/source/ui/uno/SwXPrintPreviewSettings.hxx
sw/source/ui/uno/unoatxt.cxx
sw/source/ui/uno/unomod.cxx
sw/source/ui/uno/unotxdoc.cxx
sw/source/ui/uno/unotxvw.cxx
sw/source/ui/utlui/attrdesc.cxx
sw/source/ui/utlui/content.cxx
sw/source/ui/utlui/glbltree.cxx
sw/source/ui/utlui/initui.cxx
sw/source/ui/utlui/makefile.mk
sw/source/ui/utlui/navipi.cxx
sw/source/ui/utlui/navipi.src
sw/source/ui/utlui/numfmtlb.cxx
sw/source/ui/utlui/prcntfld.cxx
sw/source/ui/utlui/uiitems.cxx
sw/source/ui/utlui/uitool.cxx
sw/source/ui/utlui/unotools.cxx
sw/source/ui/utlui/viewlayoutctrl.cxx
sw/source/ui/utlui/zoomctrl.cxx
sw/source/ui/vba/makefile.mk
sw/source/ui/vba/service.cxx
sw/source/ui/web/makefile.mk
sw/source/ui/wrtsh/makefile.mk
sw/source/ui/wrtsh/wrtsh1.cxx
sw/source/ui/wrtsh/wrtsh2.cxx
sw/source/ui/wrtsh/wrtsh4.cxx
sw/source/ui/wrtsh/wrtundo.cxx
sw/util/hidother.src
sw/util/makefile.mk
sw/util/msword.map
Diffstat (limited to 'sw/inc')
202 files changed, 5960 insertions, 7796 deletions
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 7c4e522daf3b..e8befb722fc0 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -149,7 +149,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/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx index 6b1a30b8d06f..40c680bb597f 100644 --- a/sw/inc/IDocumentDeviceAccess.hxx +++ b/sw/inc/IDocumentDeviceAccess.hxx @@ -130,7 +130,7 @@ @returns the current PrintData */ - virtual SwPrintData* getPrintData() const = 0; + virtual const SwPrintData & getPrintData() const = 0; /** Sets the PrintData diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx index 1f28006ad5a2..4cc0318cd852 100644 --- a/sw/inc/IDocumentFieldsAccess.hxx +++ b/sw/inc/IDocumentFieldsAccess.hxx @@ -77,10 +77,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; // Call update of expression fields. All expressions are re-evaluated. @@ -91,8 +91,8 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } @param pMsgHnt @param bUpdateTblFlds 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; @@ -118,7 +118,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; virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0; @@ -127,7 +127,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } } // (Node [ + ::com::sun::star::ucb::Content]). // A generated list of all fields may be passed along too // (if the addreess != 0 and the pointer == 0 a new list will be returned). - virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt) = 0; + virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0; virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0; diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx index 66a2e4ae0e67..fb3d3c8c89e0 100644 --- a/sw/inc/IDocumentLinksAdministration.hxx +++ b/sw/inc/IDocumentLinksAdministration.hxx @@ -53,7 +53,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; } /** #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 / ?? for linking of parts of documents. */ diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx index 52517e495dfc..ffa24645181b 100644 --- a/sw/inc/IDocumentRedlineAccess.hxx +++ b/sw/inc/IDocumentRedlineAccess.hxx @@ -50,7 +50,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 @@ -71,7 +71,7 @@ namespace nsRedlineMode_t const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400; } -typedef USHORT RedlineType_t; +typedef sal_uInt16 RedlineType_t; namespace nsRedlineType_t { // Range of RedlineTypes is 0 to 127. @@ -93,16 +93,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: @@ -135,7 +135,7 @@ public: /** Query if redlining is on. @returns - </TRUE> if redlining is on </FALSE> otherwise + <TRUE/> if redlining is on <FALSE/> otherwise */ virtual bool IsRedlineOn() const = 0; diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx index 931c2266536d..76e3d977d447 100644 --- a/sw/inc/IDocumentSettingAccess.hxx +++ b/sw/inc/IDocumentSettingAccess.hxx @@ -89,7 +89,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd GLOBAL_DOCUMENT_SAVE_LINKS, LABEL_DOCUMENT, PURGE_OLE, - KERN_ASIAN_PUNCTUATION + KERN_ASIAN_PUNCTUATION, + MATH_BASELINE_ALIGNMENT }; public: @@ -128,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. @@ -138,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. @@ -209,6 +210,6 @@ protected: virtual ~IDocumentSettingAccess() {}; }; - #endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED +#endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx index 38e558668858..33ae7efb8e64 100644 --- a/sw/inc/IDocumentUndoRedo.hxx +++ b/sw/inc/IDocumentUndoRedo.hxx @@ -30,51 +30,87 @@ #define IDOCUMENTUNDOREDO_HXX_INCLUDED #include <sal/types.h> + #include <swundo.hxx> -class SwUndoIter; class SwRewriter; -class String; -class SwUndoIds; class SwNodes; class SwUndo; +namespace sw { + class RepeatContext; +} + -typedef sal_uInt16 SwUndoNoModifiedPosition; /** IDocumentUndoRedo */ class IDocumentUndoRedo { public: - virtual void SetUndoNoResetModified() = 0; - virtual bool IsUndoNoResetModified() const = 0; - - /** Care for UndoHistory of document. - UndoHistory is reset at Save, SaveAs, Create ??? + /** Enable/Disable Undo. */ - virtual void DoUndo(bool bUn) = 0; + virtual void DoUndo(bool const bDoUndo) = 0; + /** Is Undo enabled? + */ virtual bool DoesUndo() const = 0; - /** Concatenate continuous Insert/Delete/Overwrite of characters. - Default is ::com::sun::star::sdbcx::Group-Undo. + /** Enable/Disable Group Undo. + This determines whether successive Insert/Delete/Overwrite + actions are combined. */ - virtual void DoGroupUndo(bool bUn) = 0; + virtual void DoGroupUndo(bool const bDoUndo) = 0; + /** Is Group Undo enabled? + */ virtual bool DoesGroupUndo() const = 0; - /* Undo: - 0 last action, else actions until start of parenthesis nUndoId. - Restored range is set in rUndoRange. + /** Enable/Disable Undo for Drawing objects. + */ + virtual void DoDrawUndo(bool const bDoUndo) = 0; + + /** Is Undo for Drawing objects enabled? + for Draw-Undo: writer wants to handle actions on Flys on its own. + */ + virtual bool DoesDrawUndo() const = 0; + + /** Set the position at which the document is in the "unmodified" state + to the current position in the Undo stack. + */ + virtual void SetUndoNoModifiedPosition() = 0; + + /** Prevent updates to the "unmodified" state position + via SetUndoNoResetModified(). + */ + virtual void LockUndoNoModifiedPosition() = 0; + + /** Allow updates to the "unmodified" state position + via SetUndoNoResetModified(). */ - virtual bool Undo( SwUndoIter& ) = 0; + virtual void UnLockUndoNoModifiedPosition() = 0; + + /** Disable (re)setting the document modified flag on Undo/Redo. + */ + virtual void SetUndoNoResetModified() = 0; + + /** Is setting the document modified flag on Undo/Redo disabled? + */ + virtual bool IsUndoNoResetModified() const = 0; + + /** Execute Undo. + + @return true if executing the last Undo action was successful. + */ + virtual sal_Bool Undo() = 0; /** Opens undo block. - @param nUndoId undo ID for the start object + @remark StartUndo() and EndUndo() do nothing if !DoesUndo(). + + @param nUndoId undo ID for the list action @param pRewriter rewriter for comments @see SwUndo::GetComment If the given nUndoId is equal to zero an undo object with ID @@ -82,95 +118,168 @@ public: @return the undo ID of the created object */ - virtual SwUndoId StartUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0; + virtual SwUndoId StartUndo(SwUndoId const eUndoId, + SwRewriter const*const pRewriter) = 0; /** Closes undo block. - @param nUndoId undo ID for the closure object - @param pRewriter rewriter for comments @see SwUndo::GetComment + @remark StartUndo() and EndUndo() do nothing if !DoesUndo(). - If the given nUndoId is equal to zero an undo object with ID - UNDO_START will be generated. + @param nUndoId undo ID for the list action + @param pRewriter rewriter for comments @see SwUndo::GetComment - If pRewriter is not equal to zero the given rewriter will be - set for the generated closure object and the corresponding - start object. Otherwise an existent rewriter in theIDocumentRedlineAccess - corresponding start object will be propagated to the generated - closure object. + If the given nUndoId is not UNDO_EMPTY or UNDO_END, the comment of + the resulting list action will be set via the nUndoId, applying the + given pRewriter (if not 0). Otherwise the comment of the resulting + list action is unchanged if it has an UndoId that is not UNDO_START + set by StartUndo, and in case the UndoId is UNDO_START the comment + of the list action defaults to the comment of the last action + contained in the list action. */ - virtual SwUndoId EndUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0; + virtual SwUndoId EndUndo(SwUndoId const eUndoId, + SwRewriter const*const pRewriter) = 0; /** - Deletes all UndoObjects (for methods that do something with the Nodes Array - without corresponding Undo!) + Delete all Undo actions. + Of course Undo will be disabled during deletion. */ virtual void DelAllUndoObj() = 0; - /** Returns the ID of the last action that can be undone. - Alternatively USHRT_MAX is filling VARARR with ::com::sun::star::sdbcx::User-UndoIdDs + /** Get Id and comment of last Undo action. + @param o_pStr if not 0, receives comment of last Undo action. + @param o_pId if not 0, receives Id of last Undo action. + @return true if there is a Undo action, false if none + */ + virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + SwUndoId *const o_pId) const = 0; + + /** Get comments of Undo actions. + @return comments of all top-level Undo actions. */ - virtual SwUndoId GetUndoIds(String* pStr, SwUndoIds *pUndoIds) const = 0; + virtual SwUndoComments_t GetUndoComments() const = 0; - virtual String GetUndoIdsStr(String* pStr, SwUndoIds *pUndoIds) const = 0; + /** Execute Redo. - /** Are there parentheses with this ID? + @return true if executing the first Redo action was successful. */ - virtual bool HasUndoId(SwUndoId eId) const = 0; + virtual sal_Bool Redo() = 0; - /* @@@MAINTAINABILITY-HORROR@@@ - Implementation details made public. - The following three methods are required only for Undo. - They should not be called otherwise. + /** Get comment of first Redo action. + @param o_pStr if not 0, receives comment of first Redo action. + @return true if there is a Redo action, false if none */ - virtual const SwNodes* GetUndoNds() const = 0; + virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const = 0; - virtual SwUndo* RemoveLastUndo(SwUndoId eUndoId) = 0; + /** Get comments of Redo actions. + @return comments of all top-level Redo actions. + */ + virtual SwUndoComments_t GetRedoComments() const = 0; - /** To prevent an undo array overflow when - doing nested undos, undo may have to be disabled. Undo-intensive - actions (like auto-format) should check this manually. + /** Repeat the last Undo action. + @return true if repeating the last Undo Redo action was attempted. */ - virtual bool HasTooManyUndos() const = 0; + virtual bool Repeat(::sw::RepeatContext & rContext, + sal_uInt16 const nRepeatCnt) = 0; + + /** Get Id and comment of last Undo action, if it is Repeat capable. + @param o_pStr if not 0, receives comment of last Undo action + if it is Repeat capable. + @return Id of last Undo action if it is Repeat capable, + or UNDO_EMPTY if there is none or it is not Repeat capable. + */ + virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const = 0; - virtual bool Redo( SwUndoIter& ) = 0; + /** Add new Undo action. + Takes over ownership of pUndo. + @remark calls ClearRedo(), except for UNDO_START/UNDO_END. + @remark does nothing if !DoesUndo(). + */ + virtual void AppendUndo(SwUndo *const pUndo) = 0; - /** Return the ID of the last undoable action. - Fills VARARR with RedoIds if required. + /** Delete all Redo actions. */ - virtual SwUndoId GetRedoIds( String* pStr, SwUndoIds *pRedoIds) const = 0; + virtual void ClearRedo() = 0; - virtual String GetRedoIdsStr( String* pStr, SwUndoIds *pRedoIds) const = 0; + /* Is the given nodes array the Undo nodes array? + */ + virtual bool IsUndoNodes(SwNodes const& rNodes) const = 0; - virtual bool Repeat( SwUndoIter&, sal_uInt16 nRepeatCnt) = 0; +protected: + virtual ~IDocumentUndoRedo() {}; +}; - /** Return the ID of the last repeatable action. - Fills VARARR mit RedoIds if required. - */ - virtual SwUndoId GetRepeatIds( String* pStr, SwUndoIds *pRedoIds) const = 0; - virtual String GetRepeatIdsStr( String* pStr, SwUndoIds *pRedoIds) const = 0; +namespace sw { - /** Internal shortcut for Insert at end. - */ - virtual void AppendUndo(SwUndo*) = 0; +class UndoGuard +{ +public: - /** Delete all UndoObjects of nUndoPos until the end of the Undo-Array. - */ - virtual void ClearRedo() = 0; + UndoGuard(IDocumentUndoRedo & rUndoRedo) + : m_rUndoRedo(rUndoRedo) + , m_bUndoWasEnabled(rUndoRedo.DoesUndo()) + { + m_rUndoRedo.DoUndo(false); + } + ~UndoGuard() + { + m_rUndoRedo.DoUndo(m_bUndoWasEnabled); + } + + bool UndoWasEnabled() const + { + return m_bUndoWasEnabled; + } + +private: + IDocumentUndoRedo & m_rUndoRedo; + bool const m_bUndoWasEnabled; +}; - /** Manipulates the position of the undo stack which reset the modified flag - */ - virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition ) = 0; +class GroupUndoGuard +{ +public: - /** Gets the position of the undo stack which reset the modified flag - */ - virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const = 0; + GroupUndoGuard(IDocumentUndoRedo & rUndoRedo) + : m_rUndoRedo(rUndoRedo) + , m_bGroupUndoWasEnabled(rUndoRedo.DoesGroupUndo()) + { + m_rUndoRedo.DoGroupUndo(false); + } + ~GroupUndoGuard() + { + m_rUndoRedo.DoGroupUndo(m_bGroupUndoWasEnabled); + } + +private: + IDocumentUndoRedo & m_rUndoRedo; + bool const m_bGroupUndoWasEnabled; +}; -protected: - virtual ~IDocumentUndoRedo() {}; +class DrawUndoGuard +{ +public: + + DrawUndoGuard(IDocumentUndoRedo & rUndoRedo) + : m_rUndoRedo(rUndoRedo) + , m_bDrawUndoWasEnabled(rUndoRedo.DoesDrawUndo()) + { + m_rUndoRedo.DoDrawUndo(false); + } + ~DrawUndoGuard() + { + m_rUndoRedo.DoDrawUndo(m_bDrawUndoWasEnabled); + } + +private: + IDocumentUndoRedo & m_rUndoRedo; + bool const m_bDrawUndoWasEnabled; }; + +} // namespace sw + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwUndoTOXChange.hxx b/sw/inc/IShellCursorSupplier.hxx index 9c6838e470a1..a160f43d40dd 100644 --- a/sw/inc/SwUndoTOXChange.hxx +++ b/sw/inc/IShellCursorSupplier.hxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -25,26 +24,28 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SW_UNDO_TOX_CHANGE_HXX -#define _SW_UNDO_TOX_CHANGE_HXX -#include <undobj.hxx> -#include <tox.hxx> -class SwUndoTOXChange : public SwUndo -{ - SwTOXBase * pTOX, aOld, aNew; +#ifndef ISHELLCURSORSUPPLIER_HXX +#define ISHELLCURSORSUPPLIER_HXX - void UpdateTOXBaseSection(); -public: - SwUndoTOXChange(SwTOXBase * pTOX, const SwTOXBase & rNew); - virtual ~SwUndoTOXChange(); +class SwPaM; + - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - virtual void Repeat(SwUndoIter & rIter); +namespace sw { + +/** The Undo actions need to create new Shell cursors. + Just creating new SwPaMs in the Undo actions is not sufficient, + because only Shell cursors are corrected by doccorr.cxx. + */ +class IShellCursorSupplier +{ +public: + virtual ~IShellCursorSupplier() { } + virtual SwPaM & CreateNewShellCursor() = 0; + virtual SwPaM & GetCurrentShellCursor() = 0; }; -#endif //_SW_UNDO_TOX_CHANGE_HXX +} // namespace sw -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +#endif // ISHELLCURSORSUPPLIER_HXX diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 2a3b6d956e13..96c5d74a319e 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -151,7 +151,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; @@ -178,7 +178,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); @@ -238,11 +238,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 83389d6f0442..24f3fd11cc30 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); @@ -201,7 +201,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 dcd6d2fad7b7..3c936b3a14f9 100644 --- a/sw/inc/SwAppletImpl.hxx +++ b/sw/inc/SwAppletImpl.hxx @@ -58,12 +58,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 25e1a4181755..f1f91524530e 100644 --- a/sw/inc/SwGetPoolIdFromName.hxx +++ b/sw/inc/SwGetPoolIdFromName.hxx @@ -31,7 +31,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/SwRewriter.hxx b/sw/inc/SwRewriter.hxx index 8de178aac4bb..7e581cfcc854 100644 --- a/sw/inc/SwRewriter.hxx +++ b/sw/inc/SwRewriter.hxx @@ -31,6 +31,11 @@ #include <vector> #include <tools/string.hxx> +#include <swdllapi.h> + +extern SW_DLLPUBLIC String const UNDO_ARG1; +extern SW_DLLPUBLIC String const UNDO_ARG2; +extern SW_DLLPUBLIC String const UNDO_ARG3; typedef std::pair<String, String> SwRewriteRule; diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx index b2d8671a8a8b..dceb43a16c69 100644 --- a/sw/inc/SwUndoField.hxx +++ b/sw/inc/SwUndoField.hxx @@ -25,18 +25,21 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SW_UNDO_FIELD_HXX -#define _SW_UNDO_FIELD_HXX +#ifndef SW_UNDO_FIELD_HXX +#define SW_UNDO_FIELD_HXX #include <undobj.hxx> +#include <com/sun/star/uno/Any.h> + + class SwDoc; class SwField; class SwMsgPoolItem; class SwUndoField : public SwUndo { - ULONG nNodeIndex; + sal_uLong nNodeIndex; xub_StrLen nOffset; protected: @@ -52,37 +55,42 @@ class SwUndoFieldFromDoc : public SwUndoField { SwField * pOldField, * pNewField; SwMsgPoolItem * pHnt; - BOOL bUpdate; + sal_Bool bUpdate; + + void DoImpl(); 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(); - virtual void Undo(SwUndoIter & rIt); - virtual void Redo(SwUndoIter & rIt); - virtual void Repeat(SwUndoIter & rIt); + virtual void UndoImpl( ::sw::UndoRedoContext & ); + virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ); }; class SwUndoFieldFromAPI : public SwUndoField { com::sun::star::uno::Any aOldVal, aNewVal; - USHORT nWhich; + sal_uInt16 nWhich; + + void DoImpl(); 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); - virtual void Redo(SwUndoIter & rIt); - virtual void Repeat(SwUndoIter & rIt); + virtual void UndoImpl( ::sw::UndoRedoContext & ); + virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ); }; -#endif // _SW_UNDO_FIELD_HXX +#endif // SW_UNDO_FIELD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwUndoFmt.hxx b/sw/inc/SwUndoFmt.hxx deleted file mode 100644 index d5da4ffcb1c2..000000000000 --- a/sw/inc/SwUndoFmt.hxx +++ /dev/null @@ -1,252 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SW_UNDO_TXT_FMT_COLL_HXX -#define _SW_UNDO_TXT_FMT_COLL_HXX - -#include <undobj.hxx> -#include <swundo.hxx> - -class SwDoc; -class SwTxtFmtColl; -class String; -class SwRewriter; -class SfxItemSet; - -class SwUndoFmtCreate : public SwUndo -{ -protected: - SwFmt * pNew; - String sDerivedFrom; - SwDoc * pDoc; - mutable String sNewName; - SfxItemSet * pNewSet; - USHORT nId; // FmtId related - BOOL bAuto; - -public: - - SwUndoFmtCreate(SwUndoId nUndoId, SwFmt * pNew, SwFmt * pDerivedFrom, - SwDoc * pDoc); - virtual ~SwUndoFmtCreate(); - - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - - virtual SwRewriter GetRewriter() const; - - virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; - virtual void Delete() = 0; - virtual SwFmt * Find(const String & rName) const = 0; -}; - -class SwUndoFmtDelete : public SwUndo -{ -protected: - String sDerivedFrom; - SwDoc * pDoc; - String sOldName; - SfxItemSet aOldSet; - USHORT nId; // FmtId related - BOOL bAuto; - -public: - SwUndoFmtDelete(SwUndoId nUndoId, SwFmt * pOld, SwDoc * pDoc); - ~SwUndoFmtDelete(); - - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - - virtual SwRewriter GetRewriter() const; - - virtual SwFmt * Create(SwFmt * pDerivedFrom) = 0; - virtual void Delete(SwFmt * pFmt) = 0; - virtual SwFmt * Find(const String & rName) const = 0; -}; - -class SwUndoRenameFmt : public SwUndo -{ -protected: - String sOldName, sNewName; - SwDoc * pDoc; - -public: - SwUndoRenameFmt(SwUndoId nUndoId, const String & sOldName, - const String & sNewName, - SwDoc * pDoc); - ~SwUndoRenameFmt(); - - void Undo(SwUndoIter & rIter); - void Redo(SwUndoIter & rIter); - - SwRewriter GetRewriter() const; - - virtual SwFmt * Find(const String & rName) const = 0; -}; - -class SwUndoTxtFmtCollCreate : public SwUndoFmtCreate -{ -public: - SwUndoTxtFmtCollCreate(SwTxtFmtColl * pNew, SwTxtFmtColl * pDerivedFrom, - SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoTxtFmtCollDelete : public SwUndoFmtDelete -{ -public: - SwUndoTxtFmtCollDelete(SwTxtFmtColl * pOld, SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoRenameFmtColl : public SwUndoRenameFmt -{ -public: - SwUndoRenameFmtColl(const String & sOldName, - const String & sNewName, - SwDoc * pDoc); - - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoCharFmtCreate : public SwUndoFmtCreate -{ -public: - SwUndoCharFmtCreate(SwCharFmt * pNew, SwCharFmt * pDerivedFrom, - SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoCharFmtDelete : public SwUndoFmtDelete -{ -public: - SwUndoCharFmtDelete(SwCharFmt * pOld, SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoRenameCharFmt : public SwUndoRenameFmt -{ -public: - SwUndoRenameCharFmt(const String & sOldName, - const String & sNewName, - SwDoc * pDoc); - - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoFrmFmtCreate : public SwUndoFmtCreate -{ - BOOL bAuto; - -public: - SwUndoFrmFmtCreate(SwFrmFmt * pNew, SwFrmFmt * pDerivedFrom, - SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoFrmFmtDelete : public SwUndoFmtDelete -{ -public: - SwUndoFrmFmtDelete(SwFrmFmt * pOld, SwDoc * pDoc); - - virtual SwFmt * Create(SwFmt * pDerivedFrom); - virtual void Delete(SwFmt * pFmt); - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoRenameFrmFmt : public SwUndoRenameFmt -{ -public: - SwUndoRenameFrmFmt(const String & sOldName, - const String & sNewName, - SwDoc * pDoc); - - virtual SwFmt * Find(const String & rName) const; -}; - -class SwUndoNumruleCreate : public SwUndo -{ - const SwNumRule * pNew; - mutable SwNumRule aNew; - SwDoc * pDoc; - mutable bool bInitialized; - -public: - SwUndoNumruleCreate(const SwNumRule * pNew, SwDoc * pDoc); - - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - - SwRewriter GetRewriter() const; -}; - -class SwUndoNumruleDelete : public SwUndo -{ - SwNumRule aOld; - SwDoc * pDoc; - -public: - SwUndoNumruleDelete(const SwNumRule & aRule, SwDoc * pDoc); - - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - - SwRewriter GetRewriter() const; -}; - -class SwUndoNumruleRename : public SwUndo -{ - String aOldName, aNewName; - SwDoc * pDoc; - - public: - SwUndoNumruleRename(const String & aOldName, const String & aNewName, - SwDoc * pDoc); - - virtual void Undo(SwUndoIter & rIter); - virtual void Redo(SwUndoIter & rIter); - - SwRewriter GetRewriter() const; -}; -#endif // _SW_UNDO_TXT_FMT_COLL_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/SwUndoPageDesc.hxx b/sw/inc/SwUndoPageDesc.hxx deleted file mode 100644 index 29004b3941e0..000000000000 --- a/sw/inc/SwUndoPageDesc.hxx +++ /dev/null @@ -1,93 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SW_UNDO_PAGE_DESC_HXX -#define _SW_UNDO_PAGE_DESC_HXX - -#include <undobj.hxx> -#include <pagedesc.hxx> - -class SwDoc; -class SwPageDesc; - - -class SwUndoPageDesc : public SwUndo -{ - SwPageDescExt aOld, aNew; - SwDoc * pDoc; - bool bExchange; - - // To avoid duplication of (header/footer)content nodes for simple page desc changes - void ExchangeContentNodes( SwPageDesc& rSource, SwPageDesc &rDest ); - -public: - SwUndoPageDesc(const SwPageDesc & aOld, const SwPageDesc & aNew, - SwDoc * pDoc); - virtual ~SwUndoPageDesc(); - - virtual void Undo(SwUndoIter & rIt); - virtual void Redo(SwUndoIter & rIt); - virtual void Repeat(SwUndoIter & rIt); - - virtual SwRewriter GetRewriter() const; -}; - -class SwUndoPageDescCreate : public SwUndo -{ - const SwPageDesc * pDesc; - SwPageDescExt aNew; - SwDoc * pDoc; - -public: - SwUndoPageDescCreate(const SwPageDesc * pNew, SwDoc * pDoc); - virtual ~SwUndoPageDescCreate(); - - virtual void Undo(SwUndoIter & rIt); - virtual void Redo(SwUndoIter & rIt); - virtual void Repeat(SwUndoIter & rIt); - - virtual SwRewriter GetRewriter() const; -}; - -class SwUndoPageDescDelete : public SwUndo -{ - SwPageDescExt aOld; - SwDoc * pDoc; - -public: - SwUndoPageDescDelete(const SwPageDesc & aOld, SwDoc * pDoc); - virtual ~SwUndoPageDescDelete(); - - virtual void Undo(SwUndoIter & rIt); - virtual void Redo(SwUndoIter & rIt); - virtual void Repeat(SwUndoIter & rIt); - - virtual SwRewriter GetRewriter() const; -}; -#endif // _SW_UNDO_PAGE_DESC_CHANGE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc index b6c6bb30086e..b33b19b814c7 100644 --- a/sw/inc/access.hrc +++ b/sw/inc/access.hrc @@ -52,7 +52,20 @@ #define STR_ACCESS_ANNOTATION_BUTTON_NAME (RC_ACCESS_BEGIN + 20) #define STR_ACCESS_ANNOTATION_BUTTON_DESC (RC_ACCESS_BEGIN + 21) -#define ACCESS_ACT_END STR_ACCESS_ANNOTATION_BUTTON_DESC +//IAccessibility2 Implementation 2009----- +#define STR_ACCESS_PREVIEW_DOC_NAME (RC_ACCESS_BEGIN + 22) +//#define STR_ACCESS_PREVIEW_DOC_DESC (RC_ACCESS_BEGIN + 23) +#define STR_ACCESS_PREVIEW_DOC_SUFFIX (RC_ACCESS_BEGIN + 24) +#define STR_ACCESS_DOC_WORDPROCESSING (RC_ACCESS_BEGIN + 25) +#define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26) +#define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27) +#define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28) +#define STR_ACCESS_SW_CATEGORY (RC_ACCESS_BEGIN + 29) +#define STR_ACCESS_TL_GLOBAL (RC_ACCESS_BEGIN + 30) +#define STR_ACCESS_TL_CONTENT (RC_ACCESS_BEGIN + 31) +//-----IAccessibility2 Implementation 2009 + +#define ACCESS_ACT_END STR_ACCESS_TL_CONTENT #if ACCESS_ACT_END > RC_ACCESS_END #error Resource-Id Ueberlauf in #file, #line diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx index 445d0c401e00..ff5c934a89da 100644 --- a/sw/inc/accessibilityoptions.hxx +++ b/sw/inc/accessibilityoptions.hxx @@ -32,23 +32,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 476e72f8ec81..ad7a0de42414 100644 --- a/sw/inc/acmplwrd.hxx +++ b/sw/inc/acmplwrd.hxx @@ -44,27 +44,27 @@ class SwAutoCompleteWord SvPtrarr aLRULst; SwAutoCompleteWord_Impl* pImpl; - USHORT nMaxCount, nMinWrdLen; + sal_uInt16 nMaxCount, nMinWrdLen; 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; } - 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 4f95403864d5..ebac43554a44 100644 --- a/sw/inc/authfld.hxx +++ b/sw/inc/authfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _AUTHFLD_HXX -#define _AUTHFLD_HXX +#ifndef SW_AUTHFLD_HXX +#define SW_AUTHFLD_HXX #include "swdllapi.h" #include <fldbas.hxx> @@ -38,11 +38,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, @@ -50,16 +50,16 @@ public: void AddRef() { ++nRefCount; } void RemoveRef() { --nRefCount; } - USHORT GetRefCount() { return nRefCount; } + sal_uInt16 GetRefCount() { return nRefCount; } }; struct SwTOXSortKey { ToxAuthorityField eField; - BOOL bSortAscending; + sal_Bool bSortAscending; SwTOXSortKey() : eField(AUTH_FIELD_END), - bSortAscending(TRUE){} + bSortAscending(sal_True){} }; class SwAuthorityField; @@ -73,8 +73,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; @@ -89,14 +89,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual 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_SequArr.clear(); @@ -109,13 +109,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; @@ -129,16 +129,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); @@ -156,6 +156,10 @@ class SwAuthorityField : public SwField { long m_nHandle; mutable long m_nTempSequencePos; + + virtual String Expand() const; + virtual SwField* Copy() const; + public: SwAuthorityField(SwAuthorityFieldType* pType, const String& rFieldContents); SwAuthorityField(SwAuthorityFieldType* pType, long nHandle); @@ -163,13 +167,11 @@ public: const String& GetFieldText(ToxAuthorityField eField) const; - virtual String Expand() const; - virtual SwField* Copy() const; 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual 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 7c369a6acecc..b4a3e0dde9b4 100644 --- a/sw/inc/authratr.hxx +++ b/sw/inc/authratr.hxx @@ -38,13 +38,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 32f4e751b5e3..236cc46fc1d0 100644 --- a/sw/inc/bparr.hxx +++ b/sw/inc/bparr.hxx @@ -40,19 +40,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 entries per Block = a bit less then 4K #define MAXENTRY 1000 @@ -67,52 +67,51 @@ typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs ); struct BlockInfo { // block info: BigPtrArray* pBigArr; // in this array the block is located ElementPtr* pData; // data block - ULONG nStart, nEnd; // start- and end index - USHORT nElem; // number of elements + sal_uLong nStart, nEnd; // start- and end index + sal_uInt16 nElem; // number of elements }; class SW_DLLPUBLIC BigPtrArray { BlockInfo** ppInf; // block info - ULONG nSize; // number of elements - USHORT nMaxBlock; // current max. number of blocks - USHORT nBlock; // number of blocks - USHORT nCur; // last block + sal_uLong nSize; // number of elements + sal_uInt16 nMaxBlock; // current max. number of blocks + sal_uInt16 nBlock; // number of blocks + sal_uInt16 nCur; // last block - USHORT Index2Block( ULONG ) const; // block search - BlockInfo* InsBlock( USHORT ); // insert block - void BlockDel( USHORT ); // some blocks were deleted - void UpdIndex( USHORT ); // recalculate indices + sal_uInt16 Index2Block( sal_uLong ) const; // block search + BlockInfo* InsBlock( sal_uInt16 ); // insert block + void BlockDel( sal_uInt16 ); // some blocks were deleted + void UpdIndex( sal_uInt16 ); // recalculate indices protected: // fill all blocks // the short parameter specifies in percent, how full the blocks should be // made - // the return value specifies that something was done - 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 not in the block" ); return pBlock->nStart + nOffset; diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx index ac95208423e1..ae05468aa16b 100644 --- a/sw/inc/breakit.hxx +++ b/sw/inc/breakit.hxx @@ -109,8 +109,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 cf39c2518b81..e778e0366007 100644 --- a/sw/inc/calbck.hxx +++ b/sw/inc/calbck.hxx @@ -62,16 +62,16 @@ class SW_DLLPUBLIC SwClient friend class SwClientIter; SwClient *pLeft, *pRight; // for AVL sorting - BOOL bModifyLocked : 1; // used in SwModify::Modify, + sal_Bool bModifyLocked : 1; // used in SwModify::Modify, // is really a member of SwModify // but here for lack of space - BOOL bInModify : 1; // is in a modify. (Debug!!!) - BOOL bInDocDTOR : 1; // Doc gets destroyed, + sal_Bool bInModify : 1; // is in a modify. (Debug!!!) + sal_Bool bInDocDTOR : 1; // Doc gets destroyed, // do not "unsubscribe" - BOOL bInCache : 1; // is in BorderAttrCache of the layout, + sal_Bool bInCache : 1; // is in BorderAttrCache of the layout, // unsubscribes itself then in Modify! - BOOL bInSwFntCache : 1; // is in SwFont cache of the formatting + sal_Bool bInSwFntCache : 1; // is in SwFont cache of the formatting protected: SwModify *pRegisteredIn; @@ -90,17 +90,17 @@ public: //casted typesafely via the dependency list of a Modify 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; } // get client Information - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; private: SwClient( const SwClient& ); @@ -109,7 +109,7 @@ private: inline SwClient::SwClient() : pLeft(0), pRight(0), pRegisteredIn(0) -{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = FALSE; } +{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = sal_False; } // ---------- @@ -142,13 +142,13 @@ public: const SwClient* GetDepends() const { return pRoot; } // get client information - 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: @@ -183,7 +183,7 @@ public: virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue ); // get Client information - 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 0e13c010d418..69ab36a84e38 100644 --- a/sw/inc/calc.hxx +++ b/sw/inc/calc.hxx @@ -131,7 +131,7 @@ public: virtual ~SwSbxValue(); - BOOL GetBool() const; + sal_Bool GetBool() const; double GetDouble() const; SwSbxValue& MakeDouble(); @@ -160,9 +160,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 ); // if _CalcOp != 0, this is a valid operator struct _CalcOp; @@ -187,7 +187,7 @@ class SwCalc const LocaleDataWrapper* pLclData; CharClass* pCharClass; - USHORT nListPor; + sal_uInt16 nListPor; SwCalcOper eCurrOper; SwCalcOper eCurrListOper; SwCalcError eError; @@ -198,7 +198,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 ); @@ -212,20 +212,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, @@ -233,7 +233,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 5a44c3a2bc5e..35ea265e13d1 100644 --- a/sw/inc/ccoll.hxx +++ b/sw/inc/ccoll.hxx @@ -47,8 +47,8 @@ //*********************************************************** struct CollName { - ULONG nCnd; - ULONG nSubCond; + sal_uLong nCnd; + sal_uLong nSubCond; }; //*********************************************************** @@ -57,8 +57,8 @@ struct CollName { struct CommandStruct { - ULONG nCnd; - ULONG nSubCond; + sal_uLong nCnd; + sal_uLong nSubCond; }; //*********************************************************** @@ -75,7 +75,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(); @@ -85,8 +85,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 b899c2573780..e081375a5495 100644 --- a/sw/inc/cellatr.hxx +++ b/sw/inc/cellatr.hxx @@ -37,10 +37,10 @@ class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item { - BOOL bAuto; // automatically given flag + sal_Bool bAuto; // automatically given flag public: - SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT, - BOOL bAuto = FALSE ); + SwTblBoxNumFormat( sal_uInt32 nFormat = NUMBERFORMAT_TEXT, + sal_Bool bAuto = sal_False ); // "pure virtual methods" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -53,8 +53,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 @@ -107,20 +107,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 e806e215d5d4..3a8566f14ecc 100644 --- a/sw/inc/cellfml.hxx +++ b/sw/inc/cellfml.hxx @@ -44,7 +44,7 @@ class String; class SwTblCalcPara { const SwTableBox* pLastTblBox; - USHORT nStackCnt, nMaxSize; + sal_uInt16 nStackCnt, nMaxSize; public: SwTableSortBoxes *pBoxStk; // stack for recognizing recursion @@ -54,9 +54,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; } }; @@ -99,7 +99,7 @@ protected: String sFormel; // current formula NameType eNmType; // current display method - bool bValidValue; // TRUE: recalculate formula + sal_Bool bValidValue; // sal_True: recalculate formula // find the node in which the formula is located // TextFeld -> TextNode, @@ -115,7 +115,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: @@ -152,7 +152,7 @@ public: eNmType = EXTRNL_NAME; } - USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes ); + sal_uInt16 GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes ); // are all boxes valid which this formula relies on? bool HasValidBoxes() const; }; diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx index 5e4a397ea648..ed45ed922c46 100644 --- a/sw/inc/charatr.hxx +++ b/sw/inc/charatr.hxx @@ -34,140 +34,140 @@ // implementation of the character attribute methods of SwAttrSet -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 ); } // implementation of the character attribute methods of SwFmt -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 2708b1770cae..f40029d7290b 100644 --- a/sw/inc/charfmt.hxx +++ b/sw/inc/charfmt.hxx @@ -52,8 +52,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 d4f0c2a7bb76..cf45a3412569 100644 --- a/sw/inc/chpfld.hxx +++ b/sw/inc/chpfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _CHPFLD_HXX -#define _CHPFLD_HXX +#ifndef SW_CHPFLD_HXX +#define SW_CHPFLD_HXX #include "fldbas.hxx" @@ -59,34 +59,35 @@ public: class SW_DLLPUBLIC SwChapterField : public SwField { friend class SwChapterFieldType; - BYTE nLevel; + sal_uInt8 nLevel; String sTitle, sNumber, sPre, sPost; + + virtual String Expand() const; + virtual SwField* Copy() const; + public: SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0); // #i53420# void ChangeExpansion( const SwFrm*, const SwCntntNode*, - BOOL bSrchNum = FALSE); - void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum); - - virtual String Expand() const; - virtual SwField* Copy() const; + sal_Bool bSrchNum = sal_False); + 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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; } -#endif // _CHPFLD_HXX +#endif // SW_CHPFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h index b88f7c63a424..5c5ab9a71505 100644 --- a/sw/inc/cmdid.h +++ b/sw/inc/cmdid.h @@ -866,6 +866,12 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 116) +// #i972: bool items to be passed to SwFrmPage for evaluation +#define FN_OLE_IS_MATH (FN_EXTRA2 + 114) +#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115) + +#define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116) + /*------------------------------------------------ -------------------- Area: Help -------------------------------------------------- ------------------*/ @@ -997,7 +1003,7 @@ included in c-context files, so c++ style stuff will cause problems. #define FN_ENVELOP (FN_ENVELP ) -#define FN_DELETE_NOTE (FN_NOTES+0) + #define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1) #define FN_DELETE_ALL_NOTES (FN_NOTES+2) #define FN_HIDE_NOTE (FN_NOTES+3) diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 26b6f54d79e3..f42fe3c2b695 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -40,11 +40,11 @@ class SwTableFUNC; class SwTableWidthDlg : public SvxStandardDialog { + FixedLine aWidthFL; FixedText aColFT; NumericField aColEdit; FixedText aWidthFT; MetricField aWidthEdit; - FixedLine aWidthFL; OKButton aOKBtn; CancelButton aCancelBtn; HelpButton aHelpBtn; diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 93ecfc9ae3b1..9d69a0be7f12 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -25,14 +25,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _CRSRSH_HXX -#define _CRSRSH_HXX +#ifndef SW_CRSRSH_HXX +#define SW_CRSRSH_HXX #include <com/sun/star/i18n/WordType.hpp> #include <tools/string.hxx> #include <tools/link.hxx> #include <tools/rtti.hxx> + +#include <IShellCursorSupplier.hxx> #include "swdllapi.h" #include <swtypes.hxx> // for SWPOSDOC #include <viewsh.hxx> // for ViewShell @@ -136,7 +138,7 @@ struct SwContentAtPos nDist = 0; // #i23726# } - BOOL IsInProtectSect() const; + sal_Bool IsInProtectSect() const; bool IsInRTLText()const; }; @@ -148,7 +150,10 @@ const int CRSR_POSOLD = 0x01, // cursor stays at old position String *ReplaceBackReferences( const com::sun::star::util::SearchOptions& rSearchOpt, SwPaM* pPam ); -class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify +class SW_DLLPUBLIC SwCrsrShell + : public ViewShell + , public SwModify + , public ::sw::IShellCursorSupplier { friend class SwCallLink; friend class SwVisCrsr; @@ -156,7 +161,7 @@ class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify friend class SwChgLinkFlag; // requires the Crsr as InternalCrsr - friend BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); + friend sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); public: @@ -197,9 +202,9 @@ private: long nUpDownX; // try to move the cursor on up/down always // in the same column 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; /* @@ -208,40 +213,40 @@ private: * current Cursor gets no update. This way, "complicated" cursor movements * (via Find()) can be realised. */ - USHORT nCrsrMove; - USHORT nBasicActionCnt; // Actions which are parenthesized by Basic + sal_uInt16 nCrsrMove; + sal_uInt16 nBasicActionCnt; // Actions which are parenthesized by Basic CrsrMoveState eMvState; // Status for Crsr-Travelling - GetCrsrOfst String sMarkedListId; int nMarkedListLevel; - BOOL bHasFocus : 1; // Shell is "active" in a window - BOOL bSVCrsrVis : 1; // SV-Cursor visible/invisible - BOOL bChgCallFlag : 1; // attribute change inside Start- and EndAction - BOOL bVisPortChgd : 1; // in VisPortChg-Call + sal_Bool bHasFocus : 1; // Shell is "active" in a window + sal_Bool bSVCrsrVis : 1; // SV-Cursor visible/invisible + sal_Bool bChgCallFlag : 1; // attribute change inside Start- and EndAction + sal_Bool bVisPortChgd : 1; // in VisPortChg-Call // (used in Invalidate by the Cursor) - BOOL bCallChgLnk : 1; // flag for derived classes + sal_Bool bCallChgLnk : 1; // flag for derived classes // TRUE -> call ChgLnk // access only via SwChgLinkFlag - BOOL bAllProtect : 1; // Flag for areas + sal_Bool bAllProtect : 1; // Flag for areas // TRUE -> everything protected / hidden - BOOL bInCMvVisportChgd : 1; // Flag for CrsrMoves + sal_Bool bInCMvVisportChgd : 1; // Flag for CrsrMoves // TRUE -> view was moved - BOOL bGCAttr : 1; // TRUE -> non expanded attributes exist. - BOOL bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next + sal_Bool bGCAttr : 1; // TRUE -> non expanded attributes exist. + sal_Bool bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next // EndAction in spite of Readonly - BOOL bSelTblCells : 1; // TRUE -> select cells over the InputWin - BOOL bAutoUpdateCells : 1; // TRUE -> autoformat cells - BOOL bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic - BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas - BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr + sal_Bool bSelTblCells : 1; // TRUE -> select cells over the InputWin + sal_Bool bAutoUpdateCells : 1; // TRUE -> autoformat cells + sal_Bool bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic + sal_Bool bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas + sal_Bool bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr 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 ); @@ -258,21 +263,21 @@ private: const int nLevel ); // 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. @@ -293,9 +298,9 @@ protected: void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos, const xub_StrLen nOffset = 0 ); - BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); + sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false ); - bool SetInFrontOfLabel( BOOL bNew ); + bool SetInFrontOfLabel( sal_Bool bNew ); void RefreshBlockCursor(); @@ -313,9 +318,12 @@ public: virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); // create new cursor and append the old one + virtual SwPaM & CreateNewShellCursor(); + virtual SwPaM & GetCurrentShellCursor(); + SwPaM * CreateCrsr(); // delete the current cursor and make the following into the current - BOOL DestroyCrsr(); + sal_Bool DestroyCrsr(); // transform TableCursor to normal cursor, nullify Tablemode void TblCrsrToCursor(); // enter block mode, change normal cursor into block cursor @@ -328,8 +336,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; // return only the current cursor SwShellCrsr* _GetCrsr() { return pCurCrsr; } const SwShellCrsr* _GetCrsr() const { return pCurCrsr; } @@ -347,42 +355,42 @@ public: // start parenthesing, hide SV-Cursor and selected areas void StartAction(); // end parenthesing, show SV-Cursor and selected areas - void EndAction( const BOOL bIdleEnd = FALSE ); + void EndAction( const sal_Bool bIdleEnd = sal_False ); // basic cursor travelling 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 ); - - ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + 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 ); + + 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 ); @@ -391,7 +399,7 @@ public: // return values: // CRSR_POSCHG: when cursor was corrected from SPoint by the layout // CRSR_POSOLD: when the cursor was not changed - int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true ); + int SetCrsr( const Point &rPt, sal_Bool bOnlyText = sal_False, bool bBlock = true ); /* * Notification that the visible area was changed. aVisArea is reset, then @@ -407,7 +415,7 @@ public: // Areas inline void SetMark(); - inline BOOL HasMark(); + inline sal_Bool HasMark(); void ClearMark(); @@ -418,12 +426,12 @@ public: swap the PaM. 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, // test only, don't set - BOOL bTstHit = FALSE ); // only exact matches + sal_Bool ChgCurrPam( const Point & rPt, + sal_Bool bTstOnly = sal_True, // test only, don't set + sal_Bool bTstHit = sal_False ); // only exact matches void KillPams(); // story a copy of the cursor in the stack @@ -435,7 +443,7 @@ public: * stack * Return: whether there was one left one the stack */ - BOOL Pop( BOOL bOldCrsr = TRUE ); + sal_Bool Pop( sal_Bool bOldCrsr = sal_True ); /* * Combine 2 Cursors. * Delete the topmost from the stack and move its Mark into the current. @@ -444,10 +452,10 @@ public: #if OSL_DEBUG_LEVEL > 1 void SttCrsrMove(); - void EndCrsrMove( const BOOL bIdleEnd = FALSE ); + void EndCrsrMove( const sal_Bool bIdleEnd = FALSE ); #else void SttCrsrMove() { ++nCrsrMove; StartAction(); } - void EndCrsrMove( const BOOL bIdleEnd = FALSE ) + void EndCrsrMove( const sal_Bool bIdleEnd = sal_False ) { EndAction( bIdleEnd ); --nCrsrMove; } #endif @@ -456,35 +464,35 @@ public: * On the other hand, on receiving the focus all selected ranges are displayed again * (ranges must be recalculated!). */ - 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 ); // Methods for displaying or hiding the visible text cursor. void ShowCrsr(); void HideCrsr(); // Methods for displaying or hiding the selected ranges with visible 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; } // Return current frame in which the cursor is placed. - SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const; + SwCntntFrm *GetCurrFrm( const sal_Bool bCalcFrm = sal_True ) const; //TRUE if cursor is hidden because of readonly. //FALSE if it is working despite readonly. - BOOL IsCrsrReadonly() const; + sal_Bool IsCrsrReadonly() const; // Cursor is placed in something that is protected or selection contains // something that is protected. - BOOL HasReadonlySel() const; + sal_Bool HasReadonlySel() const; // Can the cursor be set to read only ranges? - 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; // Methods for aFlyMacroLnk. void SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; } @@ -503,21 +511,23 @@ public: // Check if the current cursor contains a selection, i.e. // if Mark is set and SPoint and Mark are different. - BOOL HasSelection() const; + sal_Bool HasSelection() const; // Check if a selection exists, i.e. if the current cursor comprises a selection. - inline BOOL IsSelection() const; + inline sal_Bool IsSelection() const; // returns if multiple cursors are available - inline BOOL IsMultiSelection() const; + inline sal_Bool IsMultiSelection() const; // Check if a complete paragraph was selected. - BOOL IsSelFullPara() const; + sal_Bool IsSelFullPara() const; // Check if selection is within one paragraph. - inline BOOL IsSelOnePara() const; //Should WaitPtr be activated for Clipboard. - BOOL ShouldWait() const; + sal_Bool ShouldWait() const; + + // Check if selection is within one paragraph. + inline sal_Bool IsSelOnePara() const; /* * Returns SRectangle, at which the cursor is located. @@ -526,25 +536,25 @@ public: /* * Returns if cursor is wholly or partly within visible range. */ - BOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } + sal_Bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); } // Return current page number: // TRUE: in which cursor is located. // FALSE: which is visible at the upper margin. - void GetPageNum( USHORT &rnPhyNum, USHORT &rnVirtNum, - BOOL bAtCrsrPos = TRUE, const BOOL bCalcFrm = TRUE ); + void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, + sal_Bool bAtCrsrPos = sal_True, const sal_Bool bCalcFrm = sal_True ); // Determine how "empty pages" are handled // (used in PhyPage). - USHORT GetNextPrevPageNum( BOOL bNext = TRUE ); + sal_uInt16 GetNextPrevPageNum( sal_Bool bNext = sal_True ); // Move cursor at the bginning of page "nPage". - BOOL GotoPage( USHORT nPage ); + sal_Bool GotoPage( sal_uInt16 nPage ); - USHORT GetPageCnt(); + sal_uInt16 GetPageCnt(); - BOOL GoNextCrsr(); + sal_Bool GoNextCrsr(); - BOOL GoPrevCrsr(); + sal_Bool GoPrevCrsr(); // at CurCrsr.SPoint ::sw::mark::IMark* SetBookmark( @@ -575,47 +585,47 @@ public: String GetText() const; // Check of SPoint or Mark of current cursor are placed within a table. - inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const; + inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const; - 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(); // get current table selection as text String GetBoxNms() const; // set Crsr to the next/previous cell - BOOL GoNextCell( BOOL bAppendLine = TRUE ); - BOOL GoPrevCell(); + sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True ); + sal_Bool GoPrevCell(); // go to this box (if available and inside of table) - 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(); - BOOL SelTbl(); + sal_Bool SelTbl(); - BOOL GotoNextNum(); - BOOL GotoPrevNum(); + sal_Bool GotoNextNum(); + sal_Bool GotoPrevNum(); - BOOL GotoOutline( const String& rName ); + sal_Bool GotoOutline( const String& rName ); // to the next/previous or the given OutlineNode - void GotoOutline( USHORT nIdx ); + void GotoOutline( sal_uInt16 nIdx ); // find the "outline position" in the nodes array of the current chapter - USHORT GetOutlinePos( BYTE nLevel = UCHAR_MAX ); + sal_uInt16 GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX ); // select the given range of OutlineNodes. Optionally including the children - // the USHORTs are the positions in OutlineNodes-Array (EditShell) - BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos, - BOOL bWithChilds = FALSE ); + // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell) + sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos, + sal_Bool bWithChilds = sal_False ); - BOOL GotoNextOutline(); - BOOL GotoPrevOutline(); + sal_Bool GotoNextOutline(); + sal_Bool GotoPrevOutline(); /** Delivers the current shell cursor @@ -640,125 +650,125 @@ public: IBlockCursor* GetBlockCrsr() { return pBlockCrsr; } // is the Crsr in a table and is the selection over 2 columns - BOOL IsTableMode() const { return 0 != pTblCrsr; } + sal_Bool IsTableMode() const { return 0 != pTblCrsr; } const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; } SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; } - USHORT UpdateTblSelBoxes(); + sal_uInt16 UpdateTblSelBoxes(); - BOOL GotoFtnTxt(); // jump from content to footnote - BOOL GotoFtnAnchor(); // jump from footnote to anchor - BOOL GotoPrevFtnAnchor(); - BOOL GotoNextFtnAnchor(); + sal_Bool GotoFtnTxt(); // jump from content to footnote + sal_Bool GotoFtnAnchor(); // jump from footnote to anchor + sal_Bool GotoPrevFtnAnchor(); + sal_Bool GotoNextFtnAnchor(); - BOOL GotoFlyAnchor(); // jump from the frame to the anchor - BOOL GotoHeaderTxt(); // jump from the content to the header - BOOL GotoFooterTxt(); // jump from the content to the footer + sal_Bool GotoFlyAnchor(); // jump from the frame to the anchor + sal_Bool GotoHeaderTxt(); // jump from the content to the header + sal_Bool GotoFooterTxt(); // jump from the content to the footer // jump to the header/footer of the given or current 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; - BOOL GotoNextTOXBase( const String* = 0 ); - BOOL GotoPrevTOXBase( const String* = 0 ); - BOOL GotoTOXMarkBase(); + sal_Bool GotoNextTOXBase( const String* = 0 ); + sal_Bool GotoPrevTOXBase( const String* = 0 ); + sal_Bool GotoTOXMarkBase(); // jump to the next or previous index entry - BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE ); + sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True ); // jump to the next/previous index mark of this type const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir ); // jump to the next or previous table formula // optionally only to broken formulas - 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 ); - 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 ); // get the nth character from the start or end of the current selection - sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 ); - BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 ); + sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 ); + sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, xub_StrLen nCount = 1 ); // Place only the visible cursor at the given position in the document. // Return FALSE if SPoint was corrected by layout. // (This is needed for displaying the Drag&Drop/Copy-Cursor.) - BOOL SetVisCrsr( const Point &rPt ); + sal_Bool SetVisCrsr( const Point &rPt ); inline void UnSetVisCrsr(); // jump to the next or previous field of the corresponding type - BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext, - USHORT nSubType = USHRT_MAX, - USHORT nResType = USHRT_MAX ); - BOOL GotoFld( const SwFmtFld& rFld ); + sal_Bool MoveFldType( const SwFieldType* pFldType, sal_Bool bNext, + sal_uInt16 nSubType = USHRT_MAX, + sal_uInt16 nResType = USHRT_MAX ); + sal_Bool GotoFld( const SwFmtFld& rFld ); // Return number of cursors in ring (The flag indicates whether // only cursors containing selections are requested). - USHORT GetCrsrCnt( BOOL bAll = TRUE ) const; + sal_uInt16 GetCrsrCnt( sal_Bool bAll = sal_True ) const; // Char Travelling - methods (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(); // get position from current cursor - 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 ); } // delete all created cursors, set the table cursor and the last cursor to // its TextNode (or StartNode?) // They all get created on the next ::GetCrsr again // Used for Drag&Drop/Clipboard-Paste in tables - BOOL ParkTblCrsr(); + sal_Bool ParkTblCrsr(); // Non expanded attributes? - 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; } // is the whole document protected/hidden (for UI...) - BOOL IsAllProtect() const { return bAllProtect; } + sal_Bool IsAllProtect() const { return bAllProtect; } #ifdef SW_CRSR_TIMER // Set flag at VisCrsr. Is it triggered by Timer (TRUE) or directly (FALSE). // Default is triggert by Timer. - BOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE ); + sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True ); #endif - BOOL BasicActionPend() const { return nBasicActionCnt != nStartAction; } + sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; } - BOOL GotoRegion( const String& rName ); + sal_Bool GotoRegion( const String& rName ); // show the current selection virtual void MakeSelVisible(); // set the cursor to a NOT protected/hidden 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 ); const SwPostItField* GetPostItFieldAtCursor() const; @@ -775,39 +785,39 @@ 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; - 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(); // gets called when a table selection gets created in UpdateCrsr without // the UI knowing of it 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: @@ -841,12 +851,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 ); } @@ -855,35 +865,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(); } @@ -901,7 +911,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 0066b28e2aca..8393174b7837 100644 --- a/sw/inc/crsskip.hxx +++ b/sw/inc/crsskip.hxx @@ -36,9 +36,9 @@ // 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 00595afbcb8c..53a449e7e804 100644 --- a/sw/inc/crstate.hxx +++ b/sw/inc/crstate.hxx @@ -45,11 +45,11 @@ enum SwFillMode struct SwFillCrsrPos { SwRect aCrsr; // position and size of the ShadowCursor - USHORT nParaCnt; // number of paragraphs to insert - USHORT nTabCnt; // number of tabs respectively size of indentation - USHORT nSpaceCnt; // number of spaces to insert - USHORT nColumnCnt; // number of necessary column breaks - sal_Int16 eOrient; // paragraph alignment + sal_uInt16 nParaCnt; // number of paragraphs to insert + sal_uInt16 nTabCnt; // number of tabs respectively size of indentation + sal_uInt16 nSpaceCnt; // number of spaces to insert + sal_uInt16 nColumnCnt; // number of necessary column breaks + sal_Int16 eOrient; // paragraph alignment SwFillMode eMode; // desired fill-up rule SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) : nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ), @@ -70,7 +70,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 }; /** @@ -111,8 +111,8 @@ struct Sw2LinesPos struct SwSpecialPos { xub_StrLen nCharOfst; - USHORT nLineOfst; - BYTE nExtendRange; + sal_uInt16 nLineOfst; + sal_uInt8 nExtendRange; // #i27615# SwSpecialPos() : nCharOfst(0), nLineOfst(0), @@ -139,31 +139,31 @@ struct SwCrsrMoveState SwSpecialPos* pSpecialPos; // for positions inside fields Point aRealHeight; // contains then the position/height of the cursor CrsrMoveState eState; - BYTE nCursorBidiLevel; - BOOL bStop :1; - BOOL bRealHeight :1; // should the real height be calculated? - BOOL bFieldInfo :1; // should be fields recognized? - BOOL bPosCorr :1; // Point had to be corrected - BOOL bFtnNoInfo :1; // recognized footnote numbering - BOOL bExactOnly :1; // let GetCrsrOfst look for exact matches only, + sal_uInt8 nCursorBidiLevel; + sal_Bool bStop :1; + sal_Bool bRealHeight :1; // should the real height be calculated? + sal_Bool bFieldInfo :1; // should be fields recognized? + sal_Bool bPosCorr :1; // Point had to be corrected + sal_Bool bFtnNoInfo :1; // recognized footnote numbering + sal_Bool bExactOnly :1; // let GetCrsrOfst look for exact matches only, // i.e. never let it run into GetCntntPos - BOOL bFillRet :1; // only used temporary in FillMode - BOOL bSetInReadOnly :1; // ReadOnly areas may be entered - 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; // only used temporary in FillMode + sal_Bool bSetInReadOnly :1; // ReadOnly areas may be entered + 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 ), // #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 ), // #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 ), // #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 ), // #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 f06d77fee4d6..a28f146123a0 100644 --- a/sw/inc/cshtyp.hxx +++ b/sw/inc/cshtyp.hxx @@ -49,19 +49,19 @@ extern SwPosPage fnPageStart, fnPageEnd; // Direction-parameter for MovePara (initialized in SwCntntFrm). typedef SwMoveFnCollection* SwPosPara; -typedef BOOL (*SwWhichPara)( SwPaM&, SwPosPara ); +typedef sal_Bool (*SwWhichPara)( SwPaM&, SwPosPara ); extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext; extern SwPosPara fnParaStart, fnParaEnd; // Direction-parameter for MoveSection. typedef SwMoveFnCollection* SwPosSection; -typedef BOOL (*SwWhichSection)( SwPaM&, SwPosSection ); +typedef sal_Bool (*SwWhichSection)( SwPaM&, SwPosSection ); extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext; extern SwPosSection fnSectionStart, fnSectionEnd; // Direction-parameter for 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; // Direction-parameter for MoveRegion (ranges!) 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 9b2795f9149b..8273b39ce119 100644 --- a/sw/inc/dbfld.hxx +++ b/sw/inc/dbfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _DBFLD_HXX -#define _DBFLD_HXX +#ifndef SW_DBFLD_HXX +#define SW_DBFLD_HXX #include "swdllapi.h" #include "fldbas.hxx" @@ -61,8 +61,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -74,30 +74,30 @@ 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* ); // Current text. inline void SetExpansion(const String& rStr); - virtual String Expand() const; - virtual SwField* Copy() const; - virtual USHORT GetSubType() const; - virtual void SetSubType(USHORT nType); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); - // Name or content. - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; // For calculations in expressions. - void ChgValue( double d, BOOL bVal ); + void ChgValue( double d, sal_Bool bVal ); // Get the evaluation via DBMgr string. 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; } // Get name. 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline void SwDBField::SetExpansion(const String& rStr) { aContent = rStr; } // set from UpdateExpFlds (the Node-Position is known there) -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 @@ -157,12 +157,12 @@ public: SwDBData GetDBData(SwDoc* pDoc); void SetDBData(const SwDBData& rDBData); - // Name or content. - virtual String GetCntnt(BOOL bName = FALSE) 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 String GetFieldName() const; + + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); }; /*-------------------------------------------------------------------- @@ -184,7 +184,7 @@ public: class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField { String aCond; - BOOL bCondValid; + sal_Bool bCondValid; public: SwDBNextSetField( SwDBNextSetFieldType*, @@ -194,20 +194,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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; } /*-------------------------------------------------------------------- @@ -231,7 +231,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); @@ -239,8 +239,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 @@ -252,14 +252,14 @@ public: virtual void SetPar2(const String& rStr); // Number of data record is 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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; } /*-------------------------------------------------------------------- @@ -272,7 +272,7 @@ class SwDBNameFieldType : public SwFieldType public: SwDBNameFieldType(SwDoc*); - String Expand(ULONG) const; + String Expand(sal_uLong) const; virtual SwFieldType* Copy() const; }; @@ -283,12 +283,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -312,7 +312,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; @@ -320,8 +320,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline long SwDBSetNumberField::GetSetNumber() const @@ -330,6 +330,6 @@ inline long SwDBSetNumberField::GetSetNumber() const inline void SwDBSetNumberField::SetSetNumber(long nNum) { nNumber = nNum; } -#endif // _DBFLD_HXX +#endif // SW_DBFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx index 11a30f4e026f..fdedacbb5232 100644 --- a/sw/inc/dbgoutsw.hxx +++ b/sw/inc/dbgoutsw.hxx @@ -48,7 +48,6 @@ struct SwPosition; class SwPaM; class SwNodeNum; class SwUndo; -class SwUndos; class SwRect; class SwFrmFmt; class SwFrmFmts; @@ -87,7 +86,6 @@ SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos); SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam); SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum); SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo); -SW_DLLPUBLIC const char * dbg_out(const SwUndos & rUndos); SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter); SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule); SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt); diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx index 0b47de63a758..3c16000c5f89 100644 --- a/sw/inc/dbmgr.hxx +++ b/sw/inc/dbmgr.hxx @@ -74,7 +74,6 @@ struct SwDBFormatData class SwView; class SwWrtShell; -class SwPrtOptions; class SfxProgress; class ListBox; class Button; @@ -114,16 +113,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) {} @@ -133,16 +132,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; @@ -150,7 +149,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 @@ -176,7 +175,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), @@ -202,21 +201,21 @@ friend class SwConnectionDisposedListener_Impl; String sEMailAddrFld; // Mailing: Column name of email address. String sSubject; // Mailing: Subject String sAttached; // Mailing: Attached Files. - USHORT nMergeType; - BOOL bInitDBFields : 1; - BOOL bSingleJobs : 1; // Printing job when called from Basic. - BOOL bCancel : 1; // Mail merge save canceled. - - 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_Bool bSingleJobs : 1; // Printing job when called from Basic. + sal_Bool bCancel : 1; // Mail merge save canceled. + + 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 * ); @@ -228,36 +227,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(); // Current merge type. Cf. 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; } // Merging of data records into fields. - BOOL MergeNew( const SwMergeDescriptor& rMergeDesc ); - BOOL Merge(SwWrtShell* pSh); + sal_Bool MergeNew( const SwMergeDescriptor& rMergeDesc ); + sal_Bool Merge(SwWrtShell* pSh); // Initialize data fields that lack name of database. - 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; } // Print / Save mail merge one by one or all together. - 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: Set email data. inline void SetEMailColumn(const String& sColName) { sEMailAddrFld = sColName; } @@ -266,22 +265,22 @@ public: // Fill listbox with all table names of a database. - BOOL GetTableNames(ListBox* pListBox, const String& rDBName ); + sal_Bool GetTableNames(ListBox* pListBox, const String& rDBName ); // Fill listbox with all column names of a database table. - 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, @@ -290,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 @@ -317,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); @@ -347,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 4509c1e60cf8..07044bce0182 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -76,7 +76,7 @@ SwRect GetBoundRectOfAnchoredObj( const SdrObject* pObj ); SwContact* GetUserCall( const SdrObject* ); // Returns TRUE if the SrdObject is a Marquee object. -BOOL IsMarqueeTextObj( const SdrObject& rObj ); +sal_Bool IsMarqueeTextObj( const SdrObject& rObj ); // Base class for the following contact objects (frame + draw objects). class SwContact : public SdrObjUserCall, public SwClient @@ -306,7 +306,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); @@ -373,7 +373,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 1d87806fd238..877377ab3d74 100644 --- a/sw/inc/ddefld.hxx +++ b/sw/inc/ddefld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _DDEFLD_HXX -#define _DDEFLD_HXX +#ifndef SW_DDEFLD_HXX +#define SW_DDEFLD_HXX #include <sfx2/lnkbase.hxx> #include "swdllapi.h" @@ -46,35 +46,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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(); } @@ -89,7 +89,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; } }; /*-------------------------------------------------------------------- @@ -98,13 +98,14 @@ public: class SwDDEField : public SwField { +private: + virtual String Expand() const; + virtual SwField* Copy() const; + public: SwDDEField(SwDDEFieldType*); ~SwDDEField(); - virtual String Expand() const; - virtual SwField* Copy() const; - // Get parameter via types. // Name cannot be changed. virtual const String& GetPar1() const; @@ -115,6 +116,6 @@ public: }; -#endif // _DDEFLD_HXX +#endif // SW_DDEFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 604c4bfdbfdd..44480a7012b7 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _DOC_HXX -#define _DOC_HXX +#ifndef SW_DOC_HXX +#define SW_DOC_HXX /** SwDoc interfaces */ @@ -35,7 +35,6 @@ #include <IDocumentDeviceAccess.hxx> #include <IDocumentMarkAccess.hxx> #include <IDocumentRedlineAccess.hxx> -#include <IDocumentUndoRedo.hxx> #include <IDocumentLinksAdministration.hxx> #include <IDocumentFieldsAccess.hxx> #include <IDocumentContentOperations.hxx> @@ -62,7 +61,6 @@ class SwList; #include <sal/macros.h> #include "swdllapi.h" #include <swtypes.hxx> -#include <ndarr.hxx> #include <swatrset.hxx> #include <toxe.hxx> // enums #include <flyenum.hxx> @@ -73,6 +71,7 @@ class SwList; #include <com/sun/star/linguistic2/XHyphenatedWord.hpp> #include <rtl/ref.hxx> #include <svx/svdtypes.hxx> +#include <sfx2/objsh.hxx> #include <svl/style.hxx> #include <editeng/numitem.hxx> #include "comphelper/implementationreference.hxx" @@ -91,8 +90,6 @@ class SwList; #include <boost/scoped_ptr.hpp> -class SfxObjectShell; -class SfxObjectShellRef; class SvxForbiddenCharactersTable; class SwExtTextInput; class DateTime; @@ -152,6 +149,7 @@ class SwNewDBMgr; class SwNoTxtNode; class SwNodeIndex; class SwNodeRange; +class SwNodes; class SwNumRule; class SwNumRuleTbl; class SwPageDesc; @@ -185,10 +183,6 @@ class SwTextBlocks; class SwTxtFmtColl; class SwTxtFmtColls; class SwURLStateChanged; -class SwUndo; -class SwUndoIds; -class SwUndoIter; -class SwUndos; class SwUnoCrsr; class SwUnoCrsrTbl; class ViewShell; @@ -218,12 +212,15 @@ class SwPrintData; class SwRenderData; class SwPageFrm; class SwViewOption; +class IDocumentUndoRedo; namespace sw { namespace mark { class MarkManager; }} namespace sw { class MetaFieldManager; + class UndoManager; + class IShellCursorSupplier; } namespace com { namespace sun { namespace star { @@ -259,7 +256,6 @@ class SW_DLLPUBLIC SwDoc : public IDocumentSettingAccess, public IDocumentDeviceAccess, public IDocumentRedlineAccess, - public IDocumentUndoRedo, public IDocumentLinksAdministration, public IDocumentFieldsAccess, public IDocumentContentOperations, @@ -283,9 +279,8 @@ class SW_DLLPUBLIC SwDoc : //---------------- private Member -------------------------------- // ------------------------------------------------------------------- - SwNodes aNodes; // document content - SwNodes aUndoNodes; // content for undo - SwAttrPool* mpAttrPool; // attribute pool + ::boost::scoped_ptr<SwNodes> m_pNodes; /// document content (Nodes Array) + SwAttrPool* mpAttrPool; // der Attribut Pool SwPageDescs aPageDescs; // PageDescriptors Link aOle2Link; // OLE 2.0-notification /* @@@MAINTAINABILITY-HORROR@@@ @@ -303,6 +298,7 @@ class SW_DLLPUBLIC SwDoc : const ::boost::scoped_ptr< ::sw::mark::MarkManager> pMarkManager; const ::boost::scoped_ptr< ::sw::MetaFieldManager > m_pMetaFieldManager; + const ::boost::scoped_ptr< ::sw::UndoManager > m_pUndoManager; // ------------------------------------------------------------------- // Pointer @@ -328,8 +324,6 @@ class SW_DLLPUBLIC SwDoc : SwRootFrm *pLayout; // Rootframe of the specific layout. SdrModel *pDrawModel; // StarView Drawing - SwUndos *pUndos; // Undo/Redo History - SwDocUpdtFld *pUpdtFlds; // Struct for updating fields SwFldTypes *pFldTypes; SwNewDBMgr *pNewDBMgr; // Pointer to the new DBMgr for @@ -350,8 +344,8 @@ class SW_DLLPUBLIC SwDoc : SvxMacroTableDtor *pMacroTable; // table of macros. SwDocShell *pDocShell; // Ptr to SfxDocShell of Doc. - SfxObjectShellRef* pDocShRef; // For copying OLE-nodes. (If no DocShell - // is set, this Ref-Pointer must be set!!). + SfxObjectShellLock xTmpDocShell; // A temporary shell that is used to copy OLE-Nodes + sfx2::LinkManager *pLinkMgr; // List of linked stuff (graphics/DDE/OLE). @@ -412,9 +406,6 @@ private: // ------------------------------------------------------------------- // other - sal_uInt16 nUndoPos; // act. Undo-InsertPosition (for Redo!). - sal_uInt16 nUndoSavePos; // Position in Undo-Array, at which document. - // is regarded as not modified. sal_uInt16 nUndoCnt; // Count of Undo Actions. sal_uInt16 nUndoSttEnd; // != 0 -> within parentheses. @@ -449,15 +440,12 @@ private: // and unfortunately temorarily also in // SwSwgReader::InLayout() when flawed // frames need deletion. - bool mbUndo : 1; // TRUE: Undo switched on. - bool mbGroupUndo : 1; // TRUE: Undos are grouped. bool mbPageNums : 1; // TRUE: There are virtual page numbers. bool mbLoaded : 1; // TRUE: Doc loaded. bool mbUpdateExpFld : 1; // TRUE: Update expression fields. bool mbNewDoc : 1; // TRUE: new Doc. bool mbNewFldLst : 1; // TRUE: Rebuild field-list. bool mbCopyIsMove : 1; // TRUE: Copy is a hidden Move. - bool mbNoDrawUndoObj : 1; // TRUE: Do not save DrawUndoObjects. bool mbVisibleLinks : 1; // TRUE: Links are inserted visibly. bool mbBrowseMode : 1; // TRUE: Show document in browser mode. bool mbInReading : 1; // TRUE: Document is in the process of being read. @@ -477,9 +465,9 @@ private: bool mbIsRedlineMove : 1; // True: Redlines are moved into to / out of the section. 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; // #i38810# // flag indicating, that the links have been updated. bool mbClipBoard : 1; // TRUE: this document represents the clipboard @@ -487,7 +475,7 @@ private: // (clipboard docs only) #if OSL_DEBUG_LEVEL > 1 - bool mbXMLExport : 1; // TRUE: during XML export + bool mbXMLExport : 1; // sal_True: during XML export #endif // Document flag to trigger conversion, which applys the workaround for documents, @@ -504,59 +492,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; @@ -570,10 +558,10 @@ private: bool mbUseFormerObjectPos : 1; // #i11860# bool mbUseFormerTextWrapping : 1; bool mbConsiderWrapOnObjPos : 1; // #i28701# - // TRUE: object positioning algorithm has - // to consider the wrapping style of + // sal_True: object positioning algorithm has consider the wrapping style of // the floating screen objects as given by its attribute 'WrapInfluenceOnObjPos' // floating screen objects as given by its // attribute 'WrapInfluenceOnObjPos'. + bool mbMathBaselineAlignment : 1; // TL 2010-10-29 #i972# // non-ui-compatibility flags: bool mbOldNumbering : 1; @@ -602,13 +590,10 @@ private: sal_Bool mbStartIdleTimer; // idle timer mode start/stop static SwAutoCompleteWord *pACmpltWords; // List of all words for AutoComplete - static sal_uInt16 nUndoActions; // Count of Undo ::com::sun::star::chaos::Action //---------------- private methods ------------------------------ void checkRedlining(RedlineMode_t& _rReadlineMode); - sal_Bool DelUndoObj( sal_uInt16 nEnde ); // Deletes all UndoObjects from the beginning - // up to the indicated point. DECL_LINK( AddDrawUndo, SdrUndoAction * ); // DrawModel @@ -636,7 +621,7 @@ private: const bool bCopyFlyAtFly = false ) const; sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool bNewFrms ); - 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 ); void CopyFmtArr( const SvPtrarr& rSourceArr, SvPtrarr& rDestArr, @@ -688,8 +673,8 @@ private: // Update charts of given table. 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 ); // Our own 'IdleTimer' calls the following method DECL_LINK( DoIdleJobs, Timer * ); @@ -697,9 +682,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& ); @@ -721,8 +706,8 @@ public: /* @@@MAINTAINABILITY-HORROR@@@ Implementation details made public. */ - SwNodes& GetNodes() { return aNodes; } - const SwNodes& GetNodes() const { return aNodes; } + SwNodes & GetNodes() { return *m_pNodes; } + SwNodes const& GetNodes() const { return *m_pNodes; } /** IInterface */ @@ -734,8 +719,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 rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable(); virtual const rtl::Reference<SvxForbiddenCharactersTable>& getForbiddenCharacterTable() const; virtual sal_uInt16 getLinkUpdateMode( /*[in]*/bool bGlobalSettings ) const; @@ -755,7 +740,7 @@ public: virtual void setReferenceDeviceType(/*[in]*/ bool bNewVirtual,/*[in]*/ bool bNewHiRes ); virtual const JobSetup* getJobsetup() const; virtual void setJobsetup(/*[in]*/ const JobSetup& rJobSetup ); - virtual SwPrintData* getPrintData() const; + virtual const SwPrintData & getPrintData() const; virtual void setPrintData(/*[in]*/ const SwPrintData& rPrtData); /** IDocumentMarkAccess @@ -796,36 +781,8 @@ public: /** IDocumentUndoRedo */ - virtual void SetUndoNoResetModified(); - virtual bool IsUndoNoResetModified() const; - virtual void DoUndo(bool bUn); - virtual bool DoesUndo() const; - virtual void DoGroupUndo(bool bUn); - virtual bool DoesGroupUndo() const; - virtual bool Undo(SwUndoIter& ); - virtual SwUndoId StartUndo(SwUndoId eUndoId, const SwRewriter * pRewriter); - virtual SwUndoId EndUndo(SwUndoId eUndoId, const SwRewriter * pRewriter); - virtual void DelAllUndoObj(); - virtual SwUndoId GetUndoIds(String* pStr, SwUndoIds *pUndoIds) const; - virtual String GetUndoIdsStr(String* pStr, SwUndoIds *pUndoIds) const; - virtual bool HasUndoId(SwUndoId eId) const; - virtual const SwNodes* GetUndoNds() const; - virtual SwUndo* RemoveLastUndo(SwUndoId eUndoId); - virtual bool HasTooManyUndos() const; - virtual bool Redo(SwUndoIter&); - virtual SwUndoId GetRedoIds(String* pStr, SwUndoIds *pRedoIds) const; - virtual String GetRedoIdsStr(String* pStr, SwUndoIds *pRedoIds) const; - virtual bool Repeat(SwUndoIter&, sal_uInt16 nRepeatCnt); - virtual SwUndoId GetRepeatIds(String* pStr, SwUndoIds *pRedoIds) const; - virtual String GetRepeatIdsStr(String* pStr, SwUndoIds *pRedoIds) const; - virtual void AppendUndo(SwUndo*); - virtual void ClearRedo(); - virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition ); - virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const; - - /** Query / set count of Undo-Actions. */ - static sal_uInt16 GetUndoActionCount(); - static void SetUndoActionCount(sal_uInt16 nNew); + IDocumentUndoRedo & GetIDocumentUndoRedo(); + IDocumentUndoRedo const& GetIDocumentUndoRedo() const; /** IDocumentLinksAdministration */ @@ -833,7 +790,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); @@ -850,7 +807,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); @@ -861,9 +818,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; @@ -1073,18 +1030,18 @@ public: // in FlySet/FrmFmt. /* 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 ); @@ -1190,7 +1147,7 @@ public: sal_Bool bTxtAttr = sal_True, 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 ); // Set attribute in given format. // If Undo is activated, the old one is listed in Undo-History. @@ -1198,7 +1155,7 @@ public: void SetAttr( const SfxItemSet&, SwFmt& ); // method to reset a certain attribute at the given format - void ResetAttrAtFormat( const USHORT nWhichId, + void ResetAttrAtFormat( const sal_uInt16 nWhichId, SwFmt& rChangedFormat ); // Set attribute as new default attribute in current document. @@ -1237,16 +1194,16 @@ 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 ); } SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom, - BOOL bBroadcast = FALSE, - BOOL bAuto = TRUE ); - void DelCharFmt(sal_uInt16 nFmt, BOOL bBroadcast = FALSE); - void DelCharFmt(SwCharFmt* pFmt, BOOL bBroadcast = FALSE); + sal_Bool bBroadcast = sal_False, + sal_Bool bAuto = sal_True ); + 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 ); } @@ -1256,13 +1213,13 @@ public: const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; } 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 ); // Add 4th optional parameter <bResetListAttrs>. // 'side effect' of <SetTxtFmtColl> with <bReset = true> is that the hard // attributes of the affected text nodes are cleared, except the break @@ -1368,15 +1325,15 @@ 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 ); - void DelPageDesc( const String & rName, BOOL bBroadcast = FALSE); - void DelPageDesc( sal_uInt16 i, BOOL bBroadcast = FALSE ); + sal_Bool FindPageDesc( const String & rName, sal_uInt16 * pFound ); + void DelPageDesc( const String & rName, sal_Bool bBroadcast = sal_False); + void DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast = sal_False ); void PreDelPageDesc(SwPageDesc * pDel); 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); // The html import sometimes overwrites the // page sizes set in the page descriptions. This function is used to @@ -1395,7 +1352,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; @@ -1484,7 +1441,7 @@ public: // Accept changes of outline styles for OUtlineRule. // re-use unused 3rd parameter - // 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. @@ -1518,7 +1475,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 ); sal_uInt16 FindNumRule( const String& rName ) const; @@ -1526,8 +1483,8 @@ public: // Deletion only possible if ::com::sun::star::chaos::Rule is not used! 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(); // Update all invalids. @@ -1547,12 +1504,12 @@ public: 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 @@ -1596,20 +1553,20 @@ public: // The array holds the positions of the columns (not their widths). /* 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 ); // If index is in a table, return TableNode, else 0. SwTableNode* IsIdxInTbl( const SwNodeIndex& rIdx ); @@ -1659,14 +1616,14 @@ 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 ); // Direct access for UNO. 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 for table/table selection. sal_Bool SetTableAutoFmt( const SwSelBoxes& rBoxes, const SwTableAutoFmt& rNew ); @@ -1674,8 +1631,7 @@ public: // Query attributes. sal_Bool GetTableAutoFmt( const SwSelBoxes& rBoxes, SwTableAutoFmt& rGet ); - // Set up InsertDB as table Undo: - void AppendUndoForInsertFromDB( const SwPaM& rPam, BOOL bIsTable ); + void AppendUndoForInsertFromDB( const SwPaM& rPam, sal_Bool bIsTable ); sal_Bool SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff ); @@ -1730,7 +1686,7 @@ public: // Insert label. If a FlyFormat is created, return it. 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( @@ -1743,6 +1699,7 @@ public: // Search an EditShell or, if appropriate, a ViewShell via layout. SwEditShell* GetEditShell( ViewShell** ppSh = 0 ) const; + ::sw::IShellCursorSupplier * GetIShellCursorSupplier(); // OLE 2.0-notification. inline void SetOle2Link(const Link& rLink) {aOle2Link = rLink;} @@ -1773,10 +1730,10 @@ public: const SwDocShell* GetDocShell() const { return pDocShell; } void SetDocShell( SwDocShell* pDSh ); - // If a DocShell has to be created during copying of OLE-Nodes - // the Ref-Pointer MUST be set! - SfxObjectShellRef* GetRefForDocShell() { return pDocShRef; } - void SetRefForDocShell( SfxObjectShellRef* p ) { pDocShRef = p; } + // in case during copying of embedded object a new shell is created, + // it should be set here and cleaned later + void SetTmpDocShell( SfxObjectShellLock rLock ) { xTmpDocShell = rLock; } + SfxObjectShellLock GetTmpDocShell() { return xTmpDocShell; } // For Autotexts? (Textbausteine) They have only one SVPersist at their disposal. SfxObjectShell* GetPersist() const; @@ -1795,9 +1752,6 @@ public: bool IsCopyIsMove() const { return mbCopyIsMove; } void SetCopyIsMove( bool bFlag ) { mbCopyIsMove = bFlag; } - // For Draw-Undo: actions on Flys we want to handle ourselves. - bool IsNoDrawUndoObj() const { return mbNoDrawUndoObj; } - void SetNoDrawUndoObj( bool bFlag ) { mbNoDrawUndoObj = bFlag; } SwDrawContact* GroupSelection( SdrView& ); void UnGroupSelection( SdrView& ); sal_Bool DeleteSelection( SwDrawView& ); @@ -1838,15 +1792,13 @@ public: inline SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ); inline const SvNumberFormatter* GetNumberFormatter( sal_Bool bCreate = sal_True ) const; - // Delete non-visible ::com::sun::star::ucb::Content from document, e.g. - // hidden ranges, hidden paragraphes. - sal_Bool RemoveInvisibleContent(); - - //restore the invisible content if it's available on the undo stack - sal_Bool RestoreInvisibleContent(); + bool HasInvisibleContent() const; + /// delete invisible content, like hidden sections and paragraphs + bool RemoveInvisibleContent(); + /// restore the invisible content if it's available on the undo stack + bool RestoreInvisibleContent(); - // Replace fields by text - mailmerge support. - BOOL ConvertFieldsToText(); + sal_Bool ConvertFieldsToText(); // Create sub-documents according to given collection. // If no collection is given, use chapter styles for 1st level. @@ -1946,10 +1898,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 ); @@ -1972,12 +1924,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 @@ -1985,18 +1937,18 @@ 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 ); // 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); @@ -2020,7 +1972,7 @@ public: */ String GetPaMDescr(const SwPaM & rPaM) const; - BOOL IsFirstOfNumRule(SwPosition & rPos); + sal_Bool IsFirstOfNumRule(SwPosition & rPos); // access methods for XForms model(s) @@ -2068,6 +2020,8 @@ public: com::sun::star::uno::Reference< com::sun::star::container::XNameContainer > GetVBATemplateToProjectCache() { return m_xTemplateToProjectCache; }; ::sfx2::IXmlIdRegistry& GetXmlIdRegistry(); ::sw::MetaFieldManager & GetMetaFieldManager(); + ::sw::UndoManager & GetUndoManager(); + ::sw::UndoManager const& GetUndoManager() const; SfxObjectShell* CreateCopy(bool bCallInitNew) const; }; diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx index 144c8e87ef30..52c2fe08df5e 100644 --- a/sw/inc/docary.hxx +++ b/sw/inc/docary.hxx @@ -70,14 +70,7 @@ SV_DECL_PTRARR_DEL( SwFldTypes, SwFldTypePtr, INIT_FLDTYPES, GROW_FLDTYPES ) typedef SwTOXType* SwTOXTypePtr; SV_DECL_PTRARR_DEL( SwTOXTypes, SwTOXTypePtr, 0, 1 ) -// Undo -#define INIT_UNDOS 5 -#define GROW_UNDOS 5 - // Array of Undo-history. -typedef SwUndo* SwUndoPtr; -SV_DECL_PTRARR_DEL( SwUndos, SwUndoPtr, INIT_UNDOS, GROW_UNDOS ) - typedef SwSectionFmt* SwSectionFmtPtr; SV_DECL_PTRARR_DEL(SwSectionFmts,SwSectionFmtPtr,0,4) @@ -91,28 +84,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 ); // Search next or previous Redline with the same Seq. No. // Search can be restricted via Lookahaed. // Using 0 or USHRT_MAX makes search the whole 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 d42d7eb423e6..a20d9d54f7a4 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -100,28 +100,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 ); // Make DocInfo known to the Doc. SW_DLLPRIVATE virtual SfxDocumentInfoDialog* CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &); // OLE-stuff - SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, USHORT); + SW_DLLPRIVATE virtual void Draw( OutputDevice*, const JobSetup&, sal_uInt16); // Methods for 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(); // for InitNew and HtmlSourceMode. @@ -163,14 +163,14 @@ public: // OLE-stuff. 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 &); @@ -193,24 +193,24 @@ public: void UpdateChildWindows(); // global IO. - virtual BOOL Save(); + virtual sal_Bool Save(); // For Style PI. virtual SfxStyleSheetBasePool* GetStyleSheetPool(); // For 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 ); @@ -250,11 +250,11 @@ public: virtual void LoadStyles( SfxObjectShell& rSource ); - void _LoadStyles( SfxObjectShell& rSource, BOOL bPreserveCurrentDocument ); + void _LoadStyles( SfxObjectShell& rSource, sal_Bool bPreserveCurrentDocument ); // Display dialog for page style. If required display column page. void FormatPage( const String& rPage, - BOOL bColumn = FALSE, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0 ); // #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 9c36ed834779..554d506be414 100644 --- a/sw/inc/docstat.hxx +++ b/sw/inc/docstat.hxx @@ -34,18 +34,18 @@ 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; - ULONG nCharExcludingSpaces; - BOOL bModified; + sal_uLong nAllPara; + sal_uLong nWord; + sal_uLong nChar; + sal_uLong nCharExcludingSpaces; + sal_Bool bModified; SwDocStat(); void Reset(); diff --git a/sw/inc/docstyle.hxx b/sw/inc/docstyle.hxx index 6dded2703ca6..620074a7efbb 100644 --- a/sw/inc/docstyle.hxx +++ b/sw/inc/docstyle.hxx @@ -75,7 +75,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase SwDoc& rDoc; SfxItemSet aCoreSet; - BOOL bPhysical; + sal_Bool bPhysical; // Make empty shell a real StyleSheet (Core). @@ -88,7 +88,7 @@ class SW_DLLPUBLIC SwDocStyleSheet : public SfxStyleSheetBase FillPhysical }; - SW_DLLPRIVATE BOOL FillStyleSheet( FillStyleType eFType ); + SW_DLLPRIVATE sal_Bool FillStyleSheet( FillStyleType eFType ); protected: virtual ~SwDocStyleSheet(); @@ -98,19 +98,19 @@ 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); - // 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. @@ -124,8 +124,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 ); // Preset the members without physical access. // Used by StyleSheetPool. @@ -134,13 +134,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); @@ -151,7 +151,7 @@ public: const SwNumRule* GetNumRule(); void SetNumRule(const SwNumRule& rRule); - virtual BOOL IsUsed() const; + virtual sal_Bool IsUsed() const; }; /*-------------------------------------------------------------------- @@ -163,21 +163,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); @@ -190,34 +190,34 @@ class SwDocStyleSheetPool : public SfxStyleSheetBasePool { rtl::Reference< SwDocStyleSheet > mxStyleSheet; SwDoc& rDoc; - BOOL bOrganizer : 1; // TRUE: for Organizer. + sal_Bool bOrganizer : 1; // 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 2114e7c0ee83..177229930bdb 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _DOCUFLD_HXX -#define _DOCUFLD_HXX +#ifndef SW_DOCUFLD_HXX +#define SW_DOCUFLD_HXX #include <tools/date.hxx> @@ -151,15 +151,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; }; @@ -170,11 +170,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; @@ -183,9 +183,9 @@ public: virtual String GetPar2() const; virtual void SetPar2(const String& rStr); - virtual USHORT GetSubType() 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_uInt16 GetSubType() const; + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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,38 +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 GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + 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); @@ -396,10 +397,10 @@ public: virtual String GetPar2() const; - virtual USHORT GetSubType() const; + virtual sal_uInt16 GetSubType() 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -421,7 +422,7 @@ public: class SwHiddenParaField : public SwField { String aCond; - BOOL bIsHidden:1; + sal_Bool bIsHidden:1; public: // Direct input, delete old value. SwHiddenParaField(SwHiddenParaFieldType*, const String& rCond); @@ -429,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; } //Query, set 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -461,7 +462,10 @@ class SW_DLLPUBLIC SwMacroField : public SwField { String aMacro; String aText; - BOOL bIsScriptURL; + sal_Bool bIsScriptURL; + + virtual String Expand() const; + virtual SwField* Copy() const; public: // Direct input, delete old value. @@ -473,9 +477,7 @@ public: String GetMacroName() const; SvxMacro GetSvxMacro() const; - virtual String GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; // Library and FileName virtual const String& GetPar1() const; @@ -484,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 ); }; @@ -547,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); virtual String GetDescription() const; }; @@ -561,31 +563,32 @@ 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; -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); - - virtual void SetSubType(USHORT); - virtual USHORT GetSubType() const; - virtual void SetLanguage(USHORT nLng); virtual String Expand() const; - virtual String GetCntnt(BOOL bName = FALSE) const; virtual SwField* Copy() const; + +public: + 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(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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -601,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; @@ -647,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; @@ -659,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -684,7 +687,7 @@ public: // Overlay in order to update all RefPageGet-fields. virtual void Modify( SfxPoolItem *, SfxPoolItem * ); - USHORT MakeSetList( _SetGetExpFlds& rTmpLst ); + sal_uInt16 MakeSetList( _SetGetExpFlds& rTmpLst ); SwDoc* GetDoc() const { return pDoc; } }; @@ -705,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -745,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -772,11 +775,11 @@ class SwScriptField : public SwField String sCode; // Code as text. // Code as JavaCode ? - BOOL bCodeURL; // Code contains URL of a script. + sal_Bool bCodeURL; // Code contains URL of a script. public: SwScriptField( SwScriptFieldType*, const String& rType, - const String& rCode, BOOL bURL=FALSE ); + const String& rCode, sal_Bool bURL=sal_False ); virtual String GetDescription() const; @@ -790,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -828,11 +831,11 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -#endif // _DOCUFLD_HXX +#endif // SW_DOCUFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index a5f1e451a434..6c25476e1293 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -41,18 +41,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 d2075b01547e..ef46ae19bb42 100644 --- a/sw/inc/edglbldc.hxx +++ b/sw/inc/edglbldc.hxx @@ -43,14 +43,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 ); @@ -60,7 +60,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; } // For sorting. inline int operator==( const SwGlblDocContent& rCmp ) const diff --git a/sw/inc/edimp.hxx b/sw/inc/edimp.hxx index c7e6aab8a544..8fc4f8fe2f20 100644 --- a/sw/inc/edimp.hxx +++ b/sw/inc/edimp.hxx @@ -51,15 +51,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 ) @@ -70,11 +70,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 71a438c27ddb..b9c747b22ffd 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -73,7 +73,6 @@ class SwFmtRefMark; class SwNumRule; -class SwUndoIds; class SwTxtFmtColl; class SwGrfNode; class SwFlyFrmFmt; @@ -123,6 +122,10 @@ namespace sfx2{ class LinkManager; } +namespace sw { + class UndoRedoContext; +} + #define GETSELTXT_PARABRK_TO_BLANK 0 #define GETSELTXT_PARABRK_KEEP 1 #define GETSELTXT_PARABRK_TO_ONLYCR 2 @@ -167,7 +170,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell // that will be used by GetGraphic() and GetGraphicSize(). 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 ); @@ -176,7 +179,7 @@ class SW_DLLPUBLIC SwEditShell: public SwCrsrShell public: // Edit (all selected ranges). - 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 & ); @@ -185,14 +188,14 @@ public: // bRegExpRplc - replace tabs (\\t) and insert found string (not \&). // E.g.: 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 ); // Delete content of all ranges. // If whole nodes are selected, these nodes get deleted. long Delete(); // Remove a complete paragraph. - BOOL DelFullPara(); + sal_Bool DelFullPara(); // Change text to Upper/Lower/Hiragana/Katagana/... void TransliterateText( sal_uInt32 nType ); @@ -202,17 +205,17 @@ public: // Delete non-visible content in the document. // E.g. hidden ranges, hidden paragraphs. - 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(); // Embedds all local links (ranges/graphics). - USHORT GetLinkUpdMode(BOOL bDocSettings = FALSE) const; - void SetLinkUpdMode( USHORT nMode ); + sal_uInt16 GetLinkUpdMode(sal_Bool bDocSettings = sal_False) const; + void SetLinkUpdMode( sal_uInt16 nMode ); // Copy content of all ranges at current position of cursor to given Shell. long Copy( SwEditShell* pDestShell = 0 ); @@ -221,59 +224,59 @@ public: // If table is copied into table, move all cursors away from it. // Copy and Paste must be in FEShell because of FlyFrames! // Copy all selections and the document. - 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(); // If cursor is in a INetAttribute it will be deleted completely // including the descriptive text (needed at drag & drop). - BOOL DelINetAttrWithText(); + sal_Bool DelINetAttrWithText(); // If Cursor is at the end of a character style in which the DontExpand-flag // is not yet set, the latter will be set (==> return TRUE). - BOOL DontExpandFmt(); + sal_Bool DontExpandFmt(); // Apply / remove attributes. // Returns attributs in required AttributeSet. // When not unambiguous the set has a DONT_CARE !! // 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 ); // Set attribute as new default attribute in document. void SetDefault( const SfxPoolItem& ); // Query default attribute of document. - 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; @@ -290,8 +293,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; // #i62675# @@ -300,25 +303,25 @@ public: bool bResetListAttrs = false ); 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; // Return "Auto-Collection" with given Id. If it does not exist create it. - SwTxtFmtColl* GetTxtCollFromPool( USHORT nId ); + SwTxtFmtColl* GetTxtCollFromPool( sal_uInt16 nId ); // Return required automatic format base class. - SwFmt* GetFmtFromPool( USHORT nId ); + SwFmt* GetFmtFromPool( sal_uInt16 nId ); // Return required automatic page style. - SwPageDesc* GetPageDescFromPool( USHORT nId ); + SwPageDesc* GetPageDescFromPool( sal_uInt16 nId ); // Query if the paragraph-/character-/frame-/page-style is used. - BOOL IsUsed( const SwModify& ) const; + sal_Bool IsUsed( const SwModify& ) const; // Return required automatic 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 ); } void Insert2(SwField&, const bool bForceExpandHints = false); @@ -326,12 +329,12 @@ public: void UpdateFlds( SwField & ); // One single field. - 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 ); @@ -346,17 +349,17 @@ 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 ); // For evaluation of DB fields (new DB-manager). @@ -365,7 +368,7 @@ public: SwFieldType* InsertFldType(const SwFieldType &); // Changes in document? - BOOL IsModified() const; + sal_Bool IsModified() const; void SetModified(); void ResetModified(); void SetUndoNoResetModified(); @@ -378,31 +381,31 @@ public: void DeleteTOXMark(SwTOXMark* pMark); // Get all marks at current SPoint. - USHORT GetCurTOXMarks(SwTOXMarks& rMarks) const ; + sal_uInt16 GetCurTOXMarks(SwTOXMarks& rMarks) const ; // Insert content table. Renew if required. 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 ); // After reading file update all content tables. - void SetUpdateTOX( BOOL bFlag = TRUE ); - BOOL IsUpdateTOX() const; + void SetUpdateTOX( sal_Bool bFlag = sal_True ); + sal_Bool IsUpdateTOX() const; // Manage types of content tables. - 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 @@ -411,30 +414,30 @@ public: void ApplyAutoMark(); // Key for managing index. - USHORT GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const; + sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, SvStringsSort& rArr ) const; void SetOutlineNumRule(const SwNumRule&); const SwNumRule* GetOutlineNumRule() const; - BOOL OutlineUpDown( short nOffset = 1 ); + sal_Bool OutlineUpDown( short nOffset = 1 ); - BOOL MoveOutlinePara( short nOffset = 1); + sal_Bool MoveOutlinePara( short nOffset = 1); - BOOL IsProtectedOutlinePara() const; + sal_Bool IsProtectedOutlinePara() const; // Returns numbering rulse pf current enumeration list (else FALSE). const SwNumRule* GetCurNumRule() const; // If there is not already a numbering, set one, else change. // Works with old and new rules. Update only differences. - // 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. // 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*/, @@ -442,18 +445,18 @@ public: const bool bResetIndentAttrs = false ); // Paragraphs without enumeration but with indents. - BOOL NoNum(); + sal_Bool NoNum(); // Delete, split enumeration list. void DelNumRules(); - BOOL NumUpDown( BOOL bDown = TRUE ); + sal_Bool NumUpDown( sal_Bool bDown = sal_True ); - 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 ); // Switch on/off of numbering via Delete/Backspace. - BOOL NumOrNoNum( BOOL bDelete = FALSE, BOOL bChkStart = TRUE); + sal_Bool NumOrNoNum( sal_Bool bDelete = sal_False, sal_Bool bChkStart = sal_True); // #i23726# // #i90078# @@ -462,15 +465,15 @@ public: void ChangeIndentOfAllListLevels( short nDiff ); // 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; - BOOL IsNoNum( BOOL bChkStart = TRUE ) const; + sal_Bool IsNoNum( sal_Bool bChkStart = sal_True ) const; // Return Num-Level of the node in which point of cursor is. // Return values can be: NO_NUMBERING, // 0..MAXLEVEL-1, NO_NUMLEVEL .. NO_NUMLEVEL|MAXLEVEL-1 - BYTE GetNumLevel() const; + sal_uInt8 GetNumLevel() const; // Detect highest and lowest level to check moving of outline levels. void GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower ); @@ -480,20 +483,20 @@ public: int GetCurrentParaOutlineLevel( ) const;// #outlinelevel add by zhaojianwei // i29560 - BOOL HasNumber() const; - BOOL HasBullet() const; + sal_Bool HasNumber() const; + sal_Bool HasBullet() const; - 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 ); // Set (and query if) a numbering with StartFlag starts at current PointPos. - 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 ); - 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. // in case a list style is found, <sListId> holds the list id, to which the @@ -507,10 +510,10 @@ public: // Undo. // Maintain UndoHistory in Document. // Reset UndoHistory at Save, SaveAs, Create ??? - 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(); // Undo: set up Undo parenthesis, return nUndoId of this parenthesis. @@ -519,35 +522,21 @@ public: // Closes parenthesis of nUndoId, not used by UI. SwUndoId EndUndo( SwUndoId eUndoId = UNDO_EMPTY, const SwRewriter * pRewriter = 0 ); - // Returns Id of last undo-able action. Fills VARARR with User-UndoIds if required. - SwUndoId GetUndoIds( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const; - String GetUndoIdsStr( String* pUndoStr = 0, SwUndoIds *pUndoIds = 0) const; - - // Get count of possible undo-actions. - static USHORT GetUndoActionCount(); - - // Query count of possible undo-actions. - static void SetUndoActionCount( USHORT nNew ); - - // Redo. - // Returns Id of las undo-able action. Fills VARARR with RedoIds if required. - SwUndoId GetRedoIds( String* pRedoStr = 0, SwUndoIds *pRedoIds = 0) const; - String GetRedoIdsStr( String* pRedoStr = 0, SwUndoIds *pRedoIds = 0) const; + bool GetLastUndoInfo(::rtl::OUString *const o_pStr, + SwUndoId *const o_pId) const; + bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const; + SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const; - // Repeat. - // Returns Id of last repeatable action. Fills VARARR with RedoIds if required. - SwUndoId GetRepeatIds( String* pRepeatStr = 0, SwUndoIds *pRedoIds = 0) const; - String GetRepeatIdsStr( String* pRepeatStr = 0, - SwUndoIds *pRedoIds = 0) const; + /// is it forbidden to modify cursors via API calls? + bool CursorsLocked() const; + /// set selections to those contained in the UndoRedoContext + /// should only be called by sw::UndoManager! + void HandleUndoRedoContext(::sw::UndoRedoContext & rContext); + bool Undo(sal_uInt16 const nCount = 1); + bool Redo(sal_uInt16 const nCount = 1); + bool Repeat(sal_uInt16 const nCount); - // 0 if last action, else actions until start of parenthesis nUndoId - // with KillPaMs, ClearMark. - BOOL Undo(SwUndoId nUndoId = UNDO_EMPTY, USHORT nCnt = 1 ); - - USHORT Repeat( USHORT nCount ); - - USHORT Redo( USHORT nCnt = 1 ); // For all views of this document. void StartAllAction(); @@ -557,10 +546,10 @@ public: void CalcLayout(); // Determine form of content. Return Type at CurCrsr->SPoint. - USHORT GetCntType() const; + sal_uInt16 GetCntType() const; // Are there frames, footnotes, etc. - BOOL HasOtherCnt() const; + sal_Bool HasOtherCnt() const; // Apply ViewOptions with Start-/EndAction. inline void ApplyViewOptions( const SwViewOption &rOpt ); @@ -568,17 +557,17 @@ public: // Query text within selection. // Returns FALSE, if selected range is too large to be copied // into string buffer or if other errors occur. - BOOL GetSelectedText( String &rBuf, + sal_Bool GetSelectedText( String &rBuf, int nHndlParaBreak = GETSELTXT_PARABRK_TO_BLANK ); // Returns graphic, if CurCrsr->Point() points to a SwGrfNode // (and mark is not set or points to the same graphic). - 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 ); @@ -588,7 +577,7 @@ public: void ClearAutomaticContour(); // Returns the size of a graphic in Twips if cursor is in a graphic. - BOOL GetGrfSize(Size&) const; + sal_Bool GetGrfSize(Size&) const; // Returns name and filter of a graphic if the cursor is in a graphic, // else give a rap on the knuckles! @@ -607,8 +596,7 @@ public: // #i73788# // Remove default parameter, because method always called this default value. Graphic GetIMapGraphic() const; // Returns a graphic for all Flys! - - const SwFlyFrmFmt* FindFlyByName( const String& rName, BYTE nNdTyp = 0 ) const; + const SwFlyFrmFmt* FindFlyByName( const String& rName, sal_uInt8 nNdTyp = 0 ) const; // Returns a ClientObject, if CurCrsr->Point() points to a SwOLENode // (and mark is neither set not pointint to same ClientObject) @@ -616,7 +604,7 @@ public: svt::EmbeddedObjectRef& GetOLEObject() const; // Is there an OLEObject with this name (SwFmt)? - BOOL HasOLEObj( const String &rName ) const; + sal_Bool HasOLEObj( const String &rName ) const; // Returns pointer to the data of the chart in which Cursr is. void SetChartName( const String &rName ); @@ -632,15 +620,15 @@ public: // Make current selection glossary and insert into glossary document // including styles. - 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 ); // Save complete content of doc as glossary. - 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 ); // Linguistics... // Save selections. @@ -649,7 +637,7 @@ public: // restore selections. void HyphEnd(); com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> - HyphContinue( USHORT* pPageCnt, USHORT* pPageSt ); + HyphContinue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt ); void HyphIgnore(); @@ -657,47 +645,47 @@ public: void InsertSoftHyph( const xub_StrLen nHyphPos ); 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; TblChgMode GetTblChgMode() const; void SetTblChgMode( TblChgMode eMode ); // Split table at cursor position. - BOOL SplitTable( USHORT eMode ); + sal_Bool SplitTable( sal_uInt16 eMode ); // Merge tables. // Can Merge checks if Prev or Next are possible. // If pointer pChkNxtPrv is passed possible direction is given. - 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 ); // Set up InsertDB as table Undo. - void AppendUndoForInsertFromDB( BOOL bIsTable ); + void AppendUndoForInsertFromDB( sal_Bool bIsTable ); // Functions used for spell checking and text conversion. @@ -708,7 +696,7 @@ public: // Restore selections. 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 @@ -728,10 +716,10 @@ public: 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 > @@ -752,12 +740,12 @@ public: // Return names of all references set in document. // If ArrayPointer == 0 then return only whether a RefMark is set in document. - USHORT GetRefMarks( SvStringsDtor* = 0 ) const; + sal_uInt16 GetRefMarks( SvStringsDtor* = 0 ) const; // Call AutoCorrect - 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 ); // Set our styles according to the respective rules. void AutoFormat( const SvxSwAutoFmtFlags* pAFlags = 0 ); @@ -768,33 +756,31 @@ public: // Calculates selection. 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 ); - 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 ); // Query and set footnote-text/number. Set.. to current SSelection! - BOOL GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); + sal_Bool GetCurFtn( SwFmtFtn* pToFillFtn = 0 ); bool SetCurFtn( const SwFmtFtn& rFillFtn ); bool HasFtns( bool bEndNotes = false ) const; - // USHORT GetFtnCnt( BOOL bEndNotes = FALSE ) const; //Currently not required. - + sal_uInt16 GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes = false ); // Return list of all footnotes and their first portions of text. - USHORT 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; // Returns current range like Cet CurrSection(). But this function iterates @@ -802,17 +788,17 @@ public: // a footnote the reference of which is in a columned range. // If bOutOfTab is set, the range comprising the table is searched // and not an inner one. - 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; @@ -822,7 +808,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 @@ -833,16 +819,16 @@ public: bool CanSpecialInsert() const; // Optimizing 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 ); // Query NumberFormater from document. SvNumberFormatter* GetNumberFormatter(); @@ -850,38 +836,39 @@ public: { return ((SwEditShell*)this)->GetNumberFormatter(); } // Interfaces for GlobalDocument. - 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 ); // For 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 ); // Search Redline for this Data and return position in array. // If not found, return USHRT_MAX. - USHORT FindRedlineOfData( const SwRedlineData& ) const; + sal_uInt16 FindRedlineOfData( const SwRedlineData& ) const; + // Set comment to Redline at position. - BOOL SetRedlineComment( const String& rS ); + sal_Bool SetRedlineComment( const String& rS ); const SwRedline* GetCurrRedline() const; // Redline attributes have been changed. Updated views. @@ -903,12 +890,12 @@ public: void SetLineNumberInfo( const SwLineNumberInfo& rInfo); // Labels: Synchronize ranges. - void SetLabelDoc( BOOL bFlag = TRUE ); - BOOL IsLabelDoc() const; + void SetLabelDoc( sal_Bool bFlag = sal_True ); + sal_Bool IsLabelDoc() const; // Interface for TextInputData - (for input of Japanese/Chinese chars.) SwExtTextInput* CreateExtTextInput(LanguageType eInputLanguage); - String DeleteExtTextInput( SwExtTextInput* pDel = 0, BOOL bInsText = TRUE); + String DeleteExtTextInput( SwExtTextInput* pDel = 0, sal_Bool bInsText = sal_True); void SetExtTextInputData( const CommandExtTextInputData& ); // Interface for access to AutoComplete-list. @@ -916,7 +903,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 new file mode 100644 index 000000000000..31002c1875c8 --- /dev/null +++ b/sw/inc/errhdl.hxx @@ -0,0 +1,76 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _ERRHDL_HXX +#define _ERRHDL_HXX + +#ifdef DBG_UTIL + +#include <tools/solar.h> +#include <sal/types.h> +#include "swdllapi.h" + +extern sal_Bool bAssert; // sal_True, wenn eine ASSERT-Box hochkam + + +// ----------------------------------------------------------------------- +// Ausgabe einer Fehlermeldung inkl. Dateiname und Zeilennummer +// wo der Fehler auftrat. +// Die Funktion darf nicht direkt benutzt werden! +// ----------------------------------------------------------------------- +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) ) { \ + const char *_pErrorText = #message; \ + const char *_pFileName = __FILE__; \ + ::AssertFail( _pErrorText, _pFileName, __LINE__ ); \ + } + +// ----------------------------------------------------------------------- +// Prueft ob die angegebene Bedingung wahr ist, wenn nicht wird eine +// Fehlermeldung die ueber die ID Identifiziert wird, ausgegeben. +// ----------------------------------------------------------------------- +#define ASSERT_ID( cond, id ) \ + if( !(cond) ) { \ + const char *_pFileName = __FILE__; \ + ::AssertFail( (sal_uInt16)id, _pFileName, __LINE__ ); \ + } + + +// ----------------------------------------------------------------------- +// Beim Bilden der Produktversion werden alle Debug-Utilities automatisch +// ignoriert +// ----------------------------------------------------------------------- +#else +#define ASSERT( cond, message ) ; +#define ASSERT_ID( cond, id ) ; +#endif // PRODUCT + + + +#endif diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 4a2e654f131a..e80b2c264578 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _EXPFLD_HXX -#define _EXPFLD_HXX +#ifndef SW_EXPFLD_HXX +#define SW_EXPFLD_HXX #include <svl/svarray.hxx> #include "swdllapi.h" @@ -47,14 +47,14 @@ class SwEditShell; const SwTxtNode* GetBodyTxtNode( const SwDoc& pDoc, SwPosition& rPos, const SwFrm& rFrm ); -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 ); }; class SwGetExpFieldType : public SwValueFieldType @@ -84,46 +84,46 @@ public: class SW_DLLPUBLIC SwGetExpField : public SwFormulaField { String sExpand; - BOOL bIsInBodyTxt; - USHORT nSubType; + sal_Bool bIsInBodyTxt; + sal_uInt16 nSubType; bool bLateInitialization; // #i82544# + virtual String Expand() const; + virtual SwField* Copy() const; + 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 String Expand() const; - virtual SwField* Copy() const; + virtual void SetLanguage(sal_uInt16 nLng); inline const String& GetExpStr() const; inline void ChgExpStr(const String& rExpand); // Called by formating. - inline BOOL IsInBodyTxt() const; + inline sal_Bool IsInBodyTxt() const; // Set by UpdateExpFlds where node position is known. - inline void ChgBodyTxtFlag( BOOL bIsInBody ); + inline void ChgBodyTxtFlag( sal_Bool bIsInBody ); // For fields in header/footer/footnotes/flys: // Only called by formating!! void ChangeExpansion( const SwFrm&, const SwTxtFld& ); - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; // Change formula. 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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;} }; @@ -135,11 +135,11 @@ inline const String& SwGetExpField::GetExpStr() const { return sExpand; } // Called by formating. -inline BOOL SwGetExpField::IsInBodyTxt() const +inline sal_Bool SwGetExpField::IsInBodyTxt() const { return bIsInBodyTxt; } // Set by UpdateExpFlds where node position is known. -inline void SwGetExpField::ChgBodyTxtFlag( BOOL bIsInBody ) +inline void SwGetExpField::ChgBodyTxtFlag( sal_Bool bIsInBody ) { bIsInBodyTxt = bIsInBody; } class SwSetExpField; @@ -149,39 +149,39 @@ class SW_DLLPUBLIC SwSetExpFieldType : public SwValueFieldType String sName; const SwNode* pOutlChgNd; 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; } // Overlay, because set-field takes care for its being updated by itself. 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 ); // Number sequence fields chapterwise if required. 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 only for SwDoc::UpdateExpFld. @@ -189,17 +189,17 @@ public: 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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 @@ -211,18 +211,18 @@ 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 ); - virtual String Expand() const; - virtual SwField* Copy() const; - inline const String& GetExpStr() const; inline void ChgExpStr( const String& rExpand ); @@ -230,18 +230,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 String GetCntnt(BOOL bName = FALSE) 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; // Logical number, sequence fields. - 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; } // Query name only. virtual const String& GetPar1() const; @@ -249,8 +250,8 @@ public: // Query formula. 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; inline const String& SwSetExpField::GetExpStr() const @@ -265,13 +266,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()); } @@ -293,16 +294,18 @@ 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; + public: // Direct input via dialog; delete old value. 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 GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; // Content virtual const String& GetPar1() const; @@ -318,12 +321,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; /*-------------------------------------------------------------------- @@ -333,20 +336,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(); // Put all that are new into SortLst for updating. Returns count. // (For Glossary: only update its input-fields). // Compare TmpLst with current fields. - USHORT BuildSortLst(); + sal_uInt16 BuildSortLst(); void RemoveUnselectedFlds(); @@ -368,36 +371,39 @@ public: class SwTblField : public SwValueField, public SwTableFormula { String sExpand; - USHORT nSubType; + sal_uInt16 nSubType; + + virtual String Expand() const; + virtual SwField* Copy() const; // Search TextNode containing the field. virtual const SwNode* GetNodeOfFormula() const; + String GetCommand(); + 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 String Expand() const; - virtual SwField* Copy() const; + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType(sal_uInt16 nType); const String& GetExpStr() const { return sExpand; } void ChgExpStr(const String& rStr) { sExpand = rStr; } void CalcField( SwTblCalcPara& rCalcPara ); - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; // The formula. 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ); }; -#endif // _EXPFLD_HXX +#endif // SW_EXPFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/extinput.hxx b/sw/inc/extinput.hxx index d3fe1ffe32cd..9ce347e37902 100644 --- a/sw/inc/extinput.hxx +++ b/sw/inc/extinput.hxx @@ -41,8 +41,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 ); @@ -50,9 +50,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 0a95a246d380..48c7590dec11 100644 --- a/sw/inc/fchrfmt.hxx +++ b/sw/inc/fchrfmt.hxx @@ -70,12 +70,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // Pass to SwTxtCharFmt (from 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 d4c9b960498b..d7b646c678b6 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/embed/XClassifiedObject.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svx/svdobj.hxx> #include "swdllapi.h" @@ -71,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 -#define FLYPROTECT_SIZE (USHORT) 2 -#define FLYPROTECT_POS (USHORT) 4 -#define FLYPROTECT_PARENT (USHORT) 8 // Check only parents. -#define FLYPROTECT_FIXED (USHORT) 16 // Only protection that cannot be withdrawn +#define FLYPROTECT_CONTENT (sal_uInt16) 1 +#define FLYPROTECT_SIZE (sal_uInt16) 2 +#define FLYPROTECT_POS (sal_uInt16) 4 +#define FLYPROTECT_PARENT (sal_uInt16) 8 // Check only parents. +#define FLYPROTECT_FIXED (sal_uInt16) 16 // Only protection that cannot be withdrawn // e.g. by OLE-server; also relevant for dialog. // For figuring out contents by position (D&D) @@ -182,7 +183,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; @@ -199,26 +200,26 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell SW_DLLPRIVATE const SwFrm *GetBox( const Point &rPt, bool* pbRow = 0, bool* pbCol = 0 ) const; // 0 == not in any column. - 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; // Methods for copying of draw objects. - 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; @@ -232,17 +233,17 @@ public: virtual ~SwFEShell(); // Copy and Paste methods for internal 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-Method for 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 ); // Is selected frame within another frame? const SwFrmFmt* IsFlyInFly(); @@ -250,14 +251,14 @@ public: // If an object as been given, exactly this object is selected // (instead of searching over position). - 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(); // Move selection upwards or downwards (Z-Order). // TRUE = to top or bottom. // FALSE = run past one other. - void SelectionToTop ( BOOL bTop = TRUE ); - void SelectionToBottom( BOOL bBottom = TRUE ); + void SelectionToTop ( sal_Bool bTop = sal_True ); + void SelectionToBottom( sal_Bool bBottom = sal_True ); short GetLayerId() const; // 1 Heaven, 0 Hell, -1 Ambiguous. void SelectionToHeaven(); // Above document. @@ -273,7 +274,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 @@ -284,8 +285,8 @@ public: // pPt: Cursr or DocPos respectively; bStopAtFly: Stop at flys or continue over anchor. // Although (0,TRUE) is kind of a standard, the parameters are not defaulted here // in order to force more conscious use especially of bStopAtFly. - 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) /** check whether selected frame contains a control; * companion method to GetSelFrmType, used for preventing @@ -317,9 +318,9 @@ public: // Set size of draw objects. 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(); //Methods for status line. @@ -342,13 +343,13 @@ public: const SwFrmFmt* GetFmtFromAnyObj( const Point& rPt ) const; // Which Protection is set at selected object? - //!! 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; // Deliver graphic in rName besides graphic name. If graphic is // linked give name with path. rbLink is TRUE if graphic is linked. const Graphic *GetGrfAtPos( const Point &rDocPos, - String &rName, BOOL &rbLink ) const; + String &rName, sal_Bool &rbLink ) const; const String GetObjTitle() const; void SetObjTitle( const String& rTitle ); @@ -356,34 +357,36 @@ public: void SetObjDescription( const String& rDescription ); - 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; + // also determines, if frame or its environmane is in mongolianlayout (vertical left-to-right) + // - add output parameter <bVertL2R> + sal_Bool IsFrmVertical(const sal_Bool bEnvironment, sal_Bool& bRightToLeft, sal_Bool& bVertL2R) const; SwFrmFmt* GetCurFrmFmt() const; //If frame then frame style, else 0. - void SetFrmFmt( SwFrmFmt *pFmt, BOOL bKeepOrient = FALSE, Point* pDocPos = 0 ); //If frame then set frame style. + void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point* pDocPos = 0 ); //If frame then set frame style. const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); } // Find/delete fly containing the cursor. SwFrmFmt* WizzardGetFly(); // Independent selecting of 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); } // Iterate over flys - for 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; // If a fly is selected, it draws cursor into the first CntntFrm. const SwFrmFmt* SelFlyGrabCrsr(); @@ -419,21 +422,24 @@ 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; } // Set name at selected FlyFrame. void SetFlyName( const String& rName ); const String& GetFlyName() const; + // get reference to OLE object (if there is one) for selected FlyFrame + const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef() const; + // Created unique name for frame. String GetUniqueGrfName() const; String GetUniqueOLEName() const; String GetUniqueFrameName() const; // Jump to named Fly (graphic/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 ); // Position is a graphic with URL? const SwFrmFmt* IsURLGrfAtPos( const Point& rPt, String* pURL = 0, @@ -455,16 +461,16 @@ public: void CheckUnboundObjects(); // Attention: Ambiguities if multiple selections. - 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); // Set DragMode (e.g. Rotae), but do nothing when frame is selected. - void SetDragMode( UINT16 eSdrDragMode ); + void SetDragMode( sal_uInt16 eSdrDragMode ); - USHORT IsObjSelected() const; // Returns object count, but doesn't count the objects in groups. + sal_uInt16 IsObjSelected() const; // Returns object count, but doesn't count the objects in groups. sal_Bool IsObjSelected( const SdrObject& rObj ) const; void EndTextEdit(); // Deletes object if required. @@ -478,47 +484,47 @@ public: // or SDRCREATE_NEXTPOINT for a polygon may be relevant. // After RESTRAINTEND the object is created and selected. // BreakCreate interrupts the process. In this case no object is selected. - 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); // Functions for Rubberbox, ti select Draw-Objects - BOOL BeginMark( const Point &rPos ); + sal_Bool BeginMark( const Point &rPos ); void MoveMark ( const Point &rPos ); - BOOL EndMark (); + sal_Bool EndMark (); void BreakMark(); // Create and destroy group, don't when frame is selected. - BOOL IsGroupSelected(); // Can be a mixed selection! + sal_Bool IsGroupSelected(); // Can be a mixed selection! void GroupSelection(); // Afterwards the group is selected. void UnGroupSelection(); // The individual objects are selected, but // it is possible that there are groups included. bool IsGroupAllowed() const; - void MirrorSelection( BOOL bHorizontal ); //Vertical if FALSE. + void MirrorSelection( sal_Bool bHorizontal ); //Vertical if FALSE. // frmatr.hxx. Here no enum because of dependencies. - // BOOL value only for internal use! Anchor is newly set according + // bool value only for internal use! Anchor is newly set according // to current document position. Anchor is not re-set. - 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 ); // Get selected DrawObj as graphics (MetaFile/Bitmap). // Return value indicates if it was converted. - 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, @@ -532,32 +538,41 @@ 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# + // for starmath formulas anchored 'as char' it alignes it baseline to baseline + // changing the previous vertical orientation + void AlignFormulaToBaseline( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XEmbeddedObject >& xObj, SwFlyFrm * pFly = 0 ); + + // aligns all formulas with anchor 'as char' to baseline + void AlignAllFormulasToBaseline(); + // <-- + // Provide information about content situated closes to given 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); // Hide or show layout-selection and pass call to CrsrSh. void ShLooseFcs(); - void ShGetFcs( BOOL bUpdate = TRUE ); + void ShGetFcs( sal_Bool bUpdate = sal_True ); // PageDescriptor-interface 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; @@ -569,36 +584,36 @@ public: // Page number of the page containing Point, O if no page. - 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(); //Shutdown server. + sal_Bool FinishOLEObj(); //Shutdown server. void GetTblAttr( SfxItemSet & ) const; void SetTblAttr( const SfxItemSet & ); - BOOL HasWholeTabSelection() const; + sal_Bool HasWholeTabSelection() const; // Is content of a table cell or at least a table cell completely selected? - BOOL HasBoxSelection() const; + sal_Bool HasBoxSelection() const; - BOOL InsertRow( USHORT nCnt, BOOL bBehind ); - BOOL InsertCol( USHORT nCnt, BOOL bBehind ); // 0 == at the end. - BOOL DeleteCol(); - BOOL DeleteRow(); + sal_Bool InsertRow( sal_uInt16 nCnt, sal_Bool bBehind ); + sal_Bool InsertCol( sal_uInt16 nCnt, sal_Bool bBehind ); // 0 == at the end. + sal_Bool DeleteCol(); + sal_Bool DeleteRow(); - BOOL DeleteTblSel(); // Current selection, may be whole table. + sal_Bool DeleteTblSel(); // Current selection, may be whole table. - USHORT MergeTab(); // Merge selected parts of table. + sal_uInt16 MergeTab(); // Merge selected parts of table. // Return error via enum. // Split cell vertically or horizontally. - BOOL SplitTab( BOOL nVert = TRUE, USHORT nCnt = 1, BOOL bSameHeight = FALSE ); - BOOL Sort(const SwSortOptions&); + 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 ); @@ -608,115 +623,115 @@ public: void SetRowSplit( const SwFmtRowSplit &rSz ); void GetRowSplit( SwFmtRowSplit *&rpSz ) const; - void SetBoxAlign( USHORT nOrient ); - USHORT GetBoxAlign() const; // USHRT_MAX if ambiguous. + void SetBoxAlign( sal_uInt16 nOrient ); + sal_uInt16 GetBoxAlign() const; // USHRT_MAX if ambiguous. // Adjustment of Rowheights. Determine via bTstOnly if more than one row is selected. - 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 ambiguous. + sal_Bool GetBoxBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous. void SetBoxDirection( const SvxFrameDirectionItem& rNew ); - BOOL GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE ambiguous. + sal_Bool GetBoxDirection( SvxFrameDirectionItem& rToFill ) const; //FALSE ambiguous. void SetRowBackground( const SvxBrushItem &rNew ); - BOOL GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous. + sal_Bool GetRowBackground( SvxBrushItem &rToFill ) const; //FALSE ambiguous. - BYTE WhichMouseTabCol( const Point &rPt ) const; + sal_uInt8 WhichMouseTabCol( const Point &rPt ) const; void GetTabCols( SwTabCols &rToFill ) const; // Info about columns and margins. - 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 ); // pEnd will be used during MouseMove bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false ); 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(); // If a table selection exists it is destroyed in case // cursor is not allowed in readonly. void UnProtectCells(); // Refers to table selection. void UnProtectTbls(); // Unprotect all tables in selection. - 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 ); } // Adjusts cell widths in such a way, that their content // does not need to be wrapped (if possible). // bBalance provides for adjustment of selected columns. - void AdjustCellWidth( BOOL bBalance = FALSE ); + void AdjustCellWidth( sal_Bool bBalance = sal_False ); // Not allowed if only empty cells are selected. - BOOL IsAdjustCellWidthAllowed( BOOL bBalance = FALSE ) const; + sal_Bool IsAdjustCellWidthAllowed( sal_Bool bBalance = sal_False ) const; // Adjustment of cell-widths; determine via bTstOnly if more than one cell is selected. - BOOL BalanceCellWidth( BOOL bTstOnly ); + sal_Bool BalanceCellWidth( sal_Bool bTstOnly ); // AutoFormat for table/ table selection. - BOOL SetTableAutoFmt( const SwTableAutoFmt& rNew ); + sal_Bool SetTableAutoFmt( const SwTableAutoFmt& rNew ); - BOOL GetTableAutoFmt( SwTableAutoFmt& rGet ); + sal_Bool GetTableAutoFmt( SwTableAutoFmt& rGet ); - BOOL SetColRowWidthHeight( USHORT eType, USHORT nDiff = 283 ); + sal_Bool SetColRowWidthHeight( sal_uInt16 eType, sal_uInt16 nDiff = 283 ); - BOOL GetAutoSum( String& rFml ) const; + sal_Bool GetAutoSum( String& rFml ) const; // Phy: real page count. // Virt: consider offset that may have been set by user. - USHORT GetPhyPageNum(); + sal_uInt16 GetPhyPageNum(); - void SetNewPageOffset( USHORT nOffset ); - void SetPageOffset( USHORT nOffset ); //Changes last page offset. - USHORT GetPageOffset() const; //Returns last page offset. + void SetNewPageOffset( sal_uInt16 nOffset ); + void SetPageOffset( sal_uInt16 nOffset ); //Changes last page offset. + sal_uInt16 GetPageOffset() const; //Returns last page offset. 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 ); // The ruler needs some information too. - USHORT GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column. - USHORT GetCurMouseColNum( const Point &rPt, + sal_uInt16 GetCurColNum( SwGetCurColNumPara* pPara = 0 ) const; //0 == not in any column. + sal_uInt16 GetCurMouseColNum( const Point &rPt, SwGetCurColNumPara* pPara = 0 ) const; - USHORT GetCurTabColNum() const; //0 == not in any table. - USHORT GetCurMouseTabColNum( const Point &rPt ) const; - USHORT GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // Current outer column. + sal_uInt16 GetCurTabColNum() const; //0 == not in any table. + sal_uInt16 GetCurMouseTabColNum( const Point &rPt ) const; + sal_uInt16 GetCurOutColNum( SwGetCurColNumPara* pPara = 0 ) const; // Current outer column. - 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; // Width of current range for column-dialog. 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, @@ -752,7 +767,7 @@ public: void ParkCursorInTab(); SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot); - BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); + sal_Bool IsNumLabel( const Point &rPt, int nMaxOffset = -1 ); bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode, const Point& _rDocPos ) const; diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx index 23695335ade0..8c6c925d5bdf 100644 --- a/sw/inc/fldbas.hxx +++ b/sw/inc/fldbas.hxx @@ -25,10 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _FLDBAS_HXX -#define _FLDBAS_HXX - -#ifndef FIELDIDS_ONLY // SWG-Testreader!! +#ifndef SW_FLDBAS_HXX +#define SW_FLDBAS_HXX #include <i18npool/lang.h> #include <tools/debug.hxx> @@ -41,7 +39,6 @@ class SwDoc; class SvStringsDtor; class SvNumberFormatter; -#endif // FIELDIDS_ONLY enum RES_FIELDS { @@ -190,7 +187,7 @@ enum SwVarFormat }; -typedef USHORT SwGetSetExpType; +typedef sal_uInt16 SwGetSetExpType; namespace nsSwGetSetExpType { const SwGetSetExpType GSE_STRING = 0x0001; // String @@ -200,7 +197,7 @@ namespace nsSwGetSetExpType const SwGetSetExpType GSE_FORMULA = 0x0010; // Formula } -typedef USHORT SwExtendedSubType; +typedef sal_uInt16 SwExtendedSubType; namespace nsSwExtendedSubType { const SwExtendedSubType SUB_CMD = 0x0100; // Show command. @@ -229,15 +226,13 @@ enum SwDateTimeSubType TIMEFLD = 4 }; -#ifndef FIELDIDS_ONLY // SWG-Testreader!! - -extern USHORT aTypeTab[]; +extern sal_uInt16 aTypeTab[]; // General 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 FormatNumber(USHORT nNum, sal_uInt32 nFormat); +String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat); // Instances of SwFields and those derived from it occur 0 to n times. // For each class there is one instance of the associated type class. @@ -246,7 +241,7 @@ DBG_NAMEEX(SwFieldType) class SW_DLLPUBLIC SwFieldType : public SwModify { - USHORT nWhich; + sal_uInt16 nWhich; friend void _FinitUI(); // In order to delete pointer! static SvStringsDtor* pFldNames; @@ -255,22 +250,22 @@ class SW_DLLPUBLIC SwFieldType : public SwModify protected: // Single argument ctors shall be explicit. - explicit SwFieldType( USHORT nWhichId ); + explicit SwFieldType( sal_uInt16 nWhichId ); public: #if OSL_DEBUG_LEVEL > 1 virtual ~SwFieldType(); #endif - static const String& GetTypeStr( USHORT nTypeId ); + static const String& GetTypeStr( sal_uInt16 nTypeId ); // Only in derived classes. 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const; + virtual 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; }; @@ -287,8 +282,8 @@ class SW_DLLPUBLIC SwField { private: mutable String m_Cache; // Cached expansion (for clipboard). - USHORT nLang; // Always change via SetLanguage! - BOOL bIsAutomaticLanguage; + sal_uInt16 nLang; // Always change via SetLanguage! + sal_Bool bIsAutomaticLanguage; sal_uInt32 nFormat; SwFieldType* pType; @@ -299,7 +294,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(); @@ -310,18 +305,22 @@ public: virtual SwFieldType* ChgTyp( SwFieldType* ); /** expand the field. - @param bInClipboard field is in clipboard document? + @param bCached return cached field value. + @remark most callers should use the cached field value. + this is because various fields need special handing + (ChangeExpansion()) to return correct values, and only + SwTxtFormatter::NewFldPortion() sets things up properly. @return the generated text (suitable for display) */ - String ExpandField(bool const bInClipboard) const; + String ExpandField(bool const bCached) const; // Returns name or content. - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; SwField * CopyField() const; // ResId - USHORT Which() const + sal_uInt16 Which() const #if OSL_DEBUG_LEVEL > 1 ; // implemented in fldbas.cxx #else @@ -329,13 +328,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); // Language at field position. - inline USHORT GetLanguage() const; - virtual void SetLanguage(USHORT nLng); + inline sal_uInt16 GetLanguage() const; + virtual void SetLanguage(sal_uInt16 nLng); // Query parameters for dialog and for BASIC. inline sal_uInt32 GetFormat() const; @@ -348,15 +347,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); // Does the field possess an action on its ClickHandler? (e.g. INetFields, ...). - BOOL HasClickHdl() const; - BOOL IsFixed() const; + sal_Bool HasClickHdl() 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; }; @@ -367,7 +366,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; } @@ -375,20 +374,20 @@ inline USHORT SwField::GetLanguage() const class SwValueFieldType : public SwFieldType { SwDoc* pDoc; - BOOL bUseFormat; // Use number formatter. + sal_Bool bUseFormat; // Use number formatter. 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; }; @@ -398,21 +397,21 @@ class SW_DLLPUBLIC SwValueField : public SwField double fValue; 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); 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); @@ -434,7 +433,6 @@ public: String GetExpandedFormula() const; }; -#endif // FIELDIDS_ONLY -#endif // _FLDBAS_HXX +#endif // SW_FLDBAS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/flddat.hxx b/sw/inc/flddat.hxx index 9a2a535a4ee8..7ef3ce69d87c 100644 --- a/sw/inc/flddat.hxx +++ b/sw/inc/flddat.hxx @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _FLDDAT_HXX -#define _FLDDAT_HXX +#ifndef SW_FLDDAT_HXX +#define SW_FLDDAT_HXX #include <tools/string.hxx> @@ -104,39 +104,39 @@ public: class SW_DLLPUBLIC SwDateTimeField : public SwValueField { - USHORT nSubType; + sal_uInt16 nSubType; long nOffset; // Offset in minutes. + 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 String Expand() const; - virtual SwField* Copy() const; - - 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); }; -#endif // _FLDDAT_HXX +#endif // SW_FLDDAT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx index 6ad316a1281e..c0c9113566af 100644 --- a/sw/inc/flddropdown.hxx +++ b/sw/inc/flddropdown.hxx @@ -25,17 +25,14 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _FLDDROPDOWN_HXX -#define _FLDDROPDOWN_HXX +#ifndef SW_FLDDROPDOWN_HXX +#define SW_FLDDROPDOWN_HXX #include "com/sun/star/uno/Sequence.hxx" #include "swdllapi.h" #include "fldbas.hxx" -#ifndef INCLUDED_VECTOR #include <vector> -#define INCLUDED_VECTOR -#endif /** Field type for dropdown boxes. @@ -94,6 +91,23 @@ class SW_DLLPUBLIC SwDropDownField : public SwField */ String aToolTip; + /** + Expands the field. + + The expanded value of the field is the value of the selected + item. If no item is selected, an empty string is returned. + + @return the expanded value of the field + */ + virtual String Expand() const; + + /** + Creates a copy of this field. + + @return the copy of this field + */ + virtual SwField * Copy() const; + public: /** Constructor @@ -115,23 +129,6 @@ public: virtual ~SwDropDownField(); /** - Expands the field. - - The expanded value of the field is the value of the selected - item. If no item is selected, an empty string is returned. - - @return the expanded value of the field - */ - virtual String Expand() const; - - /** - Creates a copy of this field. - - @return the copy of this field - */ - virtual SwField * Copy() const; - - /** Returns the selected value. @see Expand @@ -224,10 +221,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. @@ -260,7 +257,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 bool QueryValue(com::sun::star::uno::Any &rVal, sal_uInt16 nWhichId) const; /** API: Sets a property value on the dropdown field. @@ -272,7 +269,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 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 315f72b4be35..9640afb8a675 100644 --- a/sw/inc/flypos.hxx +++ b/sw/inc/flypos.hxx @@ -41,18 +41,18 @@ class SW_DLLPUBLIC SwPosFlyFrm { const SwFrmFmt* pFrmFmt; // FlyFrmFmt SwNodeIndex* pNdIdx; // Index for node is sufficient. - UINT32 nOrdNum; + sal_uInt32 nOrdNum; public: - SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, USHORT nArrPos ); + SwPosFlyFrm( const SwNodeIndex& , const SwFrmFmt*, sal_uInt16 nArrPos ); virtual ~SwPosFlyFrm(); // Virtual for Writer (DLL !!) // Operators for 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 8e84dd87bbac..6595991eda1d 100644 --- a/sw/inc/fmtanchr.hxx +++ b/sw/inc/fmtanchr.hxx @@ -36,7 +36,7 @@ struct SwPosition; class IntlWrapper; -#define IVER_FMTANCHOR_LONGIDX ((USHORT)1) +#define IVER_FMTANCHOR_LONGIDX ((sal_uInt16)1) // FlyAnchors class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem @@ -45,14 +45,14 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem // Index for paragraph-bound frames. // Position for character-bound frames. RndStdIds nAnchorId; - USHORT nPageNum; // Page number for page-bound frames. + sal_uInt16 nPageNum; // Page number for page-bound frames. // #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(); @@ -67,24 +67,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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; } // #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 ad80534c3c47..ddcd2505735e 100644 --- a/sw/inc/fmtautofmt.hxx +++ b/sw/inc/fmtautofmt.hxx @@ -41,7 +41,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(); @@ -64,8 +64,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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 ba97935d3c92..aacb8a50562b 100644 --- a/sw/inc/fmtclbl.hxx +++ b/sw/inc/fmtclbl.hxx @@ -37,7 +37,7 @@ class SW_DLLPUBLIC SwFmtNoBalancedColumns : public SfxBoolItem { public: - SwFmtNoBalancedColumns( BOOL bFlag = FALSE ) + SwFmtNoBalancedColumns( sal_Bool bFlag = sal_False ) : SfxBoolItem( RES_COLUMNBALANCE, bFlag ) {} // "pure virtual methods" of SfxPoolItem @@ -45,10 +45,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 4ae400485e46..2ab58323b7c8 100644 --- a/sw/inc/fmtclds.hxx +++ b/sw/inc/fmtclds.hxx @@ -37,31 +37,31 @@ // ColumnDescriptor class SwColumn { - USHORT nWish; // Desired width, borders included. + sal_uInt16 nWish; // Desired width, borders included. // It is inversely proportional to the ratio of // desired width environment / current width column. - USHORT nUpper; // Top border. - USHORT nLower; // Bottom border. - USHORT nLeft; // Left border. - USHORT nRight; // Right border. + sal_uInt16 nUpper; // Top border. + sal_uInt16 nLower; // Bottom border. + sal_uInt16 nLeft; // Left border. + sal_uInt16 nRight; // Right border. 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; @@ -77,24 +77,24 @@ enum SwColLineAdj class SW_DLLPUBLIC SwFmtCol : public SfxPoolItem { - ULONG nLineWidth; // Width of the separator line. - Color aLineColor; // Color of the separator line. + sal_uLong nLineWidth; // Width of the separator line. + Color aLineColor; //color of the separator line - BYTE nLineHeight; // Percentile height of lines. + sal_uInt16 nLineHeight; // Percentile height of lines. // (Based on height of columns including UL). SwColLineAdj eAdj; // Line will be adjusted top, centered or bottom. SwColumns aColumns; // Information concerning the columns. - USHORT nWidth; // Total desired width of all columns. + sal_uInt16 nWidth; // Total desired width of all columns. - BOOL bOrtho; // Only if this flag is set, the setting of GutterWidth will + sal_Bool bOrtho; // Only if this flag is set, the setting of GutterWidth will // be accompanied by a "visual rearrangement". // The flag must be reset if widths of columns or borders are changed. // When it is set (again) the visual arrangement is recalculated. // The flag is initially set. - SW_DLLPRIVATE void Calc( USHORT nGutterWidth, USHORT nAct ); + SW_DLLPRIVATE void Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct ); public: SwFmtCol(); @@ -112,63 +112,63 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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(); } - 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 if ambiguous. // Return smallest width if bMin is true. - USHORT GetGutterWidth( BOOL bMin = FALSE ) const; + sal_uInt16 GetGutterWidth( sal_Bool bMin = sal_False ) const; - 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; } // This function allows to (repeatedly) initialize the columns. // The Ortho flag is set automatically. - void Init( USHORT nNumCols, USHORT nGutterWidth, USHORT nAct ); + void Init( sal_uInt16 nNumCols, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); // Adjusts borders for columns in aColumns. // If flag bOrtho is set, columns are visually re-arranged. // If the flag is not set, columns widths are not changed and // borders are adjusted. - void SetGutterWidth( USHORT nNew, USHORT nAct ); + void SetGutterWidth( sal_uInt16 nNew, sal_uInt16 nAct ); // This too re-arranges columns automatically if flag is set. // Only in this case the second parameter is needed and evaluated. - void SetOrtho( BOOL bNew, USHORT nGutterWidth, USHORT nAct ); + void SetOrtho( sal_Bool bNew, sal_uInt16 nGutterWidth, sal_uInt16 nAct ); //For the reader - void _SetOrtho( BOOL bNew ) { bOrtho = bNew; } + void _SetOrtho( sal_Bool bNew ) { bOrtho = bNew; } // Calculates current width of column nCol. // The ratio of desired width of this column to return value is // proportional to ratio of total desired value to nAct. - USHORT CalcColWidth( USHORT nCol, USHORT nAct ) const; + sal_uInt16 CalcColWidth( sal_uInt16 nCol, sal_uInt16 nAct ) const; // As above except that it returns the width of PrtArea - // that corresponds to what constitutes the column for the user. - 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 1e492cf37b3a..e7f526d8bca7 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 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 cba626baa102..501da07db0e3 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 46fbec471cb4..4f941e084132 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -39,16 +39,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: @@ -73,7 +73,7 @@ protected: 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 ), mbStayAssignedToListLevelOfOutlineStyle( false ), @@ -83,7 +83,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 ), @@ -101,7 +101,7 @@ public: inline void SetNextTxtFmtColl(SwTxtFmtColl& rNext); SwTxtFmtColl& GetNextTxtFmtColl() const { return *pNextTxtFmtColl; } - BOOL IsAtDocNodeSet() const; + sal_Bool IsAtDocNodeSet() const; void SetAttrOutlineLevel( int ); int GetAttrOutlineLevel() const; @@ -115,12 +115,12 @@ public: // 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 ); // Override <ResetAllFmtAttr()> to stay assigned to list level of outline style. - virtual USHORT ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFmtAttr(); inline bool StayAssignedToListLevelOfOutlineStyle() const { @@ -135,15 +135,15 @@ public: in TextNode and here in TxtCollection in order to make both the inheritance of and the access to set attributes function correctly! - 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 { @@ -198,19 +198,19 @@ enum Master_CollConditions class SW_DLLPUBLIC SwCollCondition : public SwClient { - ULONG nCondition; + sal_uLong nCondition; union { - ULONG nSubCondition; + sal_uLong nSubCondition; String* pFldExpression; } aSubCondition; public: TYPEINFO(); // Already in base class Client. - 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(); @@ -225,12 +225,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(); } }; @@ -260,7 +260,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 5880557e0704..dd56f0cf7b4b 100644 --- a/sw/inc/fmteiro.hxx +++ b/sw/inc/fmteiro.hxx @@ -39,8 +39,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 methos" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -51,10 +51,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 9ec54b325913..c6edb55fe82f 100644 --- a/sw/inc/fmtfld.hxx +++ b/sw/inc/fmtfld.hxx @@ -70,7 +70,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 ab0bc99a46b0..7f079d3ca9b2 100644 --- a/sw/inc/fmtfollowtextflow.hxx +++ b/sw/inc/fmtfollowtextflow.hxx @@ -39,7 +39,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(); @@ -56,10 +56,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 fc8bdead2bb7..9e8a05dd95cf 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -51,7 +51,7 @@ public: // "Pure virtual methods" of 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 ea89fa44e059..e3ef199d66cf 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; - BYTE nHeightPercent; + sal_uInt8 nWidthPercent; //Fuer Tabellen kann die Breite in Prozent + sal_uInt8 nHeightPercent; //angegeben sein. // For tables: width can be given in percent. @@ -81,8 +81,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SwFrmSize GetHeightSizeType() const { return eFrmHeightType; } void SetHeightSizeType( SwFrmSize eSize ) { eFrmHeightType = eSize; } @@ -98,16 +98,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 432bffa927a2..8c1315f8efb0 100644 --- a/sw/inc/fmtftn.hxx +++ b/sw/inc/fmtftn.hxx @@ -42,7 +42,7 @@ class SW_DLLPUBLIC SwFmtFtn: public SfxPoolItem friend class SwTxtFtn; SwTxtFtn* pTxtAttr; // My TextAttribute. String aNumber; // User-defined 'Number'. - USHORT nNumber; // Automatic numbering. + sal_uInt16 nNumber; //Automatische Nummerierung bool m_bEndNote; // Is it an End note? // Protected CopyCtor. @@ -58,11 +58,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 ) @@ -74,7 +74,7 @@ public: void GetFtnText( String& rStr ) const; // Returns string to be displayed of footnote / 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 f59b77955f8f..c7ecbafc2b10 100644 --- a/sw/inc/fmtftntx.hxx +++ b/sw/inc/fmtftntx.hxx @@ -49,11 +49,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 ), @@ -62,12 +62,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -75,7 +75,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 ); @@ -84,8 +84,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; } @@ -116,15 +116,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 cb3bb057926b..67134aabd75d 100644 --- a/sw/inc/fmthdft.hxx +++ b/sw/inc/fmthdft.hxx @@ -42,10 +42,10 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtHeader: public SfxPoolItem, public SwClient { - BOOL bActive; // Only for controlling (creation of content). + sal_Bool bActive; // Only for controlling (creation of content). public: - SwFmtHeader( BOOL bOn = FALSE ); + SwFmtHeader( sal_Bool bOn = sal_False ); SwFmtHeader( SwFrmFmt *pHeaderFmt ); SwFmtHeader( const SwFmtHeader &rCpy ); ~SwFmtHeader(); @@ -65,8 +65,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; } }; //Footer, for pageformats @@ -74,10 +74,10 @@ public: class SW_DLLPUBLIC SwFmtFooter: public SfxPoolItem, public SwClient { - BOOL bActive; // Only for controlling (creation of content). + sal_Bool bActive; // Only for controlling (creation of content). public: - SwFmtFooter( BOOL bOn = FALSE ); + SwFmtFooter( sal_Bool bOn = sal_False ); SwFmtFooter( SwFrmFmt *pFooterFmt ); SwFmtFooter( const SwFmtFooter &rCpy ); ~SwFmtFooter(); @@ -97,18 +97,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 6ffc653557dc..ae33b2ab492c 100644 --- a/sw/inc/fmtinfmt.hxx +++ b/sw/inc/fmtinfmt.hxx @@ -50,8 +50,8 @@ class SW_DLLPUBLIC SwFmtINetFmt: public SfxPoolItem String aName; // Name of the link. SvxMacroTableDtor* pMacroTbl; SwTxtINetFmt* pTxtAttr; // My TextAttribute. - USHORT nINetId; - USHORT nVisitedId; + sal_uInt16 nINetId; + sal_uInt16 nVisitedId; public: SwFmtINetFmt( const String& rURL, const String& rTarget ); SwFmtINetFmt( const SwFmtINetFmt& rAttr ); @@ -70,9 +70,9 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); const SwTxtINetFmt* GetTxtINetFmt() const { return pTxtAttr; } @@ -91,19 +91,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; } // Set a new MacroTable or clear the current one. void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; } // Macro getter and setter. - 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 d6ab919672ab..a98e90b8732d 100644 --- a/sw/inc/fmtline.hxx +++ b/sw/inc/fmtline.hxx @@ -38,8 +38,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtLineNumber: public SfxPoolItem { - ULONG nStartValue :24; // Starting value for the paragraph. 0 == no starting value. - ULONG bCountLines :1; // Also count lines of paragraph. + sal_uLong nStartValue :24; // Starting value for the paragraph. 0 == no starting value. + sal_uLong bCountLines :1; // Also count lines of paragraph. public: SwFmtLineNumber(); @@ -55,17 +55,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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 99126a0ba2eb..23914d3b067b 100644 --- a/sw/inc/fmtlsplt.hxx +++ b/sw/inc/fmtlsplt.hxx @@ -38,7 +38,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 methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -49,10 +49,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 8cf7d4c0b45d..459220c6007f 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -109,12 +109,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 4bde0fb62860..ac196412fba5 100644 --- a/sw/inc/fmtornt.hxx +++ b/sw/inc/fmtornt.hxx @@ -40,7 +40,7 @@ class IntlWrapper; -#define IVER_VERTORIENT_REL ((USHORT)0x0001) +#define IVER_VERTORIENT_REL ((sal_uInt16)0x0001) class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem { @@ -61,8 +61,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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; how and towards what does the FlyFrm orient itself horizontally? -#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; // Contains *always* the current RelPos. sal_Int16 eOrient; sal_Int16 eRelation; - BOOL bPosToggle : 1; // Flip position on even pages. + sal_Bool bPosToggle : 1; // Flip position on even pages. 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 methods" of 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual 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 { return bPosToggle; } - void SetPosToggle( BOOL bNew ) { bPosToggle = bNew; } + sal_Bool IsPosToggle() const { return bPosToggle; } + void SetPosToggle( sal_Bool bNew ) { bPosToggle = bNew; } }; inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy ) @@ -129,14 +129,14 @@ inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy return *this; } -inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(BOOL bInP) const +inline const SwFmtVertOrient &SwAttrSet::GetVertOrient(sal_Bool bInP) const { return (const SwFmtVertOrient&)Get( RES_VERT_ORIENT,bInP); } -inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(BOOL bInP) const +inline const SwFmtHoriOrient &SwAttrSet::GetHoriOrient(sal_Bool bInP) const { return (const SwFmtHoriOrient&)Get( RES_HORI_ORIENT,bInP); } -inline const SwFmtVertOrient &SwFmt::GetVertOrient(BOOL bInP) const +inline const SwFmtVertOrient &SwFmt::GetVertOrient(sal_Bool bInP) const { return aSet.GetVertOrient(bInP); } -inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(BOOL bInP) const +inline const SwFmtHoriOrient &SwFmt::GetHoriOrient(sal_Bool bInP) const { return aSet.GetHoriOrient(bInP); } #endif diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index b52ac1cd6074..307fcb6576ab 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -43,17 +43,17 @@ class IntlWrapper; // Pagedescriptor // Client of SwPageDesc that is "described" by the attribute. -#define IVER_FMTPAGEDESC_NOAUTO ((USHORT)0x0001) -#define IVER_FMTPAGEDESC_LONGPAGE ((USHORT)0x0002) +#define IVER_FMTPAGEDESC_NOAUTO ((sal_uInt16)0x0001) +#define IVER_FMTPAGEDESC_LONGPAGE ((sal_uInt16)0x0002) class SW_DLLPUBLIC SwFmtPageDesc : public SfxPoolItem, public SwClient { // This "Doc"-function is made friend in order to be able // to set the auto-flag after copying!! - friend BOOL InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, USHORT, + friend sal_Bool InsAttr( SwDoc*, const SwPaM &, const SfxItemSet&, sal_uInt16, SwHistory* ); - USHORT nNumOffset; // Offset page number. - USHORT nDescNameIdx; // SW3-Reader: stringpool-index of style name. + sal_uInt16 nNumOffset; // Offset page number. + sal_uInt16 nDescNameIdx; // SW3-Reader: stringpool-index of style name. SwModify* pDefinedIn; // Points to the object in which the // attribute was set (CntntNode/Format). @@ -73,16 +73,16 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew ); SwPageDesc *GetPageDesc() { return (SwPageDesc*)GetRegisteredIn(); } const SwPageDesc *GetPageDesc() const { return (SwPageDesc*)GetRegisteredIn(); } - USHORT GetNumOffset() const { return nNumOffset; } - void SetNumOffset( USHORT nNum ) { nNumOffset = nNum; } + sal_uInt16 GetNumOffset() const { return nNumOffset; } + void SetNumOffset( sal_uInt16 nNum ) { nNumOffset = nNum; } // Query / set where attribute is anchored. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -90,10 +90,10 @@ public: }; -inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwAttrSet::GetPageDesc(sal_Bool bInP) const { return (const SwFmtPageDesc&)Get( RES_PAGEDESC,bInP); } -inline const SwFmtPageDesc &SwFmt::GetPageDesc(BOOL bInP) const +inline const SwFmtPageDesc &SwFmt::GetPageDesc(sal_Bool bInP) const { return aSet.GetPageDesc(bInP); } #endif diff --git a/sw/inc/fmtrowsplt.hxx b/sw/inc/fmtrowsplt.hxx index 3ac1b2a2e527..4d6cdfe8f47f 100644 --- a/sw/inc/fmtrowsplt.hxx +++ b/sw/inc/fmtrowsplt.hxx @@ -38,7 +38,7 @@ class IntlWrapper; class SW_DLLPUBLIC SwFmtRowSplit : public SfxBoolItem { public: - SwFmtRowSplit( BOOL bSplit = TRUE ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} + SwFmtRowSplit( sal_Bool bSplit = sal_True ) : SfxBoolItem( RES_ROW_SPLIT, bSplit ) {} // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -49,10 +49,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(BOOL bInP) const +inline const SwFmtRowSplit &SwAttrSet::GetRowSplit(sal_Bool bInP) const { return (const SwFmtRowSplit&)Get( RES_ROW_SPLIT,bInP); } -inline const SwFmtRowSplit &SwFmt::GetRowSplit(BOOL bInP) const +inline const SwFmtRowSplit &SwFmt::GetRowSplit(sal_Bool bInP) const { return aSet.GetRowSplit(bInP); } #endif diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx index 0e2b39fb2e5c..bee5b6a3137b 100644 --- a/sw/inc/fmtruby.hxx +++ b/sw/inc/fmtruby.hxx @@ -41,9 +41,9 @@ class SW_DLLPUBLIC SwFmtRuby : public SfxPoolItem String sRubyTxt; // The ruby txt. String sCharFmtName; // Name of the charformat. SwTxtRuby* pTxtAttr; // The TextAttribute. - USHORT nCharFmtId; // PoolId of the charformat. - USHORT nPosition; // Position of the Ruby-character. - USHORT nAdjustment; // Specific adjustment of the Ruby-ch. + sal_uInt16 nCharFmtId; // PoolId of the charformat. + sal_uInt16 nPosition; // Position of the Ruby-character. + sal_uInt16 nAdjustment; // Specific adjustment of the Ruby-ch. public: SwFmtRuby( const String& rRubyTxt ); @@ -63,9 +63,9 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); const SwTxtRuby* GetTxtRuby() const { return pTxtAttr; } @@ -77,14 +77,14 @@ public: const String& GetCharFmtName() const { return sCharFmtName; } void SetCharFmtName( const String& rNm ) { sCharFmtName = rNm; } - USHORT GetCharFmtId() const { return nCharFmtId; } - void SetCharFmtId( USHORT nNew ) { nCharFmtId = nNew; } + sal_uInt16 GetCharFmtId() const { return nCharFmtId; } + void SetCharFmtId( sal_uInt16 nNew ) { nCharFmtId = nNew; } - USHORT GetPosition() const { return nPosition; } - void SetPosition( USHORT nNew ) { nPosition = nNew; } + sal_uInt16 GetPosition() const { return nPosition; } + void SetPosition( sal_uInt16 nNew ) { nPosition = nNew; } - USHORT GetAdjustment() const { return nAdjustment; } - void SetAdjustment( USHORT nNew ) { nAdjustment = nNew; } + sal_uInt16 GetAdjustment() const { return nAdjustment; } + void SetAdjustment( sal_uInt16 nNew ) { nAdjustment = nNew; } }; diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx index 0bedda9c181e..b8edae5a58c8 100644 --- a/sw/inc/fmtsrnd.hxx +++ b/sw/inc/fmtsrnd.hxx @@ -39,9 +39,9 @@ class IntlWrapper; // SwFmtSurround: How document content under the frame shall behave. class SW_DLLPUBLIC SwFmtSurround: public SfxEnumItem { - BOOL bAnchorOnly :1; - BOOL bContour :1; - BOOL bOutside :1; + sal_Bool bAnchorOnly :1; + sal_Bool bContour :1; + sal_Bool bOutside :1; public: SwFmtSurround( SwSurround eNew = SURROUND_PARALLEL ); SwFmtSurround( const SwFmtSurround & ); @@ -50,24 +50,24 @@ public: // "Pure virtual Methods" of SfxPoolItem. virtual int operator==( const SfxPoolItem& ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 0 ) const; - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SwSurround GetSurround()const { return SwSurround( GetValue() ); } - BOOL IsAnchorOnly() const { return bAnchorOnly; } - BOOL IsContour() const { return bContour; } - BOOL IsOutside() const { return bOutside; } - void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( USHORT( eNew ) ); } - void SetAnchorOnly( BOOL bNew ) { bAnchorOnly = bNew; } - void SetContour( BOOL bNew ) { bContour = bNew; } - void SetOutside( BOOL bNew ) { bOutside = bNew; } + sal_Bool IsAnchorOnly() const { return bAnchorOnly; } + sal_Bool IsContour() const { return bContour; } + sal_Bool IsOutside() const { return bOutside; } + void SetSurround ( SwSurround eNew ){ SfxEnumItem::SetValue( sal_uInt16( eNew ) ); } + void SetAnchorOnly( sal_Bool bNew ) { bAnchorOnly = bNew; } + void SetContour( sal_Bool bNew ) { bContour = bNew; } + void SetOutside( sal_Bool bNew ) { bOutside = bNew; } }; inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) @@ -79,10 +79,10 @@ inline SwFmtSurround &SwFmtSurround::operator=( const SwFmtSurround &rCpy ) return *this; } -inline const SwFmtSurround &SwAttrSet::GetSurround(BOOL bInP) const +inline const SwFmtSurround &SwAttrSet::GetSurround(sal_Bool bInP) const { return (const SwFmtSurround&)Get( RES_SURROUND,bInP); } -inline const SwFmtSurround &SwFmt::GetSurround(BOOL bInP) const +inline const SwFmtSurround &SwFmt::GetSurround(sal_Bool bInP) const { return aSet.GetSurround(bInP); } #endif diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx index 639a2667f5b4..667f0f1d8cac 100644 --- a/sw/inc/fmturl.hxx +++ b/sw/inc/fmturl.hxx @@ -45,7 +45,7 @@ class SW_DLLPUBLIC SwFmtURL: public SfxPoolItem String sName; // Name of the anchor. ImageMap *pMap; // ClientSide images. - BOOL bIsServerMap; // A ServerSideImageMap with the URL. + sal_Bool bIsServerMap; // A ServerSideImageMap with the URL. SwFmtURL& operator=( const SwFmtURL& ); @@ -65,16 +65,16 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); void SetTargetFrameName( const String& rStr ) { sTargetFrameName = rStr; } - void SetURL( const String &rURL, BOOL bServerMap ); + void SetURL( const String &rURL, sal_Bool bServerMap ); void SetMap( const ImageMap *pM ); // Pointer will be copied. const String &GetTargetFrameName()const { return sTargetFrameName; } const String &GetURL() const { return sURL; } - BOOL IsServerMap() const { return bIsServerMap; } + sal_Bool IsServerMap() const { return bIsServerMap; } const ImageMap *GetMap() const { return pMap; } ImageMap *GetMap() { return pMap; } @@ -83,10 +83,10 @@ public: }; -inline const SwFmtURL &SwAttrSet::GetURL(BOOL bInP) const +inline const SwFmtURL &SwAttrSet::GetURL(sal_Bool bInP) const { return (const SwFmtURL&)Get( RES_URL,bInP); } -inline const SwFmtURL &SwFmt::GetURL(BOOL bInP) const +inline const SwFmtURL &SwFmt::GetURL(sal_Bool bInP) const { return aSet.GetURL(bInP); } #endif diff --git a/sw/inc/fmtwrapinfluenceonobjpos.hxx b/sw/inc/fmtwrapinfluenceonobjpos.hxx index e7e0bc22eb58..91418b49e24d 100644 --- a/sw/inc/fmtwrapinfluenceonobjpos.hxx +++ b/sw/inc/fmtwrapinfluenceonobjpos.hxx @@ -56,8 +56,8 @@ public: virtual int operator==( const SfxPoolItem& _rAttr ) const; virtual SfxPoolItem* Clone( SfxItemPool* pPool = 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); // direct accessors to data void SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInfluenceOnPosition ); @@ -67,10 +67,10 @@ public: const bool _bIterativeAsOnceConcurrent = false ) const; }; -inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(BOOL bInP) const +inline const SwFmtWrapInfluenceOnObjPos& SwAttrSet::GetWrapInfluenceOnObjPos(sal_Bool bInP) const { return (const SwFmtWrapInfluenceOnObjPos&)Get( RES_WRAP_INFLUENCE_ON_OBJPOS,bInP); } - inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(BOOL bInP) const + inline const SwFmtWrapInfluenceOnObjPos& SwFmt::GetWrapInfluenceOnObjPos(sal_Bool bInP) const { return aSet.GetWrapInfluenceOnObjPos(bInP); } #endif diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 253552688031..6f7e9b84f428 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -48,25 +48,25 @@ class SW_DLLPUBLIC SwFmt : public SwModify String aFmtName; SwAttrSet aSet; - USHORT nWhichId; - USHORT nFmtId; // Format-ID for reading / writing. - USHORT nPoolFmtId; // Id for "automatically" created formats. + sal_uInt16 nWhichId; + sal_uInt16 nFmtId; // Format-ID for reading / writing. + sal_uInt16 nPoolFmtId; // Id for "automatically" created formats. // (is not hard attribution!!!) - USHORT nPoolHelpId; // HelpId for this Pool-style. - BYTE nPoolHlpFileId; // FilePos to Doc to these style helps. - BOOL bWritten : 1; // TRUE: already written. - BOOL bAutoFmt : 1; // FALSE: it is a template. + sal_uInt16 nPoolHelpId; // HelpId for this Pool-style. + sal_uInt8 nPoolHlpFileId; // FilePos to Doc to these style helps. + sal_Bool bWritten : 1; // TRUE: already written. + sal_Bool bAutoFmt : 1; // FALSE: it is a template. // default is true! - BOOL bFmtInDTOR : 1; // TRUE: Format becomes deleted. In order to be able + sal_Bool bFmtInDTOR : 1; // TRUE: Format becomes deleted. In order to be able // to recognize this in FmtChg-message!! - BOOL bAutoUpdateFmt : 1;// TRUE: Set attributes of a whole paragraph + sal_Bool bAutoUpdateFmt : 1;// TRUE: Set attributes of a whole paragraph // at format (UI-side!). protected: SwFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - const USHORT* pWhichRanges, SwFmt *pDrvdFrm, USHORT nFmtWhich ); - SwFmt( SwAttrPool& rPool, const String &rFmtNm, const USHORT* pWhichRanges, - SwFmt *pDrvdFrm, USHORT nFmtWhich ); + const sal_uInt16* pWhichRanges, SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); + SwFmt( SwAttrPool& rPool, const String &rFmtNm, const sal_uInt16* pWhichRanges, + SwFmt *pDrvdFrm, sal_uInt16 nFmtWhich ); SwFmt( const SwFmt& rFmt ); public: @@ -76,38 +76,38 @@ public: SwFmt &operator=(const SwFmt&); // for Querying of Writer-functions. - USHORT Which() const { return nWhichId; } + sal_uInt16 Which() const { return nWhichId; } virtual void Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue ); // Query format information. - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // Copy attributes even among documents. - void CopyAttrs( const SwFmt&, BOOL bReplace=TRUE ); + void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True ); // Delete all attributes that are not in rFmt. void DelDiffs( const SfxItemSet& rSet ); void DelDiffs( const SwFmt& rFmt ) { DelDiffs( rFmt.GetAttrSet() ); } // 0 is Default. - BOOL SetDerivedFrom(SwFmt *pDerivedFrom = 0); + sal_Bool SetDerivedFrom(SwFmt *pDerivedFrom = 0); // If bInParents is FALSE, search only in this format for attribute. - inline const SfxPoolItem& GetFmtAttr( USHORT nWhich, - BOOL bInParents = TRUE ) const; - inline SfxItemState GetItemState( USHORT nWhich, BOOL bSrchInParent = TRUE, + inline const SfxPoolItem& GetFmtAttr( sal_uInt16 nWhich, + sal_Bool bInParents = sal_True ) const; + inline SfxItemState GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent = sal_True, const SfxPoolItem **ppItem = 0 ) const; - 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 ); // Takes all hints from Delta-Array, // returns count of deleted hints. - virtual USHORT ResetAllFmtAttr(); + virtual sal_uInt16 ResetAllFmtAttr(); inline SwFmt* DerivedFrom() const { return (SwFmt*)pRegisteredIn; } - inline BOOL IsDefault() const { return DerivedFrom() == 0; } + inline sal_Bool IsDefault() const { return DerivedFrom() == 0; } inline const String& GetName() const { return aFmtName; } void SetName( const String& rNewName, sal_Bool bBroadcast=sal_False ); @@ -143,14 +143,14 @@ public: IDocumentChartDataProviderAccess* getIDocumentChartDataProviderAccess(); // Get and set Pool style IDs. - USHORT GetPoolFmtId() const { return nPoolFmtId; } - void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; } + sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; } + void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; } // Get and set Help-IDs for document templates. - USHORT GetPoolHelpId() const { return nPoolHelpId; } - void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; } - BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; } - void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; } + sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; } + void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; } + sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; } + void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; } // Get attribute-description. Returns passed string. void GetPresentation( SfxItemPresentation ePres, @@ -158,140 +158,140 @@ public: { aSet.GetPresentation( ePres, eCoreMetric, ePresMetric, rText ); } // Format-ID for reading/writing: - void ResetWritten() { bWritten = FALSE; } + void ResetWritten() { bWritten = sal_False; } // Query / set AutoFmt-flag. - BOOL IsAuto() const { return bAutoFmt; } - void SetAuto( BOOL bNew = FALSE ) { bAutoFmt = bNew; } + sal_Bool IsAuto() const { return bAutoFmt; } + void SetAuto( sal_Bool bNew = sal_False ) { bAutoFmt = bNew; } // Query / set bAutoUpdateFmt-flag. - BOOL IsAutoUpdateFmt() const { return bAutoUpdateFmt; } - void SetAutoUpdateFmt( BOOL bNew = TRUE ) { bAutoUpdateFmt = bNew; } + sal_Bool IsAutoUpdateFmt() const { return bAutoUpdateFmt; } + void SetAutoUpdateFmt( sal_Bool bNew = sal_True ) { bAutoUpdateFmt = bNew; } - BOOL IsFmtInDTOR() const { return bFmtInDTOR; } + sal_Bool IsFmtInDTOR() const { return bFmtInDTOR; } // GetMethods: Bool indicates whether to search only in Set (FALSE) // or also in Parents. // If nothing is found the defaulted attribute is returned. // Character-attributes - implemented in charatr.hxx - inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const; - inline const SvxShadowedItem &GetShadowed( BOOL = TRUE ) const; - inline const SvxAutoKernItem &GetAutoKern( BOOL = TRUE ) const; - inline const SvxWordLineModeItem &GetWordLineMode( BOOL = TRUE ) const; - inline const SvxContourItem &GetContour( BOOL = TRUE ) const; - inline const SvxKerningItem &GetKerning( BOOL = TRUE ) const; - inline const SvxUnderlineItem &GetUnderline( BOOL = TRUE ) const; - inline const SvxOverlineItem &GetOverline( BOOL = TRUE ) const; - inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; - inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; - inline const SvxColorItem &GetColor( BOOL = TRUE ) const; - inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; - inline const SvxEscapementItem &GetEscapement( BOOL = TRUE ) const; - inline const SvxCaseMapItem &GetCaseMap( BOOL = TRUE ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( BOOL = TRUE ) const; - inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const; - inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const; - - inline const SvxFontItem &GetCJKFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCJKSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCJKLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCJKPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCJKWeight( BOOL = TRUE ) const; - inline const SvxFontItem &GetCTLFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCTLSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCTLLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCTLPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCTLWeight( BOOL = TRUE ) const; - inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const; - inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const; - inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; - inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const; + inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; + inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; + inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; + inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; + inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; + inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; + inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; + inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; + inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; + inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; + inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; + inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; + inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; + inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; + inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; + + inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; + inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; + inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; + inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; + inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; + inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; // Frame-attributes - implemented in frmatr.hxx. - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtRowSplit &GetRowSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; - inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const; - inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const; + inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; + inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; + inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; + inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; + inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; + inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; + inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; + inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; + inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; + inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; + inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; + inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; + inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; + inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; + inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; + inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; + inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetBackground( sal_Bool = sal_True ) const; + inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; + inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; + inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; + inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; + inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; + inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; + inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; + inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; + inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; + inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; // #i18732# - inline const SwFmtFollowTextFlow &GetFollowTextFlow(BOOL = TRUE) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; // #i28701# - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; // Graphics-attributes - implemented in grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; - inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; - inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; - inline const SwContrastGrf &GetContrastGrf(BOOL = TRUE ) const; - inline const SwChannelRGrf &GetChannelRGrf(BOOL = TRUE ) const; - inline const SwChannelGGrf &GetChannelGGrf(BOOL = TRUE ) const; - inline const SwChannelBGrf &GetChannelBGrf(BOOL = TRUE ) const; - inline const SwGammaGrf &GetGammaGrf(BOOL = TRUE ) const; - inline const SwInvertGrf &GetInvertGrf(BOOL = TRUE ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const; + inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; + inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; + inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; + inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; + inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; + inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; + inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; + inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; + inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; // Paragraph-attributes - implemented in paratr.hxx. - inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const; - inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const; - inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const; - inline const SwRegisterItem &GetRegister( BOOL = TRUE ) const; - inline const SwNumRuleItem &GetNumRule( BOOL = TRUE ) const; - inline const SvxWidowsItem &GetWidows( BOOL = TRUE ) const; - inline const SvxOrphansItem &GetOrphans( BOOL = TRUE ) const; - inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const; - inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(BOOL = TRUE) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; - inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const; + inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; + inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; + inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; + inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; + inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; + inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; + inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; + inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; + inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; + inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; // TableBox attributes - implemented in cellatr.hxx. - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; + inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; /** SwFmt::IsBackgroundTransparent @@ -320,8 +320,8 @@ public: // --------------- inline Implementations ------------------------ -inline const SfxPoolItem& SwFmt::GetFmtAttr( USHORT nWhich, - BOOL bInParents ) const +inline const SfxPoolItem& SwFmt::GetFmtAttr( sal_uInt16 nWhich, + sal_Bool bInParents ) const { return aSet.Get( nWhich, bInParents ); } @@ -333,7 +333,7 @@ inline void SwFmt::SetName( const sal_Char* pNewName, SetName( aTmp, bBroadcast ); } -inline SfxItemState SwFmt::GetItemState( USHORT nWhich, BOOL bSrchInParent, +inline SfxItemState SwFmt::GetItemState( sal_uInt16 nWhich, sal_Bool bSrchInParent, const SfxPoolItem **ppItem ) const { return aSet.GetItemState( nWhich, bSrchInParent, ppItem ); diff --git a/sw/inc/frmatr.hxx b/sw/inc/frmatr.hxx index 87c7759e5bff..b0f5afd28c4b 100644 --- a/sw/inc/frmatr.hxx +++ b/sw/inc/frmatr.hxx @@ -35,60 +35,60 @@ // Implementation of FrameAttribute methods of SwAttrSet. -inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(BOOL bInP) const +inline const SvxPaperBinItem &SwAttrSet::GetPaperBin(sal_Bool bInP) const { return (const SvxPaperBinItem&)Get( RES_PAPER_BIN,bInP); } -inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(BOOL bInP) const +inline const SvxLRSpaceItem &SwAttrSet::GetLRSpace(sal_Bool bInP) const { return (const SvxLRSpaceItem&)Get( RES_LR_SPACE,bInP); } -inline const SvxULSpaceItem &SwAttrSet::GetULSpace(BOOL bInP) const +inline const SvxULSpaceItem &SwAttrSet::GetULSpace(sal_Bool bInP) const { return (const SvxULSpaceItem&)Get( RES_UL_SPACE,bInP); } -inline const SvxPrintItem &SwAttrSet::GetPrint(BOOL bInP) const +inline const SvxPrintItem &SwAttrSet::GetPrint(sal_Bool bInP) const { return (const SvxPrintItem&)Get( RES_PRINT,bInP); } -inline const SvxOpaqueItem &SwAttrSet::GetOpaque(BOOL bInP) const +inline const SvxOpaqueItem &SwAttrSet::GetOpaque(sal_Bool bInP) const { return (const SvxOpaqueItem&)Get( RES_OPAQUE,bInP); } -inline const SvxProtectItem &SwAttrSet::GetProtect(BOOL bInP) const +inline const SvxProtectItem &SwAttrSet::GetProtect(sal_Bool bInP) const { return (const SvxProtectItem&)Get( RES_PROTECT,bInP); } -inline const SvxBoxItem &SwAttrSet::GetBox(BOOL bInP) const +inline const SvxBoxItem &SwAttrSet::GetBox(sal_Bool bInP) const { return (const SvxBoxItem&)Get( RES_BOX,bInP); } -inline const SvxFmtKeepItem &SwAttrSet::GetKeep(BOOL bInP) const +inline const SvxFmtKeepItem &SwAttrSet::GetKeep(sal_Bool bInP) const { return (const SvxFmtKeepItem&)Get( RES_KEEP,bInP); } -inline const SvxBrushItem &SwAttrSet::GetBackground(BOOL bInP) const +inline const SvxBrushItem &SwAttrSet::GetBackground(sal_Bool bInP) const { return (const SvxBrushItem&)Get( RES_BACKGROUND,bInP); } -inline const SvxShadowItem &SwAttrSet::GetShadow(BOOL bInP) const +inline const SvxShadowItem &SwAttrSet::GetShadow(sal_Bool bInP) const { return (const SvxShadowItem&)Get( RES_SHADOW,bInP); } -inline const SvxFmtBreakItem &SwAttrSet::GetBreak(BOOL bInP) const +inline const SvxFmtBreakItem &SwAttrSet::GetBreak(sal_Bool bInP) const { return (const SvxFmtBreakItem&)Get( RES_BREAK,bInP); } -inline const SvxMacroItem &SwAttrSet::GetMacro(BOOL bInP) const +inline const SvxMacroItem &SwAttrSet::GetMacro(sal_Bool bInP) const { return (const SvxMacroItem&)Get( RES_FRMMACRO,bInP); } -inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(BOOL bInP) const +inline const SvxFrameDirectionItem &SwAttrSet::GetFrmDir(sal_Bool bInP) const { return (const SvxFrameDirectionItem&)Get( RES_FRAMEDIR,bInP); } // Implementation of FrameAttribute methods of SwFmt. -inline const SvxPaperBinItem &SwFmt::GetPaperBin(BOOL bInP) const +inline const SvxPaperBinItem &SwFmt::GetPaperBin(sal_Bool bInP) const { return aSet.GetPaperBin(bInP); } -inline const SvxLRSpaceItem &SwFmt::GetLRSpace(BOOL bInP) const +inline const SvxLRSpaceItem &SwFmt::GetLRSpace(sal_Bool bInP) const { return aSet.GetLRSpace(bInP); } -inline const SvxULSpaceItem &SwFmt::GetULSpace(BOOL bInP) const +inline const SvxULSpaceItem &SwFmt::GetULSpace(sal_Bool bInP) const { return aSet.GetULSpace(bInP); } -inline const SvxPrintItem &SwFmt::GetPrint(BOOL bInP) const +inline const SvxPrintItem &SwFmt::GetPrint(sal_Bool bInP) const { return aSet.GetPrint(bInP); } -inline const SvxOpaqueItem &SwFmt::GetOpaque(BOOL bInP) const +inline const SvxOpaqueItem &SwFmt::GetOpaque(sal_Bool bInP) const { return aSet.GetOpaque(bInP); } -inline const SvxProtectItem &SwFmt::GetProtect(BOOL bInP) const +inline const SvxProtectItem &SwFmt::GetProtect(sal_Bool bInP) const { return aSet.GetProtect(bInP); } -inline const SvxBoxItem &SwFmt::GetBox(BOOL bInP) const +inline const SvxBoxItem &SwFmt::GetBox(sal_Bool bInP) const { return aSet.GetBox(bInP); } -inline const SvxFmtKeepItem &SwFmt::GetKeep(BOOL bInP) const +inline const SvxFmtKeepItem &SwFmt::GetKeep(sal_Bool bInP) const { return aSet.GetKeep(bInP); } -inline const SvxBrushItem &SwFmt::GetBackground(BOOL bInP) const +inline const SvxBrushItem &SwFmt::GetBackground(sal_Bool bInP) const { return aSet.GetBackground(bInP); } -inline const SvxShadowItem &SwFmt::GetShadow(BOOL bInP) const +inline const SvxShadowItem &SwFmt::GetShadow(sal_Bool bInP) const { return aSet.GetShadow(bInP); } -inline const SvxFmtBreakItem &SwFmt::GetBreak(BOOL bInP) const +inline const SvxFmtBreakItem &SwFmt::GetBreak(sal_Bool bInP) const { return aSet.GetBreak(bInP); } -inline const SvxMacroItem &SwFmt::GetMacro(BOOL bInP) const +inline const SvxMacroItem &SwFmt::GetMacro(sal_Bool bInP) const { return aSet.GetMacro(bInP); } -inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(BOOL bInP) const +inline const SvxFrameDirectionItem &SwFmt::GetFrmDir(sal_Bool bInP) const { return aSet.GetFrmDir(bInP); } #endif //_FRMATR_HXX diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 0366cf1fb6e9..229d482b34e1 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/text/PositionLayoutDir.hpp> #include <cppuhelper/weakref.hxx> +#include <tools/gen.hxx> #include <format.hxx> @@ -56,15 +57,15 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt protected: SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm, - SwFrmFmt *pDrvdFrm, USHORT nFmtWhich = RES_FRMFMT, - const USHORT* pWhichRange = 0 ) + SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, pFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) {} SwFrmFmt( SwAttrPool& rPool, const String &rFmtNm, - SwFrmFmt *pDrvdFrm, USHORT nFmtWhich = RES_FRMFMT, - const USHORT* pWhichRange = 0 ) + SwFrmFmt *pDrvdFrm, sal_uInt16 nFmtWhich = RES_FRMFMT, + const sal_uInt16* pWhichRange = 0 ) : SwFmt( rPool, rFmtNm, (pWhichRange ? pWhichRange : aFrmFmtSetRange), pDrvdFrm, nFmtWhich ) {} @@ -93,9 +94,9 @@ public: // Returns the real size of the frame - or an empty rectangle // if no layout exists. // If pPoint is given, look for the frame closest to it. - SwRect FindLayoutRect( const BOOL bPrtArea = FALSE, + SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; // Searches SdrObject. SdrObjUserCall is client of the format. // The UserCall knows its SdrObject. @@ -115,7 +116,7 @@ public: const SdrObject *FindRealSdrObject() const { return ((SwFrmFmt*)this)->FindRealSdrObject(); } - BOOL IsLowerOf( const SwFrmFmt& rFmt ) const; + sal_Bool IsLowerOf( const SwFrmFmt& rFmt ) const; enum tLayoutDir { @@ -150,6 +151,11 @@ class SW_DLLPUBLIC SwFlyFrmFmt: public SwFrmFmt friend class SwDoc; // Both not existent. + // it stores the previous position of Prt rectangle from RequestObjectResize + // so it can be used to move frames of non-resizable objects to align them correctly + // when they get borders (this is done in SwWrtShell::CalcAndGetScale) + Point m_aLastFlyFrmPrtRectPos; + SwFlyFrmFmt( const SwFlyFrmFmt &rCpy ); SwFlyFrmFmt &operator=( const SwFlyFrmFmt &rCpy ); @@ -171,14 +177,14 @@ public: virtual void MakeFrms(); SwFlyFrm* GetFrm( const Point* pDocPos = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; SwAnchoredObject* GetAnchoredObj( const Point* pDocPos = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; virtual Graphic MakeGraphic( ImageMap* pMap = NULL ); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; const String GetObjTitle() const; void SetObjTitle( const String& rTitle, @@ -213,6 +219,9 @@ public: */ sal_Bool IsBackgroundBrushInherited() const; + const Point & GetLastFlyFrmPrtRectPos() const { return m_aLastFlyFrmPrtRectPos; } + void SetLastFlyFrmPrtRectPos( const Point &rPoint ) { m_aLastFlyFrmPrtRectPos = rPoint; } + DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt) }; diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx index 783f349363ca..e2d6fcfd1138 100644 --- a/sw/inc/ftnidx.hxx +++ b/sw/inc/ftnidx.hxx @@ -53,7 +53,7 @@ public: void UpdateFtn( const SwNodeIndex& rStt ); // Update all from pos. void UpdateAllFtn(); // Update all footnotes. - SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, USHORT* pPos = 0 ) const; + SwTxtFtn* SeekEntry( const SwNodeIndex& rIdx, sal_uInt16* pPos = 0 ) const; }; @@ -70,8 +70,8 @@ public: static const SwSectionNode* FindSectNdWithEndAttr( const SwTxtFtn& rTxtFtn ); - USHORT GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd ); - USHORT ChkNumber( const SwTxtFtn& rTxtFtn ); + sal_uInt16 GetNumber( const SwTxtFtn& rTxtFtn, const SwSectionNode& rNd ); + sal_uInt16 ChkNumber( const SwTxtFtn& rTxtFtn ); }; diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx index 1376fb75c102..adfeda9975d2 100644 --- a/sw/inc/ftninfo.hxx +++ b/sw/inc/ftninfo.hxx @@ -48,7 +48,7 @@ protected: bool m_bEndNote; public: SvxNumberType aFmt; - USHORT nFtnOffset; + sal_uInt16 nFtnOffset; void ChgPageDesc( SwPageDesc *pDesc ); SwPageDesc *GetPageDesc( SwDoc &rDoc ) const; @@ -68,7 +68,7 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); SwEndNoteInfo & operator=(const SwEndNoteInfo&); - BOOL operator==( const SwEndNoteInfo &rInf ) const; + sal_Bool operator==( const SwEndNoteInfo &rInf ) const; SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0); SwEndNoteInfo(const SwEndNoteInfo&); @@ -105,7 +105,7 @@ public: SwFtnInfo& operator=(const SwFtnInfo&); - BOOL operator==( const SwFtnInfo &rInf ) const; + sal_Bool operator==( const SwFtnInfo &rInf ) const; SwFtnInfo(SwTxtFmtColl* pTxtColl = 0); SwFtnInfo(const SwFtnInfo&); diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx index dc15444fd377..4626b1839001 100644 --- a/sw/inc/grfatr.hxx +++ b/sw/inc/grfatr.hxx @@ -53,11 +53,11 @@ RES_MIRROR_GRAPH_END class SW_DLLPUBLIC SwMirrorGrf : public SfxEnumItem { - BOOL bGrfToggle; // Flip graphics on even pages. + sal_Bool bGrfToggle; // Flip graphics on even pages. public: SwMirrorGrf( MirrorGraph eMiro = RES_MIRROR_GRAPH_DONT ) - : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< USHORT >(eMiro) ), bGrfToggle( sal_False ) + : SfxEnumItem( RES_GRFATR_MIRRORGRF, static_cast< sal_uInt16 >(eMiro) ), bGrfToggle( sal_False ) {} SwMirrorGrf( const SwMirrorGrf &rMirrorGrf ) : SfxEnumItem( RES_GRFATR_MIRRORGRF, rMirrorGrf.GetValue()), @@ -68,7 +68,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual methods of SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual int operator==( const SfxPoolItem& ) const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, @@ -77,9 +77,9 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); inline SwMirrorGrf& operator=( const SwMirrorGrf& rMirrorGrf ) { @@ -88,8 +88,8 @@ public: return *this; } - inline BOOL IsGrfToggle() const { return bGrfToggle; } - inline void SetGrfToggle( BOOL bNew ) { bGrfToggle = bNew; } + inline sal_Bool IsGrfToggle() const { return bGrfToggle; } + inline void SetGrfToggle( sal_Bool bNew ) { bGrfToggle = bNew; } }; @@ -129,9 +129,9 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); void SetUnrotatedSize( const Size& rSz ) { aUnrotatedSize = rSz; } const Size& GetUnrotatedSize() const { return aUnrotatedSize; } @@ -172,7 +172,7 @@ public: class SwChannelGrf : public SfxInt16Item { protected: - SwChannelGrf( sal_Int16 nVal, USHORT nWhichL ) + SwChannelGrf( sal_Int16 nVal, sal_uInt16 nWhichL ) : SfxInt16Item( nWhichL, nVal ) {} @@ -238,9 +238,9 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); const double& GetValue() const { return nValue; } @@ -278,15 +278,15 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); }; class SW_DLLPUBLIC SwDrawModeGrf : public SfxEnumItem { public: - SwDrawModeGrf( USHORT nMode = 0 ) + SwDrawModeGrf( sal_uInt16 nMode = 0 ) : SfxEnumItem( RES_GRFATR_DRAWMODE, nMode ) {} @@ -294,7 +294,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; // pure virtual methods of SfxEnumItem - virtual USHORT GetValueCount() const; + virtual sal_uInt16 GetValueCount() const; virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, @@ -302,9 +302,9 @@ public: const IntlWrapper* pIntl = 0 ) const; virtual bool QueryValue( com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ) const; + sal_uInt8 nMemberId = 0 ) const; virtual bool PutValue( const com::sun::star::uno::Any& rVal, - BYTE nMemberId = 0 ); + sal_uInt8 nMemberId = 0 ); }; @@ -313,58 +313,58 @@ public: * Implementation of graphics attributes methods of SwAttr ******************************************************************************/ -inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwAttrSet::GetMirrorGrf(sal_Bool bInP) const { return (const SwMirrorGrf&)Get( RES_GRFATR_MIRRORGRF,bInP); } -inline const SwCropGrf &SwAttrSet::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwAttrSet::GetCropGrf(sal_Bool bInP) const { return (const SwCropGrf&)Get( RES_GRFATR_CROPGRF,bInP); } -inline const SwRotationGrf &SwAttrSet::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwAttrSet::GetRotationGrf(sal_Bool bInP) const { return (const SwRotationGrf&)Get( RES_GRFATR_ROTATION,bInP); } -inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwAttrSet::GetLuminanceGrf(sal_Bool bInP) const { return (const SwLuminanceGrf&)Get( RES_GRFATR_LUMINANCE,bInP); } -inline const SwContrastGrf &SwAttrSet::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwAttrSet::GetContrastGrf(sal_Bool bInP) const { return (const SwContrastGrf&)Get( RES_GRFATR_CONTRAST,bInP); } -inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwAttrSet::GetChannelRGrf(sal_Bool bInP) const { return (const SwChannelRGrf&)Get( RES_GRFATR_CHANNELR,bInP); } -inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwAttrSet::GetChannelGGrf(sal_Bool bInP) const { return (const SwChannelGGrf&)Get( RES_GRFATR_CHANNELG,bInP); } -inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwAttrSet::GetChannelBGrf(sal_Bool bInP) const { return (const SwChannelBGrf&)Get( RES_GRFATR_CHANNELB,bInP); } -inline const SwGammaGrf &SwAttrSet::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwAttrSet::GetGammaGrf(sal_Bool bInP) const { return (const SwGammaGrf&)Get( RES_GRFATR_GAMMA,bInP); } -inline const SwInvertGrf &SwAttrSet::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwAttrSet::GetInvertGrf(sal_Bool bInP) const { return (const SwInvertGrf&)Get( RES_GRFATR_INVERT,bInP); } -inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwAttrSet::GetTransparencyGrf(sal_Bool bInP) const { return (const SwTransparencyGrf&)Get( RES_GRFATR_TRANSPARENCY,bInP); } -inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwAttrSet::GetDrawModeGrf(sal_Bool bInP) const { return (const SwDrawModeGrf&)Get( RES_GRFATR_DRAWMODE,bInP); } /****************************************************************************** * Implementation of graphics attributes methods of SwFmt ******************************************************************************/ -inline const SwMirrorGrf &SwFmt::GetMirrorGrf(BOOL bInP) const +inline const SwMirrorGrf &SwFmt::GetMirrorGrf(sal_Bool bInP) const { return aSet.GetMirrorGrf(bInP); } -inline const SwCropGrf &SwFmt::GetCropGrf(BOOL bInP) const +inline const SwCropGrf &SwFmt::GetCropGrf(sal_Bool bInP) const { return aSet.GetCropGrf(bInP); } -inline const SwRotationGrf &SwFmt::GetRotationGrf(BOOL bInP) const +inline const SwRotationGrf &SwFmt::GetRotationGrf(sal_Bool bInP) const { return aSet.GetRotationGrf(bInP); } -inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(BOOL bInP) const +inline const SwLuminanceGrf &SwFmt::GetLuminanceGrf(sal_Bool bInP) const { return aSet.GetLuminanceGrf( bInP); } -inline const SwContrastGrf &SwFmt::GetContrastGrf(BOOL bInP) const +inline const SwContrastGrf &SwFmt::GetContrastGrf(sal_Bool bInP) const { return aSet.GetContrastGrf( bInP); } -inline const SwChannelRGrf &SwFmt::GetChannelRGrf(BOOL bInP) const +inline const SwChannelRGrf &SwFmt::GetChannelRGrf(sal_Bool bInP) const { return aSet.GetChannelRGrf( bInP); } -inline const SwChannelGGrf &SwFmt::GetChannelGGrf(BOOL bInP) const +inline const SwChannelGGrf &SwFmt::GetChannelGGrf(sal_Bool bInP) const { return aSet.GetChannelGGrf( bInP); } -inline const SwChannelBGrf &SwFmt::GetChannelBGrf(BOOL bInP) const +inline const SwChannelBGrf &SwFmt::GetChannelBGrf(sal_Bool bInP) const { return aSet.GetChannelBGrf( bInP); } -inline const SwGammaGrf &SwFmt::GetGammaGrf(BOOL bInP) const +inline const SwGammaGrf &SwFmt::GetGammaGrf(sal_Bool bInP) const { return aSet.GetGammaGrf( bInP); } -inline const SwInvertGrf &SwFmt::GetInvertGrf(BOOL bInP) const +inline const SwInvertGrf &SwFmt::GetInvertGrf(sal_Bool bInP) const { return aSet.GetInvertGrf( bInP); } -inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(BOOL bInP) const +inline const SwTransparencyGrf &SwFmt::GetTransparencyGrf(sal_Bool bInP) const { return aSet.GetTransparencyGrf( bInP); } -inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(BOOL bInP) const +inline const SwDrawModeGrf &SwFmt::GetDrawModeGrf(sal_Bool bInP) const { return aSet.GetDrawModeGrf(bInP); } diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index e74011e74548..90fa81818f9f 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -25,962 +25,971 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SOLAR_HRC -#include <svl/solar.hrc> -#endif - -#define HID_BASE HID_APP_START - -#define HID_BIB_BASE (HID_BASE + 1) -#define HID_DBSEL (HID_BASE + 2) -#define HID_DBEDIT (HID_BASE + 3) -#define HID_PRINT_OPTION (HID_BASE + 4) -#define HID_MERGE_PRINTMONITOR (HID_BASE + 5) -#define HID_FLD_INPUT (HID_BASE + 6) -#define HID_CONFIG_MISC (HID_BASE + 7) -#define HID_CONFIG_PATH (HID_BASE + 8) -#define HID_CONFIG_TB (HID_BASE + 9) -#define HID_PG_FOOTNOTE (HID_BASE + 10) -#define HID_FORMAT_GRAPHIC (HID_BASE + 11) -#define HID_FILTERSTATUS (HID_BASE + 12) -#define HID_DOCINFO_EDT (HID_BASE + 13) -#define HID_DBLOGON (HID_BASE + 14) -#define HID_MAC_ASSIGN (HID_BASE + 15) -#define HID_CONFIG_MN (HID_BASE + 16) -#define HID_PAPERSIZE (HID_BASE + 17) -#define HID_PASSWD (HID_BASE + 18) -#define HID_SPELLING_OPTIONS (HID_BASE + 19) -#define HID_HYPHENATE_OPTIONS (HID_BASE + 20) -#define HID_FORMAT_COLUMN (HID_BASE + 21) -#define HID_CONFIG_SAVE (HID_BASE + 22) -#define HID_NUM_NAMES (HID_BASE + 23) -#define HID_SYMBOL_SELECT (HID_BASE + 24) -#define HID_CONFIG_KY (HID_BASE + 25) -#define HID_LINKEDIT (HID_BASE + 26) -#define HID_GRAPHIC_PREVIEW (HID_BASE + 28) -#define HID_DICTIONARY (HID_BASE + 29) -#define HID_SET_STYLE (HID_BASE + 30) -#define HID_RIBBONBAR (HID_BASE + 31) -#define HID_STATUSLINE (HID_BASE + 32) -#define HID_DOCBAR (HID_BASE + 33) -#define HID_VRULER (HID_BASE + 34) -#define HID_MAKRO_WINDOW (HID_BASE + 35) -#define HID_ENVELOP_FORMAT (HID_BASE + 37) -#define HID_ENVELOP_PRINTER (HID_BASE + 38) - -#define HID_HEADER_FOOTER_DLG (HID_BASE + 39) -#define HID_GRID_DLG (HID_BASE + 40) -#define HID_USER_ADDRESS_DLG (HID_BASE + 41) -#define HID_SELECT_FAX_DLG (HID_BASE + 42) - -#define HID_LABEL_FORMAT (HID_BASE + 43) -#define HID_BRSORT (HID_BASE + 44) -#define HID_BRSEEK (HID_BASE + 45) -#define HID_BRCFG (HID_BASE + 46) - -#define HID_FORMEDT_CONTENT (HID_BASE + 47) -#define HID_FORMEDT_USER (HID_BASE + 48) -#define HID_FORMEDT_INDEX (HID_BASE + 49) - -#define HID_SCRL_PAGEUP (HID_BASE + 50) -#define HID_SCRL_PAGEDOWN (HID_BASE + 51) - -#define HID_DRAW_WIN (HID_BASE + 52) -#define HID_EDIT_WIN (HID_BASE + 53) - -#define HID_INSERT_CTRL (HID_BASE + 54) // Insert TbxControl. -#define HID_INSERT_OBJ_CTRL (HID_BASE + 55) -#define HID_INSERT_FIELD_CTRL (HID_BASE + 56) - -#define HID_SOURCEVIEW (HID_BASE + 57) -#define HID_TBL_OPT_CTRL (HID_BASE + 58) -#define HID_AUTOFORMAT_CLB (HID_BASE + 59) - -#define HID_SCRL_NAVI (HID_BASE + 60) -#define HID_NAVI_DRAG_HYP (HID_BASE + 61) -#define HID_NAVI_DRAG_LINK (HID_BASE + 62) -#define HID_NAVI_DRAG_COPY (HID_BASE + 63) -#define HID_NAVI_OUTLINES (HID_BASE + 64) - -#define HID_AUTOFORMAT_EXEC (HID_BASE + 65) -#define HID_AUTOFORMAT_CLOSE (HID_BASE + 66) - -#define HID_PAGEPREVIEW (HID_BASE + 67) -#define HID_SOURCE_EDITWIN (HID_BASE + 68) +#include "swcommands.h" +#include <svx/svxcommands.h> +#include <sfx2/sfxcommands.h> + +#define HID_BIB_BASE "SW_HID_BIB_BASE" +#define HID_DBSEL "SW_HID_DBSEL" +#define HID_DBEDIT "SW_HID_DBEDIT" +#define HID_PRINT_OPTION "SW_HID_PRINT_OPTION" +#define HID_MERGE_PRINTMONITOR "SW_HID_MERGE_PRINTMONITOR" +#define HID_FLD_INPUT "SW_HID_FLD_INPUT" +#define HID_CONFIG_MISC "SW_HID_CONFIG_MISC" +#define HID_CONFIG_PATH "SW_HID_CONFIG_PATH" +#define HID_CONFIG_TB "SW_HID_CONFIG_TB" +#define HID_PG_FOOTNOTE "SW_HID_PG_FOOTNOTE" +#define HID_FORMAT_GRAPHIC "SW_HID_FORMAT_GRAPHIC" +#define HID_FILTERSTATUS "SW_HID_FILTERSTATUS" +#define HID_DOCINFO_EDT "SW_HID_DOCINFO_EDT" +#define HID_DBLOGON "SW_HID_DBLOGON" +#define HID_MAC_ASSIGN "SW_HID_MAC_ASSIGN" +#define HID_CONFIG_MN "SW_HID_CONFIG_MN" +#define HID_PAPERSIZE "SW_HID_PAPERSIZE" +#define HID_PASSWD "SW_HID_PASSWD" +#define HID_SPELLING_OPTIONS "SW_HID_SPELLING_OPTIONS" +#define HID_HYPHENATE_OPTIONS "SW_HID_HYPHENATE_OPTIONS" +#define HID_FORMAT_COLUMN "SW_HID_FORMAT_COLUMN" +#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE" +#define HID_NUM_NAMES "SW_HID_NUM_NAMES" +#define HID_SYMBOL_SELECT "SW_HID_SYMBOL_SELECT" +#define HID_CONFIG_KY "SW_HID_CONFIG_KY" +#define HID_LINKEDIT "SW_HID_LINKEDIT" +#define HID_GRAPHIC_PREVIEW "SW_HID_GRAPHIC_PREVIEW" +#define HID_DICTIONARY "SW_HID_DICTIONARY" +#define HID_SET_STYLE "SW_HID_SET_STYLE" +#define HID_RIBBONBAR "SW_HID_RIBBONBAR" +#define HID_STATUSLINE "SW_HID_STATUSLINE" +#define HID_DOCBAR "SW_HID_DOCBAR" +#define HID_VRULER "SW_HID_VRULER" +#define HID_MAKRO_WINDOW "SW_HID_MAKRO_WINDOW" +#define HID_ENVELOP_FORMAT "SW_HID_ENVELOP_FORMAT" +#define HID_ENVELOP_PRINTER "SW_HID_ENVELOP_PRINTER" + +#define HID_HEADER_FOOTER_DLG "SW_HID_HEADER_FOOTER_DLG" +#define HID_GRID_DLG "SW_HID_GRID_DLG" +#define HID_USER_ADDRESS_DLG "SW_HID_USER_ADDRESS_DLG" +#define HID_SELECT_FAX_DLG "SW_HID_SELECT_FAX_DLG" + +#define HID_LABEL_FORMAT "SW_HID_LABEL_FORMAT" +#define HID_BRSORT "SW_HID_BRSORT" +#define HID_BRSEEK "SW_HID_BRSEEK" +#define HID_BRCFG "SW_HID_BRCFG" + +#define HID_FORMEDT_CONTENT "SW_HID_FORMEDT_CONTENT" +#define HID_FORMEDT_USER "SW_HID_FORMEDT_USER" +#define HID_FORMEDT_INDEX "SW_HID_FORMEDT_INDEX" + +#define HID_SCRL_PAGEUP "SW_HID_SCRL_PAGEUP" +#define HID_SCRL_PAGEDOWN "SW_HID_SCRL_PAGEDOWN" + +#define HID_DRAW_WIN "SW_HID_DRAW_WIN" +#define HID_EDIT_WIN "SW_HID_EDIT_WIN" + +#define HID_INSERT_CTRL "SW_HID_INSERT_CTRL" // TbxControl Einfuegen +#define HID_INSERT_OBJ_CTRL "SW_HID_INSERT_OBJ_CTRL" +#define HID_INSERT_FIELD_CTRL "SW_HID_INSERT_FIELD_CTRL" + +#define HID_SOURCEVIEW "SW_HID_SOURCEVIEW" +#define HID_TBL_OPT_CTRL "SW_HID_TBL_OPT_CTRL" +#define HID_AUTOFORMAT_CLB "SW_HID_AUTOFORMAT_CLB" + +#define HID_SCRL_NAVI "SW_HID_SCRL_NAVI" +#define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP" +#define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK" +#define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY" +#define HID_NAVI_OUTLINES "SW_HID_NAVI_OUTLINES" + +#define HID_AUTOFORMAT_EXEC "SW_HID_AUTOFORMAT_EXEC" +#define HID_AUTOFORMAT_CLOSE "SW_HID_AUTOFORMAT_CLOSE" + +#define HID_PAGEPREVIEW "SW_HID_PAGEPREVIEW" +#define HID_SOURCE_EDITWIN "SW_HID_SOURCE_EDITWIN" // Dialog Help-IDs -#define HID_CONVERT_FROM (HID_BASE + 200) -#define HID_CONVERT_TO (HID_BASE + 201) -#define HID_EDIT_POSTIT (HID_BASE + 202) -#define HID_INSERT_CHART (HID_BASE + 203) -#define HID_PAGE_PREVIEW (HID_BASE + 204) -#define HID_INSERT_HYPERLINK (HID_BASE + 205) -#define HID_NAVIGATOR_TREELIST (HID_BASE + 206) -#define HID_DLG_CAPTION (HID_BASE + 207) -#define HID_DLG_GLOSS_DECIDE (HID_BASE + 208) -#define HID_NAVIGATOR_TOOLBOX (HID_BASE + 209) -#define HID_NAVIGATOR_LISTBOX (HID_BASE + 210) -#define HID_NUM_BULLET_DLG (HID_BASE + 211) -#define HID_VS_SINGLENUM (HID_BASE + 212) -#define HID_VS_NUM (HID_BASE + 213) -#define HID_VS_BULLET (HID_BASE + 214) -#define HID_VS_NUMBMP (HID_BASE + 215) -#define HID_VS_RULER (HID_BASE + 216) -#define HID_RULER_DIALOG (HID_BASE + 217) -#define HID_INSERT_ABSTRACT (HID_BASE + 218) -#define HID_NAVI_TBX1 (HID_BASE + 219) -#define HID_NAVI_TBX2 (HID_BASE + 220) -#define HID_NAVI_TBX3 (HID_BASE + 221) -#define HID_NAVI_TBX4 (HID_BASE + 222) -#define HID_NAVI_TBX5 (HID_BASE + 223) -#define HID_NAVI_TBX6 (HID_BASE + 224) -#define HID_NAVI_TBX7 (HID_BASE + 225) -#define HID_NAVI_TBX8 (HID_BASE + 226) -#define HID_NAVI_TBX9 (HID_BASE + 227) -#define HID_NAVI_TBX10 (HID_BASE + 228) -#define HID_NAVI_TBX11 (HID_BASE + 229) -#define HID_NAVI_TBX12 (HID_BASE + 230) -#define HID_NAVI_TBX13 (HID_BASE + 231) -#define HID_NAVI_TBX14 (HID_BASE + 232) -#define HID_NAVI_TBX15 (HID_BASE + 233) -#define HID_NAVI_VS (HID_BASE + 234) -#define HID_NUM_FORMAT_BTN (HID_BASE + 235) -#define HID_PPREV_ZOOM (HID_BASE + 236) -#define HID_NAVI_TBX16 (HID_BASE + 237) -#define HID_LTEMPL_TEXT (HID_BASE + 238) -#define HID_LTEMPL_FRAME (HID_BASE + 239) -#define HID_LTEMPL_PAGE (HID_BASE + 240) -#define HID_LTEMPL_OVERRIDE (HID_BASE + 241) -#define HID_LTEMPL_TEMPLATES (HID_BASE + 242) -#define HID_NAVI_TBX17 (HID_BASE + 243) -#define HID_NAVI_TBX18 (HID_BASE + 244) -#define HID_NAVI_TBX19 (HID_BASE + 245) -#define HID_NAVI_TBX20 (HID_BASE + 246) -#define HID_NAVI_TBX21 (HID_BASE + 247) -#define HID_NAVI_TBX22 (HID_BASE + 248) -#define HID_NAVI_TBX23 (HID_BASE + 249) -#define HID_NAVI_TBX24 (HID_BASE + 250) -#define HID_NAVIGATOR_GLOBAL_TOOLBOX (HID_BASE + 251) -#define HID_NAVIGATOR_GLOB_TREELIST (HID_BASE + 252) -#define HID_GLOS_GROUP_TREE (HID_BASE + 253) -#define HID_GLBLTREE_UPDATE (HID_BASE + 254) -#define HID_GLBLTREE_INSERT (HID_BASE + 255) -#define HID_GLBLTREE_EDIT (HID_BASE + 256) -#define HID_GLBLTREE_DEL (HID_BASE + 257) -#define HID_GLBLTREE_INS_IDX (HID_BASE + 258) -#define HID_GLBLTREE_INS_CNTIDX (HID_BASE + 259) -#define HID_GLBLTREE_INS_USRIDX (HID_BASE + 260) -#define HID_GLBLTREE_INS_FILE (HID_BASE + 261) -#define HID_GLBLTREE_INS_NEW_FILE (HID_BASE + 262) -#define HID_GLBLTREE_INS_TEXT (HID_BASE + 263) -#define HID_GLBLTREE_UPD_SEL (HID_BASE + 264) -#define HID_GLBLTREE_UPD_IDX (HID_BASE + 265) -#define HID_GLBLTREE_UPD_LINK (HID_BASE + 266) -#define HID_GLBLTREEUPD_ALL (HID_BASE + 267) -#define HID_NUM_OUTL_NAMED_NUMS (HID_BASE + 268) -#define HID_NUM_OUTL_NUM_SAVEAS (HID_BASE + 269) -#define HID_NUM_NAMED_NUMS (HID_BASE + 270) -#define HID_NUM_NUM_SAVEAS (HID_BASE + 271) -#define HID_NUM_STD_NUMBER (HID_BASE + 272) -#define HID_NUM_DEL_NUMBER (HID_BASE + 273) -#define HID_NUM_STD_BULLET (HID_BASE + 274) -#define HID_NUM_DEL_BULLET (HID_BASE + 275) -#define HID_NAVI_CONTENT (HID_BASE + 276) -#define HID_NAVI_GLOBAL (HID_BASE + 277) -#define HID_LTEMPL_NUMBERING (HID_BASE + 278) -#define HID_FLDVAR_APPLY (HID_BASE + 279) -#define HID_FLDVAR_DELETE (HID_BASE + 280) -#define HID_FLDEDT_ADDRESS (HID_BASE + 281) -#define HID_SORT_ACTION (HID_BASE + 282) -#define HID_SORT_AUTHOR (HID_BASE + 283) -#define HID_SORT_DATE (HID_BASE + 284) -#define HID_SORT_COMMENT (HID_BASE + 285) -#define HID_SW_SORT_POSITION (HID_BASE + 286) -#define HID_SYNC_BTN (HID_BASE + 287) -#define HID_EDIT_COMMENT (HID_BASE + 288) -#define HID_SEL_TEMPLATE (HID_BASE + 289) -#define HID_DLG_SEQUENCE_OPTION (HID_BASE + 290) -#define HID_DLG_FLDEDT_NEXT (HID_BASE + 291) -#define HID_DLG_FLDEDT_PREV (HID_BASE + 292) -#define HID_DLG_FLDEDT_ADDRESS (HID_BASE + 293) -#define HID_DLG_PRV_PRT_OPTIONS (HID_BASE + 294) - -#define HID_FILEDLG_CHARDLG (HID_BASE + 295) -#define HID_FILEDLG_LOADTEMPLATE (HID_BASE + 296) -#define HID_FILEDLG_ROMENU (HID_BASE + 297) -#define HID_FILEDLG_MAILMRGE1 (HID_BASE + 298) -#define HID_FILEDLG_MAILMRGE2 (HID_BASE + 299) -#define HID_FILEDLG_FRMPAGE (HID_BASE + 300) -#define HID_FILEDLG_SRCVIEW (HID_BASE + 301) -#define HID_FILEDLG_WIZDOKU (HID_BASE + 302) -#define HID_PREVIEW_ZOOM (HID_BASE + 303) - -#define HID_REDLINE_AUTOFMT_ACCEPT (HID_BASE + 304) -#define HID_MULTI_TOX_DLG (HID_BASE + 305) -#define HID_ASCII_FILTER (HID_BASE + 306) -#define HID_GLBLTREE_EDIT_LINK (HID_BASE + 307) -#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308) -#define HID_REFSELECTION_TOOLTIP (HID_BASE + 309) // #i83479# +#define HID_CONVERT_FROM "SW_HID_CONVERT_FROM" +#define HID_CONVERT_TO "SW_HID_CONVERT_TO" +#define HID_EDIT_POSTIT "SW_HID_EDIT_POSTIT" +#define HID_INSERT_CHART "SW_HID_INSERT_CHART" +#define HID_PAGE_PREVIEW "SW_HID_PAGE_PREVIEW" +#define HID_INSERT_HYPERLINK "SW_HID_INSERT_HYPERLINK" +#define HID_NAVIGATOR_TREELIST "SW_HID_NAVIGATOR_TREELIST" +#define HID_DLG_CAPTION "SW_HID_DLG_CAPTION" +#define HID_DLG_GLOSS_DECIDE "SW_HID_DLG_GLOSS_DECIDE" +#define HID_NAVIGATOR_TOOLBOX "SW_HID_NAVIGATOR_TOOLBOX" +#define HID_NAVIGATOR_LISTBOX "SW_HID_NAVIGATOR_LISTBOX" +#define HID_NUM_BULLET_DLG "SW_HID_NUM_BULLET_DLG" +#define HID_VS_SINGLENUM "SW_HID_VS_SINGLENUM" +#define HID_VS_NUM "SW_HID_VS_NUM" +#define HID_VS_BULLET "SW_HID_VS_BULLET" +#define HID_VS_NUMBMP "SW_HID_VS_NUMBMP" +#define HID_VS_RULER "SW_HID_VS_RULER" +#define HID_RULER_DIALOG "SW_HID_RULER_DIALOG" +#define HID_INSERT_ABSTRACT "SW_HID_INSERT_ABSTRACT" +#define HID_NAVI_TBX1 "SW_HID_NAVI_TBX1" +#define HID_NAVI_TBX2 "SW_HID_NAVI_TBX2" +#define HID_NAVI_TBX3 "SW_HID_NAVI_TBX3" +#define HID_NAVI_TBX4 "SW_HID_NAVI_TBX4" +#define HID_NAVI_TBX5 "SW_HID_NAVI_TBX5" +#define HID_NAVI_TBX6 "SW_HID_NAVI_TBX6" +#define HID_NAVI_TBX7 "SW_HID_NAVI_TBX7" +#define HID_NAVI_TBX8 "SW_HID_NAVI_TBX8" +#define HID_NAVI_TBX9 "SW_HID_NAVI_TBX9" +#define HID_NAVI_TBX10 "SW_HID_NAVI_TBX10" +#define HID_NAVI_TBX11 "SW_HID_NAVI_TBX11" +#define HID_NAVI_TBX12 "SW_HID_NAVI_TBX12" +#define HID_NAVI_TBX13 "SW_HID_NAVI_TBX13" +#define HID_NAVI_TBX14 "SW_HID_NAVI_TBX14" +#define HID_NAVI_TBX15 "SW_HID_NAVI_TBX15" +#define HID_NAVI_VS "SW_HID_NAVI_VS" +#define HID_NUM_FORMAT_BTN "SW_HID_NUM_FORMAT_BTN" +#define HID_PPREV_ZOOM "SW_HID_PPREV_ZOOM" +#define HID_NAVI_TBX16 "SW_HID_NAVI_TBX16" +#define HID_LTEMPL_TEXT "SW_HID_LTEMPL_TEXT" +#define HID_LTEMPL_FRAME "SW_HID_LTEMPL_FRAME" +#define HID_LTEMPL_PAGE "SW_HID_LTEMPL_PAGE" +#define HID_LTEMPL_OVERRIDE "SW_HID_LTEMPL_OVERRIDE" +#define HID_LTEMPL_TEMPLATES "SW_HID_LTEMPL_TEMPLATES" +#define HID_NAVI_TBX17 "SW_HID_NAVI_TBX17" +#define HID_NAVI_TBX18 "SW_HID_NAVI_TBX18" +#define HID_NAVI_TBX19 "SW_HID_NAVI_TBX19" +#define HID_NAVI_TBX20 "SW_HID_NAVI_TBX20" +#define HID_NAVI_TBX21 "SW_HID_NAVI_TBX21" +#define HID_NAVI_TBX22 "SW_HID_NAVI_TBX22" +#define HID_NAVI_TBX23 "SW_HID_NAVI_TBX23" +#define HID_NAVI_TBX24 "SW_HID_NAVI_TBX24" +#define HID_NAVIGATOR_GLOBAL_TOOLBOX "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX" +#define HID_NAVIGATOR_GLOB_TREELIST "SW_HID_NAVIGATOR_GLOB_TREELIST" +#define HID_GLOS_GROUP_TREE "SW_HID_GLOS_GROUP_TREE" +#define HID_GLBLTREE_UPDATE "SW_HID_GLBLTREE_UPDATE" +#define HID_GLBLTREE_INSERT "SW_HID_GLBLTREE_INSERT" +#define HID_GLBLTREE_EDIT "SW_HID_GLBLTREE_EDIT" +#define HID_GLBLTREE_DEL "SW_HID_GLBLTREE_DEL" +#define HID_GLBLTREE_INS_IDX "SW_HID_GLBLTREE_INS_IDX" +#define HID_GLBLTREE_INS_CNTIDX "SW_HID_GLBLTREE_INS_CNTIDX" +#define HID_GLBLTREE_INS_USRIDX "SW_HID_GLBLTREE_INS_USRIDX" +#define HID_GLBLTREE_INS_FILE "SW_HID_GLBLTREE_INS_FILE" +#define HID_GLBLTREE_INS_NEW_FILE "SW_HID_GLBLTREE_INS_NEW_FILE" +#define HID_GLBLTREE_INS_TEXT "SW_HID_GLBLTREE_INS_TEXT" +#define HID_GLBLTREE_UPD_SEL "SW_HID_GLBLTREE_UPD_SEL" +#define HID_GLBLTREE_UPD_IDX "SW_HID_GLBLTREE_UPD_IDX" +#define HID_GLBLTREE_UPD_LINK "SW_HID_GLBLTREE_UPD_LINK" +#define HID_GLBLTREEUPD_ALL "SW_HID_GLBLTREEUPD_ALL" +#define HID_NUM_OUTL_NAMED_NUMS "SW_HID_NUM_OUTL_NAMED_NUMS" +#define HID_NUM_OUTL_NUM_SAVEAS "SW_HID_NUM_OUTL_NUM_SAVEAS" +#define HID_NUM_NAMED_NUMS "SW_HID_NUM_NAMED_NUMS" +#define HID_NUM_NUM_SAVEAS "SW_HID_NUM_NUM_SAVEAS" +#define HID_NUM_STD_NUMBER "SW_HID_NUM_STD_NUMBER" +#define HID_NUM_DEL_NUMBER "SW_HID_NUM_DEL_NUMBER" +#define HID_NUM_STD_BULLET "SW_HID_NUM_STD_BULLET" +#define HID_NUM_DEL_BULLET "SW_HID_NUM_DEL_BULLET" +#define HID_NAVI_CONTENT "SW_HID_NAVI_CONTENT" +#define HID_NAVI_GLOBAL "SW_HID_NAVI_GLOBAL" +#define HID_LTEMPL_NUMBERING "SW_HID_LTEMPL_NUMBERING" +#define HID_FLDVAR_APPLY "SW_HID_FLDVAR_APPLY" +#define HID_FLDVAR_DELETE "SW_HID_FLDVAR_DELETE" +#define HID_FLDEDT_ADDRESS "SW_HID_FLDEDT_ADDRESS" +#define HID_SORT_ACTION "SW_HID_SORT_ACTION" +#define HID_SORT_AUTHOR "SW_HID_SORT_AUTHOR" +#define HID_SORT_DATE "SW_HID_SORT_DATE" +#define HID_SORT_COMMENT "SW_HID_SORT_COMMENT" +#define HID_SW_SORT_POSITION "SW_HID_SW_SORT_POSITION" +#define HID_SYNC_BTN "SW_HID_SYNC_BTN" +#define HID_EDIT_COMMENT "SW_HID_EDIT_COMMENT" +#define HID_SEL_TEMPLATE "SW_HID_SEL_TEMPLATE" +#define HID_DLG_SEQUENCE_OPTION "SW_HID_DLG_SEQUENCE_OPTION" +#define HID_DLG_FLDEDT_NEXT "SW_HID_DLG_FLDEDT_NEXT" +#define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV" +#define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS" +#define HID_DLG_PRV_PRT_OPTIONS "SW_HID_DLG_PRV_PRT_OPTIONS" + +#define HID_FILEDLG_CHARDLG "SW_HID_FILEDLG_CHARDLG" +#define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE" +#define HID_FILEDLG_ROMENU "SW_HID_FILEDLG_ROMENU" +#define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1" +#define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" +#define HID_FILEDLG_FRMPAGE "SW_HID_FILEDLG_FRMPAGE" +#define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW" +#define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU" +#define HID_PREVIEW_ZOOM "SW_HID_PREVIEW_ZOOM" + +#define HID_REDLINE_AUTOFMT_ACCEPT "SW_HID_REDLINE_AUTOFMT_ACCEPT" +#define HID_MULTI_TOX_DLG "SW_HID_MULTI_TOX_DLG" +#define HID_ASCII_FILTER "SW_HID_ASCII_FILTER" +#define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" +#define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME" +#define HID_REFSELECTION_TOOLTIP "SW_HID_REFSELECTION_TOOLTIP" // #i83479# // TabPage Help-IDs -#define HID_DROPCAPS (HID_BASE + 400) -#define HID_FRM_EXT (HID_BASE + 401) -#define HID_FRM_STD (HID_BASE + 402) -#define HID_GRF_EXT (HID_BASE + 403) -#define HID_COLUMN (HID_BASE + 404) -#define HID_DOC_STAT (HID_BASE + 405) -#define HID_MACROASSIGN (HID_BASE + 406) -#define HID_FOOTNOTE_PAGE (HID_BASE + 407) -#define HID_OPTDOCDISP_PAGE (HID_BASE + 408) -#define HID_OPTGRID_PAGE (HID_BASE + 409) -#define HID_OPTTEST_PAGE (HID_BASE + 410) -#define HID_OPTPRINT_PAGE (HID_BASE + 411) -#define HID_FORMAT_TABLE (HID_BASE + 412) -#define HID_TABLE_COLUMN (HID_BASE + 413) -#define HID_LAB_LAB (HID_BASE + 414) -#define HID_LAB_PRT (HID_BASE + 415) -#define HID_ENV_PRT (HID_BASE + 416) -#define HID_LAB_FMT (HID_BASE + 417) -#define HID_ENV_ENV (HID_BASE + 418) -#define HID_ENV_FMT (HID_BASE + 419) -#define HID_FRM_URL (HID_BASE + 421) -#define HID_CHAR_URL (HID_BASE + 422) -#define HID_CONTENT_OPT (HID_BASE + 423) -#define HID_LAYOUT_OPT (HID_BASE + 424) -#define HID_STD_FONT (HID_BASE + 425) -#define HID_COND_COLL (HID_BASE + 426) -#define HID_FRM_ADD (HID_BASE + 427) -#define HID_TABLE_TEXTFLOW (HID_BASE + 428) -#define HID_AUTOFMT_BY_INPUT (HID_BASE + 429) -#define HID_AUTOFMT_APPLY (HID_BASE + 430) -#define HID_OPTTABLE_PAGE (HID_BASE + 431) -#define HID_PICK_SINGLE_NUM (HID_BASE + 432) -#define HID_PICK_BULLET (HID_BASE + 433) -#define HID_PICK_NUM (HID_BASE + 434) -#define HID_PICK_BMP (HID_BASE + 435) - -#define HID_FLD_DB (HID_BASE + 437) -#define HID_FLD_DOKINF (HID_BASE + 438) -#define HID_FLD_VAR (HID_BASE + 439) -#define HID_FLD_DOK (HID_BASE + 440) -#define HID_FLD_FUNC (HID_BASE + 441) -#define HID_FLD_REF (HID_BASE + 442) -#define HID_OPTSHDWCRSR (HID_BASE + 443) -#define HID_NUM_OPTIONS (HID_BASE + 444) -#define HID_NUM_POSITION (HID_BASE + 445) -#define HID_NUMPARA (HID_BASE + 446) -#define HID_FOOTNOTE_OPTIONS (HID_BASE + 447) -#define HID_ENDNOTE_OPTIONS (HID_BASE + 448) -#define HID_REDLINE_OPT (HID_BASE + 449) -#define HID_LINENUMBERING (HID_BASE + 450) -#define HID_REDLINE_ACCEPT (HID_BASE + 451) -#define HID_EDIT_FLD_DB (HID_BASE + 452) -#define HID_EDIT_FLD_DOKINF (HID_BASE + 453) -#define HID_EDIT_FLD_VAR (HID_BASE + 454) -#define HID_EDIT_FLD_DOK (HID_BASE + 455) -#define HID_EDIT_FLD_FUNC (HID_BASE + 456) -#define HID_EDIT_FLD_REF (HID_BASE + 457) -#define HID_REDLINE_CTRL (HID_BASE + 458) -#define HID_TP_OUTLINE_NUM (HID_BASE + 459) -#define HID_OPTINSERT_PAGE (HID_BASE + 460) -#define HID_OPTCAPTION_PAGE (HID_BASE + 461) -#define HID_OPTLOAD_PAGE (HID_BASE + 462) -#define HID_INSERT_TOX_PAGE (HID_BASE + 463) -#define HID_TOX_FORM_ENTRY_PAGE (HID_BASE + 464) -#define HID_TOX_FORM_STYLES_PAGE (HID_BASE + 465) -#define HID_INSERT_TOX_TABDLG (HID_BASE + 466) -#define HID_INSERT_SECTION_PAGE (HID_BASE + 467) -#define HID_INSERT_SECTION_DLG (HID_BASE + 468) -#define HID_SECTION_PROPERTIES_DLG (HID_BASE + 469) -#define HID_RENAME_XNAMED (HID_BASE + 470) -#define HID_TP_TOX_SELECT (HID_BASE + 471) -#define HID_TP_TOX_ENTRY (HID_BASE + 472) -#define HID_TOX_STYLES_PAGE (HID_BASE + 473) -#define HID_TP_VISITING_CARDS (HID_BASE + 474) -#define HID_DLG_ADD_IDX_STYLES (HID_BASE + 475) -#define HID_ADD_STYLES_TLB (HID_BASE + 476) -#define HID_OLE_CHECKLB (HID_BASE + 477) -#define HID_DLG_CREATE_AUTH_ENTRY (HID_BASE + 478) -#define HID_TP_PRIVATE_DATA (HID_BASE + 479) - -#define HID_TP_BUSINESS_DATA (HID_BASE + 480) -#define HID_SECTION_FTNENDNOTES_PAGE (HID_BASE + 481) -#define HID_TEXTGRID_PAGE (HID_BASE + 482) -#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483) -#define HID_COMPATIBILITY_OPTIONS_BOX (HID_BASE + 484) +#define HID_DROPCAPS "SW_HID_DROPCAPS" +#define HID_FRM_EXT "SW_HID_FRM_EXT" +#define HID_FRM_STD "SW_HID_FRM_STD" +#define HID_GRF_EXT "SW_HID_GRF_EXT" +#define HID_COLUMN "SW_HID_COLUMN" +#define HID_DOC_STAT "SW_HID_DOC_STAT" +#define HID_MACROASSIGN "SW_HID_MACROASSIGN" +#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE" +#define HID_OPTDOCDISP_PAGE "SW_HID_OPTDOCDISP_PAGE" +#define HID_OPTGRID_PAGE "SW_HID_OPTGRID_PAGE" +#define HID_OPTTEST_PAGE "SW_HID_OPTTEST_PAGE" +#define HID_OPTPRINT_PAGE "SW_HID_OPTPRINT_PAGE" +#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE" +#define HID_TABLE_COLUMN "SW_HID_TABLE_COLUMN" +#define HID_LAB_LAB "SW_HID_LAB_LAB" +#define HID_LAB_PRT "SW_HID_LAB_PRT" +#define HID_ENV_PRT "SW_HID_ENV_PRT" +#define HID_LAB_FMT "SW_HID_LAB_FMT" +#define HID_ENV_ENV "SW_HID_ENV_ENV" +#define HID_ENV_FMT "SW_HID_ENV_FMT" +#define HID_FRM_URL "SW_HID_FRM_URL" +#define HID_CHAR_URL "SW_HID_CHAR_URL" +#define HID_CONTENT_OPT "SW_HID_CONTENT_OPT" +#define HID_LAYOUT_OPT "SW_HID_LAYOUT_OPT" +#define HID_STD_FONT "SW_HID_STD_FONT" +#define HID_COND_COLL "SW_HID_COND_COLL" +#define HID_FRM_ADD "SW_HID_FRM_ADD" +#define HID_TABLE_TEXTFLOW "SW_HID_TABLE_TEXTFLOW" +#define HID_AUTOFMT_BY_INPUT "SW_HID_AUTOFMT_BY_INPUT" +#define HID_AUTOFMT_APPLY "SW_HID_AUTOFMT_APPLY" +#define HID_OPTTABLE_PAGE "SW_HID_OPTTABLE_PAGE" +#define HID_PICK_SINGLE_NUM "SW_HID_PICK_SINGLE_NUM" +#define HID_PICK_BULLET "SW_HID_PICK_BULLET" +#define HID_PICK_NUM "SW_HID_PICK_NUM" +#define HID_PICK_BMP "SW_HID_PICK_BMP" + +#define HID_FLD_DB "SW_HID_FLD_DB" +#define HID_FLD_DOKINF "SW_HID_FLD_DOKINF" +#define HID_FLD_VAR "SW_HID_FLD_VAR" +#define HID_FLD_DOK "SW_HID_FLD_DOK" +#define HID_FLD_FUNC "SW_HID_FLD_FUNC" +#define HID_FLD_REF "SW_HID_FLD_REF" +#define HID_OPTSHDWCRSR "SW_HID_OPTSHDWCRSR" +#define HID_NUM_OPTIONS "SW_HID_NUM_OPTIONS" +#define HID_NUM_POSITION "SW_HID_NUM_POSITION" +#define HID_NUMPARA "SW_HID_NUMPARA" +#define HID_FOOTNOTE_OPTIONS "SW_HID_FOOTNOTE_OPTIONS" +#define HID_ENDNOTE_OPTIONS "SW_HID_ENDNOTE_OPTIONS" +#define HID_REDLINE_OPT "SW_HID_REDLINE_OPT" +#define HID_LINENUMBERING "SW_HID_LINENUMBERING" +#define HID_REDLINE_ACCEPT "SW_HID_REDLINE_ACCEPT" +#define HID_EDIT_FLD_DB "SW_HID_EDIT_FLD_DB" +#define HID_EDIT_FLD_DOKINF "SW_HID_EDIT_FLD_DOKINF" +#define HID_EDIT_FLD_VAR "SW_HID_EDIT_FLD_VAR" +#define HID_EDIT_FLD_DOK "SW_HID_EDIT_FLD_DOK" +#define HID_EDIT_FLD_FUNC "SW_HID_EDIT_FLD_FUNC" +#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF" +#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" +#define HID_TP_OUTLINE_NUM "SW_HID_TP_OUTLINE_NUM" +#define HID_OPTINSERT_PAGE "SW_HID_OPTINSERT_PAGE" +#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE" +#define HID_OPTLOAD_PAGE "SW_HID_OPTLOAD_PAGE" +#define HID_INSERT_TOX_PAGE "SW_HID_INSERT_TOX_PAGE" +#define HID_TOX_FORM_ENTRY_PAGE "SW_HID_TOX_FORM_ENTRY_PAGE" +#define HID_TOX_FORM_STYLES_PAGE "SW_HID_TOX_FORM_STYLES_PAGE" +#define HID_INSERT_TOX_TABDLG "SW_HID_INSERT_TOX_TABDLG" +#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE" +#define HID_INSERT_SECTION_DLG "SW_HID_INSERT_SECTION_DLG" +#define HID_SECTION_PROPERTIES_DLG "SW_HID_SECTION_PROPERTIES_DLG" +#define HID_RENAME_XNAMED "SW_HID_RENAME_XNAMED" +#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" +#define HID_TP_TOX_ENTRY "SW_HID_TP_TOX_ENTRY" +#define HID_TOX_STYLES_PAGE "SW_HID_TOX_STYLES_PAGE" +#define HID_TP_VISITING_CARDS "SW_HID_TP_VISITING_CARDS" +#define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES" +#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB" +#define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB" +#define HID_DLG_CREATE_AUTH_ENTRY "SW_HID_DLG_CREATE_AUTH_ENTRY" +#define HID_TP_PRIVATE_DATA "SW_HID_TP_PRIVATE_DATA" + +#define HID_TP_BUSINESS_DATA "SW_HID_TP_BUSINESS_DATA" +#define HID_SECTION_FTNENDNOTES_PAGE "SW_HID_SECTION_FTNENDNOTES_PAGE" +#define HID_TEXTGRID_PAGE "SW_HID_TEXTGRID_PAGE" +#define HID_OPTCOMPATIBILITY_PAGE "SW_HID_OPTCOMPATIBILITY_PAGE" +#define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX" // AutoPilot Help-IDs -#define HID_LETTER_PAGE1 (HID_BASE + 501) -#define HID_LETTER_PAGE2 (HID_BASE + 502) -#define HID_LETTER_PAGE3 (HID_BASE + 503) -#define HID_LETTER_PAGE4 (HID_BASE + 504) -#define HID_LETTER_PAGE5 (HID_BASE + 505) -#define HID_LETTER_PAGE6 (HID_BASE + 506) -#define HID_LETTER_PAGE7 (HID_BASE + 507) -#define HID_LETTER_PAGE8 (HID_BASE + 508) -#define HID_LETTER_PAGE9 (HID_BASE + 509) - -#define HID_FAX_PAGE1 (HID_BASE + 511) -#define HID_FAX_PAGE2 (HID_BASE + 512) -#define HID_FAX_PAGE3 (HID_BASE + 513) -#define HID_FAX_PAGE4 (HID_BASE + 514) -#define HID_FAX_PAGE5 (HID_BASE + 515) -#define HID_FAX_PAGE6 (HID_BASE + 516) -#define HID_FAX_PAGE7 (HID_BASE + 517) -#define HID_FAX_PAGE8 (HID_BASE + 518) - -#define HID_MEMO_PAGE1 (HID_BASE + 521) -#define HID_MEMO_PAGE2 (HID_BASE + 522) -#define HID_MEMO_PAGE3 (HID_BASE + 523) -#define HID_MEMO_PAGE4 (HID_BASE + 524) -#define HID_MEMO_PAGE5 (HID_BASE + 525) - -#define HID_AGENDA_PAGE1 (HID_BASE + 531) -#define HID_AGENDA_PAGE2 (HID_BASE + 532) -#define HID_AGENDA_PAGE3 (HID_BASE + 533) -#define HID_AGENDA_PAGE4 (HID_BASE + 534) -#define HID_AGENDA_PAGE5 (HID_BASE + 535) -#define HID_AGENDA_PAGE6 (HID_BASE + 536) - -#define HID_AUTOPILOT_NEXT (HID_BASE + 537) -#define HID_AUTOPILOT_PREV (HID_BASE + 538) -#define HID_AUTOPILOT_OK (HID_BASE + 539) +#define HID_LETTER_PAGE1 "SW_HID_LETTER_PAGE1" +#define HID_LETTER_PAGE2 "SW_HID_LETTER_PAGE2" +#define HID_LETTER_PAGE3 "SW_HID_LETTER_PAGE3" +#define HID_LETTER_PAGE4 "SW_HID_LETTER_PAGE4" +#define HID_LETTER_PAGE5 "SW_HID_LETTER_PAGE5" +#define HID_LETTER_PAGE6 "SW_HID_LETTER_PAGE6" +#define HID_LETTER_PAGE7 "SW_HID_LETTER_PAGE7" +#define HID_LETTER_PAGE8 "SW_HID_LETTER_PAGE8" +#define HID_LETTER_PAGE9 "SW_HID_LETTER_PAGE9" + +#define HID_FAX_PAGE1 "SW_HID_FAX_PAGE1" +#define HID_FAX_PAGE2 "SW_HID_FAX_PAGE2" +#define HID_FAX_PAGE3 "SW_HID_FAX_PAGE3" +#define HID_FAX_PAGE4 "SW_HID_FAX_PAGE4" +#define HID_FAX_PAGE5 "SW_HID_FAX_PAGE5" +#define HID_FAX_PAGE6 "SW_HID_FAX_PAGE6" +#define HID_FAX_PAGE7 "SW_HID_FAX_PAGE7" +#define HID_FAX_PAGE8 "SW_HID_FAX_PAGE8" + +#define HID_MEMO_PAGE1 "SW_HID_MEMO_PAGE1" +#define HID_MEMO_PAGE2 "SW_HID_MEMO_PAGE2" +#define HID_MEMO_PAGE3 "SW_HID_MEMO_PAGE3" +#define HID_MEMO_PAGE4 "SW_HID_MEMO_PAGE4" +#define HID_MEMO_PAGE5 "SW_HID_MEMO_PAGE5" + +#define HID_AGENDA_PAGE1 "SW_HID_AGENDA_PAGE1" +#define HID_AGENDA_PAGE2 "SW_HID_AGENDA_PAGE2" +#define HID_AGENDA_PAGE3 "SW_HID_AGENDA_PAGE3" +#define HID_AGENDA_PAGE4 "SW_HID_AGENDA_PAGE4" +#define HID_AGENDA_PAGE5 "SW_HID_AGENDA_PAGE5" +#define HID_AGENDA_PAGE6 "SW_HID_AGENDA_PAGE6" + +#define HID_AUTOPILOT_NEXT "SW_HID_AUTOPILOT_NEXT" +#define HID_AUTOPILOT_PREV "SW_HID_AUTOPILOT_PREV" +#define HID_AUTOPILOT_OK "SW_HID_AUTOPILOT_OK" // HelpIds for Menu -#define HID_MN_SUB_TBLROW (HID_BASE + 600) -#define HID_MN_SUB_TBLCOL (HID_BASE + 601) -#define HID_MN_SUB_AUTOFORMAT (HID_BASE + 602) -#define HID_MN_SUB_TOOLBAR (HID_BASE + 603) -#define HID_MN_SUB_FIELD (HID_BASE + 604) -#define HID_MN_SUB_GRAPHIC (HID_BASE + 605) -#define HID_MN_SUB_TEMPLATES (HID_BASE + 606) -#define HID_MN_SUB_ARRANGE (HID_BASE + 607) -#define HID_MN_SUB_SPELLING (HID_BASE + 608) -#define HID_MN_SUB_UPDATE (HID_BASE + 609) -#define HID_MN_SUB_MIRROR (HID_BASE + 610) -#define HID_MN_SUB_ALIGN (HID_BASE + 611) -#define HID_MN_SUB_OPTIONS (HID_BASE + 612) - -#define HID_MN_CALC_PHD (HID_BASE + 613) -#define HID_MN_CALC_SQRT (HID_BASE + 614) -#define HID_MN_CALC_OR (HID_BASE + 615) -#define HID_MN_CALC_XOR (HID_BASE + 616) -#define HID_MN_CALC_AND (HID_BASE + 617) -#define HID_MN_CALC_NOT (HID_BASE + 618) -#define HID_MN_CALC_EQ (HID_BASE + 619) -#define HID_MN_CALC_NEQ (HID_BASE + 620) -#define HID_MN_CALC_LEQ (HID_BASE + 621) -#define HID_MN_CALC_GEQ (HID_BASE + 622) -#define HID_MN_CALC_LES (HID_BASE + 623) -#define HID_MN_CALC_GRE (HID_BASE + 624) -#define HID_MN_CALC_SUM (HID_BASE + 625) -#define HID_MN_CALC_MEAN (HID_BASE + 626) -#define HID_MN_CALC_MIN (HID_BASE + 627) -#define HID_MN_CALC_MAX (HID_BASE + 628) -#define HID_MN_CALC_SIN (HID_BASE + 629) -#define HID_MN_CALC_COS (HID_BASE + 630) -#define HID_MN_CALC_TAN (HID_BASE + 631) -#define HID_MN_CALC_ASIN (HID_BASE + 632) -#define HID_MN_CALC_ACOS (HID_BASE + 633) -#define HID_MN_CALC_ATAN (HID_BASE + 634) -#define HID_MN_CALC_POW (HID_BASE + 635) -#define HID_MN_CALC_LISTSEP (HID_BASE + 636) -#define HID_MN_POP_OPS (HID_BASE + 637) -#define HID_MN_POP_STATISTICS (HID_BASE + 638) -#define HID_MN_POP_FUNC (HID_BASE + 639) -#define HID_MN_RSC_END (HID_BASE + 640) -#define HID_MN_CALC_ROUND (HID_BASE + 641) -#define HID_MN_SUB_MACRO (HID_BASE + 642) - -#define HID_MN_READONLY_SAVEGRAPHIC (HID_BASE + 645) -#define HID_MN_READONLY_GRAPHICTOGALLERY (HID_BASE + 646) -#define HID_MN_READONLY_TOGALLERYLINK (HID_BASE + 647) -#define HID_MN_READONLY_TOGALLERYCOPY (HID_BASE + 648) -#define HID_MN_READONLY_SAVEBACKGROUND (HID_BASE + 649) -#define HID_MN_READONLY_BACKGROUNDTOGALLERY (HID_BASE + 650) -#define HID_MN_READONLY_COPYLINK (HID_BASE + 651) -#define HID_MN_READONLY_COPYGRAPHIC (HID_BASE + 652) -#define HID_MN_READONLY_LOADGRAPHIC (HID_BASE + 653) -#define HID_MN_READONLY_GRAPHICOFF (HID_BASE + 654) -#define HID_MN_READONLY_PLUGINOFF (HID_BASE + 655) - -#define HID_MD_GLOS_DEFINE (HID_BASE + 656) -#define HID_MD_GLOS_REPLACE (HID_BASE + 657) -#define HID_MD_GLOS_RENAME (HID_BASE + 658) -#define HID_MD_GLOS_DELETE (HID_BASE + 659) -#define HID_MD_GLOS_EDIT (HID_BASE + 660) -#define HID_MD_GLOS_MACRO (HID_BASE + 661) -#define HID_LINGU_ADD_WORD (HID_BASE + 662) -#define HID_LINGU_IGNORE_WORD (HID_BASE + 663) -#define HID_LINGU_SPELLING_DLG (HID_BASE + 664) -#define HID_LINGU_AUTOCORR (HID_BASE + 665) -#define HID_LINGU_REPLACE (HID_BASE + 666) -#define HID_MD_GLOS_CATEGORY (HID_BASE + 667) -#define HID_REGION_TREE (HID_BASE + 668) -#define HID_LINGU_WORD_LANGUAGE (HID_BASE + 669) -#define HID_LINGU_PARA_LANGUAGE (HID_BASE + 670) -#define HID_MD_GLOS_DEFINE_TEXT (HID_BASE + 671) -#define HID_DLG_PASSWD_SECTION (HID_BASE + 672) -#define HID_MD_COPY_TO_CLIPBOARD (HID_BASE + 673) -#define HID_MD_GLOS_IMPORT (HID_BASE + 674) -#define HID_SMARTTAG_MAIN (HID_BASE + 675) // SMARTTAGS -#define HID_LINGU_IGNORE_SELECTION (HID_BASE + 676) // grammar check context menu +#define HID_MN_SUB_TBLROW "SW_HID_MN_SUB_TBLROW" +#define HID_MN_SUB_TBLCOL "SW_HID_MN_SUB_TBLCOL" +#define HID_MN_SUB_AUTOFORMAT "SW_HID_MN_SUB_AUTOFORMAT" +#define HID_MN_SUB_TOOLBAR "SW_HID_MN_SUB_TOOLBAR" +#define HID_MN_SUB_FIELD "SW_HID_MN_SUB_FIELD" +#define HID_MN_SUB_GRAPHIC "SW_HID_MN_SUB_GRAPHIC" +#define HID_MN_SUB_TEMPLATES "SW_HID_MN_SUB_TEMPLATES" +#define HID_MN_SUB_ARRANGE "SW_HID_MN_SUB_ARRANGE" +#define HID_MN_SUB_SPELLING "SW_HID_MN_SUB_SPELLING" +#define HID_MN_SUB_UPDATE "SW_HID_MN_SUB_UPDATE" +#define HID_MN_SUB_MIRROR "SW_HID_MN_SUB_MIRROR" +#define HID_MN_SUB_ALIGN "SW_HID_MN_SUB_ALIGN" +#define HID_MN_SUB_OPTIONS "SW_HID_MN_SUB_OPTIONS" + +#define HID_MN_CALC_PHD "SW_HID_MN_CALC_PHD" +#define HID_MN_CALC_SQRT "SW_HID_MN_CALC_SQRT" +#define HID_MN_CALC_OR "SW_HID_MN_CALC_OR" +#define HID_MN_CALC_XOR "SW_HID_MN_CALC_XOR" +#define HID_MN_CALC_AND "SW_HID_MN_CALC_AND" +#define HID_MN_CALC_NOT "SW_HID_MN_CALC_NOT" +#define HID_MN_CALC_EQ "SW_HID_MN_CALC_EQ" +#define HID_MN_CALC_NEQ "SW_HID_MN_CALC_NEQ" +#define HID_MN_CALC_LEQ "SW_HID_MN_CALC_LEQ" +#define HID_MN_CALC_GEQ "SW_HID_MN_CALC_GEQ" +#define HID_MN_CALC_LES "SW_HID_MN_CALC_LES" +#define HID_MN_CALC_GRE "SW_HID_MN_CALC_GRE" +#define HID_MN_CALC_SUM "SW_HID_MN_CALC_SUM" +#define HID_MN_CALC_MEAN "SW_HID_MN_CALC_MEAN" +#define HID_MN_CALC_MIN "SW_HID_MN_CALC_MIN" +#define HID_MN_CALC_MAX "SW_HID_MN_CALC_MAX" +#define HID_MN_CALC_SIN "SW_HID_MN_CALC_SIN" +#define HID_MN_CALC_COS "SW_HID_MN_CALC_COS" +#define HID_MN_CALC_TAN "SW_HID_MN_CALC_TAN" +#define HID_MN_CALC_ASIN "SW_HID_MN_CALC_ASIN" +#define HID_MN_CALC_ACOS "SW_HID_MN_CALC_ACOS" +#define HID_MN_CALC_ATAN "SW_HID_MN_CALC_ATAN" +#define HID_MN_CALC_POW "SW_HID_MN_CALC_POW" +#define HID_MN_CALC_LISTSEP "SW_HID_MN_CALC_LISTSEP" +#define HID_MN_POP_OPS "SW_HID_MN_POP_OPS" +#define HID_MN_POP_STATISTICS "SW_HID_MN_POP_STATISTICS" +#define HID_MN_POP_FUNC "SW_HID_MN_POP_FUNC" +#define HID_MN_RSC_END "SW_HID_MN_RSC_END" +#define HID_MN_CALC_ROUND "SW_HID_MN_CALC_ROUND" +#define HID_MN_SUB_MACRO "SW_HID_MN_SUB_MACRO" + +#define HID_MN_READONLY_SAVEGRAPHIC "SW_HID_MN_READONLY_SAVEGRAPHIC" +#define HID_MN_READONLY_GRAPHICTOGALLERY "SW_HID_MN_READONLY_GRAPHICTOGALLERY" +#define HID_MN_READONLY_TOGALLERYLINK "SW_HID_MN_READONLY_TOGALLERYLINK" +#define HID_MN_READONLY_TOGALLERYCOPY "SW_HID_MN_READONLY_TOGALLERYCOPY" +#define HID_MN_READONLY_SAVEBACKGROUND "SW_HID_MN_READONLY_SAVEBACKGROUND" +#define HID_MN_READONLY_BACKGROUNDTOGALLERY "SW_HID_MN_READONLY_BACKGROUNDTOGALLERY" +#define HID_MN_READONLY_COPYLINK "SW_HID_MN_READONLY_COPYLINK" +#define HID_MN_READONLY_COPYGRAPHIC "SW_HID_MN_READONLY_COPYGRAPHIC" +#define HID_MN_READONLY_LOADGRAPHIC "SW_HID_MN_READONLY_LOADGRAPHIC" +#define HID_MN_READONLY_GRAPHICOFF "SW_HID_MN_READONLY_GRAPHICOFF" +#define HID_MN_READONLY_PLUGINOFF "SW_HID_MN_READONLY_PLUGINOFF" + +#define HID_MD_GLOS_DEFINE "SW_HID_MD_GLOS_DEFINE" +#define HID_MD_GLOS_REPLACE "SW_HID_MD_GLOS_REPLACE" +#define HID_MD_GLOS_RENAME "SW_HID_MD_GLOS_RENAME" +#define HID_MD_GLOS_DELETE "SW_HID_MD_GLOS_DELETE" +#define HID_MD_GLOS_EDIT "SW_HID_MD_GLOS_EDIT" +#define HID_MD_GLOS_MACRO "SW_HID_MD_GLOS_MACRO" +#define HID_LINGU_ADD_WORD "SW_HID_LINGU_ADD_WORD" +#define HID_LINGU_IGNORE_WORD "SW_HID_LINGU_IGNORE_WORD" +#define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG" +#define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" +#define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" +#define HID_MD_GLOS_CATEGORY "SW_HID_MD_GLOS_CATEGORY" +#define HID_REGION_TREE "SW_HID_REGION_TREE" +#define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE" +#define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE" +#define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT" +#define HID_DLG_PASSWD_SECTION "SW_HID_DLG_PASSWD_SECTION" +#define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD" +#define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT" +#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS +#define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu // More Help-IDs -#define HID_CLOSE_FILE (HID_BASE + 1001) -#define HID_LAUNCH_REGISTRY (HID_BASE + 1002) -#define HID_MERGE_FILE (HID_BASE + 1003) -#define HID_MERGE_FILE_DLG (HID_BASE + 1004) -#define HID_NEW_FILE (HID_BASE + 1005) -#define HID_OPEN_FILE (HID_BASE + 1007) -#define HID_OPEN_LASTVERSION (HID_BASE + 1009) -#define HID_PRINT_FILE (HID_BASE + 1010) -#define HID_PRINT_FILE_OPTIONS (HID_BASE + 1011) -#define HID_SAVE_FILE_AS (HID_BASE + 1012) -#define HID_SAVE_FILE (HID_BASE + 1013) -#define HID_SETUP_PRINTER_DLG (HID_BASE + 1015) -#define HID_EXIT (HID_BASE + 1017) -#define HID_CREATE_DOCUMENT (HID_BASE + 1019) -#define HID_DOCSTAT_DLG (HID_BASE + 1020) -#define HID_LOAD_TEMPLATE_DLG (HID_BASE + 1021) -#define HID_SAVE_ALL (HID_BASE + 1023) -#define HID_NEW_FILE_DEFAULT (HID_BASE + 1024) -#define HID_PRINT_FILE_DEFAULT (HID_BASE + 1025) -#define HID_FAX (HID_BASE + 1028) -#define HID_SELECT_DATABASE (HID_BASE + 1030) -#define HID_DOC_INFO_DLG (HID_BASE + 1031) -#define HID_DOC_MGR_DLG (HID_BASE + 1032) -#define HID_OPTCAPTION_CLB (HID_BASE + 1033) - -#define HID_COPY (HID_BASE + 1102) -#define HID_CUT (HID_BASE + 1103) -#define HID_EDIT_FIELD (HID_BASE + 1104) -#define HID_EDIT_FILE_INFO_DLG (HID_BASE + 1107) -#define HID_EDIT_LINK_DLG (HID_BASE + 1109) -#define HID_EDIT_OBJECT (HID_BASE + 1110) -#define HID_GOTO (HID_BASE + 1111) -#define HID_SET_FIELD_VALUE (HID_BASE + 1112) -#define HID_PASTE (HID_BASE + 1113) -#define HID_REDO (HID_BASE + 1116) -#define HID_SEARCH (HID_BASE + 1117) -#define HID_REPLACE (HID_BASE + 1118) -#define HID_SELECT_ALL (HID_BASE + 1119) -#define HID_UNDO (HID_BASE + 1120) -#define HID_REPEAT (HID_BASE + 1122) -#define HID_BUFFER_UPDATE (HID_BASE + 1124) -#define HID_UPDATE_FIELDS (HID_BASE + 1126) -#define HID_EXECUTE_MACROFIELD (HID_BASE + 1127) -#define HID_EDIT_FORMULA (HID_BASE + 1128) -#define HID_CALC_TABLE (HID_BASE + 1129) -#define HID_NUM_BULLET_DOWN (HID_BASE + 1130) -#define HID_NUM_BULLET_UP (HID_BASE + 1131) -#define HID_NUM_BULLET_PREV (HID_BASE + 1132) -#define HID_NUM_BULLET_NEXT (HID_BASE + 1133) -#define HID_NUM_BULLET_MOVEUP (HID_BASE + 1134) -#define HID_NUM_BULLET_MOVEDOWN (HID_BASE + 1135) -#define HID_NUM_BULLET_NONUM (HID_BASE + 1136) -#define HID_NUM_BULLET_OFF (HID_BASE + 1137) -#define HID_NUM_BULLET_ON (HID_BASE + 1138) -#define HID_NUM_BULLET_OUTLINE_DOWN (HID_BASE + 1139) -#define HID_NUM_BULLET_OUTLINE_UP (HID_BASE + 1140) -#define HID_NUM_BULLET_OUTLINE_MOVEUP (HID_BASE + 1141) -#define HID_NUM_BULLET_OUTLINE_MOVEDOWN (HID_BASE + 1142) -#define HID_UPDATE_INPUTFIELDS (HID_BASE + 1143) -#define HID_NUM_NUMBERING_ON (HID_BASE + 1144) -#define HID_REPEAT_SEARCH (HID_BASE + 1150) -#define HID_REPAGINATE (HID_BASE + 1161) - -#define HID_REFRESH_VIEW (HID_BASE + 1201) -#define HID_RIBBON (HID_BASE + 1210) -#define HID_RULER (HID_BASE + 1211) -#define HID_STATUSBAR (HID_BASE + 1212) -#define HID_TOOLBOX (HID_BASE + 1213) -#define HID_VIEW_BOUNDS (HID_BASE + 1214) -#define HID_VIEW_FIELDS (HID_BASE + 1215) -#define HID_VLINEAL (HID_BASE + 1216) -#define HID_VSCROLLBAR (HID_BASE + 1217) -#define HID_HSCROLLBAR (HID_BASE + 1218) -#define HID_VIEW_META_CHARS (HID_BASE + 1224) -#define HID_VIEW_MARKS (HID_BASE + 1225) -#define HID_VIEW_FIELDNAME (HID_BASE + 1226) -#define HID_VIEW_TABLEGRID (HID_BASE + 1227) -#define HID_ZOOM (HID_BASE + 1231) - -#define HID_DELETE_BOOKMARK (HID_BASE + 1301) -#define HID_INSERT_BREAK (HID_BASE + 1303) -#define HID_INSERT_COLUMN_BREAK (HID_BASE + 1305) -#define HID_INSERT_FILE (HID_BASE + 1309) -#define HID_INSERT_FOOTNOTE (HID_BASE + 1311) -#define HID_INSERT_GRAFIC (HID_BASE + 1315) -#define HID_INSERT_LINEBREAK (HID_BASE + 1318) -#define HID_INSERT_MERGEFIELD_DLG (HID_BASE + 1320) -#define HID_INSERT_OBJECT_DLG (HID_BASE + 1322) -#define HID_INSERT_PAGEBREAK (HID_BASE + 1323) -#define HID_INSERT_RECORD (HID_BASE + 1326) -#define HID_MERGE_RECORD (HID_BASE + 1327) -#define HID_INSERT_SYMBOL (HID_BASE + 1328) -#define HID_INSERT_STRING (HID_BASE + 1331) -#define HID_INSERT_COLS (HID_BASE + 1332) -#define HID_INSERT_FRAME_INTERACT (HID_BASE + 1333) -#define HID_INSERT_FRAME (HID_BASE + 1334) -#define HID_INSERT_IDX_ENTRY (HID_BASE + 1340) -#define HID_INSERT_USERIDX_ENTRY (HID_BASE + 1341) -#define HID_INSERT_CNTNTIDX_ENTRY (HID_BASE + 1342) -#define HID_INSERT_SOFT_HYPHEN (HID_BASE + 1350) -#define HID_INSERT_HARD_SPACE (HID_BASE + 1351) - -#define HID_SET_FONT (HID_BASE + 1401) -#define HID_SET_FONT_SIZE (HID_BASE + 1402) -#define HID_GROW_FONT_SIZE (HID_BASE + 1403) -#define HID_SHRINK_FONT_SIZE (HID_BASE + 1404) -#define HID_SET_BOLD (HID_BASE + 1405) -#define HID_SET_ITALIC (HID_BASE + 1406) -#define HID_SET_SHADOW (HID_BASE + 1407) -#define HID_SET_OUTLINE (HID_BASE + 1408) -#define HID_SET_UNDERLINE (HID_BASE + 1409) -#define HID_SET_STRIKEOUT (HID_BASE + 1410) -#define HID_SET_SUPER_SCRIPT (HID_BASE + 1411) -#define HID_SET_SUB_SCRIPT (HID_BASE + 1412) -#define HID_SET_COLOR (HID_BASE + 1413) -#define HID_SET_CASEMAP (HID_BASE + 1414) -#define HID_SET_LANGUAGE (HID_BASE + 1415) -#define HID_SET_KERNING (HID_BASE + 1416) -#define HID_INDENT_TO_TABSTOP (HID_BASE + 1417) -#define HID_SET_LEFT_PARA (HID_BASE + 1418) -#define HID_SET_RIGHT_PARA (HID_BASE + 1419) -#define HID_SET_CENTER_PARA (HID_BASE + 1420) -#define HID_SET_JUSTIFY_PARA (HID_BASE + 1421) -#define HID_SET_LINE_SPACE_1 (HID_BASE + 1422) -#define HID_SET_LINE_SPACE_15 (HID_BASE + 1423) -#define HID_SET_LINE_SPACE_2 (HID_BASE + 1424) -#define HID_FLIP_HORZ_GRAFIC (HID_BASE + 1425) -#define HID_FLIP_VERT_GRAFIC (HID_BASE + 1426) -#define HID_SET_ADJUST (HID_BASE + 1428) -#define HID_SET_LRMARGIN (HID_BASE + 1429) -#define HID_SET_ULMARGIN (HID_BASE + 1430) -#define HID_UNINDENT_TO_TABSTOP (HID_BASE + 1431) -#define HID_SET_HYPHEN_ZONE (HID_BASE + 1432) -#define HID_SET_PAGE_BREAK (HID_BASE + 1433) -#define HID_SET_KEEP_TOGETHER (HID_BASE + 1434) -#define HID_SET_WIDOW (HID_BASE + 1436) -#define HID_SET_ORPHAN (HID_BASE + 1437) -#define HID_FORMAT_SHADOW (HID_BASE + 1438) -#define HID_FORMAT_BORDER (HID_BASE + 1439) -#define HID_FORMAT_CHAR_DLG (HID_BASE + 1441) -#define HID_FORMAT_PARA_DLG (HID_BASE + 1443) -#define HID_FORMAT_TAB (HID_BASE + 1444) -#define HID_FORMAT_TAB_DLG (HID_BASE + 1445) -#define HID_FORMAT_BORDER_DLG (HID_BASE + 1447) -#define HID_FORMAT_BACKGROUND (HID_BASE + 1448) -#define HID_FORMAT_BACKGROUND_DLG (HID_BASE + 1450) -#define HID_FORMAT_PAGE (HID_BASE + 1451) -#define HID_FORMAT_PAGE_DLG (HID_BASE + 1452) -#define HID_FORMAT_DROPCAPS (HID_BASE + 1454) -#define HID_FORMAT_FRAME_DLG (HID_BASE + 1456) -#define HID_FORMAT_GRAFIC_DLG (HID_BASE + 1458) -#define HID_FORMAT_TABLE_DLG (HID_BASE + 1460) -#define HID_NEW_STYLE_BY_EXAMPLE (HID_BASE + 1462) -#define HID_UPDATE_STYLE_BY_EXAMPLE (HID_BASE + 1463) -#define HID_STYLE_SHEET_FRAME_DLG (HID_BASE + 1464) -#define HID_STYLE_SHEET_DOC_DLG (HID_BASE + 1465) -#define HID_FORMAT_RESET (HID_BASE + 1469) -#define HID_FRAME_TO_TOP (HID_BASE + 1470) -#define HID_FRAME_TO_BOTTOM (HID_BASE + 1471) -#define HID_FRAME_NOWRAP (HID_BASE + 1472) -#define HID_FRAME_WRAP (HID_BASE + 1473) -#define HID_FRAME_WRAPTHRU (HID_BASE + 1474) -#define HID_FRAME_ALIGN_HORZ_LEFT (HID_BASE + 1475) -#define HID_FRAME_ALIGN_HORZ_RIGHT (HID_BASE + 1476) -#define HID_FRAME_ALIGN_HORZ_CENTER (HID_BASE + 1477) -#define HID_FRAME_ALIGN_VERT_TOP (HID_BASE + 1478) -#define HID_FRAME_ALIGN_VERT_BOTTOM (HID_BASE + 1479) -#define HID_FRAME_ALIGN_VERT_CENTER (HID_BASE + 1480) -#define HID_SET_FRM_SIZE (HID_BASE + 1481) -#define HID_SET_FRM_POSITION (HID_BASE + 1482) -#define HID_SET_FRM_ANCHOR (HID_BASE + 1483) -#define HID_SET_FRM_WRAP (HID_BASE + 1484) -#define HID_SET_FRM_DIST (HID_BASE + 1485) -#define HID_SET_FRM_OPTIONS (HID_BASE + 1486) -#define HID_SET_GRF_MIRROR (HID_BASE + 1488) -#define HID_SET_TABLE_WIDTH (HID_BASE + 1489) -#define HID_SET_TABLE_ALIGN (HID_BASE + 1490) -#define HID_SET_CHAR_STYLE (HID_BASE + 1491) -#define HID_SET_PARA_STYLE (HID_BASE + 1492) -#define HID_SET_PAGE_STYLE (HID_BASE + 1493) -#define HID_SET_FRM_MACRO (HID_BASE + 1494) -#define HID_SET_FRM_COLUMNS (HID_BASE + 1495) -#define HID_SET_FRM_COLUMN_WIDTH (HID_BASE + 1496) -#define HID_UPDATE_STYLES_DIRECT (HID_BASE + 1497) - -#define HID_TABLE_INSERT_ROW (HID_BASE + 1501) -#define HID_TABLE_DELETE_ROW (HID_BASE + 1503) -#define HID_TABLE_DELETE_COL (HID_BASE + 1504) -#define HID_TABLE_MERGE_CELLS (HID_BASE + 1506) -#define HID_AUTOFMT_TABLE (HID_BASE + 1507) -#define HID_SWDLG_STRINPUT (HID_BASE + 1508) -#define HID_TABLE_SET_ULSPACE (HID_BASE + 1509) -#define HID_TABLE_SET_GRID (HID_BASE + 1510) -#define HID_TABLE_SET_SHADOW (HID_BASE + 1511) -#define HID_TABLE_SELECT_ROW (HID_BASE + 1513) -#define HID_TABLE_SELECT_COL (HID_BASE + 1514) -#define HID_TABLE_SELECT_ALL (HID_BASE + 1515) -#define HID_TABLE_SET_READ_ONLY_CELLS (HID_BASE + 1517) -#define HID_TABLE_UNSET_READ_ONLY_CELLS (HID_BASE + 1519) -#define HID_PAGE_STYLE_SET_COLS (HID_BASE + 1538) -#define HID_SET_PROP_LINE_SPACE (HID_BASE + 1540) -#define HID_SET_ABS_LINE_SPACE (HID_BASE + 1541) - -#define HID_SPELLING_DLG (HID_BASE + 1601) -#define HID_THESAURUS_DLG (HID_BASE + 1604) -#define HID_HYPHENATE_OPT_DLG (HID_BASE + 1607) -#define HID_SORTING (HID_BASE + 1613) -#define HID_SORTING_DLG (HID_BASE + 1614) -#define HID_CALCULATE (HID_BASE + 1615) -#define HID_RECORD_MACRO_DLG (HID_BASE + 1622) -#define HID_PLAY_MACRO_DLG (HID_BASE + 1624) -#define HID_CONFIG_DLG (HID_BASE + 1627) -#define HID_EXPAND_GLOSSARY (HID_BASE + 1628) -#define HID_RENAME_GLOSSARY (HID_BASE + 1629) -#define HID_CONFIG_MENU (HID_BASE + 1630) -#define HID_CONFIG_KEY (HID_BASE + 1631) -#define HID_ASSIGN_LOCAL_MACRO_DLG (HID_BASE + 1632) -#define HID_COMPILE_MACRO (HID_BASE + 1633) -#define HID_CONFIG_VIEWOPTIONS (HID_BASE + 1635) -#define HID_CONFIG_COLORS (HID_BASE + 1636) -#define HID_INSERT_GLOSSARY (HID_BASE + 1640) -#define HID_AUTO_CORRECT (HID_BASE + 1649) -#define HID_AUTO_CORRECT_DLG (HID_BASE + 1650) -#define HID_HELP_PI (HID_BASE + 1655) -#define HID_NAVIGATION_PI (HID_BASE + 1656) -#define HID_TEMPLATE_PI (HID_BASE + 1657) -#define HID_ADDR_PI (HID_BASE + 1658) -#define HID_NAVIGATION_PI_GOTO_PAGE (HID_BASE + 1659) -#define HID_LETTER_WIZZARD (HID_BASE + 1660) -#define HID_FAX_WIZZARD (HID_BASE + 1661) -#define HID_MEMO_WIZZARD (HID_BASE + 1662) -#define HID_AGENDA_WIZZARD (HID_BASE + 1663) - -#define HID_NEW_WINDOW (HID_BASE + 1701) -#define HID_ARRANGE_ALL_WIN (HID_BASE + 1702) -#define HID_ARRANGE_CASCADE_WIN (HID_BASE + 1703) -#define HID_ARRANGE_HORZ_WIN (HID_BASE + 1704) -#define HID_ARRANGE_VERT_WIN (HID_BASE + 1705) - -#define HID_SHOW_HELP_INDEX (HID_BASE + 1802) -#define HID_SHOW_KEYBOARD_HELP (HID_BASE + 1803) -#define HID_SHOW_HELP_MANUAL (HID_BASE + 1804) -#define HID_SHOW_UPDATE_HELP (HID_BASE + 1805) - -#define HID_CHAR_LEFT (HID_BASE + 1901) -#define HID_CHAR_RIGHT (HID_BASE + 1902) -#define HID_LINE_UP (HID_BASE + 1903) -#define HID_LINE_DOWN (HID_BASE + 1904) -#define HID_START_OF_LINE (HID_BASE + 1905) -#define HID_END_OF_LINE (HID_BASE + 1906) -#define HID_START_OF_DOCUMENT (HID_BASE + 1907) -#define HID_END_OF_DOCUMENT (HID_BASE + 1908) -#define HID_START_OF_NEXT_PAGE (HID_BASE + 1909) -#define HID_END_OF_NEXT_PAGE (HID_BASE + 1910) -#define HID_START_OF_PREV_PAGE (HID_BASE + 1911) -#define HID_END_OF_PREV_PAGE (HID_BASE + 1912) -#define HID_START_OF_PAGE (HID_BASE + 1913) -#define HID_END_OF_PAGE (HID_BASE + 1914) -#define HID_START_OF_COLUMN (HID_BASE + 1917) -#define HID_END_OF_COLUMN (HID_BASE + 1918) -#define HID_START_OF_PARA (HID_BASE + 1919) -#define HID_END_OF_PARA (HID_BASE + 1920) -#define HID_NEXT_WORD (HID_BASE + 1921) -#define HID_PREV_WORD (HID_BASE + 1922) -#define HID_NEXT_SENT (HID_BASE + 1923) -#define HID_PREV_SENT (HID_BASE + 1924) -#define HID_DELETE (HID_BASE + 1925) -#define HID_BACKSPACE (HID_BASE + 1926) -#define HID_DELETE_SENT (HID_BASE + 1927) -#define HID_DELETE_BACK_SENT (HID_BASE + 1928) -#define HID_DELETE_WORD (HID_BASE + 1929) -#define HID_DELETE_BACK_WORD (HID_BASE + 1930) -#define HID_DELETE_LINE (HID_BASE + 1931) -#define HID_DELETE_BACK_LINE (HID_BASE + 1932) -#define HID_DELETE_PARA (HID_BASE + 1933) -#define HID_DELETE_BACK_PARA (HID_BASE + 1934) -#define HID_DELETE_WHOLE_LINE (HID_BASE + 1935) -#define HID_SET_INS_MODE (HID_BASE + 1936) -#define HID_PAGEUP (HID_BASE + 1937) -#define HID_PAGEDOWN (HID_BASE + 1938) -#define HID_SET_ADD_MODE (HID_BASE + 1939) -#define HID_SET_EXT_MODE (HID_BASE + 1940) -#define HID_ESCAPE (HID_BASE + 1941) -#define HID_SELECT_WORD (HID_BASE + 1943) -#define HID_START_TABLE (HID_BASE + 1947) -#define HID_END_TABLE (HID_BASE + 1948) -#define HID_NEXT_TABLE (HID_BASE + 1949) -#define HID_PREV_TABLE (HID_BASE + 1950) -#define HID_START_OF_NEXT_COLUMN (HID_BASE + 1951) -#define HID_END_OF_NEXT_COLUMN (HID_BASE + 1952) -#define HID_START_OF_PREV_COLUMN (HID_BASE + 1953) -#define HID_END_OF_PREV_COLUMN (HID_BASE + 1954) -#define HID_FOOTNOTE_TO_ANCHOR (HID_BASE + 1955) -#define HID_NEXT_FOOTNOTE (HID_BASE + 1956) -#define HID_PREV_FOOTNOTE (HID_BASE + 1957) -#define HID_CNTNT_TO_NEXT_FRAME (HID_BASE + 1958) -#define HID_FRAME_TO_ANCHOR (HID_BASE + 1959) -#define HID_TO_HEADER (HID_BASE + 1960) -#define HID_TO_FOOTER (HID_BASE + 1961) -#define HID_IDX_MARK_TO_IDX (HID_BASE + 1962) - -#define HID_ENVELOP (HID_BASE + 2050) -#define HID_LABEL (HID_BASE + 2051) -#define HID_ENVELOP_PRINT (HID_BASE + 2052) - -#define HID_NAVIGATION_IMGBTN (HID_BASE + 2054) -#define HID_ENVELOP_INSERT (HID_BASE + 2055) - -#define HID_WEBTOOLS_TOOLBOX (HID_BASE + 2056) -#define HID_WEBTEXT_TOOLBOX (HID_BASE + 2057) -#define HID_WEBFRAME_TOOLBOX (HID_BASE + 2058) -#define HID_TEXT_TOOLBOX (HID_BASE + 2059) -#define HID_TABLE_TOOLBOX (HID_BASE + 2060) -#define HID_FRAME_TOOLBOX (HID_BASE + 2061) -#define HID_GRAFIK_TOOLBOX (HID_BASE + 2062) -#define HID_OLE_TOOLBOX (HID_BASE + 2063) -#define HID_DRAW_TOOLBOX (HID_BASE + 2064) -#define HID_BEZIER_TOOLBOX (HID_BASE + 2066) -#define HID_DRAW_TEXT_TOOLBOX (HID_BASE + 2067) -#define HID_NUM_TOOLBOX (HID_BASE + 2068) -#define HID_TOOLS_TOOLBOX (HID_BASE + 2069) -#define HID_SRCVIEW_TOOLBOX (HID_BASE + 2070) - -#define HID_LABEL_INSERT (HID_BASE + 2071) -#define HID_CALC_TOOLBOX (HID_BASE + 2072) -#define HID_PVIEW_TOOLBOX (HID_BASE + 2073) - -#define HID_FIELD_INSERT (HID_BASE + 2074) -#define HID_FIELD_CLOSE (HID_BASE + 2075) - -#define HID_COND_COLL_TABLIST (HID_BASE + 2076) - -#define HID_DB_SELECTION_TLB (HID_BASE + 2077) -#define HID_FIELD_DINF_TYPE (HID_BASE + 2078) - -#define HID_DRAWFORM_TOOLBOX (HID_BASE + 2079) -#define HID_SELECT_TEMPLATE (HID_BASE + 2080) - -#define HID_AP_INSERT_DB_SEL (HID_BASE + 2081) -#define HID_WEBGRAPHIC_TOOLBOX (HID_BASE + 2082) -#define HID_OUTLINE_FORM (HID_BASE + 2083) -#define HID_NUM_RESET (HID_BASE + 2084) - -#define HID_AUTOFORMAT_REJECT (HID_BASE + 2085) -#define HID_AUTOFORMAT_ACCEPT (HID_BASE + 2086) -#define HID_AUTOFORMAT_EDIT_CHG (HID_BASE + 2087) +#define HID_CLOSE_FILE "SW_HID_CLOSE_FILE" +#define HID_LAUNCH_REGISTRY "SW_HID_LAUNCH_REGISTRY" +#define HID_MERGE_FILE "SW_HID_MERGE_FILE" +#define HID_MERGE_FILE_DLG "SW_HID_MERGE_FILE_DLG" +#define HID_NEW_FILE "SW_HID_NEW_FILE" +#define HID_OPEN_FILE "SW_HID_OPEN_FILE" +#define HID_OPEN_LASTVERSION "SW_HID_OPEN_LASTVERSION" +#define HID_PRINT_FILE "SW_HID_PRINT_FILE" +#define HID_PRINT_FILE_OPTIONS "SW_HID_PRINT_FILE_OPTIONS" +#define HID_SAVE_FILE_AS "SW_HID_SAVE_FILE_AS" +#define HID_SAVE_FILE "SW_HID_SAVE_FILE" +#define HID_SETUP_PRINTER_DLG "SW_HID_SETUP_PRINTER_DLG" +#define HID_EXIT "SW_HID_EXIT" +#define HID_CREATE_DOCUMENT "SW_HID_CREATE_DOCUMENT" +#define HID_DOCSTAT_DLG "SW_HID_DOCSTAT_DLG" +#define HID_LOAD_TEMPLATE_DLG "SW_HID_LOAD_TEMPLATE_DLG" +#define HID_SAVE_ALL "SW_HID_SAVE_ALL" +#define HID_NEW_FILE_DEFAULT "SW_HID_NEW_FILE_DEFAULT" +#define HID_PRINT_FILE_DEFAULT "SW_HID_PRINT_FILE_DEFAULT" +#define HID_FAX "SW_HID_FAX" +#define HID_SELECT_DATABASE "SW_HID_SELECT_DATABASE" +#define HID_DOC_INFO_DLG "SW_HID_DOC_INFO_DLG" +#define HID_DOC_MGR_DLG "SW_HID_DOC_MGR_DLG" +#define HID_OPTCAPTION_CLB "SW_HID_OPTCAPTION_CLB" + +#define HID_COPY "SW_HID_COPY" +#define HID_CUT "SW_HID_CUT" +#define HID_EDIT_FIELD "SW_HID_EDIT_FIELD" +#define HID_EDIT_FILE_INFO_DLG "SW_HID_EDIT_FILE_INFO_DLG" +#define HID_EDIT_LINK_DLG "SW_HID_EDIT_LINK_DLG" +#define HID_EDIT_OBJECT "SW_HID_EDIT_OBJECT" +#define HID_GOTO "SW_HID_GOTO" +#define HID_SET_FIELD_VALUE "SW_HID_SET_FIELD_VALUE" +#define HID_PASTE "SW_HID_PASTE" +#define HID_REDO "SW_HID_REDO" +#define HID_SEARCH "SW_HID_SEARCH" +#define HID_REPLACE "SW_HID_REPLACE" +#define HID_SELECT_ALL "SW_HID_SELECT_ALL" +#define HID_UNDO "SW_HID_UNDO" +#define HID_REPEAT "SW_HID_REPEAT" +#define HID_BUFFER_UPDATE "SW_HID_BUFFER_UPDATE" +#define HID_UPDATE_FIELDS "SW_HID_UPDATE_FIELDS" +#define HID_EXECUTE_MACROFIELD "SW_HID_EXECUTE_MACROFIELD" +#define HID_EDIT_FORMULA "SW_HID_EDIT_FORMULA" +#define HID_CALC_TABLE "SW_HID_CALC_TABLE" +#define HID_NUM_BULLET_DOWN "SW_HID_NUM_BULLET_DOWN" +#define HID_NUM_BULLET_UP "SW_HID_NUM_BULLET_UP" +#define HID_NUM_BULLET_PREV "SW_HID_NUM_BULLET_PREV" +#define HID_NUM_BULLET_NEXT "SW_HID_NUM_BULLET_NEXT" +#define HID_NUM_BULLET_MOVEUP "SW_HID_NUM_BULLET_MOVEUP" +#define HID_NUM_BULLET_MOVEDOWN "SW_HID_NUM_BULLET_MOVEDOWN" +#define HID_NUM_BULLET_NONUM "SW_HID_NUM_BULLET_NONUM" +#define HID_NUM_BULLET_OFF "SW_HID_NUM_BULLET_OFF" +#define HID_NUM_BULLET_ON "SW_HID_NUM_BULLET_ON" +#define HID_NUM_BULLET_OUTLINE_DOWN "SW_HID_NUM_BULLET_OUTLINE_DOWN" +#define HID_NUM_BULLET_OUTLINE_UP "SW_HID_NUM_BULLET_OUTLINE_UP" +#define HID_NUM_BULLET_OUTLINE_MOVEUP "SW_HID_NUM_BULLET_OUTLINE_MOVEUP" +#define HID_NUM_BULLET_OUTLINE_MOVEDOWN "SW_HID_NUM_BULLET_OUTLINE_MOVEDOWN" +#define HID_UPDATE_INPUTFIELDS "SW_HID_UPDATE_INPUTFIELDS" +#define HID_NUM_NUMBERING_ON "SW_HID_NUM_NUMBERING_ON" +#define HID_REPEAT_SEARCH "SW_HID_REPEAT_SEARCH" +#define HID_REPAGINATE "SW_HID_REPAGINATE" + +#define HID_REFRESH_VIEW "SW_HID_REFRESH_VIEW" +#define HID_RIBBON "SW_HID_RIBBON" +#define HID_RULER "SW_HID_RULER" +#define HID_STATUSBAR "SW_HID_STATUSBAR" +#define HID_TOOLBOX "SW_HID_TOOLBOX" +#define HID_VIEW_BOUNDS "SW_HID_VIEW_BOUNDS" +#define HID_VIEW_FIELDS "SW_HID_VIEW_FIELDS" +#define HID_VLINEAL "SW_HID_VLINEAL" +#define HID_VSCROLLBAR "SW_HID_VSCROLLBAR" +#define HID_HSCROLLBAR "SW_HID_HSCROLLBAR" +#define HID_VIEW_META_CHARS "SW_HID_VIEW_META_CHARS" +#define HID_VIEW_MARKS "SW_HID_VIEW_MARKS" +#define HID_VIEW_FIELDNAME "SW_HID_VIEW_FIELDNAME" +#define HID_VIEW_TABLEGRID "SW_HID_VIEW_TABLEGRID" +#define HID_ZOOM "SW_HID_ZOOM" + +#define HID_DELETE_BOOKMARK "SW_HID_DELETE_BOOKMARK" +#define HID_INSERT_BREAK "SW_HID_INSERT_BREAK" +#define HID_INSERT_COLUMN_BREAK "SW_HID_INSERT_COLUMN_BREAK" +#define HID_INSERT_FILE "SW_HID_INSERT_FILE" +#define HID_INSERT_FOOTNOTE "SW_HID_INSERT_FOOTNOTE" +#define HID_INSERT_GRAFIC "SW_HID_INSERT_GRAFIC" +#define HID_INSERT_LINEBREAK "SW_HID_INSERT_LINEBREAK" +#define HID_INSERT_MERGEFIELD_DLG "SW_HID_INSERT_MERGEFIELD_DLG" +#define HID_INSERT_OBJECT_DLG "SW_HID_INSERT_OBJECT_DLG" +#define HID_INSERT_PAGEBREAK "SW_HID_INSERT_PAGEBREAK" +#define HID_INSERT_RECORD "SW_HID_INSERT_RECORD" +#define HID_MERGE_RECORD "SW_HID_MERGE_RECORD" +#define HID_INSERT_SYMBOL "SW_HID_INSERT_SYMBOL" +#define HID_INSERT_STRING "SW_HID_INSERT_STRING" +#define HID_INSERT_COLS "SW_HID_INSERT_COLS" +#define HID_INSERT_FRAME_INTERACT "SW_HID_INSERT_FRAME_INTERACT" +#define HID_INSERT_FRAME "SW_HID_INSERT_FRAME" +#define HID_INSERT_IDX_ENTRY "SW_HID_INSERT_IDX_ENTRY" +#define HID_INSERT_USERIDX_ENTRY "SW_HID_INSERT_USERIDX_ENTRY" +#define HID_INSERT_CNTNTIDX_ENTRY "SW_HID_INSERT_CNTNTIDX_ENTRY" +#define HID_INSERT_SOFT_HYPHEN "SW_HID_INSERT_SOFT_HYPHEN" +#define HID_INSERT_HARD_SPACE "SW_HID_INSERT_HARD_SPACE" + +#define HID_SET_FONT "SW_HID_SET_FONT" +#define HID_SET_FONT_SIZE "SW_HID_SET_FONT_SIZE" +#define HID_GROW_FONT_SIZE "SW_HID_GROW_FONT_SIZE" +#define HID_SHRINK_FONT_SIZE "SW_HID_SHRINK_FONT_SIZE" +#define HID_SET_BOLD "SW_HID_SET_BOLD" +#define HID_SET_ITALIC "SW_HID_SET_ITALIC" +#define HID_SET_SHADOW "SW_HID_SET_SHADOW" +#define HID_SET_OUTLINE "SW_HID_SET_OUTLINE" +#define HID_SET_UNDERLINE "SW_HID_SET_UNDERLINE" +#define HID_SET_STRIKEOUT "SW_HID_SET_STRIKEOUT" +#define HID_SET_SUPER_SCRIPT "SW_HID_SET_SUPER_SCRIPT" +#define HID_SET_SUB_SCRIPT "SW_HID_SET_SUB_SCRIPT" +#define HID_SET_COLOR "SW_HID_SET_COLOR" +#define HID_SET_CASEMAP "SW_HID_SET_CASEMAP" +#define HID_SET_LANGUAGE "SW_HID_SET_LANGUAGE" +#define HID_SET_KERNING "SW_HID_SET_KERNING" +#define HID_INDENT_TO_TABSTOP "SW_HID_INDENT_TO_TABSTOP" +#define HID_SET_LEFT_PARA "SW_HID_SET_LEFT_PARA" +#define HID_SET_RIGHT_PARA "SW_HID_SET_RIGHT_PARA" +#define HID_SET_CENTER_PARA "SW_HID_SET_CENTER_PARA" +#define HID_SET_JUSTIFY_PARA "SW_HID_SET_JUSTIFY_PARA" +#define HID_SET_LINE_SPACE_1 "SW_HID_SET_LINE_SPACE_1" +#define HID_SET_LINE_SPACE_15 "SW_HID_SET_LINE_SPACE_15" +#define HID_SET_LINE_SPACE_2 "SW_HID_SET_LINE_SPACE_2" +#define HID_FLIP_HORZ_GRAFIC "SW_HID_FLIP_HORZ_GRAFIC" +#define HID_FLIP_VERT_GRAFIC "SW_HID_FLIP_VERT_GRAFIC" +#define HID_SET_ADJUST "SW_HID_SET_ADJUST" +#define HID_SET_LRMARGIN "SW_HID_SET_LRMARGIN" +#define HID_SET_ULMARGIN "SW_HID_SET_ULMARGIN" +#define HID_UNINDENT_TO_TABSTOP "SW_HID_UNINDENT_TO_TABSTOP" +#define HID_SET_HYPHEN_ZONE "SW_HID_SET_HYPHEN_ZONE" +#define HID_SET_PAGE_BREAK "SW_HID_SET_PAGE_BREAK" +#define HID_SET_KEEP_TOGETHER "SW_HID_SET_KEEP_TOGETHER" +#define HID_SET_WIDOW "SW_HID_SET_WIDOW" +#define HID_SET_ORPHAN "SW_HID_SET_ORPHAN" +#define HID_FORMAT_SHADOW "SW_HID_FORMAT_SHADOW" +#define HID_FORMAT_BORDER "SW_HID_FORMAT_BORDER" +#define HID_FORMAT_CHAR_DLG "SW_HID_FORMAT_CHAR_DLG" +#define HID_FORMAT_PARA_DLG "SW_HID_FORMAT_PARA_DLG" +#define HID_FORMAT_TAB "SW_HID_FORMAT_TAB" +#define HID_FORMAT_TAB_DLG "SW_HID_FORMAT_TAB_DLG" +#define HID_FORMAT_BORDER_DLG "SW_HID_FORMAT_BORDER_DLG" +#define HID_FORMAT_BACKGROUND "SW_HID_FORMAT_BACKGROUND" +#define HID_FORMAT_BACKGROUND_DLG "SW_HID_FORMAT_BACKGROUND_DLG" +#define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE" +#define HID_FORMAT_PAGE_DLG "SW_HID_FORMAT_PAGE_DLG" +#define HID_FORMAT_DROPCAPS "SW_HID_FORMAT_DROPCAPS" +#define HID_FORMAT_FRAME_DLG "SW_HID_FORMAT_FRAME_DLG" +#define HID_FORMAT_GRAFIC_DLG "SW_HID_FORMAT_GRAFIC_DLG" +#define HID_FORMAT_TABLE_DLG "SW_HID_FORMAT_TABLE_DLG" +#define HID_NEW_STYLE_BY_EXAMPLE "SW_HID_NEW_STYLE_BY_EXAMPLE" +#define HID_UPDATE_STYLE_BY_EXAMPLE "SW_HID_UPDATE_STYLE_BY_EXAMPLE" +#define HID_STYLE_SHEET_FRAME_DLG "SW_HID_STYLE_SHEET_FRAME_DLG" +#define HID_STYLE_SHEET_DOC_DLG "SW_HID_STYLE_SHEET_DOC_DLG" +#define HID_FORMAT_RESET "SW_HID_FORMAT_RESET" +#define HID_FRAME_TO_TOP "SW_HID_FRAME_TO_TOP" +#define HID_FRAME_TO_BOTTOM "SW_HID_FRAME_TO_BOTTOM" +#define HID_FRAME_NOWRAP "SW_HID_FRAME_NOWRAP" +#define HID_FRAME_WRAP "SW_HID_FRAME_WRAP" +#define HID_FRAME_WRAPTHRU "SW_HID_FRAME_WRAPTHRU" +#define HID_FRAME_ALIGN_HORZ_LEFT "SW_HID_FRAME_ALIGN_HORZ_LEFT" +#define HID_FRAME_ALIGN_HORZ_RIGHT "SW_HID_FRAME_ALIGN_HORZ_RIGHT" +#define HID_FRAME_ALIGN_HORZ_CENTER "SW_HID_FRAME_ALIGN_HORZ_CENTER" +#define HID_FRAME_ALIGN_VERT_TOP "SW_HID_FRAME_ALIGN_VERT_TOP" +#define HID_FRAME_ALIGN_VERT_BOTTOM "SW_HID_FRAME_ALIGN_VERT_BOTTOM" +#define HID_FRAME_ALIGN_VERT_CENTER "SW_HID_FRAME_ALIGN_VERT_CENTER" +#define HID_SET_FRM_SIZE "SW_HID_SET_FRM_SIZE" +#define HID_SET_FRM_POSITION "SW_HID_SET_FRM_POSITION" +#define HID_SET_FRM_ANCHOR "SW_HID_SET_FRM_ANCHOR" +#define HID_SET_FRM_WRAP "SW_HID_SET_FRM_WRAP" +#define HID_SET_FRM_DIST "SW_HID_SET_FRM_DIST" +#define HID_SET_FRM_OPTIONS "SW_HID_SET_FRM_OPTIONS" +#define HID_SET_GRF_MIRROR "SW_HID_SET_GRF_MIRROR" +#define HID_SET_TABLE_WIDTH "SW_HID_SET_TABLE_WIDTH" +#define HID_SET_TABLE_ALIGN "SW_HID_SET_TABLE_ALIGN" +#define HID_SET_CHAR_STYLE "SW_HID_SET_CHAR_STYLE" +#define HID_SET_PARA_STYLE "SW_HID_SET_PARA_STYLE" +#define HID_SET_PAGE_STYLE "SW_HID_SET_PAGE_STYLE" +#define HID_SET_FRM_MACRO "SW_HID_SET_FRM_MACRO" +#define HID_SET_FRM_COLUMNS "SW_HID_SET_FRM_COLUMNS" +#define HID_SET_FRM_COLUMN_WIDTH "SW_HID_SET_FRM_COLUMN_WIDTH" +#define HID_UPDATE_STYLES_DIRECT "SW_HID_UPDATE_STYLES_DIRECT" + +#define HID_TABLE_INSERT_ROW "SW_HID_TABLE_INSERT_ROW" +#define HID_TABLE_DELETE_ROW "SW_HID_TABLE_DELETE_ROW" +#define HID_TABLE_DELETE_COL "SW_HID_TABLE_DELETE_COL" +#define HID_TABLE_MERGE_CELLS "SW_HID_TABLE_MERGE_CELLS" +#define HID_AUTOFMT_TABLE "SW_HID_AUTOFMT_TABLE" +#define HID_SWDLG_STRINPUT "SW_HID_SWDLG_STRINPUT" +#define HID_TABLE_SET_ULSPACE "SW_HID_TABLE_SET_ULSPACE" +#define HID_TABLE_SET_GRID "SW_HID_TABLE_SET_GRID" +#define HID_TABLE_SET_SHADOW "SW_HID_TABLE_SET_SHADOW" +#define HID_TABLE_SELECT_ROW "SW_HID_TABLE_SELECT_ROW" +#define HID_TABLE_SELECT_COL "SW_HID_TABLE_SELECT_COL" +#define HID_TABLE_SELECT_ALL "SW_HID_TABLE_SELECT_ALL" +#define HID_TABLE_SET_READ_ONLY_CELLS "SW_HID_TABLE_SET_READ_ONLY_CELLS" +#define HID_TABLE_UNSET_READ_ONLY_CELLS "SW_HID_TABLE_UNSET_READ_ONLY_CELLS" +#define HID_PAGE_STYLE_SET_COLS "SW_HID_PAGE_STYLE_SET_COLS" +#define HID_SET_PROP_LINE_SPACE "SW_HID_SET_PROP_LINE_SPACE" +#define HID_SET_ABS_LINE_SPACE "SW_HID_SET_ABS_LINE_SPACE" + +#define HID_SPELLING_DLG "SW_HID_SPELLING_DLG" +#define HID_THESAURUS_DLG "SW_HID_THESAURUS_DLG" +#define HID_HYPHENATE_OPT_DLG "SW_HID_HYPHENATE_OPT_DLG" +#define HID_SORTING "SW_HID_SORTING" +#define HID_SORTING_DLG "SW_HID_SORTING_DLG" +#define HID_CALCULATE "SW_HID_CALCULATE" +#define HID_RECORD_MACRO_DLG "SW_HID_RECORD_MACRO_DLG" +#define HID_PLAY_MACRO_DLG "SW_HID_PLAY_MACRO_DLG" +#define HID_CONFIG_DLG "SW_HID_CONFIG_DLG" +#define HID_EXPAND_GLOSSARY "SW_HID_EXPAND_GLOSSARY" +#define HID_RENAME_GLOSSARY "SW_HID_RENAME_GLOSSARY" +#define HID_CONFIG_MENU "SW_HID_CONFIG_MENU" +#define HID_CONFIG_KEY "SW_HID_CONFIG_KEY" +#define HID_ASSIGN_LOCAL_MACRO_DLG "SW_HID_ASSIGN_LOCAL_MACRO_DLG" +#define HID_COMPILE_MACRO "SW_HID_COMPILE_MACRO" +#define HID_CONFIG_VIEWOPTIONS "SW_HID_CONFIG_VIEWOPTIONS" +#define HID_CONFIG_COLORS "SW_HID_CONFIG_COLORS" +#define HID_INSERT_GLOSSARY "SW_HID_INSERT_GLOSSARY" +#define HID_AUTO_CORRECT "SW_HID_AUTO_CORRECT" +#define HID_AUTO_CORRECT_DLG "SW_HID_AUTO_CORRECT_DLG" +#define HID_HELP_PI "SW_HID_HELP_PI" +#define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI" +#define HID_TEMPLATE_PI "SW_HID_TEMPLATE_PI" +#define HID_ADDR_PI "SW_HID_ADDR_PI" +#define HID_NAVIGATION_PI_GOTO_PAGE "SW_HID_NAVIGATION_PI_GOTO_PAGE" +#define HID_LETTER_WIZZARD "SW_HID_LETTER_WIZZARD" +#define HID_FAX_WIZZARD "SW_HID_FAX_WIZZARD" +#define HID_MEMO_WIZZARD "SW_HID_MEMO_WIZZARD" +#define HID_AGENDA_WIZZARD "SW_HID_AGENDA_WIZZARD" + +#define HID_NEW_WINDOW "SW_HID_NEW_WINDOW" +#define HID_ARRANGE_ALL_WIN "SW_HID_ARRANGE_ALL_WIN" +#define HID_ARRANGE_CASCADE_WIN "SW_HID_ARRANGE_CASCADE_WIN" +#define HID_ARRANGE_HORZ_WIN "SW_HID_ARRANGE_HORZ_WIN" +#define HID_ARRANGE_VERT_WIN "SW_HID_ARRANGE_VERT_WIN" + +#define HID_SHOW_HELP_INDEX "SW_HID_SHOW_HELP_INDEX" +#define HID_SHOW_KEYBOARD_HELP "SW_HID_SHOW_KEYBOARD_HELP" +#define HID_SHOW_HELP_MANUAL "SW_HID_SHOW_HELP_MANUAL" +#define HID_SHOW_UPDATE_HELP "SW_HID_SHOW_UPDATE_HELP" + +#define HID_CHAR_LEFT "SW_HID_CHAR_LEFT" +#define HID_CHAR_RIGHT "SW_HID_CHAR_RIGHT" +#define HID_LINE_UP "SW_HID_LINE_UP" +#define HID_LINE_DOWN "SW_HID_LINE_DOWN" +#define HID_START_OF_LINE "SW_HID_START_OF_LINE" +#define HID_END_OF_LINE "SW_HID_END_OF_LINE" +#define HID_START_OF_DOCUMENT "SW_HID_START_OF_DOCUMENT" +#define HID_END_OF_DOCUMENT "SW_HID_END_OF_DOCUMENT" +#define HID_START_OF_NEXT_PAGE "SW_HID_START_OF_NEXT_PAGE" +#define HID_END_OF_NEXT_PAGE "SW_HID_END_OF_NEXT_PAGE" +#define HID_START_OF_PREV_PAGE "SW_HID_START_OF_PREV_PAGE" +#define HID_END_OF_PREV_PAGE "SW_HID_END_OF_PREV_PAGE" +#define HID_START_OF_PAGE "SW_HID_START_OF_PAGE" +#define HID_END_OF_PAGE "SW_HID_END_OF_PAGE" +#define HID_START_OF_COLUMN "SW_HID_START_OF_COLUMN" +#define HID_END_OF_COLUMN "SW_HID_END_OF_COLUMN" +#define HID_START_OF_PARA "SW_HID_START_OF_PARA" +#define HID_END_OF_PARA "SW_HID_END_OF_PARA" +#define HID_NEXT_WORD "SW_HID_NEXT_WORD" +#define HID_PREV_WORD "SW_HID_PREV_WORD" +#define HID_NEXT_SENT "SW_HID_NEXT_SENT" +#define HID_PREV_SENT "SW_HID_PREV_SENT" +#define HID_DELETE "SW_HID_DELETE" +#define HID_BACKSPACE "SW_HID_BACKSPACE" +#define HID_DELETE_SENT "SW_HID_DELETE_SENT" +#define HID_DELETE_BACK_SENT "SW_HID_DELETE_BACK_SENT" +#define HID_DELETE_WORD "SW_HID_DELETE_WORD" +#define HID_DELETE_BACK_WORD "SW_HID_DELETE_BACK_WORD" +#define HID_DELETE_LINE "SW_HID_DELETE_LINE" +#define HID_DELETE_BACK_LINE "SW_HID_DELETE_BACK_LINE" +#define HID_DELETE_PARA "SW_HID_DELETE_PARA" +#define HID_DELETE_BACK_PARA "SW_HID_DELETE_BACK_PARA" +#define HID_DELETE_WHOLE_LINE "SW_HID_DELETE_WHOLE_LINE" +#define HID_SET_INS_MODE "SW_HID_SET_INS_MODE" +#define HID_PAGEUP "SW_HID_PAGEUP" +#define HID_PAGEDOWN "SW_HID_PAGEDOWN" +#define HID_SET_ADD_MODE "SW_HID_SET_ADD_MODE" +#define HID_SET_EXT_MODE "SW_HID_SET_EXT_MODE" +#define HID_ESCAPE "SW_HID_ESCAPE" +#define HID_SELECT_WORD "SW_HID_SELECT_WORD" +#define HID_START_TABLE "SW_HID_START_TABLE" +#define HID_END_TABLE "SW_HID_END_TABLE" +#define HID_NEXT_TABLE "SW_HID_NEXT_TABLE" +#define HID_PREV_TABLE "SW_HID_PREV_TABLE" +#define HID_START_OF_NEXT_COLUMN "SW_HID_START_OF_NEXT_COLUMN" +#define HID_END_OF_NEXT_COLUMN "SW_HID_END_OF_NEXT_COLUMN" +#define HID_START_OF_PREV_COLUMN "SW_HID_START_OF_PREV_COLUMN" +#define HID_END_OF_PREV_COLUMN "SW_HID_END_OF_PREV_COLUMN" +#define HID_FOOTNOTE_TO_ANCHOR "SW_HID_FOOTNOTE_TO_ANCHOR" +#define HID_NEXT_FOOTNOTE "SW_HID_NEXT_FOOTNOTE" +#define HID_PREV_FOOTNOTE "SW_HID_PREV_FOOTNOTE" +#define HID_CNTNT_TO_NEXT_FRAME "SW_HID_CNTNT_TO_NEXT_FRAME" +#define HID_FRAME_TO_ANCHOR "SW_HID_FRAME_TO_ANCHOR" +#define HID_TO_HEADER "SW_HID_TO_HEADER" +#define HID_TO_FOOTER "SW_HID_TO_FOOTER" +#define HID_IDX_MARK_TO_IDX "SW_HID_IDX_MARK_TO_IDX" + +#define HID_ENVELOP "SW_HID_ENVELOP" +#define HID_LABEL "SW_HID_LABEL" +#define HID_ENVELOP_PRINT "SW_HID_ENVELOP_PRINT" + +#define HID_NAVIGATION_IMGBTN "SW_HID_NAVIGATION_IMGBTN" +#define HID_ENVELOP_INSERT "SW_HID_ENVELOP_INSERT" + +#define HID_WEBTOOLS_TOOLBOX "SW_HID_WEBTOOLS_TOOLBOX" +#define HID_WEBTEXT_TOOLBOX "SW_HID_WEBTEXT_TOOLBOX" +#define HID_WEBFRAME_TOOLBOX "SW_HID_WEBFRAME_TOOLBOX" +#define HID_TEXT_TOOLBOX "SW_HID_TEXT_TOOLBOX" +#define HID_TABLE_TOOLBOX "SW_HID_TABLE_TOOLBOX" +#define HID_FRAME_TOOLBOX "SW_HID_FRAME_TOOLBOX" +#define HID_GRAFIK_TOOLBOX "SW_HID_GRAFIK_TOOLBOX" +#define HID_OLE_TOOLBOX "SW_HID_OLE_TOOLBOX" +#define HID_DRAW_TOOLBOX "SW_HID_DRAW_TOOLBOX" +#define HID_BEZIER_TOOLBOX "SW_HID_BEZIER_TOOLBOX" +#define HID_DRAW_TEXT_TOOLBOX "SW_HID_DRAW_TEXT_TOOLBOX" +#define HID_NUM_TOOLBOX "SW_HID_NUM_TOOLBOX" +#define HID_TOOLS_TOOLBOX "SW_HID_TOOLS_TOOLBOX" +#define HID_SRCVIEW_TOOLBOX "SW_HID_SRCVIEW_TOOLBOX" + +#define HID_LABEL_INSERT "SW_HID_LABEL_INSERT" +#define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" +#define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" + +#define HID_FIELD_INSERT "SW_HID_FIELD_INSERT" +#define HID_FIELD_CLOSE "SW_HID_FIELD_CLOSE" + +#define HID_COND_COLL_TABLIST "SW_HID_COND_COLL_TABLIST" + +#define HID_DB_SELECTION_TLB "SW_HID_DB_SELECTION_TLB" +#define HID_FIELD_DINF_TYPE "SW_HID_FIELD_DINF_TYPE" + +#define HID_DRAWFORM_TOOLBOX "SW_HID_DRAWFORM_TOOLBOX" +#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE" + +#define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL" +#define HID_WEBGRAPHIC_TOOLBOX "SW_HID_WEBGRAPHIC_TOOLBOX" +#define HID_OUTLINE_FORM "SW_HID_OUTLINE_FORM" +#define HID_NUM_RESET "SW_HID_NUM_RESET" + +#define HID_AUTOFORMAT_REJECT "SW_HID_AUTOFORMAT_REJECT" +#define HID_AUTOFORMAT_ACCEPT "SW_HID_AUTOFORMAT_ACCEPT" +#define HID_AUTOFORMAT_EDIT_CHG "SW_HID_AUTOFORMAT_EDIT_CHG" //insert index/entries/Pattern buttons and edits -#define HID_TOX_ENTRY_BUTTON (HID_BASE + 2088) -#define HID_TOX_ENTRY_EDIT (HID_BASE + 2089) - -#define HID_DLG_NEW_USER_IDX (HID_BASE + 2090) -#define HID_INSERT_IDX_MRK_OK (HID_BASE + 2091) -#define HID_INSERT_IDX_MRK_CLOSE (HID_BASE + 2092) -#define HID_INSERT_AUTH_MRK_OK (HID_BASE + 2093) -#define HID_INSERT_AUTH_MRK_CLOSE (HID_BASE + 2094) -#define HID_INSERT_IDX_MRK_DELETE (HID_BASE + 2095) -#define HID_INSERT_IDX_MRK_NEW (HID_BASE + 2096) -#define HID_INSERT_IDX_MRK_PREV (HID_BASE + 2097) -#define HID_INSERT_IDX_MRK_PREV_SAME (HID_BASE + 2098) -#define HID_INSERT_IDX_MRK_NEXT (HID_BASE + 2099) -#define HID_INSERT_IDX_MRK_NEXT_SAME (HID_BASE + 2100) -#define HID_INSERT_IDX_MRK_TYPE (HID_BASE + 2101) -#define HID_INSERT_IDX_MRK_ENTRY (HID_BASE + 2102) -#define HID_INSERT_IDX_MRK_PRIM_KEY (HID_BASE + 2103) -#define HID_INSERT_IDX_MRK_SEC_KEY (HID_BASE + 2104) -#define HID_INSERT_IDX_MRK_LEVEL (HID_BASE + 2105) -#define HID_INSERT_IDX_MRK_MAIN_ENTRY (HID_BASE + 2106) -#define HID_INSERT_IDX_MRK_APPLY_ALL (HID_BASE + 2107) -#define HID_INSERT_AUTH_MRK_ENTRY (HID_BASE + 2108) -#define HID_INSERT_AUTH_MRK_CREATE_ENTRY (HID_BASE + 2109) -#define HID_INSERT_AUTH_MRK_EDIT_ENTRY (HID_BASE + 2110) -#define HID_TOKEN_WINDOW (HID_BASE + 2111) - -#define HID_AUTH_FIELD_IDENTIFIER (HID_BASE + 2112 ) -#define HID_AUTH_FIELD_AUTHORITY_TYPE (HID_BASE + 2113 ) -#define HID_AUTH_FIELD_ADDRESS (HID_BASE + 2114 ) -#define HID_AUTH_FIELD_ANNOTE (HID_BASE + 2115 ) -#define HID_AUTH_FIELD_AUTHOR (HID_BASE + 2116 ) -#define HID_AUTH_FIELD_BOOKTITLE (HID_BASE + 2117 ) -#define HID_AUTH_FIELD_CHAPTER (HID_BASE + 2118 ) -#define HID_AUTH_FIELD_EDITION (HID_BASE + 2119 ) -#define HID_AUTH_FIELD_EDITOR (HID_BASE + 2120 ) -#define HID_AUTH_FIELD_HOWPUBLISHED (HID_BASE + 2121 ) -#define HID_AUTH_FIELD_INSTITUTION (HID_BASE + 2122 ) -#define HID_AUTH_FIELD_JOURNAL (HID_BASE + 2123 ) -#define HID_AUTH_FIELD_MONTH (HID_BASE + 2124 ) -#define HID_AUTH_FIELD_NOTE (HID_BASE + 2125 ) -#define HID_AUTH_FIELD_NUMBER (HID_BASE + 2126 ) -#define HID_AUTH_FIELD_ORGANIZATIONS (HID_BASE + 2127 ) -#define HID_AUTH_FIELD_PAGES (HID_BASE + 2128 ) -#define HID_AUTH_FIELD_PUBLISHER (HID_BASE + 2129 ) -#define HID_AUTH_FIELD_SCHOOL (HID_BASE + 2130 ) -#define HID_AUTH_FIELD_SERIES (HID_BASE + 2131 ) -#define HID_AUTH_FIELD_TITLE (HID_BASE + 2132 ) -#define HID_AUTH_FIELD_REPORT_TYPE (HID_BASE + 2133 ) -#define HID_AUTH_FIELD_VOLUME (HID_BASE + 2134 ) -#define HID_AUTH_FIELD_YEAR (HID_BASE + 2135 ) -#define HID_AUTH_FIELD_URL (HID_BASE + 2136 ) -#define HID_AUTH_FIELD_CUSTOM1 (HID_BASE + 2137 ) -#define HID_AUTH_FIELD_CUSTOM2 (HID_BASE + 2138 ) -#define HID_AUTH_FIELD_CUSTOM3 (HID_BASE + 2139 ) -#define HID_AUTH_FIELD_CUSTOM4 (HID_BASE + 2140 ) -#define HID_AUTH_FIELD_CUSTOM5 (HID_BASE + 2141 ) -#define HID_AUTH_FIELD_ISBN (HID_BASE + 2142 ) - -#define HID_AUTH_MARK_DLG_FROM_COMP_RB (HID_BASE + 2143 ) -#define HID_AUTH_MARK_DLG_FROM_DOC_RB (HID_BASE + 2144 ) -#define HID_AUTH_MARK_DLG_ID_LISTBOX (HID_BASE + 2145 ) - -#define HID_INSERT_INDEX_ENTRY_LEVEL_LB (HID_BASE + 2146 ) -#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE (HID_BASE + 2147 ) -#define HID_INSERT_IDX_MRK_SRCH_WORDONLY (HID_BASE + 2148 ) -#define HID_DLG_CREATE_AUTOMARK (HID_BASE + 2149 ) -#define HID_BUSINESS_CARD_CONTENT (HID_BASE + 2150 ) -#define HID_SAVE_LABEL_DLG (HID_BASE + 2151 ) -#define HID_BUSINESS_FMT_PAGE (HID_BASE + 2152 ) -#define HID_BUSINESS_FMT_PAGE_CONT (HID_BASE + 2153 ) -#define HID_BUSINESS_FMT_PAGE_SHEET (HID_BASE + 2154 ) -#define HID_BUSINESS_FMT_PAGE_BRAND (HID_BASE + 2155 ) -#define HID_BUSINESS_FMT_PAGE_TYPE (HID_BASE + 2156 ) -#define HID_SEND_MASTER_DIALOG (HID_BASE + 2157 ) -#define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK (HID_BASE + 2158 ) -#define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL (HID_BASE + 2159 ) -#define HID_SEND_MASTER_CTRL_LISTBOX_FILTER (HID_BASE + 2160 ) -#define HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW (HID_BASE + 2161 ) -#define HID_SEND_MASTER_CTRL_EDIT_FILEURL (HID_BASE + 2162 ) -#define HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION (HID_BASE + 2163 ) -#define HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE (HID_BASE + 2164 ) -#define HID_SEND_MASTER_CTRL_DUMMY (HID_BASE + 2165 ) - -#define HID_SEND_HTML_DIALOG (HID_BASE + 2166 ) -#define HID_SEND_HTML_CTRL_PUSHBUTTON_OK (HID_BASE + 2167 ) -#define HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL (HID_BASE + 2168 ) -#define HID_SEND_HTML_CTRL_LISTBOX_FILTER (HID_BASE + 2169 ) -#define HID_SEND_HTML_CTRL_CONTROL_FILEVIEW (HID_BASE + 2170 ) -#define HID_SEND_HTML_CTRL_EDIT_FILEURL (HID_BASE + 2171 ) -#define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION (HID_BASE + 2172 ) -#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE (HID_BASE + 2173 ) -#define HID_SEND_HTML_CTRL_DUMMY (HID_BASE + 2174 ) - -#define HID_INSERT_IDX_MRK_PHONETIC_READING (HID_BASE + 2175 ) -#define HID_COLUMN_VALUESET (HID_BASE + 2176 ) -#define HID_PVIEW_ZOOM_LB (HID_BASE + 2177 ) -#define HID_MAIL_MERGE_SELECT (HID_BASE + 2178 ) -#define HID_MAIL_MERGE_CREATE_FROM (HID_BASE + 2179 ) -#define HID_MAIL_MERGE_INSERT_FIELDS (HID_BASE + 2180 ) -#define HID_PRINT_AS_MERGE (HID_BASE + 2181 ) -#define HID_MERGE_SOURCE_UNAVAILABLE (HID_BASE + 2182 ) -#define HID_DATA_SOURCES_UNAVAILABLE (HID_BASE + 2183 ) -#define HID_MODULE_TOOLBOX (HID_BASE + 2184 ) -#define HID_SECTION_INDENTS_PAGE (HID_BASE + 2185 ) - -#define HID_FLD_DROPDOWN (HID_BASE + 2186 ) -#define HID_MM_DOCSELECTPAGE (HID_BASE + 2187 ) -#define HID_MM_OUTPUTTYPEPAGE (HID_BASE + 2188 ) -#define HID_MM_ADDRESSBLOCKPAGE (HID_BASE + 2189 ) -#define HID_MM_GREETINGSPAGE (HID_BASE + 2190 ) -#define HID_MM_PREPAREMERGEPAGE (HID_BASE + 2191 ) -#define HID_MM_MERGEPAGE (HID_BASE + 2192 ) -#define HID_MM_OUTPUTPAGE (HID_BASE + 2193 ) -#define HID_MM_ADDRESSLISTDIALOG (HID_BASE + 2194 ) -#define HID_MM_SELECTDBTABLEDDIALOG (HID_BASE + 2195 ) -#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX (HID_BASE + 2196 ) -#define HID_MM_DBTABLEPREVIEWDIALOG (HID_BASE + 2197 ) -#define HID_MM_CREATEADDRESSLIST (HID_BASE + 2198 ) -#define HID_MM_FIND_ENTRY (HID_BASE + 2199 ) -#define HID_MM_ADD_RENAME_ENTRY (HID_BASE + 2200 ) -#define HID_MM_CUSTOMIZE_ADDRESS_LIST (HID_BASE + 2201 ) -#define HID_MM_CUSTOMIZEADDRESSBLOCK (HID_BASE + 2202 ) -#define HID_MM_SELECTADDRESSBLOCK (HID_BASE + 2203 ) -#define HID_MM_ASSIGNFIELDS (HID_BASE + 2204 ) -#define HID_MM_MAILNOTINSTALLED (HID_BASE + 2205 ) -#define HID_MM_LAYOUT_PAGE (HID_BASE + 2206 ) -#define HID_MM_COPYTO (HID_BASE + 2207 ) -#define HID_MM_ADDRESSLIST_HB (HID_BASE + 2208 ) -#define HID_MM_ADDRESSLIST_TLB (HID_BASE + 2209 ) -#define HID_TP_MAILCONFIG (HID_BASE + 2210 ) -#define HID_MM_TESTACCOUNTSETTINGS (HID_BASE + 2211 ) -#define HID_MM_TESTACCOUNTSETTINGS_TLB (HID_BASE + 2212 ) -#define HID_MM_TESTACCOUNTSETTINGS_HB (HID_BASE + 2213 ) -#define HID_MM_MAILBODY (HID_BASE + 2214 ) -#define HID_MM_SENDMAILS (HID_BASE + 2215 ) -#define HID_MM_SENDMAILS_STATUSLB (HID_BASE + 2216 ) -#define HID_MAILMERGECHILD (HID_BASE + 2217 ) -#define HID_MM_CUSTOMFIELDS (HID_BASE + 2218 ) -#define HID_DLG_WORDCOUNT (HID_BASE + 2219 ) -#define HID_MM_MAILSTATUS_TLB (HID_BASE + 2220 ) -#define HID_RETURN_TO_MAILMERGE (HID_BASE + 2221 ) -#define HID_MM_SAVEWARNING (HID_BASE + 2222 ) -#define HID_MM_QUERY (HID_BASE + 2223 ) -#define HID_MM_SENDWARNING (HID_BASE + 2224 ) -#define HID_MM_SERVERAUTHENTICATION (HID_BASE + 2225 ) - -#define HID_MEDIA_TOOLBOX (HID_BASE + 2227) -#define HID_NID_TBL (HID_BASE + 2228) -#define HID_NID_FRM (HID_BASE + 2229) -#define HID_NID_GRF (HID_BASE + 2230) -#define HID_NID_OLE (HID_BASE + 2231) -#define HID_NID_PGE (HID_BASE + 2232) -#define HID_NID_OUTL (HID_BASE + 2233) -#define HID_NID_MARK (HID_BASE + 2234) -#define HID_NID_DRW (HID_BASE + 2235) -#define HID_NID_CTRL (HID_BASE + 2236) -#define HID_NID_PREV (HID_BASE + 2237) -#define HID_NID_REG (HID_BASE + 2238) -#define HID_NID_BKM (HID_BASE + 2239) -#define HID_NID_SEL (HID_BASE + 2240) -#define HID_NID_FTN (HID_BASE + 2241) -#define HID_NID_POSTIT (HID_BASE + 2242) -#define HID_NID_SRCH_REP (HID_BASE + 2243) -#define HID_NID_INDEX_ENTRY (HID_BASE + 2244) -#define HID_NID_TABLE_FORMULA (HID_BASE + 2245) -#define HID_NID_TABLE_FORMULA_ERROR (HID_BASE + 2246) -#define HID_NID_NEXT (HID_BASE + 2247) -#define HID_MM_NEXT_PAGE (HID_BASE + 2248) -#define HID_MM_PREV_PAGE (HID_BASE + 2249) -#define HID_MM_GREETINGS_CB_PERSONALIZED (HID_BASE + 2250) -#define HID_MM_GREETINGS_LB_FEMALE (HID_BASE + 2251) -#define HID_MM_GREETINGS_PB_FEMALE (HID_BASE + 2252) -#define HID_MM_GREETINGS_LB_MALE (HID_BASE + 2253) -#define HID_MM_GREETINGS_PB_MALE (HID_BASE + 2254) -#define HID_MM_GREETINGS_LB_FEMALECOLUMN (HID_BASE + 2255) -#define HID_MM_GREETINGS_CB_FEMALEFIELD (HID_BASE + 2256) -#define HID_MM_GREETINGS_CB_NEUTRAL (HID_BASE + 2257) -#define HID_MM_BODY_CB_PERSONALIZED (HID_BASE + 2258) -#define HID_MM_BODY_LB_FEMALE (HID_BASE + 2259) -#define HID_MM_BODY_PB_FEMALE (HID_BASE + 2260) -#define HID_MM_BODY_LB_MALE (HID_BASE + 2261) -#define HID_MM_BODY_PB_MALE (HID_BASE + 2262) -#define HID_MM_BODY_LB_FEMALECOLUMN (HID_BASE + 2263) -#define HID_MM_BODY_CB_FEMALEFIELD (HID_BASE + 2264) -#define HID_MM_BODY_CB_NEUTRAL (HID_BASE + 2265) -#define HID_MM_ASSIGN_FIELDS (HID_BASE + 2266) -#define HID_MM_HEADER_0 (HID_BASE + 2267) -#define HID_MM_HEADER_1 (HID_BASE + 2268) -#define HID_MM_HEADER_2 (HID_BASE + 2269) -#define HID_MM_HEADER_3 (HID_BASE + 2270) -#define HID_MM_HEADER_4 (HID_BASE + 2271) -#define HID_MM_HEADER_5 (HID_BASE + 2272) -#define HID_MM_HEADER_6 (HID_BASE + 2273) -#define HID_MM_HEADER_7 (HID_BASE + 2274) -#define HID_MM_HEADER_8 (HID_BASE + 2275) -#define HID_MM_HEADER_9 (HID_BASE + 2276) -#define HID_MM_HEADER_10 (HID_BASE + 2277) -#define HID_MM_HEADER_11 (HID_BASE + 2278) -#define HID_MM_HEADER_12 (HID_BASE + 2279) -#define HID_MM_HEADER_13 (HID_BASE + 2280) +#define HID_TOX_ENTRY_BUTTON "SW_HID_TOX_ENTRY_BUTTON" +#define HID_TOX_ENTRY_EDIT "SW_HID_TOX_ENTRY_EDIT" + +#define HID_DLG_NEW_USER_IDX "SW_HID_DLG_NEW_USER_IDX" +#define HID_INSERT_IDX_MRK_OK "SW_HID_INSERT_IDX_MRK_OK" +#define HID_INSERT_IDX_MRK_CLOSE "SW_HID_INSERT_IDX_MRK_CLOSE" +#define HID_INSERT_AUTH_MRK_OK "SW_HID_INSERT_AUTH_MRK_OK" +#define HID_INSERT_AUTH_MRK_CLOSE "SW_HID_INSERT_AUTH_MRK_CLOSE" +#define HID_INSERT_IDX_MRK_DELETE "SW_HID_INSERT_IDX_MRK_DELETE" +#define HID_INSERT_IDX_MRK_NEW "SW_HID_INSERT_IDX_MRK_NEW" +#define HID_INSERT_IDX_MRK_PREV "SW_HID_INSERT_IDX_MRK_PREV" +#define HID_INSERT_IDX_MRK_PREV_SAME "SW_HID_INSERT_IDX_MRK_PREV_SAME" +#define HID_INSERT_IDX_MRK_NEXT "SW_HID_INSERT_IDX_MRK_NEXT" +#define HID_INSERT_IDX_MRK_NEXT_SAME "SW_HID_INSERT_IDX_MRK_NEXT_SAME" +#define HID_INSERT_IDX_MRK_TYPE "SW_HID_INSERT_IDX_MRK_TYPE" +#define HID_INSERT_IDX_MRK_ENTRY "SW_HID_INSERT_IDX_MRK_ENTRY" +#define HID_INSERT_IDX_MRK_PRIM_KEY "SW_HID_INSERT_IDX_MRK_PRIM_KEY" +#define HID_INSERT_IDX_MRK_SEC_KEY "SW_HID_INSERT_IDX_MRK_SEC_KEY" +#define HID_INSERT_IDX_MRK_LEVEL "SW_HID_INSERT_IDX_MRK_LEVEL" +#define HID_INSERT_IDX_MRK_MAIN_ENTRY "SW_HID_INSERT_IDX_MRK_MAIN_ENTRY" +#define HID_INSERT_IDX_MRK_APPLY_ALL "SW_HID_INSERT_IDX_MRK_APPLY_ALL" +#define HID_INSERT_AUTH_MRK_ENTRY "SW_HID_INSERT_AUTH_MRK_ENTRY" +#define HID_INSERT_AUTH_MRK_CREATE_ENTRY "SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY" +#define HID_INSERT_AUTH_MRK_EDIT_ENTRY "SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY" +#define HID_TOKEN_WINDOW "SW_HID_TOKEN_WINDOW" + +#define HID_AUTH_FIELD_IDENTIFIER "SW_HID_AUTH_FIELD_IDENTIFIER" +#define HID_AUTH_FIELD_AUTHORITY_TYPE "SW_HID_AUTH_FIELD_AUTHORITY_TYPE" +#define HID_AUTH_FIELD_ADDRESS "SW_HID_AUTH_FIELD_ADDRESS" +#define HID_AUTH_FIELD_ANNOTE "SW_HID_AUTH_FIELD_ANNOTE" +#define HID_AUTH_FIELD_AUTHOR "SW_HID_AUTH_FIELD_AUTHOR" +#define HID_AUTH_FIELD_BOOKTITLE "SW_HID_AUTH_FIELD_BOOKTITLE" +#define HID_AUTH_FIELD_CHAPTER "SW_HID_AUTH_FIELD_CHAPTER" +#define HID_AUTH_FIELD_EDITION "SW_HID_AUTH_FIELD_EDITION" +#define HID_AUTH_FIELD_EDITOR "SW_HID_AUTH_FIELD_EDITOR" +#define HID_AUTH_FIELD_HOWPUBLISHED "SW_HID_AUTH_FIELD_HOWPUBLISHED" +#define HID_AUTH_FIELD_INSTITUTION "SW_HID_AUTH_FIELD_INSTITUTION" +#define HID_AUTH_FIELD_JOURNAL "SW_HID_AUTH_FIELD_JOURNAL" +#define HID_AUTH_FIELD_MONTH "SW_HID_AUTH_FIELD_MONTH" +#define HID_AUTH_FIELD_NOTE "SW_HID_AUTH_FIELD_NOTE" +#define HID_AUTH_FIELD_NUMBER "SW_HID_AUTH_FIELD_NUMBER" +#define HID_AUTH_FIELD_ORGANIZATIONS "SW_HID_AUTH_FIELD_ORGANIZATIONS" +#define HID_AUTH_FIELD_PAGES "SW_HID_AUTH_FIELD_PAGES" +#define HID_AUTH_FIELD_PUBLISHER "SW_HID_AUTH_FIELD_PUBLISHER" +#define HID_AUTH_FIELD_SCHOOL "SW_HID_AUTH_FIELD_SCHOOL" +#define HID_AUTH_FIELD_SERIES "SW_HID_AUTH_FIELD_SERIES" +#define HID_AUTH_FIELD_TITLE "SW_HID_AUTH_FIELD_TITLE" +#define HID_AUTH_FIELD_REPORT_TYPE "SW_HID_AUTH_FIELD_REPORT_TYPE" +#define HID_AUTH_FIELD_VOLUME "SW_HID_AUTH_FIELD_VOLUME" +#define HID_AUTH_FIELD_YEAR "SW_HID_AUTH_FIELD_YEAR" +#define HID_AUTH_FIELD_URL "SW_HID_AUTH_FIELD_URL" +#define HID_AUTH_FIELD_CUSTOM1 "SW_HID_AUTH_FIELD_CUSTOM1" +#define HID_AUTH_FIELD_CUSTOM2 "SW_HID_AUTH_FIELD_CUSTOM2" +#define HID_AUTH_FIELD_CUSTOM3 "SW_HID_AUTH_FIELD_CUSTOM3" +#define HID_AUTH_FIELD_CUSTOM4 "SW_HID_AUTH_FIELD_CUSTOM4" +#define HID_AUTH_FIELD_CUSTOM5 "SW_HID_AUTH_FIELD_CUSTOM5" +#define HID_AUTH_FIELD_ISBN "SW_HID_AUTH_FIELD_ISBN" + +#define HID_AUTH_MARK_DLG_FROM_COMP_RB "SW_HID_AUTH_MARK_DLG_FROM_COMP_RB" +#define HID_AUTH_MARK_DLG_FROM_DOC_RB "SW_HID_AUTH_MARK_DLG_FROM_DOC_RB" +#define HID_AUTH_MARK_DLG_ID_LISTBOX "SW_HID_AUTH_MARK_DLG_ID_LISTBOX" + +#define HID_INSERT_INDEX_ENTRY_LEVEL_LB "SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB" +#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE "SW_HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE" +#define HID_INSERT_IDX_MRK_SRCH_WORDONLY "SW_HID_INSERT_IDX_MRK_SRCH_WORDONLY" +#define HID_DLG_CREATE_AUTOMARK "SW_HID_DLG_CREATE_AUTOMARK" +#define HID_BUSINESS_CARD_CONTENT "SW_HID_BUSINESS_CARD_CONTENT" +#define HID_SAVE_LABEL_DLG "SW_HID_SAVE_LABEL_DLG" +#define HID_BUSINESS_FMT_PAGE "SW_HID_BUSINESS_FMT_PAGE" +#define HID_BUSINESS_FMT_PAGE_CONT "SW_HID_BUSINESS_FMT_PAGE_CONT" +#define HID_BUSINESS_FMT_PAGE_SHEET "SW_HID_BUSINESS_FMT_PAGE_SHEET" +#define HID_BUSINESS_FMT_PAGE_BRAND "SW_HID_BUSINESS_FMT_PAGE_BRAND" +#define HID_BUSINESS_FMT_PAGE_TYPE "SW_HID_BUSINESS_FMT_PAGE_TYPE" +#define HID_SEND_MASTER_DIALOG "SW_HID_SEND_MASTER_DIALOG" +#define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" +#define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL" +#define HID_SEND_MASTER_CTRL_LISTBOX_FILTER "SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" +#define HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW "SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW" +#define HID_SEND_MASTER_CTRL_EDIT_FILEURL "SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL" +#define HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION" +#define HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE" +#define HID_SEND_MASTER_CTRL_DUMMY "SW_HID_SEND_MASTER_CTRL_DUMMY" + +#define HID_SEND_HTML_DIALOG "SW_HID_SEND_HTML_DIALOG" +#define HID_SEND_HTML_CTRL_PUSHBUTTON_OK "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK" +#define HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL" +#define HID_SEND_HTML_CTRL_LISTBOX_FILTER "SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER" +#define HID_SEND_HTML_CTRL_CONTROL_FILEVIEW "SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW" +#define HID_SEND_HTML_CTRL_EDIT_FILEURL "SW_HID_SEND_HTML_CTRL_EDIT_FILEURL" +#define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION" +#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE" +#define HID_SEND_HTML_CTRL_DUMMY "SW_HID_SEND_HTML_CTRL_DUMMY" + +#define HID_INSERT_IDX_MRK_PHONETIC_READING "SW_HID_INSERT_IDX_MRK_PHONETIC_READING" +#define HID_COLUMN_VALUESET "SW_HID_COLUMN_VALUESET" +#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB" +#define HID_MAIL_MERGE_SELECT "SW_HID_MAIL_MERGE_SELECT" +#define HID_MAIL_MERGE_CREATE_FROM "SW_HID_MAIL_MERGE_CREATE_FROM" +#define HID_MAIL_MERGE_INSERT_FIELDS "SW_HID_MAIL_MERGE_INSERT_FIELDS" +#define HID_PRINT_AS_MERGE "SW_HID_PRINT_AS_MERGE" +#define HID_MERGE_SOURCE_UNAVAILABLE "SW_HID_MERGE_SOURCE_UNAVAILABLE" +#define HID_DATA_SOURCES_UNAVAILABLE "SW_HID_DATA_SOURCES_UNAVAILABLE" +#define HID_MODULE_TOOLBOX "SW_HID_MODULE_TOOLBOX" +#define HID_SECTION_INDENTS_PAGE "SW_HID_SECTION_INDENTS_PAGE" + +#define HID_FLD_DROPDOWN "SW_HID_FLD_DROPDOWN" +#define HID_MM_DOCSELECTPAGE "SW_HID_MM_DOCSELECTPAGE" +#define HID_MM_OUTPUTTYPEPAGE "SW_HID_MM_OUTPUTTYPEPAGE" +#define HID_MM_ADDRESSBLOCKPAGE "SW_HID_MM_ADDRESSBLOCKPAGE" +#define HID_MM_GREETINGSPAGE "SW_HID_MM_GREETINGSPAGE" +#define HID_MM_PREPAREMERGEPAGE "SW_HID_MM_PREPAREMERGEPAGE" +#define HID_MM_MERGEPAGE "SW_HID_MM_MERGEPAGE" +#define HID_MM_OUTPUTPAGE "SW_HID_MM_OUTPUTPAGE" +#define HID_MM_ADDRESSLISTDIALOG "SW_HID_MM_ADDRESSLISTDIALOG" +#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG" +#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" +#define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG" +#define HID_MM_CREATEADDRESSLIST "SW_HID_MM_CREATEADDRESSLIST" +#define HID_MM_FIND_ENTRY "SW_HID_MM_FIND_ENTRY" +#define HID_MM_ADD_RENAME_ENTRY "SW_HID_MM_ADD_RENAME_ENTRY" +#define HID_MM_CUSTOMIZE_ADDRESS_LIST "SW_HID_MM_CUSTOMIZE_ADDRESS_LIST" +#define HID_MM_CUSTOMIZEADDRESSBLOCK "SW_HID_MM_CUSTOMIZEADDRESSBLOCK" +#define HID_MM_SELECTADDRESSBLOCK "SW_HID_MM_SELECTADDRESSBLOCK" +#define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS" +#define HID_MM_MAILNOTINSTALLED "SW_HID_MM_MAILNOTINSTALLED" +#define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE" +#define HID_MM_COPYTO "SW_HID_MM_COPYTO" +#define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB" +#define HID_MM_ADDRESSLIST_TLB "SW_HID_MM_ADDRESSLIST_TLB" +#define HID_TP_MAILCONFIG "SW_HID_TP_MAILCONFIG" +#define HID_MM_TESTACCOUNTSETTINGS "SW_HID_MM_TESTACCOUNTSETTINGS" +#define HID_MM_TESTACCOUNTSETTINGS_TLB "SW_HID_MM_TESTACCOUNTSETTINGS_TLB" +#define HID_MM_TESTACCOUNTSETTINGS_HB "SW_HID_MM_TESTACCOUNTSETTINGS_HB" +#define HID_MM_MAILBODY "SW_HID_MM_MAILBODY" +#define HID_MM_SENDMAILS "SW_HID_MM_SENDMAILS" +#define HID_MM_SENDMAILS_STATUSLB "SW_HID_MM_SENDMAILS_STATUSLB" +#define HID_MAILMERGECHILD "SW_HID_MAILMERGECHILD" +#define HID_MM_CUSTOMFIELDS "SW_HID_MM_CUSTOMFIELDS" +#define HID_DLG_WORDCOUNT "SW_HID_DLG_WORDCOUNT" +#define HID_MM_MAILSTATUS_TLB "SW_HID_MM_MAILSTATUS_TLB" +#define HID_RETURN_TO_MAILMERGE "SW_HID_RETURN_TO_MAILMERGE" +#define HID_MM_SAVEWARNING "SW_HID_MM_SAVEWARNING" +#define HID_MM_QUERY "SW_HID_MM_QUERY" +#define HID_MM_SENDWARNING "SW_HID_MM_SENDWARNING" +#define HID_MM_SERVERAUTHENTICATION "SW_HID_MM_SERVERAUTHENTICATION" + +#define HID_MEDIA_TOOLBOX "SW_HID_MEDIA_TOOLBOX" +#define HID_NID_TBL "SW_HID_NID_TBL" +#define HID_NID_FRM "SW_HID_NID_FRM" +#define HID_NID_GRF "SW_HID_NID_GRF" +#define HID_NID_OLE "SW_HID_NID_OLE" +#define HID_NID_PGE "SW_HID_NID_PGE" +#define HID_NID_OUTL "SW_HID_NID_OUTL" +#define HID_NID_MARK "SW_HID_NID_MARK" +#define HID_NID_DRW "SW_HID_NID_DRW" +#define HID_NID_CTRL "SW_HID_NID_CTRL" +#define HID_NID_PREV "SW_HID_NID_PREV" +#define HID_NID_REG "SW_HID_NID_REG" +#define HID_NID_BKM "SW_HID_NID_BKM" +#define HID_NID_SEL "SW_HID_NID_SEL" +#define HID_NID_FTN "SW_HID_NID_FTN" +#define HID_NID_POSTIT "SW_HID_NID_POSTIT" +#define HID_NID_SRCH_REP "SW_HID_NID_SRCH_REP" +#define HID_NID_INDEX_ENTRY "SW_HID_NID_INDEX_ENTRY" +#define HID_NID_TABLE_FORMULA "SW_HID_NID_TABLE_FORMULA" +#define HID_NID_TABLE_FORMULA_ERROR "SW_HID_NID_TABLE_FORMULA_ERROR" +#define HID_NID_NEXT "SW_HID_NID_NEXT" +#define HID_MM_NEXT_PAGE "SW_HID_MM_NEXT_PAGE" +#define HID_MM_PREV_PAGE "SW_HID_MM_PREV_PAGE" +#define HID_MM_GREETINGS_CB_PERSONALIZED "SW_HID_MM_GREETINGS_CB_PERSONALIZED" +#define HID_MM_GREETINGS_LB_FEMALE "SW_HID_MM_GREETINGS_LB_FEMALE" +#define HID_MM_GREETINGS_PB_FEMALE "SW_HID_MM_GREETINGS_PB_FEMALE" +#define HID_MM_GREETINGS_LB_MALE "SW_HID_MM_GREETINGS_LB_MALE" +#define HID_MM_GREETINGS_PB_MALE "SW_HID_MM_GREETINGS_PB_MALE" +#define HID_MM_GREETINGS_LB_FEMALECOLUMN "SW_HID_MM_GREETINGS_LB_FEMALECOLUMN" +#define HID_MM_GREETINGS_CB_FEMALEFIELD "SW_HID_MM_GREETINGS_CB_FEMALEFIELD" +#define HID_MM_GREETINGS_CB_NEUTRAL "SW_HID_MM_GREETINGS_CB_NEUTRAL" +#define HID_MM_BODY_CB_PERSONALIZED "SW_HID_MM_BODY_CB_PERSONALIZED" +#define HID_MM_BODY_LB_FEMALE "SW_HID_MM_BODY_LB_FEMALE" +#define HID_MM_BODY_PB_FEMALE "SW_HID_MM_BODY_PB_FEMALE" +#define HID_MM_BODY_LB_MALE "SW_HID_MM_BODY_LB_MALE" +#define HID_MM_BODY_PB_MALE "SW_HID_MM_BODY_PB_MALE" +#define HID_MM_BODY_LB_FEMALECOLUMN "SW_HID_MM_BODY_LB_FEMALECOLUMN" +#define HID_MM_BODY_CB_FEMALEFIELD "SW_HID_MM_BODY_CB_FEMALEFIELD" +#define HID_MM_BODY_CB_NEUTRAL "SW_HID_MM_BODY_CB_NEUTRAL" +#define HID_MM_ASSIGN_FIELDS "SW_HID_MM_ASSIGN_FIELDS" +#define HID_MM_HEADER_0 "SW_HID_MM_HEADER_0" +#define HID_MM_HEADER_1 "SW_HID_MM_HEADER_1" +#define HID_MM_HEADER_2 "SW_HID_MM_HEADER_2" +#define HID_MM_HEADER_3 "SW_HID_MM_HEADER_3" +#define HID_MM_HEADER_4 "SW_HID_MM_HEADER_4" +#define HID_MM_HEADER_5 "SW_HID_MM_HEADER_5" +#define HID_MM_HEADER_6 "SW_HID_MM_HEADER_6" +#define HID_MM_HEADER_7 "SW_HID_MM_HEADER_7" +#define HID_MM_HEADER_8 "SW_HID_MM_HEADER_8" +#define HID_MM_HEADER_9 "SW_HID_MM_HEADER_9" +#define HID_MM_HEADER_10 "SW_HID_MM_HEADER_10" +#define HID_MM_HEADER_11 "SW_HID_MM_HEADER_11" +#define HID_MM_HEADER_12 "SW_HID_MM_HEADER_12" +#define HID_MM_HEADER_13 "SW_HID_MM_HEADER_13" + +#define HID_ITM_HOR_LEFT "SW_HID_ITM_HOR_LEFT" +#define HID_ITM_HOR_CNTR "SW_HID_ITM_HOR_CNTR" +#define HID_ITM_HOR_RGHT "SW_HID_ITM_HOR_RGHT" +#define HID_ITM_VER_LEFT "SW_HID_ITM_VER_LEFT" +#define HID_ITM_VER_CNTR "SW_HID_ITM_VER_CNTR" +#define HID_ITM_VER_RGHT "SW_HID_ITM_VER_RGHT" + +#define HID_TBX_FORMULA_CALC "SW_HID_TBX_FORMULA_CALC" +#define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL" +#define HID_TBX_FORMULA_APPLY "SW_HID_TBX_FORMULA_APPLY" #define HID_TITLEPAGE (HID_BASE + 2281) diff --git a/sw/inc/hfspacingitem.hxx b/sw/inc/hfspacingitem.hxx index 6dd5efbde153..116335cbb74e 100644 --- a/sw/inc/hfspacingitem.hxx +++ b/sw/inc/hfspacingitem.hxx @@ -38,8 +38,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwHeaderAndFooterEatSpacingItem : public SfxBoolItem { public: - SwHeaderAndFooterEatSpacingItem( USHORT nId = RES_HEADER_FOOTER_EAT_SPACING, - BOOL bPrt = FALSE ) : SfxBoolItem( nId, bPrt ) {} + SwHeaderAndFooterEatSpacingItem( sal_uInt16 nId = RES_HEADER_FOOTER_EAT_SPACING, + sal_Bool bPrt = sal_False ) : SfxBoolItem( nId, bPrt ) {} // "pure virtual methods" of SfxPoolItem virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; @@ -50,10 +50,10 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(BOOL bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwAttrSet::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const { return (const SwHeaderAndFooterEatSpacingItem&)Get( RES_HEADER_FOOTER_EAT_SPACING,bInP); } -inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(BOOL bInP) const +inline const SwHeaderAndFooterEatSpacingItem &SwFmt::GetHeaderAndFooterEatSpacing(sal_Bool bInP) const { return aSet.GetHeaderAndFooterEatSpacing(bInP); } #endif diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 961ae8be2c6b..1b2e682d4df4 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -52,8 +52,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion // SwPaM or SwPosition by replace operations!) sal_Int32 nUnitOffset; - USHORT nPageCount; // page count for progress bar - USHORT nPageStart; // first checked page + sal_uInt16 nPageCount; // page count for progress bar + sal_uInt16 nPageStart; // first checked page sal_Bool bIsDrawObj; sal_Bool bIsStart; @@ -83,8 +83,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion SwPaM *pCrsr ); void ChangeText_impl( const String &rNewText, sal_Bool bKeepAttributes ); - inline BOOL IsDrawObj() { return bIsDrawObj; } - inline void SetDrawObj( BOOL bNew ) { bIsDrawObj = bNew; } + inline sal_Bool IsDrawObj() { return bIsDrawObj; } + inline void SetDrawObj( sal_Bool bNew ) { bIsDrawObj = bNew; } protected: virtual void GetNextPortion( ::rtl::OUString& rNextPortion, diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx index 03af76475b2e..afd57f3bfb4a 100644 --- a/sw/inc/hintids.hxx +++ b/sw/inc/hintids.hxx @@ -369,48 +369,48 @@ RES_FLTRATTR_END #define RES_WHICHHINT_END HINT_END -inline bool isATR(const USHORT nWhich) +inline bool isATR(const sal_uInt16 nWhich) { return (RES_CHRATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); } -inline bool isCHRATR(const USHORT nWhich) +inline bool isCHRATR(const sal_uInt16 nWhich) { return (RES_CHRATR_BEGIN <= nWhich) && (RES_CHRATR_END > nWhich); } -inline bool isTXTATR_WITHEND(const USHORT nWhich) +inline bool isTXTATR_WITHEND(const sal_uInt16 nWhich) { return (RES_TXTATR_WITHEND_BEGIN <= nWhich) && (RES_TXTATR_WITHEND_END > nWhich); } -inline bool isTXTATR_NOEND(const USHORT nWhich) +inline bool isTXTATR_NOEND(const sal_uInt16 nWhich) { return (RES_TXTATR_NOEND_BEGIN <= nWhich) && (RES_TXTATR_NOEND_END > nWhich); } -inline bool isTXTATR(const USHORT nWhich) +inline bool isTXTATR(const sal_uInt16 nWhich) { return (RES_TXTATR_BEGIN <= nWhich) && (RES_TXTATR_END > nWhich); } -inline bool isPARATR(const USHORT nWhich) +inline bool isPARATR(const sal_uInt16 nWhich) { return (RES_PARATR_BEGIN <= nWhich) && (RES_PARATR_END > nWhich); } -inline bool isPARATR_LIST(const USHORT nWhich) +inline bool isPARATR_LIST(const sal_uInt16 nWhich) { return (RES_PARATR_LIST_BEGIN <= nWhich) && (RES_PARATR_LIST_END > nWhich); } -inline bool isFRMATR(const USHORT nWhich) +inline bool isFRMATR(const sal_uInt16 nWhich) { return (RES_FRMATR_BEGIN <= nWhich) && (RES_FRMATR_END > nWhich); } -inline bool isGRFATR(const USHORT nWhich) +inline bool isGRFATR(const sal_uInt16 nWhich) { return (RES_GRFATR_BEGIN <= nWhich) && (RES_GRFATR_END > nWhich); } -inline bool isBOXATR(const USHORT nWhich) +inline bool isBOXATR(const sal_uInt16 nWhich) { return (RES_BOXATR_BEGIN <= nWhich) && (RES_BOXATR_END > nWhich); } -inline bool isUNKNOWNATR(const USHORT nWhich) +inline bool isUNKNOWNATR(const sal_uInt16 nWhich) { return (RES_UNKNOWNATR_BEGIN <= nWhich) && (RES_UNKNOWNATR_END > nWhich); } @@ -429,9 +429,9 @@ typedef SfxPoolItem* SwDfltAttrTab[ POOLATTR_END - POOLATTR_BEGIN ]; extern SwDfltAttrTab aAttrTab; extern SfxItemInfo aSlotTab[]; -SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( USHORT nWhich ); +SW_DLLPUBLIC const SfxPoolItem* GetDfltAttr( sal_uInt16 nWhich ); -SW_DLLPUBLIC USHORT GetWhichOfScript( USHORT nWhich, USHORT nScript ); +SW_DLLPUBLIC sal_uInt16 GetWhichOfScript( sal_uInt16 nWhich, sal_uInt16 nScript ); // return for the given TextAttribute without an end the correct character. // This function returns @@ -443,32 +443,32 @@ sal_Unicode GetCharOfTxtAttr( const SwTxtAttr& rAttr ); // all Sets defined in init.cxx // AttrSet-Range for the 3 Break-Attribute -extern USHORT aBreakSetRange[]; +extern sal_uInt16 aBreakSetRange[]; // AttrSet-Range for TxtFmtColl -extern USHORT aTxtFmtCollSetRange[]; +extern sal_uInt16 aTxtFmtCollSetRange[]; // AttrSet-Range for GrfFmtColl -extern USHORT aGrfFmtCollSetRange[]; +extern sal_uInt16 aGrfFmtCollSetRange[]; // AttrSet-Range for TextNode -SW_DLLPUBLIC extern USHORT aTxtNodeSetRange[]; +SW_DLLPUBLIC extern sal_uInt16 aTxtNodeSetRange[]; // AttrSet-Range for NoTxtNode -extern USHORT aNoTxtNodeSetRange[]; +extern sal_uInt16 aNoTxtNodeSetRange[]; // AttrSet-Range for SwTable -extern USHORT aTableSetRange[]; +extern sal_uInt16 aTableSetRange[]; // AttrSet-Range for SwTableLine -extern USHORT aTableLineSetRange[]; +extern sal_uInt16 aTableLineSetRange[]; // AttrSet-Range for SwTableBox -extern USHORT aTableBoxSetRange[]; +extern sal_uInt16 aTableBoxSetRange[]; // AttrSet-Range for SwFrmFmt -SW_DLLPUBLIC extern USHORT aFrmFmtSetRange[]; +SW_DLLPUBLIC extern sal_uInt16 aFrmFmtSetRange[]; // AttrSet-Range for SwCharFmt -extern USHORT aCharFmtSetRange[]; +extern sal_uInt16 aCharFmtSetRange[]; // AttrSet-Range for the autostyles -extern USHORT aCharAutoFmtSetRange[]; +extern sal_uInt16 aCharAutoFmtSetRange[]; // AttrSet-Range for SwPageDescFmt -extern USHORT aPgFrmFmtSetRange[]; +extern sal_uInt16 aPgFrmFmtSetRange[]; // check if ID is InRange of AttrSet-Ids -BOOL IsInRange( const USHORT* pRange, const USHORT nId ); +sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId ); #endif diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 9381893d4de9..fb064c19a468 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -47,7 +47,7 @@ class SwHistory; class SwMsgPoolItem : public SfxPoolItem { public: - SwMsgPoolItem( USHORT nWhich ); + SwMsgPoolItem( sal_uInt16 nWhich ); // "Overhead" of SfxPoolItem virtual int operator==( const SfxPoolItem& ) const; @@ -64,7 +64,7 @@ class SwPtrMsgPoolItem : public SwMsgPoolItem public: void * pObject; - SwPtrMsgPoolItem( USHORT nId, void * pObj ) + SwPtrMsgPoolItem( sal_uInt16 nId, void * pObj ) : SwMsgPoolItem( nId ), pObject( pObj ) {} }; @@ -114,8 +114,8 @@ class SwUpdateAttr: public SwMsgPoolItem public: xub_StrLen nStart; xub_StrLen nEnd; - USHORT nWhichAttr; - SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, USHORT nW ); + sal_uInt16 nWhichAttr; + SwUpdateAttr( xub_StrLen nS, xub_StrLen nE, sal_uInt16 nW ); }; @@ -155,10 +155,10 @@ public: const String* pNewTblNm; // Split: the name of the new table } DATA; SwHistory* pHistory; - USHORT nSplitLine; // Split: from this BaseLine on will be splitted + sal_uInt16 nSplitLine; // Split: from this BaseLine on will be splitted TableFmlUpdtFlags eFlags; - BOOL bModified : 1; - BOOL bBehindSplitLine : 1; + sal_Bool bModified : 1; + sal_Bool bBehindSplitLine : 1; SwTableFmlUpdate( const SwTable* ); }; @@ -179,7 +179,7 @@ public: */ class SwAttrSetChg: public SwMsgPoolItem { - BOOL bDelSet; + sal_Bool bDelSet; SwAttrSet* pChgSet; // what has changed const SwAttrSet* pTheChgdSet; // is only used to compare public: @@ -194,8 +194,8 @@ public: // Where it has changed const SwAttrSet* GetTheChgdSet() const { return pTheChgdSet; } - USHORT Count() const { return pChgSet->Count(); } - void ClearItem( USHORT nWhichL = 0 ) + sal_uInt16 Count() const { return pChgSet->Count(); } + void ClearItem( sal_uInt16 nWhichL = 0 ) #if OSL_DEBUG_LEVEL > 1 ; #else @@ -244,7 +244,7 @@ public: const String& GetString() const { return sStr; } - SwStringMsgPoolItem( USHORT nId, const String& rStr ) + SwStringMsgPoolItem( sal_uInt16 nId, const String& rStr ) : SwMsgPoolItem( nId ), sStr( rStr ) {} }; diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx index 6802fa7eb1af..4016dba7f833 100644 --- a/sw/inc/htmltbl.hxx +++ b/sw/inc/htmltbl.hxx @@ -61,15 +61,15 @@ class SwHTMLTableLayoutCnts // done for this content. Therefore they are compared against // a reference value. If 255 is reached the continue with 0. // This avoids reinitialization on every resize. - BYTE nPass1Done; // How many times has Pass 1 been called? - BYTE nWidthSet; // How many times has the width been set? + sal_uInt8 nPass1Done; // How many times has Pass 1 been called? + sal_uInt8 nWidthSet; // How many times has the width been set? - BOOL bNoBreakTag; // <NOBR>-Tag over complete content. + sal_Bool bNoBreakTag; // <NOBR>-Tag over complete content. public: SwHTMLTableLayoutCnts( const SwStartNode* pSttNd, SwHTMLTableLayout* pTab, - BOOL bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); + sal_Bool bNoBreakTag, SwHTMLTableLayoutCnts* pNxt ); ~SwHTMLTableLayoutCnts(); @@ -83,32 +83,32 @@ public: // Calculation of next node. SwHTMLTableLayoutCnts *GetNext() const { return pNext; } - void SetWidthSet( BYTE nRef ) { nWidthSet = nRef; } - BOOL IsWidthSet( BYTE nRef ) const { return nRef==nWidthSet; } + void SetWidthSet( sal_uInt8 nRef ) { nWidthSet = nRef; } + sal_Bool IsWidthSet( sal_uInt8 nRef ) const { return nRef==nWidthSet; } - void SetPass1Done( BYTE nRef ) { nPass1Done = nRef; } - BOOL IsPass1Done( BYTE nRef ) const { return nRef==nPass1Done; } + void SetPass1Done( sal_uInt8 nRef ) { nPass1Done = nRef; } + sal_Bool IsPass1Done( sal_uInt8 nRef ) const { return nRef==nPass1Done; } - BOOL HasNoBreakTag() const { return bNoBreakTag; } + sal_Bool HasNoBreakTag() const { return bNoBreakTag; } }; class SwHTMLTableLayoutCell { SwHTMLTableLayoutCnts *pContents; // Content of cell. - USHORT nRowSpan; // ROWSPAN of cell. - USHORT nColSpan; // COLSPAN of cell. - USHORT nWidthOption;// Given width of cell in Twip or %. + sal_uInt16 nRowSpan; // ROWSPAN of cell. + sal_uInt16 nColSpan; // COLSPAN of cell. + sal_uInt16 nWidthOption;// Given width of cell in Twip or %. - BOOL bPrcWidthOption : 1;// nWidth is %-value. - BOOL bNoWrapOption : 1; // NOWRAP-option. + sal_Bool bPrcWidthOption : 1;// nWidth is %-value. + sal_Bool bNoWrapOption : 1; // NOWRAP-option. public: SwHTMLTableLayoutCell( SwHTMLTableLayoutCnts *pCnts, - USHORT nRSpan, USHORT nCSpan, - USHORT nWidthOpt, BOOL bPrcWdthOpt, - BOOL nNWrapOpt ); + sal_uInt16 nRSpan, sal_uInt16 nCSpan, + sal_uInt16 nWidthOpt, sal_Bool bPrcWdthOpt, + sal_Bool nNWrapOpt ); ~SwHTMLTableLayoutCell(); @@ -119,67 +119,67 @@ public: inline void SetProtected(); // Set or get ROWSPAN/COLSPAN of cell. - void SetRowSpan( USHORT nRSpan ) { nRowSpan = nRSpan; } - USHORT GetRowSpan() const { return nRowSpan; } - USHORT GetColSpan() const { return nColSpan; } + void SetRowSpan( sal_uInt16 nRSpan ) { nRowSpan = nRSpan; } + sal_uInt16 GetRowSpan() const { return nRowSpan; } + sal_uInt16 GetColSpan() const { return nColSpan; } - USHORT GetWidthOption() const { return nWidthOption; } - BOOL IsPrcWidthOption() const { return bPrcWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool IsPrcWidthOption() const { return bPrcWidthOption; } - BOOL HasNoWrapOption() const { return bNoWrapOption; } + sal_Bool HasNoWrapOption() const { return bNoWrapOption; } }; class SwHTMLTableLayoutColumn { // Interim values of AutoLayoutPass1, - ULONG nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign; + sal_uLong nMinNoAlign, nMaxNoAlign, nAbsMinNoAlign; // Results of AutoLayoutPass1 - ULONG nMin, nMax; + sal_uLong nMin, nMax; // Results of Pass 2. - USHORT nAbsColWidth; // In Twips. - USHORT nRelColWidth; // In Twips or relative to USHRT_MAX. + sal_uInt16 nAbsColWidth; // In Twips. + sal_uInt16 nRelColWidth; // In Twips or relative to USHRT_MAX. - USHORT nWidthOption; // Options of <COL> or <TD>/<TH>. + sal_uInt16 nWidthOption; // Options of <COL> or <TD>/<TH>. - BOOL bRelWidthOption : 1; - BOOL bLeftBorder : 1; + sal_Bool bRelWidthOption : 1; + sal_Bool bLeftBorder : 1; public: - SwHTMLTableLayoutColumn( USHORT nColWidthOpt, BOOL bRelColWidthOpt, - BOOL bLBorder ); + SwHTMLTableLayoutColumn( sal_uInt16 nColWidthOpt, sal_Bool bRelColWidthOpt, + sal_Bool bLBorder ); ~SwHTMLTableLayoutColumn() {} - inline void MergeCellWidthOption( USHORT nWidth, BOOL bPrc ); - inline void SetWidthOption( USHORT nWidth, BOOL bRelWidth, BOOL bTest ); + inline void MergeCellWidthOption( sal_uInt16 nWidth, sal_Bool bPrc ); + inline void SetWidthOption( sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest ); - USHORT GetWidthOption() const { return nWidthOption; } - BOOL IsRelWidthOption() const { return bRelWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool IsRelWidthOption() const { return bRelWidthOption; } - inline void MergeMinMaxNoAlign( ULONG nMin, ULONG nMax, ULONG nAbsMin ); - ULONG GetMinNoAlign() const { return nMinNoAlign; } - ULONG GetMaxNoAlign() const { return nMaxNoAlign; } - ULONG GetAbsMinNoAlign() const { return nAbsMinNoAlign; } - inline void ClearPass1Info( BOOL bWidthOpt ); + inline void MergeMinMaxNoAlign( sal_uLong nMin, sal_uLong nMax, sal_uLong nAbsMin ); + sal_uLong GetMinNoAlign() const { return nMinNoAlign; } + sal_uLong GetMaxNoAlign() const { return nMaxNoAlign; } + sal_uLong GetAbsMinNoAlign() const { return nAbsMinNoAlign; } + inline void ClearPass1Info( sal_Bool bWidthOpt ); - inline void SetMinMax( ULONG nMin, ULONG nMax ); - void SetMax( ULONG nVal ) { nMax = nVal; } - void AddToMin( ULONG nVal ) { nMin += nVal; } - void AddToMax( ULONG nVal ) { nMax += nVal; } - ULONG GetMin() const { return nMin; } - ULONG GetMax() const { return nMax; } + inline void SetMinMax( sal_uLong nMin, sal_uLong nMax ); + void SetMax( sal_uLong nVal ) { nMax = nVal; } + void AddToMin( sal_uLong nVal ) { nMin += nVal; } + void AddToMax( sal_uLong nVal ) { nMax += nVal; } + sal_uLong GetMin() const { return nMin; } + sal_uLong GetMax() const { return nMax; } - void SetAbsColWidth( USHORT nWidth ) { nAbsColWidth = nWidth; } - USHORT GetAbsColWidth() const { return nAbsColWidth; } + void SetAbsColWidth( sal_uInt16 nWidth ) { nAbsColWidth = nWidth; } + sal_uInt16 GetAbsColWidth() const { return nAbsColWidth; } - void SetRelColWidth( USHORT nWidth ) { nRelColWidth = nWidth; } - USHORT GetRelColWidth() const { return nRelColWidth; } + void SetRelColWidth( sal_uInt16 nWidth ) { nRelColWidth = nWidth; } + sal_uInt16 GetRelColWidth() const { return nRelColWidth; } - BOOL HasLeftBorder() const { return bLeftBorder; } + sal_Bool HasLeftBorder() const { return bLeftBorder; } }; class SwHTMLTableLayout @@ -193,61 +193,61 @@ class SwHTMLTableLayout SwTableBox *pLeftFillerBox; // Left filler-box (table in table only). SwTableBox *pRightFillerBox; // Right filler-box (table in Table only). - ULONG nMin; // Minimal width of table (Twips). - ULONG nMax; // Maximal width of table (Twips). + sal_uLong nMin; // Minimal width of table (Twips). + sal_uLong nMax; // Maximal width of table (Twips). - USHORT nRows; // Row count. - USHORT nCols; // Column count. + sal_uInt16 nRows; // Row count. + sal_uInt16 nCols; // Column count. - USHORT nLeftMargin; // Space to left margin (from paragraph). - USHORT nRightMargin; // Space to left margin (from paragraph). + sal_uInt16 nLeftMargin; // Space to left margin (from paragraph). + sal_uInt16 nRightMargin; // Space to left margin (from paragraph). - USHORT nInhAbsLeftSpace; // Space inherited from surrounding box - USHORT nInhAbsRightSpace; // that was added to boxes. + sal_uInt16 nInhAbsLeftSpace; // Space inherited from surrounding box + sal_uInt16 nInhAbsRightSpace; // that was added to boxes. - USHORT nRelLeftFill; // Width of boxes relative to alignment - USHORT nRelRightFill; // of tables in tables. + sal_uInt16 nRelLeftFill; // Width of boxes relative to alignment + sal_uInt16 nRelRightFill; // of tables in tables. - USHORT nRelTabWidth; // Relative width of table. + sal_uInt16 nRelTabWidth; // Relative width of table. - USHORT nWidthOption; // Width of table (in Twips oder %). - USHORT nCellPadding; // Space to contents (in Twips). - USHORT nCellSpacing; // Cell spacing (in Twips). - USHORT nBorder; // Line strength of outer border, or rather the + sal_uInt16 nWidthOption; // Width of table (in Twips oder %). + sal_uInt16 nCellPadding; // Space to contents (in Twips). + sal_uInt16 nCellSpacing; // Cell spacing (in Twips). + sal_uInt16 nBorder; // Line strength of outer border, or rather the // space needed for it as calculated by Netscape. - USHORT nLeftBorderWidth; - USHORT nRightBorderWidth; - USHORT nInhLeftBorderWidth; - USHORT nInhRightBorderWidth; - USHORT nBorderWidth; + sal_uInt16 nLeftBorderWidth; + sal_uInt16 nRightBorderWidth; + sal_uInt16 nInhLeftBorderWidth; + sal_uInt16 nInhRightBorderWidth; + sal_uInt16 nBorderWidth; - USHORT nDelayedResizeAbsAvail; // Param for delayed Resize. - USHORT nLastResizeAbsAvail; + sal_uInt16 nDelayedResizeAbsAvail; // Param for delayed Resize. + sal_uInt16 nLastResizeAbsAvail; - BYTE nPass1Done; // Reference-values for - BYTE nWidthSet; // the runs through loop. + sal_uInt8 nPass1Done; // Reference-values for + sal_uInt8 nWidthSet; // the runs through loop. SvxAdjust eTableAdjust; // Alignment of table. - BOOL bColsOption : 1; // Table has a COLS-option. - BOOL bColTags : 1; // Tabelle has COL/COLGRP-tags. - BOOL bPrcWidthOption : 1; // Width is given in percent. - BOOL bUseRelWidth : 1; // SwTable gets relative width. + sal_Bool bColsOption : 1; // Table has a COLS-option. + sal_Bool bColTags : 1; // Tabelle has COL/COLGRP-tags. + sal_Bool bPrcWidthOption : 1; // Width is given in percent. + sal_Bool bUseRelWidth : 1; // SwTable gets relative width. - BOOL bMustResize : 1; // Table width must be defined. - BOOL bExportable : 1; // Layout may be used for export. - BOOL bBordersChanged : 1; // Borders have been changed. - BOOL bMayBeInFlyFrame : 1; // Table could be within frame. + sal_Bool bMustResize : 1; // Table width must be defined. + sal_Bool bExportable : 1; // Layout may be used for export. + sal_Bool bBordersChanged : 1; // Borders have been changed. + sal_Bool bMayBeInFlyFrame : 1; // Table could be within frame. - BOOL bDelayedResizeRecalc : 1; // Param for delayed Resize. - BOOL bMustNotResize : 1; // Table may not be resized. - BOOL bMustNotRecalc : 1; // Table may not be adapted to its contents. + sal_Bool bDelayedResizeRecalc : 1; // Param for delayed Resize. + sal_Bool bMustNotResize : 1; // Table may not be resized. + sal_Bool bMustNotRecalc : 1; // Table may not be adapted to its contents. - void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin, - USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - void SetBoxWidth( SwTableBox *pBox, USHORT nCol, USHORT nColSpan ) const; + void AddBorderWidth( sal_uLong &rMin, sal_uLong &rMax, sal_uLong& rAbsMin, + sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + void SetBoxWidth( SwTableBox *pBox, sal_uInt16 nCol, sal_uInt16 nColSpan ) const; const SwStartNode *GetAnyBoxStartNode() const; SwFrmFmt *FindFlyFrmFmt() const; @@ -255,68 +255,68 @@ class SwHTMLTableLayout void ClearPass1Info() { nMin = nMax = 0; } - void _Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE ); + void _Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); DECL_STATIC_LINK( SwHTMLTableLayout, DelayedResize_Impl, void* ); - static USHORT GetBrowseWidthByVisArea( const SwDoc& rDoc ); + static sal_uInt16 GetBrowseWidthByVisArea( const SwDoc& rDoc ); public: SwHTMLTableLayout( const SwTable *pSwTbl, - USHORT nRows, USHORT nCols, BOOL bColsOpt, BOOL ColTgs, - USHORT nWidth, BOOL bPrcWidth, USHORT nBorderOpt, - USHORT nCellPad, USHORT nCellSp, SvxAdjust eAdjust, - USHORT nLMargin, USHORT nRMargin, USHORT nBWidth, - USHORT nLeftBWidth, USHORT nRightBWidth, - USHORT nInhLeftBWidth, USHORT nInhRightBWidth ); + sal_uInt16 nRows, sal_uInt16 nCols, sal_Bool bColsOpt, sal_Bool ColTgs, + sal_uInt16 nWidth, sal_Bool bPrcWidth, sal_uInt16 nBorderOpt, + sal_uInt16 nCellPad, sal_uInt16 nCellSp, SvxAdjust eAdjust, + sal_uInt16 nLMargin, sal_uInt16 nRMargin, sal_uInt16 nBWidth, + sal_uInt16 nLeftBWidth, sal_uInt16 nRightBWidth, + sal_uInt16 nInhLeftBWidth, sal_uInt16 nInhRightBWidth ); ~SwHTMLTableLayout(); - USHORT GetLeftCellSpace( USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - USHORT GetRightCellSpace( USHORT nCol, USHORT nColSpan, - BOOL bSwBorders=TRUE ) const; - inline USHORT GetInhCellSpace( USHORT nCol, USHORT nColSpan ) const; + sal_uInt16 GetLeftCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + sal_uInt16 GetRightCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan, + sal_Bool bSwBorders=sal_True ) const; + inline sal_uInt16 GetInhCellSpace( sal_uInt16 nCol, sal_uInt16 nColSpan ) const; - inline void SetInhBorderWidths( USHORT nLeft, USHORT nRight ); + inline void SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ); - void GetAvail( USHORT nCol, USHORT nColSpan, USHORT& rAbsAvail, - USHORT& rRelAvail ) const; + void GetAvail( sal_uInt16 nCol, sal_uInt16 nColSpan, sal_uInt16& rAbsAvail, + sal_uInt16& rRelAvail ) const; void AutoLayoutPass1(); - void AutoLayoutPass2( USHORT nAbsAvail, USHORT nRelAvail, - USHORT nAbsLeftSpace, USHORT nAbsRightSpace, - USHORT nParentInhSpace ); - void SetWidths( BOOL bCallPass2=FALSE, USHORT nAbsAvail=0, - USHORT nRelAvail=0, USHORT nAbsLeftSpace=0, - USHORT nAbsRightSpace=0, - USHORT nParentInhSpace=0 ); + void AutoLayoutPass2( sal_uInt16 nAbsAvail, sal_uInt16 nRelAvail, + sal_uInt16 nAbsLeftSpace, sal_uInt16 nAbsRightSpace, + sal_uInt16 nParentInhSpace ); + void SetWidths( sal_Bool bCallPass2=sal_False, sal_uInt16 nAbsAvail=0, + sal_uInt16 nRelAvail=0, sal_uInt16 nAbsLeftSpace=0, + sal_uInt16 nAbsRightSpace=0, + sal_uInt16 nParentInhSpace=0 ); - inline SwHTMLTableLayoutColumn *GetColumn( USHORT nCol ) const; - inline void SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol ); + inline SwHTMLTableLayoutColumn *GetColumn( sal_uInt16 nCol ) const; + inline void SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ); - inline SwHTMLTableLayoutCell *GetCell( USHORT nRow, USHORT nCol ) const; - inline void SetCell( SwHTMLTableLayoutCell *pCell, USHORT nRow, USHORT nCol ); + inline SwHTMLTableLayoutCell *GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const; + inline void SetCell( SwHTMLTableLayoutCell *pCell, sal_uInt16 nRow, sal_uInt16 nCol ); void SetLeftFillerBox( SwTableBox *pBox ) { pLeftFillerBox = pBox; } void SetRightFillerBox( SwTableBox *pBox ) { pRightFillerBox = pBox; } - ULONG GetMin() const { return nMin; } - ULONG GetMax() const { return nMax; } - USHORT GetRelLeftFill() const { return nRelLeftFill; } - USHORT GetRelRightFill() const { return nRelRightFill; } + sal_uLong GetMin() const { return nMin; } + sal_uLong GetMax() const { return nMax; } + sal_uInt16 GetRelLeftFill() const { return nRelLeftFill; } + sal_uInt16 GetRelRightFill() const { return nRelRightFill; } inline long GetBrowseWidthMin() const; - BOOL HasColsOption() const { return bColsOption; } - BOOL HasColTags() const { return bColTags; } + sal_Bool HasColsOption() const { return bColsOption; } + sal_Bool HasColTags() const { return bColTags; } - BOOL IsTopTable() const { return pSwTable != 0; } + sal_Bool IsTopTable() const { return pSwTable != 0; } - void SetMustResize( BOOL bSet ) { bMustResize = bSet; } - void SetMustNotResize( BOOL bSet ) { bMustNotResize = bSet; } - void SetMustNotRecalc( BOOL bSet ) { bMustNotRecalc = bSet; } + void SetMustResize( sal_Bool bSet ) { bMustResize = bSet; } + void SetMustNotResize( sal_Bool bSet ) { bMustNotResize = bSet; } + void SetMustNotRecalc( sal_Bool bSet ) { bMustNotRecalc = bSet; } // Recalculation of table widths for available width that has been passed. // - If bRecalc is set, contents of boxes are included into calculation. @@ -328,41 +328,41 @@ public: // - If nDelay == HTMLTABLE_RESIZE_NOW, resize immediately and do not // consider any resize-calls that might possibly be in order. // - The return value indicates whether the table has been changed. - BOOL Resize( USHORT nAbsAvail, BOOL bRecalc=FALSE, BOOL bForce=FALSE, - ULONG nDelay=0 ); + sal_Bool Resize( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False, sal_Bool bForce=sal_False, + sal_uLong nDelay=0 ); - void BordersChanged( USHORT nAbsAvail, BOOL bRecalc=FALSE ); + void BordersChanged( sal_uInt16 nAbsAvail, sal_Bool bRecalc=sal_False ); // Calculate available width. This works only if a layout or a // ViewShell exists. Otherwise returns 0. // This is needed by HTML-filter because it doesn't have access to the layout.) - static USHORT GetBrowseWidth( const SwDoc& rDoc ); + static sal_uInt16 GetBrowseWidth( const SwDoc& rDoc ); // Calculates available width by table-frame. - USHORT GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const; + sal_uInt16 GetBrowseWidthByTabFrm( const SwTabFrm& rTabFrm ) const; // Calculates available width by the table-frame or // static GetBrowseWidth if no layout exists. - USHORT GetBrowseWidthByTable( const SwDoc& rDoc ) const; + sal_uInt16 GetBrowseWidthByTable( const SwDoc& rDoc ) const; // For Export. - USHORT GetWidthOption() const { return nWidthOption; } - BOOL HasPrcWidthOption() const { return bPrcWidthOption; } + sal_uInt16 GetWidthOption() const { return nWidthOption; } + sal_Bool HasPrcWidthOption() const { return bPrcWidthOption; } - USHORT GetCellPadding() const { return nCellPadding; } - USHORT GetCellSpacing() const { return nCellSpacing; } - USHORT GetBorder() const { return nBorder; } + sal_uInt16 GetCellPadding() const { return nCellPadding; } + sal_uInt16 GetCellSpacing() const { return nCellSpacing; } + sal_uInt16 GetBorder() const { return nBorder; } - USHORT GetRowCount() const { return nRows; } - USHORT GetColCount() const { return nCols; } + sal_uInt16 GetRowCount() const { return nRows; } + sal_uInt16 GetColCount() const { return nCols; } - void SetExportable( BOOL bSet ) { bExportable = bSet; } - BOOL IsExportable() const { return bExportable; } + void SetExportable( sal_Bool bSet ) { bExportable = bSet; } + sal_Bool IsExportable() const { return bExportable; } - BOOL HaveBordersChanged() const { return bBordersChanged; } + sal_Bool HaveBordersChanged() const { return bBordersChanged; } - void SetMayBeInFlyFrame( BOOL bSet ) { bMayBeInFlyFrame = bSet; } - BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; } + void SetMayBeInFlyFrame( sal_Bool bSet ) { bMayBeInFlyFrame = bSet; } + sal_Bool MayBeInFlyFrame() const { return bMayBeInFlyFrame; } }; inline void SwHTMLTableLayoutCell::SetProtected() @@ -373,8 +373,8 @@ inline void SwHTMLTableLayoutCell::SetProtected() pContents = 0; } -inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin, - ULONG nCMax, ULONG nAbsMin ) +inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( sal_uLong nCMin, + sal_uLong nCMax, sal_uLong nAbsMin ) { if( nCMin > nMinNoAlign ) nMinNoAlign = nCMin; @@ -384,19 +384,19 @@ inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin, nAbsMinNoAlign = nAbsMin; } -inline void SwHTMLTableLayoutColumn::ClearPass1Info( BOOL bWidthOpt ) +inline void SwHTMLTableLayoutColumn::ClearPass1Info( sal_Bool bWidthOpt ) { nMinNoAlign = nMaxNoAlign = nAbsMinNoAlign = MINLAY; nMin = nMax = 0; if( bWidthOpt ) { nWidthOption = 0; - bRelWidthOption = FALSE; + bRelWidthOption = sal_False; } } inline void SwHTMLTableLayoutColumn::MergeCellWidthOption( - USHORT nWidth, BOOL bRel ) + sal_uInt16 nWidth, sal_Bool bRel ) { if( !nWidthOption || (bRel==bRelWidthOption && nWidthOption < nWidth) ) @@ -406,31 +406,31 @@ inline void SwHTMLTableLayoutColumn::MergeCellWidthOption( } } -inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx ) +inline void SwHTMLTableLayoutColumn::SetMinMax( sal_uLong nMn, sal_uLong nMx ) { nMin = nMn; nMax = nMx; } -inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol, - USHORT nColSpan ) const +inline sal_uInt16 SwHTMLTableLayout::GetInhCellSpace( sal_uInt16 nCol, + sal_uInt16 nColSpan ) const { - USHORT nSpace = 0; + sal_uInt16 nSpace = 0; if( nCol==0 ) - nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsLeftSpace); + nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsLeftSpace); if( nCol+nColSpan==nCols ) - nSpace = nSpace + sal::static_int_cast< USHORT >(nInhAbsRightSpace); + nSpace = nSpace + sal::static_int_cast< sal_uInt16 >(nInhAbsRightSpace); return nSpace; } -inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( USHORT nCol ) const +inline SwHTMLTableLayoutColumn *SwHTMLTableLayout::GetColumn( sal_uInt16 nCol ) const { return aColumns[nCol]; } inline void SwHTMLTableLayoutColumn::SetWidthOption( - USHORT nWidth, BOOL bRelWidth, BOOL bTest ) + sal_uInt16 nWidth, sal_Bool bRelWidth, sal_Bool bTest ) { if( bTest && bRelWidthOption==bRelWidth ) { @@ -442,18 +442,18 @@ inline void SwHTMLTableLayoutColumn::SetWidthOption( bRelWidthOption = bRelWidth; } -inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, USHORT nCol ) +inline void SwHTMLTableLayout::SetColumn( SwHTMLTableLayoutColumn *pCol, sal_uInt16 nCol ) { aColumns[nCol] = pCol; } -inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( USHORT nRow, USHORT nCol ) const +inline SwHTMLTableLayoutCell *SwHTMLTableLayout::GetCell( sal_uInt16 nRow, sal_uInt16 nCol ) const { return aCells[nRow*nCols+nCol]; } inline void SwHTMLTableLayout::SetCell( SwHTMLTableLayoutCell *pCell, - USHORT nRow, USHORT nCol ) + sal_uInt16 nRow, sal_uInt16 nCol ) { aCells[nRow*nCols+nCol] = pCell; } @@ -463,7 +463,7 @@ inline long SwHTMLTableLayout::GetBrowseWidthMin() const return (long)( (!nWidthOption || bPrcWidthOption) ? nMin : nRelTabWidth ); } -void SwHTMLTableLayout::SetInhBorderWidths( USHORT nLeft, USHORT nRight ) +void SwHTMLTableLayout::SetInhBorderWidths( sal_uInt16 nLeft, sal_uInt16 nRight ) { nInhLeftBorderWidth = nLeft; nInhRightBorderWidth = nRight; diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx index a04d550180b7..551e31df3af8 100644 --- a/sw/inc/index.hxx +++ b/sw/inc/index.hxx @@ -79,22 +79,22 @@ public: INLINE xub_StrLen operator+=( const SwIndex& ); INLINE xub_StrLen operator-=( const SwIndex& ); - INLINE BOOL operator<( const SwIndex& ) const; - INLINE BOOL operator<=( const SwIndex& ) const; - INLINE BOOL operator>( const SwIndex& ) const; - INLINE BOOL operator>=( const SwIndex& ) const; - BOOL operator==( const SwIndex& rSwIndex ) const + INLINE sal_Bool operator<( const SwIndex& ) const; + INLINE sal_Bool operator<=( const SwIndex& ) const; + INLINE sal_Bool operator>( const SwIndex& ) const; + INLINE sal_Bool operator>=( const SwIndex& ) const; + sal_Bool operator==( const SwIndex& rSwIndex ) const { return (nIndex == rSwIndex.nIndex) && (pArray == rSwIndex.pArray); } - BOOL operator!=( const SwIndex& rSwIndex ) const + sal_Bool operator!=( const SwIndex& rSwIndex ) const { return (nIndex != rSwIndex.nIndex) || (pArray != rSwIndex.pArray); } - BOOL operator<( xub_StrLen nWert ) const { return nIndex < nWert; } - BOOL operator<=( xub_StrLen nWert ) const { return nIndex <= nWert; } - BOOL operator>( xub_StrLen nWert ) const { return nIndex > nWert; } - BOOL operator>=( xub_StrLen nWert ) const { return nIndex >= nWert; } - BOOL operator==( xub_StrLen nWert ) const { return nIndex == nWert; } - BOOL operator!=( xub_StrLen nWert ) const { return nIndex != nWert; } + sal_Bool operator<( xub_StrLen nWert ) const { return nIndex < nWert; } + sal_Bool operator<=( xub_StrLen nWert ) const { return nIndex <= nWert; } + sal_Bool operator>( xub_StrLen nWert ) const { return nIndex > nWert; } + sal_Bool operator>=( xub_StrLen nWert ) const { return nIndex >= nWert; } + sal_Bool operator==( xub_StrLen nWert ) const { return nIndex == nWert; } + sal_Bool operator!=( xub_StrLen nWert ) const { return nIndex != nWert; } INLINE SwIndex& operator=( xub_StrLen ); SwIndex& operator=( const SwIndex & ); @@ -129,7 +129,7 @@ protected: void ChkArr(); - BOOL HasAnyIndex() const { return 0 != pFirst; } + sal_Bool HasAnyIndex() const { return 0 != pFirst; } public: SwIndexReg(); @@ -182,19 +182,19 @@ inline xub_StrLen SwIndex::operator-=( const SwIndex& rIndex ) return ChgValue( *this, nIndex - rIndex.nIndex ).nIndex; } -inline BOOL SwIndex::operator<( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator<( const SwIndex& rIndex ) const { return nIndex < rIndex.nIndex; } -inline BOOL SwIndex::operator<=( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator<=( const SwIndex& rIndex ) const { return nIndex <= rIndex.nIndex; } -inline BOOL SwIndex::operator>( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator>( const SwIndex& rIndex ) const { return nIndex > rIndex.nIndex; } -inline BOOL SwIndex::operator>=( const SwIndex& rIndex ) const +inline sal_Bool SwIndex::operator>=( const SwIndex& rIndex ) const { return nIndex >= rIndex.nIndex; } diff --git a/sw/inc/inetfld.hxx b/sw/inc/inetfld.hxx index e7206e2c8a33..8cb71f655f6b 100644 --- a/sw/inc/inetfld.hxx +++ b/sw/inc/inetfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _INETFLD_HXX -#define _INETFLD_HXX +#ifndef SW_INETFLD_HXX +#define SW_INETFLD_HXX #include "fldbas.hxx" @@ -67,15 +67,16 @@ class SwINetField : public SwField String sText; SvxMacroTableDtor* pMacroTbl; + virtual String Expand() const; + virtual SwField* Copy() const; + public: // Direct input, delete old value. - SwINetField( SwINetFieldType* pTyp, USHORT nFmt, + SwINetField( SwINetFieldType* pTyp, sal_uInt16 nFmt, const String& rURL, const String& rText ); virtual ~SwINetField(); - virtual String GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; // URL virtual const String& GetPar1() const; @@ -97,11 +98,11 @@ public: void SetMacroTbl( const SvxMacroTableDtor* pTbl = 0 ); const SvxMacroTableDtor* GetMacroTbl() const { return pMacroTbl; } - 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; }; -#endif // _INETFLD_HXX +#endif // SW_INETFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/io.hxx b/sw/inc/io.hxx index 7d1665c4f72b..832bd946b165 100644 --- a/sw/inc/io.hxx +++ b/sw/inc/io.hxx @@ -148,7 +148,7 @@ public: return aStr; } - BOOL Ok(); + sal_Bool Ok(); }; diff --git a/sw/inc/iodetect.hxx b/sw/inc/iodetect.hxx index 5ae24dc3041a..b16560ae9c9c 100644 --- a/sw/inc/iodetect.hxx +++ b/sw/inc/iodetect.hxx @@ -56,9 +56,9 @@ struct SwIoDetect { const sal_Char* pName; - USHORT nLen; + sal_uInt16 nLen; - inline SwIoDetect( const sal_Char *pN, USHORT nL ) + inline SwIoDetect( const sal_Char *pN, sal_uInt16 nL ) : pName( pN ), nLen( nL ) {} @@ -67,7 +67,7 @@ struct SwIoDetect return pName && rNm.EqualsAscii( pName, 0, nLen ); } - const sal_Char* IsReader( const sal_Char* pHeader, ULONG nLen_, + const sal_Char* IsReader( const sal_Char* pHeader, sal_uLong nLen_, const String &rFileName, const String& rUserData ) const; }; @@ -109,16 +109,16 @@ public: // Detect whether the given file is in the given format. // For now, only our own filters are supported! - static BOOL IsFileFilter( SfxMedium& rMedium, const String& rFmtName, + static sal_Bool IsFileFilter( SfxMedium& rMedium, const String& rFmtName, const SfxFilter** ppFlt = 0 ); - static BOOL IsValidStgFilter( SotStorage& , const SfxFilter& ); - static BOOL IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); + static sal_Bool IsValidStgFilter( SotStorage& , const SfxFilter& ); + static sal_Bool IsValidStgFilter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, const SfxFilter& rFilter); - static bool IsDetectableText( const sal_Char* pBuf, ULONG &rLen, + static bool IsDetectableText( const sal_Char* pBuf, sal_uLong &rLen, CharSet *pCharSet=0, bool *pSwap=0, LineEnd *pLineEnd=0, bool bEncodedFilter = false ); - static const SfxFilter* GetTextFilter( const sal_Char* pBuf, ULONG nLen ); + static const SfxFilter* GetTextFilter( const sal_Char* pBuf, sal_uLong nLen ); static const String GetSubStorageName( const SfxFilter& rFltr ); }; diff --git a/sw/inc/itabenum.hxx b/sw/inc/itabenum.hxx index a260659b2626..4c7af27a13f3 100644 --- a/sw/inc/itabenum.hxx +++ b/sw/inc/itabenum.hxx @@ -32,19 +32,19 @@ namespace tabopts { - const USHORT DEFAULT_BORDER = 0x01; - const USHORT HEADLINE = 0x02; - const USHORT SPLIT_LAYOUT = 0x08; - const USHORT HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT; - const USHORT ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT; + const sal_uInt16 DEFAULT_BORDER = 0x01; + const sal_uInt16 HEADLINE = 0x02; + const sal_uInt16 SPLIT_LAYOUT = 0x08; + const sal_uInt16 HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT; + const sal_uInt16 ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT; } struct SwInsertTableOptions { - USHORT mnInsMode; - USHORT mnRowsToRepeat; + sal_uInt16 mnInsMode; + sal_uInt16 mnRowsToRepeat; - SwInsertTableOptions( USHORT nInsMode, USHORT nRowsToRepeat ) : + SwInsertTableOptions( sal_uInt16 nInsMode, sal_uInt16 nRowsToRepeat ) : mnInsMode( nInsMode ), mnRowsToRepeat( nRowsToRepeat ) {}; }; diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx index 3aaca94d8b35..17f78e950ce5 100644 --- a/sw/inc/lineinfo.hxx +++ b/sw/inc/lineinfo.hxx @@ -48,15 +48,15 @@ class SW_DLLPUBLIC SwLineNumberInfo : public SwClient //purpose of derivation fr { SvxNumberType aType; //e.g. roman linenumbers String aDivider; //String for aditional interval (vert. lines user defined) - USHORT nPosFromLeft; //Position for paint - USHORT nCountBy; //Paint only for every n line - USHORT nDividerCountBy; //Interval for display of an user defined + sal_uInt16 nPosFromLeft; //Position for paint + sal_uInt16 nCountBy; //Paint only for every n line + sal_uInt16 nDividerCountBy; //Interval for display of an user defined //string every n lines LineNumberPosition ePos; //Where should the display occur (number and divicer) - BOOL bPaintLineNumbers; //Should anything be displayed? - BOOL bCountBlankLines; //Count empty lines? - BOOL bCountInFlys; //Count also within FlyFrames? - BOOL bRestartEachPage; //Restart counting at the first paragraph of each page + sal_Bool bPaintLineNumbers; //Should anything be displayed? + sal_Bool bCountBlankLines; //Count empty lines? + sal_Bool bCountInFlys; //Count also within FlyFrames? + sal_Bool bRestartEachPage; //Restart counting at the first paragraph of each page //(even on follows when paragraphs are splitted) public: @@ -64,7 +64,7 @@ public: SwLineNumberInfo(const SwLineNumberInfo&); SwLineNumberInfo& operator=(const SwLineNumberInfo&); - BOOL operator==( const SwLineNumberInfo& rInf ) const; + sal_Bool operator==( const SwLineNumberInfo& rInf ) const; SwCharFmt *GetCharFmt( IDocumentStylePoolAccess& rIDSPA ) const; void SetCharFmt( SwCharFmt* ); @@ -74,29 +74,29 @@ public: const String &GetDivider() const { return aDivider; } void SetDivider( const String &r ) { aDivider = r; } - USHORT GetDividerCountBy() const { return nDividerCountBy; } - void SetDividerCountBy( USHORT n ) { nDividerCountBy = n; } + sal_uInt16 GetDividerCountBy() const { return nDividerCountBy; } + void SetDividerCountBy( sal_uInt16 n ) { nDividerCountBy = n; } - USHORT GetPosFromLeft() const { return nPosFromLeft; } - void SetPosFromLeft( USHORT n) { nPosFromLeft = n; } + sal_uInt16 GetPosFromLeft() const { return nPosFromLeft; } + void SetPosFromLeft( sal_uInt16 n) { nPosFromLeft = n; } - USHORT GetCountBy() const { return nCountBy; } - void SetCountBy( USHORT n) { nCountBy = n; } + sal_uInt16 GetCountBy() const { return nCountBy; } + void SetCountBy( sal_uInt16 n) { nCountBy = n; } LineNumberPosition GetPos() const { return ePos; } void SetPos( LineNumberPosition eP ){ ePos = eP; } - BOOL IsPaintLineNumbers() const { return bPaintLineNumbers; } - void SetPaintLineNumbers( BOOL b ){ bPaintLineNumbers = b; } + sal_Bool IsPaintLineNumbers() const { return bPaintLineNumbers; } + void SetPaintLineNumbers( sal_Bool b ){ bPaintLineNumbers = b; } - BOOL IsCountBlankLines() const { return bCountBlankLines; } - void SetCountBlankLines( BOOL b ) { bCountBlankLines = b; } + sal_Bool IsCountBlankLines() const { return bCountBlankLines; } + void SetCountBlankLines( sal_Bool b ) { bCountBlankLines = b; } - BOOL IsCountInFlys() const { return bCountInFlys; } - void SetCountInFlys( BOOL b ) { bCountInFlys = b; } + sal_Bool IsCountInFlys() const { return bCountInFlys; } + void SetCountInFlys( sal_Bool b ) { bCountInFlys = b; } - BOOL IsRestartEachPage() const { return bRestartEachPage; } - void SetRestartEachPage( BOOL b ) { bRestartEachPage = b; } + sal_Bool IsRestartEachPage() const { return bRestartEachPage; } + void SetRestartEachPage( sal_Bool b ) { bRestartEachPage = b; } virtual void Modify( SfxPoolItem*, SfxPoolItem* ); }; diff --git a/sw/inc/list.hxx b/sw/inc/list.hxx index 659d9c119242..5629540126ee 100644 --- a/sw/inc/list.hxx +++ b/sw/inc/list.hxx @@ -57,7 +57,7 @@ class SwList void ValidateListTree(); void MarkListLevel( const int nListLevel, - const BOOL bValue ); + const sal_Bool bValue ); bool IsListLevelMarked( const int nListLevel ) const; diff --git a/sw/inc/makefile.mk b/sw/inc/makefile.mk deleted file mode 100644 index b5efd14c8164..000000000000 --- a/sw/inc/makefile.mk +++ /dev/null @@ -1,49 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* -PRJ=.. - -PRJNAME=sw -TARGET=inc - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- -# --- Targets ------------------------------------------------------- - -.INCLUDE : target.mk - -.IF "$(ENABLE_PCH)"!="" # && ( "$(PRJNAME)"!="sw" || "$(BUILD_SPECIAL)"!="TRUE" ) -ALLTAR : \ - $(SLO)$/precompiled.pch \ - $(SLO)$/precompiled_ex.pch - -.ENDIF # "$(ENABLE_PCH)"!="" - diff --git a/sw/inc/mdiexp.hxx b/sw/inc/mdiexp.hxx index 3a4132f77ad7..e7af13ecdf54 100644 --- a/sw/inc/mdiexp.hxx +++ b/sw/inc/mdiexp.hxx @@ -41,26 +41,26 @@ class ViewShell; class SwDoc; class SwDocShell; -extern void ScrollMDI(ViewShell* pVwSh, const SwRect &, USHORT nRangeX, USHORT nRangeY); -extern BOOL IsScrollMDI(ViewShell* pVwSh, const SwRect &); +extern void ScrollMDI(ViewShell* pVwSh, const SwRect &, sal_uInt16 nRangeX, sal_uInt16 nRangeY); +extern sal_Bool IsScrollMDI(ViewShell* pVwSh, const SwRect &); extern void SizeNotify(ViewShell* pVwSh, const Size &); // Update of status bar during an action. extern void PageNumNotify( ViewShell* pVwSh, - USHORT nPhyNum, - USHORT nVirtNum, + sal_uInt16 nPhyNum, + sal_uInt16 nVirtNum, const UniString& rPg ); enum FlyMode { FLY_DRAG_START, FLY_DRAG, FLY_DRAG_END }; extern void FrameNotify( ViewShell* pVwSh, FlyMode eMode = FLY_DRAG ); -SW_DLLPUBLIC void StartProgress ( USHORT nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 ); +SW_DLLPUBLIC void StartProgress ( sal_uInt16 nMessId, long nStartVal, long nEndVal, SwDocShell *pDocSh = 0 ); SW_DLLPUBLIC void EndProgress ( SwDocShell *pDocSh = 0 ); SW_DLLPUBLIC void SetProgressState ( long nPosition, SwDocShell *pDocShell ); -void SetProgressText ( USHORT nMessId, SwDocShell *pDocShell ); +void SetProgressText ( sal_uInt16 nMessId, SwDocShell *pDocShell ); void RescheduleProgress( SwDocShell *pDocShell ); -void EnableCmdInterface(BOOL bEnable = TRUE); +void EnableCmdInterface(sal_Bool bEnable = sal_True); LAYOUT_NS Dialog* GetSearchDialog(); @@ -73,7 +73,7 @@ void DelAllGrfCacheEntries( SwDoc* pDoc ); // Read ChgMode for tables from configuration. TblChgMode GetTblChgDefaultMode(); -BOOL JumpToSwMark( ViewShell* pVwSh, const UniString& rMark ); +sal_Bool JumpToSwMark( ViewShell* pVwSh, const UniString& rMark ); #endif diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx index 5081d3ad76e2..e45a3e39657f 100644 --- a/sw/inc/modcfg.hxx +++ b/sw/inc/modcfg.hxx @@ -29,7 +29,7 @@ #define _MODOPT_HXX #include <tools/string.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/field.hxx> #include <svl/svarray.hxx> #include <unotools/configitem.hxx> @@ -63,7 +63,7 @@ class SwRevisionConfig : public utl::ConfigItem //Revision/TextDisplay/Delete/Color AuthorCharAttr aFormatAttr; //Revision/TextDisplay/ChangeAttribute/Attribute //Revision/TextDisplay/ChangeAttribute/Color - USHORT nMarkAlign; //Revision/LinesChanged/Mark + sal_uInt16 nMarkAlign; //Revision/LinesChanged/Mark Color aMarkColor; //Revision/LinesChanged/Color const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames(); @@ -107,10 +107,10 @@ class SwTableConfig : public utl::ConfigItem { friend class SwModuleOptions; - USHORT nTblHMove; //int Table/Shift/Row - USHORT nTblVMove; //int Table/Shift/Column - USHORT nTblHInsert; //int Table/Insert/Row - USHORT nTblVInsert; //int Table/Insert/Column + sal_uInt16 nTblHMove; //int Table/Shift/Row + sal_uInt16 nTblVMove; //int Table/Shift/Column + sal_uInt16 nTblHInsert; //int Table/Insert/Row + sal_uInt16 nTblVInsert; //int Table/Insert/Column TblChgMode eTblChgMode; //int Table/Change/Effect sal_Bool bInsTblFormatNum; // Table/Input/NumberRecognition // Automatic recognition of numbers. @@ -133,13 +133,13 @@ class SwMiscConfig : public utl::ConfigItem friend class SwModuleOptions; String sWordDelimiter; // Statistics/WordNumber/Delimiter - BOOL bDefaultFontsInCurrDocOnly; // DefaultFont/Document - BOOL bShowIndexPreview ; // Index/ShowPreview - BOOL bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink - BOOL bNumAlignSize; // Numbering/Graphic/KeepRatio - BOOL bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs - BOOL bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation - BOOL bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' + sal_Bool bDefaultFontsInCurrDocOnly; // DefaultFont/Document + sal_Bool bShowIndexPreview ; // Index/ShowPreview + sal_Bool bGrfToGalleryAsLnk; // Misc/GraphicToGalleryAsLink + sal_Bool bNumAlignSize; // Numbering/Graphic/KeepRatio + sal_Bool bSinglePrintJob; // FormLetter/PrintOutput/SinglePrintJobs + sal_Bool bIsNameFromColumn; // FormLetter/FileOutput/FileName/Generation + sal_Bool bAskForMailMergeInPrint; // Ask if documents containing fields should be 'mailmerged' sal_Int16 nMailingFormats; // FormLetter/MailingOutput/Formats String sNameFromColumn; // FormLetter/FileOutput/FileName/FromDatabaseField (string!) String sMailingPath; // FormLetter/FileOutput/Path @@ -168,7 +168,7 @@ class SW_DLLPUBLIC SwModuleOptions SwMiscConfig aMiscConfig; //fiscus: don't show tips of text fields - it's not part of the configuration! - BOOL bHideFieldTips : 1; + sal_Bool bHideFieldTips : 1; public: SwModuleOptions(); @@ -177,20 +177,20 @@ public: void SetTblMode( TblChgMode eSet ) { aTableConfig.eTblChgMode = eSet; aTableConfig.SetModified();} - USHORT GetTblHMove() const { return aTableConfig.nTblHMove;} - void SetTblHMove( USHORT nSet ) { aTableConfig.nTblHMove = nSet; + sal_uInt16 GetTblHMove() const { return aTableConfig.nTblHMove;} + void SetTblHMove( sal_uInt16 nSet ) { aTableConfig.nTblHMove = nSet; aTableConfig.SetModified();} - USHORT GetTblVMove() const { return aTableConfig.nTblVMove;} - void SetTblVMove( USHORT nSet ) { aTableConfig.nTblVMove = nSet; + sal_uInt16 GetTblVMove() const { return aTableConfig.nTblVMove;} + void SetTblVMove( sal_uInt16 nSet ) { aTableConfig.nTblVMove = nSet; aTableConfig.SetModified();} - USHORT GetTblHInsert() const {return aTableConfig.nTblHInsert;} - void SetTblHInsert( USHORT nSet ) { aTableConfig.nTblHInsert = nSet; + sal_uInt16 GetTblHInsert() const {return aTableConfig.nTblHInsert;} + void SetTblHInsert( sal_uInt16 nSet ) { aTableConfig.nTblHInsert = nSet; aTableConfig.SetModified();} - USHORT GetTblVInsert() const {return aTableConfig.nTblVInsert;} - void SetTblVInsert( USHORT nSet ) { aTableConfig.nTblVInsert = nSet; + sal_uInt16 GetTblVInsert() const {return aTableConfig.nTblVInsert;} + void SetTblVInsert( sal_uInt16 nSet ) { aTableConfig.nTblVInsert = nSet; aTableConfig.SetModified();} const AuthorCharAttr &GetInsertAuthorAttr() const { return aRevisionConfig.aInsertAttr; } @@ -205,17 +205,17 @@ public: void SetFormatAuthorAttr( AuthorCharAttr &rAttr ) { aRevisionConfig.aFormatAttr = rAttr; aRevisionConfig.SetModified();} - USHORT GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; } - void SetMarkAlignMode(USHORT nMode) { aRevisionConfig.nMarkAlign = nMode; + sal_uInt16 GetMarkAlignMode() const { return aRevisionConfig.nMarkAlign; } + void SetMarkAlignMode(sal_uInt16 nMode) { aRevisionConfig.nMarkAlign = nMode; aRevisionConfig.SetModified();} const Color& GetMarkAlignColor() const { return aRevisionConfig.aMarkColor; } void SetMarkAlignColor(const Color &rColor) { aRevisionConfig.aMarkColor = rColor; aRevisionConfig.SetModified();} - BOOL IsInsWithCaption(BOOL bHTML) const - { return bHTML ? FALSE : aInsertConfig.bInsWithCaption; } - void SetInsWithCaption( BOOL bHTML, BOOL b ) + sal_Bool IsInsWithCaption(sal_Bool bHTML) const + { return bHTML ? sal_False : aInsertConfig.bInsWithCaption; } + void SetInsWithCaption( sal_Bool bHTML, sal_Bool b ) { if(!bHTML) aInsertConfig.bInsWithCaption = b; aInsertConfig.SetModified();} @@ -230,60 +230,60 @@ public: } } - BOOL IsInsTblFormatNum(BOOL bHTML) const + sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblFormatNum : aTableConfig.bInsTblFormatNum; } - void SetInsTblFormatNum( BOOL bHTML, BOOL b ) + void SetInsTblFormatNum( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblFormatNum = b) : (aTableConfig.bInsTblFormatNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - BOOL IsInsTblChangeNumFormat(BOOL bHTML) const + sal_Bool IsInsTblChangeNumFormat(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblChangeNumFormat : aTableConfig.bInsTblChangeNumFormat; } - void SetInsTblChangeNumFormat( BOOL bHTML, BOOL b ) + void SetInsTblChangeNumFormat( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblChangeNumFormat = b) : (aTableConfig.bInsTblChangeNumFormat = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();} - BOOL IsInsTblAlignNum(BOOL bHTML) const + sal_Bool IsInsTblAlignNum(sal_Bool bHTML) const { return bHTML ? aWebTableConfig.bInsTblAlignNum : aTableConfig.bInsTblAlignNum; } - void SetInsTblAlignNum( BOOL bHTML, BOOL b ) + void SetInsTblAlignNum( sal_Bool bHTML, sal_Bool b ) { bHTML ? (aWebTableConfig.bInsTblAlignNum = b) : (aTableConfig.bInsTblAlignNum = b); bHTML ? aWebTableConfig.SetModified() : aTableConfig.SetModified();;} - SwInsertTableOptions GetInsTblFlags(BOOL bHTML) const + SwInsertTableOptions GetInsTblFlags(sal_Bool bHTML) const { return bHTML ? aWebInsertConfig.aInsTblOpts : aInsertConfig.aInsTblOpts;} - void SetInsTblFlags( BOOL bHTML, const SwInsertTableOptions& rOpts ) { + void SetInsTblFlags( sal_Bool bHTML, const SwInsertTableOptions& rOpts ) { bHTML ? (aWebInsertConfig.aInsTblOpts = rOpts) : (aInsertConfig.aInsTblOpts = rOpts); bHTML ? aWebInsertConfig.SetModified() : aInsertConfig.SetModified();} - const InsCaptionOpt* GetCapOption(BOOL bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); - BOOL SetCapOption(BOOL bHTML, const InsCaptionOpt* pOpt); + const InsCaptionOpt* GetCapOption(sal_Bool bHTML, const SwCapObjType eType, const SvGlobalName *pOleId); + sal_Bool SetCapOption(sal_Bool bHTML, const InsCaptionOpt* pOpt); - BOOL IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } - void SetGrfToGalleryAsLnk( BOOL b ) { aMiscConfig.bGrfToGalleryAsLnk = b; + sal_Bool IsGrfToGalleryAsLnk() const { return aMiscConfig.bGrfToGalleryAsLnk; } + void SetGrfToGalleryAsLnk( sal_Bool b ) { aMiscConfig.bGrfToGalleryAsLnk = b; aMiscConfig.SetModified();} sal_Int16 GetMailingFormats() const { return aMiscConfig.nMailingFormats;} void SetMailingFormats( sal_Int16 nSet ) { aMiscConfig.nMailingFormats = nSet; aMiscConfig.SetModified();} - BOOL IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } - void SetSinglePrintJob( BOOL b ) { aMiscConfig.bSinglePrintJob = b; + sal_Bool IsSinglePrintJob() const { return aMiscConfig.bSinglePrintJob; } + void SetSinglePrintJob( sal_Bool b ) { aMiscConfig.bSinglePrintJob = b; aMiscConfig.SetModified();} - BOOL IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } - void SetNumAlignSize( BOOL b ) { aMiscConfig.bNumAlignSize = b; + sal_Bool IsNumAlignSize() const { return aMiscConfig.bNumAlignSize; } + void SetNumAlignSize( sal_Bool b ) { aMiscConfig.bNumAlignSize = b; aMiscConfig.SetModified();} - BOOL IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } - void SetIsNameFromColumn( BOOL bSet ) + sal_Bool IsNameFromColumn() const { return aMiscConfig.bIsNameFromColumn; } + void SetIsNameFromColumn( sal_Bool bSet ) { aMiscConfig.SetModified(); aMiscConfig.bIsNameFromColumn = bSet; } - BOOL IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} - void SetAskForMailMerge(BOOL bSet) + sal_Bool IsAskForMailMerge() const { return aMiscConfig.bAskForMailMergeInPrint;} + void SetAskForMailMerge(sal_Bool bSet) { aMiscConfig.SetModified(); aMiscConfig.bAskForMailMergeInPrint = bSet; @@ -307,22 +307,22 @@ public: aMiscConfig.SetModified();} //convert word delimiter from or to user interface - static String ConvertWordDelimiter(const String& rDelim, BOOL bFromUI); + static String ConvertWordDelimiter(const String& rDelim, sal_Bool bFromUI); - BOOL IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} - void SetShowIndexPreview(BOOL bSet) + sal_Bool IsShowIndexPreview() const {return aMiscConfig.bShowIndexPreview;} + void SetShowIndexPreview(sal_Bool bSet) {aMiscConfig.bShowIndexPreview = bSet; aMiscConfig.SetModified();} - BOOL IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} - void SetDefaultFontInCurrDocOnly(BOOL bSet) + sal_Bool IsDefaultFontInCurrDocOnly() const { return aMiscConfig.bDefaultFontsInCurrDocOnly;} + void SetDefaultFontInCurrDocOnly(sal_Bool bSet) { aMiscConfig.bDefaultFontsInCurrDocOnly = bSet; aMiscConfig.SetModified(); } - BOOL IsHideFieldTips() const {return bHideFieldTips;} - void SetHideFieldTips(BOOL bSet) {bHideFieldTips = bSet;} + sal_Bool IsHideFieldTips() const {return bHideFieldTips;} + void SetHideFieldTips(sal_Bool bSet) {bHideFieldTips = bSet;} }; #endif diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index a2f24ff53506..71c447ab7c0b 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -31,6 +31,8 @@ #include <vector> +#include <boost/utility.hpp> + #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <svl/svarray.hxx> @@ -77,11 +79,13 @@ struct SwPosition; // -------------------- typedef SwNode * SwNodePtr; -typedef BOOL (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); +typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs ); SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0, 10 ) -class SW_DLLPUBLIC SwNodes: private BigPtrArray +class SW_DLLPUBLIC SwNodes + : private BigPtrArray + , private ::boost::noncopyable { friend class SwDoc; friend class SwNode; @@ -92,7 +96,7 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray void InsertNode( const SwNodePtr pNode, const SwNodeIndex& rPos ); void InsertNode( const SwNodePtr pNode, - ULONG nPos ); + sal_uLong nPos ); SwDoc* pMyDoc; // This Doc contains the nodes-array. @@ -102,27 +106,27 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray mutable SwOutlineNodes* pOutlineNds; // Array of all outline nodes. - BOOL bInNodesDel : 1; // In Case of recursive calling. + sal_Bool bInNodesDel : 1; // In Case of recursive calling. // Do not update Num/Outline. - BOOL bInDelUpdOutl : 1; // Flag for updating of Outline. - BOOL bInDelUpdNum : 1; // Flag for updating of Outline. + sal_Bool bInDelUpdOutl : 1; // Flag for updating of Outline. + sal_Bool bInDelUpdNum : 1; // Flag for updating of Outline. // For administering indices. void RegisterIndex( SwNodeIndex& rIdx ); void DeRegisterIndex( SwNodeIndex& rIdx ); - void RemoveNode( ULONG nDelPos, ULONG nLen, BOOL bDel ); + void RemoveNode( sal_uLong nDelPos, sal_uLong nLen, sal_Bool bDel ); // Actions on the nodes. void SectionUpDown( const SwNodeIndex & aStart, const SwNodeIndex & aEnd ); - void DelNodes( const SwNodeIndex& rStart, ULONG nCnt = 1 ); + void DelNodes( const SwNodeIndex& rStart, sal_uLong nCnt = 1 ); - void ChgNode( SwNodeIndex& rDelPos, ULONG nSize, - SwNodeIndex& rInsPos, BOOL bNewFrms ); + void ChgNode( SwNodeIndex& rDelPos, sal_uLong nSize, + SwNodeIndex& rInsPos, sal_Bool bNewFrms ); void UpdtOutlineIdx( const SwNode& ); // Update all OutlineNodes starting from Node. void _CopyNodes( const SwNodeRange&, const SwNodeIndex&, - BOOL bNewFrms = TRUE, BOOL bTblInsDummyNode = FALSE ) const; + sal_Bool bNewFrms = sal_True, sal_Bool bTblInsDummyNode = sal_False ) const; void _DelDummyNodes( const SwNodeRange& rRg ); protected: @@ -134,20 +138,16 @@ public: typedef ::std::vector<SwNodeRange> NodeRanges_t; typedef ::std::vector<NodeRanges_t> TableRanges_t; - SwNodePtr operator[]( ULONG n ) const + SwNodePtr operator[]( sal_uLong n ) const { return (SwNodePtr)BigPtrArray::operator[] ( n ); } - // Implementaition in ndindex.hxx - it should be adapted to the - // new interface as soon as possible. - inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const; - - ULONG Count() const { return BigPtrArray::Count(); } + sal_uLong Count() const { return BigPtrArray::Count(); } void ForEach( FnForEach_SwNodes fnForEach, void* pArgs = 0 ) { BigPtrArray::ForEach( 0, BigPtrArray::Count(), (FnForEach) fnForEach, pArgs ); } - void ForEach( ULONG nStt, ULONG nEnd, FnForEach_SwNodes fnForEach, void* pArgs = 0 ) + void ForEach( sal_uLong nStt, sal_uLong nEnd, FnForEach_SwNodes fnForEach, void* pArgs = 0 ) { BigPtrArray::ForEach( nStt, nEnd, (FnForEach) fnForEach, pArgs ); } @@ -170,23 +170,23 @@ public: // Is the NodesArray the regular one of Doc? (and not the UndoNds, ...) // Implementation in doc.hxx (because one needs to know Doc for it) ! - BOOL IsDocNodes() const; + sal_Bool IsDocNodes() const; - USHORT GetSectionLevel(const SwNodeIndex &rIndex) const; - void Delete(const SwNodeIndex &rPos, ULONG nNodes = 1); + sal_uInt16 GetSectionLevel(const SwNodeIndex &rIndex) const; + void Delete(const SwNodeIndex &rPos, sal_uLong nNodes = 1); - BOOL _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, - BOOL bNewFrms = TRUE ); + sal_Bool _MoveNodes( const SwNodeRange&, SwNodes& rNodes, const SwNodeIndex&, + sal_Bool bNewFrms = sal_True ); void MoveRange( SwPaM&, SwPosition&, SwNodes& rNodes ); void _Copy( const SwNodeRange& rRg, const SwNodeIndex& rInsPos, - BOOL bNewFrms = TRUE ) const + sal_Bool bNewFrms = sal_True ) const { _CopyNodes( rRg, rInsPos, bNewFrms ); } void SectionUp( SwNodeRange *); void SectionDown( SwNodeRange *pRange, SwStartNodeType = SwNormalStartNode ); - BOOL CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; + sal_Bool CheckNodesRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd ) const; void GoStartOfSection(SwNodeIndex *) const; void GoEndOfSection(SwNodeIndex *) const; @@ -201,10 +201,10 @@ public: // Go to next content-node that is not protected or hidden // (Both set FALSE ==> GoNext/GoPrevious!!!). - SwCntntNode* GoNextSection( SwNodeIndex *, int bSkipHidden = TRUE, - int bSkipProtect = TRUE ) const; - SwCntntNode* GoPrevSection( SwNodeIndex *, int bSkipHidden = TRUE, - int bSkipProtect = TRUE ) const; + SwCntntNode* GoNextSection( SwNodeIndex *, int bSkipHidden = sal_True, + int bSkipProtect = sal_True ) const; + SwCntntNode* GoPrevSection( SwNodeIndex *, int bSkipHidden = sal_True, + int bSkipProtect = sal_True ) const; // Create an empty section of Start- and EndNote. It may be called // only if a new section with content is to be created, @@ -227,7 +227,7 @@ public: const Graphic* pGraphic, SwGrfFmtColl *pColl, SwAttrSet* pAutoAttr = 0, - BOOL bDelayed = FALSE ); // in ndgrf.cxx + sal_Bool bDelayed = sal_False ); // in ndgrf.cxx SwGrfNode *MakeGrfNode( const SwNodeIndex & rWhere, const GraphicObject& rGrfObj, @@ -247,7 +247,7 @@ public: // Array of all OutlineNodes. const SwOutlineNodes& GetOutLineNds() const; - // void UpdateOutlineNode( const SwNode&, BYTE nOldLevel, BYTE nNewLevel );//#outline level,removed by zhaojianwei + //void UpdateOutlineNode( const SwNode&, sal_uInt8 nOldLevel, sal_uInt8 nNewLevel );//#outline level,removed by zhaojianwei // Update all Nodes - Rule/Format-Change. void UpdateOutlineNode(SwNode & rNd); @@ -261,8 +261,8 @@ public: // overrides the item in pAttrSet. SwTableNode* InsertTable( const SwNodeIndex& rNdIdx, - USHORT nBoxes, SwTxtFmtColl* pCntntTxtColl, - USHORT nLines = 0, USHORT nRepeat = 0, + sal_uInt16 nBoxes, SwTxtFmtColl* pCntntTxtColl, + sal_uInt16 nLines = 0, sal_uInt16 nRepeat = 0, SwTxtFmtColl* pHeadlineTxtColl = 0, const SwAttrSet * pAttrSet = 0); @@ -286,30 +286,30 @@ public: // Create regular text from what was table. - BOOL TableToText( const SwNodeRange& rRange, sal_Unicode cCh, + sal_Bool TableToText( const SwNodeRange& rRange, sal_Unicode cCh, SwUndoTblToTxt* = 0 ); // Is in untbl.cxx and may called only by Undo-object. - SwTableNode* UndoTableToText( ULONG nStt, ULONG nEnd, + SwTableNode* UndoTableToText( sal_uLong nStt, sal_uLong nEnd, const SwTblToTxtSaves& rSavedData ); // Insert a new box in the line before InsPos. Its format // is taken from the following one (or from the previous one if we are // at the end). In the line there must be a box already. - BOOL InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, + sal_Bool InsBoxen( SwTableNode*, SwTableLine*, SwTableBoxFmt*, // Formats for TextNode of box. SwTxtFmtColl*, const SfxItemSet* pAutoAttr, - USHORT nInsPos, USHORT nCnt = 1 ); + sal_uInt16 nInsPos, sal_uInt16 nCnt = 1 ); // Splits a table at the base-line which contains the index. // All base lines behind it are moved to a new table/ -node. // Is the flag bCalcNewSize set to TRUE, the new SSize for both // tables is calculated from the Maximum of the boxes, provided // SSize is set "absolute" (LONG_MAX). // (Momentarily this is needed only for the RTF-parser.) - SwTableNode* SplitTable( const SwNodeIndex& rPos, BOOL bAfter = TRUE, - BOOL bCalcNewSize = FALSE ); + SwTableNode* SplitTable( const SwNodeIndex& rPos, sal_Bool bAfter = sal_True, + sal_Bool bCalcNewSize = sal_False ); // Two Tables that are following one another are merged. - BOOL MergeTable( const SwNodeIndex& rPos, BOOL bWithPrev = TRUE, - USHORT nMode = 0, SwHistory* pHistory = 0 ); + sal_Bool MergeTable( const SwNodeIndex& rPos, sal_Bool bWithPrev = sal_True, + sal_uInt16 nMode = 0, SwHistory* pHistory = 0 ); // Insert a new SwSection. SwSectionNode* InsertTextSection(SwNodeIndex const& rNdIdx, @@ -333,9 +333,6 @@ public: SwNode * DocumentSectionStartNode(SwNode * pNode) const; SwNode * DocumentSectionEndNode(SwNode * pNode) const; -private: - // Private constructor because copying is never allowed!! - SwNodes( const SwNodes & rNodes ); }; #endif diff --git a/sw/inc/ndgrf.hxx b/sw/inc/ndgrf.hxx index a50a8b8434ba..2dbcdea62697 100644 --- a/sw/inc/ndgrf.hxx +++ b/sw/inc/ndgrf.hxx @@ -51,15 +51,15 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode String aNewStrmName; // SW3/XML: new stream name (either SW3 stream // name or package url) String aLowResGrf; // HTML: LowRes graphics (substitute until regular HighRes graphics is loaded). - BOOL bTransparentFlagValid :1; - BOOL bInSwapIn :1; + sal_Bool bTransparentFlagValid :1; + sal_Bool bInSwapIn :1; - BOOL bGrafikArrived :1; - BOOL bChgTwipSize :1; - BOOL bChgTwipSizeFromPixel :1; - BOOL bLoadLowResGrf :1; - BOOL bFrameInPaint :1; // To avoid Start-/EndActions in Paint via SwapIn. - BOOL bScaleImageMap :1; // Scale image map in SetTwipSize. + sal_Bool bGrafikArrived :1; + sal_Bool bChgTwipSize :1; + sal_Bool bChgTwipSizeFromPixel :1; + sal_Bool bLoadLowResGrf :1; + sal_Bool bFrameInPaint :1; // To avoid Start-/EndActions in Paint via SwapIn. + sal_Bool bScaleImageMap :1; // Scale image map in SetTwipSize. boost::shared_ptr< SwAsyncRetrieveInputStreamThreadConsumer > mpThreadConsumer; bool mbLinkedInputStreamReady; @@ -82,8 +82,8 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode SwAttrSet* pAutoAttr = 0 ); void InsertLink( const String& rGrfName, const String& rFltName ); - BOOL ImportGraphic( SvStream& rStrm ); - BOOL HasStreamName() const { return aGrfObj.HasUserData(); } + sal_Bool ImportGraphic( SvStream& rStrm ); + sal_Bool HasStreamName() const { return aGrfObj.HasUserData(); } // adjust return type and rename method to // indicate that its an private one. @@ -145,22 +145,22 @@ public: #ifndef _FESHVIEW_ONLY_INLINE_NEEDED void SetTwipSize( const Size& rSz ); - BOOL IsTransparent() const; + sal_Bool IsTransparent() const; - inline BOOL IsAnimated() const { return aGrfObj.IsAnimated(); } + inline sal_Bool IsAnimated() const { return aGrfObj.IsAnimated(); } - inline BOOL IsChgTwipSize() const { return bChgTwipSize; } - inline BOOL IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } - inline void SetChgTwipSize( BOOL b, BOOL bFromPx=FALSE ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } + inline sal_Bool IsChgTwipSize() const { return bChgTwipSize; } + inline sal_Bool IsChgTwipSizeFromPixel() const { return bChgTwipSizeFromPixel; } + inline void SetChgTwipSize( sal_Bool b, sal_Bool bFromPx=sal_False ) { bChgTwipSize = b; bChgTwipSizeFromPixel = bFromPx; } - inline BOOL IsGrafikArrived() const { return bGrafikArrived; } - inline void SetGrafikArrived( BOOL b ) { bGrafikArrived = b; } + inline sal_Bool IsGrafikArrived() const { return bGrafikArrived; } + inline void SetGrafikArrived( sal_Bool b ) { bGrafikArrived = b; } - inline BOOL IsFrameInPaint() const { return bFrameInPaint; } - inline void SetFrameInPaint( BOOL b ) { bFrameInPaint = b; } + inline sal_Bool IsFrameInPaint() const { return bFrameInPaint; } + inline void SetFrameInPaint( sal_Bool b ) { bFrameInPaint = b; } - inline BOOL IsScaleImageMap() const { return bScaleImageMap; } - inline void SetScaleImageMap( BOOL b ) { bScaleImageMap = b; } + inline sal_Bool IsScaleImageMap() const { return bScaleImageMap; } + inline void SetScaleImageMap( sal_Bool b ) { bScaleImageMap = b; } #endif // in ndcopy.cxx virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; @@ -168,33 +168,33 @@ public: // Re-read in case graphic was not OK. The current one // gets replaced by the new one. - BOOL ReRead( const String& rGrfName, const String& rFltName, + sal_Bool ReRead( const String& rGrfName, const String& rFltName, const Graphic* pGraphic = 0, const GraphicObject* pGrfObj = 0, - BOOL bModify = TRUE ); + sal_Bool bModify = sal_True ); // Loading of graphic immediately before displaying. - short SwapIn( BOOL bWaitForData = FALSE ); + short SwapIn( sal_Bool bWaitForData = sal_False ); // Remove graphic in order to free memory. short SwapOut(); // Access to storage stream-name. void SetStreamName( const String& r ) { aGrfObj.SetUserData( r ); } void SetNewStreamName( const String& r ) { aNewStrmName = r; } // Is this node selected by any shell? - BOOL IsSelected() const; + sal_Bool IsSelected() const; #endif // Communicate to graphic that node is in Undo-range. - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); #ifndef _FESHVIEW_ONLY_INLINE_NEEDED // Query link-data. - BOOL IsGrfLink() const { return refLink.Is(); } - inline BOOL IsLinkedFile() const; - inline BOOL IsLinkedDDE() const; + sal_Bool IsGrfLink() const { return refLink.Is(); } + inline sal_Bool IsLinkedFile() const; + inline sal_Bool IsLinkedDDE() const; ::sfx2::SvBaseLinkRef GetLink() const { return refLink; } - BOOL GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; + sal_Bool GetFileFilterNms( String* pFileNm, String* pFilterNm ) const; void ReleaseLink(); // Scale an image-map: the image-map becomes zoomed in / out by @@ -227,11 +227,11 @@ inline const SwGrfNode *SwNode::GetGrfNode() const } #ifndef _FESHVIEW_ONLY_INLINE_NEEDED -inline BOOL SwGrfNode::IsLinkedFile() const +inline sal_Bool SwGrfNode::IsLinkedFile() const { return refLink.Is() && OBJECT_CLIENT_GRF == refLink->GetObjType(); } -inline BOOL SwGrfNode::IsLinkedDDE() const +inline sal_Bool SwGrfNode::IsLinkedDDE() const { return refLink.Is() && OBJECT_CLIENT_DDE == refLink->GetObjType(); } diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx index bd47ced1eba8..58aa4c2d3037 100644 --- a/sw/inc/ndhints.hxx +++ b/sw/inc/ndhints.hxx @@ -82,31 +82,31 @@ protected: //FIXME: why are the non-const methods public? public: void Insert( const SwTxtAttr *pHt ); - void DeleteAtPos( const USHORT nPosInStart ); + void DeleteAtPos( const sal_uInt16 nPosInStart ); bool Resort(); - SwTxtAttr * Cut( const USHORT nPosInStart ); + SwTxtAttr * Cut( const sal_uInt16 nPosInStart ); - inline const SwTxtAttr * GetStart( const USHORT nPos ) const + inline const SwTxtAttr * GetStart( const sal_uInt16 nPos ) const { return m_HintStarts[nPos]; } - inline const SwTxtAttr * GetEnd ( const USHORT nPos ) const + inline const SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) const { return m_HintEnds [nPos]; } - inline SwTxtAttr * GetStart( const USHORT nPos ) + inline SwTxtAttr * GetStart( const sal_uInt16 nPos ) { return m_HintStarts[nPos]; } - inline SwTxtAttr * GetEnd ( const USHORT nPos ) + inline SwTxtAttr * GetEnd ( const sal_uInt16 nPos ) { return m_HintEnds [nPos]; } - inline USHORT GetEndCount() const { return m_HintEnds .Count(); } - inline USHORT GetStartCount() const { return m_HintStarts.Count(); } + inline sal_uInt16 GetEndCount() const { return m_HintEnds .Count(); } + inline sal_uInt16 GetStartCount() const { return m_HintStarts.Count(); } - inline USHORT GetStartOf( const SwTxtAttr *pHt ) const; - inline USHORT GetPos( const SwTxtAttr *pHt ) const + inline sal_uInt16 GetStartOf( const SwTxtAttr *pHt ) const; + inline sal_uInt16 GetPos( const SwTxtAttr *pHt ) const { return m_HintStarts.GetPos( pHt ); } - inline SwTxtAttr * GetTextHint( const USHORT nIdx ) + inline SwTxtAttr * GetTextHint( const sal_uInt16 nIdx ) { return GetStart(nIdx); } - inline const SwTxtAttr * operator[]( const USHORT nIdx ) const + inline const SwTxtAttr * operator[]( const sal_uInt16 nIdx ) const { return m_HintStarts[nIdx]; } - inline USHORT Count() const { return m_HintStarts.Count(); } + inline sal_uInt16 Count() const { return m_HintStarts.Count(); } #if OSL_DEBUG_LEVEL > 1 bool Check() const; @@ -141,7 +141,7 @@ private: // Because the TextNode also guarantees removal of the Character for // attributes without an end. friend class SwTxtNode; - void DeleteAtPos( const USHORT nPos ); + void DeleteAtPos( const sal_uInt16 nPos ); // Delete the given Hint. The Hint must actually be in the array! void Delete( SwTxtAttr* pTxtHt ); @@ -196,9 +196,9 @@ SvStream &operator<<(SvStream &aS, const SwpHints &rHints); //$ ostream // Inline Implementations -inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const +inline sal_uInt16 SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const { - USHORT nPos; + sal_uInt16 nPos; if ( !m_HintStarts.Seek_Entry( pHt, &nPos ) ) { nPos = USHRT_MAX; @@ -206,7 +206,7 @@ inline USHORT SwpHintsArray::GetStartOf( const SwTxtAttr *pHt ) const return nPos; } -inline SwTxtAttr *SwpHintsArray::Cut( const USHORT nPosInStart ) +inline SwTxtAttr *SwpHintsArray::Cut( const sal_uInt16 nPosInStart ) { SwTxtAttr *pHt = GetTextHint(nPosInStart); DeleteAtPos( nPosInStart ); diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx index cde04d8a79a7..15bbfe57f55f 100644 --- a/sw/inc/ndindex.hxx +++ b/sw/inc/ndindex.hxx @@ -25,14 +25,15 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _NDINDEX_HXX -#define _NDINDEX_HXX +#ifndef SW_NDINDEX_HXX +#define SW_NDINDEX_HXX #include <limits.h> + #include <tools/solar.h> -#include "node.hxx" -#include "ndarr.hxx" +#include <node.hxx> + class SwNode; class SwNodes; @@ -41,7 +42,7 @@ class SW_DLLPUBLIC SwNodeIndex { friend void SwNodes::RegisterIndex( SwNodeIndex& ); friend void SwNodes::DeRegisterIndex( SwNodeIndex& ); - friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL ); + friend void SwNodes::RemoveNode( sal_uLong, sal_uLong, sal_Bool ); #if OSL_DEBUG_LEVEL > 1 static int nSerial; @@ -54,48 +55,48 @@ class SW_DLLPUBLIC SwNodeIndex void Remove(); // These are not allowed! - SwNodeIndex( SwNodes& rNds, USHORT nIdx ); + SwNodeIndex( SwNodes& rNds, sal_uInt16 nIdx ); SwNodeIndex( SwNodes& rNds, int nIdx ); public: - SwNodeIndex( SwNodes& rNds, ULONG nIdx = 0 ); + SwNodeIndex( SwNodes& rNds, sal_uLong nIdx = 0 ); SwNodeIndex( const SwNodeIndex &, long nDiff = 0 ); SwNodeIndex( const SwNode&, long nDiff = 0 ); ~SwNodeIndex() { Remove(); } - inline ULONG operator++(); - inline ULONG operator--(); - inline ULONG operator++(int); - inline ULONG operator--(int); - - inline ULONG operator+=( ULONG ); - inline ULONG operator-=( ULONG ); - inline ULONG operator+=( const SwNodeIndex& ); - inline ULONG operator-=( const SwNodeIndex& ); - - inline BOOL operator< ( const SwNodeIndex& ) const; - inline BOOL operator<=( const SwNodeIndex& ) const; - inline BOOL operator> ( const SwNodeIndex& ) const; - inline BOOL operator>=( const SwNodeIndex& ) const; - inline BOOL operator==( const SwNodeIndex& ) const; - inline BOOL operator!=( const SwNodeIndex& ) const; - - inline BOOL operator< ( ULONG nWert ) const; - inline BOOL operator<=( ULONG nWert ) const; - inline BOOL operator> ( ULONG nWert ) const; - inline BOOL operator>=( ULONG nWert ) const; - inline BOOL operator==( ULONG nWert ) const; - inline BOOL operator!=( ULONG nWert ) const; - - inline SwNodeIndex& operator=( ULONG ); + inline sal_uLong operator++(); + inline sal_uLong operator--(); + inline sal_uLong operator++(int); + inline sal_uLong operator--(int); + + inline sal_uLong operator+=( sal_uLong ); + inline sal_uLong operator-=( sal_uLong ); + inline sal_uLong operator+=( const SwNodeIndex& ); + inline sal_uLong operator-=( const SwNodeIndex& ); + + inline sal_Bool operator< ( const SwNodeIndex& ) const; + inline sal_Bool operator<=( const SwNodeIndex& ) const; + inline sal_Bool operator> ( const SwNodeIndex& ) const; + inline sal_Bool operator>=( const SwNodeIndex& ) const; + inline sal_Bool operator==( const SwNodeIndex& ) const; + inline sal_Bool operator!=( const SwNodeIndex& ) const; + + inline sal_Bool operator< ( sal_uLong nWert ) const; + inline sal_Bool operator<=( sal_uLong nWert ) const; + inline sal_Bool operator> ( sal_uLong nWert ) const; + inline sal_Bool operator>=( sal_uLong nWert ) const; + inline sal_Bool operator==( sal_uLong nWert ) const; + inline sal_Bool operator!=( sal_uLong nWert ) const; + + inline SwNodeIndex& operator=( sal_uLong ); SwNodeIndex& operator=( const SwNodeIndex& ); SwNodeIndex& operator=( const SwNode& ); - // Return value of index as ULONG. - inline ULONG GetIndex() const; + // Return value of index as sal_uLong. + inline sal_uLong GetIndex() const; // Enables assignments without creation of a temporary object. - SwNodeIndex& Assign( SwNodes& rNds, ULONG ); + SwNodeIndex& Assign( SwNodes& rNds, sal_uLong ); SwNodeIndex& Assign( const SwNode& rNd, long nOffset = 0 ); // Gets pointer on NodesArray. @@ -116,7 +117,7 @@ public: SwNodeRange( const SwNodeIndex &rS, const SwNodeIndex &rE ); SwNodeRange( const SwNodeRange &rRange ); - SwNodeRange( SwNodes& rArr, ULONG nSttIdx = 0, ULONG nEndIdx = 0 ); + SwNodeRange( SwNodes& rArr, sal_uLong nSttIdx = 0, sal_uLong nEndIdx = 0 ); SwNodeRange( const SwNodeIndex& rS, long nSttDiff, const SwNodeIndex& rE, long nEndDiff = 0 ); SwNodeRange( const SwNode& rS, long nSttDiff, @@ -129,7 +130,7 @@ public: // For inlines node.hxx is needed which in turn needs this one. // Therefore all inlines accessing pNd are implemented here. -inline ULONG SwNodeIndex::GetIndex() const +inline sal_uLong SwNodeIndex::GetIndex() const { return pNd->GetIndex(); } @@ -141,109 +142,99 @@ inline SwNodes& SwNodeIndex::GetNodes() { return pNd->GetNodes(); } -inline BOOL SwNodeIndex::operator< ( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator< ( sal_uLong nWert ) const { return pNd->GetIndex() < nWert; } -inline BOOL SwNodeIndex::operator<=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator<=( sal_uLong nWert ) const { return pNd->GetIndex() <= nWert; } -inline BOOL SwNodeIndex::operator> ( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator> ( sal_uLong nWert ) const { return pNd->GetIndex() > nWert; } -inline BOOL SwNodeIndex::operator>=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator>=( sal_uLong nWert ) const { return pNd->GetIndex() >= nWert; } -inline BOOL SwNodeIndex::operator==( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator==( sal_uLong nWert ) const { return pNd->GetIndex() == nWert; } -inline BOOL SwNodeIndex::operator!=( ULONG nWert ) const +inline sal_Bool SwNodeIndex::operator!=( sal_uLong nWert ) const { return pNd->GetIndex() != nWert; } -inline BOOL SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator<( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() < rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator<=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() <= rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator>( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() > rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const +inline sal_Bool SwNodeIndex::operator>=( const SwNodeIndex& rIndex ) const { return pNd->GetIndex() >= rIndex.GetIndex(); } -inline BOOL SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const +inline sal_Bool SwNodeIndex::operator==( const SwNodeIndex& rIdx ) const { return pNd == rIdx.pNd; } -inline BOOL SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const +inline sal_Bool SwNodeIndex::operator!=( const SwNodeIndex& rIdx ) const { return pNd != rIdx.pNd; } -inline ULONG SwNodeIndex::operator++() +inline sal_uLong SwNodeIndex::operator++() { return ( pNd = GetNodes()[ pNd->GetIndex()+1 ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator--() +inline sal_uLong SwNodeIndex::operator--() { return ( pNd = GetNodes()[ pNd->GetIndex()-1 ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator++(int) +inline sal_uLong SwNodeIndex::operator++(int) { - ULONG nOldIndex = pNd->GetIndex(); + sal_uLong nOldIndex = pNd->GetIndex(); pNd = GetNodes()[ nOldIndex + 1 ]; return nOldIndex; } -inline ULONG SwNodeIndex::operator--(int) +inline sal_uLong SwNodeIndex::operator--(int) { - ULONG nOldIndex = pNd->GetIndex(); + sal_uLong nOldIndex = pNd->GetIndex(); pNd = GetNodes()[ nOldIndex - 1 ]; return nOldIndex; } -inline ULONG SwNodeIndex::operator+=( ULONG nWert ) +inline sal_uLong SwNodeIndex::operator+=( sal_uLong nWert ) { return ( pNd = GetNodes()[ pNd->GetIndex() + nWert ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator-=( ULONG nWert ) +inline sal_uLong SwNodeIndex::operator-=( sal_uLong nWert ) { return ( pNd = GetNodes()[ pNd->GetIndex() - nWert ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator+=( const SwNodeIndex& rIndex ) +inline sal_uLong SwNodeIndex::operator+=( const SwNodeIndex& rIndex ) { return ( pNd = GetNodes()[ pNd->GetIndex() + rIndex.GetIndex() ] )->GetIndex(); } -inline ULONG SwNodeIndex::operator-=( const SwNodeIndex& rIndex ) +inline sal_uLong SwNodeIndex::operator-=( const SwNodeIndex& rIndex ) { return ( pNd = GetNodes()[ pNd->GetIndex() - rIndex.GetIndex() ] )->GetIndex(); } -inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert ) +inline SwNodeIndex& SwNodeIndex::operator=( sal_uLong nWert ) { pNd = GetNodes()[ nWert ]; return *this; } - - -// Implementation in ndindex.hxx - should be adapted to the -// new interface as soon as possible. -inline SwNode* SwNodes::operator[]( const SwNodeIndex& rIdx ) const -{ - return &rIdx.GetNode(); -} - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index b245cd8b09f1..70081fcac7ee 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -40,11 +40,11 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode friend class SwNoTxtFrm; PolyPolygon *pContour; - BOOL bAutomaticContour : 1; // automatic contour polygon, not manipulated - BOOL bContourMapModeValid : 1; // contour map mode is not the graphics's + sal_Bool bAutomaticContour : 1; // automatic contour polygon, not manipulated + sal_Bool bContourMapModeValid : 1; // contour map mode is not the graphics's // prefered map mode, but either // MM100 or or pixel - BOOL bPixelContour : 1; // contour map mode is invalid and pixel. + sal_Bool bPixelContour : 1; // contour map mode is invalid and pixel. // Creates for all derivations an AttrSet with ranges for frame- and // graphics-attributes (only called by SwCntntNode). @@ -54,7 +54,7 @@ class SW_DLLPUBLIC SwNoTxtNode : public SwCntntNode SwNoTxtNode &operator=( const SwNoTxtNode& ); // Not allowed. protected: - SwNoTxtNode( const SwNodeIndex &rWhere, const BYTE nNdType, + SwNoTxtNode( const SwNodeIndex &rWhere, const sal_uInt8 nNdType, SwGrfFmtColl *pGrColl, SwAttrSet* pAutoAttr = 0 ); public: @@ -66,8 +66,8 @@ public: virtual Size GetTwipSize() const = 0; - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); const String GetTitle() const; void SetTitle( const String& rTitle, @@ -77,25 +77,25 @@ public: bool bBroadcast = false ); void SetContour( const PolyPolygon *pPoly, - BOOL bAutomatic = FALSE ); + sal_Bool bAutomatic = sal_False ); const PolyPolygon *HasContour() const; - BOOL _HasContour() const { return pContour!=0; }; + sal_Bool _HasContour() const { return pContour!=0; }; void GetContour( PolyPolygon &rPoly ) const; void CreateContour(); - void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; } - BOOL HasAutomaticContour() const { return bAutomaticContour; } + void SetAutomaticContour( sal_Bool bSet ) { bAutomaticContour = bSet; } + sal_Bool HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour void SetContourAPI( const PolyPolygon *pPoly ); - // get either a MM100 or pixel contour, return FALSE if no contour is set. - BOOL GetContourAPI( PolyPolygon &rPoly ) const; + // get either a MM100 or pixel contour, return sal_False if no contour is set. + sal_Bool GetContourAPI( PolyPolygon &rPoly ) const; - void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; } - BOOL IsPixelContour() const; + void SetPixelContour( sal_Bool bSet ) { bPixelContour = bSet; } + sal_Bool IsPixelContour() const; - BOOL IsContourMapModeValid() const { return bContourMapModeValid; } + sal_Bool IsContourMapModeValid() const { return bContourMapModeValid; } // Obtains the graphic with SwapIn for GrfNode via GetData for OLE. Graphic GetGraphic() const; diff --git a/sw/inc/ndole.hxx b/sw/inc/ndole.hxx index 511a14de64be..5291a6ae8757 100644 --- a/sw/inc/ndole.hxx +++ b/sw/inc/ndole.hxx @@ -60,18 +60,18 @@ public: SwOLEObj( const String &rName, sal_Int64 nAspect ); ~SwOLEObj(); - BOOL UnloadObject(); - static BOOL UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, + sal_Bool UnloadObject(); + static sal_Bool UnloadObject( ::com::sun::star::uno::Reference< ::com::sun::star::embed::XEmbeddedObject > xObj, const SwDoc* pDoc, sal_Int64 nAspect ); String GetDescription(); #ifndef _FESHVIEW_ONLY_INLINE_NEEDED - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef(); + const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetOleRef(); svt::EmbeddedObjectRef& GetObject(); const String& GetCurrentPersistName() const { return aName; } - BOOL IsOleRef() const; // To avoid unneccessary loading of object. + sal_Bool IsOleRef() const; // To avoid unneccessary loading of object. #endif }; @@ -85,7 +85,7 @@ class SW_DLLPUBLIC SwOLENode: public SwNoTxtNode mutable SwOLEObj aOLEObj; Graphic* pGraphic; String sChartTblName; // with chart objects: name of referenced table. - BOOL bOLESizeInvalid; // Should be considered at SwDoc::PrtOLENotify + sal_Bool bOLESizeInvalid; // Should be considered at SwDoc::PrtOLENotify // (e.g. copied). Is not persistent. SwEmbedObjectLink* mpObjectLink; @@ -123,14 +123,14 @@ public: void GetNewReplacement(); - virtual BOOL SavePersistentData(); - virtual BOOL RestorePersistentData(); + virtual sal_Bool SavePersistentData(); + virtual sal_Bool RestorePersistentData(); - BOOL IsInGlobalDocSection() const; - BOOL IsOLEObjectDeleted() const; + sal_Bool IsInGlobalDocSection() const; + sal_Bool IsOLEObjectDeleted() const; - BOOL IsOLESizeInvalid() const { return bOLESizeInvalid; } - void SetOLESizeInvalid( BOOL b ){ bOLESizeInvalid = b; } + sal_Bool IsOLESizeInvalid() const { return bOLESizeInvalid; } + void SetOLESizeInvalid( sal_Bool b ){ bOLESizeInvalid = b; } sal_Int64 GetAspect() const { return aOLEObj.GetObject().GetViewAspect(); } void SetAspect( sal_Int64 nAspect) { aOLEObj.GetObject().SetViewAspect( nAspect ); } @@ -168,4 +168,4 @@ inline const SwOLENode *SwNode::GetOLENode() const #endif // _NDOLE_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 937f1a8a4f47..61838cf20a15 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -109,7 +109,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable mutable bool m_bLastOutlineState : 1; bool m_bNotifiable; - // BYTE nOutlineLevel; //#outline level, removed by zhaojianwei. + // sal_uInt8 nOutlineLevel; //#outline level, removed by zhaojianwei. bool mbEmptyListStyleSetDueToSetOutlineLevelAttr; // boolean, indicating that a <SetAttr(..)> or <ResetAttr(..)> or @@ -131,8 +131,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable // Copies the attributes at nStart to pDest. SW_DLLPRIVATE void CopyAttr( SwTxtNode *pDest, const xub_StrLen nStart, const xub_StrLen nOldPos); - SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, BOOL bNext = TRUE, - BOOL bChgFollow = TRUE ); + SW_DLLPRIVATE SwTxtNode* _MakeNewTxtNode( const SwNodeIndex&, sal_Bool bNext = sal_True, + sal_Bool bChgFollow = sal_True ); SW_DLLPRIVATE void CutImpl( SwTxtNode * const pDest, const SwIndex & rDestStart, @@ -146,7 +146,7 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable SW_DLLPRIVATE virtual void NewAttrSet( SwAttrPool& ); SW_DLLPRIVATE void Replace0xFF( XubString& rTxt, xub_StrLen& rTxtStt, - xub_StrLen nEndPos, BOOL bExpandFlds ) const; + xub_StrLen nEndPos, sal_Bool bExpandFlds ) const; // Optimization: Asking for information about hidden characters at SwScriptInfo // updates these flags. @@ -161,21 +161,21 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable SW_DLLPRIVATE void CalcHiddenCharFlags() const; - SW_DLLPRIVATE SwNumRule * _GetNumRule(BOOL bInParent = TRUE) const; + SW_DLLPRIVATE SwNumRule * _GetNumRule(sal_Bool bInParent = sal_True) const; SW_DLLPRIVATE void SetLanguageAndFont( const SwPaM &rPaM, - LanguageType nLang, USHORT nLangWhichId, - const Font *pFont, USHORT nFontWhichId ); + LanguageType nLang, sal_uInt16 nLangWhichId, + const Font *pFont, sal_uInt16 nFontWhichId ); // // Start: Data collected during idle time // - SW_DLLPRIVATE void SetParaNumberOfWords( ULONG nTmpWords ) const; - SW_DLLPRIVATE ULONG GetParaNumberOfWords() const; - SW_DLLPRIVATE void SetParaNumberOfChars( ULONG nTmpChars ) const; - SW_DLLPRIVATE ULONG GetParaNumberOfChars() const; - SW_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( ULONG nTmpChars ) const; - SW_DLLPRIVATE ULONG GetParaNumberOfCharsExcludingSpaces() const; + SW_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const; + SW_DLLPRIVATE sal_uLong GetParaNumberOfWords() const; + SW_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const; + SW_DLLPRIVATE sal_uLong GetParaNumberOfChars() const; + SW_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const; + SW_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const; SW_DLLPRIVATE void InitSwParaStatistics( bool bNew ); /** create number for this text node, if not already existing @@ -230,15 +230,15 @@ public: virtual xub_StrLen Len() const; // Is in itratr. - void GetMinMaxSize( ULONG nIndex, ULONG& rMin, ULONG &rMax, ULONG &rAbs, + void GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rMax, sal_uLong &rAbs, OutputDevice* pOut = 0 ) const; // overriding to handle change of certain paragraph attributes - virtual BOOL SetAttr( const SfxPoolItem& ); - virtual BOOL SetAttr( const SfxItemSet& rSet ); - virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); - virtual BOOL ResetAttr( const SvUShorts& rWhichArr ); - virtual USHORT ResetAllAttr(); + virtual sal_Bool SetAttr( const SfxPoolItem& ); + virtual sal_Bool SetAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual sal_Bool ResetAttr( const SvUShorts& rWhichArr ); + virtual sal_uInt16 ResetAllAttr(); /// insert text content void InsertText( const XubString & rStr, const SwIndex & rIdx, @@ -264,8 +264,8 @@ public: refmarks, toxmarks, and metas will be ignored unless this is true ATTENTION: setting bInclRefToxMark is only allowed from UNDO! */ - void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, USHORT nWhich = 0, - const SfxItemSet* pSet = 0, BOOL bInclRefToxMark = FALSE ); + void RstAttr( const SwIndex &rIdx, xub_StrLen nLen, sal_uInt16 nWhich = 0, + const SfxItemSet* pSet = 0, sal_Bool bInclRefToxMark = sal_False ); void GCAttr(); // Delete text attribute (needs to be deregistered at Pool!) @@ -285,26 +285,26 @@ public: // Set these attributes at TextNode. If the whole range is comprised // set them only in AutoAttrSet (SwCntntNode::SetAttr). - BOOL SetAttr( const SfxItemSet& rSet, + sal_Bool SetAttr( const SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, const SetAttrMode nMode = nsSetAttrMode::SETATTR_DEFAULT ); // Query the attributes of textnode over the range. // Introduce 4th 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 <bOnlyTxtAttr> == FALSE, + // the requested item set as a LR-SPACE item, if <bOnlyTxtAttr> == sal_False, // corresponding node has not its own indent attributes and the // position-and-space mode of the list level is SvxNumberFormat::LABEL_ALIGNMENT. - BOOL GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, - BOOL bOnlyTxtAttr = FALSE, - BOOL bGetFromChrFmt = TRUE, + sal_Bool GetAttr( SfxItemSet& rSet, xub_StrLen nStt, xub_StrLen nEnd, + sal_Bool bOnlyTxtAttr = sal_False, + sal_Bool bGetFromChrFmt = sal_True, const bool bMergeIndentValuesOfNumRule = false ) const; // Convey attributes of an AttrSet (AutoFmt) to SwpHintsArray. void FmtToTxtAttr( SwTxtNode* pNd ); /// delete all attributes of type nWhich at nStart (opt. end nEnd) - void DeleteAttributes( const USHORT nWhich, + void DeleteAttributes( const sal_uInt16 nWhich, const xub_StrLen nStart, const xub_StrLen nEnd = 0 ); /// delete the attribute pTxtAttr void DeleteAttribute ( SwTxtAttr * const pTxtAttr ); @@ -341,8 +341,8 @@ public: SwCntntNode *AppendNode( const SwPosition & ); // When appropriate set DontExpand-flag at INet or character styles respectively. - BOOL DontExpandFmt( const SwIndex& rIdx, bool bFlag = true, - BOOL bFmtToTxtAttributes = TRUE ); + sal_Bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true, + sal_Bool bFmtToTxtAttributes = sal_True ); enum GetTxtAttrMode { DEFAULT, /// DEFAULT: (Start < nIndex <= End) @@ -380,8 +380,8 @@ public: const RES_TXTATR nWhich = RES_TXTATR_END ) const; XubString GetCurWord(xub_StrLen) const; - USHORT Spell(SwSpellArgs*); - USHORT Convert( SwConversionArgs & ); + sal_uInt16 Spell(SwSpellArgs*); + sal_uInt16 Convert( SwConversionArgs & ); inline SwTxtFmtColl *GetTxtColl() const; virtual SwFmtColl *ChgFmtColl( SwFmtColl* ); @@ -406,7 +406,7 @@ public: @return numbering rule of this text node or NULL if none is set */ - SwNumRule *GetNumRule(BOOL bInParent = TRUE) const; + SwNumRule *GetNumRule(sal_Bool bInParent = sal_True) const; inline const SwNodeNum* GetNum() const { @@ -434,10 +434,10 @@ public: - it has a SwNodeNum and it has a numbering rule and the according SwNumFmt defines a numbering type that is an enumeration. - @retval TRUE this text node may be numbered - @retval FALSE else + @retval sal_True this text node may be numbered + @retval sal_False else */ - //BOOL MayBeNumbered() const; + //sal_Bool MayBeNumbered() const; /** Notify this textnode that its numbering rule has changed. @@ -467,7 +467,7 @@ public: @return additional indents */ - long GetLeftMarginWithNum( BOOL bTxtLeft = FALSE ) const; + long GetLeftMarginWithNum( sal_Bool bTxtLeft = sal_False ) const; /** Returns the combined first line indent of this text node and @@ -476,10 +476,10 @@ public: @param the first line indent of this text node taking the numbering into account (return parameter) - @retval TRUE this node has SwNodeNum and has numbering rule - @retval FALSE else + @retval sal_True this node has SwNodeNum and has numbering rule + @retval sal_False else */ - BOOL GetFirstLineOfsWithNum( short& rFirstOffset ) const; + sal_Bool GetFirstLineOfsWithNum( short& rFirstOffset ) const; SwTwips GetAdditionalIndentForStartingNewList() const; @@ -500,10 +500,10 @@ public: numbering rule and the numbering format specified for the level of the SwNodeNum is of an enumeration type. - @retval TRUE This text node has a number. - @retval FALSE else + @retval sal_True This text node has a number. + @retval sal_False else */ - BOOL HasNumber() const; + sal_Bool HasNumber() const; /** Returns if this text node has a bullet. @@ -511,23 +511,23 @@ public: numbering rule and the numbering format specified for the level of the SwNodeNum is of a bullet type. - @retval TRUE This text node has a bullet. - @retval FALSE else + @retval sal_True This text node has a bullet. + @retval sal_False else */ - BOOL HasBullet() const; + sal_Bool HasBullet() const; /** Returns is this text node is numbered. This node is numbered if it has a SwNodeNum and it has a numbering rule and has not a hidden SwNodeNum. - ATTENTION: Returns TRUE even if the SwNumFmt has type + ATTENTION: Returns sal_True even if the SwNumFmt has type SVX_NUM_NUMBER_NONE. - @retval TRUE This node is numbered. - @retval FALSE else + @retval sal_True This node is numbered. + @retval sal_False else */ - BOOL IsNumbered() const; + sal_Bool IsNumbered() const; /** Returns if this text node has a marked label. @@ -605,7 +605,7 @@ public: @return the width of the leading whitespace */ - USHORT GetWidthOfLeadingTabs() const; + sal_uInt16 GetWidthOfLeadingTabs() const; /** Returns if the paragraph has a visible numbering or bullet. @@ -613,7 +613,7 @@ public: Note: This function returns false, if the numbering format is SVX_NUM_NUMBER_NONE or if the numbering/bullet has been deleted. - @return TRUE if the paragraph has a visible numbering/bullet/outline + @return sal_True if the paragraph has a visible numbering/bullet/outline */ bool HasVisibleNumberingOrBullet() const; @@ -665,15 +665,15 @@ public: void fillSoftPageBreakList( SwSoftPageBreakList& rBreak ) const; - USHORT GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0, - USHORT nScript = 0 ) const; + sal_uInt16 GetLang( const xub_StrLen nBegin, const xub_StrLen nLen = 0, + sal_uInt16 nScript = 0 ) const; // in ndcopy.cxx - BOOL IsSymbol( const xub_StrLen nBegin ) const; // In itratr.cxx. + sal_Bool IsSymbol( const xub_StrLen nBegin ) const; // In itratr.cxx. virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; // Interactive hyphenation: we find TxtFrm and call its CalcHyph. - BOOL Hyphenate( SwInterHyphInfo &rHyphInf ); + sal_Bool Hyphenate( SwInterHyphInfo &rHyphInf ); void DelSoftHyph( const xub_StrLen nStart, const xub_StrLen nEnd ); // add 4th optional parameter <bAddSpaceAfterListLabelStr> indicating, @@ -687,22 +687,22 @@ public: const bool bWithNum = false, const bool bAddSpaceAfterListLabelStr = false, const bool bWithSpacesForLevel = false ) const; - BOOL GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, + sal_Bool GetExpandTxt( SwTxtNode& rDestNd, const SwIndex* pDestIdx = 0, xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, - BOOL bWithNum = FALSE, BOOL bWithFtn = TRUE, - BOOL bReplaceTabsWithSpaces = FALSE ) const; + sal_Bool bWithNum = sal_False, sal_Bool bWithFtn = sal_True, + sal_Bool bReplaceTabsWithSpaces = sal_False ) const; const ModelToViewHelper::ConversionMap* BuildConversionMap( rtl::OUString& rExpandText ) const; XubString GetRedlineTxt( xub_StrLen nIdx = 0, xub_StrLen nLen = STRING_LEN, - BOOL bExpandFlds = FALSE, - BOOL bWithNum = FALSE ) const; + sal_Bool bExpandFlds = sal_False, + sal_Bool bWithNum = sal_False ) const; // Returns actual count of initial chars for initial-function. // If nWishLen == 0 that of first word. - USHORT GetDropLen( USHORT nWishLen) const; + sal_uInt16 GetDropLen( sal_uInt16 nWishLen) const; // Passes back info needed on the dropcap dimensions bool GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const; @@ -780,7 +780,7 @@ public: bool IsFirstOfNumRule() const; - USHORT GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const; + sal_uInt16 GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const; SW_DLLPRIVATE ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextContent> const& GetXParagraph() const diff --git a/sw/inc/ndtyp.hxx b/sw/inc/ndtyp.hxx index b4b9cd1d8d34..9b37b350afa5 100644 --- a/sw/inc/ndtyp.hxx +++ b/sw/inc/ndtyp.hxx @@ -33,19 +33,19 @@ // IDs for different nodes. The member indicating the type of node is // in base class. -const BYTE ND_ENDNODE = 0x01; -const BYTE ND_STARTNODE = 0x02; -const BYTE ND_TABLENODE = 0x06; -const BYTE ND_TEXTNODE = 0x08; -const BYTE ND_GRFNODE = 0x10; -const BYTE ND_OLENODE = 0x20; +const sal_uInt8 ND_ENDNODE = 0x01; +const sal_uInt8 ND_STARTNODE = 0x02; +const sal_uInt8 ND_TABLENODE = 0x06; +const sal_uInt8 ND_TEXTNODE = 0x08; +const sal_uInt8 ND_GRFNODE = 0x10; +const sal_uInt8 ND_OLENODE = 0x20; -const BYTE ND_CONTENTNODE = 0x38; // ContentNode (one of the 3 bits). -const BYTE ND_NOTXTNODE = 0x30; // NoTxtNode (one of the 2 bits). +const sal_uInt8 ND_CONTENTNODE = 0x38; // ContentNode (one of the 3 bits). +const sal_uInt8 ND_NOTXTNODE = 0x30; // NoTxtNode (one of the 2 bits). -const BYTE ND_SECTIONNODE = 0x42; +const sal_uInt8 ND_SECTIONNODE = 0x42; // For internal use only!! -const BYTE ND_SECTIONDUMMY = 0x40; //(ND_SECTIONNODE & ~ND_STARTNODE); +const sal_uInt8 ND_SECTIONDUMMY = 0x40; //(ND_SECTIONNODE & ~ND_STARTNODE); // Special types of StartNodes that are not derivations but keep // "sections" together. @@ -62,8 +62,8 @@ enum SwStartNodeType // is the node the first and/or last node of a section? // This information is used for the export filters. Our layout never have a // distance before or after if the node is the first or last in a section. -const BYTE ND_HAS_PREV_LAYNODE = 0x01; -const BYTE ND_HAS_NEXT_LAYNODE = 0x02; +const sal_uInt8 ND_HAS_PREV_LAYNODE = 0x01; +const sal_uInt8 ND_HAS_NEXT_LAYNODE = 0x02; diff --git a/sw/inc/newhdl.hxx b/sw/inc/newhdl.hxx index f44813d64b36..8391f9a31f21 100644 --- a/sw/inc/newhdl.hxx +++ b/sw/inc/newhdl.hxx @@ -46,10 +46,10 @@ public: void SetWarnLnk( const Link &rLink ); void SetErrLnk( const Link &rLink ); - BOOL TryWarnMem(); + sal_Bool TryWarnMem(); - BOOL Flush_WarnMem(); - BOOL Flush_ExceptMem(); + sal_Bool Flush_WarnMem(); + sal_Bool Flush_ExceptMem(); SwNewHdl(); ~SwNewHdl(); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index a3369bec2533..f666b70d7536 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -96,20 +96,20 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry long nMySerial; #endif - BYTE nNodeType; + sal_uInt8 nNodeType; // For text nodes: level of auto format. Was put here because we had still free bits. - BYTE nAFmtNumLvl : 3; - BOOL bSetNumLSpace : 1; // For numbering: TRUE: set indent. - BOOL bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag + sal_uInt8 nAFmtNumLvl : 3; + sal_Bool bSetNumLSpace : 1; // For numbering: TRUE: set indent. + sal_Bool bIgnoreDontExpand : 1; // for Text Attributes - ignore the flag protected: SwStartNode* pStartOfSection; - SwNode( const SwNodeIndex &rWhere, const BYTE nNodeId ); + SwNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeId ); // for the initial StartNode - SwNode( SwNodes& rNodes, ULONG nPos, const BYTE nNodeId ); + SwNode( SwNodes& rNodes, sal_uLong nPos, const sal_uInt8 nNodeId ); public: virtual ~SwNode(); @@ -118,26 +118,26 @@ public: long int GetSerial() const { return nMySerial; } #endif - USHORT GetSectionLevel() const; + sal_uInt16 GetSectionLevel() const; - inline ULONG StartOfSectionIndex() const; + inline sal_uLong StartOfSectionIndex() const; inline const SwStartNode* StartOfSectionNode() const { return pStartOfSection; } inline SwStartNode* StartOfSectionNode() { return pStartOfSection; } - inline ULONG EndOfSectionIndex() const; + inline sal_uLong EndOfSectionIndex() const; inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } - inline void SetAutoFmtLvl( BYTE nVal ) { nAFmtNumLvl = nVal; } + inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; } + inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; } - inline BOOL IsSetNumLSpace() const { return bSetNumLSpace; } - inline void SetNumLSpace( BOOL bFlag ) { bSetNumLSpace = bFlag; } + inline sal_Bool IsSetNumLSpace() const { return bSetNumLSpace; } + inline void SetNumLSpace( sal_Bool bFlag ) { bSetNumLSpace = bFlag; } - inline BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } - inline void SetIgnoreDontExpand( BOOL bNew ) { bIgnoreDontExpand = bNew; } + inline sal_Bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; } + inline void SetIgnoreDontExpand( sal_Bool bNew ) { bIgnoreDontExpand = bNew; } - BYTE GetNodeType() const { return nNodeType; } + sal_uInt8 GetNodeType() const { return nNodeType; } inline SwStartNode *GetStartNode(); inline const SwStartNode *GetStartNode() const; @@ -165,23 +165,23 @@ public: inline SwSectionNode *GetSectionNode(); inline const SwSectionNode *GetSectionNode() const; - inline BOOL IsStartNode() const; - inline BOOL IsCntntNode() const; - inline BOOL IsEndNode() const; - inline BOOL IsTxtNode() const; - inline BOOL IsTableNode() const; - inline BOOL IsSectionNode() const; - inline BOOL IsOLENode() const; - inline BOOL IsNoTxtNode() const; - inline BOOL IsGrfNode() const; + inline sal_Bool IsStartNode() const; + inline sal_Bool IsCntntNode() const; + inline sal_Bool IsEndNode() const; + inline sal_Bool IsTxtNode() const; + inline sal_Bool IsTableNode() const; + inline sal_Bool IsSectionNode() const; + inline sal_Bool IsOLENode() const; + inline sal_Bool IsNoTxtNode() const; + inline sal_Bool IsGrfNode() const; /** Checks if this node is in redlines. - @retval TRUE this node is in redlines - @retval FALSE else + @retval sal_True this node is in redlines + @retval sal_False else */ - BOOL IsInRedlines() const; + sal_Bool IsInRedlines() const; // Search table node, in which it is. If it is in no table // return 0. @@ -271,18 +271,17 @@ public: IDocumentListItems& getIDocumentListItems(); // Is node in the visible area of the Shell? - BOOL IsInVisibleArea( ViewShell* pSh = 0 ) const; + sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const; // Is node in an protected area? - BOOL IsInProtectSect() const; + sal_Bool IsInProtectSect() const; // Is node in something that is protected (range, frame, // table cells ... including anchor in case of frames or footnotes)? - BOOL IsProtect() const; + sal_Bool IsProtect() const; // Search PageDesc with which this node is formated. If layout is existent // search over layout, else only the hard way is left: search over the nodes // to the front!! - - const SwPageDesc* FindPageDesc( BOOL bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; + const SwPageDesc* FindPageDesc( sal_Bool bCalcLay, sal_uInt32* pPgDescNdIdx = 0 ) const; // If node is in a fly return the respective format. SwFrmFmt* GetFlyFmt() const; @@ -290,11 +289,11 @@ public: // If node is in a table return the respective table box. SwTableBox* GetTblBox() const; - inline ULONG GetIndex() const { return GetPos(); } + inline sal_uLong GetIndex() const { return GetPos(); } - const SwTxtNode* FindOutlineNodeOfLevel( BYTE nLvl ) const; + const SwTxtNode* FindOutlineNodeOfLevel( sal_uInt8 nLvl ) const; - BYTE HasPrevNextLayNode() const; + sal_uInt8 HasPrevNextLayNode() const; private: // Private constructor because copying is never allowed!! @@ -315,11 +314,11 @@ class SwStartNode: public SwNode SwStartNodeType eSttNdTyp; // for the initial StartNode - SwStartNode( SwNodes& rNodes, ULONG nPos ); + SwStartNode( SwNodes& rNodes, sal_uLong nPos ); protected: SwStartNode( const SwNodeIndex &rWhere, - const BYTE nNodeType = ND_STARTNODE, + const sal_uInt8 nNodeType = ND_STARTNODE, SwStartNodeType = SwNormalStartNode ); public: DECL_FIXEDMEMPOOL_NEWDEL(SwStartNode) @@ -346,7 +345,7 @@ class SwEndNode : public SwNode friend class SwSectionNode; // To enable creation of its EndNote. // for the initial StartNode - SwEndNode( SwNodes& rNodes, ULONG nPos, SwStartNode& rSttNd ); + SwEndNode( SwNodes& rNodes, sal_uLong nPos, SwStartNode& rSttNd ); protected: SwEndNode( const SwNodeIndex &rWhere, SwStartNode& rSttNd ); @@ -372,7 +371,7 @@ class SW_DLLPUBLIC SwCntntNode: public SwModify, public SwNode, public SwIndexRe mutable bool mbSetModifyAtAttr; protected: - SwCntntNode( const SwNodeIndex &rWhere, const BYTE nNodeType, + SwCntntNode( const SwNodeIndex &rWhere, const sal_uInt8 nNodeType, SwFmtColl *pFmtColl ); virtual ~SwCntntNode(); @@ -385,7 +384,7 @@ protected: // There some functions that like to remove items from the internal // SwAttrSet (handle): - USHORT ClearItemsFromAttrSet( const std::vector<USHORT>& rWhichIds ); + sal_uInt16 ClearItemsFromAttrSet( const std::vector<sal_uInt16>& rWhichIds ); public: TYPEINFO(); //Already contained in base class Client. @@ -404,20 +403,20 @@ public: void MakeStartIndex( SwIndex * pIdx ) { pIdx->Assign( this, 0 ); } void MakeEndIndex( SwIndex * pIdx ) { pIdx->Assign( this, Len() ); } - BOOL GoNext(SwIndex *, USHORT nMode ) const; - BOOL GoPrevious(SwIndex *, USHORT nMode ) const; + sal_Bool GoNext(SwIndex *, sal_uInt16 nMode ) const; + sal_Bool GoPrevious(SwIndex *, sal_uInt16 nMode ) const; SwCntntFrm *GetFrm( const Point* pDocPos = 0, const SwPosition *pPos = 0, - const BOOL bCalcFrm = TRUE ) const; + const sal_Bool bCalcFrm = sal_True ) const; // Returns the real size of the frame or an empty rectangle if // no layout exists. Needed for export filters. - SwRect FindLayoutRect( const BOOL bPrtArea = FALSE, + SwRect FindLayoutRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; - SwRect FindPageFrmRect( const BOOL bPrtArea = FALSE, + const sal_Bool bCalcFrm = sal_False ) const; + SwRect FindPageFrmRect( const sal_Bool bPrtArea = sal_False, const Point* pPoint = 0, - const BOOL bCalcFrm = FALSE ) const; + const sal_Bool bCalcFrm = sal_False ) const; // Method creates all views of document for given node. The content // frames that are created are put in the respective layout. @@ -434,28 +433,28 @@ public: virtual SwCntntNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const = 0; // Get information from Client. - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // SS for PoolItems: hard attributation. // If bInParent is FALSE search for attribute only in this node. - const SfxPoolItem& GetAttr( USHORT nWhich, BOOL bInParent=TRUE ) const; - BOOL GetAttr( SfxItemSet& rSet, BOOL bInParent=TRUE ) const; + const SfxPoolItem& GetAttr( sal_uInt16 nWhich, sal_Bool bInParent=sal_True ) const; + sal_Bool GetAttr( SfxItemSet& rSet, sal_Bool bInParent=sal_True ) const; // made virtual - virtual BOOL SetAttr( const SfxPoolItem& ); - virtual BOOL SetAttr( const SfxItemSet& rSet ); - virtual BOOL ResetAttr( USHORT nWhich1, USHORT nWhich2 = 0 ); - virtual BOOL ResetAttr( const SvUShorts& rWhichArr ); - virtual USHORT ResetAllAttr(); + virtual sal_Bool SetAttr( const SfxPoolItem& ); + virtual sal_Bool SetAttr( const SfxItemSet& rSet ); + virtual sal_Bool ResetAttr( sal_uInt16 nWhich1, sal_uInt16 nWhich2 = 0 ); + virtual sal_Bool ResetAttr( const SvUShorts& rWhichArr ); + virtual sal_uInt16 ResetAllAttr(); // Obtains attribute that is not delivered via conditional style! - const SfxPoolItem* GetNoCondAttr( USHORT nWhich, BOOL bInParents ) const; + const SfxPoolItem* GetNoCondAttr( sal_uInt16 nWhich, sal_Bool bInParents ) const; // Does node has already its own auto-attributes? // Access to SwAttrSet. inline const SwAttrSet &GetSwAttrSet() const; inline const SwAttrSet *GetpSwAttrSet() const { return static_cast<const SwAttrSet*>(mpAttrSet.get()); } - inline BOOL HasSwAttrSet() const { return mpAttrSet ? TRUE : FALSE; } + inline sal_Bool HasSwAttrSet() const { return mpAttrSet ? sal_True : sal_False; } virtual SwFmtColl* ChgFmtColl( SwFmtColl* ); SwFmtColl* GetFmtColl() const { return (SwFmtColl*)GetRegisteredIn(); } @@ -465,13 +464,13 @@ public: void SetCondFmtColl( SwFmtColl* ); inline SwFmtColl* GetCondFmtColl() const; - BOOL IsAnyCondition( SwCollCondition& rTmp ) const; + sal_Bool IsAnyCondition( SwCollCondition& rTmp ) const; void ChkCondColl(); //FEATURE::CONDCOLL // Invalidates NumRule at the node. NumRule is updated // on EndAction of a Shell at the latest. - BOOL InvalidateNumRule(); + sal_Bool InvalidateNumRule(); // determines the text direction for a certain // position. Return -1, if text direction could *not* be determined. @@ -519,7 +518,7 @@ public: void MakeFrms( const SwNodeIndex & rIdx ); SwTableNode* MakeCopy( SwDoc*, const SwNodeIndex& ) const; - void SetNewTable( SwTable* , BOOL bNewFrames=TRUE ); + void SetNewTable( SwTable* , sal_Bool bNewFrames=sal_True ); private: // Private constructor because copying is never allowed!! @@ -575,7 +574,8 @@ public: // _nicht_ in einem versteckten (Unter-)Bereich liegt // Check for not hidden areas whether there is content that is not in // a hidden sub-area. - BOOL IsCntntHidden() const; + sal_Bool IsCntntHidden() const; + }; @@ -623,41 +623,41 @@ inline const SwCntntNode *SwNode::GetCntntNode() const } -inline BOOL SwNode::IsStartNode() const +inline sal_Bool SwNode::IsStartNode() const { - return ND_STARTNODE & nNodeType ? TRUE : FALSE; + return ND_STARTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsCntntNode() const +inline sal_Bool SwNode::IsCntntNode() const { - return ND_CONTENTNODE & nNodeType ? TRUE : FALSE; + return ND_CONTENTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsEndNode() const +inline sal_Bool SwNode::IsEndNode() const { - return ND_ENDNODE == nNodeType ? TRUE : FALSE; + return ND_ENDNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsTxtNode() const +inline sal_Bool SwNode::IsTxtNode() const { - return ND_TEXTNODE == nNodeType ? TRUE : FALSE; + return ND_TEXTNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsTableNode() const +inline sal_Bool SwNode::IsTableNode() const { - return ND_TABLENODE == nNodeType ? TRUE : FALSE; + return ND_TABLENODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsSectionNode() const +inline sal_Bool SwNode::IsSectionNode() const { - return ND_SECTIONNODE == nNodeType ? TRUE : FALSE; + return ND_SECTIONNODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsNoTxtNode() const +inline sal_Bool SwNode::IsNoTxtNode() const { - return ND_NOTXTNODE & nNodeType ? TRUE : FALSE; + return ND_NOTXTNODE & nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsOLENode() const +inline sal_Bool SwNode::IsOLENode() const { - return ND_OLENODE == nNodeType ? TRUE : FALSE; + return ND_OLENODE == nNodeType ? sal_True : sal_False; } -inline BOOL SwNode::IsGrfNode() const +inline sal_Bool SwNode::IsGrfNode() const { - return ND_GRFNODE == nNodeType ? TRUE : FALSE; + return ND_GRFNODE == nNodeType ? sal_True : sal_False; } inline const SwStartNode* SwNode::FindSttNodeByType( SwStartNodeType eTyp ) const @@ -672,11 +672,11 @@ inline const SwSectionNode* SwNode::FindSectionNode() const { return ((SwNode*)this)->FindSectionNode(); } -inline ULONG SwNode::StartOfSectionIndex() const +inline sal_uLong SwNode::StartOfSectionIndex() const { return pStartOfSection->GetIndex(); } -inline ULONG SwNode::EndOfSectionIndex() const +inline sal_uLong SwNode::EndOfSectionIndex() const { const SwStartNode* pStNd = IsStartNode() ? (SwStartNode*)this : pStartOfSection; return pStNd->pEndOfSection->GetIndex(); @@ -730,8 +730,8 @@ inline const SwAttrSet& SwCntntNode::GetSwAttrSet() const //FEATURE::CONDCOLL -inline const SfxPoolItem& SwCntntNode::GetAttr( USHORT nWhich, - BOOL bInParents ) const +inline const SfxPoolItem& SwCntntNode::GetAttr( sal_uInt16 nWhich, + sal_Bool bInParents ) const { return GetSwAttrSet().Get( nWhich, bInParents ); } diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index f5ec01325d11..beb6b1fe8e5c 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -74,8 +74,8 @@ public: SwNumFmt& operator=( const SwNumFmt& ); - BOOL operator==( const SwNumFmt& ) const; - BOOL operator!=( const SwNumFmt& r ) const { return !(*this == r); } + sal_Bool operator==( const SwNumFmt& ) const; + sal_Bool operator!=( const SwNumFmt& r ) const { return !(*this == r); } SwCharFmt* GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; } void SetCharFmt( SwCharFmt* ); @@ -90,8 +90,8 @@ public: virtual sal_Int16 GetVertOrient() const; const SwFmtVertOrient* GetGraphicOrientation() const; - BOOL IsEnumeration() const; - BOOL IsItemize() const; + sal_Bool IsEnumeration() const; // #i22362# + sal_Bool IsItemize() const; // #i29560# }; class SwPaM; @@ -111,10 +111,10 @@ private: #endif static SwNumFmt* aBaseFmts [ RULE_END ][ MAXLEVEL ]; - static USHORT aDefNumIndents[ MAXLEVEL ]; + static sal_uInt16 aDefNumIndents[ MAXLEVEL ]; // default list level properties for position-and-space mode LABEL_ALIGNMENT static SwNumFmt* aLabelAlignmentBaseFmts [ RULE_END ][ MAXLEVEL ]; - static USHORT nRefCount; + static sal_uInt16 nRefCount; static char* pDefOutlineName; SwNumFmt* aFmts[ MAXLEVEL ]; @@ -130,13 +130,13 @@ private: String sName; SwNumRuleType eRuleType; - USHORT nPoolFmtId; // Id-for NumRules created "automatically" - USHORT nPoolHelpId; // HelpId for this Pool-style. - BYTE nPoolHlpFileId; // FilePos at Doc on style helps. - BOOL bAutoRuleFlag : 1; - BOOL bInvalidRuleFlag : 1; - BOOL bContinusNum : 1; // Continuous numbering without levels. - BOOL bAbsSpaces : 1; // Levels represent absolute indents. + sal_uInt16 nPoolFmtId; // Id-for NumRules created "automatically" + sal_uInt16 nPoolHelpId; // HelpId for this Pool-style. + sal_uInt8 nPoolHlpFileId; // FilePos at Doc on style helps. + sal_Bool bAutoRuleFlag : 1; + sal_Bool bInvalidRuleFlag : 1; + sal_Bool bContinusNum : 1; // Continuous numbering without levels. + sal_Bool bAbsSpaces : 1; // Levels represent absolute indents. bool mbCountPhantoms; const SvxNumberFormat::SvxNumPositionAndSpaceMode meDefaultNumberFormatPositionAndSpaceMode; @@ -150,27 +150,27 @@ public: SwNumRule( const String& rNm, const SvxNumberFormat::SvxNumPositionAndSpaceMode eDefaultNumberFormatPositionAndSpaceMode, SwNumRuleType = NUM_RULE, - BOOL bAutoFlg = TRUE ); + sal_Bool bAutoFlg = sal_True ); SwNumRule( const SwNumRule& ); ~SwNumRule(); SwNumRule& operator=( const SwNumRule& ); - BOOL operator==( const SwNumRule& ) const; - BOOL operator!=( const SwNumRule& r ) const { return !(*this == r); } + sal_Bool operator==( const SwNumRule& ) const; + sal_Bool operator!=( const SwNumRule& r ) const { return !(*this == r); } - const SwNumFmt* GetNumFmt( USHORT i ) const; - const SwNumFmt& Get( USHORT i ) const; + const SwNumFmt* GetNumFmt( sal_uInt16 i ) const; + const SwNumFmt& Get( sal_uInt16 i ) const; - void Set( USHORT i, const SwNumFmt* ); - void Set( USHORT i, const SwNumFmt& ); - String MakeNumString( const SwNodeNum&, BOOL bInclStrings = TRUE, - BOOL bOnlyArabic = FALSE ) const; + void Set( sal_uInt16 i, const SwNumFmt* ); + void Set( sal_uInt16 i, const SwNumFmt& ); + String MakeNumString( const SwNodeNum&, sal_Bool bInclStrings = sal_True, + sal_Bool bOnlyArabic = sal_False ) const; // - add optional parameter <_nRestrictToThisLevel> in order to // restrict returned string to this level. String MakeNumString( const SwNumberTree::tNumberVector & rNumVector, - const BOOL bInclStrings = TRUE, - const BOOL bOnlyArabic = FALSE, + const sal_Bool bInclStrings = sal_True, + const sal_Bool bOnlyArabic = sal_False, const unsigned int _nRestrictToThisLevel = MAXLEVEL ) const; String MakeRefNumString( const SwNodeNum& rNodeNum, const bool bInclSuperiorNumLabels = false, @@ -208,12 +208,12 @@ public: static char* GetOutlineRuleName() { return pDefOutlineName; } - static USHORT GetNumIndent( BYTE nLvl ); - static USHORT GetBullIndent( BYTE nLvl ); + static sal_uInt16 GetNumIndent( sal_uInt8 nLvl ); + static sal_uInt16 GetBullIndent( sal_uInt8 nLvl ); SwNumRuleType GetRuleType() const { return eRuleType; } void SetRuleType( SwNumRuleType eNew ) { eRuleType = eNew; - bInvalidRuleFlag = TRUE; } + bInvalidRuleFlag = sal_True; } // A kind of copy-constructor to make sure the num formats are // attached to the correctCharFormats of a document!! @@ -229,32 +229,32 @@ public: void SetName( const String& rNm, IDocumentListsAccess& rDocListAccess ); - BOOL IsAutoRule() const { return bAutoRuleFlag; } - void SetAutoRule( BOOL bFlag ) { bAutoRuleFlag = bFlag; } + sal_Bool IsAutoRule() const { return bAutoRuleFlag; } + void SetAutoRule( sal_Bool bFlag ) { bAutoRuleFlag = bFlag; } - BOOL IsInvalidRule() const { return bInvalidRuleFlag; } - void SetInvalidRule( BOOL bFlag ); + sal_Bool IsInvalidRule() const { return bInvalidRuleFlag; } + void SetInvalidRule( sal_Bool bFlag ); - BOOL IsContinusNum() const { return bContinusNum; } - void SetContinusNum( BOOL bFlag ) { bContinusNum = bFlag; } + sal_Bool IsContinusNum() const { return bContinusNum; } + void SetContinusNum( sal_Bool bFlag ) { bContinusNum = bFlag; } - BOOL IsAbsSpaces() const { return bAbsSpaces; } - void SetAbsSpaces( BOOL bFlag ) { bAbsSpaces = bFlag; } + sal_Bool IsAbsSpaces() const { return bAbsSpaces; } + void SetAbsSpaces( sal_Bool bFlag ) { bAbsSpaces = bFlag; } - BOOL IsOutlineRule() const { return eRuleType == OUTLINE_RULE; } + sal_Bool IsOutlineRule() const { return eRuleType == OUTLINE_RULE; } bool IsCountPhantoms() const; void SetCountPhantoms(bool bCountPhantoms); // Query and set PoolFormat IDs. - USHORT GetPoolFmtId() const { return nPoolFmtId; } - void SetPoolFmtId( USHORT nId ) { nPoolFmtId = nId; } + sal_uInt16 GetPoolFmtId() const { return nPoolFmtId; } + void SetPoolFmtId( sal_uInt16 nId ) { nPoolFmtId = nId; } // Query and set Help-IDs for document styles. - USHORT GetPoolHelpId() const { return nPoolHelpId; } - void SetPoolHelpId( USHORT nId ) { nPoolHelpId = nId; } - BYTE GetPoolHlpFileId() const { return nPoolHlpFileId; } - void SetPoolHlpFileId( BYTE nId ) { nPoolHlpFileId = nId; } + sal_uInt16 GetPoolHelpId() const { return nPoolHelpId; } + void SetPoolHelpId( sal_uInt16 nId ) { nPoolHelpId = nId; } + sal_uInt8 GetPoolHlpFileId() const { return nPoolHlpFileId; } + void SetPoolHlpFileId( sal_uInt8 nId ) { nPoolHlpFileId = nId; } void SetSvxRule(const SvxNumRule&, SwDoc* pDoc); SvxNumRule MakeSvxNumRule() const; @@ -263,7 +263,7 @@ public: void ChangeIndent( const short nDiff ); // set indent of certain list level to given value void SetIndent( const short nNewIndent, - const USHORT nListLevel ); + const sal_uInt16 nListLevel ); // set indent of first list level to given value and change other list level's // indents accordingly void SetIndentOfFirstListLevelAndChangeOthers( const short nNewIndent ); @@ -298,7 +298,7 @@ namespace numfunc @author OD */ - sal_Unicode GetBulletChar( BYTE nLevel ); + sal_Unicode GetBulletChar( sal_uInt8 nLevel ); /** configuration, if at first position of the first list item the <TAB>-key increased the indent of the complete list or only demotes this list item. diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx index eb857b36dd55..0690a3d1b7ed 100644 --- a/sw/inc/pagedesc.hxx +++ b/sw/inc/pagedesc.hxx @@ -52,7 +52,7 @@ enum SwFtnAdj class SW_DLLPUBLIC SwPageFtnInfo { SwTwips nMaxHeight; // Maximum height of the footnote area. - ULONG nLineWidth; // Width of separator line. + sal_uLong nLineWidth; // Width of separator line. Color aLineColor; // Color of the separator line. Fraction aWidth; // Percentage width of the separator line. SwFtnAdj eAdj; // Line adjustment. @@ -61,7 +61,7 @@ class SW_DLLPUBLIC SwPageFtnInfo public: SwTwips GetHeight() const { return nMaxHeight; } - ULONG GetLineWidth() const { return nLineWidth; } + sal_uLong GetLineWidth() const { return nLineWidth; } const Color& GetLineColor() const { return aLineColor;} const Fraction& GetWidth() const { return aWidth; } SwFtnAdj GetAdj() const { return eAdj; } @@ -69,7 +69,7 @@ public: SwTwips GetBottomDist() const { return nBottomDist; } void SetHeight( SwTwips nNew ) { nMaxHeight = nNew; } - void SetLineWidth(ULONG nSet ) { nLineWidth = nSet; } + void SetLineWidth(sal_uLong nSet ) { nLineWidth = nSet; } void SetLineColor(const Color& rCol ) { aLineColor = rCol;} void SetWidth( const Fraction &rNew){ aWidth = rNew; } void SetAdj ( SwFtnAdj eNew ) { eAdj = eNew; } @@ -80,7 +80,7 @@ public: SwPageFtnInfo( const SwPageFtnInfo& ); SwPageFtnInfo& operator=( const SwPageFtnInfo& ); - BOOL operator ==( const SwPageFtnInfo& ) const; + sal_Bool operator ==( const SwPageFtnInfo& ) const; }; /* @@ -117,7 +117,7 @@ public: * document (contents are created or removed according to SHARE-information). */ -typedef USHORT UseOnPage; +typedef sal_uInt16 UseOnPage; namespace nsUseOnPage { const UseOnPage PD_NONE = 0x0000; // For internal use only. @@ -142,10 +142,10 @@ class SW_DLLPUBLIC SwPageDesc : public SwModify SwFrmFmt aLeft; SwDepend aDepend; // Because of grid alignment (Registerhaltigkeit). SwPageDesc *pFollow; - USHORT nRegHeight; // Sentence spacing and fontascent of style. - USHORT nRegAscent; // For grid alignment (Registerhaltigkeit). + sal_uInt16 nRegHeight; // Sentence spacing and fontascent of style. + sal_uInt16 nRegAscent; // For grid alignment (Registerhaltigkeit). UseOnPage eUse; - BOOL bLandscape; + sal_Bool bLandscape; // Footnote information. SwPageFtnInfo aFtnInfo; @@ -162,8 +162,8 @@ public: const String &GetName() const { return aDescName; } void SetName( const String& rNewName ) { aDescName = rNewName; } - BOOL GetLandscape() const { return bLandscape; } - void SetLandscape( BOOL bNew ) { bLandscape = bNew; } + sal_Bool GetLandscape() const { return bLandscape; } + void SetLandscape( sal_Bool bNew ) { bLandscape = bNew; } const SvxNumberType &GetNumType() const { return aNumType; } void SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; } @@ -172,10 +172,10 @@ public: SwPageFtnInfo &GetFtnInfo() { return aFtnInfo; } void SetFtnInfo( const SwPageFtnInfo &rNew ) { aFtnInfo = rNew; } - inline BOOL IsHeaderShared() const; - inline BOOL IsFooterShared() const; - inline void ChgHeaderShare( BOOL bNew ); - inline void ChgFooterShare( BOOL bNew ); + inline sal_Bool IsHeaderShared() const; + inline sal_Bool IsFooterShared() const; + inline void ChgHeaderShare( sal_Bool bNew ); + inline void ChgFooterShare( sal_Bool bNew ); inline void SetUseOn( UseOnPage eNew ); inline UseOnPage GetUseOn() const; @@ -200,10 +200,10 @@ public: inline SwFrmFmt *GetLeftFmt(); inline const SwFrmFmt *GetLeftFmt() const; - USHORT GetRegHeight() const { return nRegHeight; } - USHORT GetRegAscent() const { return nRegAscent; } - void SetRegHeight( USHORT nNew ){ nRegHeight = nNew; } - void SetRegAscent( USHORT nNew ){ nRegAscent = nNew; } + sal_uInt16 GetRegHeight() const { return nRegHeight; } + sal_uInt16 GetRegAscent() const { return nRegAscent; } + void SetRegHeight( sal_uInt16 nNew ){ nRegHeight = nNew; } + void SetRegAscent( sal_uInt16 nNew ){ nRegAscent = nNew; } inline void SetFollow( const SwPageDesc* pNew ); const SwPageDesc* GetFollow() const { return pFollow; } @@ -215,19 +215,19 @@ public: void RegisterChange(); // Query and set PoolFormat-Id. - USHORT GetPoolFmtId() const { return aMaster.GetPoolFmtId(); } - void SetPoolFmtId( USHORT nId ) { aMaster.SetPoolFmtId( nId ); } - USHORT GetPoolHelpId() const { return aMaster.GetPoolHelpId(); } - void SetPoolHelpId( USHORT nId ) { aMaster.SetPoolHelpId( nId ); } - BYTE GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); } - void SetPoolHlpFileId( BYTE nId ) { aMaster.SetPoolHlpFileId( nId ); } + sal_uInt16 GetPoolFmtId() const { return aMaster.GetPoolFmtId(); } + void SetPoolFmtId( sal_uInt16 nId ) { aMaster.SetPoolFmtId( nId ); } + sal_uInt16 GetPoolHelpId() const { return aMaster.GetPoolHelpId(); } + void SetPoolHelpId( sal_uInt16 nId ) { aMaster.SetPoolHelpId( nId ); } + sal_uInt8 GetPoolHlpFileId() const { return aMaster.GetPoolHlpFileId(); } + void SetPoolHlpFileId( sal_uInt8 nId ) { aMaster.SetPoolHlpFileId( nId ); } // Query information from Client. - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; const SwFrmFmt* GetPageFmtOfNode( const SwNode& rNd, - BOOL bCheckForThisPgDc = TRUE ) const; - BOOL IsFollowNextPageOfNode( const SwNode& rNd ) const; + sal_Bool bCheckForThisPgDc = sal_True ) const; + sal_Bool IsFollowNextPageOfNode( const SwNode& rNd ) const; //Given a SwNode return the pagedesc in use at that location. static const SwPageDesc* GetPageDescOfNode(const SwNode& rNd); @@ -243,22 +243,22 @@ inline void SwPageDesc::SetFollow( const SwPageDesc* pNew ) pFollow = pNew ? (SwPageDesc*)pNew : this; } -inline BOOL SwPageDesc::IsHeaderShared() const +inline sal_Bool SwPageDesc::IsHeaderShared() const { - return eUse & nsUseOnPage::PD_HEADERSHARE ? TRUE : FALSE; + return eUse & nsUseOnPage::PD_HEADERSHARE ? sal_True : sal_False; } -inline BOOL SwPageDesc::IsFooterShared() const +inline sal_Bool SwPageDesc::IsFooterShared() const { - return eUse & nsUseOnPage::PD_FOOTERSHARE ? TRUE : FALSE; + return eUse & nsUseOnPage::PD_FOOTERSHARE ? sal_True : sal_False; } -inline void SwPageDesc::ChgHeaderShare( BOOL bNew ) +inline void SwPageDesc::ChgHeaderShare( sal_Bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_HEADERSHARE); else eUse = (UseOnPage) (eUse & nsUseOnPage::PD_NOHEADERSHARE); } -inline void SwPageDesc::ChgFooterShare( BOOL bNew ) +inline void SwPageDesc::ChgFooterShare( sal_Bool bNew ) { if ( bNew ) eUse = (UseOnPage) (eUse | nsUseOnPage::PD_FOOTERSHARE); diff --git a/sw/inc/pageiter.hxx b/sw/inc/pageiter.hxx index 86b4c8e6cfd1..c0c6b6576b7c 100644 --- a/sw/inc/pageiter.hxx +++ b/sw/inc/pageiter.hxx @@ -42,11 +42,11 @@ class SwPageIter { public: SwPageIter( const SwDoc &rDoc, const SwPosition &rStartPos ); - BOOL IsEnd() const { return 0 == pPage; } - BOOL NextPage(); + sal_Bool IsEnd() const { return 0 == pPage; } + sal_Bool NextPage(); const SwPageDesc* GetPageDesc() const; - BOOL Seek( const SwPosition &rPos ); - BOOL GetPosition( SwPosition &rPos ) const; + sal_Bool Seek( const SwPosition &rPos ); + sal_Bool GetPosition( SwPosition &rPos ) const; }; diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx index 8b78fc7cc398..9d839475dbd5 100644 --- a/sw/inc/pam.hxx +++ b/sw/inc/pam.hxx @@ -73,12 +73,12 @@ struct SW_DLLPUBLIC SwPosition */ SwDoc * GetDoc() const; - BOOL operator < (const SwPosition &) const; - BOOL operator > (const SwPosition &) const; - BOOL operator <=(const SwPosition &) const; - BOOL operator >=(const SwPosition &) const; - BOOL operator ==(const SwPosition &) const; - BOOL operator !=(const SwPosition &) const; + sal_Bool operator < (const SwPosition &) const; + sal_Bool operator > (const SwPosition &) const; + sal_Bool operator <=(const SwPosition &) const; + sal_Bool operator >=(const SwPosition &) const; + sal_Bool operator ==(const SwPosition &) const; + sal_Bool operator !=(const SwPosition &) const; }; @@ -109,7 +109,7 @@ typedef SwMoveFnCollection* SwMoveFn; SW_DLLPUBLIC extern SwMoveFn fnMoveForward; // SwPam::Move()/Find() default argument. SW_DLLPUBLIC extern SwMoveFn fnMoveBackward; -typedef BOOL (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove ); +typedef sal_Bool (*SwGoInDoc)( SwPaM& rPam, SwMoveFn fnMove ); SW_DLLPUBLIC extern SwGoInDoc fnGoDoc; extern SwGoInDoc fnGoSection; SW_DLLPUBLIC extern SwGoInDoc fnGoNode; @@ -151,27 +151,27 @@ public: SwPaM& operator=( const SwPaM & ); // Movement of cursor. - BOOL Move( SwMoveFn fnMove = fnMoveForward, + sal_Bool Move( SwMoveFn fnMove = fnMoveForward, SwGoInDoc fnGo = fnGoCntnt ); // Search. - BYTE Find( const com::sun::star::util::SearchOptions& rSearchOpt, - BOOL bSearchInNotes, + sal_uInt8 Find( const com::sun::star::util::SearchOptions& rSearchOpt, + sal_Bool bSearchInNotes, utl::TextSearch& rSTxt, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE); - BOOL Find( const SwFmt& rFmt, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False); + sal_Bool Find( const SwFmt& rFmt, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE); - BOOL Find( const SfxPoolItem& rAttr, BOOL bValue = TRUE, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False); + sal_Bool Find( const SfxPoolItem& rAttr, sal_Bool bValue = sal_True, SwMoveFn fnMove = fnMoveForward, - const SwPaM *pPam =0, BOOL bInReadOnly = FALSE ); - BOOL Find( const SfxItemSet& rAttr, BOOL bNoColls, + const SwPaM *pPam =0, sal_Bool bInReadOnly = sal_False ); + sal_Bool Find( const SfxItemSet& rAttr, sal_Bool bNoColls, SwMoveFn fnMove, - const SwPaM *pPam, BOOL bInReadOnly, BOOL bMoveFirst ); + const SwPaM *pPam, sal_Bool bInReadOnly, sal_Bool bMoveFirst ); bool DoSearch( const com::sun::star::util::SearchOptions& rSearchOpt, utl::TextSearch& rSTxt, - SwMoveFn fnMove, BOOL bSrchForward, BOOL bRegSearch, BOOL bChkEmptyPara, BOOL bChkParaEnd, + SwMoveFn fnMove, sal_Bool bSrchForward, sal_Bool bRegSearch, sal_Bool bChkEmptyPara, sal_Bool bChkParaEnd, xub_StrLen &nStart, xub_StrLen &nEnde,xub_StrLen nTxtLen,SwNode* pNode, SwPaM* pPam); inline bool IsInFrontOfLabel() const { return m_bIsInFrontOfLabel; } @@ -239,10 +239,10 @@ public: /** Normalizes PaM, i.e. sort point and mark. - @param bPointFirst TRUE: If the point is behind the mark then swap. - FALSE: If the mark is behind the point then swap. + @param bPointFirst sal_True: If the point is behind the mark then swap. + sal_False: If the mark is behind the point then swap. */ - SwPaM & Normalize(BOOL bPointFirst = TRUE); + SwPaM & Normalize(sal_Bool bPointFirst = sal_True); /// @return the document (SwDoc) at which the PaM is registered SwDoc* GetDoc() const { return m_pPoint->nNode.GetNode().GetDoc(); } @@ -253,18 +253,18 @@ public: { return bOne ? m_Bound1 : m_Bound2; } // Get number of page which contains cursor. - USHORT GetPageNum( BOOL bAtPoint = TRUE, const Point* pLayPos = 0 ); + sal_uInt16 GetPageNum( sal_Bool bAtPoint = sal_True, const Point* pLayPos = 0 ); // Is in something protected (readonly) or selection contains // something protected. - BOOL HasReadonlySel( bool bFormView ) const; + sal_Bool HasReadonlySel( bool bFormView ) const; - BOOL ContainsPosition(const SwPosition & rPos) + sal_Bool ContainsPosition(const SwPosition & rPos) { return *Start() <= rPos && rPos <= *End(); } - static BOOL Overlap(const SwPaM & a, const SwPaM & b); + static sal_Bool Overlap(const SwPaM & a, const SwPaM & b); - static BOOL LessThan(const SwPaM & a, const SwPaM & b); + static sal_Bool LessThan(const SwPaM & a, const SwPaM & b); DECL_FIXEDMEMPOOL_NEWDEL(SwPaM); @@ -273,8 +273,8 @@ public: }; -BOOL CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, BOOL ); -BOOL GoInCntnt( SwPaM & rPam, SwMoveFn fnMove ); +sal_Bool CheckNodesRange( const SwNodeIndex&, const SwNodeIndex&, sal_Bool ); +sal_Bool GoInCntnt( SwPaM & rPam, SwMoveFn fnMove ); #endif // _PAM_HXX diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx index a07fe93974b0..54eff6a7cd26 100644 --- a/sw/inc/paratr.hxx +++ b/sw/inc/paratr.hxx @@ -39,7 +39,7 @@ class SwCharFmt; class IntlWrapper; -#define DROP_WHOLEWORD ((USHORT)0x0001) +#define DROP_WHOLEWORD ((sal_uInt16)0x0001) // If SwFmtDrop is a Client, it is the CharFmt that describes the font for the // DropCaps. If it is not a Client, formating uses the CharFmt of the paragraph. @@ -49,11 +49,11 @@ class SW_DLLPUBLIC SwFmtDrop: public SfxPoolItem, public SwClient { SwModify* pDefinedIn; // Modify-Object, that contains DropCaps. // Can only be TxtFmtCollection/TxtNode. - USHORT nDistance; // Distance to beginning of text. - USHORT nReadFmt; // For Sw3-Reader: CharFormat-Id (load Pool!). - BYTE nLines; // Line count. - BYTE nChars; // Character count. - BOOL bWholeWord; // First word with initials. + sal_uInt16 nDistance; // Distance to beginning of text. + sal_uInt16 nReadFmt; // For Sw3-Reader: CharFormat-Id (load Pool!). + sal_uInt8 nLines; // Line count. + sal_uInt8 nChars; // Character count. + sal_Bool bWholeWord; // First word with initials. public: TYPEINFO(); // Already in base class SwClient. @@ -75,27 +75,27 @@ 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); - inline BYTE GetLines() const { return nLines; } - inline BYTE &GetLines() { return nLines; } + inline sal_uInt8 GetLines() const { return nLines; } + inline sal_uInt8 &GetLines() { return nLines; } - inline BYTE GetChars() const { return nChars; } - inline BYTE &GetChars() { return nChars; } + inline sal_uInt8 GetChars() const { return nChars; } + inline sal_uInt8 &GetChars() { return nChars; } - inline BOOL GetWholeWord() const { return bWholeWord; } - inline BYTE &GetWholeWord() { return bWholeWord; } + inline sal_Bool GetWholeWord() const { return bWholeWord; } + inline sal_uInt8 &GetWholeWord() { return bWholeWord; } - inline USHORT GetDistance() const { return nDistance; } - inline USHORT &GetDistance() { return nDistance; } + inline sal_uInt16 GetDistance() const { return nDistance; } + inline sal_uInt16 &GetDistance() { return nDistance; } inline const SwCharFmt *GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; } inline SwCharFmt *GetCharFmt() { return (SwCharFmt*)pRegisteredIn; } void SetCharFmt( SwCharFmt *pNew ); virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // Get information from Client. - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // Get and set Modify pointer. inline const SwModify* GetDefinedIn() const { return pDefinedIn; } @@ -108,7 +108,7 @@ class SwRegisterItem : public SfxBoolItem public: TYPEINFO(); - inline SwRegisterItem( const BOOL bRegister = FALSE ); + inline SwRegisterItem( const sal_Bool bRegister = sal_False ); // @@@ public copy assignment, but no copy ctor? inline SwRegisterItem& operator=( const SwRegisterItem& rRegister ); @@ -122,7 +122,7 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline SwRegisterItem::SwRegisterItem( const BOOL bRegister ) : +inline SwRegisterItem::SwRegisterItem( const sal_Bool bRegister ) : SfxBoolItem( RES_PARATR_REGISTER, bRegister ) {} @@ -159,8 +159,8 @@ public: String &rText, const IntlWrapper* pIntl = 0 ) const; - virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const; - virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId ); + virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ); }; class SwParaConnectBorderItem : public SfxBoolItem @@ -168,7 +168,7 @@ class SwParaConnectBorderItem : public SfxBoolItem public: TYPEINFO(); - inline SwParaConnectBorderItem( const BOOL bConnect = TRUE ); + inline SwParaConnectBorderItem( const sal_Bool bConnect = sal_True ); // @@@ public copy assignment, but no copy ctor? inline SwParaConnectBorderItem& operator=( const SwParaConnectBorderItem& rConnect ); @@ -182,7 +182,7 @@ public: const IntlWrapper* pIntl = 0 ) const; }; -inline SwParaConnectBorderItem::SwParaConnectBorderItem( const BOOL bConnect ) : +inline SwParaConnectBorderItem::SwParaConnectBorderItem( const sal_Bool bConnect ) : SfxBoolItem( RES_PARATR_CONNECT_BORDER, bConnect ) {} @@ -199,74 +199,74 @@ inline SwParaConnectBorderItem& SwParaConnectBorderItem::operator=( * Implementation of paragraph-attributes methods of SwAttrSet ******************************************************************************/ -inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(BOOL bInP) const +inline const SvxLineSpacingItem &SwAttrSet::GetLineSpacing(sal_Bool bInP) const { return (const SvxLineSpacingItem&)Get( RES_PARATR_LINESPACING,bInP); } -inline const SvxAdjustItem &SwAttrSet::GetAdjust(BOOL bInP) const +inline const SvxAdjustItem &SwAttrSet::GetAdjust(sal_Bool bInP) const { return (const SvxAdjustItem&)Get( RES_PARATR_ADJUST,bInP); } -inline const SvxFmtSplitItem &SwAttrSet::GetSplit(BOOL bInP) const +inline const SvxFmtSplitItem &SwAttrSet::GetSplit(sal_Bool bInP) const { return (const SvxFmtSplitItem&)Get( RES_PARATR_SPLIT,bInP); } -inline const SwRegisterItem &SwAttrSet::GetRegister(BOOL bInP) const +inline const SwRegisterItem &SwAttrSet::GetRegister(sal_Bool bInP) const { return (const SwRegisterItem&)Get( RES_PARATR_REGISTER,bInP); } -inline const SvxWidowsItem &SwAttrSet::GetWidows(BOOL bInP) const +inline const SvxWidowsItem &SwAttrSet::GetWidows(sal_Bool bInP) const { return (const SvxWidowsItem&)Get( RES_PARATR_WIDOWS,bInP); } -inline const SvxOrphansItem &SwAttrSet::GetOrphans(BOOL bInP) const +inline const SvxOrphansItem &SwAttrSet::GetOrphans(sal_Bool bInP) const { return (const SvxOrphansItem&)Get( RES_PARATR_ORPHANS,bInP); } -inline const SvxTabStopItem &SwAttrSet::GetTabStops(BOOL bInP) const +inline const SvxTabStopItem &SwAttrSet::GetTabStops(sal_Bool bInP) const { return (const SvxTabStopItem&)Get( RES_PARATR_TABSTOP,bInP); } -inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(BOOL bInP) const +inline const SvxHyphenZoneItem &SwAttrSet::GetHyphenZone(sal_Bool bInP) const { return (const SvxHyphenZoneItem&)Get(RES_PARATR_HYPHENZONE,bInP); } -inline const SwFmtDrop &SwAttrSet::GetDrop(BOOL bInP) const +inline const SwFmtDrop &SwAttrSet::GetDrop(sal_Bool bInP) const { return (const SwFmtDrop&)Get(RES_PARATR_DROP,bInP); } -inline const SwNumRuleItem &SwAttrSet::GetNumRule(BOOL bInP) const +inline const SwNumRuleItem &SwAttrSet::GetNumRule(sal_Bool bInP) const { return (const SwNumRuleItem&)Get(RES_PARATR_NUMRULE,bInP); } -inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(BOOL bInP) const +inline const SvxScriptSpaceItem& SwAttrSet::GetScriptSpace(sal_Bool bInP) const { return (const SvxScriptSpaceItem&)Get(RES_PARATR_SCRIPTSPACE,bInP); } -inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(BOOL bInP) const +inline const SvxHangingPunctuationItem &SwAttrSet::GetHangingPunctuation(sal_Bool bInP) const { return (const SvxHangingPunctuationItem&)Get(RES_PARATR_HANGINGPUNCTUATION,bInP); } -inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(BOOL bInP) const +inline const SvxForbiddenRuleItem &SwAttrSet::GetForbiddenRule(sal_Bool bInP) const { return (const SvxForbiddenRuleItem&)Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(BOOL bInP) const +inline const SvxParaVertAlignItem &SwAttrSet::GetParaVertAlign(sal_Bool bInP) const { return (const SvxParaVertAlignItem&)Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwAttrSet::GetParaGrid(BOOL bInP) const +inline const SvxParaGridItem &SwAttrSet::GetParaGrid(sal_Bool bInP) const { return (const SvxParaGridItem&)Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(BOOL bInP) const +inline const SwParaConnectBorderItem &SwAttrSet::GetParaConnectBorder(sal_Bool bInP) const { return (const SwParaConnectBorderItem&)Get( RES_PARATR_CONNECT_BORDER, bInP ); } /****************************************************************************** * Implementation of paragraph-attributes methods of SwFmt ******************************************************************************/ -inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(BOOL bInP) const +inline const SvxLineSpacingItem &SwFmt::GetLineSpacing(sal_Bool bInP) const { return aSet.GetLineSpacing(bInP); } -inline const SvxAdjustItem &SwFmt::GetAdjust(BOOL bInP) const +inline const SvxAdjustItem &SwFmt::GetAdjust(sal_Bool bInP) const { return aSet.GetAdjust(bInP); } -inline const SvxFmtSplitItem &SwFmt::GetSplit(BOOL bInP) const +inline const SvxFmtSplitItem &SwFmt::GetSplit(sal_Bool bInP) const { return aSet.GetSplit(bInP); } -inline const SwRegisterItem &SwFmt::GetRegister(BOOL bInP) const +inline const SwRegisterItem &SwFmt::GetRegister(sal_Bool bInP) const { return aSet.GetRegister(bInP); } -inline const SvxWidowsItem &SwFmt::GetWidows(BOOL bInP) const +inline const SvxWidowsItem &SwFmt::GetWidows(sal_Bool bInP) const { return aSet.GetWidows(bInP); } -inline const SvxOrphansItem &SwFmt::GetOrphans(BOOL bInP) const +inline const SvxOrphansItem &SwFmt::GetOrphans(sal_Bool bInP) const { return aSet.GetOrphans(bInP); } -inline const SvxTabStopItem &SwFmt::GetTabStops(BOOL bInP) const +inline const SvxTabStopItem &SwFmt::GetTabStops(sal_Bool bInP) const { return aSet.GetTabStops(bInP); } -inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(BOOL bInP) const +inline const SvxHyphenZoneItem &SwFmt::GetHyphenZone(sal_Bool bInP) const { return aSet.GetHyphenZone(bInP); } -inline const SwFmtDrop &SwFmt::GetDrop(BOOL bInP) const +inline const SwFmtDrop &SwFmt::GetDrop(sal_Bool bInP) const { return aSet.GetDrop(bInP); } -inline const SwNumRuleItem &SwFmt::GetNumRule(BOOL bInP) const +inline const SwNumRuleItem &SwFmt::GetNumRule(sal_Bool bInP) const { return aSet.GetNumRule(bInP); } -inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(BOOL bInP) const +inline const SvxScriptSpaceItem& SwFmt::GetScriptSpace(sal_Bool bInP) const { return aSet.GetScriptSpace(bInP) ; } -inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(BOOL bInP) const +inline const SvxHangingPunctuationItem &SwFmt::GetHangingPunctuation(sal_Bool bInP) const { return aSet.GetHangingPunctuation(bInP) ; } -inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(BOOL bInP) const +inline const SvxForbiddenRuleItem &SwFmt::GetForbiddenRule(sal_Bool bInP) const { return (const SvxForbiddenRuleItem&)aSet.Get(RES_PARATR_FORBIDDEN_RULES, bInP); } -inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(BOOL bInP) const +inline const SvxParaVertAlignItem &SwFmt::GetParaVertAlign(sal_Bool bInP) const { return (const SvxParaVertAlignItem&)aSet.Get( RES_PARATR_VERTALIGN, bInP ); } -inline const SvxParaGridItem &SwFmt::GetParaGrid(BOOL bInP) const +inline const SvxParaGridItem &SwFmt::GetParaGrid(sal_Bool bInP) const { return (const SvxParaGridItem&)aSet.Get( RES_PARATR_SNAPTOGRID, bInP ); } -inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(BOOL bInP) const +inline const SwParaConnectBorderItem &SwFmt::GetParaConnectBorder(sal_Bool bInP) const { return (const SwParaConnectBorderItem&)aSet.Get( RES_PARATR_CONNECT_BORDER, bInP ); } #endif diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index f77bb6a62f9d..63fef819d135 100644..100755 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -660,7 +660,6 @@ #include "unotools/pathoptions.hxx" #include "svl/poolitem.hxx" #include "svtools/prgsbar.hxx" -#include "svtools/printdlg.hxx" #include "svtools/prnsetup.hxx" #include "svl/ptitem.hxx" #include "svl/rectitem.hxx" @@ -748,7 +747,7 @@ #include "svx/globlmn.hrc" #include "svx/grafctrl.hxx" #include "editeng/hangulhanja.hxx" -#include "svx/hdft2.hxx" +#include "svx/hdft.hxx" #include "svtools/htmlcfg.hxx" #include "svx/htmlmode.hxx" #include "svx/hyperdlg.hxx" @@ -910,14 +909,14 @@ #include "vcl/event.hxx" #include "vcl/field.hxx" #include "vcl/fixed.hxx" -#include "vcl/fldunit.hxx" +#include "tools/fldunit.hxx" #include "vcl/font.hxx" #include "unotools/fontcvt.hxx" #include "vcl/graph.hxx" #include "vcl/group.hxx" #include "vcl/help.hxx" #include "vcl/image.hxx" -#include "vcl/imagebtn.hxx" +#include "vcl/button.hxx" #include "vcl/inputctx.hxx" #include "vcl/jobset.hxx" #include "vcl/keycod.hxx" @@ -947,7 +946,7 @@ #include "vcl/virdev.hxx" #include "vcl/waitobj.hxx" #include "vcl/window.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vcl/wrkwin.hxx" #include "rtl/ref.hxx" diff --git a/sw/inc/poolfmt.awk b/sw/inc/poolfmt.awk index e9e333097020..42e31bab981e 100644 --- a/sw/inc/poolfmt.awk +++ b/sw/inc/poolfmt.awk @@ -1,11 +1,28 @@ #************************************************************************* -#* -#* $Workfile: dbgxtor.awk -#* -#* $Logfile: T:/sw/inc/poolfmt.awv $ -#* -#* Copyright (c) 1990-1996, STAR DIVISION -#* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. +# +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# OpenOffice.org is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License version 3 +# only, as published by the Free Software Foundation. +# +# OpenOffice.org is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License version 3 for more details +# (a copy is included in the LICENSE file that accompanied this code). +# +# You should have received a copy of the GNU Lesser General Public License +# version 3 along with OpenOffice.org. If not, see +# <http://www.openoffice.org/license.html> +# for a copy of the LGPLv3 License. +# #************************************************************************* # diff --git a/sw/inc/poolfmt.hrc b/sw/inc/poolfmt.hrc index f191f0fac78c..e68de680c243 100644 --- a/sw/inc/poolfmt.hrc +++ b/sw/inc/poolfmt.hrc @@ -268,7 +268,14 @@ #define STR_POOLNUMRULE_BUL3 (RC_POOLNUMRULE_BEGIN+ 7) #define STR_POOLNUMRULE_BUL4 (RC_POOLNUMRULE_BEGIN+ 8) #define STR_POOLNUMRULE_BUL5 (RC_POOLNUMRULE_BEGIN+ 9) - +//IAccessibility2 Impplementaton 2009----- +//Solution:Define column item's accessible name ID. +#define STR_COLUMN_VALUESET_ITEM0 (RC_POOLNUMRULE_BEGIN + 10 ) +#define STR_COLUMN_VALUESET_ITEM1 (RC_POOLNUMRULE_BEGIN + 11 ) +#define STR_COLUMN_VALUESET_ITEM2 (RC_POOLNUMRULE_BEGIN + 12 ) +#define STR_COLUMN_VALUESET_ITEM3 (RC_POOLNUMRULE_BEGIN + 13 ) +#define STR_COLUMN_VALUESET_ITEM4 (RC_POOLNUMRULE_BEGIN + 14 ) +//-----IAccessibility2 Impplementaton 2009 //----------------- // Paragraph styles //----------------- diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx index e235cf1ee504..d222cf3c2234 100644 --- a/sw/inc/poolfmt.hxx +++ b/sw/inc/poolfmt.hxx @@ -54,7 +54,7 @@ // 3 - Absatzformate (?) // 4 - Grafikformate (?) -// Fr alle IDs gilt: +// F�r alle IDs gilt: // Herkunft: 0 -Pool // 1 -Benutzer // Offset: innerhalb der Gruppe @@ -70,37 +70,37 @@ // Maske fuer Erkennung von COLLPOOL-Ids: -const USHORT POOLGRP_NOCOLLID = (1 << 10); +const sal_uInt16 POOLGRP_NOCOLLID = (1 << 10); // POLLCOLL-Gruppen: -const USHORT USER_FMT = (1 << 15); -const USHORT POOL_FMT = (0 << 15); +const sal_uInt16 USER_FMT = (1 << 15); +const sal_uInt16 POOL_FMT = (0 << 15); -const USHORT COLL_TEXT_BITS = (1 << 11); -const USHORT COLL_LISTS_BITS = (2 << 11); -const USHORT COLL_EXTRA_BITS = (3 << 11); -const USHORT COLL_REGISTER_BITS = (4 << 11); -const USHORT COLL_DOC_BITS = (5 << 11); -const USHORT COLL_HTML_BITS = (6 << 11); -const USHORT COLL_GET_RANGE_BITS = (15 << 11); +const sal_uInt16 COLL_TEXT_BITS = (1 << 11); +const sal_uInt16 COLL_LISTS_BITS = (2 << 11); +const sal_uInt16 COLL_EXTRA_BITS = (3 << 11); +const sal_uInt16 COLL_REGISTER_BITS = (4 << 11); +const sal_uInt16 COLL_DOC_BITS = (5 << 11); +const sal_uInt16 COLL_HTML_BITS = (6 << 11); +const sal_uInt16 COLL_GET_RANGE_BITS = (15 << 11); // Sonstige Gruppen: -const USHORT POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID; -const USHORT POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_CHARFMT = (0 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_FRAMEFMT = (1 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_PAGEDESC = (2 << 11) + POOLGRP_NOCOLLID; +const sal_uInt16 POOLGRP_NUMRULE = (3 << 11) + POOLGRP_NOCOLLID; // fuer Erkennung ob Benutzer-Vorlage oder nicht: -const USHORT POOL_IDUSER_FMT = +const sal_uInt16 POOL_IDUSER_FMT = USHRT_MAX & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID); -inline BOOL IsPoolUserFmt( USHORT nId ) +inline sal_Bool IsPoolUserFmt( sal_uInt16 nId ) { return POOL_IDUSER_FMT == (nId & ~(COLL_GET_RANGE_BITS + POOLGRP_NOCOLLID)) - ? TRUE : FALSE; + ? sal_True : sal_False; } @@ -423,11 +423,11 @@ RES_POOLCOLL_HTML_END // returnt: 0 -> Standard // USHRT_MAX -> kein Parent // sonst -> den Parent -USHORT GetPoolParent( USHORT nId ); +sal_uInt16 GetPoolParent( sal_uInt16 nId ); -SvxFrameDirection GetDefaultFrameDirection(ULONG nLanguage); +SvxFrameDirection GetDefaultFrameDirection(sal_uLong nLanguage); -inline BOOL IsConditionalByPoolId(USHORT nId) +inline sal_Bool IsConditionalByPoolId(sal_uInt16 nId) { return RES_POOLCOLL_TEXT == nId; } diff --git a/sw/inc/postithelper.hxx b/sw/inc/postithelper.hxx index 9884a140b312..6552a5680a9e 100644 --- a/sw/inc/postithelper.hxx +++ b/sw/inc/postithelper.hxx @@ -58,7 +58,7 @@ struct SwLayoutInfo SwRect mPagePrtArea; unsigned long mnPageNumber; sw::sidebarwindows::SidebarPosition meSidebarPosition; - USHORT mRedlineAuthor; + sal_uInt16 mRedlineAuthor; SwLayoutInfo() : mpAnchorFrm(0) diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx index ba71f976ceb6..a93ff9957695 100644 --- a/sw/inc/printdata.hxx +++ b/sw/inc/printdata.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SW_PRINTDATA_HXX -#define _SW_PRINTDATA_HXX +#ifndef SW_PRINTDATA_HXX +#define SW_PRINTDATA_HXX #include <sal/types.h> @@ -46,7 +46,6 @@ class _SetGetExpFlds; class SwViewOption; class OutputDevice; class SwViewOptionAdjust_Impl; -class SwPrtOptions; class SwWrtShell; class SfxViewShell; @@ -249,7 +248,7 @@ class SwRenderData // the view options to be applied for printing SwViewOptionAdjust_Impl * m_pViewOptionAdjust; - SwPrtOptions * m_pPrtOptions; + SwPrintData * m_pPrtOptions; public: @@ -270,14 +269,14 @@ public: bool IsViewOptionAdjust() const { return m_pViewOptionAdjust != 0; } bool NeedNewViewOptionAdjust( const SwWrtShell& ) const; void ViewOptionAdjustStart( SwWrtShell &rSh, const SwViewOption &rViewOptions ); - void ViewOptionAdjust( const SwPrtOptions *pPrtOptions ); + void ViewOptionAdjust( SwPrintData const*const pPrtOptions ); void ViewOptionAdjustStop(); bool HasSwPrtOptions() const { return m_pPrtOptions != 0; } - void SetSwPrtOptions( SwPrtOptions * pOpt ) { m_pPrtOptions = pOpt; } - const SwPrtOptions * GetSwPrtOptions() const { return m_pPrtOptions; } - SwPrtOptions & GetSwPrtOptionsRef() { return *m_pPrtOptions; } - void MakeSwPrtOptions( SwPrtOptions &rOptions, const SwDocShell *pDocShell, + void SetSwPrtOptions(SwPrintData *const pOpt) { m_pPrtOptions = pOpt; } + SwPrintData const* GetSwPrtOptions() const { return m_pPrtOptions; } + SwPrintData & GetSwPrtOptionsRef() { return *m_pPrtOptions; } + void MakeSwPrtOptions( SwPrintData & rOptions, const SwDocShell *pDocShell, const SwPrintUIOptions *pOpt, const SwRenderData *pData, bool bIsPDFExport ); @@ -321,6 +320,18 @@ public: //////////////////////////////////////////////////////////// -#endif //_SW_PRINTDATA_HXX +// last remnants of swprtopt.hxx: +#define POSTITS_NONE 0 +#define POSTITS_ONLY 1 +#define POSTITS_ENDDOC 2 +#define POSTITS_ENDPAGE 3 + +namespace sw { + +void InitPrintOptionsFromApplication(SwPrintData & o_rData, bool const bWeb); + +} // namespace sw + +#endif // SW_PRINTDATA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx new file mode 100644 index 000000000000..a2c47fd47066 --- /dev/null +++ b/sw/inc/prtopt.hxx @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef _PRTOPT_HXX +#define _PRTOPT_HXX + +#include <unotools/configitem.hxx> +#include <printdata.hxx> + +class SwPrintOptions : public SwPrintData, public utl::ConfigItem +{ + sal_Bool bIsWeb; + + com::sun::star::uno::Sequence<rtl::OUString> GetPropertyNames(); +public: + SwPrintOptions(sal_Bool bWeb); + virtual ~SwPrintOptions(); + + virtual void Commit(); + virtual void Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); + virtual void doSetModified( ) { bModified = sal_True; SetModified();} + + SwPrintOptions& operator=(const SwPrintData& rData) + { + SwPrintData::operator=( rData ); + SetModified(); + return *this; + } +}; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx index 8c1b2bb5f8bc..99f1e7ef52cc 100644 --- a/sw/inc/pvprtdat.hxx +++ b/sw/inc/pvprtdat.hxx @@ -34,11 +34,11 @@ class SwPagePreViewPrtData { - ULONG nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, + sal_uLong nLeftSpace, nRightSpace, nTopSpace, nBottomSpace, nHorzSpace, nVertSpace; - BYTE nRow, nCol; - BOOL bLandscape : 1; - BOOL bStretch : 1; + sal_uInt8 nRow, nCol; + sal_Bool bLandscape : 1; + sal_Bool bStretch : 1; public: SwPagePreViewPrtData() : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0), @@ -46,32 +46,32 @@ public: bLandscape(0),bStretch(0) {} - ULONG GetLeftSpace() const { return nLeftSpace; } - void SetLeftSpace( ULONG n ) { nLeftSpace = n; } + sal_uLong GetLeftSpace() const { return nLeftSpace; } + void SetLeftSpace( sal_uLong n ) { nLeftSpace = n; } - ULONG GetRightSpace() const { return nRightSpace; } - void SetRightSpace( ULONG n ) { nRightSpace = n; } + sal_uLong GetRightSpace() const { return nRightSpace; } + void SetRightSpace( sal_uLong n ) { nRightSpace = n; } - ULONG GetTopSpace() const { return nTopSpace; } - void SetTopSpace( ULONG n ) { nTopSpace = n; } + sal_uLong GetTopSpace() const { return nTopSpace; } + void SetTopSpace( sal_uLong n ) { nTopSpace = n; } - ULONG GetBottomSpace() const { return nBottomSpace; } - void SetBottomSpace( ULONG n ) { nBottomSpace = n; } + sal_uLong GetBottomSpace() const { return nBottomSpace; } + void SetBottomSpace( sal_uLong n ) { nBottomSpace = n; } - ULONG GetHorzSpace() const { return nHorzSpace; } - void SetHorzSpace( ULONG n ) { nHorzSpace = n; } + sal_uLong GetHorzSpace() const { return nHorzSpace; } + void SetHorzSpace( sal_uLong n ) { nHorzSpace = n; } - ULONG GetVertSpace() const { return nVertSpace; } - void SetVertSpace( ULONG n ) { nVertSpace = n; } + sal_uLong GetVertSpace() const { return nVertSpace; } + void SetVertSpace( sal_uLong n ) { nVertSpace = n; } - BYTE GetRow() const { return nRow; } - void SetRow(BYTE n ) { nRow = n; } + sal_uInt8 GetRow() const { return nRow; } + void SetRow(sal_uInt8 n ) { nRow = n; } - BYTE GetCol() const { return nCol; } - void SetCol( BYTE n ) { nCol = n; } + sal_uInt8 GetCol() const { return nCol; } + void SetCol( sal_uInt8 n ) { nCol = n; } - BOOL GetLandscape() const { return bLandscape; } - void SetLandscape( BOOL b ) { bLandscape = b; } + sal_Bool GetLandscape() const { return bLandscape; } + void SetLandscape( sal_Bool b ) { bLandscape = b; } }; diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx index 39f3c62a2385..ac1140820877 100644 --- a/sw/inc/redline.hxx +++ b/sw/inc/redline.hxx @@ -63,9 +63,9 @@ class SwRedlineExtraData_FmtColl : public SwRedlineExtraData { String sFmtNm; SfxItemSet* pSet; - USHORT nPoolId; + sal_uInt16 nPoolId; public: - SwRedlineExtraData_FmtColl( const String& rColl, USHORT nPoolFmtId, + SwRedlineExtraData_FmtColl( const String& rColl, sal_uInt16 nPoolFmtId, const SfxItemSet* pSet = 0 ); virtual ~SwRedlineExtraData_FmtColl(); virtual SwRedlineExtraData* CreateNew() const; @@ -99,14 +99,14 @@ class SW_DLLPUBLIC SwRedlineData String sComment; DateTime aStamp; RedlineType_t eType; - USHORT nAuthor, nSeqNo; + sal_uInt16 nAuthor, nSeqNo; public: - SwRedlineData( RedlineType_t eT, USHORT nAut ); - SwRedlineData( const SwRedlineData& rCpy, BOOL bCpyNext = TRUE ); + SwRedlineData( RedlineType_t eT, sal_uInt16 nAut ); + SwRedlineData( const SwRedlineData& rCpy, sal_Bool bCpyNext = sal_True ); // fuer sw3io: pNext/pExtraData gehen in eigenen Besitz ueber! - SwRedlineData( RedlineType_t eT, USHORT nAut, const DateTime& rDT, + SwRedlineData( RedlineType_t eT, sal_uInt16 nAut, const DateTime& rDT, const String& rCmnt, SwRedlineData* pNxt, SwRedlineExtraData* pExtraData = 0 ); @@ -129,7 +129,7 @@ public: RedlineType_t GetType() const { return ((RedlineType_t)(eType & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } RedlineType_t GetRealType() const { return eType; } - USHORT GetAuthor() const { return nAuthor; } + sal_uInt16 GetAuthor() const { return nAuthor; } const String& GetComment() const { return sComment; } const DateTime& GetTimeStamp() const { return aStamp; } inline const SwRedlineData* Next() const{ return pNext; } @@ -161,8 +161,8 @@ public: // fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur // fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei, // das es noch weitere geben kann! - USHORT GetSeqNo() const { return nSeqNo; } - void SetSeqNo( USHORT nNo ) { nSeqNo = nNo; } + sal_uInt16 GetSeqNo() const { return nSeqNo; } + void SetSeqNo( sal_uInt16 nNo ) { nSeqNo = nNo; } String GetDescr() const; }; @@ -172,9 +172,9 @@ class SW_DLLPUBLIC SwRedline : public SwPaM { SwRedlineData* pRedlineData; SwNodeIndex* pCntntSect; - BOOL bDelLastPara : 1; - BOOL bIsLastParaDelete : 1; - BOOL bIsVisible : 1; + sal_Bool bDelLastPara : 1; + sal_Bool bIsLastParaDelete : 1; + sal_Bool bIsVisible : 1; void MoveToSection(); void CopyToSection(); @@ -186,8 +186,8 @@ public: SwRedline( const SwRedlineData& rData, const SwPaM& rPam ); SwRedline( const SwRedlineData& rData, const SwPosition& rPos ); // fuer sw3io: pData geht in eigenen Besitz ueber! - SwRedline(SwRedlineData* pData, const SwPosition& rPos, BOOL bVsbl, - BOOL bDelLP, BOOL bIsPD) : + SwRedline(SwRedlineData* pData, const SwPosition& rPos, sal_Bool bVsbl, + sal_Bool bDelLP, sal_Bool bIsPD) : SwPaM( rPos ), pRedlineData( pData ), pCntntSect( 0 ), bDelLastPara( bDelLP ), bIsLastParaDelete( bIsPD ), bIsVisible( bVsbl ) {} @@ -198,11 +198,11 @@ public: // fuers Undo void SetContentIdx( const SwNodeIndex* ); - BOOL IsVisible() const { return bIsVisible; } - BOOL IsDelLastPara() const { return bDelLastPara; } + sal_Bool IsVisible() const { return bIsVisible; } + sal_Bool IsDelLastPara() const { return bDelLastPara; } - // das BOOL besagt, ob nach dem setzen der Pos kein Bereich mehr - // aufgespannt ist. -> TRUE, ansonten Bereich und FALSE + // das sal_Bool besagt, ob nach dem setzen der Pos kein Bereich mehr + // aufgespannt ist. -> sal_True, ansonten Bereich und sal_False void SetStart( const SwPosition& rPos, SwPosition* pSttPtr = 0 ) { if( !pSttPtr ) pSttPtr = Start(); @@ -214,23 +214,23 @@ public: *pEndPtr = rPos; } // liegt eine gueltige Selektion vor? - BOOL HasValidRange() const; + sal_Bool HasValidRange() const; - const SwRedlineData& GetRedlineData(USHORT nPos = 0) const; + const SwRedlineData& GetRedlineData(sal_uInt16 nPos = 0) const; int operator==( const SwRedlineData& rCmp ) const { return *pRedlineData == rCmp; } int operator!=( const SwRedlineData& rCmp ) const { return *pRedlineData != rCmp; } void SetAutoFmtFlag() { pRedlineData->SetAutoFmtFlag(); } - USHORT GetStackCount() const; - USHORT GetAuthor( USHORT nPos = 0) const; - const String& GetAuthorString( USHORT nPos = 0 ) const; - const DateTime& GetTimeStamp( USHORT nPos = 0) const; - RedlineType_t GetRealType( USHORT nPos = 0 ) const; - RedlineType_t GetType( USHORT nPos = 0) const + sal_uInt16 GetStackCount() const; + sal_uInt16 GetAuthor( sal_uInt16 nPos = 0) const; + const String& GetAuthorString( sal_uInt16 nPos = 0 ) const; + const DateTime& GetTimeStamp( sal_uInt16 nPos = 0) const; + RedlineType_t GetRealType( sal_uInt16 nPos = 0 ) const; + RedlineType_t GetType( sal_uInt16 nPos = 0) const { return ( (RedlineType_t)(GetRealType( nPos ) & nsRedlineType_t::REDLINE_NO_FLAG_MASK)); } - const String& GetComment( USHORT nPos = 0 ) const; + const String& GetComment( sal_uInt16 nPos = 0 ) const; void SetComment( const String& rS ) { pRedlineData->SetComment( rS ); } @@ -244,29 +244,29 @@ public: // fuers UI-seitige zusammenfassen von Redline-Actionen. Wird z.Z. nur // fuers Autoformat mit Redline benoetigt. Der Wert != 0 bedeutet dabei, // das es noch weitere geben kann! - USHORT GetSeqNo() const { return pRedlineData->GetSeqNo(); } - void SetSeqNo( USHORT nNo ) { pRedlineData->SetSeqNo( nNo ); } + sal_uInt16 GetSeqNo() const { return pRedlineData->GetSeqNo(); } + void SetSeqNo( sal_uInt16 nNo ) { pRedlineData->SetSeqNo( nNo ); } // Beim Hide/ShowOriginal wird 2 mal ueber die Liste gelaufen, damit // die Del-Redlines per Copy und Delete versteckt werden. Beim Move // wird sonst die Attributierung falsch behandelt. // Alle anderen Aufrufer muessen immer 0 angeben. - void CallDisplayFunc( USHORT nLoop = 0 ); - void Show( USHORT nLoop = 0 ); - void Hide( USHORT nLoop = 0 ); - void ShowOriginal( USHORT nLoop = 0 ); + void CallDisplayFunc( sal_uInt16 nLoop = 0 ); + void Show( sal_uInt16 nLoop = 0 ); + void Hide( sal_uInt16 nLoop = 0 ); + void ShowOriginal( sal_uInt16 nLoop = 0 ); // calculates the intersection with text node number nNdIdx - void CalcStartEnd( ULONG nNdIdx, USHORT& nStart, USHORT& nEnd ) const; + void CalcStartEnd( sal_uLong nNdIdx, sal_uInt16& nStart, sal_uInt16& nEnd ) const; void InvalidateRange(); // das Layout anstossen - BOOL IsOwnRedline( const SwRedline& rRedl ) const + sal_Bool IsOwnRedline( const SwRedline& rRedl ) const { return GetAuthor() == rRedl.GetAuthor(); } - BOOL CanCombine( const SwRedline& rRedl ) const; + sal_Bool CanCombine( const SwRedline& rRedl ) const; - void PushData( const SwRedline& rRedl, BOOL bOwnAsNext = TRUE ); - BOOL PopData(); + void PushData( const SwRedline& rRedl, sal_Bool bOwnAsNext = sal_True ); + sal_Bool PopData(); /** Returns textual description of this a redline data element of @@ -279,7 +279,7 @@ public: @return textual description of the selected redline data element */ - String GetDescr(USHORT nPos = 0); + String GetDescr(sal_uInt16 nPos = 0); int operator==( const SwRedline& ) const; int operator<( const SwRedline& ) const; diff --git a/sw/inc/redlnaut.hxx b/sw/inc/redlnaut.hxx index 7d07ca479be8..1764333b5d5d 100644 --- a/sw/inc/redlnaut.hxx +++ b/sw/inc/redlnaut.hxx @@ -42,7 +42,7 @@ class SwRedlineAuthor Color aChgLineColor; SfxItemSet *pInsAttrSet, *pDelAttrSet, *pFmtAttrSet; short eChgLineOrient; - BYTE cDelChar; + sal_uInt8 cDelChar; public: SwRedlineAuthor( SwAttrPool& rPool, const String& ); SwRedlineAuthor( const SwRedlineAuthor& ); diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx index 6233dfb6372f..06b897576279 100644 --- a/sw/inc/reffld.hxx +++ b/sw/inc/reffld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _REFFLD_HXX -#define _REFFLD_HXX +#ifndef SW_REFFLD_HXX +#define SW_REFFLD_HXX #include <fldbas.hxx> @@ -84,8 +84,8 @@ public: void MergeWithOtherDoc( SwDoc& rDestDoc ); static SwTxtNode* FindAnchor( SwDoc* pDoc, const String& rRefMark, - USHORT nSubType, USHORT nSeqNo, - USHORT* pStt, USHORT* pEnd = 0 ); + sal_uInt16 nSubType, sal_uInt16 nSeqNo, + sal_uInt16* pStt, sal_uInt16* pEnd = 0 ); }; /*-------------------------------------------------------------------- @@ -97,8 +97,11 @@ class SW_DLLPUBLIC SwGetRefField : public SwField private: String sSetRefName; String sTxt; - USHORT nSubType; - USHORT nSeqNo; + sal_uInt16 nSubType; + sal_uInt16 nSeqNo; + + virtual String Expand() const; + virtual SwField* Copy() const; // #i81002# String MakeRefNumStr( const SwTxtNode& rTxtNodeOfField, @@ -107,13 +110,11 @@ private: public: SwGetRefField( SwGetRefFieldType*, const String& rSetRef, - USHORT nSubType, USHORT nSeqNo, ULONG nFmt ); + sal_uInt16 nSubType, sal_uInt16 nSeqNo, sal_uLong nFmt ); virtual ~SwGetRefField(); - virtual String GetCntnt(BOOL bName = FALSE) const; - virtual String Expand() const; - virtual SwField* Copy() const; + virtual String GetFieldName() const; const String& GetSetRefName() const { return sSetRefName; } @@ -129,8 +130,8 @@ public: void SetExpand( const String& rStr ) { sTxt = rStr; } // SubType erfragen/setzen - virtual USHORT GetSubType() const; - virtual void SetSubType( USHORT n ); + virtual sal_uInt16 GetSubType() const; + virtual void SetSubType( sal_uInt16 n ); // --> #i81002# bool IsRefToHeadingCrossRefBookmark() const; @@ -142,16 +143,16 @@ public: // SequenceNo erfragen/setzen (nur fuer REF_SEQUENCEFLD interressant) - USHORT GetSeqNo() const { return nSeqNo; } - void SetSeqNo( USHORT n ) { nSeqNo = n; } + sal_uInt16 GetSeqNo() const { return nSeqNo; } + void SetSeqNo( sal_uInt16 n ) { nSeqNo = n; } // Name der Referenz virtual const String& GetPar1() const; virtual void SetPar1(const String& rStr); virtual String GetPar2() const; - 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); void ConvertProgrammaticToUIName(); @@ -159,6 +160,6 @@ public: }; -#endif // _REFFLD_HXX +#endif // SW_REFFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx deleted file mode 100644 index 5a40d1ce13bb..000000000000 --- a/sw/inc/rolbck.hxx +++ /dev/null @@ -1,439 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _ROLBCK_HXX -#define _ROLBCK_HXX - -#include <tools/solar.h> -#ifndef _SVSTDARR_HXX -#define _SVSTDARR_USHORTS -#define _SVSTDARR_USHORTSSORT -#include <svl/svstdarr.hxx> -#endif -#include <svl/itemset.hxx> - -//Nur die History anziehen, um das docnew.cxx gegen die CLOOK's zu behaupten. - -namespace sfx2 { - class MetadatableUndo; -} - -class SwDoc; -class SwFmt; -class SwFmtColl; -class SwHistoryHint; -class SwTxtAttr; -class SfxPoolItem; -class SwTxtNode; -class SwUndoSaveSection; -class SwTxtFtn; -class SwTxtFlyCnt; -class SwUndoDelLayFmt; -class SwFlyFrmFmt; -class SwFmtFld; -class SwTxtFld; -class SwFieldType; -class SwTxtTOXMark; -class SwTxtRefMark; -class SwFrmFmt; -class SwpHints; -class SwFmtChain; -class SwNode; -class SwCharFmt; - -#ifndef ROLBCK_HISTORY_ONLY - -#include <tox.hxx> - -#include <SwNumberTreeTypes.hxx> -#include <IDocumentMarkAccess.hxx> - -#include <memory> - -enum HISTORY_HINT { - HSTRY_SETFMTHNT, - HSTRY_RESETFMTHNT, - HSTRY_SETTXTHNT, - HSTRY_SETTXTFLDHNT, - HSTRY_SETREFMARKHNT, - HSTRY_SETTOXMARKHNT, - HSTRY_RESETTXTHNT, - HSTRY_SETFTNHNT, - HSTRY_CHGFMTCOLL, - HSTRY_FLYCNT, - HSTRY_BOOKMARK, - HSTRY_SETATTRSET, - HSTRY_RESETATTRSET, - HSTRY_CHGFLYANCHOR, - HSTRY_CHGFLYCHAIN, - HSTRY_CHGCHARFMT, - HSTRY_END -}; - -class SwHistoryHint -{ - const HISTORY_HINT m_eWhichId; - -public: - SwHistoryHint( HISTORY_HINT eWhich ) : m_eWhichId( eWhich ) {} - virtual ~SwHistoryHint() {} - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ) = 0; - HISTORY_HINT Which() const { return m_eWhichId; } - virtual String GetDescription() const; -}; - -class SwHistorySetFmt : public SwHistoryHint -{ - ::std::auto_ptr<SfxPoolItem> m_pAttr; - const ULONG m_nNodeIndex; - -public: - SwHistorySetFmt( const SfxPoolItem* pFmtHt, ULONG nNode ); - virtual ~SwHistorySetFmt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - virtual String GetDescription() const; - -}; - -class SwHistoryResetFmt : public SwHistoryHint -{ - const ULONG m_nNodeIndex; - const USHORT m_nWhich; - -public: - SwHistoryResetFmt( const SfxPoolItem* pFmtHt, ULONG nNodeIdx ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -class SwHistorySetTxt : public SwHistoryHint -{ - ::std::auto_ptr<SfxPoolItem> m_pAttr; - const ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const xub_StrLen m_nEnd; - -public: - SwHistorySetTxt( SwTxtAttr* pTxtHt, ULONG nNode ); - virtual ~SwHistorySetTxt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -class SwHistorySetTxtFld : public SwHistoryHint -{ - //!! beware of the order for the declation of the auto_ptrs. - //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well) - ::std::auto_ptr<SwFieldType> m_pFldType; - const ::std::auto_ptr<SwFmtFld> m_pFld; - - ULONG m_nNodeIndex; - xub_StrLen m_nPos; - USHORT m_nFldWhich; - -public: - SwHistorySetTxtFld( SwTxtFld* pTxtFld, ULONG nNode ); - virtual ~SwHistorySetTxtFld(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - - virtual String GetDescription() const; - -}; - -class SwHistorySetRefMark : public SwHistoryHint -{ - const String m_RefName; - const ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const xub_StrLen m_nEnd; - -public: - SwHistorySetRefMark( SwTxtRefMark* pTxtHt, ULONG nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -class SwHistorySetTOXMark : public SwHistoryHint -{ - SwTOXMark m_TOXMark; - const String m_TOXName; - const TOXTypes m_eTOXTypes; - const ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const xub_StrLen m_nEnd; - -public: - SwHistorySetTOXMark( SwTxtTOXMark* pTxtHt, ULONG nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - int IsEqual( const SwTOXMark& rCmp ) const; - -}; - -class SwHistoryResetTxt : public SwHistoryHint -{ - const ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const xub_StrLen m_nEnd; - const USHORT m_nAttr; - -public: - SwHistoryResetTxt( USHORT nWhich, xub_StrLen nStt, xub_StrLen nEnd, - ULONG nNode ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - - USHORT GetWhich() const { return m_nAttr; } - ULONG GetNode() const { return m_nNodeIndex; } - xub_StrLen GetCntnt() const { return m_nStart; } - -}; - -class SwHistorySetFootnote : public SwHistoryHint -{ - const ::std::auto_ptr<SwUndoSaveSection> m_pUndo; - const String m_FootnoteNumber; - ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const bool m_bEndNote; - -public: - SwHistorySetFootnote( SwTxtFtn* pTxtFtn, ULONG nNode ); - SwHistorySetFootnote( const SwTxtFtn& ); - virtual ~SwHistorySetFootnote(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - - virtual String GetDescription() const; - -}; - -class SwHistoryChangeFmtColl : public SwHistoryHint -{ - SwFmtColl * const m_pColl; - const ULONG m_nNodeIndex; - const BYTE m_nNodeType; - -public: - SwHistoryChangeFmtColl( SwFmtColl* pColl, ULONG nNode, BYTE nNodeWhich ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -class SwHistoryTxtFlyCnt : public SwHistoryHint -{ - ::std::auto_ptr<SwUndoDelLayFmt> m_pUndo; - -public: - SwHistoryTxtFlyCnt( SwFrmFmt* const pFlyFmt ); - virtual ~SwHistoryTxtFlyCnt(); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - SwUndoDelLayFmt* GetUDelLFmt() { return m_pUndo.get(); } - -}; - -class SwHistoryBookmark : public SwHistoryHint -{ - public: - SwHistoryBookmark(const ::sw::mark::IMark& rBkmk, - bool bSavePos, bool bSaveOtherPos); - virtual void SetInDoc(SwDoc * pDoc, bool); - - bool IsEqualBookmark(const ::sw::mark::IMark& rBkmk); - const ::rtl::OUString& GetName() const; - - private: - const ::rtl::OUString m_aName; - ::rtl::OUString m_aShortName; - KeyCode m_aKeycode; - const ULONG m_nNode; - const ULONG m_nOtherNode; - const xub_StrLen m_nCntnt; - const xub_StrLen m_nOtherCntnt; - const bool m_bSavePos; - const bool m_bSaveOtherPos; - const bool m_bHadOtherPos; - const IDocumentMarkAccess::MarkType m_eBkmkType; - ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndo; -}; - -class SwHistorySetAttrSet : public SwHistoryHint -{ - SfxItemSet m_OldSet; - SvUShorts m_ResetArray; - const ULONG m_nNodeIndex; - -public: - SwHistorySetAttrSet( const SfxItemSet& rSet, ULONG nNode, - const SvUShortsSort& rSetArr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -class SwHistoryResetAttrSet : public SwHistoryHint -{ - const ULONG m_nNodeIndex; - const xub_StrLen m_nStart; - const xub_StrLen m_nEnd; - SvUShorts m_Array; - -public: - SwHistoryResetAttrSet( const SfxItemSet& rSet, ULONG nNode, - xub_StrLen nStt = STRING_MAXLEN, - xub_StrLen nEnd = STRING_MAXLEN ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - - const SvUShorts& GetArr() const { return m_Array; } - ULONG GetNode() const { return m_nNodeIndex; } - xub_StrLen GetCntnt() const { return m_nStart; } - -}; - -class SwHistoryChangeFlyAnchor : public SwHistoryHint -{ - SwFrmFmt & m_rFmt; - const ULONG m_nOldNodeIndex; - const xub_StrLen m_nOldContentIndex; - -public: - SwHistoryChangeFlyAnchor( SwFrmFmt& rFmt ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); -}; - -class SwHistoryChangeFlyChain : public SwHistoryHint -{ - SwFlyFrmFmt * const m_pPrevFmt; - SwFlyFrmFmt * const m_pNextFmt; - SwFlyFrmFmt * const m_pFlyFmt; - -public: - SwHistoryChangeFlyChain( SwFlyFrmFmt& rFmt, const SwFmtChain& rAttr ); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); -}; - -class SwHistoryChangeCharFmt : public SwHistoryHint -{ - const SfxItemSet m_OldSet; - const String m_Fmt; - -public: - SwHistoryChangeCharFmt( const SfxItemSet& rSet, const String & sFmt); - virtual void SetInDoc( SwDoc* pDoc, bool bTmpSet ); - -}; - -#endif - -typedef SwHistoryHint* SwHistoryHintPtr; -SV_DECL_PTRARR_DEL( SwpHstry, SwHistoryHintPtr, 0, 2 ) - -class SwHistory -{ - friend class SwDoc; // actually only SwDoc::DelUndoObj may access - friend class SwUndoWriter; // for Undo/Redo Writer - friend class SwRegHistory; // for inserting History attributes - - SwpHstry m_SwpHstry; - USHORT m_nEndDiff; - -public: - SwHistory( USHORT nInitSz = 0, USHORT nGrowSz = 2 ); - ~SwHistory(); - - // delete History from nStart to array end - void Delete( USHORT nStart = 0 ); - // call and delete all objects between nStart and array end - bool Rollback( SwDoc* pDoc, USHORT nStart = 0 ); - // call all objects between nStart and TmpEnd; store nStart as TmpEnd - bool TmpRollback( SwDoc* pDoc, USHORT nStart, bool ToFirst = true ); - - void Add( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue, - ULONG nNodeIdx ); - void Add( SwTxtAttr* pTxtHt, ULONG nNodeIdx, bool bNewAttr = true ); - void Add( SwFmtColl*, ULONG nNodeIdx, BYTE nWhichNd ); - void Add( const ::sw::mark::IMark&, bool bSavePos, bool bSaveOtherPos ); - void Add( SwFrmFmt& rFmt ); - void Add( SwFlyFrmFmt&, USHORT& rSetPos ); - void Add( const SwTxtFtn& ); - void Add( const SfxItemSet & rSet, const SwCharFmt & rCharFmt); - - USHORT Count() const { return m_SwpHstry.Count(); } - USHORT GetTmpEnd() const { return m_SwpHstry.Count() - m_nEndDiff; } - USHORT SetTmpEnd( USHORT nTmpEnd ); // return previous value - SwHistoryHint * operator[]( USHORT nPos ) { return m_SwpHstry[nPos]; } - SwHistoryHint const* operator[]( USHORT nPos ) const - { return m_SwpHstry[nPos]; } - - // for SwUndoDelete::Undo/Redo - void Move( USHORT nPos, SwHistory *pIns, - USHORT nStart = 0, USHORT nEnd = USHRT_MAX ) - { - m_SwpHstry.Insert( &pIns->m_SwpHstry, nPos, nStart, nEnd ); - pIns->m_SwpHstry.Remove( nStart, (nEnd == USHRT_MAX) - ? pIns->Count() - nStart - : nEnd ); - } - - // helper methods for recording attribute in History - // used by Undo classes (Delete/Overwrite/Inserts) - void CopyAttr( SwpHints* pHts, ULONG nNodeIdx, xub_StrLen nStart, - xub_StrLen nEnd, bool bFields ); - void CopyFmtAttr( const SfxItemSet& rSet, ULONG nNodeIdx ); -}; - -#ifndef ROLBCK_HISTORY_ONLY - -class SwRegHistory : public SwClient -{ -private: - SvUShortsSort m_WhichIdSet; - SwHistory * const m_pHistory; - ULONG m_nNodeIndex; - - void _MakeSetWhichIds(); - -public: - - SwRegHistory( SwHistory* pHst ); - SwRegHistory( const SwNode& rNd, SwHistory* pHst ); - SwRegHistory( SwModify* pRegIn, const SwNode& rNd, SwHistory* pHst ); - - virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); - - /// @return true if at least 1 item was inserted - bool InsertItems( const SfxItemSet& rSet, - xub_StrLen const nStart, xub_StrLen const nEnd, - SetAttrMode const nFlags ); - - void AddHint( SwTxtAttr* pHt, const bool bNew = false ); - - void RegisterInModify( SwModify* pRegIn, const SwNode& rNd ); - void ChangeNodeIndex( ULONG nNew ) { m_nNodeIndex = nNew; } -}; - -#endif - -#endif // _ROLBCK_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 1fb47417f285..5a30cc0b502d 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -209,7 +209,7 @@ public: void SetCondHidden(bool const bFlag = true); bool IsCondHidden() const { return m_Data.IsCondHidden(); } // erfrage (auch ueber die Parents), ob diese Section versteckt sein soll. - BOOL CalcHiddenFlag() const; + sal_Bool CalcHiddenFlag() const; inline SwSection* GetParent() const; @@ -238,8 +238,8 @@ public: bool IsServer() const { return m_RefObj.Is(); } // Methoden fuer gelinkte Bereiche - USHORT GetUpdateType() const { return m_RefLink->GetUpdateMode(); } - void SetUpdateType(USHORT const nType ) + sal_uInt16 GetUpdateType() const { return m_RefLink->GetUpdateMode(); } + void SetUpdateType(sal_uInt16 const nType ) { m_RefLink->SetUpdateMode(nType); } bool IsConnected() const { return m_RefLink.Is(); } @@ -300,7 +300,7 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); // erfrage vom Format Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; SwSection* GetSection() const; inline SwSectionFmt* GetParent() const; @@ -309,13 +309,13 @@ public: // alle Sections, die von dieser abgeleitet sind // - sortiert nach : Name oder Position oder unsortiert // - alle oder nur die, die sich im normalten Nodes-Array befinden - USHORT GetChildSections( SwSections& rArr, + sal_uInt16 GetChildSections( SwSections& rArr, SectionSort eSort = SORTSECT_NOT, - BOOL bAllSections = TRUE ) const; + sal_Bool bAllSections = sal_True ) const; // erfrage, ob sich die Section im Nodes-Array oder UndoNodes-Array // befindet. - BOOL IsInNodesArr() const; + sal_Bool IsInNodesArr() const; SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false); const SwSectionNode* GetSectionNode(bool const bEvenIfInUndo = false) const diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx index 399905623a5c..d87d1b2ca4ad 100644 --- a/sw/inc/shellio.hxx +++ b/sw/inc/shellio.hxx @@ -77,7 +77,7 @@ class SW_DLLPUBLIC SwAsciiOptions { String sFont; rtl_TextEncoding eCharSet; - USHORT nLanguage; + sal_uInt16 nLanguage; LineEnd eCRLF_Flag; public: @@ -88,8 +88,8 @@ public: rtl_TextEncoding GetCharSet() const { return eCharSet; } void SetCharSet( rtl_TextEncoding nVal ) { eCharSet = nVal; } - USHORT GetLanguage() const { return nLanguage; } - void SetLanguage( USHORT nVal ) { nLanguage = nVal; } + sal_uInt16 GetLanguage() const { return nLanguage; } + void SetLanguage( sal_uInt16 nVal ) { nLanguage = nVal; } LineEnd GetParaFlags() const { return eCRLF_Flag; } void SetParaFlags( LineEnd eVal ) { eCRLF_Flag = eVal; } @@ -121,35 +121,35 @@ class SwgReaderOption SwAsciiOptions aASCIIOpts; union { - BOOL bFmtsOnly; + sal_Bool bFmtsOnly; struct { - BOOL bFrmFmts: 1; - BOOL bPageDescs: 1; - BOOL bTxtFmts: 1; - BOOL bNumRules: 1; - BOOL bMerge:1; + sal_Bool bFrmFmts: 1; + sal_Bool bPageDescs: 1; + sal_Bool bTxtFmts: 1; + sal_Bool bNumRules: 1; + sal_Bool bMerge:1; } Fmts; } What; public: void ResetAllFmtsOnly() { What.bFmtsOnly = 0; } - BOOL IsFmtsOnly() const { return What.bFmtsOnly; } + sal_Bool IsFmtsOnly() const { return What.bFmtsOnly; } - BOOL IsFrmFmts() const { return What.Fmts.bFrmFmts; } - void SetFrmFmts( const BOOL bNew) { What.Fmts.bFrmFmts = bNew; } + sal_Bool IsFrmFmts() const { return What.Fmts.bFrmFmts; } + void SetFrmFmts( const sal_Bool bNew) { What.Fmts.bFrmFmts = bNew; } - BOOL IsPageDescs() const { return What.Fmts.bPageDescs; } - void SetPageDescs( const BOOL bNew) { What.Fmts.bPageDescs = bNew; } + sal_Bool IsPageDescs() const { return What.Fmts.bPageDescs; } + void SetPageDescs( const sal_Bool bNew) { What.Fmts.bPageDescs = bNew; } - BOOL IsTxtFmts() const { return What.Fmts.bTxtFmts; } - void SetTxtFmts( const BOOL bNew) { What.Fmts.bTxtFmts = bNew; } + sal_Bool IsTxtFmts() const { return What.Fmts.bTxtFmts; } + void SetTxtFmts( const sal_Bool bNew) { What.Fmts.bTxtFmts = bNew; } - BOOL IsNumRules() const { return What.Fmts.bNumRules; } - void SetNumRules( const BOOL bNew) { What.Fmts.bNumRules = bNew; } + sal_Bool IsNumRules() const { return What.Fmts.bNumRules; } + void SetNumRules( const sal_Bool bNew) { What.Fmts.bNumRules = bNew; } - BOOL IsMerge() const { return What.Fmts.bMerge; } - void SetMerge( const BOOL bNew ) { What.Fmts.bMerge = bNew; } + sal_Bool IsMerge() const { return What.Fmts.bMerge; } + void SetMerge( const sal_Bool bNew ) { What.Fmts.bMerge = bNew; } const SwAsciiOptions& GetASCIIOpts() const { return aASCIIOpts; } void SetASCIIOpts( const SwAsciiOptions& rOpts ) { aASCIIOpts = rOpts; } @@ -188,13 +188,13 @@ public: /* * Nur SwReader::Read(...) ist die Export-Schnittstelle!!! */ - BOOL NeedsPasswd( const Reader& ); - BOOL CheckPasswd( const String&, const Reader& ); - ULONG Read( const Reader& ); + sal_Bool NeedsPasswd( const Reader& ); + sal_Bool CheckPasswd( const String&, const Reader& ); + sal_uLong Read( const Reader& ); // ask for glossaries - BOOL HasGlossaries( const Reader& ); - BOOL ReadGlossaries( const Reader&, SwTextBlocks&, BOOL bSaveRelFiles ); + sal_Bool HasGlossaries( const Reader& ); + sal_Bool ReadGlossaries( const Reader&, SwTextBlocks&, sal_Bool bSaveRelFiles ); const String& GetBaseURL() const { return sBaseURL;} @@ -227,13 +227,13 @@ protected: SfxMedium* pMedium; // wer ein Medium haben will (W4W) SwgReaderOption aOpt; - BOOL bInsertMode : 1; - BOOL bTmplBrowseMode : 1; - BOOL bReadUTF8: 1; // Stream als UTF-8 interpretieren - BOOL bBlockMode: 1; - BOOL bOrganizerMode : 1; - BOOL bHasAskTemplateName : 1; - BOOL bIgnoreHTMLComments : 1; + sal_Bool bInsertMode : 1; + sal_Bool bTmplBrowseMode : 1; + sal_Bool bReadUTF8: 1; // Stream als UTF-8 interpretieren + sal_Bool bBlockMode: 1; + sal_Bool bOrganizerMode : 1; + sal_Bool bHasAskTemplateName : 1; + sal_Bool bIgnoreHTMLComments : 1; virtual String GetTemplateName() const; @@ -256,35 +256,35 @@ public: // Die Filter-Vorlage laden, setzen und wieder freigeben SwDoc* GetTemplateDoc(); - BOOL SetTemplate( SwDoc& rDoc ); + sal_Bool SetTemplate( SwDoc& rDoc ); void ClearTemplate(); void SetTemplateName( const String& rDir ); void MakeHTMLDummyTemplateDoc(); - BOOL IsReadUTF8() const { return bReadUTF8; } - void SetReadUTF8( BOOL bSet ) { bReadUTF8 = bSet; } + sal_Bool IsReadUTF8() const { return bReadUTF8; } + void SetReadUTF8( sal_Bool bSet ) { bReadUTF8 = bSet; } - BOOL IsBlockMode() const { return bBlockMode; } - void SetBlockMode( BOOL bSet ) { bBlockMode = bSet; } + sal_Bool IsBlockMode() const { return bBlockMode; } + void SetBlockMode( sal_Bool bSet ) { bBlockMode = bSet; } - BOOL IsOrganizerMode() const { return bOrganizerMode; } - void SetOrganizerMode( BOOL bSet ) { bOrganizerMode = bSet; } + sal_Bool IsOrganizerMode() const { return bOrganizerMode; } + void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } - void SetIgnoreHTMLComments( BOOL bSet ) { bIgnoreHTMLComments = bSet; } + void SetIgnoreHTMLComments( sal_Bool bSet ) { bIgnoreHTMLComments = bSet; } - virtual BOOL HasGlossaries() const; - virtual BOOL ReadGlossaries( SwTextBlocks&, BOOL bSaveRelFiles ) const; + virtual sal_Bool HasGlossaries() const; + virtual sal_Bool ReadGlossaries( SwTextBlocks&, sal_Bool bSaveRelFiles ) const; // read the sections of the document, which is equal to the medium. // returns the count of it - virtual USHORT GetSectionList( SfxMedium& rMedium, + virtual sal_uInt16 GetSectionList( SfxMedium& rMedium, SvStrings& rStrings ) const; SotStorageRef getSotStorageRef() { return pStg; }; void setSotStorageRef(SotStorageRef pStgRef) { pStg = pStgRef; }; private: - virtual ULONG Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0; + virtual sal_uLong Read(SwDoc &, const String& rBaseURL, SwPaM &,const String &)=0; // alle die die Streams / Storages nicht geoeffnet brauchen, // muessen die Methode ueberladen (W4W!!) @@ -294,7 +294,7 @@ private: class AsciiReader: public Reader { friend class SwReader; - virtual ULONG Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); + virtual sal_uLong Read( SwDoc &, const String& rBaseURL, SwPaM &,const String &); public: AsciiReader(): Reader() {} }; @@ -302,6 +302,9 @@ public: class SW_DLLPUBLIC StgReader : public Reader { String aFltName; + +protected: + sal_uLong OpenMainStream( SotStorageStreamRef& rRef, sal_uInt16& rBuffSize ); public: virtual int GetReaderType(); const String& GetFltName() { return aFltName; } @@ -320,7 +323,7 @@ class SwImpBlocks; class SW_DLLPUBLIC SwTextBlocks { SwImpBlocks* pImp; - ULONG nErr; + sal_uLong nErr; public: SwTextBlocks( const String& ); @@ -332,43 +335,43 @@ public: void ClearDoc(); // Doc-Inhalt loeschen const String& GetName(); void SetName( const String& ); - ULONG GetError() const { return nErr; } + sal_uLong GetError() const { return nErr; } String GetBaseURL() const; void SetBaseURL( const String& rURL ); - BOOL IsOld() const; - ULONG ConvertToNew(); // Textbausteine konvertieren + sal_Bool IsOld() const; + sal_uLong ConvertToNew(); // Textbausteine konvertieren - USHORT GetCount() const; // Anzahl Textbausteine ermitteln - USHORT GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln - USHORT GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln - const String& GetShortName( USHORT ) const; // Kurzname fuer Index zurueck - const String& GetLongName( USHORT ) const; // Langname fuer Index zurueck + sal_uInt16 GetCount() const; // Anzahl Textbausteine ermitteln + sal_uInt16 GetIndex( const String& ) const; // Index fuer Kurznamen ermitteln + sal_uInt16 GetLongIndex( const String& ) const; //Index fuer Langnamen ermitteln + const String& GetShortName( sal_uInt16 ) const; // Kurzname fuer Index zurueck + const String& GetLongName( sal_uInt16 ) const; // Langname fuer Index zurueck - BOOL Delete( USHORT ); // Loeschen - USHORT Rename( USHORT, const String*, const String* ); // Umbenennen - ULONG CopyBlock( SwTextBlocks& rSource, String& rSrcShort, + sal_Bool Delete( sal_uInt16 ); // Loeschen + sal_uInt16 Rename( sal_uInt16, const String*, const String* ); // Umbenennen + sal_uLong CopyBlock( SwTextBlocks& rSource, String& rSrcShort, const String& rLong ); // Block kopieren - BOOL BeginGetDoc( USHORT ); // Textbaustein einlesen + sal_Bool BeginGetDoc( sal_uInt16 ); // Textbaustein einlesen void EndGetDoc(); // Textbaustein wieder loslassen - BOOL BeginPutDoc( const String&, const String& ); // Speichern Beginn - USHORT PutDoc(); // Speichern Ende + sal_Bool BeginPutDoc( const String&, const String& ); // Speichern Beginn + sal_uInt16 PutDoc(); // Speichern Ende - USHORT PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text) + sal_uInt16 PutText( const String&, const String&, const String& ); // Speichern( Kurzn., Text) - BOOL IsOnlyTextBlock( USHORT ) const; - BOOL IsOnlyTextBlock( const String& rShort ) const; + sal_Bool IsOnlyTextBlock( sal_uInt16 ) const; + sal_Bool IsOnlyTextBlock( const String& rShort ) const; const String& GetFileName() const; // Dateiname von pImp - BOOL IsReadOnly() const; // ReadOnly-Flag von pImp + sal_Bool IsReadOnly() const; // ReadOnly-Flag von pImp - BOOL GetMacroTable( USHORT nIdx, SvxMacroTableDtor& rMacroTbl ); - BOOL SetMacroTable( USHORT nIdx, const SvxMacroTableDtor& rMacroTbl ); + sal_Bool GetMacroTable( sal_uInt16 nIdx, SvxMacroTableDtor& rMacroTbl ); + sal_Bool SetMacroTable( sal_uInt16 nIdx, const SvxMacroTableDtor& rMacroTbl ); - BOOL StartPutMuchBlockEntries(); + sal_Bool StartPutMuchBlockEntries(); void EndPutMuchBlockEntries(); }; @@ -384,7 +387,7 @@ SW_DLLPUBLIC SwRead SwGetReaderXML(); // END source/filter/basflt/fltini.cxx -extern BOOL SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx +extern sal_Bool SetHTMLTemplate( SwDoc &rDoc ); //Fuer Vorlagen aus HTML.vor laden shellio.cxx ///////////////////////////////////////////////////////////////////////////// @@ -407,7 +410,7 @@ class SW_DLLPUBLIC Writer String sBaseURL; void _AddFontItem( SfxItemPool& rPool, const SvxFontItem& rFont ); - void _AddFontItems( SfxItemPool& rPool, USHORT nWhichId ); + void _AddFontItems( SfxItemPool& rPool, sal_uInt16 nWhichId ); ::std::auto_ptr<Writer_Impl> m_pImpl; @@ -417,13 +420,13 @@ protected: const String* pOrigFileName; void ResetWriter(); - BOOL CopyNextPam( SwPaM ** ); + sal_Bool CopyNextPam( SwPaM ** ); void PutNumFmtFontsInAttrPool(); - void PutEditEngFontsInAttrPool( BOOL bIncl_CJK_CTL = TRUE ); + void PutEditEngFontsInAttrPool( sal_Bool bIncl_CJK_CTL = sal_True ); void PutCJKandCTLFontsInAttrPool(); - virtual ULONG WriteStream() = 0; + virtual sal_uLong WriteStream() = 0; void SetBaseURL( const String& rURL ) { sBaseURL = rURL; } IDocumentSettingAccess* getIDocumentSettingAccess(); @@ -435,32 +438,32 @@ protected: public: SwDoc* pDoc; SwPaM* pCurPam; - BOOL bWriteAll : 1; - BOOL bShowProgress : 1; - BOOL bWriteClipboardDoc : 1; - BOOL bWriteOnlyFirstTable : 1; - BOOL bASCII_ParaAsCR : 1; - BOOL bASCII_ParaAsBlanc : 1; - BOOL bASCII_NoLastLineEnd : 1; - BOOL bUCS2_WithStartChar : 1; - BOOL bExportPargraphNumbering : 1; - - BOOL bBlock : 1; - BOOL bOrganizerMode : 1; + sal_Bool bWriteAll : 1; + sal_Bool bShowProgress : 1; + sal_Bool bWriteClipboardDoc : 1; + sal_Bool bWriteOnlyFirstTable : 1; + sal_Bool bASCII_ParaAsCR : 1; + sal_Bool bASCII_ParaAsBlanc : 1; + sal_Bool bASCII_NoLastLineEnd : 1; + sal_Bool bUCS2_WithStartChar : 1; + sal_Bool bExportPargraphNumbering : 1; + + sal_Bool bBlock : 1; + sal_Bool bOrganizerMode : 1; Writer(); virtual ~Writer(); - virtual ULONG Write( SwPaM&, SfxMedium&, const String* = 0 ); - ULONG Write( SwPaM&, SvStream&, const String* = 0 ); - virtual ULONG Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); - virtual ULONG Write( SwPaM&, SotStorage&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, SfxMedium&, const String* = 0 ); + sal_uLong Write( SwPaM&, SvStream&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const String* = 0 ); virtual void SetPasswd( const String& ); virtual void SetVersion( const String&, long ); - virtual BOOL IsStgWriter() const; + virtual sal_Bool IsStgWriter() const; - void SetShowProgress( BOOL bFlag = FALSE ) { bShowProgress = bFlag; } + void SetShowProgress( sal_Bool bFlag = sal_False ) { bShowProgress = bFlag; } const String* GetOrigFileName() const { return pOrigFileName; } @@ -475,38 +478,38 @@ public: // OtherPos of the bookmarks also inserted. void CreateBookmarkTbl(); // search alle Bookmarks in the range and return it in the Array - USHORT GetBookmarks( const SwCntntNode& rNd, + sal_uInt16 GetBookmarks( const SwCntntNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, SvPtrarr& rArr ); // lege einen neuen PaM an der Position an - static SwPaM* NewSwPaM( SwDoc & rDoc, ULONG nStartIdx, ULONG nEndIdx, - BOOL bNodesArray = TRUE ); + static SwPaM * NewSwPaM(SwDoc & rDoc, + sal_uLong const nStartIdx, sal_uLong const nEndIdx); // kopiere ggfs. eine lokale Datei ins Internet - BOOL CopyLocalFileToINet( String& rFileNm ); + sal_Bool CopyLocalFileToINet( String& rFileNm ); // Stream-spezifische Routinen, im Storage-Writer NICHT VERWENDEN! // Optimierung der Ausgabe auf den Stream. SvStream& OutLong( SvStream& rStrm, long nVal ); - SvStream& OutULong( SvStream& rStrm, ULONG nVal ); + SvStream& OutULong( SvStream& rStrm, sal_uLong nVal ); // Hex-Zahl ausgeben, default ist 2.stellige Zahl - SvStream& OutHex( SvStream& rStrm, ULONG nHex, BYTE nLen = 2 ); + SvStream& OutHex( SvStream& rStrm, sal_uLong nHex, sal_uInt8 nLen = 2 ); // 4-st. Hex-Zahl ausgeben - inline SvStream& OutHex4( SvStream& rStrm, USHORT nHex ) + inline SvStream& OutHex4( SvStream& rStrm, sal_uInt16 nHex ) { return OutHex( rStrm, nHex, 4 ); } - inline SvStream& OutHex( USHORT nHex, BYTE nLen = 2 ) { return OutHex( Strm(), nHex, nLen ); } - inline SvStream& OutHex4( USHORT nHex ) { return OutHex( Strm(), nHex, 4 ); } + inline SvStream& OutHex( sal_uInt16 nHex, sal_uInt8 nLen = 2 ) { return OutHex( Strm(), nHex, nLen ); } + inline SvStream& OutHex4( sal_uInt16 nHex ) { return OutHex( Strm(), nHex, 4 ); } inline SvStream& OutLong( long nVal ) { return OutLong( Strm(), nVal ); } - inline SvStream& OutULong( ULONG nVal ) { return OutULong( Strm(), nVal ); } + inline SvStream& OutULong( sal_uLong nVal ) { return OutULong( Strm(), nVal ); } void SetStream(SvStream *const pStream); SvStream& Strm(); - void SetOrganizerMode( BOOL bSet ) { bOrganizerMode = bSet; } + void SetOrganizerMode( sal_Bool bSet ) { bOrganizerMode = bSet; } }; #ifndef SW_DECL_WRITER_DEFINED @@ -524,19 +527,19 @@ protected: com::sun::star::uno::Reference < com::sun::star::embed::XStorage > xStg; // Fehler beim Aufruf erzeugen - virtual ULONG WriteStream(); - virtual ULONG WriteStorage() = 0; - virtual ULONG WriteMedium( SfxMedium& ) = 0; + virtual sal_uLong WriteStream(); + virtual sal_uLong WriteStorage() = 0; + virtual sal_uLong WriteMedium( SfxMedium& ) = 0; using Writer::Write; public: StgWriter() : Writer() {} - virtual BOOL IsStgWriter() const; + virtual sal_Bool IsStgWriter() const; - virtual ULONG Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); - virtual ULONG Write( SwPaM&, SotStorage&, const String* = 0 ); + virtual sal_uLong Write( SwPaM&, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String* = 0, SfxMedium* = 0 ); + virtual sal_uLong Write( SwPaM&, SotStorage&, const String* = 0 ); SotStorage& GetStorage() const { return *pStg; } }; @@ -555,18 +558,18 @@ class SwWriter SwCrsrShell *pShell; SwDoc &rDoc; - BOOL bWriteAll; + sal_Bool bWriteAll; public: - ULONG Write( WriterRef& rxWriter, const String* = 0); + sal_uLong Write( WriterRef& rxWriter, const String* = 0); - SwWriter( SvStream&, SwCrsrShell &,BOOL bWriteAll = FALSE ); + SwWriter( SvStream&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); SwWriter( SvStream&, SwDoc & ); - SwWriter( SvStream&, SwPaM &, BOOL bWriteAll = FALSE ); + SwWriter( SvStream&, SwPaM &, sal_Bool bWriteAll = sal_False ); SwWriter( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, SwDoc& ); - SwWriter( SfxMedium&, SwCrsrShell &,BOOL bWriteAll = FALSE ); + SwWriter( SfxMedium&, SwCrsrShell &,sal_Bool bWriteAll = sal_False ); SwWriter( SfxMedium&, SwDoc & ); }; @@ -575,17 +578,17 @@ public: typedef Reader* (*FnGetReader)(); typedef void (*FnGetWriter)(const String&, const String& rBaseURL, WriterRef&); -ULONG SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, BOOL, const String& ); -ULONG GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); +sal_uLong SaveOrDelMSVBAStorage( SfxObjectShell&, SotStorage&, sal_Bool, const String& ); +sal_uLong GetSaveWarningOfMSVBAStorage( SfxObjectShell &rDocS ); struct SwReaderWriterEntry { Reader* pReader; FnGetReader fnGetReader; FnGetWriter fnGetWriter; - BOOL bDelReader; + sal_Bool bDelReader; - SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, BOOL bDel ) + SwReaderWriterEntry( const FnGetReader fnReader, const FnGetWriter fnWriter, sal_Bool bDel ) : pReader( NULL ), fnGetReader( fnReader ), fnGetWriter( fnWriter ), bDelReader( bDel ) {} diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 1589fff584d4..4af688fd89f0 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -94,7 +94,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource // returns for the specific filter the new names of pagedescs // This method is for the old code of the specific filters with // now localized names - String GetPageDescName( USHORT nNo, PageNameMode eMode ); + String GetPageDescName( sal_uInt16 nNo, PageNameMode eMode ); ShellResource(); ~ShellResource(); diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx index 5355f9dccaaf..128ba771881b 100644 --- a/sw/inc/sortopt.hxx +++ b/sw/inc/sortopt.hxx @@ -42,13 +42,13 @@ enum SwSortDirection { SRT_COLUMNS, SRT_ROWS }; struct SW_DLLPUBLIC SwSortKey { SwSortKey(); - SwSortKey( USHORT nId, const String& rSrtType, SwSortOrder eOrder ); + SwSortKey( sal_uInt16 nId, const String& rSrtType, SwSortOrder eOrder ); SwSortKey( const SwSortKey& rOld ); String sSortType; SwSortOrder eSortOrder; - USHORT nColumnId; - BOOL bIsNumeric; + sal_uInt16 nColumnId; + sal_Bool bIsNumeric; }; SV_DECL_PTRARR(SwSortKeys, SwSortKey*, 3, 1) @@ -62,9 +62,9 @@ struct SW_DLLPUBLIC SwSortOptions SwSortKeys aKeys; SwSortDirection eDirection; sal_Unicode cDeli; - USHORT nLanguage; - BOOL bTable; - BOOL bIgnoreCase; + sal_uInt16 nLanguage; + sal_Bool bTable; + sal_Bool bIgnoreCase; }; #endif // _SORTOPT_HXX diff --git a/sw/inc/sw.mk b/sw/inc/sw.mk deleted file mode 100644 index c7ba1233d708..000000000000 --- a/sw/inc/sw.mk +++ /dev/null @@ -1,41 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# Bereiche aktivieren - -CDEFS+=-DACCESSIBLE_LAYOUT - -# define SW_DLLIMPLEMENTATION (see @ swdllapi.h) -.IF "$(MAKING_LIBMSWORD)" != "TRUE" -CDEFS += -DSW_DLLIMPLEMENTATION -.ENDIF - -VISIBILITY_HIDDEN=TRUE - -.IF "$(DBG_LEVEL)">="2" -CFLAGS += $(LIBXML_CFLAGS) -.ENDIF diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index 4ca28425849a..d5219da395ba 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -116,17 +116,17 @@ class AbstractFldInputDlg : public VclAbstractDialog //add for SwFldInputDlg public: //from class SalFrame virtual void SetWindowState( const ByteString& rStr ) = 0; - virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const = 0; + virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; }; class AbstractInsFootNoteDlg : public VclAbstractDialog //add for SwInsFootNoteDlg { public: virtual String GetFontName() = 0; - virtual BOOL IsEndNote() = 0; + virtual sal_Bool IsEndNote() = 0; virtual String GetStr() = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& sHelpId ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; @@ -134,14 +134,14 @@ class AbstractInsertGrfRulerDlg : public VclAbstractDialog //add for SwInsertGr { public: virtual String GetGraphicName() = 0; - virtual BOOL IsSimpleLine() = 0; - virtual BOOL HasImages() const = 0; + virtual sal_Bool IsSimpleLine() = 0; + virtual sal_Bool HasImages() const = 0; }; class AbstractInsTableDlg : public VclAbstractDialog //add for SwInsTableDlg { public: - virtual void GetValues( String& rName, USHORT& rRow, USHORT& rCol, + virtual void GetValues( String& rName, sal_uInt16& rRow, sal_uInt16& rCol, SwInsertTableOptions& rInsTblFlags, String& rTableAutoFmtName, SwTableAutoFmt *& prTAFmt ) = 0; }; @@ -151,15 +151,15 @@ class AbstractJavaEditDialog : public VclAbstractDialog //add for SwJavaEditDia public: virtual String GetText() = 0; virtual String GetType() = 0; - virtual BOOL IsUrl() = 0; - virtual BOOL IsNew() = 0; - virtual BOOL IsUpdate() = 0; + virtual sal_Bool IsUrl() = 0; + virtual sal_Bool IsNew() = 0; + virtual sal_Bool IsUpdate() = 0; }; class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg { public: - virtual USHORT GetMergeType() = 0; + virtual sal_uInt16 GetMergeType() = 0; virtual const ::rtl::OUString& GetSaveFilter() const = 0; virtual const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet> GetResultSet() const = 0; @@ -167,12 +167,12 @@ public: class AbstractMailMergeCreateFromDlg : public VclAbstractDialog //add for SwMailMergeCreateFromDlg { public: - virtual BOOL IsThisDocument() const = 0; + virtual sal_Bool IsThisDocument() const = 0; }; class AbstractMailMergeFieldConnectionsDlg : public VclAbstractDialog //add for SwMailMergeFieldConnectionsDlg { public: - virtual BOOL IsUseExistingConnections() const = 0; + virtual sal_Bool IsUseExistingConnections() const = 0; }; class AbstractMultiTOXTabDialog : public VclAbstractDialog //add for SwMultiTOXTabDialog @@ -205,8 +205,8 @@ public: class AbstractSwInsertAbstractDlg : public VclAbstractDialog // add for SwInsertAbstractDlg { public: - virtual BYTE GetLevel() const = 0; - virtual BYTE GetPara() const = 0; + virtual sal_uInt8 GetLevel() const = 0; + virtual sal_uInt8 GetPara() const = 0; }; class AbstractSwAsciiFilterDlg : public VclAbstractDialog // add for SwAsciiFilterDlg @@ -220,8 +220,8 @@ class AbstractSwBreakDlg : public VclAbstractDialog // add for SwBreakDlg { public: virtual String GetTemplateName() = 0; - virtual USHORT GetKind() = 0; - virtual USHORT GetPageNumber() = 0; + virtual sal_uInt16 GetKind() = 0; + virtual sal_uInt16 GetPageNumber() = 0; }; @@ -252,7 +252,7 @@ public: class AbstractDropDownFieldDialog : public VclAbstractDialog //add for DropDownFieldDialog { public: - virtual ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow + virtual ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const = 0; //this method inherit from SystemWindow virtual void SetWindowState( const ByteString& rStr ) =0;//this method inherit from SystemWindow }; @@ -267,15 +267,15 @@ class AbstractSwSelGlossaryDlg : public VclAbstractDialog //add for SwSelGlossar { public: virtual void InsertGlos(const String &rRegion, const String &rGlosName) = 0; // inline - virtual USHORT GetSelectedIdx() const = 0; // inline - virtual void SelectEntryPos(USHORT nIdx) = 0; // inline + virtual sal_uInt16 GetSelectedIdx() const = 0; // inline + virtual void SelectEntryPos(sal_uInt16 nIdx) = 0; // inline }; class AbstractSwSplitTableDlg :public VclAbstractDialog //add for SwSplitTableDlg { public: - virtual BOOL IsHorizontal() const = 0; - virtual BOOL IsProportional() const = 0; + virtual sal_Bool IsHorizontal() const = 0; + virtual sal_Bool IsProportional() const = 0; virtual long GetCount() const = 0; }; @@ -288,11 +288,11 @@ public: class AbstractSwFldDlg : public SfxAbstractTabDialog //add for SwFldDlg { public: - virtual void Start( BOOL bShow = TRUE ) = 0; //this method from sfxtabdialog + virtual void Start( sal_Bool bShow = sal_True ) = 0; //this method from sfxtabdialog virtual void Initialize(SfxChildWinInfo *pInfo) = 0; virtual void ReInitDlg() = 0; virtual void ActivateDatabasePage() = 0; - virtual void ShowPage( USHORT nId ) = 0;// this method from SfxTabDialog + virtual void ShowPage( sal_uInt16 nId ) = 0;// this method from SfxTabDialog virtual Window * GetWindow() = 0; //this method is added for return a Window type pointer }; @@ -308,7 +308,7 @@ public: class AbstractSwModalRedlineAcceptDlg : public VclAbstractDialog //add for SwModalRedlineAcceptDlg { public: - virtual void AcceptAll( BOOL bAccept ) = 0; + virtual void AcceptAll( sal_Bool bAccept ) = 0; }; class AbstractMarkFloatDlg : public VclAbstractDialog //add for SwIndexMarkFloatDlg & SwAuthMarkFloatDlg @@ -332,7 +332,7 @@ class AbstractMailMergeWizard : public VclAbstractDialog2 public: virtual void SetReloadDocument(const String& rURL) = 0; virtual const String& GetReloadDocument() const = 0; - virtual BOOL ShowPage( USHORT nLevel ) = 0; + virtual sal_Bool ShowPage( sal_uInt16 nLevel ) = 0; virtual sal_uInt16 GetRestartPage() const = 0; }; @@ -357,7 +357,7 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg( Window *pParent, SwWrtShell &rSh,int nResId ) = 0; // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg( SwView& rVw, int nResId ) = 0; //add for SwChangeDBDlg virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg - const String* pFmtStr = 0, BOOL bIsDrwTxtDlg = FALSE) = 0; + const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg ( SwView& rView , int nResId, bool bToTable) = 0; //add for SwConvertTableDlg virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog @@ -368,23 +368,23 @@ public: virtual SfxAbstractTabDialog * CreateSwFootNoteOptionDlg( Window *pParent, SwWrtShell &rSh,int nResId) = 0;//add for SwFootNoteOptionDlg virtual AbstractDropDownFieldDialog * CreateDropDownFieldDialog ( Window *pParent, SwWrtShell &rSh, //add for DropDownFieldDialog - SwField* pField,int nResId, BOOL bNextButton = FALSE ) = 0; - virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, BOOL bInsert,int nResId ) = 0; //add for SwEnvDlg + SwField* pField,int nResId, sal_Bool bNextButton = sal_False ) = 0; + virtual SfxAbstractTabDialog* CreateSwEnvDlg ( Window* pParent, const SfxItemSet& rSet, SwWrtShell* pWrtSh, Printer* pPrt, sal_Bool bInsert,int nResId ) = 0; //add for SwEnvDlg virtual AbstractSwLabDlg* CreateSwLabDlg ( Window* pParent, const SfxItemSet& rSet, //add for SwLabDlg - SwNewDBMgr* pNewDBMgr, BOOL bLabel,int nResId ) = 0; + SwNewDBMgr* pNewDBMgr, sal_Bool bLabel,int nResId ) = 0; virtual SwLabDlgMethod GetSwLabDlgStaticMethod () =0;//add for SwLabDlg virtual SfxAbstractTabDialog* CreateSwParaDlg ( Window *pParent, //add for SwParaDlg SwView& rVw, const SfxItemSet& rCoreSet, - BYTE nDialogMode, + sal_uInt8 nDialogMode, int nResId, const String *pCollName = 0, - BOOL bDraw = FALSE, - UINT16 nDefPage = 0) = 0; + sal_Bool bDraw = sal_False, + sal_uInt16 nDefPage = 0) = 0; virtual AbstractSwSelGlossaryDlg * CreateSwSelGlossaryDlg ( Window * pParent, const String &rShortName, int nResId ) = 0; //add for SwSelGlossaryDlg @@ -393,10 +393,10 @@ public: virtual AbstractSwAutoFormatDlg * CreateSwAutoFormatDlg( Window* pParent, SwWrtShell* pShell, //add for SwAutoFormatDlg int nResId, - BOOL bSetAutoFmt = TRUE, + sal_Bool bSetAutoFmt = sal_True, const SwTableAutoFmt* pSelFmt = 0 ) = 0; - virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, USHORT nType, int nResId ) = 0;//add for SwBorderDlg - virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, BOOL bDrawMode, int nResId ) = 0; //add for SwWrapDlg + virtual SfxAbstractDialog * CreateSwBorderDlg ( Window* pParent, SfxItemSet& rSet, sal_uInt16 nType, int nResId ) = 0;//add for SwBorderDlg + virtual SfxAbstractDialog * CreateSwWrapDlg ( Window* pParent, SfxItemSet& rSet, SwWrtShell* pSh, sal_Bool bDrawMode, int nResId ) = 0; //add for SwWrapDlg virtual VclAbstractDialog * CreateSwTableWidthDlg ( Window *pParent, SwTableFUNC &rFnc , int nResId ) = 0; //add for SwTableWidthDlg virtual SfxAbstractTabDialog* CreateSwTableTabDlg( Window* pParent, SfxItemPool& Pool, @@ -409,34 +409,34 @@ public: STAR_REFERENCE( container::XNameAccess ) & xNameAccess, int nResId ) = 0; virtual AbstractSwModalRedlineAcceptDlg * CreateSwModalRedlineAcceptDlg ( Window *pParent, int nResId ) = 0; //add for SwModalRedlineAcceptDlg - virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, BOOL& rWithPrev ) = 0; //add for SwMergeTblDlg + virtual VclAbstractDialog* CreateSwVclDialog( int nResId, Window* pParent, sal_Bool& rWithPrev ) = 0; //add for SwMergeTblDlg virtual SfxAbstractTabDialog* CreateFrmTabDialog( int nResId, SfxViewFrame *pFrame, Window *pParent, const SfxItemSet& rCoreSet, - BOOL bNewFrm = TRUE, - USHORT nResType = DLG_FRM_STD, - BOOL bFmt = FALSE, - UINT16 nDefPage = 0, + sal_Bool bNewFrm = sal_True, + sal_uInt16 nResType = DLG_FRM_STD, + sal_Bool bFmt = sal_False, + sal_uInt16 nDefPage = 0, const String* pFmtStr = 0) = 0; //add for SwFrmDlg virtual SfxAbstractTabDialog* CreateTemplateDialog( int nResId, Window* pParent, SfxStyleSheetBase& rBase, - USHORT nRegion, - BOOL bColumn = FALSE, + sal_uInt16 nRegion, + sal_Bool bColumn = sal_False, SwWrtShell* pActShell = 0, - BOOL bNew = FALSE ) = 0; //add for SwTemplateDlg + sal_Bool bNew = sal_False ) = 0; //add for SwTemplateDlg virtual AbstractGlossaryDlg* CreateGlossaryDlg( int nResId, SfxViewFrame* pViewFrame, SwGlossaryHdl* pGlosHdl, SwWrtShell *pWrtShell) = 0; //add for SwGlossaryDlg virtual AbstractFldInputDlg* CreateFldInputDlg( int nResId, Window *pParent, SwWrtShell &rSh, - SwField* pField, BOOL bNextButton = FALSE ) = 0; //add for SwFldInputDlg + SwField* pField, sal_Bool bNextButton = sal_False ) = 0; //add for SwFldInputDlg virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId, - Window * pParent, SwWrtShell &rSh, BOOL bEd = FALSE) = 0; //add for SwInsFootNoteDlg + Window * pParent, SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent ) = 0; virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId, - SwView& rView, BOOL bCol = FALSE ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg + SwView& rView, sal_Bool bCol = sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg virtual AbstractInsertGrfRulerDlg* CreateInsertGrfRulerDlg( int nResId, Window * pParent ) = 0; //add for SwInsertGrfRulerDlg virtual AbstractInsTableDlg* CreateInsTableDlg( int nResId, @@ -463,8 +463,8 @@ public: virtual AbstractMultiTOXTabDialog* CreateMultiTOXTabDialog( int nResId, Window* pParent, const SfxItemSet& rSet, SwWrtShell &rShell, - SwTOXBase* pCurTOX, USHORT nToxType = USHRT_MAX, - BOOL bGlobal = FALSE) = 0; //add for SwMultiTOXTabDialog + SwTOXBase* pCurTOX, sal_uInt16 nToxType = USHRT_MAX, + sal_Bool bGlobal = sal_False) = 0; //add for SwMultiTOXTabDialog virtual AbstractEditRegionDlg* CreateEditRegionDlg( int nResId, Window* pParent, SwWrtShell& rWrtSh ) = 0; //add for SwEditRegionDlg virtual AbstractInsertSectionTabDialog* CreateInsertSectionTabDialog( int nResId, @@ -487,13 +487,13 @@ public: virtual AbstractMailMergeWizard* CreateMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rConfigItem) = 0; //add for static func in SwGlossaryDlg - virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( USHORT nId ) = 0; - virtual GlossarySetActGroup SetGlossaryActGroupFunc( USHORT nId ) = 0; + virtual GlossaryGetCurrGroup GetGlossaryCurrGroupFunc( sal_uInt16 nId ) = 0; + virtual GlossarySetActGroup SetGlossaryActGroupFunc( sal_uInt16 nId ) = 0; // for tabpage - virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; - virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; + virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId ) = 0; + virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId ) = 0; }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index a3b29bfc39e6..f3086864ae7c 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -41,11 +41,11 @@ protected: // - return den Ersetzungstext (nur fuer SWG-Format, alle anderen // koennen aus der Wortliste herausgeholt werden!) // rShort ist der Stream-Name - gecryptet! - virtual BOOL GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& , const String& rFileName, const String& rShort, String& rLong ); + virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& , const String& rFileName, const String& rShort, String& rLong ); // - Text mit Attributierung (kann nur der SWG - SWG-Format!) // rShort ist der Stream-Name - gecryptet! - virtual BOOL PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFileName, const String& rShort, SfxObjectShell& , + virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String& rFileName, const String& rShort, SfxObjectShell& , String& ); public: diff --git a/sw/inc/swatrset.hxx b/sw/inc/swatrset.hxx index 6544f2623bba..3bce308ee1d4 100644 --- a/sw/inc/swatrset.hxx +++ b/sw/inc/swatrset.hxx @@ -145,14 +145,14 @@ class SwAttrPool : public SfxItemPool { friend void _InitCore(); // fuers anlegen/zerstoeren der friend void _FinitCore(); // Versionsmaps - static USHORT* pVersionMap1; - static USHORT* pVersionMap2; - static USHORT* pVersionMap3; - static USHORT* pVersionMap4; + static sal_uInt16* pVersionMap1; + static sal_uInt16* pVersionMap2; + static sal_uInt16* pVersionMap3; + static sal_uInt16* pVersionMap4; // due to extension of attribute set a new version // map for binary filter is necessary (version map 5). - static USHORT* pVersionMap5; - static USHORT* pVersionMap6; + static sal_uInt16* pVersionMap5; + static sal_uInt16* pVersionMap6; SwDoc* pDoc; @@ -165,10 +165,10 @@ public: SwDoc* GetDoc() { return pDoc; } const SwDoc* GetDoc() const { return pDoc; } - static USHORT* GetVersionMap1() { return pVersionMap1; } - static USHORT* GetVersionMap2() { return pVersionMap2; } - static USHORT* GetVersionMap3() { return pVersionMap3; } - static USHORT* GetVersionMap6() { return pVersionMap4; } + static sal_uInt16* GetVersionMap1() { return pVersionMap1; } + static sal_uInt16* GetVersionMap2() { return pVersionMap2; } + static sal_uInt16* GetVersionMap3() { return pVersionMap3; } + static sal_uInt16* GetVersionMap6() { return pVersionMap4; } }; @@ -182,18 +182,18 @@ class SW_DLLPUBLIC SwAttrSet : public SfxItemSet void PutChgd( const SfxPoolItem& rI ) { SfxItemSet::PutDirect( rI ); } public: - SwAttrSet( SwAttrPool&, USHORT nWhich1, USHORT nWhich2 ); - SwAttrSet( SwAttrPool&, const USHORT* nWhichPairTable ); + SwAttrSet( SwAttrPool&, sal_uInt16 nWhich1, sal_uInt16 nWhich2 ); + SwAttrSet( SwAttrPool&, const sal_uInt16* nWhichPairTable ); SwAttrSet( const SwAttrSet& ); - virtual SfxItemSet* Clone(BOOL bItems = TRUE, SfxItemPool *pToPool = 0) const; + virtual SfxItemSet* Clone(sal_Bool bItems = sal_True, SfxItemPool *pToPool = 0) const; int Put_BC( const SfxPoolItem& rAttr, SwAttrSet* pOld, SwAttrSet* pNew ); int Put_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); // ein Item oder einen Bereich loeschen - USHORT ClearItem_BC( USHORT nWhich, SwAttrSet* pOld, SwAttrSet* pNew ); - USHORT ClearItem_BC( USHORT nWhich1, USHORT nWhich2, + sal_uInt16 ClearItem_BC( sal_uInt16 nWhich, SwAttrSet* pOld, SwAttrSet* pNew ); + sal_uInt16 ClearItem_BC( sal_uInt16 nWhich1, sal_uInt16 nWhich2, SwAttrSet* pOld = 0, SwAttrSet* pNew = 0 ); int Intersect_BC( const SfxItemSet& rSet, SwAttrSet* pOld, SwAttrSet* pNew ); @@ -220,124 +220,124 @@ public: const SwDoc *GetDoc() const { return GetPool()->GetDoc(); } SwDoc *GetDoc() { return GetPool()->GetDoc(); } - // GetMethoden: das Bool gibt an, ob nur im Set (FALSE) oder auch in + // GetMethoden: das Bool gibt an, ob nur im Set (sal_False) oder auch in // den Parents gesucht werden soll. Wird nichts gefunden, // wird das deflt. Attribut returnt. // Charakter-Attribute - impl. steht im charatr.hxx - inline const SvxPostureItem &GetPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetWeight( BOOL = TRUE ) const; - inline const SvxShadowedItem &GetShadowed( BOOL = TRUE ) const; - inline const SvxAutoKernItem &GetAutoKern( BOOL = TRUE ) const; - inline const SvxWordLineModeItem &GetWordLineMode( BOOL = TRUE ) const; - inline const SvxContourItem &GetContour( BOOL = TRUE ) const; - inline const SvxKerningItem &GetKerning( BOOL = TRUE ) const; - inline const SvxUnderlineItem &GetUnderline( BOOL = TRUE ) const; - inline const SvxOverlineItem &GetOverline( BOOL = TRUE ) const; - inline const SvxCrossedOutItem &GetCrossedOut( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetSize( BOOL = TRUE ) const; - inline const SvxPropSizeItem &GetPropSize( BOOL = TRUE ) const; - inline const SvxFontItem &GetFont( BOOL = TRUE ) const; - inline const SvxColorItem &GetColor( BOOL = TRUE ) const; - inline const SvxCharSetColorItem &GetCharSetColor( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetLanguage( BOOL = TRUE ) const; - inline const SvxEscapementItem &GetEscapement( BOOL = TRUE ) const; - inline const SvxCaseMapItem &GetCaseMap( BOOL = TRUE ) const; - inline const SvxNoHyphenItem &GetNoHyphenHere( BOOL = TRUE ) const; - inline const SvxBlinkItem &GetBlink( BOOL = TRUE ) const; - inline const SvxBrushItem &GetChrBackground( BOOL = TRUE ) const; - inline const SvxFontItem &GetCJKFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCJKSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCJKLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCJKPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCJKWeight( BOOL = TRUE ) const; - inline const SvxFontItem &GetCTLFont( BOOL = TRUE ) const; - inline const SvxFontHeightItem &GetCTLSize( BOOL = TRUE ) const; - inline const SvxLanguageItem &GetCTLLanguage( BOOL = TRUE ) const; - inline const SvxPostureItem &GetCTLPosture( BOOL = TRUE ) const; - inline const SvxWeightItem &GetCTLWeight( BOOL = TRUE ) const; - inline const SfxBoolItem &GetWritingDirection( BOOL = TRUE ) const; - inline const SvxEmphasisMarkItem &GetEmphasisMark( BOOL = TRUE ) const; - inline const SvxTwoLinesItem &Get2Lines( BOOL = TRUE ) const; - inline const SvxCharScaleWidthItem &GetCharScaleW( BOOL = TRUE ) const; - inline const SvxCharRotateItem &GetCharRotate( BOOL = TRUE ) const; - inline const SvxCharReliefItem &GetCharRelief( BOOL = TRUE ) const; - inline const SvxCharHiddenItem &GetCharHidden( BOOL = TRUE ) const; + inline const SvxPostureItem &GetPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetWeight( sal_Bool = sal_True ) const; + inline const SvxShadowedItem &GetShadowed( sal_Bool = sal_True ) const; + inline const SvxAutoKernItem &GetAutoKern( sal_Bool = sal_True ) const; + inline const SvxWordLineModeItem &GetWordLineMode( sal_Bool = sal_True ) const; + inline const SvxContourItem &GetContour( sal_Bool = sal_True ) const; + inline const SvxKerningItem &GetKerning( sal_Bool = sal_True ) const; + inline const SvxUnderlineItem &GetUnderline( sal_Bool = sal_True ) const; + inline const SvxOverlineItem &GetOverline( sal_Bool = sal_True ) const; + inline const SvxCrossedOutItem &GetCrossedOut( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetSize( sal_Bool = sal_True ) const; + inline const SvxPropSizeItem &GetPropSize( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetFont( sal_Bool = sal_True ) const; + inline const SvxColorItem &GetColor( sal_Bool = sal_True ) const; + inline const SvxCharSetColorItem &GetCharSetColor( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetLanguage( sal_Bool = sal_True ) const; + inline const SvxEscapementItem &GetEscapement( sal_Bool = sal_True ) const; + inline const SvxCaseMapItem &GetCaseMap( sal_Bool = sal_True ) const; + inline const SvxNoHyphenItem &GetNoHyphenHere( sal_Bool = sal_True ) const; + inline const SvxBlinkItem &GetBlink( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetChrBackground( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCJKFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCJKSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCJKLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCJKPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCJKWeight( sal_Bool = sal_True ) const; + inline const SvxFontItem &GetCTLFont( sal_Bool = sal_True ) const; + inline const SvxFontHeightItem &GetCTLSize( sal_Bool = sal_True ) const; + inline const SvxLanguageItem &GetCTLLanguage( sal_Bool = sal_True ) const; + inline const SvxPostureItem &GetCTLPosture( sal_Bool = sal_True ) const; + inline const SvxWeightItem &GetCTLWeight( sal_Bool = sal_True ) const; + inline const SfxBoolItem &GetWritingDirection( sal_Bool = sal_True ) const; + inline const SvxEmphasisMarkItem &GetEmphasisMark( sal_Bool = sal_True ) const; + inline const SvxTwoLinesItem &Get2Lines( sal_Bool = sal_True ) const; + inline const SvxCharScaleWidthItem &GetCharScaleW( sal_Bool = sal_True ) const; + inline const SvxCharRotateItem &GetCharRotate( sal_Bool = sal_True ) const; + inline const SvxCharReliefItem &GetCharRelief( sal_Bool = sal_True ) const; + inline const SvxCharHiddenItem &GetCharHidden( sal_Bool = sal_True ) const; // Frame-Attribute - impl. steht im frmatr.hxx - inline const SwFmtFillOrder &GetFillOrder( BOOL = TRUE ) const; - inline const SwFmtFrmSize &GetFrmSize( BOOL = TRUE ) const; - inline const SvxPaperBinItem &GetPaperBin( BOOL = TRUE ) const; - inline const SvxLRSpaceItem &GetLRSpace( BOOL = TRUE ) const; - inline const SvxULSpaceItem &GetULSpace( BOOL = TRUE ) const; - inline const SwFmtCntnt &GetCntnt( BOOL = TRUE ) const; - inline const SwFmtHeader &GetHeader( BOOL = TRUE ) const; - inline const SwFmtFooter &GetFooter( BOOL = TRUE ) const; - inline const SvxPrintItem &GetPrint( BOOL = TRUE ) const; - inline const SvxOpaqueItem &GetOpaque( BOOL = TRUE ) const; - inline const SvxProtectItem &GetProtect( BOOL = TRUE ) const; - inline const SwFmtSurround &GetSurround( BOOL = TRUE ) const; - inline const SwFmtVertOrient &GetVertOrient( BOOL = TRUE ) const; - inline const SwFmtHoriOrient &GetHoriOrient( BOOL = TRUE ) const; - inline const SwFmtAnchor &GetAnchor( BOOL = TRUE ) const; - inline const SvxBoxItem &GetBox( BOOL = TRUE ) const; - inline const SvxFmtKeepItem &GetKeep( BOOL = TRUE ) const; - inline const SvxBrushItem &GetBackground( BOOL = TRUE ) const; - inline const SvxShadowItem &GetShadow( BOOL = TRUE ) const; - inline const SwFmtPageDesc &GetPageDesc( BOOL = TRUE ) const; - inline const SvxFmtBreakItem &GetBreak( BOOL = TRUE ) const; - inline const SwFmtCol &GetCol( BOOL = TRUE ) const; - inline const SvxMacroItem &GetMacro( BOOL = TRUE ) const; - inline const SwFmtURL &GetURL( BOOL = TRUE ) const; - inline const SwFmtEditInReadonly &GetEditInReadonly( BOOL = TRUE ) const; - inline const SwFmtLayoutSplit &GetLayoutSplit( BOOL = TRUE ) const; - inline const SwFmtRowSplit &GetRowSplit( BOOL = TRUE ) const; - inline const SwFmtChain &GetChain( BOOL = TRUE ) const; - inline const SwFmtLineNumber &GetLineNumber( BOOL = TRUE ) const; - inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( BOOL = TRUE ) const; - inline const SwFmtNoBalancedColumns &GetBalancedColumns( BOOL = TRUE ) const; - inline const SvxFrameDirectionItem &GetFrmDir( BOOL = TRUE ) const; - inline const SwTextGridItem &GetTextGrid( BOOL = TRUE ) const; - inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( BOOL = TRUE ) const; - inline const SwFmtFollowTextFlow &GetFollowTextFlow(BOOL = TRUE) const; - inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(BOOL = TRUE) const; + inline const SwFmtFillOrder &GetFillOrder( sal_Bool = sal_True ) const; + inline const SwFmtFrmSize &GetFrmSize( sal_Bool = sal_True ) const; + inline const SvxPaperBinItem &GetPaperBin( sal_Bool = sal_True ) const; + inline const SvxLRSpaceItem &GetLRSpace( sal_Bool = sal_True ) const; + inline const SvxULSpaceItem &GetULSpace( sal_Bool = sal_True ) const; + inline const SwFmtCntnt &GetCntnt( sal_Bool = sal_True ) const; + inline const SwFmtHeader &GetHeader( sal_Bool = sal_True ) const; + inline const SwFmtFooter &GetFooter( sal_Bool = sal_True ) const; + inline const SvxPrintItem &GetPrint( sal_Bool = sal_True ) const; + inline const SvxOpaqueItem &GetOpaque( sal_Bool = sal_True ) const; + inline const SvxProtectItem &GetProtect( sal_Bool = sal_True ) const; + inline const SwFmtSurround &GetSurround( sal_Bool = sal_True ) const; + inline const SwFmtVertOrient &GetVertOrient( sal_Bool = sal_True ) const; + inline const SwFmtHoriOrient &GetHoriOrient( sal_Bool = sal_True ) const; + inline const SwFmtAnchor &GetAnchor( sal_Bool = sal_True ) const; + inline const SvxBoxItem &GetBox( sal_Bool = sal_True ) const; + inline const SvxFmtKeepItem &GetKeep( sal_Bool = sal_True ) const; + inline const SvxBrushItem &GetBackground( sal_Bool = sal_True ) const; + inline const SvxShadowItem &GetShadow( sal_Bool = sal_True ) const; + inline const SwFmtPageDesc &GetPageDesc( sal_Bool = sal_True ) const; + inline const SvxFmtBreakItem &GetBreak( sal_Bool = sal_True ) const; + inline const SwFmtCol &GetCol( sal_Bool = sal_True ) const; + inline const SvxMacroItem &GetMacro( sal_Bool = sal_True ) const; + inline const SwFmtURL &GetURL( sal_Bool = sal_True ) const; + inline const SwFmtEditInReadonly &GetEditInReadonly( sal_Bool = sal_True ) const; + inline const SwFmtLayoutSplit &GetLayoutSplit( sal_Bool = sal_True ) const; + inline const SwFmtRowSplit &GetRowSplit( sal_Bool = sal_True ) const; + inline const SwFmtChain &GetChain( sal_Bool = sal_True ) const; + inline const SwFmtLineNumber &GetLineNumber( sal_Bool = sal_True ) const; + inline const SwFmtFtnAtTxtEnd &GetFtnAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtEndAtTxtEnd &GetEndAtTxtEnd( sal_Bool = sal_True ) const; + inline const SwFmtNoBalancedColumns &GetBalancedColumns( sal_Bool = sal_True ) const; + inline const SvxFrameDirectionItem &GetFrmDir( sal_Bool = sal_True ) const; + inline const SwTextGridItem &GetTextGrid( sal_Bool = sal_True ) const; + inline const SwHeaderAndFooterEatSpacingItem &GetHeaderAndFooterEatSpacing( sal_Bool = sal_True ) const; + inline const SwFmtFollowTextFlow &GetFollowTextFlow(sal_Bool = sal_True) const; + inline const SwFmtWrapInfluenceOnObjPos& GetWrapInfluenceOnObjPos(sal_Bool = sal_True) const; // Graphic attributes - implementation in grfatr.hxx - inline const SwMirrorGrf &GetMirrorGrf( BOOL = TRUE ) const; - inline const SwCropGrf &GetCropGrf( BOOL = TRUE ) const; - inline const SwRotationGrf &GetRotationGrf(BOOL = TRUE ) const; - inline const SwLuminanceGrf &GetLuminanceGrf(BOOL = TRUE ) const; - inline const SwContrastGrf &GetContrastGrf(BOOL = TRUE ) const; - inline const SwChannelRGrf &GetChannelRGrf(BOOL = TRUE ) const; - inline const SwChannelGGrf &GetChannelGGrf(BOOL = TRUE ) const; - inline const SwChannelBGrf &GetChannelBGrf(BOOL = TRUE ) const; - inline const SwGammaGrf &GetGammaGrf(BOOL = TRUE ) const; - inline const SwInvertGrf &GetInvertGrf(BOOL = TRUE ) const; - inline const SwTransparencyGrf &GetTransparencyGrf(BOOL = TRUE ) const; - inline const SwDrawModeGrf &GetDrawModeGrf(BOOL = TRUE ) const; + inline const SwMirrorGrf &GetMirrorGrf( sal_Bool = sal_True ) const; + inline const SwCropGrf &GetCropGrf( sal_Bool = sal_True ) const; + inline const SwRotationGrf &GetRotationGrf(sal_Bool = sal_True ) const; + inline const SwLuminanceGrf &GetLuminanceGrf(sal_Bool = sal_True ) const; + inline const SwContrastGrf &GetContrastGrf(sal_Bool = sal_True ) const; + inline const SwChannelRGrf &GetChannelRGrf(sal_Bool = sal_True ) const; + inline const SwChannelGGrf &GetChannelGGrf(sal_Bool = sal_True ) const; + inline const SwChannelBGrf &GetChannelBGrf(sal_Bool = sal_True ) const; + inline const SwGammaGrf &GetGammaGrf(sal_Bool = sal_True ) const; + inline const SwInvertGrf &GetInvertGrf(sal_Bool = sal_True ) const; + inline const SwTransparencyGrf &GetTransparencyGrf(sal_Bool = sal_True ) const; + inline const SwDrawModeGrf &GetDrawModeGrf(sal_Bool = sal_True ) const; // Paragraph attributes - implementation in paratr.hxx - inline const SvxLineSpacingItem &GetLineSpacing( BOOL = TRUE ) const; - inline const SvxAdjustItem &GetAdjust( BOOL = TRUE ) const; - inline const SvxFmtSplitItem &GetSplit( BOOL = TRUE ) const; - inline const SwRegisterItem &GetRegister( BOOL = TRUE ) const; - inline const SwNumRuleItem &GetNumRule( BOOL = TRUE ) const; - inline const SvxWidowsItem &GetWidows( BOOL = TRUE ) const; - inline const SvxOrphansItem &GetOrphans( BOOL = TRUE ) const; - inline const SvxTabStopItem &GetTabStops( BOOL = TRUE ) const; - inline const SvxHyphenZoneItem &GetHyphenZone( BOOL = TRUE ) const; - inline const SwFmtDrop &GetDrop( BOOL = TRUE ) const; - inline const SvxScriptSpaceItem &GetScriptSpace(BOOL = TRUE) const; - inline const SvxHangingPunctuationItem &GetHangingPunctuation(BOOL = TRUE) const; - inline const SvxForbiddenRuleItem &GetForbiddenRule(BOOL = TRUE) const; - inline const SvxParaVertAlignItem &GetParaVertAlign(BOOL = TRUE) const; - inline const SvxParaGridItem &GetParaGrid(BOOL = TRUE) const; - inline const SwParaConnectBorderItem &GetParaConnectBorder(BOOL = TRUE ) const; + inline const SvxLineSpacingItem &GetLineSpacing( sal_Bool = sal_True ) const; + inline const SvxAdjustItem &GetAdjust( sal_Bool = sal_True ) const; + inline const SvxFmtSplitItem &GetSplit( sal_Bool = sal_True ) const; + inline const SwRegisterItem &GetRegister( sal_Bool = sal_True ) const; + inline const SwNumRuleItem &GetNumRule( sal_Bool = sal_True ) const; + inline const SvxWidowsItem &GetWidows( sal_Bool = sal_True ) const; + inline const SvxOrphansItem &GetOrphans( sal_Bool = sal_True ) const; + inline const SvxTabStopItem &GetTabStops( sal_Bool = sal_True ) const; + inline const SvxHyphenZoneItem &GetHyphenZone( sal_Bool = sal_True ) const; + inline const SwFmtDrop &GetDrop( sal_Bool = sal_True ) const; + inline const SvxScriptSpaceItem &GetScriptSpace(sal_Bool = sal_True) const; + inline const SvxHangingPunctuationItem &GetHangingPunctuation(sal_Bool = sal_True) const; + inline const SvxForbiddenRuleItem &GetForbiddenRule(sal_Bool = sal_True) const; + inline const SvxParaVertAlignItem &GetParaVertAlign(sal_Bool = sal_True) const; + inline const SvxParaGridItem &GetParaGrid(sal_Bool = sal_True) const; + inline const SwParaConnectBorderItem &GetParaConnectBorder(sal_Bool = sal_True ) const; // Tablebox attributes - implementation in cellatr.hxx - inline const SwTblBoxNumFormat &GetTblBoxNumFmt( BOOL = TRUE ) const; - inline const SwTblBoxFormula &GetTblBoxFormula( BOOL = TRUE ) const; - inline const SwTblBoxValue &GetTblBoxValue( BOOL = TRUE ) const; + inline const SwTblBoxNumFormat &GetTblBoxNumFmt( sal_Bool = sal_True ) const; + inline const SwTblBoxFormula &GetTblBoxFormula( sal_Bool = sal_True ) const; + inline const SwTblBoxValue &GetTblBoxValue( sal_Bool = sal_True ) const; DECL_FIXEDMEMPOOL_NEWDEL(SwAttrSet) }; diff --git a/sw/inc/swbaslnk.hxx b/sw/inc/swbaslnk.hxx index b3d5258863ee..b558aa19ca9f 100644 --- a/sw/inc/swbaslnk.hxx +++ b/sw/inc/swbaslnk.hxx @@ -40,27 +40,27 @@ class SwBaseLink : public ::sfx2::SvBaseLink friend long GrfNodeChanged( void* pLink, void* pCaller ); SwCntntNode* pCntntNode; - BOOL bSwapIn : 1; - BOOL bNoDataFlag : 1; - BOOL bIgnoreDataChanged : 1; + sal_Bool bSwapIn : 1; + sal_Bool bNoDataFlag : 1; + sal_Bool bIgnoreDataChanged : 1; ReReadThread* m_pReReadThread; protected: SwBaseLink(): m_pReReadThread(0) {} - SwBaseLink( const String& rNm, USHORT nObjectType, ::sfx2::SvLinkSource* pObj, + SwBaseLink( const String& rNm, sal_uInt16 nObjectType, ::sfx2::SvLinkSource* pObj, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( rNm, nObjectType, pObj ), pCntntNode( pNode ), - bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE ), + bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ), m_pReReadThread(0) {} public: TYPEINFO(); - SwBaseLink( USHORT nMode, USHORT nFormat, SwCntntNode* pNode = 0 ) + SwBaseLink( sal_uInt16 nMode, sal_uInt16 nFormat, SwCntntNode* pNode = 0 ) : ::sfx2::SvBaseLink( nMode, nFormat ), pCntntNode( pNode ), - bSwapIn( FALSE ), bNoDataFlag( FALSE ), bIgnoreDataChanged( FALSE ), + bSwapIn( sal_False ), bNoDataFlag( sal_False ), bIgnoreDataChanged( sal_False ), m_pReReadThread(0) {} virtual ~SwBaseLink(); @@ -75,20 +75,20 @@ public: SwCntntNode *GetCntntNode() { return pCntntNode; } // nur fuer Grafiken - BOOL SwapIn( BOOL bWaitForData = FALSE, BOOL bNativFormat = FALSE ); + sal_Bool SwapIn( sal_Bool bWaitForData = sal_False, sal_Bool bNativFormat = sal_False ); - BOOL Connect() { return 0 != SvBaseLink::GetRealObject(); } + sal_Bool Connect() { return 0 != SvBaseLink::GetRealObject(); } // nur fuer Grafik-Links ( zum Umschalten zwischen DDE / Grf-Link) - void SetObjType( USHORT nType ) { SvBaseLink::SetObjType( nType ); } + void SetObjType( sal_uInt16 nType ) { SvBaseLink::SetObjType( nType ); } - BOOL IsRecursion( const SwBaseLink* pChkLnk ) const; - virtual BOOL IsInRange( ULONG nSttNd, ULONG nEndNd, xub_StrLen nStt = 0, + sal_Bool IsRecursion( const SwBaseLink* pChkLnk ) const; + virtual sal_Bool IsInRange( sal_uLong nSttNd, sal_uLong nEndNd, xub_StrLen nStt = 0, xub_StrLen nEnd = STRING_NOTFOUND ) const; - void SetNoDataFlag() { bNoDataFlag = TRUE; } - BOOL ChkNoDataFlag() { BOOL bRet = bNoDataFlag; bNoDataFlag = FALSE; return bRet; } - BOOL IsNoDataFlag() const { return bNoDataFlag; } + void SetNoDataFlag() { bNoDataFlag = sal_True; } + sal_Bool ChkNoDataFlag() { sal_Bool bRet = bNoDataFlag; bNoDataFlag = sal_False; return bRet; } + sal_Bool IsNoDataFlag() const { return bNoDataFlag; } }; diff --git a/sw/inc/swcalwrp.hxx b/sw/inc/swcalwrp.hxx index d6df4e36f512..0adf78ebf2fa 100644 --- a/sw/inc/swcalwrp.hxx +++ b/sw/inc/swcalwrp.hxx @@ -37,7 +37,7 @@ class SwCalendarWrapper : public CalendarWrapper { String sUniqueId; - USHORT nLang; + sal_uInt16 nLang; public: SwCalendarWrapper( const ::com::sun::star::uno::Reference< @@ -45,7 +45,7 @@ public: : CalendarWrapper( xMSF ), nLang( LANGUAGE_SYSTEM ) {} - void LoadDefaultCalendar( USHORT nLang ); + void LoadDefaultCalendar( sal_uInt16 nLang ); }; diff --git a/sw/inc/swcli.hxx b/sw/inc/swcli.hxx index 130f74125e3e..f0a186047907 100644 --- a/sw/inc/swcli.hxx +++ b/sw/inc/swcli.hxx @@ -38,8 +38,8 @@ class SwEditWin; class SwOleClient : public SfxInPlaceClient { - BOOL bInDoVerb; - BOOL bOldCheckForOLEInCaption; + sal_Bool bInDoVerb; + sal_Bool bOldCheckForOLEInCaption; virtual void ObjectAreaChanged(); virtual void RequestNewObjectArea( Rectangle& ); @@ -49,9 +49,11 @@ class SwOleClient : public SfxInPlaceClient public: SwOleClient( SwView *pView, SwEditWin *pWin, const svt::EmbeddedObjectRef& ); - void SetInDoVerb( BOOL bFlag ) { bInDoVerb = bFlag; } + void SetInDoVerb( sal_Bool bFlag ) { bInDoVerb = bFlag; } - BOOL IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } + sal_Bool IsCheckForOLEInCaption() const { return bOldCheckForOLEInCaption; } + + virtual void FormatChanged(); }; #endif diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h new file mode 100644 index 000000000000..77b30ca59f7a --- /dev/null +++ b/sw/inc/swcommands.h @@ -0,0 +1,437 @@ +/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef SW_SWCOMMANDS_HRC
+#define SW_SWCOMMANDS_HRC
+
+#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView"
+#define CMD_FN_REDLINE_ACCEPT ".uno:AcceptTrackedChanges"
+#define CMD_FN_REDLINE_ON ".uno:TrackChanges"
+#define CMD_FN_ADD_UNKNOWN ".uno:AddAllUnknownWords"
+#define CMD_FN_FRAME_ALIGN_VERT_BOTTOM ".uno:AlignBottom"
+#define CMD_FN_FRAME_ALIGN_VERT_CHAR_BOTTOM ".uno:AlignCharBottom"
+#define CMD_FN_FRAME_ALIGN_VERT_CHAR_TOP ".uno:AlignCharTop"
+#define CMD_FN_FRAME_ALIGN_HORZ_CENTER ".uno:AlignHorizontalCenter"
+#define CMD_FN_FRAME_ALIGN_HORZ_LEFT ".uno:AlignLeft"
+#define CMD_FN_FRAME_ALIGN_HORZ_RIGHT ".uno:AlignRight"
+#define CMD_FN_FRAME_ALIGN_VERT_ROW_BOTTOM ".uno:AlignRowBottom"
+#define CMD_FN_FRAME_ALIGN_VERT_ROW_TOP ".uno:AlignRowTop"
+#define CMD_FN_FRAME_ALIGN_VERT_TOP ".uno:AlignTop"
+#define CMD_FN_FRAME_ALIGN_VERT_CENTER ".uno:AlignVerticalCenter"
+#define CMD_FN_FRAME_ALIGN_VERT_CHAR_CENTER ".uno:AlignVerticalCharCenter"
+#define CMD_FN_FRAME_ALIGN_VERT_ROW_CENTER ".uno:AlignVerticalRowCenter"
+#define CMD_FN_EDIT_AUTH_ENTRY_DLG ".uno:AuthoritiesEntryDialog"
+#define CMD_FN_AUTOFORMAT_APPLY ".uno:AutoFormatApply"
+#define CMD_FN_AUTOFORMAT_REDLINE_APPLY ".uno:AutoFormatRedlineApply"
+#define CMD_FN_TABLE_AUTOSUM ".uno:AutoSum"
+#define CMD_SID_ATTR_CHAR_COLOR_BACKGROUND ".uno:BackColor"
+#define CMD_FN_FORMAT_BACKGROUND_DLG ".uno:BackgroundDialog"
+#define CMD_FN_BACKSPACE ".uno:SwBackspace"
+#define CMD_FN_FORMAT_BORDER_DLG ".uno:BorderDialog"
+#define CMD_FN_NUMBER_BULLETS ".uno:BulletsAndNumberingDialog"
+#define CMD_FN_CALC_TABLE ".uno:Calc"
+#define CMD_FN_CALCULATE ".uno:CalculateSel"
+#define CMD_FN_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_FN_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_FN_TABLE_VERT_NONE ".uno:CellVertTop"
+#define CMD_FN_FRAME_CHAIN ".uno:ChainFrames"
+#define CMD_FN_CHANGE_DBFIELD ".uno:ChangeDatabaseField"
+#define CMD_FN_NUMBERING_OUTLINE_DLG ".uno:ChapterNumberingDialog"
+#define CMD_SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ".uno:CharBackgroundExt"
+#define CMD_SID_ATTR_CHAR_COLOR_EXT ".uno:CharColorExt"
+#define CMD_FN_CHAR_LEFT_SEL ".uno:CharLeftSel"
+#define CMD_FN_CHAR_RIGHT_SEL ".uno:CharRightSel"
+#define CMD_FN_CLOSE_PAGEPREVIEW ".uno:ClosePreview"
+#define CMD_FN_REDLINE_COMMENT ".uno:CommentChangeTracking"
+#define CMD_FN_VIEW_META_CHARS ".uno:ControlCodes"
+#define CMD_FN_CONVERT_TEXT_TABLE ".uno:ConvertTableText"
+#define CMD_FN_ABSTRACT_NEWDOC ".uno:CreateAbstract"
+#define CMD_FN_DEC_INDENT_OFFSET ".uno:DecrementIndentValue"
+#define CMD_FN_NUM_BULLET_DOWN ".uno:DecrementLevel"
+#define CMD_FN_NUM_BULLET_OUTLINE_DOWN ".uno:DecrementSubLevels"
+#define CMD_FN_TABLE_DELETE_COL ".uno:DeleteColumns"
+#define CMD_FN_TABLE_DELETE_ROW ".uno:DeleteRows"
+#define CMD_FN_DELETE_WHOLE_LINE ".uno:DelLine"
+#define CMD_FN_DELETE_LINE ".uno:DelToEndOfLine"
+#define CMD_FN_DELETE_PARA ".uno:DelToEndOfPara"
+#define CMD_FN_DELETE_SENT ".uno:DelToEndOfSentence"
+#define CMD_FN_DELETE_WORD ".uno:DelToEndOfWord"
+#define CMD_FN_DELETE_BACK_LINE ".uno:DelToStartOfLine"
+#define CMD_FN_DELETE_BACK_PARA ".uno:DelToStartOfPara"
+#define CMD_FN_DELETE_BACK_SENT ".uno:DelToStartOfSentence"
+#define CMD_FN_DELETE_BACK_WORD ".uno:DelToStartOfWord"
+#define CMD_FN_TABLE_BALANCE_CELLS ".uno:DistributeColumns"
+#define CMD_FN_TABLE_BALANCE_ROWS ".uno:DistributeRows"
+#define CMD_FN_EDIT_CURRENT_TOX ".uno:EditCurIndex"
+#define CMD_FN_GLOSSARY_DLG ".uno:EditGlossary"
+#define CMD_FN_EDIT_HYPERLINK ".uno:EditHyperlink"
+#define CMD_FN_EDIT_REGION ".uno:EditRegion"
+#define CMD_FN_END_OF_DOCUMENT_SEL ".uno:EndOfDocumentSel"
+#define CMD_FN_END_OF_LINE_SEL ".uno:EndOfLineSel"
+#define CMD_FN_END_OF_PARA_SEL ".uno:EndOfParaSel"
+#define CMD_FN_TABLE_SELECT_COL ".uno:EntireColumn"
+#define CMD_FN_TABLE_SELECT_ROW ".uno:EntireRow"
+#define CMD_FN_ESCAPE ".uno:Escape"
+#define CMD_FN_EXECUTE_MACROFIELD ".uno:ExecuteMacroField"
+#define CMD_FN_EXPAND_GLOSSARY ".uno:ExpandGlossary"
+#define CMD_FN_EDIT_FIELD ".uno:FieldDialog"
+#define CMD_FN_VIEW_FIELDNAME ".uno:Fieldnames"
+#define CMD_FN_VIEW_FIELDS ".uno:Fields"
+#define CMD_FN_FLIP_HORZ_GRAFIC ".uno:FlipHorizontal"
+#define CMD_FN_FLIP_VERT_GRAFIC ".uno:FlipVertical"
+#define CMD_SID_ATTR_CHAR_COLOR2 ".uno:FontColor"
+#define CMD_FN_FORMAT_FOOTNOTE_DLG ".uno:FootnoteDialog"
+#define CMD_FN_EDIT_FOOTNOTE ".uno:EditFootnote"
+#define CMD_FN_FORMAT_COLUMN ".uno:FormatColumns"
+#define CMD_FN_FORMAT_DROPCAPS ".uno:FormatDropcap"
+#define CMD_FN_FORMAT_FRAME_DLG ".uno:FrameDialog"
+#define CMD_FN_LINE_DOWN ".uno:GoDown"
+#define CMD_FN_CHAR_LEFT ".uno:GoLeft"
+#define CMD_FN_CHAR_RIGHT ".uno:GoRight"
+#define CMD_FN_FRAME_TO_ANCHOR ".uno:GoToAnchor"
+#define CMD_FN_END_TABLE ".uno:GoToEnd"
+#define CMD_FN_END_OF_COLUMN ".uno:GoToEndOfColumn"
+#define CMD_FN_END_OF_DOCUMENT ".uno:GoToEndOfDoc"
+#define CMD_FN_END_OF_LINE ".uno:GoToEndOfLine"
+#define CMD_FN_END_OF_NEXT_COLUMN ".uno:GoToEndOfNextColumn"
+#define CMD_FN_END_OF_NEXT_PAGE ".uno:GoToEndOfNextPage"
+#define CMD_FN_END_OF_NEXT_PAGE_SEL ".uno:GoToEndOfNextPageSel"
+#define CMD_FN_END_OF_PAGE ".uno:GoToEndOfPage"
+#define CMD_FN_END_OF_PAGE_SEL ".uno:GoToEndOfPageSel"
+#define CMD_FN_END_OF_PARA ".uno:GoToEndOfPara"
+#define CMD_FN_END_OF_PREV_COLUMN ".uno:GoToEndOfPrevColumn"
+#define CMD_FN_END_OF_PREV_PAGE ".uno:GoToEndOfPrevPage"
+#define CMD_FN_END_OF_PREV_PAGE_SEL ".uno:GoToEndOfPrevPageSel"
+#define CMD_FN_NEXT_TOXMARK ".uno:GotoNextIndexMark"
+#define CMD_FN_GOTO_NEXT_INPUTFLD ".uno:GotoNextInputField"
+#define CMD_FN_GOTO_NEXT_OBJ ".uno:GotoNextObject"
+#define CMD_FN_NEXT_PARA ".uno:GoToNextPara"
+#define CMD_FN_GOTO_NEXT_MARK ".uno:GotoNextPlacemarker"
+#define CMD_FN_NEXT_SENT ".uno:GoToNextSentence"
+#define CMD_FN_NEXT_SENT_SEL ".uno:GotoNextSentenceSel"
+#define CMD_FN_NEXT_TBLFML ".uno:GotoNextTableFormula"
+#define CMD_FN_NEXT_WORD ".uno:GoToNextWord"
+#define CMD_FN_NEXT_TBLFML_ERR ".uno:GotoNextWrongTableFormula"
+#define CMD_FN_NAVIGATION_PI_GOTO_PAGE ".uno:GotoPage"
+#define CMD_FN_PREV_TOXMARK ".uno:GotoPrevIndexMark"
+#define CMD_FN_GOTO_PREV_INPUTFLD ".uno:GotoPrevInputField"
+#define CMD_FN_GOTO_PREV_OBJ ".uno:GotoPrevObject"
+#define CMD_FN_PREV_PARA ".uno:GoToPrevPara"
+#define CMD_FN_GOTO_PREV_MARK ".uno:GotoPrevPlacemarker"
+#define CMD_FN_PREV_SENT ".uno:GoToPrevSentence"
+#define CMD_FN_PREV_SENT_SEL ".uno:GotoPrevSentenceSel"
+#define CMD_FN_PREV_TBLFML ".uno:GotoPrevTableFormula"
+#define CMD_FN_PREV_WORD ".uno:GoToPrevWord"
+#define CMD_FN_PREV_TBLFML_ERR ".uno:GotoPrevWrongTableFormula"
+#define CMD_FN_START_TABLE ".uno:GoToStartOfTable"
+#define CMD_FN_START_OF_COLUMN ".uno:GoToStartOfColumn"
+#define CMD_FN_START_OF_DOCUMENT ".uno:GoToStartOfDoc"
+#define CMD_FN_START_OF_LINE ".uno:GoToStartOfLine"
+#define CMD_FN_START_OF_NEXT_COLUMN ".uno:GoToStartOfNextColumn"
+#define CMD_FN_START_OF_NEXT_PAGE ".uno:GoToStartOfNextPage"
+#define CMD_FN_START_OF_NEXT_PAGE_SEL ".uno:GoToStartOfNextPageSel"
+#define CMD_FN_START_OF_PAGE ".uno:GoToStartOfPage"
+#define CMD_FN_START_OF_PAGE_SEL ".uno:GoToStartOfPageSel"
+#define CMD_FN_START_OF_PARA ".uno:GoToStartOfPara"
+#define CMD_FN_START_OF_PREV_COLUMN ".uno:GoToStartOfPrevColumn"
+#define CMD_FN_START_OF_PREV_PAGE ".uno:GoToStartOfPrevPage"
+#define CMD_FN_START_OF_PREV_PAGE_SEL ".uno:GoToStartOfPrevPageSel"
+#define CMD_FN_LINE_UP ".uno:GoUp"
+#define CMD_FN_VIEW_GRAPHIC ".uno:Graphic"
+#define CMD_FN_FORMAT_GRAFIC_DLG ".uno:GraphicDialog"
+#define CMD_FN_SAVE_GRAPHIC ".uno:SaveGraphic"
+#define CMD_FN_EXTERNAL_EDIT ".uno:ExternalEdit"
+#define CMD_FN_EXPORT_OLE_AS_PDF ".uno:ExportOleAsPDF"
+#define CMD_FN_EXPORT_OLE_AS_GRAPHIC ".uno:ExportOleAsGraphic"
+#define CMD_FN_GROW_FONT_SIZE ".uno:Grow"
+#define CMD_FN_HSCROLLBAR ".uno:HScroll"
+#define CMD_SID_HTML_MODE ".uno:HtmlMode"
+#define CMD_FN_HYPHENATE_OPT_DLG ".uno:Hyphenate"
+#define CMD_FN_INC_INDENT_OFFSET ".uno:IncrementIndentValue"
+#define CMD_FN_NUM_BULLET_UP ".uno:IncrementLevel"
+#define CMD_FN_NUM_BULLET_OUTLINE_UP ".uno:IncrementSubLevels"
+#define CMD_FN_EDIT_IDX_ENTRY_DLG ".uno:IndexEntryDialog"
+#define CMD_FN_IDX_MARK_TO_IDX ".uno:IndexMarkToIndex"
+#define CMD_FN_POSTIT ".uno:InsertAnnotation"
+#define CMD_FN_INSERT_FLD_AUTHOR ".uno:InsertAuthorField"
+#define CMD_FN_INSERT_AUTH_ENTRY_DLG ".uno:InsertAuthoritiesEntry"
+#define CMD_FN_INSERT_BOOKMARK ".uno:InsertBookmark"
+#define CMD_FN_INSERT_BREAK_DLG ".uno:InsertBreak"
+#define CMD_FN_INSERT_CAPTION ".uno:InsertCaptionDialog"
+#define CMD_FN_INSERT_COLUMN_BREAK ".uno:InsertColumnBreak"
+#define CMD_FN_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog"
+#define CMD_FN_TABLE_INSERT_COL ".uno:InsertColumns"
+#define CMD_FN_INSERT_REGION ".uno:InsertSection"
+#define CMD_FN_INSERT_CTRL ".uno:InsertCtrl"
+#define CMD_FN_INSERT_FLD_DATE ".uno:InsertDateField"
+#define CMD_FN_INSERT_ENDNOTE ".uno:InsertEndnote"
+#define CMD_FN_ENVELOP ".uno:InsertEnvelope"
+#define CMD_FN_INSERT_FIELD ".uno:InsertField"
+#define CMD_FN_INSERT_FIELD_CTRL ".uno:InsertFieldCtrl"
+#define CMD_FN_INSERT_FOOTNOTE_DLG ".uno:InsertFootnoteDialog"
+#define CMD_FN_INSERT_FOOTNOTE ".uno:InsertFootnote"
+#define CMD_FN_EDIT_FORMULA ".uno:InsertFormula"
+#define CMD_FN_INSERT_FRAME ".uno:InsertFrame"
+#define CMD_FN_INSERT_FRAME_INTERACT ".uno:InsertFrameInteract"
+#define CMD_FN_INSERT_FRAME_INTERACT_NOCOL ".uno:InsertFrameInteractNoColumns"
+#define CMD_FN_INSERT_HRULER ".uno:InsertGraphicRuler"
+#define CMD_FN_INSERT_HYPERLINK ".uno:InsertHyperlinkDlg"
+#define CMD_FN_INSERT_IDX_ENTRY_DLG ".uno:InsertIndexesEntry"
+#define CMD_FN_INSERT_LINEBREAK ".uno:InsertLinebreak"
+#define CMD_FN_INSERT_MULTI_TOX ".uno:InsertMultiIndex"
+#define CMD_FN_NUM_BULLET_NONUM ".uno:InsertNeutralParagraph"
+#define CMD_FN_INSERT_OBJ_CTRL ".uno:InsertObjCtrl"
+#define CMD_FN_INSERT_OBJECT_DLG ".uno:InsertObjectDialog"
+#define CMD_FN_INSERT_SMA ".uno:InsertObjectStarMath"
+#define CMD_FN_INSERT_PAGEBREAK ".uno:InsertPagebreak"
+#define CMD_FN_INSERT_FLD_PGCOUNT ".uno:InsertPageCountField"
+#define CMD_FN_INSERT_PAGEFOOTER ".uno:InsertPageFooter"
+#define CMD_FN_INSERT_PAGEHEADER ".uno:InsertPageHeader"
+#define CMD_FN_INSERT_FLD_PGNUMBER ".uno:InsertPageNumberField"
+#define CMD_FN_INSERT_BREAK ".uno:InsertPara"
+#define CMD_FN_INSERT_REF_FIELD ".uno:InsertReferenceField"
+#define CMD_FN_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog"
+#define CMD_FN_TABLE_INSERT_ROW ".uno:InsertRows"
+#define CMD_FN_JAVAEDIT ".uno:InsertScript"
+#define CMD_FN_INSERT_TABLE ".uno:InsertTable"
+#define CMD_FN_INSERT_FLD_TIME ".uno:InsertTimeField"
+#define CMD_FN_INSERT_FLD_TITLE ".uno:InsertTitleField"
+#define CMD_FN_INSERT_FLD_TOPIC ".uno:InsertTopicField"
+#define CMD_FN_NUM_BULLET_NEXT ".uno:JumpDownThisLevel"
+#define CMD_FN_END_DOC_DIRECT ".uno:JumpToEndOfDoc"
+#define CMD_FN_TO_FOOTER ".uno:JumpToFooter"
+#define CMD_FN_FOOTNOTE_TO_ANCHOR ".uno:JumpToFootnoteOrAnchor"
+#define CMD_FN_TO_HEADER ".uno:JumpToHeader"
+#define CMD_FN_NEXT_BOOKMARK ".uno:JumpToNextBookmark"
+#define CMD_FN_NEXT_FOOTNOTE ".uno:JumpToNextFootnote"
+#define CMD_FN_CNTNT_TO_NEXT_FRAME ".uno:JumpToNextFrame"
+#define CMD_FN_GOTO_NEXT_REGION ".uno:JumpToNextRegion"
+#define CMD_FN_NEXT_TABLE ".uno:JumpToNextTable"
+#define CMD_FN_PREV_BOOKMARK ".uno:JumpToPrevBookmark"
+#define CMD_FN_PREV_FOOTNOTE ".uno:JumpToPrevFootnote"
+#define CMD_FN_GOTO_PREV_REGION ".uno:JumpToPrevRegion"
+#define CMD_FN_PREV_TABLE ".uno:JumpToPrevTable"
+#define CMD_FN_GOTO_REFERENCE ".uno:JumpToReference"
+#define CMD_FN_START_DOC_DIRECT ".uno:JumpToStartOfDoc"
+#define CMD_FN_NUM_BULLET_PREV ".uno:JumpUpThisLevel"
+#define CMD_FN_LINE_DOWN_SEL ".uno:LineDownSel"
+#define CMD_FN_LINE_NUMBERING_DLG ".uno:LineNumberingDialog"
+#define CMD_FN_LINE_UP_SEL ".uno:LineUpSel"
+#define CMD_FN_EDIT_LINK_DLG ".uno:LinkDialog"
+#define CMD_SID_TEMPLATE_LOAD ".uno:LoadStyles"
+#define CMD_FN_VIEW_MARKS ".uno:Marks"
+#define CMD_FN_TABLE_MERGE_CELLS ".uno:MergeCells"
+#define CMD_FN_QRY_MERGE ".uno:MergeDialog"
+#define CMD_FN_MAILMERGE_WIZARD ".uno:MailMergeWizard"
+#define CMD_FN_TABLE_MERGE_TABLE ".uno:MergeTable"
+#define CMD_FN_FORMAT_APPLY_HEAD1 ".uno:ApplyStyleHead1"
+#define CMD_FN_FORMAT_APPLY_HEAD2 ".uno:ApplyStyleHead2"
+#define CMD_FN_FORMAT_APPLY_HEAD3 ".uno:ApplyStyleHead3"
+#define CMD_FN_FORMAT_APPLY_DEFAULT ".uno:ApplyStyleDefault"
+#define CMD_FN_FORMAT_APPLY_TEXTBODY ".uno:ApplyStyleTextbody"
+#define CMD_FN_GRAPHIC_MIRROR_ON_EVEN_PAGES ".uno:MirrorGraphicOnEvenPages"
+#define CMD_FN_FRAME_MIRROR_ON_EVEN_PAGES ".uno:MirrorOnEvenPages"
+#define CMD_FN_NUM_BULLET_MOVEDOWN ".uno:MoveDown"
+#define CMD_FN_NUM_BULLET_OUTLINE_MOVEDOWN ".uno:MoveDownSubItems"
+#define CMD_FN_NUM_BULLET_MOVEUP ".uno:MoveUp"
+#define CMD_FN_NUM_BULLET_OUTLINE_MOVEUP ".uno:MoveUpSubItems"
+#define CMD_FN_TITLE_DESCRIPTION_SHAPE ".uno:ObjectTitleDescription"
+#define CMD_FN_NAME_SHAPE ".uno:NameGroup"
+#define CMD_FN_NEW_GLOBAL_DOC ".uno:NewGlobalDoc"
+#define CMD_FN_NEW_HTML_DOC ".uno:NewHtmlDoc"
+#define CMD_FN_NUMBER_FORMAT ".uno:NumberFormat"
+#define CMD_FN_NUMBER_CURRENCY ".uno:NumberFormatCurrency"
+#define CMD_FN_NUMBER_DATE ".uno:NumberFormatDate"
+#define CMD_FN_NUMBER_TWODEC ".uno:NumberFormatDecimal"
+#define CMD_FN_NUMBER_PERCENT ".uno:NumberFormatPercent"
+#define CMD_FN_NUMBER_SCIENTIFIC ".uno:NumberFormatScientific"
+#define CMD_FN_NUMBER_STANDARD ".uno:NumberFormatStandard"
+#define CMD_FN_NUMBER_TIME ".uno:NumberFormatTime"
+#define CMD_FN_NUMBER_NEWSTART ".uno:NumberingStart"
+#define CMD_FN_NUM_OR_NONUM ".uno:NumberOrNoNumber"
+#define CMD_FN_FRAME_DOWN ".uno:ObjectBackOne"
+#define CMD_FN_FRAME_UP ".uno:ObjectForwardOne"
+#define CMD_FN_AUTOFORMAT_AUTO ".uno:OnlineAutoFormat"
+#define CMD_FN_OPTIMIZE_TABLE ".uno:OptimizeTable"
+#define CMD_FN_FORMAT_PAGE_COLUMN_DLG ".uno:PageColumnDialog"
+#define CMD_FN_FORMAT_PAGE_DLG ".uno:PageDialog"
+#define CMD_FN_PAGEDOWN ".uno:PageDown"
+#define CMD_FN_PAGEDOWN_SEL ".uno:PageDownSel"
+#define CMD_FN_CHANGE_PAGENUM ".uno:PageOffset"
+#define CMD_FN_SET_PAGE_STYLE ".uno:PageStyleApply"
+#define CMD_FN_STAT_TEMPLATE ".uno:PageStyleName"
+#define CMD_FN_PAGEUP ".uno:PageUp"
+#define CMD_FN_PAGEUP_SEL ".uno:PageUpSel"
+#define CMD_FN_PREVIEW_ZOOM ".uno:PreviewZoom"
+#define CMD_FN_PRINT_LAYOUT ".uno:PrintLayout"
+#define CMD_FN_PRINT_PAGEPREVIEW ".uno:PrintPagePreView"
+#define CMD_FN_TABLE_SET_READ_ONLY_CELLS ".uno:Protect"
+#define CMD_FN_REDLINE_PROTECT ".uno:ProtectTraceChangeMode"
+#define CMD_FN_REFRESH_VIEW ".uno:RefreshView"
+#define CMD_FN_NUM_BULLET_OFF ".uno:RemoveBullets"
+#define CMD_FN_REMOVE_CUR_TOX ".uno:RemoveTableOf"
+#define CMD_FN_REPAGINATE ".uno:Repaginate"
+#define CMD_FN_REPEAT_SEARCH ".uno:RepeatSearch"
+#define CMD_FN_FORMAT_RESET ".uno:ResetAttributes"
+#define CMD_FN_TABLE_UNSET_READ_ONLY ".uno:ResetTableProtection"
+#define CMD_FN_RULER ".uno:Ruler"
+#define CMD_FN_QRY_INSERT ".uno:SbaInsert"
+#define CMD_FN_QRY_INSERT_FIELD ".uno:SbaInsertField"
+#define CMD_FN_QRY_MERGE_FIELD ".uno:SbaMerge"
+#define CMD_FN_SCROLL_NAVIGATION ".uno:ScrollNavigation"
+#define CMD_FN_SCROLL_NEXT_PREV ".uno:ScrollNextPrev"
+#define CMD_FN_TABLE_SELECT_ALL ".uno:SelectTable"
+#define CMD_FN_STAT_SELMODE ".uno:SelectionMode"
+#define CMD_FN_SELECT_PARA ".uno:SelectText"
+#define CMD_FN_SELECT_WORD ".uno:SelectWord"
+#define CMD_FN_ABSTRACT_STARIMPRESS ".uno:SendAbstractToStarImpress"
+#define CMD_FN_OUTLINE_TO_CLIPBOARD ".uno:SendOutlineToClipboard"
+#define CMD_FN_OUTLINE_TO_IMPRESS ".uno:SendOutlineToStarImpress"
+#define CMD_FN_TOOL_ANKER_AT_CHAR ".uno:SetAnchorAtChar"
+#define CMD_FN_TOOL_ANKER_CHAR ".uno:SetAnchorToChar"
+#define CMD_FN_TOOL_ANKER_FRAME ".uno:SetAnchorToFrame"
+#define CMD_FN_TOOL_ANKER_PAGE ".uno:SetAnchorToPage"
+#define CMD_FN_TOOL_ANKER_PARAGRAPH ".uno:SetAnchorToPara"
+#define CMD_FN_TABLE_SET_COL_WIDTH ".uno:SetColumnWidth"
+#define CMD_FN_SET_EXT_MODE ".uno:SetExtSelection"
+#define CMD_FN_SET_ADD_MODE ".uno:SetMultiSelection"
+#define CMD_FN_TABLE_ADJUST_CELLS ".uno:SetOptimalColumnWidth"
+#define CMD_FN_TABLE_OPTIMAL_HEIGHT ".uno:SetOptimalRowHeight"
+#define CMD_FN_TABLE_SET_ROW_HEIGHT ".uno:SetRowHeight"
+#define CMD_FN_SHADOWCURSOR ".uno:ShadowCursor"
+#define CMD_FN_SHIFT_BACKSPACE ".uno:ShiftBackspace"
+#define CMD_FN_SHOW_MULTIPLE_PAGES ".uno:ShowMultiplePages"
+#define CMD_FN_VIEW_NOTES ".uno:ShowAnnotations"
+#define CMD_FN_VIEW_HIDDEN_PARA ".uno:ShowHiddenParagraphs"
+#define CMD_FN_REDLINE_SHOW ".uno:ShowTrackedChanges"
+#define CMD_FN_SHOW_TWO_PAGES ".uno:ShowTwoPages"
+#define CMD_FN_SHOW_BOOKVIEW ".uno:ShowBookview"
+#define CMD_FN_SHRINK_FONT_SIZE ".uno:Shrink"
+#define CMD_FN_SORTING_DLG ".uno:SortDialog"
+#define CMD_FN_TABLE_SPLIT_CELLS ".uno:SplitCell"
+#define CMD_FN_TABLE_SPLIT_TABLE ".uno:SplitTable"
+#define CMD_FN_AUTO_CORRECT ".uno:StartAutoCorrect"
+#define CMD_FN_START_OF_DOCUMENT_SEL ".uno:StartOfDocumentSel"
+#define CMD_FN_START_OF_LINE_SEL ".uno:StartOfLineSel"
+#define CMD_FN_START_OF_PARA_SEL ".uno:StartOfParaSel"
+#define CMD_FN_STAT_BOOKMARK ".uno:StateBookmark"
+#define CMD_FN_STAT_PAGE ".uno:StatePageNumber"
+#define CMD_FN_STAT_ZOOM ".uno:StateZoom"
+#define CMD_FN_SET_SUB_SCRIPT ".uno:SubScript"
+#define CMD_FN_SET_SUPER_SCRIPT ".uno:SuperScript"
+#define CMD_FN_SBA_BRW_INSERT ".uno:SwBrwInsert"
+#define CMD_FN_SBA_BRW_MERGE ".uno:SwMailMerge"
+#define CMD_FN_SBA_BRW_UPDATE ".uno:SwUpdate"
+#define CMD_FN_SYNC_LABELS ".uno:SynchronizeLabelsDlg"
+#define CMD_FN_VIEW_TABLEGRID ".uno:TableBoundaries"
+#define CMD_FN_FORMAT_TABLE_DLG ".uno:TableDialog"
+#define CMD_FN_TABLE_MODE_FIX ".uno:TableModeFix"
+#define CMD_FN_TABLE_MODE_FIX_PROP ".uno:TableModeFixProp"
+#define CMD_FN_TABLE_MODE_VARIABLE ".uno:TableModeVariable"
+#define CMD_FN_NUM_FORMAT_TABLE_DLG ".uno:TableNumberFormatDialog"
+#define CMD_FN_SET_MODOPT_TBLNUMFMT ".uno:TableNumberRecognition"
+#define CMD_FN_DRAWTEXT_ATTR_DLG ".uno:TextAttributes"
+#define CMD_FN_DRAW_WRAP_DLG ".uno:TextWrap"
+#define CMD_FN_THESAURUS_DLG ".uno:ThesaurusDialog"
+#define CMD_FN_TOOL_ANKER ".uno:ToggleAnchorType"
+#define CMD_FN_TOOL_HIERARCHIE ".uno:ToggleObjectLayer"
+#define CMD_FN_UNDERLINE_DOUBLE ".uno:UnderlineDouble"
+#define CMD_FN_FRAME_UNCHAIN ".uno:UnhainFrames"
+#define CMD_FN_TABLE_UNSET_READ_ONLY_CELLS ".uno:UnsetCellsReadOnly"
+#define CMD_FN_UPDATE_ALL ".uno:UpdateAll"
+#define CMD_FN_UPDATE_TOX ".uno:UpdateAllIndexes"
+#define CMD_FN_UPDATE_ALL_LINKS ".uno:UpdateAllLinks"
+#define CMD_FN_UPDATE_CHARTS ".uno:UpdateCharts"
+#define CMD_FN_UPDATE_CUR_TOX ".uno:UpdateCurIndex"
+#define CMD_FN_UPDATE_FIELDS ".uno:UpdateFields"
+#define CMD_FN_UPDATE_INPUTFIELDS ".uno:UpdateInputFields"
+#define CMD_FN_VIEW_BOUNDS ".uno:ViewBounds"
+#define CMD_FN_VLINEAL ".uno:VRuler"
+#define CMD_FN_VSCROLLBAR ".uno:VScroll"
+#define CMD_FN_PREV_WORD_SEL ".uno:WordLeftSel"
+#define CMD_FN_NEXT_WORD_SEL ".uno:WordRightSel"
+#define CMD_FN_WRAP_ANCHOR_ONLY ".uno:WrapAnchorOnly"
+#define CMD_FN_FRAME_WRAP_CONTOUR ".uno:WrapContour"
+#define CMD_FN_FRAME_WRAP_IDEAL ".uno:WrapIdeal"
+#define CMD_FN_FRAME_WRAP_LEFT ".uno:WrapLeft"
+#define CMD_FN_FRAME_NOWRAP ".uno:WrapOff"
+#define CMD_FN_FRAME_WRAP ".uno:WrapOn"
+#define CMD_FN_FRAME_WRAP_RIGHT ".uno:WrapRight"
+#define CMD_FN_FRAME_WRAPTHRU ".uno:WrapThrough"
+#define CMD_FN_FRAME_WRAPTHRU_TRANSP ".uno:WrapThroughTransparent"
+#define CMD_FN_INSERT_STRING ".uno:InsertText"
+#define CMD_SID_ATTR_PARA_NUMRULE ".uno:NumRule"
+#define CMD_SID_ATTR_PARA_OUTLINE_LEVEL ".uno:OutlineLevel"
+#define CMD_FN_NUMBER_NEWSTART_AT ".uno:NumNewStartAt"
+#define CMD_FN_FORMAT_LINENUMBER ".uno:LineNumber"
+#define CMD_SID_ATTR_PARA_PAGENUM ".uno:PageNumber"
+#define CMD_SID_ATTR_PARA_REGISTER ".uno:RegisterTrue"
+#define CMD_FN_TO_FOOTNOTE_AREA ".uno:JumpToFootnoteArea"
+#define CMD_FN_TXTATR_INET ".uno:HyperlinkAttributes"
+#define CMD_FN_INSERT_GLOSSARY ".uno:InsertGlossary"
+#define CMD_FN_NEW_GLOSSARY ".uno:NewGlossary"
+#define CMD_FN_SET_ACT_GLOSSARY ".uno:SetActGlossaryGroup"
+#define CMD_FN_DELETE_BOOKMARK ".uno:DeleteBookmark"
+#define CMD_FN_DROP_TEXT ".uno:SetDropCapText"
+#define CMD_FN_DROP_CHAR_STYLE_NAME ".uno:SetDropCapCharStyleName"
+#define CMD_FN_READONLY_SELECTION_MODE ".uno:SelectTextMode"
+#define CMD_FN_INSERT_DBFIELD ".uno:InsertDBField"
+#define CMD_FN_GOTO_NEXT_CELL ".uno:JumpToNextCell"
+#define CMD_FN_GOTO_PREV_CELL ".uno:JumpToPrevCell"
+#define CMD_FN_INSERT_FIELD_DATA_ONLY ".uno:InsertFieldDataOnly"
+#define CMD_SID_ATTR_BRUSH_ROW ".uno:TableRowBackground"
+#define CMD_SID_ATTR_BRUSH_TABLE ".uno:TableBackground"
+#define CMD_FN_TABLE_ROW_SPLIT ".uno:RowSplit"
+#define CMD_FN_MAILMERGE_CHILDWINDOW ".uno:MailmergeChildWindow"
+#define CMD_FN_WORDCOUNT_DIALOG ".uno:WordCountDialog"
+#define CMD_FN_MAILMERGE_SENDMAIL_CHILDWINDOW ".uno:SendMailChildWindow"
+#define CMD_FN_TABLE_DELETE_TABLE ".uno:DeleteTable"
+#define CMD_FN_TABLE_SELECT_CELL ".uno:EntireCell"
+#define CMD_FN_CONVERT_TABLE_TO_TEXT ".uno:ConvertTableToText"
+#define CMD_FN_CONVERT_TEXT_TO_TABLE ".uno:ConvertTextToTable"
+#define CMD_FN_TABLE_HEADLINE_REPEAT ".uno:HeadingRowsRepeat"
+#define CMD_FN_TABLE_SORT_DIALOG ".uno:TableSort"
+#define CMD_FN_XFORMS_DESIGN_MODE ".uno:SwitchXFormsDesignMode"
+#define CMD_FN_REMOVE_DIRECT_CHAR_FORMATS ".uno:RemoveDirectCharFormats"
+#define CMD_FN_NUM_CONTINUE ".uno:ContinueNumbering"
+#define CMD_FN_SELECTION_MODE_DEFAULT ".uno:SelectionModeDefault"
+#define CMD_FN_DELETE_NOTE ".uno:DeleteNote"
+#define CMD_FN_REPLY ".uno:ReplyNote"
+#define CMD_FN_DELETE_COMMENT ".uno:DeleteComment"
+#define CMD_FN_DELETE_NOTE_AUTHOR ".uno:DeleteAuthor"
+#define CMD_FN_DELETE_ALL_NOTES ".uno:DeleteAllNotes"
+#define CMD_FN_HIDE_NOTE ".uno:HideNote"
+#define CMD_FN_HIDE_NOTE_AUTHOR ".uno:HideAuthor"
+#define CMD_SID_ATTR_VIEWLAYOUT ".uno:ViewLayout"
+#define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes"
+#define CMD_FN_SELECTION_MODE_BLOCK ".uno:SelectionModeBlock"
+#define CMD_FN_SPELL_GRAMMAR_DIALOG ".uno:SpellingAndGrammarDialog"
+#define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTracedChange"
+#define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTracedChange"
+#define CMD_FN_REMOVE_HYPERLINK ".uno:RemoveHyperlink"
+#define CMD_FN_COPY_HYPERLINK_LOCATION ".uno:CopyHyperlinkLocation"
+
+#endif
diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index bbd51c90436d..57c41714e75a 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -50,11 +50,11 @@ const int FIND_NO_RING = 2; struct SwFindParas { - virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, BOOL ) = 0; + virtual int Find( SwPaM*, SwMoveFn, const SwPaM*, sal_Bool ) = 0; virtual int IsReplaceMode() const = 0; }; -typedef USHORT SwCursorSelOverFlags; +typedef sal_uInt16 SwCursorSelOverFlags; namespace nsSwCursorSelOverFlags { const SwCursorSelOverFlags SELOVER_NONE = 0x00; @@ -70,10 +70,10 @@ class SwCursor : public SwPaM _SwCursor_SavePos* pSavePos; long mnRowSpanOffset; // required for travelling in tabs with rowspans - BYTE nCursorBidiLevel; // bidi level of the cursor + sal_uInt8 nCursorBidiLevel; // bidi level of the cursor bool mbColumnSelection; // true: cursor is aprt of a column selection - ULONG FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, BOOL& bCancel ); + sal_uLong FindAll( SwFindParas& , SwDocPositions, SwDocPositions, FindRanges, sal_Bool& bCancel ); using SwPaM::Find; @@ -85,7 +85,7 @@ protected: const _SwCursor_SavePos* GetSavePos() const { return pSavePos; } virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - BOOL & io_rbLeft, BOOL bVisualAllowed, BOOL bInsertCrsr); + sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); virtual bool IsSelOvrCheck(int eFlags); @@ -113,45 +113,45 @@ public: SwPaM* ) const; - 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 nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, - int bReplace = FALSE ); - ULONG Find( const SwTxtFmtColl& rFmtColl, + int bReplace = sal_False ); + sal_uLong Find( const SwTxtFmtColl& rFmtColl, SwDocPositions nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, const SwTxtFmtColl* pReplFmt = 0 ); - ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections, + sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections, SwDocPositions nStart, SwDocPositions nEnde, - BOOL& bCancel, + sal_Bool& bCancel, FindRanges = FND_IN_BODY, const com::sun::star::util::SearchOptions* pSearchOpt = 0, const SfxItemSet* rReplSet = 0 ); // UI versions - 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 IsStartEndSentence( bool bEnd ) const; - BOOL GoStartWord(); - BOOL GoEndWord(); - BOOL GoNextWord(); - BOOL GoPrevWord(); - BOOL SelectWord( const Point* pPt = 0 ); + 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 IsStartEndSentence( bool bEnd ) const; + sal_Bool GoStartWord(); + sal_Bool GoEndWord(); + sal_Bool GoNextWord(); + sal_Bool GoPrevWord(); + sal_Bool SelectWord( const Point* pPt = 0 ); // API versions of above functions (will be used with a different // WordType for the break iterator) - BOOL IsStartWordWT( sal_Int16 nWordType ) const; - BOOL IsEndWordWT( sal_Int16 nWordType ) const; - BOOL IsInWordWT( sal_Int16 nWordType ) const; - BOOL GoStartWordWT( sal_Int16 nWordType ); - BOOL GoEndWordWT( sal_Int16 nWordType ); - BOOL GoNextWordWT( sal_Int16 nWordType ); - BOOL GoPrevWordWT( sal_Int16 nWordType ); - BOOL SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); + sal_Bool IsStartWordWT( sal_Int16 nWordType ) const; + sal_Bool IsEndWordWT( sal_Int16 nWordType ) const; + sal_Bool IsInWordWT( sal_Int16 nWordType ) const; + sal_Bool GoStartWordWT( sal_Int16 nWordType ); + sal_Bool GoEndWordWT( sal_Int16 nWordType ); + sal_Bool GoNextWordWT( sal_Int16 nWordType ); + sal_Bool GoPrevWordWT( sal_Int16 nWordType ); + sal_Bool SelectWordWT( sal_Int16 nWordType, const Point* pPt = 0 ); enum SentenceMoveType { @@ -160,67 +160,67 @@ public: START_SENT, END_SENT }; - BOOL GoSentence(SentenceMoveType eMoveType); - BOOL GoNextSentence(){return GoSentence(NEXT_SENT);} - BOOL GoEndSentence(){return GoSentence(END_SENT);} - BOOL GoPrevSentence(){return GoSentence(PREV_SENT);} - BOOL GoStartSentence(){return GoSentence(START_SENT);} - BOOL ExpandToSentenceBorders(); - - virtual BOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bAllowVisual, BOOL bSkipHidden, BOOL bInsertCrsr ); - BOOL UpDown( BOOL bUp, USHORT nCnt, Point* pPt, long nUpDownX ); - BOOL LeftRightMargin( BOOL bLeftMargin, BOOL bAPI = FALSE ); - BOOL IsAtLeftRightMargin( BOOL bLeftMargin, BOOL bAPI = FALSE ) const; - BOOL SttEndDoc( BOOL bSttDoc ); - BOOL GoPrevNextCell( BOOL bNext, USHORT nCnt ); - - BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden ) - { return LeftRight( TRUE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); } - BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual, BOOL bSkipHidden ) - { return LeftRight( FALSE, nCnt, nMode, bAllowVisual, bSkipHidden, FALSE ); } - BOOL GoNextCell( USHORT nCnt = 1 ) { return GoPrevNextCell( TRUE, nCnt ); } - BOOL GoPrevCell( USHORT nCnt = 1 ) { return GoPrevNextCell( FALSE, nCnt ); } - virtual BOOL GotoTable( const String& rName ); - BOOL GotoTblBox( const String& rName ); - BOOL GotoRegion( const String& rName ); - BOOL GotoFtnAnchor(); - BOOL GotoFtnTxt(); - BOOL GotoNextFtnAnchor(); - BOOL GotoPrevFtnAnchor(); - BOOL GotoNextFtnCntnt(); - BOOL GotoPrevFtnCntnt(); - - BOOL MovePara( SwWhichPara, SwPosPara ); - BOOL MoveSection( SwWhichSection, SwPosSection ); - BOOL MoveTable( SwWhichTable, SwPosTable ); - BOOL MoveRegion( SwWhichRegion, SwPosRegion ); + sal_Bool GoSentence(SentenceMoveType eMoveType); + sal_Bool GoNextSentence(){return GoSentence(NEXT_SENT);} + sal_Bool GoEndSentence(){return GoSentence(END_SENT);} + sal_Bool GoPrevSentence(){return GoSentence(PREV_SENT);} + sal_Bool GoStartSentence(){return GoSentence(START_SENT);} + sal_Bool ExpandToSentenceBorders(); + + virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); + sal_Bool UpDown( sal_Bool bUp, sal_uInt16 nCnt, Point* pPt, long nUpDownX ); + sal_Bool LeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ); + sal_Bool IsAtLeftRightMargin( sal_Bool bLeftMargin, sal_Bool bAPI = sal_False ) const; + sal_Bool SttEndDoc( sal_Bool bSttDoc ); + sal_Bool GoPrevNextCell( sal_Bool bNext, sal_uInt16 nCnt ); + + sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) + { return LeftRight( sal_True, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } + sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual, sal_Bool bSkipHidden ) + { return LeftRight( sal_False, nCnt, nMode, bAllowVisual, bSkipHidden, sal_False ); } + sal_Bool GoNextCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_True, nCnt ); } + sal_Bool GoPrevCell( sal_uInt16 nCnt = 1 ) { return GoPrevNextCell( sal_False, nCnt ); } + virtual sal_Bool GotoTable( const String& rName ); + sal_Bool GotoTblBox( const String& rName ); + sal_Bool GotoRegion( const String& rName ); + sal_Bool GotoFtnAnchor(); + sal_Bool GotoFtnTxt(); + sal_Bool GotoNextFtnAnchor(); + sal_Bool GotoPrevFtnAnchor(); + sal_Bool GotoNextFtnCntnt(); + sal_Bool GotoPrevFtnCntnt(); + + sal_Bool MovePara( SwWhichPara, SwPosPara ); + sal_Bool MoveSection( SwWhichSection, SwPosSection ); + sal_Bool MoveTable( SwWhichTable, SwPosTable ); + sal_Bool MoveRegion( SwWhichRegion, SwPosRegion ); // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); - virtual BOOL IsInProtectTable( BOOL bMove = FALSE, - BOOL bChgCrsr = TRUE ); - BOOL IsNoCntnt() const; + virtual sal_Bool IsInProtectTable( sal_Bool bMove = sal_False, + sal_Bool bChgCrsr = sal_True ); + sal_Bool IsNoCntnt() const; /** Restore cursor state to the one saved by SwCrsrSaveState **/ void RestoreSavePos(); - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; // darf der Cursor in ReadOnlyBereiche? virtual bool IsReadOnlyAvailable() const; - virtual BOOL IsSkipOverProtectSections() const; - virtual BOOL IsSkipOverHiddenSections() const; + virtual sal_Bool IsSkipOverProtectSections() const; + virtual sal_Bool IsSkipOverHiddenSections() const; - BYTE GetCrsrBidiLevel() const { return nCursorBidiLevel; } - void SetCrsrBidiLevel( BYTE nNewLevel ) { nCursorBidiLevel = nNewLevel; } + sal_uInt8 GetCrsrBidiLevel() const { return nCursorBidiLevel; } + void SetCrsrBidiLevel( sal_uInt8 nNewLevel ) { nCursorBidiLevel = nNewLevel; } bool IsColumnSelection() const { return mbColumnSelection; } void SetColumnSelection( bool bNew ) { mbColumnSelection = bNew; } @@ -250,7 +250,7 @@ public: // internal, used by SwCursor::SaveState() etc. struct _SwCursor_SavePos { - ULONG nNode; + sal_uLong nNode; xub_StrLen nCntnt; _SwCursor_SavePos* pNext; @@ -270,11 +270,11 @@ class SwTableCursor : public virtual SwCursor { protected: - ULONG nTblPtNd, nTblMkNd; + sal_uLong nTblPtNd, nTblMkNd; xub_StrLen nTblPtCnt, nTblMkCnt; SwSelBoxes aSelBoxes; - BOOL bChg : 1; - BOOL bParked : 1; // Tabellen-Cursor wurde geparkt + sal_Bool bChg : 1; + sal_Bool bParked : 1; // Tabellen-Cursor wurde geparkt virtual bool IsSelOvrCheck(int eFlags); @@ -283,25 +283,25 @@ public: SwTableCursor( SwTableCursor& ); virtual ~SwTableCursor(); - virtual BOOL LeftRight( BOOL bLeft, USHORT nCnt, USHORT nMode, - BOOL bAllowVisual, BOOL bSkipHidden, BOOL bInsertCrsr ); - virtual BOOL GotoTable( const String& rName ); + virtual sal_Bool LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, + sal_Bool bAllowVisual, sal_Bool bSkipHidden, sal_Bool bInsertCrsr ); + virtual sal_Bool GotoTable( const String& rName ); void InsertBox( const SwTableBox& rTblBox ); - void DeleteBox( USHORT nPos ) { aSelBoxes.Remove( nPos ); bChg = TRUE; } - USHORT GetBoxesCount() const { return aSelBoxes.Count(); } + void DeleteBox( sal_uInt16 nPos ) { aSelBoxes.Remove( nPos ); bChg = sal_True; } + sal_uInt16 GetBoxesCount() const { return aSelBoxes.Count(); } const SwSelBoxes& GetBoxes() const { return aSelBoxes; } // Baut fuer alle Boxen die Cursor auf SwCursor* MakeBoxSels( SwCursor* pAktCrsr ); // sind irgendwelche Boxen mit einem Schutz versehen? - BOOL HasReadOnlyBoxSel() const; + sal_Bool HasReadOnlyBoxSel() const; // wurde der TabelleCursor veraendert ? Wenn ja speicher gleich // die neuen Werte. - BOOL IsCrsrMovedUpdt(); + sal_Bool IsCrsrMovedUpdt(); // wurde der TabelleCursor veraendert ? - BOOL IsCrsrMoved() const + sal_Bool IsCrsrMoved() const { return nTblMkNd != GetMark()->nNode.GetIndex() || nTblPtNd != GetPoint()->nNode.GetIndex() || @@ -309,7 +309,7 @@ public: nTblPtCnt != GetPoint()->nContent.GetIndex(); } - BOOL IsChgd() const { return bChg; } + sal_Bool IsChgd() const { return bChg; } // Parke den Tabellen-Cursor auf dem StartNode der Boxen. void ParkCrsr(); diff --git a/sw/inc/swdbdata.hxx b/sw/inc/swdbdata.hxx index 5b270b76837b..82b2c645eb78 100644 --- a/sw/inc/swdbdata.hxx +++ b/sw/inc/swdbdata.hxx @@ -40,9 +40,9 @@ struct SwDBData SwDBData() : nCommandType(0){} - BOOL operator !=(const SwDBData& rCmp) const + sal_Bool operator !=(const SwDBData& rCmp) const {return rCmp.sDataSource != sDataSource || rCmp.sCommand != sCommand || rCmp.nCommandType != nCommandType;} - BOOL operator ==(const SwDBData& rCmp) const + sal_Bool operator ==(const SwDBData& rCmp) const {return rCmp.sDataSource == sDataSource && rCmp.sCommand == sCommand && rCmp.nCommandType == nCommandType;} }; diff --git a/sw/inc/swdbtoolsclient.hxx b/sw/inc/swdbtoolsclient.hxx index 11bdcee9dc58..0174125cec5f 100644 --- a/sw/inc/swdbtoolsclient.hxx +++ b/sw/inc/swdbtoolsclient.hxx @@ -65,7 +65,7 @@ public: const ::com::sun::star::lang::Locale& _rLocale ); - ::rtl::OUString getValue( + ::rtl::OUString getFormattedValue( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxColumn, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter>& _rxFormatter, const ::com::sun::star::lang::Locale& _rLocale, diff --git a/sw/inc/swddetbl.hxx b/sw/inc/swddetbl.hxx index 6d1a11ec0044..57e000a998c5 100644 --- a/sw/inc/swddetbl.hxx +++ b/sw/inc/swddetbl.hxx @@ -40,12 +40,12 @@ public: // Constructor movet alle Lines/Boxen aus der SwTable zu sich. // Die SwTable ist danach Leer und muss geloescht werden. SwDDETable( SwTable& rTable, SwDDEFieldType* pDDEType, - BOOL bUpdate = TRUE ); + sal_Bool bUpdate = sal_True ); ~SwDDETable(); void Modify( SfxPoolItem*, SfxPoolItem* ); void ChangeContent(); - BOOL NoDDETable(); + sal_Bool NoDDETable(); SwDDEFieldType* GetDDEFldType(); inline const SwDDEFieldType* GetDDEFldType() const; diff --git a/sw/inc/swerror.h b/sw/inc/swerror.h index 6fe24e7db9b5..5453c32cc74b 100644 --- a/sw/inc/swerror.h +++ b/sw/inc/swerror.h @@ -96,12 +96,12 @@ #ifndef __RSC -inline bool IsWarning( ULONG nErr ) +inline bool IsWarning( sal_uLong nErr ) { return 0 != ( nErr & ERRCODE_WARNING_MASK & nErr ); } -inline bool IsError( ULONG nErr ) +inline bool IsError( sal_uLong nErr ) { return nErr && 0 == ( ERRCODE_WARNING_MASK & nErr ); } diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx index 8d8f69309e67..5ab89f70dc9b 100644 --- a/sw/inc/swevent.hxx +++ b/sw/inc/swevent.hxx @@ -120,7 +120,7 @@ struct SwCallMouseEvent void Clear() { eType = EVENT_OBJECT_NONE; PTR.pFmt = 0; PTR.IMAP.pIMapObj = 0; } - BOOL HasEvent() const { return EVENT_OBJECT_NONE != eType; } + sal_Bool HasEvent() const { return EVENT_OBJECT_NONE != eType; } }; diff --git a/sw/inc/swgstr.hxx b/sw/inc/swgstr.hxx index 9191e121e0f7..8f3fb8ea4464 100644 --- a/sw/inc/swgstr.hxx +++ b/sw/inc/swgstr.hxx @@ -42,11 +42,11 @@ typedef long long3; // Zur Dokumentation: 3-byte-Longs class swcrypter { protected: sal_Char cPasswd[ PASSWDLEN ]; // Passwort-Puffer - BOOL bPasswd; // TRUE wenn mit Passwort - void encode( sal_Char*, USHORT ); // Puffer codieren/decodieren + sal_Bool bPasswd; // sal_True wenn mit Passwort + void encode( sal_Char*, sal_uInt16 ); // Puffer codieren/decodieren public: swcrypter(); - BOOL setpasswd( const String& ); // Passwort setzen + sal_Bool setpasswd( const String& ); // Passwort setzen void copypasswd( const sal_Char* ); // Passwort direkt setzen const sal_Char* getpasswd() { return cPasswd; } }; @@ -58,10 +58,10 @@ class swstreambase : public swcrypter { protected: SvStream* pStrm; // eigentlicher Stream sal_Char* pBuf; // Zwischenpuffer - USHORT nBuflen; // Laenge des Zwischenpuffers + sal_uInt16 nBuflen; // Laenge des Zwischenpuffers short nLong; // Long-Laenge (3 oder 4) - BOOL bTempStrm; // TRUE: Stream loeschen - void checkbuf( USHORT ); // Testen der Pufferlaenge + sal_Bool bTempStrm; // sal_True: Stream loeschen + void checkbuf( sal_uInt16 ); // Testen der Pufferlaenge swstreambase( SvStream& ); @@ -88,15 +88,15 @@ public: int operator!() { return ( pStrm->GetError() != SVSTREAM_OK ); } int eof() { return pStrm->IsEof(); } - BYTE get(); - void get( void* p, USHORT n ) { pStrm->Read( (sal_Char*) p, n ); } + sal_uInt8 get(); + void get( void* p, sal_uInt16 n ) { pStrm->Read( (sal_Char*) p, n ); } inline swstreambase& operator>>( sal_Char& ); - inline swstreambase& operator>>( BYTE& ); + inline swstreambase& operator>>( sal_uInt8& ); inline swstreambase& operator>>( short& ); - inline swstreambase& operator>>( USHORT& ); + inline swstreambase& operator>>( sal_uInt16& ); swstreambase& operator>>( long& ); - inline swstreambase& operator>>( ULONG& ); + inline swstreambase& operator>>( sal_uLong& ); }; inline swstreambase& swstreambase::operator>>( sal_Char& c ) @@ -104,7 +104,7 @@ inline swstreambase& swstreambase::operator>>( sal_Char& c ) *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( BYTE& c ) +inline swstreambase& swstreambase::operator>>( sal_uInt8& c ) { *pStrm >> c; return *this; } @@ -114,26 +114,26 @@ inline swstreambase& swstreambase::operator>>( short& c ) *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( USHORT& c ) +inline swstreambase& swstreambase::operator>>( sal_uInt16& c ) { *pStrm >> c; return *this; } -inline swstreambase& swstreambase::operator>>( ULONG& c ) +inline swstreambase& swstreambase::operator>>( sal_uLong& c ) { return *this >> (long&) c; } class swistream : public swstreambase { - BYTE cType; // Record-Typ - ULONG nOffset; // Record-Offset-Portion + sal_uInt8 cType; // Record-Typ + sal_uLong nOffset; // Record-Offset-Portion public: swistream( SvStream& ); - BYTE peek(); // 1 Byte testen - BYTE next(); // Blockstart - BYTE cur() { return cType; } // aktueller Block - BYTE skipnext(); // Record ueberspringen + sal_uInt8 peek(); // 1 Byte testen + sal_uInt8 next(); // Blockstart + sal_uInt8 cur() { return cType; } // aktueller Block + sal_uInt8 skipnext(); // Record ueberspringen void undonext(); // next() rueckgaengig machen long getskip() { return nOffset; } void skip( long = -1L ); // Block ueberspringen diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index a59473b0889b..c30c33d47889 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -29,7 +29,7 @@ #define _SWMODULE_HXX #include <tools/link.hxx> #include <tools/string.hxx> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> #include <svl/lstner.hxx> #include <unotools/options.hxx> #include <sfx2/module.hxx> @@ -161,15 +161,15 @@ public: const SwViewOption* GetViewOption(sal_Bool bWeb); void ApplyUsrPref(const SwViewOption &, SwView*, sal_uInt16 nDest = VIEWOPT_DEST_VIEW ); - void ApplyUserMetric( FieldUnit eMetric, BOOL bWeb ); - void ApplyRulerMetric( FieldUnit eMetric, BOOL bHorizontal, BOOL bWeb ); + void ApplyUserMetric( FieldUnit eMetric, sal_Bool bWeb ); + void ApplyRulerMetric( FieldUnit eMetric, sal_Bool bHorizontal, sal_Bool bWeb ); void ApplyFldUpdateFlags(SwFldUpdateFlags eFldFlags); void ApplyLinkMode(sal_Int32 nNewLinkMode); //default page mode for text grid void ApplyDefaultPageMode(sal_Bool bIsSquaredPageMode); - void ApplyUserCharUnit(BOOL bApplyChar, BOOL bWeb); // apply_char_unit + void ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb); // apply_char_unit // ConfigItems erzeugen SwModuleOptions* GetModuleConfig() { return pModuleConfig;} @@ -193,7 +193,7 @@ public: sal_Bool IsEmbeddedLoadSave() const { return bEmbeddedLoadSave; } void SetEmbeddedLoadSave( sal_Bool bFlag ) { bEmbeddedLoadSave = bFlag; } - void ShowDBObj( SwView& rView, const SwDBData& rData, BOOL bOnlyIfAvailable = FALSE); + void ShowDBObj( SwView& rView, const SwDBData& rData, sal_Bool bOnlyIfAvailable = sal_False); // Tabellenmodi sal_Bool IsInsTblFormatNum(sal_Bool bHTML) const; diff --git a/sw/inc/swpre.mk b/sw/inc/swpre.mk deleted file mode 100644 index b19440a01a55..000000000000 --- a/sw/inc/swpre.mk +++ /dev/null @@ -1,46 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - - -#====================================================================== -# standardmaessig mit Optimierung, muss explizit mit nopt=t ausgeschaltet -# werden, wenn nicht gewuenscht -#---------------------------------------------------------------------- - -.IF "$(nopt)"!="" || "$(NOPT)"!="" -nopt=true -NOPT=TRUE -optimize= -OPTIMIZE= -.ELSE -.IF "$(debug)$(DEBUG)"=="" -optimize=true -OPTIMIZE=TRUE -.ENDIF -.ENDIF - - diff --git a/sw/inc/swprtopt.hxx b/sw/inc/swprtopt.hxx deleted file mode 100644 index 91194691f284..000000000000 --- a/sw/inc/swprtopt.hxx +++ /dev/null @@ -1,98 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SWPRTOPT_HXX -#define _SWPRTOPT_HXX - -#include <tools/multisel.hxx> -#include <printdata.hxx> - -#include <set> -#include <map> -#include <vector> -#include <utility> - -#define POSTITS_NONE 0 -#define POSTITS_ONLY 1 -#define POSTITS_ENDDOC 2 -#define POSTITS_ENDPAGE 3 - - -class PrintDialog; -class SfxPrinter; - - -//////////////////////////////////////////////////////////// - - -class SwPrtOptions : public SwPrintData -{ - USHORT nJobNo; - String sJobName; - -public: - MultiSelection aMulti; - Point aOffset; - ULONG nMergeCnt; // Anzahl der Serienbriefe - ULONG nMergeAct; // Aktueller Serienbriefnr. - USHORT nCopyCount; - - BOOL bCollate, - bPrintSelection, // Markierung drucken - bJobStartet; - - SwPrtOptions( const String& rJobName ) : - nJobNo( 1 ), - sJobName( rJobName ), - aOffset( Point(0,0) ), - nMergeCnt( 0 ), - nMergeAct( 0 ), - bCollate(FALSE), - bPrintSelection (FALSE), - bJobStartet(FALSE) - {} - - const String& MakeNextJobName(); // steht in vprint.cxx - const String& GetJobName() const { return sJobName; } - - SwPrtOptions& operator=(const SwPrintData& rData) - { - SwPrintData::operator=(rData); - return *this; - } - - // get print options - void MakeOptions( BOOL bWeb ); -}; - - -//////////////////////////////////////////////////////////// - -#endif //_SWPRTOPT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx index 6447554d7b0b..1209a200a6d4 100644 --- a/sw/inc/swrect.hxx +++ b/sw/inc/swrect.hxx @@ -85,18 +85,18 @@ public: SwRect &_Intersection( const SwRect &rRect ); inline SwRect GetIntersection( const SwRect& rRect ) const; - BOOL IsInside( const Point& rPOINT ) const; - BOOL IsNear(const Point& rPoint, long nTolerance ) const; - BOOL IsInside( const SwRect& rRect ) const; - BOOL IsOver( const SwRect& rRect ) const; - inline BOOL HasArea() const; - inline BOOL IsEmpty() const; + sal_Bool IsInside( const Point& rPOINT ) const; + sal_Bool IsNear(const Point& rPoint, long nTolerance ) const; + sal_Bool IsInside( const SwRect& rRect ) const; + sal_Bool IsOver( const SwRect& rRect ) const; + inline sal_Bool HasArea() const; + inline sal_Bool IsEmpty() const; inline void Clear(); inline SwRect &operator = ( const SwRect &rRect ); - inline BOOL operator == ( const SwRect& rRect ) const; - inline BOOL operator != ( const SwRect& rRect ) const; + inline sal_Bool operator == ( const SwRect& rRect ) const; + inline sal_Bool operator != ( const SwRect& rRect ) const; inline SwRect &operator+=( const Point &rPt ); inline SwRect &operator-=( const Point &rPt ); @@ -148,10 +148,10 @@ public: long GetBottomDistance( long ) const; long GetRightDistance( long ) const; long GetTopDistance( long ) const; - BOOL OverStepLeft( long ) const; - BOOL OverStepBottom( long ) const; - BOOL OverStepTop( long ) const; - BOOL OverStepRight( long ) const; + sal_Bool OverStepLeft( long ) const; + sal_Bool OverStepBottom( long ) const; + sal_Bool OverStepTop( long ) const; + sal_Bool OverStepRight( long ) const; }; // Implementation in swrect.cxx @@ -161,7 +161,7 @@ typedef void (SwRect:: *SwRectSet)( const long nNew ); typedef long (SwRect:: *SwRectGet)() const; typedef const Point (SwRect:: *SwRectPoint)() const; typedef const Size (SwRect:: *SwRectSize)() const; -typedef BOOL (SwRect:: *SwRectMax)( long ) const; +typedef sal_Bool (SwRect:: *SwRectMax)( long ) const; typedef long (SwRect:: *SwRectDist)( long ) const; typedef void (SwRect:: *SwRectSetTwice)( long, long ); typedef void (SwRect:: *SwRectSetPos)( const Point& ); @@ -266,11 +266,11 @@ inline SwRect &SwRect::operator = ( const SwRect &rRect ) m_Size = rRect.m_Size; return *this; } -inline BOOL SwRect::operator == ( const SwRect& rRect ) const +inline sal_Bool SwRect::operator == ( const SwRect& rRect ) const { return (m_Point == rRect.m_Point && m_Size == rRect.m_Size); } -inline BOOL SwRect::operator != ( const SwRect& rRect ) const +inline sal_Bool SwRect::operator != ( const SwRect& rRect ) const { return (m_Point != rRect.m_Point || m_Size != rRect.m_Size); } @@ -314,11 +314,11 @@ inline SwRect SwRect::GetIntersection( const SwRect& rRect ) const return SwRect( *this ).Intersection( rRect ); } -inline BOOL SwRect::HasArea() const +inline sal_Bool SwRect::HasArea() const { return !IsEmpty(); } -inline BOOL SwRect::IsEmpty() const +inline sal_Bool SwRect::IsEmpty() const { return !(m_Size.getHeight() && m_Size.getWidth()); } diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx index df15d51d8225..981391e0f61a 100644 --- a/sw/inc/swregion.hxx +++ b/sw/inc/swregion.hxx @@ -38,18 +38,18 @@ class SwRegionRects : public SwRects { SwRect aOrigin; // die Kopie des StartRects - inline void InsertRect( const SwRect &rRect, const USHORT nPos, BOOL &rDel); + inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, sal_Bool &rDel); public: - SwRegionRects( const SwRect& rStartRect, USHORT nInit = 20, - USHORT nGrow = 8 ); + SwRegionRects( const SwRect& rStartRect, sal_uInt16 nInit = 20, + sal_uInt16 nGrow = 8 ); // Zum Ausstanzen aus aOrigin. void operator-=( const SwRect& rRect ); // Aus Loechern werden Flaechen, aus Flaechen werden Loecher. void Invert(); // Benachbarte Rechtecke zusammenfassen. - void Compress( BOOL bFuzzy = TRUE ); + void Compress( sal_Bool bFuzzy = sal_True ); inline const SwRect &GetOrigin() const { return aOrigin; } inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; } diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 2e9c64083271..d9fd298fab02 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -69,17 +69,17 @@ public: } virtual ~SwServerObject(); - virtual BOOL GetData( ::com::sun::star::uno::Any & rData, + virtual sal_Bool GetData( ::com::sun::star::uno::Any & rData, const String & rMimeType, - BOOL bSynchron = FALSE ); + sal_Bool bSynchron = sal_False ); - BOOL SetData( const String & rMimeType, + sal_Bool SetData( const String & rMimeType, const ::com::sun::star::uno::Any& rData ); virtual void SendDataChanged( const SwPosition& rPos ); virtual void SendDataChanged( const SwPaM& rRange ); - BOOL IsLinkInServer( const SwBaseLink* ) const; + sal_Bool IsLinkInServer( const SwBaseLink* ) const; void SetNoServer(); void SetDdeBookmark( ::sw::mark::IMark& rBookmark); diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx index d6581a60d56b..7df49e2cd355 100644 --- a/sw/inc/swtable.hxx +++ b/sw/inc/swtable.hxx @@ -104,17 +104,17 @@ protected: //SOLL das fuer jede Tabelle einstellbar sein? TblChgMode eTblChgMode; - USHORT nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import + sal_uInt16 nGrfsThatResize; // Anzahl der Grfs, die beim HTML-Import // noch ein Resize der Tbl. anstossen - USHORT nRowsToRepeat; // number of rows to repeat on every page + sal_uInt16 nRowsToRepeat; // number of rows to repeat on every page - BOOL bModifyLocked :1; - BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel + sal_Bool bModifyLocked :1; + sal_Bool bNewModel :1; // sal_False: old SubTableModel; sal_True: new RowSpanModel #if OSL_DEBUG_LEVEL > 1 bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change #endif - BOOL IsModifyLocked(){ return bModifyLocked;} + sal_Bool IsModifyLocked(){ return bModifyLocked;} public: enum SearchType @@ -137,19 +137,19 @@ private: SwTable & operator= (const SwTable &); // no default ctor. SwTable(); - BOOL OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); - BOOL OldSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL ); - BOOL NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, + sal_Bool OldMerge( SwDoc*, const SwSelBoxes&, SwTableBox*, SwUndoTblMerge* ); + sal_Bool OldSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool ); + sal_Bool NewMerge( SwDoc*, const SwSelBoxes&, const SwSelBoxes& rMerged, SwTableBox*, SwUndoTblMerge* ); - BOOL NewSplitRow( SwDoc*, const SwSelBoxes&, USHORT, BOOL ); + sal_Bool NewSplitRow( SwDoc*, const SwSelBoxes&, sal_uInt16, sal_Bool ); SwBoxSelection* CollectBoxSelection( const SwPaM& rPam ) const; - void InsertSpannedRow( SwDoc* pDoc, USHORT nIdx, USHORT nCnt ); - BOOL _InsertRow( SwDoc*, const SwSelBoxes&, USHORT nCnt, BOOL bBehind ); - BOOL NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, USHORT nCnt, BOOL ); + void InsertSpannedRow( SwDoc* pDoc, sal_uInt16 nIdx, sal_uInt16 nCnt ); + sal_Bool _InsertRow( SwDoc*, const SwSelBoxes&, sal_uInt16 nCnt, sal_Bool bBehind ); + sal_Bool NewInsertCol( SwDoc*, const SwSelBoxes& rBoxes, sal_uInt16 nCnt, sal_Bool ); void _FindSuperfluousRows( SwSelBoxes& rBoxes, SwTableLine*, SwTableLine* ); void AdjustWidths( const long nOld, const long nNew ); void NewSetTabCols( Parm &rP, const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, BOOL bCurRowOnly ); + const SwTableBox *pStart, sal_Bool bCurRowOnly ); public: @@ -157,18 +157,18 @@ public: const SwHTMLTableLayout *GetHTMLTableLayout() const { return pHTMLLayout; } void SetHTMLTableLayout( SwHTMLTableLayout *p ); //Eigentumsuebergang! - USHORT IncGrfsThatResize() { return ++nGrfsThatResize; } - USHORT DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; } + sal_uInt16 IncGrfsThatResize() { return ++nGrfsThatResize; } + sal_uInt16 DecGrfsThatResize() { return nGrfsThatResize ? --nGrfsThatResize : 0; } - void LockModify() { bModifyLocked = TRUE; } //Muessen _immer_ paarig - void UnlockModify() { bModifyLocked = FALSE;} //benutzt werden! + void LockModify() { bModifyLocked = sal_True; } //Muessen _immer_ paarig + void UnlockModify() { bModifyLocked = sal_False;} //benutzt werden! - void SetTableModel( BOOL bNew ){ bNewModel = bNew; } - BOOL IsNewModel() const { return bNewModel; } + void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; } + sal_Bool IsNewModel() const { return bNewModel; } - USHORT GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); } - USHORT _GetRowsToRepeat() const { return nRowsToRepeat; } - void SetRowsToRepeat( USHORT nNumOfRows ) { nRowsToRepeat = nNumOfRows; } + sal_uInt16 GetRowsToRepeat() const { return Min( GetTabLines().Count(), nRowsToRepeat ); } + sal_uInt16 _GetRowsToRepeat() const { return nRowsToRepeat; } + void SetRowsToRepeat( sal_uInt16 nNumOfRows ) { nRowsToRepeat = nNumOfRows; } bool IsHeadline( const SwTableLine& rLine ) const; @@ -181,9 +181,9 @@ public: virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); void GetTabCols( SwTabCols &rToFill, const SwTableBox *pStart, - BOOL bHidden = FALSE, BOOL bCurRowOnly = FALSE ) const; + sal_Bool bHidden = sal_False, sal_Bool bCurRowOnly = sal_False ) const; void SetTabCols( const SwTabCols &rNew, const SwTabCols &rOld, - const SwTableBox *pStart, BOOL bCurRowOnly ); + const SwTableBox *pStart, sal_Bool bCurRowOnly ); // The following functions are for new table model only... void CreateSelection( const SwPaM& rPam, SwSelBoxes& rBoxes, @@ -196,17 +196,17 @@ public: // SwSavRowSpan is the structure needed by Undo to undo the split operation // CleanUpRowSpan corrects the (top of the) second table and delviers the structure // for Undo - SwSaveRowSpan* CleanUpTopRowSpan( USHORT nSplitLine ); + SwSaveRowSpan* CleanUpTopRowSpan( sal_uInt16 nSplitLine ); // RestoreRowSpan is called by Undo to restore the old row span values void RestoreRowSpan( const SwSaveRowSpan& ); // CleanUpBottomRowSpan corrects the overhanging row spans at the end of the first table - void CleanUpBottomRowSpan( USHORT nDelLines ); + void CleanUpBottomRowSpan( sal_uInt16 nDelLines ); // The following functions are "pseudo-virtual", i.e. they are different for old and new table model // It's not allowed to change the table model after the first call of one of these functions. - BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, + sal_Bool Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged, SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 ) { #if OSL_DEBUG_LEVEL > 1 @@ -215,8 +215,8 @@ public: return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) : OldMerge( pDoc, rBoxes, pMergeBox, pUndo ); } - BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1, - BOOL bSameHeight = FALSE ) + sal_Bool SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1, + sal_Bool bSameHeight = sal_False ) { #if OSL_DEBUG_LEVEL > 1 bDontChangeModel = true; @@ -229,16 +229,16 @@ public: void ExpandColumnSelection( SwSelBoxes& rBoxes, long &rMin, long &rMax ) const; void PrepareDeleteCol( long nMin, long nMax ); - BOOL InsertCol( SwDoc*, const SwSelBoxes& rBoxes, - USHORT nCnt = 1, BOOL bBehind = TRUE ); - BOOL InsertRow( SwDoc*, const SwSelBoxes& rBoxes, - USHORT nCnt = 1, BOOL bBehind = TRUE ); - BOOL AppendRow( SwDoc* pDoc, USHORT nCnt = 1 ); + sal_Bool InsertCol( SwDoc*, const SwSelBoxes& rBoxes, + sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ); + sal_Bool InsertRow( SwDoc*, const SwSelBoxes& rBoxes, + sal_uInt16 nCnt = 1, sal_Bool bBehind = sal_True ); + sal_Bool AppendRow( SwDoc* pDoc, sal_uInt16 nCnt = 1 ); void PrepareDelBoxes( const SwSelBoxes& rBoxes ); - BOOL DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, - SwUndo* pUndo, const BOOL bDelMakeFrms, const BOOL bCorrBorder ); - BOOL SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1 ); - BOOL Merge( const SwSelBoxes& rBoxes, + sal_Bool DeleteSel( SwDoc*, const SwSelBoxes& rBoxes, const SwSelBoxes* pMerged, + SwUndo* pUndo, const sal_Bool bDelMakeFrms, const sal_Bool bCorrBorder ); + sal_Bool SplitCol( SwDoc* pDoc, const SwSelBoxes& rBoxes, sal_uInt16 nCnt=1 ); + sal_Bool Merge( const SwSelBoxes& rBoxes, SwTableBox* pMergeBox, SwUndoTblMerge* = 0 ); void FindSuperfluousRows( SwSelBoxes& rBoxes ) @@ -252,8 +252,8 @@ public: // (wird von GetTblBox und SwTblFld benutzt) // #i80314# // add 3rd parameter in order to control validation check on <rStr> - static USHORT _GetBoxNum( String& rStr, - BOOL bFirst = FALSE, + static sal_uInt16 _GetBoxNum( String& rStr, + sal_Bool bFirst = sal_False, const bool bPerformValidCheck = false ); // suche die Inhaltstragende Box mit dem Namen // #i80314# @@ -262,38 +262,38 @@ public: const SwTableBox* GetTblBox( const String& rName, const bool bPerformValidCheck = false ) const; // kopiere die selektierten Boxen in ein anderes Dokument. - BOOL MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, - BOOL bCpyNds = TRUE, BOOL bCpyName = FALSE ) const; + sal_Bool MakeCopy( SwDoc*, const SwPosition&, const SwSelBoxes&, + sal_Bool bCpyNds = sal_True, sal_Bool bCpyName = sal_False ) const; // kopiere die Tabelle in diese. (die Logik steht im TBLRWCL.CXX) - BOOL InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, + sal_Bool InsTable( const SwTable& rCpyTbl, const SwNodeIndex&, SwUndoTblCpyTbl* pUndo = 0 ); - BOOL InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, + sal_Bool InsTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo = 0 ); - BOOL InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, + sal_Bool InsNewTable( const SwTable& rCpyTbl, const SwSelBoxes&, SwUndoTblCpyTbl* pUndo ); // kopiere die Headline (mit Inhalt!) der Tabelle in eine andere - BOOL CopyHeadlineIntoTable( SwTableNode& rTblNd ); + sal_Bool CopyHeadlineIntoTable( SwTableNode& rTblNd ); // erfrage die Box, dessen Start-Index auf nBoxStt steht - SwTableBox* GetTblBox( ULONG nSttIdx ); - const SwTableBox* GetTblBox( ULONG nSttIdx ) const + SwTableBox* GetTblBox( sal_uLong nSttIdx ); + const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const { return ((SwTable*)this)->GetTblBox( nSttIdx ); } - // returnt TRUE wenn sich in der Tabelle Verschachtelungen befinden - BOOL IsTblComplex() const; + // returnt sal_True wenn sich in der Tabelle Verschachtelungen befinden + sal_Bool IsTblComplex() const; - //returnt TRUE wenn die Tabelle oder Selektion ausgeglichen ist - BOOL IsTblComplexForChart( const String& rSel, + //returnt sal_True wenn die Tabelle oder Selektion ausgeglichen ist + sal_Bool IsTblComplexForChart( const String& rSel, SwChartLines* pGetCLines = 0 ) const; // suche alle Inhaltstragenden-Boxen der Grundline in der diese Box // steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen - //JP 31.01.97: bToTop = TRUE -> hoch bis zur Grundline, - // FALSE-> sonst nur die Line der Box + //JP 31.01.97: bToTop = sal_True -> hoch bis zur Grundline, + // sal_False-> sonst nur die Line der Box SwSelBoxes& SelLineFromBox( const SwTableBox* pBox, - SwSelBoxes& rBoxes, BOOL bToTop = TRUE ) const; + SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True ) const; // erfrage vom Client Informationen - virtual BOOL GetInfo( SfxPoolItem& ) const; + virtual sal_Bool GetInfo( SfxPoolItem& ) const; // suche im Format nach der angemeldeten Tabelle static SwTable * FindTable( SwFrmFmt const*const pFmt ); @@ -316,9 +316,9 @@ public: TblChgMode GetTblChgMode() const { return eTblChgMode; } void SetTblChgMode( TblChgMode eMode ) { eTblChgMode = eMode; } - BOOL SetColWidth( SwTableBox& rAktBox, USHORT eType, + sal_Bool SetColWidth( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); - BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType, + sal_Bool SetRowHeight( SwTableBox& rAktBox, sal_uInt16 eType, SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo ); #if OSL_DEBUG_LEVEL > 1 void CheckConsistency() const; @@ -335,7 +335,7 @@ public: SwTableLine() : pUpper(0) {} - SwTableLine( SwTableLineFmt*, USHORT nBoxes, SwTableBox *pUp ); + SwTableLine( SwTableLineFmt*, sal_uInt16 nBoxes, SwTableBox *pUp ); virtual ~SwTableLine(); SwTableBoxes &GetTabBoxes() { return aBoxes; } @@ -355,9 +355,9 @@ public: // suche nach der naechsten/vorherigen Box mit Inhalt SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTwips GetTableLineHeight( bool& bLayoutAvailable ) const; @@ -388,7 +388,7 @@ public: SwTableBox() : pSttNd(0), pUpper(0), pImpl(0) {} - SwTableBox( SwTableBoxFmt*, USHORT nLines, SwTableLine *pUp = 0 ); + SwTableBox( SwTableBoxFmt*, sal_uInt16 nLines, SwTableLine *pUp = 0 ); SwTableBox( SwTableBoxFmt*, const SwStartNode&, SwTableLine *pUp = 0 ); SwTableBox( SwTableBoxFmt*, const SwNodeIndex&, SwTableLine *pUp = 0 ); virtual ~SwTableBox(); @@ -408,7 +408,7 @@ public: void ChgFrmFmt( SwTableBoxFmt *pNewFmt ); const SwStartNode *GetSttNd() const { return pSttNd; } - ULONG GetSttIdx() const + sal_uLong GetSttIdx() const #if OSL_DEBUG_LEVEL > 1 ; #else @@ -417,29 +417,29 @@ public: // suche nach der naechsten/vorherigen Box mit Inhalt SwTableBox* FindNextBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; SwTableBox* FindPreviousBox( const SwTable&, const SwTableBox* =0, - BOOL bOvrTblLns=TRUE ) const; + sal_Bool bOvrTblLns=sal_True ) const; // gebe den Namen dieser Box zurueck. Dieser wird dynamisch bestimmt // und ergibt sich aus der Position in den Lines/Boxen/Tabelle String GetName() const; // gebe den "Wert" der Box zurueck (fuers rechnen in der Tabelle) double GetValue( SwTblCalcPara& rPara ) const; - BOOL IsInHeadline( const SwTable* pTbl = 0 ) const; + sal_Bool IsInHeadline( const SwTable* pTbl = 0 ) const; // enthaelt die Box Inhalt, der als Nummer formatiert werden kann? - BOOL HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, - BOOL& rIsEmptyTxtNd ) const; - ULONG IsValidNumTxtNd( BOOL bCheckAttr = TRUE ) const; + sal_Bool HasNumCntnt( double& rNum, sal_uInt32& rFmtIndex, + sal_Bool& rIsEmptyTxtNd ) const; + sal_uLong IsValidNumTxtNd( sal_Bool bCheckAttr = sal_True ) const; // teste ob der BoxInhalt mit der Nummer uebereinstimmt, wenn eine // Tabellenformel gesetzt ist. (fuers Redo des Change vom NumFormat!) - BOOL IsNumberChanged() const; + sal_Bool IsNumberChanged() const; // ist das eine FormelBox oder eine Box mit numerischen Inhalt (AutoSum) // Was es ist, besagt der ReturnWert - die WhichId des Attributes // Leere Boxen haben den ReturnWert USHRT_MAX !! - USHORT IsFormulaOrValueBox() const; + sal_uInt16 IsFormulaOrValueBox() const; // Loading of a document requires an actualisation of cells with values void ActualiseValueBox(); @@ -457,14 +457,14 @@ public: bool getDummyFlag() const; void setDummyFlag( bool bDummy ); - SwTableBox& FindStartOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX ); + SwTableBox& FindStartOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX ); const SwTableBox& FindStartOfRowSpan( const SwTable& rTable, - USHORT nMaxStep = USHRT_MAX ) const + sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindStartOfRowSpan( rTable, nMaxStep ); } - SwTableBox& FindEndOfRowSpan( const SwTable&, USHORT nMaxStep = USHRT_MAX ); + SwTableBox& FindEndOfRowSpan( const SwTable&, sal_uInt16 nMaxStep = USHRT_MAX ); const SwTableBox& FindEndOfRowSpan( const SwTable& rTable, - USHORT nMaxStep = USHRT_MAX ) const + sal_uInt16 nMaxStep = USHRT_MAX ) const { return const_cast<SwTableBox*>(this)->FindEndOfRowSpan( rTable, nMaxStep ); } }; diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 3c77dd0ad3ca..87399c808ef6 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -115,13 +115,13 @@ enum SwLabelType }; -const BYTE OLD_MAXLEVEL = 5; -const BYTE MAXLEVEL = 10; //Ehemals numrule.hxx -const BYTE NO_NUM = 200; //Ehemals numrule.hxx +const sal_uInt8 OLD_MAXLEVEL = 5; +const sal_uInt8 MAXLEVEL = 10; //Ehemals numrule.hxx +const sal_uInt8 NO_NUM = 200; //Ehemals numrule.hxx // fuer Absaetze mit NO_NUM aber auf unterschiedlichen Leveln // DAMIT entfaellt das NO_NUM !!!! -const BYTE NO_NUMLEVEL = 0x20; // wird mit den Levels verodert +const sal_uInt8 NO_NUMLEVEL = 0x20; // wird mit den Levels verodert /* @@ -141,9 +141,9 @@ extern SwPathFinder *pPathFinder; // (fuer die weiteren Ebenen sind die Werte mit den Ebenen+1 zu // multiplizieren; Ebenen 0..4 !!!) -const USHORT lBullIndent = 1440/4; +const sal_uInt16 lBullIndent = 1440/4; const short lBullFirstLineOffset = -lBullIndent; -const USHORT lNumIndent = 1440/4; +const sal_uInt16 lNumIndent = 1440/4; const short lNumFirstLineOffset = -lNumIndent; const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm @@ -207,7 +207,7 @@ extern const sal_Char* pMarkToOLE; #endif -typedef USHORT SetAttrMode; +typedef sal_uInt16 SetAttrMode; namespace nsSetAttrMode { @@ -295,7 +295,7 @@ enum PrepareHint PREP_FTN, //Fussnoten-Invalidierung PREP_POS_CHGD, //Position des Frm hat sich verandert //(Zum Fly-Umbruch pruefen). Im void* des Prepare() - //wird ein BOOL& uebergeben, dieser zeigt mit TRUE, + //wird ein sal_Bool& uebergeben, dieser zeigt mit sal_True, //dass ein Format ausgefuehrt wurde. PREP_UL_SPACE, //UL-Space hat sich veraendert, TxtFrms muessen //den Zeilenabstand neu kalkulieren. diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx index ae89b213e222..f2785d32cb26 100644 --- a/sw/inc/swundo.hxx +++ b/sw/inc/swundo.hxx @@ -25,10 +25,16 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SWUNDO_HXX -#define _SWUNDO_HXX +#ifndef SWUNDO_HXX +#define SWUNDO_HXX + +#include <vector> + +#include <rtl/ustring.hxx> + + +typedef ::std::vector< ::rtl::OUString > SwUndoComments_t; -#include <svl/svarray.hxx> // die Ids fuer StdAktionen enum SwUndoId @@ -176,26 +182,6 @@ enum SwUndoId }; -#define INIT_UNDOIDS 20 -#define GROW_UNDOIDS 32 -// Das Array der verwendeten Undo-Ids -class String; -class SwUndoIdAndName -{ - SwUndoId eUndoId; - String* pUndoStr; - -public: - SwUndoIdAndName() : eUndoId( UNDO_EMPTY ), pUndoStr( 0 ) {} - SwUndoIdAndName( SwUndoId nId, const String* pStr = 0 ); - ~SwUndoIdAndName(); - - SwUndoId GetUndoId() const { return eUndoId; } - const String* GetUndoStr() const { return pUndoStr; } -}; -typedef SwUndoIdAndName* SwUndoIdAndNamePtr; -SV_DECL_PTRARR_DEL( SwUndoIds, SwUndoIdAndNamePtr, INIT_UNDOIDS, GROW_UNDOIDS ) - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/swunohelper.hxx b/sw/inc/swunohelper.hxx index 0551ccfb8c87..9f7b05ba8b13 100644 --- a/sw/inc/swunohelper.hxx +++ b/sw/inc/swunohelper.hxx @@ -51,32 +51,32 @@ sal_Int32 GetEnumAsInt32( const com::sun::star::uno::Any& rVal ); // methods for UCB actions: // delete the file under this URL -SW_DLLPUBLIC BOOL UCB_DeleteFile( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_DeleteFile( const String& rURL ); // copy/move the file to a new location -BOOL UCB_CopyFile( const String& rURL, const String& rNewURL, - BOOL bCopyIsMove = FALSE ); +sal_Bool UCB_CopyFile( const String& rURL, const String& rNewURL, + sal_Bool bCopyIsMove = sal_False ); // is the URL on the current system case sentive? -SW_DLLPUBLIC BOOL UCB_IsCaseSensitiveFileName( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsCaseSensitiveFileName( const String& rURL ); // is the URL readonly? -SW_DLLPUBLIC BOOL UCB_IsReadOnlyFileName( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsReadOnlyFileName( const String& rURL ); // get a list of files from the folder of the URL // options: pExtension = 0 -> all, else this specific extension // pDateTime != 0 -> returns also the modified date/time of // the files in a SvPtrarr --> // !! objects must be deleted from the caller!! -BOOL UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList, +sal_Bool UCB_GetFileListOfFolder( const String& rURL, SvStrings& rList, const String* pExtension = 0, SvPtrarr* pDateTimeList = 0 ); // is the URL an existing file? -SW_DLLPUBLIC BOOL UCB_IsFile( const String& rURL ); +SW_DLLPUBLIC sal_Bool UCB_IsFile( const String& rURL ); // is the URL a existing directory? -BOOL UCB_IsDirectory( const String& rURL ); +sal_Bool UCB_IsDirectory( const String& rURL ); } #endif diff --git a/sw/inc/swurl.hxx b/sw/inc/swurl.hxx index 73c1ce94029f..550e0850ba4e 100644 --- a/sw/inc/swurl.hxx +++ b/sw/inc/swurl.hxx @@ -39,7 +39,7 @@ class ViewShell; void LoadURL( const UniString& rName, ViewShell* pSh, - USHORT nFilter = URLLOAD_NOFILTER, + sal_uInt16 nFilter = URLLOAD_NOFILTER, const UniString *pTargetFrameName = 0 ); diff --git a/sw/inc/swwait.hxx b/sw/inc/swwait.hxx index ad54933e9c7d..f2890c092c67 100644 --- a/sw/inc/swwait.hxx +++ b/sw/inc/swwait.hxx @@ -36,9 +36,9 @@ class SwDocShell; class SW_DLLPUBLIC SwWait { SwDocShell &rDoc; - BOOL bLock; + sal_Bool bLock; public: - SwWait( SwDocShell &rDocShell, BOOL bLockDispatcher ); + SwWait( SwDocShell &rDocShell, sal_Bool bLockDispatcher ); ~SwWait(); }; diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx index 6c138c852e71..1ae2b0c287f1 100644 --- a/sw/inc/tabcol.hxx +++ b/sw/inc/tabcol.hxx @@ -44,8 +44,8 @@ struct SwTabColsEntry long nPos; long nMin; long nMax; - BOOL bHidden; //Fuer jeden Eintrag ein Flag, Hidden oder nicht. - //Wenn das Flag Hidden TRUE ist liegt der Spalten- + sal_Bool bHidden; //Fuer jeden Eintrag ein Flag, Hidden oder nicht. + //Wenn das Flag Hidden sal_True ist liegt der Spalten- //trenner nicht in der aktuellen Zeile; er muss //mit gepflegt werden, darf aber nicht angezeigt //werden. @@ -72,23 +72,23 @@ class SW_DLLPUBLIC SwTabCols const SwTabColsEntries& GetData() const { return aData; } public: - SwTabCols( USHORT nSize = 0 ); + SwTabCols( sal_uInt16 nSize = 0 ); SwTabCols( const SwTabCols& ); SwTabCols &operator=( const SwTabCols& ); - BOOL operator==( const SwTabCols& rCmp ) const; - long& operator[]( USHORT nPos ) { return aData[nPos].nPos; } - long operator[]( USHORT nPos ) const { return aData[nPos].nPos; } - USHORT Count() const { return sal::static_int_cast< USHORT >(aData.size()); } + sal_Bool operator==( const SwTabCols& rCmp ) const; + long& operator[]( sal_uInt16 nPos ) { return aData[nPos].nPos; } + long operator[]( sal_uInt16 nPos ) const { return aData[nPos].nPos; } + sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16 >(aData.size()); } - BOOL IsHidden( USHORT nPos ) const { return aData[nPos].bHidden; } - void SetHidden( USHORT nPos, BOOL bValue ) { aData[nPos].bHidden = bValue; } + sal_Bool IsHidden( sal_uInt16 nPos ) const { return aData[nPos].bHidden; } + void SetHidden( sal_uInt16 nPos, sal_Bool bValue ) { aData[nPos].bHidden = bValue; } - void Insert( long nValue, BOOL bValue, USHORT nPos ); - void Insert( long nValue, long nMin, long nMax, BOOL bValue, USHORT nPos ); - void Remove( USHORT nPos, USHORT nAnz = 1 ); + void Insert( long nValue, sal_Bool bValue, sal_uInt16 nPos ); + void Insert( long nValue, long nMin, long nMax, sal_Bool bValue, sal_uInt16 nPos ); + void Remove( sal_uInt16 nPos, sal_uInt16 nAnz = 1 ); - const SwTabColsEntry& GetEntry( USHORT nPos ) const { return aData[nPos]; } - SwTabColsEntry& GetEntry( USHORT nPos ) { return aData[nPos]; } + const SwTabColsEntry& GetEntry( sal_uInt16 nPos ) const { return aData[nPos]; } + SwTabColsEntry& GetEntry( sal_uInt16 nPos ) { return aData[nPos]; } long GetLeftMin() const { return nLeftMin; } long GetLeft() const { return nLeft; } diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx index 58610145cb2c..a6c8b9fed177 100644 --- a/sw/inc/tblafmt.hxx +++ b/sw/inc/tblafmt.hxx @@ -181,13 +181,13 @@ public: void SetValueFormat( const String& rFmt, LanguageType eLng, LanguageType eSys ) { sNumFmtString = rFmt; eNumFmtLanguage = eLng; eSysLanguage = eSys; } - BOOL Load( SvStream& rStream, const SwAfVersions& rVersions, USHORT nVer ); - BOOL Save( SvStream& rStream ) const; - BOOL SaveVerionNo( SvStream& rStream ) const; + sal_Bool Load( SvStream& rStream, const SwAfVersions& rVersions, sal_uInt16 nVer ); + sal_Bool Save( SvStream& rStream ) const; + sal_Bool SaveVerionNo( SvStream& rStream ) const; #ifdef READ_OLDVERS // lade alte Version - BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] ); + sal_Bool LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ); #endif }; @@ -197,17 +197,17 @@ class SW_DLLPUBLIC SwTableAutoFmt static SwBoxAutoFmt* pDfltBoxAutoFmt; String aName; - USHORT nStrResId; + sal_uInt16 nStrResId; // common flags of Calc and Writer - BOOL bInclFont : 1; - BOOL bInclJustify : 1; - BOOL bInclFrame : 1; - BOOL bInclBackground : 1; - BOOL bInclValueFormat : 1; + sal_Bool bInclFont : 1; + sal_Bool bInclJustify : 1; + sal_Bool bInclFrame : 1; + sal_Bool bInclBackground : 1; + sal_Bool bInclValueFormat : 1; // Calc specific flags - BOOL bInclWidthHeight : 1; + sal_Bool bInclWidthHeight : 1; SwBoxAutoFmt* aBoxAutoFmt[ 16 ]; @@ -218,37 +218,37 @@ public: SwTableAutoFmt& operator=( const SwTableAutoFmt& rNew ); - void SetBoxFmt( const SwBoxAutoFmt& rNew, BYTE nPos ); - const SwBoxAutoFmt& GetBoxFmt( BYTE nPos ) const; + void SetBoxFmt( const SwBoxAutoFmt& rNew, sal_uInt8 nPos ); + const SwBoxAutoFmt& GetBoxFmt( sal_uInt8 nPos ) const; void SetName( const String& rNew ) { aName = rNew; nStrResId = USHRT_MAX; } const String& GetName() const { return aName; } enum UpdateFlags { UPDATE_CHAR = 1, UPDATE_BOX = 2, UPDATE_ALL = 3 }; - SwBoxAutoFmt& UpdateFromSet( BYTE nPos, const SfxItemSet& rSet, + SwBoxAutoFmt& UpdateFromSet( sal_uInt8 nPos, const SfxItemSet& rSet, UpdateFlags eFlags, SvNumberFormatter* ); - void UpdateToSet( BYTE nPos, SfxItemSet& rSet, UpdateFlags eFlags, + void UpdateToSet( sal_uInt8 nPos, SfxItemSet& rSet, UpdateFlags eFlags, SvNumberFormatter* ) const ; - BOOL IsFont() const { return bInclFont; } - BOOL IsJustify() const { return bInclJustify; } - BOOL IsFrame() const { return bInclFrame; } - BOOL IsBackground() const { return bInclBackground; } - BOOL IsValueFormat() const { return bInclValueFormat; } + sal_Bool IsFont() const { return bInclFont; } + sal_Bool IsJustify() const { return bInclJustify; } + sal_Bool IsFrame() const { return bInclFrame; } + sal_Bool IsBackground() const { return bInclBackground; } + sal_Bool IsValueFormat() const { return bInclValueFormat; } - void SetFont( const BOOL bNew ) { bInclFont = bNew; } - void SetJustify( const BOOL bNew ) { bInclJustify = bNew; } - void SetFrame( const BOOL bNew ) { bInclFrame = bNew; } - void SetBackground( const BOOL bNew ) { bInclBackground = bNew; } - void SetValueFormat( const BOOL bNew ) { bInclValueFormat = bNew; } - void SetWidthHeight( const BOOL bNew ) { bInclWidthHeight = bNew; } + void SetFont( const sal_Bool bNew ) { bInclFont = bNew; } + void SetJustify( const sal_Bool bNew ) { bInclJustify = bNew; } + void SetFrame( const sal_Bool bNew ) { bInclFrame = bNew; } + void SetBackground( const sal_Bool bNew ) { bInclBackground = bNew; } + void SetValueFormat( const sal_Bool bNew ) { bInclValueFormat = bNew; } + void SetWidthHeight( const sal_Bool bNew ) { bInclWidthHeight = bNew; } - BOOL Load( SvStream& rStream, const SwAfVersions& ); - BOOL Save( SvStream& rStream ) const; + sal_Bool Load( SvStream& rStream, const SwAfVersions& ); + sal_Bool Save( SvStream& rStream ) const; #ifdef READ_OLDVERS // load old versions - BOOL LoadOld( SvStream& rStream, USHORT aLoadVer[] ); + sal_Bool LoadOld( SvStream& rStream, sal_uInt16 aLoadVer[] ); #endif }; @@ -257,14 +257,14 @@ SV_DECL_PTRARR_DEL( _SwTableAutoFmtTbl, SwTableAutoFmtPtr, 1, 5 ) class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl { - SW_DLLPRIVATE BOOL Load( SvStream& rStream ); - SW_DLLPRIVATE BOOL Save( SvStream& rStream ) const; + SW_DLLPRIVATE sal_Bool Load( SvStream& rStream ); + SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const; public: SwTableAutoFmtTbl(); - BOOL Load(); - BOOL Save() const; + sal_Bool Load(); + sal_Bool Save() const; }; #endif diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx index 030857b2f1fe..5c7bc06808c3 100644 --- a/sw/inc/tblenum.hxx +++ b/sw/inc/tblenum.hxx @@ -29,7 +29,7 @@ #define _TBLENUM_HXX //fuers aendern der Tabellen/Spalten/Zeilen Breiten/Hoehen -typedef USHORT TblChgWidthHeightType; +typedef sal_uInt16 TblChgWidthHeightType; namespace nsTblChgWidthHeightType { diff --git a/sw/inc/tblsel.hxx b/sw/inc/tblsel.hxx index 9c17d1cb0987..bdab7f0ad805 100644 --- a/sw/inc/tblsel.hxx +++ b/sw/inc/tblsel.hxx @@ -56,7 +56,7 @@ SV_DECL_PTRARR_SORT( SwSelBoxes, SwTableBoxPtr, 10, 20 ) //erweitert. //Die Boxen werden ueber das Layout zusammengsucht, es wird auch bei //aufgespaltenen Tabellen korrekt gearbeitet (siehe: MakeSelUnions()). -typedef USHORT SwTblSearchType; +typedef sal_uInt16 SwTblSearchType; namespace nsSwTblSearchType { const SwTblSearchType TBLSEARCH_NONE = 0x1; // keine Erweiterung @@ -85,22 +85,22 @@ void GetTblSelCrs( const SwCrsrShell& rShell, SwSelBoxes& rBoxes ); void GetTblSelCrs( const SwTableCursor& rTblCrsr, SwSelBoxes& rBoxes ); // suche fuer eine AutoSumme die beteiligten Boxen zusammen -BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); +sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& ); // check if the SelBoxes contains protected Boxes -BOOL HasProtectedCells( const SwSelBoxes& rBoxes ); +sal_Bool HasProtectedCells( const SwSelBoxes& rBoxes ); // teste, ob die Selektion ausgeglichen ist SV_DECL_PTRARR( SwChartBoxes, SwTableBoxPtr, 16, 16) SV_DECL_PTRARR_DEL( SwChartLines, SwChartBoxes*, 25, 50) -BOOL ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, +sal_Bool ChkChartSel( const SwNode& rSttNd, const SwNode& rEndNd, SwChartLines* pGetCLines = 0 ); // teste ob die Celle in die SSelection gehoert // (wurde eine Funktion, damit GetTblSel() und MakeTblCrsr() immer // das "gleiche Verstaendnis" fuer die Selektion haben) -BOOL IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); +sal_Bool IsFrmInTblSel( const SwRect& rUnion, const SwFrm* pCell ); // bestimme die Boxen, die zusammen gefasst werden sollen. // Dabei wird auf Layout Basis das Rechteck "angepasst". D.H. es @@ -111,16 +111,16 @@ void GetMergeSel( const SwPaM& rPam, SwSelBoxes& rBoxes, SwTableBox** ppMergeBox, SwUndoTblMerge* pUndo = 0 ); // teste ob die selektierten Boxen ein gueltiges Merge erlauben -USHORT CheckMergeSel( const SwPaM& rPam ); -USHORT CheckMergeSel( const SwSelBoxes& rBoxes ); +sal_uInt16 CheckMergeSel( const SwPaM& rPam ); +sal_uInt16 CheckMergeSel( const SwSelBoxes& rBoxes ); -BOOL IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); +sal_Bool IsEmptyBox( const SwTableBox& rBox, SwPaM& rPam ); // teste ob ein Split oder InsertCol dazu fuehrt, das eine Box // kleiner als MINLAY wird. -BOOL CheckSplitCells( const SwCrsrShell& rShell, USHORT nDiv, +sal_Bool CheckSplitCells( const SwCrsrShell& rShell, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); -BOOL CheckSplitCells( const SwCursor& rCrsr, USHORT nDiv, +sal_Bool CheckSplitCells( const SwCursor& rCrsr, sal_uInt16 nDiv, const SwTblSearchType = nsSwTblSearchType::TBLSEARCH_NONE ); //Fuer das Arbeiten auf TabSelektion auch fuer aufgespaltene Tabellen. @@ -184,9 +184,9 @@ public: void SetTableLines( const SwTable &rTable ); void DelFrms ( SwTable &rTable ); void MakeFrms( SwTable &rTable ); - void MakeNewFrms( SwTable &rTable, const USHORT nNumber, - const BOOL bBehind ); - BOOL AreLinesToRestore( const SwTable &rTable ) const; + void MakeNewFrms( SwTable &rTable, const sal_uInt16 nNumber, + const sal_Bool bBehind ); + sal_Bool AreLinesToRestore( const SwTable &rTable ) const; void ClearLineBehind() { pLineBehind = 0; } }; @@ -224,8 +224,8 @@ struct _FndPara : rBoxes(rPara.rBoxes), pFndLine(pFL), pFndBox(rPara.pFndBox) {} }; -BOOL _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ); -SW_DLLPUBLIC BOOL _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ); +sal_Bool _FndBoxCopyCol( const SwTableBox*& rpBox, void* pPara ); +SW_DLLPUBLIC sal_Bool _FndLineCopyCol( const SwTableLine*& rpLine, void* pPara ); #endif // _TBLSEL_HXX diff --git a/sw/inc/tgrditem.hxx b/sw/inc/tgrditem.hxx index 8178cdc47746..0c6b9da9e243 100644 --- a/sw/inc/tgrditem.hxx +++ b/sw/inc/tgrditem.hxx @@ -44,14 +44,14 @@ class SW_DLLPUBLIC SwTextGridItem : public SfxPoolItem sal_uInt16 nLines; sal_uInt16 nBaseHeight, nRubyHeight; SwTextGrid eGridType; - BOOL bRubyTextBelow; - BOOL bPrintGrid; - BOOL bDisplayGrid; + sal_Bool bRubyTextBelow; + sal_Bool bPrintGrid; + sal_Bool bDisplayGrid; //for textgrid enhancement sal_uInt16 nBaseWidth; - BOOL bSnapToChars; - BOOL bSquaredMode; + sal_Bool bSnapToChars; + sal_Bool bSquaredMode; public: SwTextGridItem(); virtual ~SwTextGridItem(); @@ -64,8 +64,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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ); SwTextGridItem& operator=( const SwTextGridItem& ); @@ -84,37 +84,37 @@ public: SwTextGrid GetGridType() const { return eGridType; } void SetGridType( SwTextGrid eNew ) { eGridType = eNew; } - BOOL IsRubyTextBelow() const { return bRubyTextBelow; } - BOOL GetRubyTextBelow() const { return bRubyTextBelow; } - void SetRubyTextBelow( BOOL bNew ) { bRubyTextBelow = bNew; } + sal_Bool IsRubyTextBelow() const { return bRubyTextBelow; } + sal_Bool GetRubyTextBelow() const { return bRubyTextBelow; } + void SetRubyTextBelow( sal_Bool bNew ) { bRubyTextBelow = bNew; } - BOOL IsPrintGrid() const { return bPrintGrid; } - BOOL GetPrintGrid() const { return bPrintGrid; } - void SetPrintGrid( BOOL bNew ) { bPrintGrid = bNew; } + sal_Bool IsPrintGrid() const { return bPrintGrid; } + sal_Bool GetPrintGrid() const { return bPrintGrid; } + void SetPrintGrid( sal_Bool bNew ) { bPrintGrid = bNew; } - BOOL IsDisplayGrid() const { return bDisplayGrid; } - BOOL GetDisplayGrid() const { return bDisplayGrid; } - void SetDisplayGrid( BOOL bNew ) { bDisplayGrid = bNew; } + sal_Bool IsDisplayGrid() const { return bDisplayGrid; } + sal_Bool GetDisplayGrid() const { return bDisplayGrid; } + void SetDisplayGrid( sal_Bool bNew ) { bDisplayGrid = bNew; } //for textgrid enhancement sal_uInt16 GetBaseWidth() const { return nBaseWidth;} void SetBaseWidth( sal_uInt16 nNew ) { nBaseWidth = nNew; } - BOOL IsSnapToChars() const { return bSnapToChars; } - BOOL GetSnapToChars() const { return bSnapToChars; } - void SetSnapToChars( BOOL bNew ) { bSnapToChars = bNew; } + sal_Bool IsSnapToChars() const { return bSnapToChars; } + sal_Bool GetSnapToChars() const { return bSnapToChars; } + void SetSnapToChars( sal_Bool bNew ) { bSnapToChars = bNew; } - BOOL IsSquaredMode() const { return bSquaredMode; } - BOOL GetSquaredMode() const { return bSquaredMode; } - void SetSquaredMode( BOOL bNew ) { bSquaredMode = bNew; } - void SwitchPaperMode(BOOL bNew ); + sal_Bool IsSquaredMode() const { return bSquaredMode; } + sal_Bool GetSquaredMode() const { return bSquaredMode; } + void SetSquaredMode( sal_Bool bNew ) { bSquaredMode = bNew; } + void SwitchPaperMode(sal_Bool bNew ); void Init(); }; -inline const SwTextGridItem &SwAttrSet::GetTextGrid(BOOL bInP) const +inline const SwTextGridItem &SwAttrSet::GetTextGrid(sal_Bool bInP) const { return (const SwTextGridItem&)Get( RES_TEXTGRID, bInP ); } -inline const SwTextGridItem &SwFmt::GetTextGrid(BOOL bInP) const +inline const SwTextGridItem &SwFmt::GetTextGrid(sal_Bool bInP) const { return (const SwTextGridItem&)aSet.Get( RES_TEXTGRID, bInP ); } #endif diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx index 40fa7dd63774..1f5bf0530f9b 100644 --- a/sw/inc/tox.hxx +++ b/sw/inc/tox.hxx @@ -63,8 +63,8 @@ SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10) Description: Entry of content index, alphabetical index or user defined index --------------------------------------------------------------------*/ -#define IVER_TOXMARK_STRPOOL ((USHORT)1) -#define IVER_TOXMARK_NEWTOX ((USHORT)2) +#define IVER_TOXMARK_STRPOOL ((sal_uInt16)1) +#define IVER_TOXMARK_NEWTOX ((sal_uInt16)2) class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem @@ -83,9 +83,9 @@ class SW_DLLPUBLIC SwTOXMark SwTxtTOXMark* pTxtAttr; - USHORT nLevel; - BOOL bAutoGenerated : 1; // generated using a concordance file - BOOL bMainEntry : 1; // main entry emphasized by character style + sal_uInt16 nLevel; + sal_Bool bAutoGenerated : 1; // generated using a concordance file + sal_Bool bMainEntry : 1; // main entry emphasized by character style ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark; @@ -113,14 +113,14 @@ public: String GetText() const; - inline BOOL IsAlternativeText() const; + inline sal_Bool IsAlternativeText() const; inline const String& GetAlternativeText() const; inline void SetAlternativeText( const String& rAlt ); // content or user defined index - inline void SetLevel(USHORT nLevel); - inline USHORT GetLevel() const; + inline void SetLevel(sal_uInt16 nLevel); + inline sal_uInt16 GetLevel() const; // for alphabetical index only inline void SetPrimaryKey(const String& rStr ); @@ -135,11 +135,11 @@ public: inline const String& GetPrimaryKeyReading() const; inline const String& GetSecondaryKeyReading() const; - BOOL IsAutoGenerated() const {return bAutoGenerated;} - void SetAutoGenerated(BOOL bSet) {bAutoGenerated = bSet;} + sal_Bool IsAutoGenerated() const {return bAutoGenerated;} + void SetAutoGenerated(sal_Bool bSet) {bAutoGenerated = bSet;} - BOOL IsMainEntry() const {return bMainEntry;} - void SetMainEntry(BOOL bSet) { bMainEntry = bSet;} + sal_Bool IsMainEntry() const {return bMainEntry;} + void SetMainEntry(sal_Bool bSet) { bMainEntry = bSet;} inline const SwTOXType* GetTOXType() const; @@ -225,13 +225,13 @@ struct SW_DLLPUBLIC SwFormToken String sCharStyleName; SwTwips nTabStopPosition; FormTokenType eTokenType; - USHORT nPoolId; + sal_uInt16 nPoolId; SvxTabAdjust eTabAlign; - USHORT nChapterFormat; //SwChapterFormat; - USHORT nOutlineLevel;//the maximum permitted outline level in numbering - USHORT nAuthorityField; //enum ToxAuthorityField + sal_uInt16 nChapterFormat; //SwChapterFormat; + sal_uInt16 nOutlineLevel;//the maximum permitted outline level in numbering + sal_uInt16 nAuthorityField; //enum ToxAuthorityField sal_Unicode cTabFillChar; - sal_Bool bWithTab; // TRUE: do generate tab + sal_Bool bWithTab; // sal_True: do generate tab // character only the tab stop // #i21237# @@ -351,11 +351,11 @@ class SW_DLLPUBLIC SwForm String aTemplate[ AUTH_TYPE_END + 1 ]; TOXTypes eType; - USHORT nFormMaxLevel; + sal_uInt16 nFormMaxLevel; - BOOL bGenerateTabPos : 1; - BOOL bIsRelTabPos : 1; - BOOL bCommaSeparated : 1; + sal_Bool bGenerateTabPos : 1; + sal_Bool bIsRelTabPos : 1; + sal_Bool bCommaSeparated : 1; public: SwForm( TOXTypes eTOXType = TOX_CONTENT ); @@ -363,57 +363,57 @@ public: SwForm& operator=( const SwForm& rForm ); - inline void SetTemplate(USHORT nLevel, const String& rName); - inline const String& GetTemplate(USHORT nLevel) const; + inline void SetTemplate(sal_uInt16 nLevel, const String& rName); + inline const String& GetTemplate(sal_uInt16 nLevel) const; // #i21237# - void SetPattern(USHORT nLevel, const SwFormTokens& rName); - void SetPattern(USHORT nLevel, const String& rStr); - const SwFormTokens& GetPattern(USHORT nLevel) const; + void SetPattern(sal_uInt16 nLevel, const SwFormTokens& rName); + void SetPattern(sal_uInt16 nLevel, const String& rStr); + const SwFormTokens& GetPattern(sal_uInt16 nLevel) const; // fill tab stop positions from template to pattern // #i21237# void AdjustTabStops(SwDoc& rDoc, - BOOL bInsertNewTabStops = FALSE); + sal_Bool bInsertNewTabStops = sal_False); inline TOXTypes GetTOXType() const; - inline USHORT GetFormMax() const; + inline sal_uInt16 GetFormMax() const; - BOOL IsRelTabPos() const { return bIsRelTabPos; } - void SetRelTabPos( BOOL b ) { bIsRelTabPos = b; } + sal_Bool IsRelTabPos() const { return bIsRelTabPos; } + void SetRelTabPos( sal_Bool b ) { bIsRelTabPos = b; } - BOOL IsCommaSeparated() const { return bCommaSeparated;} - void SetCommaSeparated( BOOL b) { bCommaSeparated = b;} + sal_Bool IsCommaSeparated() const { return bCommaSeparated;} + void SetCommaSeparated( sal_Bool b) { bCommaSeparated = b;} - static USHORT GetFormMaxLevel( TOXTypes eType ); + static sal_uInt16 GetFormMaxLevel( TOXTypes eType ); static const sal_Char* aFormEntry; // <E> - static BYTE nFormEntryLen; // 3 characters + static sal_uInt8 nFormEntryLen; // 3 characters static const sal_Char* aFormTab; // <T> - static BYTE nFormTabLen; // 3 characters + static sal_uInt8 nFormTabLen; // 3 characters static const sal_Char* aFormPageNums; // <P> - static BYTE nFormPageNumsLen; // 3 characters + static sal_uInt8 nFormPageNumsLen; // 3 characters static const sal_Char* aFormLinkStt; // <LS> - static BYTE nFormLinkSttLen; // 4 characters + static sal_uInt8 nFormLinkSttLen; // 4 characters static const sal_Char* aFormLinkEnd; // <LE> - static BYTE nFormLinkEndLen; // 4 characters + static sal_uInt8 nFormLinkEndLen; // 4 characters static const sal_Char* aFormEntryNum; // <E#> - static BYTE nFormEntryNumLen; // 4 characters + static sal_uInt8 nFormEntryNumLen; // 4 characters static const sal_Char* aFormEntryTxt; // <ET> - static BYTE nFormEntryTxtLen; // 4 characters + static sal_uInt8 nFormEntryTxtLen; // 4 characters static const sal_Char* aFormChapterMark; // <C> - static BYTE nFormChapterMarkLen; // 3 characters + static sal_uInt8 nFormChapterMarkLen; // 3 characters static const sal_Char* aFormText; // <TX> - static BYTE nFormTextLen; // 4 characters + static sal_uInt8 nFormTextLen; // 4 characters static const sal_Char* aFormAuth; // <Axx> xx - decimal enum value - static BYTE nFormAuthLen; // 3 characters + static sal_uInt8 nFormAuthLen; // 3 characters }; /*-------------------------------------------------------------------- Description: Content to create indexes of --------------------------------------------------------------------*/ -typedef USHORT SwTOXElement; +typedef sal_uInt16 SwTOXElement; namespace nsSwTOXElement { const SwTOXElement TOX_MARK = 1; @@ -426,7 +426,7 @@ namespace nsSwTOXElement const SwTOXElement TOX_SEQUENCE = 128; } -typedef USHORT SwTOIOptions; +typedef sal_uInt16 SwTOIOptions; namespace nsSwTOIOptions { const SwTOIOptions TOI_SAME_ENTRY = 1; @@ -446,7 +446,7 @@ enum SwCaptionDisplay CAPTION_TEXT }; -typedef USHORT SwTOOElements; +typedef sal_uInt16 SwTOOElements; namespace nsSwTOOElements { const SwTOOElements TOO_MATH = 0x01; @@ -477,25 +477,25 @@ class SW_DLLPUBLIC SwTOXBase : public SwClient String sSortAlgorithm; union { - USHORT nLevel; // consider outline levels - USHORT nOptions; // options of alphabetical index + sal_uInt16 nLevel; // consider outline levels + sal_uInt16 nOptions; // options of alphabetical index } aData; - USHORT nCreateType; // sources to create the index from - USHORT nOLEOptions; // OLE sources + sal_uInt16 nCreateType; // sources to create the index from + sal_uInt16 nOLEOptions; // OLE sources SwCaptionDisplay eCaptionDisplay; // - BOOL bProtected : 1; // index protected ? - BOOL bFromChapter : 1; // create from chapter or document - BOOL bFromObjectNames : 1; // create a table or object index + sal_Bool bProtected : 1; // index protected ? + sal_Bool bFromChapter : 1; // create from chapter or document + sal_Bool bFromObjectNames : 1; // create a table or object index // from the names rather than the caption - BOOL bLevelFromChapter : 1; // User index: get the level from the source chapter + sal_Bool bLevelFromChapter : 1; // User index: get the level from the source chapter public: SwTOXBase( const SwTOXType* pTyp, const SwForm& rForm, - USHORT nCreaType, const String& rTitle ); + sal_uInt16 nCreaType, const String& rTitle ); SwTOXBase( const SwTOXBase& rCopy, SwDoc* pDoc = 0 ); virtual ~SwTOXBase(); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // a kind of CopyCtor - check if the TOXBase is at TOXType of the doc. // If not, so create it an copy all other used things. The return is this @@ -503,7 +503,7 @@ public: const SwTOXType* GetTOXType() const; // - USHORT GetCreateType() const; // creation types + sal_uInt16 GetCreateType() const; // creation types const String& GetTOXName() const {return aName;} void SetTOXName(const String& rSet) {aName = rSet;} @@ -512,7 +512,7 @@ public: const String& GetTypeName() const; // Name const SwForm& GetTOXForm() const; // description of the lines - void SetCreate(USHORT); + void SetCreate(sal_uInt16); void SetTitle(const String& rTitle); void SetTOXForm(const SwForm& rForm); @@ -522,43 +522,43 @@ public: void SetMainEntryCharStyle(const String& rSet) {sMainEntryCharStyle = rSet;} // content index only - inline void SetLevel(USHORT); // consider outline level - inline USHORT GetLevel() const; + inline void SetLevel(sal_uInt16); // consider outline level + inline sal_uInt16 GetLevel() const; // alphabetical index only - inline USHORT GetOptions() const; // alphabetical index options - inline void SetOptions(USHORT nOpt); + inline sal_uInt16 GetOptions() const; // alphabetical index options + inline void SetOptions(sal_uInt16 nOpt); // index of objects - USHORT GetOLEOptions() const {return nOLEOptions;} - void SetOLEOptions(USHORT nOpt) {nOLEOptions = nOpt;} + sal_uInt16 GetOLEOptions() const {return nOLEOptions;} + void SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;} // index of objects // user defined index only inline void SetTemplateName(const String& rName); // Absatzlayout beachten - const String& GetStyleNames(USHORT nLevel) const + const String& GetStyleNames(sal_uInt16 nLevel) const { DBG_ASSERT( nLevel < MAXLEVEL, "Which level?"); return aStyleNames[nLevel]; } - void SetStyleNames(const String& rSet, USHORT nLevel) + void SetStyleNames(const String& rSet, sal_uInt16 nLevel) { DBG_ASSERT( nLevel < MAXLEVEL, "Which level?"); aStyleNames[nLevel] = rSet; } - BOOL IsFromChapter() const { return bFromChapter;} - void SetFromChapter(BOOL bSet) { bFromChapter = bSet;} + sal_Bool IsFromChapter() const { return bFromChapter;} + void SetFromChapter(sal_Bool bSet) { bFromChapter = bSet;} - BOOL IsFromObjectNames() const {return bFromObjectNames;} - void SetFromObjectNames(BOOL bSet) {bFromObjectNames = bSet;} + sal_Bool IsFromObjectNames() const {return bFromObjectNames;} + void SetFromObjectNames(sal_Bool bSet) {bFromObjectNames = bSet;} - BOOL IsLevelFromChapter() const {return bLevelFromChapter;} - void SetLevelFromChapter(BOOL bSet) {bLevelFromChapter = bSet;} + sal_Bool IsLevelFromChapter() const {return bLevelFromChapter;} + void SetLevelFromChapter(sal_Bool bSet) {bLevelFromChapter = bSet;} - BOOL IsProtected() const { return bProtected; } - void SetProtected(BOOL bSet) { bProtected = bSet; } + sal_Bool IsProtected() const { return bProtected; } + void SetProtected(sal_Bool bSet) { bProtected = bSet; } const String& GetSequenceName() const {return sSequenceName;} void SetSequenceName(const String& rSet) {sSequenceName = rSet;} @@ -566,7 +566,7 @@ public: SwCaptionDisplay GetCaptionDisplay() const { return eCaptionDisplay;} void SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;} - BOOL IsTOXBaseInReadonly() const; + sal_Bool IsTOXBaseInReadonly() const; const SfxItemSet* GetAttrSet() const; void SetAttrSet( const SfxItemSet& ); @@ -577,7 +577,7 @@ public: const String& GetSortAlgorithm()const {return sSortAlgorithm;} void SetSortAlgorithm(const String& rSet) {sSortAlgorithm = rSet;} // #i21237# - void AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop); + void AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop); SwTOXBase& operator=(const SwTOXBase& rSource); }; @@ -595,7 +595,7 @@ inline const String& SwTOXMark::GetAlternativeText() const inline const SwTOXType* SwTOXMark::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } -inline BOOL SwTOXMark::IsAlternativeText() const +inline sal_Bool SwTOXMark::IsAlternativeText() const { return aAltText.Len() > 0; } inline void SwTOXMark::SetAlternativeText(const String& rAlt) @@ -603,7 +603,7 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt) aAltText = rAlt; } -inline void SwTOXMark::SetLevel( USHORT nLvl ) +inline void SwTOXMark::SetLevel( sal_uInt16 nLvl ) { OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); nLevel = nLvl; @@ -639,7 +639,7 @@ inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey ) aSecondaryKeyReading = rKey; } -inline USHORT SwTOXMark::GetLevel() const +inline sal_uInt16 SwTOXMark::GetLevel() const { OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); return nLevel; @@ -678,13 +678,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const // //SwForm // -inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate) +inline void SwForm::SetTemplate(sal_uInt16 nLevel, const String& rTemplate) { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); aTemplate[nLevel] = rTemplate; } -inline const String& SwForm::GetTemplate(USHORT nLevel) const +inline const String& SwForm::GetTemplate(sal_uInt16 nLevel) const { OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX"); return aTemplate[nLevel]; @@ -695,7 +695,7 @@ inline TOXTypes SwForm::GetTOXType() const return eType; } -inline USHORT SwForm::GetFormMax() const +inline sal_uInt16 SwForm::GetFormMax() const { return nFormMaxLevel; } @@ -716,7 +716,7 @@ inline TOXTypes SwTOXType::GetType() const inline const SwTOXType* SwTOXBase::GetTOXType() const { return (SwTOXType*)GetRegisteredIn(); } -inline USHORT SwTOXBase::GetCreateType() const +inline sal_uInt16 SwTOXBase::GetCreateType() const { return nCreateType; } inline const String& SwTOXBase::GetTitle() const @@ -728,12 +728,12 @@ inline const String& SwTOXBase::GetTypeName() const inline const SwForm& SwTOXBase::GetTOXForm() const { return aForm; } -inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, BOOL bDefaultRightTabStop) +inline void SwTOXBase::AdjustTabStops(SwDoc & rDoc, sal_Bool bDefaultRightTabStop) { aForm.AdjustTabStops(rDoc, bDefaultRightTabStop); } -inline void SwTOXBase::SetCreate(USHORT nCreate) +inline void SwTOXBase::SetCreate(sal_uInt16 nCreate) { nCreateType = nCreate; } inline void SwTOXBase::SetTOXForm(const SwForm& rForm) @@ -742,13 +742,13 @@ inline void SwTOXBase::SetTOXForm(const SwForm& rForm) inline TOXTypes SwTOXBase::GetType() const { return GetTOXType()->GetType(); } -inline void SwTOXBase::SetLevel(USHORT nLev) +inline void SwTOXBase::SetLevel(sal_uInt16 nLev) { OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); aData.nLevel = nLev; } -inline USHORT SwTOXBase::GetLevel() const +inline sal_uInt16 SwTOXBase::GetLevel() const { OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp"); return aData.nLevel; @@ -760,13 +760,13 @@ inline void SwTOXBase::SetTemplateName(const String& rName) aStyleNames[0] = rName; } -inline USHORT SwTOXBase::GetOptions() const +inline sal_uInt16 SwTOXBase::GetOptions() const { OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp"); return aData.nOptions; } -inline void SwTOXBase::SetOptions(USHORT nOpt) +inline void SwTOXBase::SetOptions(sal_uInt16 nOpt) { OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp"); aData.nOptions = nOpt; diff --git a/sw/inc/toxwrap.hxx b/sw/inc/toxwrap.hxx index facead6132b1..9d641c4a01f0 100644 --- a/sw/inc/toxwrap.hxx +++ b/sw/inc/toxwrap.hxx @@ -61,7 +61,7 @@ public: String GetIndexKey( const String& rTxt, const String& rTxtReading, const STAR_NMSPC::lang::Locale& rLocale ) const; - String GetFollowingText( BOOL bMorePages ) const; + String GetFollowingText( sal_Bool bMorePages ) const; STAR_NMSPC::uno::Sequence< ::rtl::OUString > GetAlgorithmList( const STAR_NMSPC::lang::Locale& rLcl ) const; diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx index 6ab8922f361c..9ea9b8376295 100644 --- a/sw/inc/txatbase.hxx +++ b/sw/inc/txatbase.hxx @@ -106,7 +106,7 @@ public: inline const SfxPoolItem& GetAttr() const; inline SfxPoolItem& GetAttr(); - inline USHORT Which() const { return GetAttr().Which(); } + inline sal_uInt16 Which() const { return GetAttr().Which(); } virtual int operator==( const SwTxtAttr& ) const; @@ -129,7 +129,7 @@ protected: xub_StrLen m_nEnd; public: - SwTxtAttrEnd( SfxPoolItem& rAttr, USHORT nStart, USHORT nEnd ); + SwTxtAttrEnd( SfxPoolItem& rAttr, sal_uInt16 nStart, sal_uInt16 nEnd ); using SwTxtAttr::GetEnd; virtual xub_StrLen* GetEnd(); diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx index 13af67950275..ada4c2fc1097 100644 --- a/sw/inc/txatritr.hxx +++ b/sw/inc/txatritr.hxx @@ -73,7 +73,7 @@ class SwTxtAttrIterator void SearchNextChg(); public: - SwTxtAttrIterator( const SwTxtNode& rTxtNd, USHORT nWhichId, + SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId, xub_StrLen nStart = 0, sal_Bool bUseGetWhichOfScript = sal_True ); sal_Bool Next(); @@ -87,7 +87,7 @@ class SwLanguageIterator : public SwTxtAttrIterator { public: SwLanguageIterator( const SwTxtNode& rTxtNode, xub_StrLen nStart = 0, - USHORT nWhich = RES_CHRATR_LANGUAGE, + sal_uInt16 nWhich = RES_CHRATR_LANGUAGE, sal_Bool bUseGetWhichOfScript = sal_True ) : SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript ) {} diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx index 2e14cf50377e..c3b816cc0d88 100644 --- a/sw/inc/txtatr.hxx +++ b/sw/inc/txtatr.hxx @@ -40,7 +40,7 @@ class SwCharFmt; class SwTxtCharFmt : public SwTxtAttrEnd { SwTxtNode * m_pTxtNode; - USHORT m_nSortNumber; + sal_uInt16 m_nSortNumber; public: SwTxtCharFmt( SwFmtCharFmt& rAttr, xub_StrLen nStart, xub_StrLen nEnd ); @@ -48,13 +48,13 @@ public: // werden vom SwFmtCharFmt hierher weitergeleitet virtual void Modify( SfxPoolItem*, SfxPoolItem* ); // SwClient - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // get and set TxtNode pointer void ChgTxtNode( SwTxtNode* pNew ) { m_pTxtNode = pNew; } - void SetSortNumber( USHORT nSortNumber ) { m_nSortNumber = nSortNumber; } - USHORT GetSortNumber() const { return m_nSortNumber; } + void SetSortNumber( sal_uInt16 nSortNumber ) { m_nSortNumber = nSortNumber; } + sal_uInt16 GetSortNumber() const { return m_nSortNumber; } }; @@ -96,7 +96,7 @@ public: TYPEINFO(); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; /// get and set TxtNode pointer const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index f5748117bf93..3ecabb8889bc 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -42,8 +42,7 @@ class SwTxtFld : public SwTxtAttr SwTxtNode * m_pTxtNode; public: - SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart, - bool const bInClipboard); + SwTxtFld(SwFmtFld & rAttr, xub_StrLen const nStart); virtual ~SwTxtFld(); void CopyFld( SwTxtFld *pDest ) const; diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx index 55eaa777b3c7..36fbfb0ee269 100644 --- a/sw/inc/txtftn.hxx +++ b/sw/inc/txtftn.hxx @@ -41,15 +41,15 @@ class SW_DLLPUBLIC SwTxtFtn : public SwTxtAttr { SwNodeIndex * m_pStartNode; SwTxtNode * m_pTxtNode; - USHORT m_nSeqNo; + sal_uInt16 m_nSeqNo; public: SwTxtFtn( SwFmtFtn& rAttr, xub_StrLen nStart ); virtual ~SwTxtFtn(); inline SwNodeIndex *GetStartNode() const { return m_pStartNode; } - void SetStartNode( const SwNodeIndex *pNode, BOOL bDelNodes = TRUE ); - void SetNumber( const USHORT nNumber, const String* = 0 ); + void SetStartNode( const SwNodeIndex *pNode, sal_Bool bDelNodes = sal_True ); + void SetNumber( const sal_uInt16 nNumber, const String* = 0 ); void CopyFtn(SwTxtFtn & rDest, SwTxtNode & rDestNode) const; // get and set TxtNode pointer @@ -65,9 +65,9 @@ public: void CheckCondColl(); // fuer die Querverweise auf Fussnoten - USHORT SetSeqRefNo(); - void SetSeqNo( USHORT n ) { m_nSeqNo = n; } // for Readers - USHORT GetSeqRefNo() const { return m_nSeqNo; } + sal_uInt16 SetSeqRefNo(); + void SetSeqNo( sal_uInt16 n ) { m_nSeqNo = n; } // for Readers + sal_uInt16 GetSeqRefNo() const { return m_nSeqNo; } static void SetUniqueSeqRefNo( SwDoc& rDoc ); }; diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 48096c4f5cb3..d09792c915cf 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -52,7 +52,7 @@ public: TYPEINFO(); virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew); - virtual BOOL GetInfo( SfxPoolItem& rInfo ) const; + virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const; // get and set TxtNode pointer const SwTxtNode* GetpTxtNode() const { return m_pTxtNode; } @@ -69,7 +69,7 @@ public: bool IsVisitedValid() const { return m_bVisitedValid; } void SetVisitedValid( bool bNew ) { m_bVisitedValid = bNew; } - BOOL IsProtect() const; + sal_Bool IsProtect() const; }; inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index c60c3a16e415..dda46d6ef8b5 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -29,114 +29,48 @@ #define SW_UNDOBJ_HXX #include <vector> -#include <memory> #include <boost/shared_ptr.hpp> -#include <com/sun/star/uno/Sequence.h> +#include <svl/undo.hxx> -#include <tools/mempool.hxx> -#ifndef _SVSTDARR_HXX -#define _SVSTDARR_USHORTS -#define _SVSTDARR_ULONGS -#define _SVSTDARR_USHORTSSORT -#include <svl/svstdarr.hxx> -#endif -#include <svl/itemset.hxx> - -#include <svx/svdundo.hxx> - -#include <numrule.hxx> -#include <itabenum.hxx> -#include <format.hxx> #include <SwRewriter.hxx> #include <swundo.hxx> -#include <IMark.hxx> -#include <IDocumentContentOperations.hxx> -class SwUndoIter; class SwHistory; class SwIndex; class SwPaM; struct SwPosition; class SwDoc; -class SwFmt; -class SwFmtColl; class SwTxtFmtColl; -class SwTxtNode; -class SwTableNode; -class SwTable; -class SwTableBox; -struct SwSortOptions; class SwFrmFmt; -class SwHistoryBookmark; -class SwSectionData; -class SwSectionFmt; -class SwTOXBase; -class SvxTabStopItem; -class SwDDEFieldType; -class Graphic; -class SwGrfNode; -class SwUndos; -class SwFtnInfo; -class SwEndNoteInfo; class SwNodeIndex; class SwNodeRange; -class SwFmtAnchor; -struct SwUndoGroupObjImpl; -class SdrMark; -class SdrMarkList; -class SdrObject; -class SdrObjGroup; -class SdrUndoAction; -class SwDrawFrmFmt; -class _SaveTable; -class SwTableAutoFmt; -class SwSelBoxes; -class SwTableSortBoxes; -class SwUndoSaveSections; -class SwUndoMoves; -class SwStartNode; -class _SaveFlyArr; -class SwTblToTxtSaves; class SwRedlineData; -class SwRedlineSaveData; -class SwRedline; -struct SwSaveRowSpan; - -namespace sfx2 { - class MetadatableUndo; -} +class SwRedlineSaveDatas; -namespace utl { - class TransliterationWrapper; +namespace sw { + class UndoRedoContext; + class RepeatContext; } -SW_DLLPUBLIC extern const String UNDO_ARG1; -SW_DLLPUBLIC extern const String UNDO_ARG2; -SW_DLLPUBLIC extern const String UNDO_ARG3; - -typedef SwRedlineSaveData* SwRedlineSaveDataPtr; -SV_DECL_PTRARR_DEL( SwRedlineSaveDatas, SwRedlineSaveDataPtr, 8, 8 ) - class SwUndo + : public SfxUndoAction { - SwUndoId nId; - USHORT nOrigRedlineMode; + SwUndoId const m_nId; + sal_uInt16 nOrigRedlineMode; protected: bool bCacheComment; mutable String * pComment; - void RemoveIdxFromSection( SwDoc&, ULONG nSttIdx, ULONG* pEndIdx = 0 ); - void RemoveIdxFromRange( SwPaM& rPam, BOOL bMoveNext ); - void RemoveIdxRel( ULONG, const SwPosition& ); + void RemoveIdxFromSection( SwDoc&, sal_uLong nSttIdx, sal_uLong* pEndIdx = 0 ); + void RemoveIdxFromRange( SwPaM& rPam, sal_Bool bMoveNext ); + void RemoveIdxRel( sal_uLong, const SwPosition& ); - void SetId( SwUndoId nNew ) { nId = nNew; } - - static BOOL CanRedlineGroup( SwRedlineSaveDatas& rCurr, + static sal_Bool CanRedlineGroup( SwRedlineSaveDatas& rCurr, const SwRedlineSaveDatas& rCheck, - BOOL bCurrIsEnd ); + sal_Bool bCurrIsEnd ); /** Returns the rewriter for this object. @@ -144,16 +78,31 @@ protected: @return the rewriter for this object */ virtual SwRewriter GetRewriter() const; + + // return type is sal_uInt16 because this overrides SfxUndoAction::GetId() + virtual sal_uInt16 GetId() const { return static_cast<sal_uInt16>(m_nId); } + + // the 4 methods that derived classes have to override + // base implementation does nothing + virtual void RepeatImpl( ::sw::RepeatContext & ); + virtual bool CanRepeatImpl( ::sw::RepeatContext & ) const; +public: // should not be public, but ran into trouble in untbl.cxx + virtual void UndoImpl( ::sw::UndoRedoContext & ) = 0; + virtual void RedoImpl( ::sw::UndoRedoContext & ) = 0; + +private: + // SfxUndoAction + virtual void Undo(); + virtual void Redo(); + virtual void UndoWithContext(SfxUndoContext &); + virtual void RedoWithContext(SfxUndoContext &); + virtual void Repeat(SfxRepeatTarget &); + virtual sal_Bool CanRepeat(SfxRepeatTarget &) const; + public: - SwUndo( SwUndoId nI ); + SwUndo(SwUndoId const nId); virtual ~SwUndo(); - SwUndoId GetId() const { return nId; } - virtual SwUndoId GetEffectiveId() const; - virtual void Undo( SwUndoIter& ) = 0; - virtual void Redo( SwUndoIter& ) = 0; - virtual void Repeat( SwUndoIter& ); - /** Returns textual comment for this undo object. @@ -167,20 +116,20 @@ public: // das UndoObject merkt sich, welcher Mode eingeschaltet war. // In Undo/Redo/Repeat wird dann immer auf diesen zurueck geschaltet - USHORT GetRedlineMode() const { return nOrigRedlineMode; } - void SetRedlineMode( USHORT eMode ) { nOrigRedlineMode = eMode; } + sal_uInt16 GetRedlineMode() const { return nOrigRedlineMode; } + void SetRedlineMode( sal_uInt16 eMode ) { nOrigRedlineMode = eMode; } bool IsDelBox() const; // sicher und setze die RedlineDaten - static BOOL FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData, - BOOL bDelRange = TRUE, BOOL bCopyNext = TRUE ); - static BOOL FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& ); + static sal_Bool FillSaveData( const SwPaM& rRange, SwRedlineSaveDatas& rSData, + sal_Bool bDelRange = sal_True, sal_Bool bCopyNext = sal_True ); + static sal_Bool FillSaveDataForFmt( const SwPaM& , SwRedlineSaveDatas& ); static void SetSaveData( SwDoc& rDoc, const SwRedlineSaveDatas& rSData ); - static BOOL HasHiddenRedlines( const SwRedlineSaveDatas& rSData ); + static sal_Bool HasHiddenRedlines( const SwRedlineSaveDatas& rSData ); }; -typedef USHORT DelCntntType; +typedef sal_uInt16 DelCntntType; namespace nsDelCntntType { const DelCntntType DELCNT_FTN = 0x01; @@ -212,17 +161,17 @@ protected: // MoveFrom.. verschiebt aus dem UndoNodesArray in das NodesArray void MoveToUndoNds( SwPaM& rPam, SwNodeIndex* pNodeIdx = 0, SwIndex* pCntIdx = 0, - ULONG* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); - void MoveFromUndoNds( SwDoc& rDoc, ULONG nNodeIdx, xub_StrLen nCntntIdx, + sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); + void MoveFromUndoNds( SwDoc& rDoc, sal_uLong nNodeIdx, xub_StrLen nCntntIdx, SwPosition& rInsPos, - ULONG* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); + sal_uLong* pEndNdIdx = 0, xub_StrLen * pEndCntIdx = 0 ); // diese beiden Methoden bewegen den SPoint vom Pam zurueck/vor. Damit // kann fuer ein Undo/Redo ein Bereich aufgespannt werden. (Der // SPoint liegt dann vor dem manipuliertem Bereich !!) // Das Flag gibt an, ob noch vorm SPoint Inhalt steht. - BOOL MovePtBackward( SwPaM& rPam ); - void MovePtForward( SwPaM& rPam, BOOL bMvBkwrd ); + sal_Bool MovePtBackward( SwPaM& rPam ); + void MovePtForward( SwPaM& rPam, sal_Bool bMvBkwrd ); // vor dem Move ins UndoNodes-Array muss dafuer gesorgt werden, das // die Inhaltstragenden Attribute aus dem Nodes-Array entfernt werden. @@ -239,12 +188,12 @@ class SwUndoSaveSection : private SwUndoSaveCntnt { SwNodeIndex *pMvStt; SwRedlineSaveDatas* pRedlSaveData; - ULONG nMvLen; // Index ins UndoNodes-Array - ULONG nStartPos; + sal_uLong nMvLen; // Index ins UndoNodes-Array + sal_uLong nStartPos; protected: SwNodeIndex* GetMvSttIdx() const { return pMvStt; } - ULONG GetMvNodeCnt() const { return nMvLen; } + sal_uLong GetMvNodeCnt() const { return nMvLen; } public: SwUndoSaveSection(); @@ -252,496 +201,57 @@ public: void SaveSection( SwDoc* pDoc, const SwNodeIndex& rSttIdx ); void SaveSection( SwDoc* pDoc, const SwNodeRange& rRange ); - void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, USHORT nSectType ); + void RestoreSection( SwDoc* pDoc, SwNodeIndex* pIdx, sal_uInt16 nSectType ); void RestoreSection( SwDoc* pDoc, const SwNodeIndex& rInsPos ); const SwHistory* GetHistory() const { return pHistory; } SwHistory* GetHistory() { return pHistory; } }; -// Diese Klasse speichert den Pam als USHORT's und kann diese wieder zu +// Diese Klasse speichert den Pam als sal_uInt16's und kann diese wieder zu // einem PaM zusammensetzen class SwUndRng { public: - ULONG nSttNode, nEndNode; + sal_uLong nSttNode, nEndNode; xub_StrLen nSttCntnt, nEndCntnt; SwUndRng(); SwUndRng( const SwPaM& ); void SetValues( const SwPaM& rPam ); - void SetPaM( SwPaM&, BOOL bCorrToCntnt = FALSE ) const; - void SetPaM( SwUndoIter&, BOOL bCorrToCntnt = FALSE ) const; -}; - -class SwUndoStart: public SwUndo -{ - // Um innerhalb von Undo zuerkennen, wann ein Start vorliegt, gibt - // GetId() immer die UNDO_START zurueck. Die UserId kann ueber - // GetUserId() erfragt werden. - SwUndoId nUserId; - // fuer die "Verpointerung" von Start- und End-Undos - USHORT nEndOffset; - - SwRewriter mRewriter; - -public: - SwUndoStart( SwUndoId nId ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - virtual String GetComment() const; - void SetRewriter(const SwRewriter & rRewriter); - virtual SwRewriter GetRewriter() const; - - virtual SwUndoId GetEffectiveId() const; - SwUndoId GetUserId() const { return nUserId; } - // Setzen vom End-Undo-Offset geschieht im Doc::EndUndo - USHORT GetEndOffset() const { return nEndOffset; } - void SetEndOffset( USHORT n ) { nEndOffset = n; } -}; - -class SwUndoEnd: public SwUndo -{ - // Um innerhalb von Undo zuerkennen, wann ein Ende vorliegt, gibt - // GetId() immer die UNDO_END zurueck. Die UserId kann ueber - // GetUserId() erfragt werden. - SwUndoId nUserId; - // fuer die "Verpointerung" von Start- und End-Undos - USHORT nSttOffset; - - SwRewriter mRewriter; - -public: - SwUndoEnd( SwUndoId nId ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - virtual String GetComment() const; - void SetRewriter(const SwRewriter & rRewriter); - virtual SwRewriter GetRewriter() const; - - virtual SwUndoId GetEffectiveId() const; - SwUndoId GetUserId() const { return nUserId; } - - // Setzen vom Start-Undo-Offset geschieht im Doc::EndUndo - void SetSttOffset(USHORT _nSttOffSet) { nSttOffset = _nSttOffSet; } - USHORT GetSttOffset() const { return nSttOffset; } -}; - -class SwUndoInsert: public SwUndo, private SwUndoSaveCntnt -{ - SwPosition *pPos; // Inhalt fuers Redo - String *pTxt, *pUndoTxt; - SwRedlineData* pRedlData; - ULONG nNode; - xub_StrLen nCntnt, nLen; - BOOL bIsWordDelim : 1; - BOOL bIsAppend : 1; - - const IDocumentContentOperations::InsertFlags m_nInsertFlags; - - friend class SwDoc; // eigentlich nur SwDoc::Insert( String ) - BOOL CanGrouping( sal_Unicode cIns ); - BOOL CanGrouping( const SwPosition& rPos ); - - SwDoc * pDoc; - - void Init(const SwNodeIndex & rNode); - String * GetTxtFromDoc() const; - -public: - SwUndoInsert( const SwNodeIndex& rNode, xub_StrLen nCntnt, xub_StrLen nLen, - const IDocumentContentOperations::InsertFlags nInsertFlags, - BOOL bWDelim = TRUE ); - SwUndoInsert( const SwNodeIndex& rNode ); - virtual ~SwUndoInsert(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - /** - Returns rewriter for this undo object. - - The returned rewriter has the following rule: - - $1 -> '<inserted text>' - - <inserted text> is shortened to a length of nUndoStringLength. - - @return rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - DECL_FIXEDMEMPOOL_NEWDEL(SwUndoInsert) -}; - -class SwUndoDelete: public SwUndo, private SwUndRng, private SwUndoSaveCntnt -{ - SwNodeIndex* pMvStt; // Position der Nodes im UndoNodes-Array - String *pSttStr, *pEndStr; - SwRedlineData* pRedlData; - SwRedlineSaveDatas* pRedlSaveData; - ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoStart; - ::boost::shared_ptr< ::sfx2::MetadatableUndo > m_pMetadataUndoEnd; - - String sTableName; - - ULONG nNode; - ULONG nNdDiff; // Differenz von Nodes vor-nach Delete - ULONG nSectDiff; // Diff. von Nodes vor/nach Move mit SectionNodes - ULONG nReplaceDummy; // Diff. to a temporary dummy object - USHORT nSetPos; - - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in CanGrouping() ausgwertet !! - BOOL bBackSp : 1; // TRUE: wenn Gruppierung und der Inhalt davor geloescht wird - BOOL bJoinNext: 1; // TRUE: wenn der Bereich von Oben nach unten geht - BOOL bTblDelLastNd : 1; // TRUE: TextNode hinter der Tabelle einf./loeschen - BOOL bDelFullPara : 1; // TRUE: gesamte Nodes wurden geloescht - BOOL bResetPgDesc : 1; // TRUE: am nachfolgenden Node das PgDsc zuruecksetzen - BOOL bResetPgBrk : 1; // TRUE: am nachfolgenden Node das PgBreak zuruecksetzen - BOOL bFromTableCopy : 1; // TRUE: called by SwUndoTblCpyTbl - - BOOL SaveCntnt( const SwPosition* pStt, const SwPosition* pEnd, - SwTxtNode* pSttTxtNd, SwTxtNode* pEndTxtNd ); -public: - SwUndoDelete( SwPaM&, BOOL bFullPara = FALSE, BOOL bCalledByTblCpy = FALSE ); - virtual ~SwUndoDelete(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - /** - Returns rewriter for this undo object. - - The rewriter consists of the following rule: - - $1 -> '<deleted text>' - - <deleted text> is shortened to nUndoStringLength characters. - - @return rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - BOOL CanGrouping( SwDoc*, const SwPaM& ); - - void SetTblDelLastNd() { bTblDelLastNd = TRUE; } - - // for PageDesc/PageBreak Attribute of a table - void SetPgBrkFlags( BOOL bPageBreak, BOOL bPageDesc ) - { bResetPgDesc = bPageDesc; bResetPgBrk = bPageBreak; } - - void SetTableName(const String & rName); - - // SwUndoTblCpyTbl needs this information: - long NodeDiff() const { return nSttNode - nEndNode; } - xub_StrLen ContentStart() const { return nSttCntnt; } - BOOL IsDelFullPara() const { return bDelFullPara; } - - DECL_FIXEDMEMPOOL_NEWDEL(SwUndoDelete) -}; - -class SwUndoOverwrite: public SwUndo, private SwUndoSaveCntnt -{ - String aDelStr, aInsStr; - SwRedlineSaveDatas* pRedlSaveData; - ULONG nSttNode; - xub_StrLen nSttCntnt; - BOOL bInsChar : 1; // no more OverWrite; use Insert - BOOL bGroup : 1; // TRUE: ist schon eine Gruppe; wird in - // CanGrouping() ausgwertet !! -public: - SwUndoOverwrite( SwDoc*, SwPosition&, sal_Unicode cIns ); - virtual ~SwUndoOverwrite(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - /** - Returns the rewriter of this undo object. - - The rewriter contains the following rule: - - $1 -> '<overwritten text>' - - <overwritten text> is shortened to nUndoStringLength characters. - - @return the rewriter of this undo object - */ - virtual SwRewriter GetRewriter() const; - - BOOL CanGrouping( SwDoc*, SwPosition&, sal_Unicode cIns ); -}; - -class SwUndoSplitNode: public SwUndo -{ - SwHistory* pHistory; - SwRedlineData* pRedlData; - ULONG nNode; - xub_StrLen nCntnt; - BOOL bTblFlag : 1; - BOOL bChkTblStt : 1; -public: - SwUndoSplitNode( SwDoc* pDoc, const SwPosition& rPos, BOOL bChkTbl ); - virtual ~SwUndoSplitNode(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetTblFlag() { bTblFlag = TRUE; } -}; - -class SwUndoMove : public SwUndo, private SwUndRng, private SwUndoSaveCntnt -{ - // nDest.. - Bereich, in den verschoben wurde (nach dem Move!) - // nIns.. - Position, von der verschoben wurde und wieder die neue InsPos. ist - // nMv.. Position auf die verschoben wird (vor dem Move!) ; fuers REDO - ULONG nDestSttNode, nDestEndNode, nInsPosNode, nMvDestNode; - xub_StrLen nDestSttCntnt, nDestEndCntnt, nInsPosCntnt, nMvDestCntnt; - - USHORT nFtnStt; // StartPos der Fussnoten in der History - - BOOL bJoinNext : 1, - bJoinPrev : 1, - bMoveRange : 1; - - bool bMoveRedlines; // use DOC_MOVEREDLINES when calling SwDoc::Move - - void DelFtn( const SwPaM& ); -public: - SwUndoMove( const SwPaM&, const SwPosition& ); - SwUndoMove( SwDoc* pDoc, const SwNodeRange&, const SwNodeIndex& ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - // setze den Destination-Bereich nach dem Verschieben. - void SetDestRange( const SwPaM&, const SwPosition&, BOOL, BOOL ); - void SetDestRange( const SwNodeIndex& rStt, const SwNodeIndex& rEnd, - const SwNodeIndex& rInsPos ); - - BOOL IsMoveRange() const { return bMoveRange; } - ULONG GetEndNode() const { return nEndNode; } - ULONG GetDestSttNode() const { return nDestSttNode; } - xub_StrLen GetDestSttCntnt() const { return nDestSttCntnt; } - - void SetMoveRedlines( bool b ) { bMoveRedlines = b; } - -}; - -class SwUndoAttr : public SwUndo, private SwUndRng -{ - SfxItemSet m_AttrSet; // attributes for Redo - const ::std::auto_ptr<SwHistory> m_pHistory; // History for Undo - ::std::auto_ptr<SwRedlineData> m_pRedlineData; // Redlining - ::std::auto_ptr<SwRedlineSaveDatas> m_pRedlineSaveData; - ULONG m_nNodeIndex; // Offset: for Redlining - const SetAttrMode m_nInsertFlags; // insert flags - - void RemoveIdx( SwDoc& rDoc ); - -public: - SwUndoAttr( const SwPaM&, const SfxItemSet &, const SetAttrMode nFlags ); - SwUndoAttr( const SwPaM&, const SfxPoolItem&, const SetAttrMode nFlags ); - virtual ~SwUndoAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SaveRedlineData( const SwPaM& rPam, BOOL bInsCntnt ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -class SwUndoResetAttr : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - SvUShortsSort m_Ids; - const USHORT m_nFormatId; // Format-Id for Redo - -public: - SwUndoResetAttr( const SwPaM&, USHORT nFmtId ); - SwUndoResetAttr( const SwPosition&, USHORT nFmtId ); - virtual ~SwUndoResetAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetAttrs( const SvUShortsSort& rArr ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -class SwUndoFmtAttr : public SwUndo -{ - friend class SwUndoDefaultAttr; - SwFmt * m_pFmt; - ::std::auto_ptr<SfxItemSet> m_pOldSet; // old attributes - ULONG m_nNodeIndex; - const USHORT m_nFmtWhich; - const bool m_bSaveDrawPt; - - bool IsFmtInDoc( SwDoc* ); //is the attribute format still in the Doc? - void SaveFlyAnchor( bool bSaveDrawPt = false ); - // Return value indicates, if anchor attribute is restored. - // Notes: - If anchor attribute is restored, all other existing attributes - // are also restored. - // - Anchor attribute isn't restored successfully, if it contains - // an invalid anchor position and all other existing attributes - // aren't restored. - // This situation occurs for undo of styles. - bool RestoreFlyAnchor( SwUndoIter& rIter ); - - void Init(); - -public: - // register at the Format and save old attributes - SwUndoFmtAttr( const SfxItemSet& rOldSet, - SwFmt& rFmt, - bool bSaveDrawPt = true ); - SwUndoFmtAttr( const SfxPoolItem& rItem, - SwFmt& rFmt, - bool bSaveDrawPt = true ); - virtual ~SwUndoFmtAttr(); - virtual void Undo( SwUndoIter& ); - - virtual void Redo( SwUndoIter& ); - - virtual void Repeat( SwUndoIter& ); - virtual SwRewriter GetRewriter() const; - - void PutAttr( const SfxPoolItem& rItem ); - SwFmt* GetFmt( SwDoc& rDoc ); // checks if it is still in the Doc! -}; - -class SwUndoFmtResetAttr : public SwUndo -{ - public: - SwUndoFmtResetAttr( SwFmt& rChangedFormat, - const USHORT nWhichId ); - ~SwUndoFmtResetAttr(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - private: - // format at which a certain attribute is reset. - SwFmt * const m_pChangedFormat; - // which ID of the reset attribute - const USHORT m_nWhichId; - // old attribute which has been reset - needed for undo. - ::std::auto_ptr<SfxPoolItem> m_pOldItem; -}; - -class SwUndoDontExpandFmt : public SwUndo -{ - const ULONG m_nNodeIndex; - const xub_StrLen m_nContentIndex; - -public: - SwUndoDontExpandFmt( const SwPosition& rPos ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); + void SetPaM( SwPaM&, sal_Bool bCorrToCntnt = sal_False ) const; + SwPaM & AddUndoRedoPaM( + ::sw::UndoRedoContext &, bool const bCorrToCntnt = false) const; }; -// helper class to receive changed attribute sets -class SwUndoFmtAttrHelper : public SwClient -{ - ::std::auto_ptr<SwUndoFmtAttr> m_pUndo; - const bool m_bSaveDrawPt; - -public: - SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); - - SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } - // release the undo object (so it is not deleted here), and return it - SwUndoFmtAttr* ReleaseUndo() { return m_pUndo.release(); } -}; - -class SwUndoFmtColl : public SwUndo, private SwUndRng -{ - String aFmtName; - SwHistory* pHistory; - SwFmtColl* pFmtColl; - // boolean, which indicates that the attributes are reseted at the nodes - // before the format has been applied. - const bool mbReset; - // boolean, which indicates that the list attributes had been reseted at - // the nodes before the format has been applied. - const bool mbResetListAttrs; -public: - - SwUndoFmtColl( const SwPaM&, SwFmtColl*, - const bool bReset, - const bool bResetListAttrs ); - virtual ~SwUndoFmtColl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - /** - Returns the rewriter for this undo object. - The rewriter contains one rule: +class SwUndoInsLayFmt; - $1 -> <name of format collection> - - <name of format collection> is the name of the format - collection that is applied by the action recorded by this undo - object. - - @return the rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; - - SwHistory* GetHistory() { return pHistory; } - -}; - -class SwUndoMoveLeftMargin : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - const bool m_bModulus; - -public: - SwUndoMoveLeftMargin( const SwPaM&, BOOL bRight, BOOL bModulus ); - virtual ~SwUndoMoveLeftMargin(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - SwHistory& GetHistory() { return *m_pHistory; } - -}; - -// Basis-Klasse fuer Insert von Dokument, Glossaries und Kopieren +// base class for insertion of Document, Glossaries and Copy class SwUndoInserts : public SwUndo, public SwUndRng, private SwUndoSaveCntnt { SwTxtFmtColl *pTxtFmtColl, *pLastNdColl; SvPtrarr* pFrmFmts; - SwUndos* pFlyUndos; + ::std::vector< ::boost::shared_ptr<SwUndoInsLayFmt> > m_FlyUndos; SwRedlineData* pRedlData; - BOOL bSttWasTxtNd; + sal_Bool bSttWasTxtNd; protected: - ULONG nNdDiff; + sal_uLong nNdDiff; SwPosition *pPos; // Inhalt fuers Redo - USHORT nSetPos; // Start in der History-Liste + sal_uInt16 nSetPos; // Start in der History-Liste SwUndoInserts( SwUndoId nUndoId, const SwPaM& ); public: virtual ~SwUndoInserts(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); + virtual void UndoImpl( ::sw::UndoRedoContext & ); + virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ); + // setze den Destination-Bereich nach dem Einlesen. - void SetInsertRange( const SwPaM&, BOOL bScanFlys = TRUE, - BOOL bSttWasTxtNd = TRUE ); + void SetInsertRange( const SwPaM&, sal_Bool bScanFlys = sal_True, + sal_Bool bSttWasTxtNd = sal_True ); }; class SwUndoInsDoc : public SwUndoInserts @@ -756,416 +266,42 @@ public: SwUndoCpyDoc( const SwPaM& ); }; -class SwUndoInsTbl : public SwUndo -{ - String sTblNm; - SwInsertTableOptions aInsTblOpts; - SwDDEFieldType* pDDEFldType; - SvUShorts* pColWidth; - SwRedlineData* pRedlData; - SwTableAutoFmt* pAutoFmt; - ULONG nSttNode; - USHORT nRows, nCols; - USHORT nAdjust; - -public: - SwUndoInsTbl( const SwPosition&, USHORT nCols, USHORT nRows, - USHORT eAdjust, const SwInsertTableOptions& rInsTblOpts, - const SwTableAutoFmt* pTAFmt, const SvUShorts* pColArr, - const String & rName); - virtual ~SwUndoInsTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - virtual SwRewriter GetRewriter() const; - -}; - -class SwUndoTxtToTbl : public SwUndo, public SwUndRng -{ - String sTblNm; - SwInsertTableOptions aInsTblOpts; - SvULongs* pDelBoxes; - SwTableAutoFmt* pAutoFmt; - SwHistory* pHistory; - sal_Unicode cTrenner; - USHORT nAdjust; - BOOL bSplitEnd : 1; - -public: - SwUndoTxtToTbl( const SwPaM&, const SwInsertTableOptions&, sal_Unicode , USHORT, - const SwTableAutoFmt* pAFmt ); - virtual ~SwUndoTxtToTbl(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - SwHistory& GetHistory(); // wird ggfs. angelegt - void AddFillBox( const SwTableBox& rBox ); -}; - -class SwUndoTblToTxt : public SwUndo -{ - String sTblNm; - SwDDEFieldType* pDDEFldType; - _SaveTable* pTblSave; - SwTblToTxtSaves* pBoxSaves; - SwHistory* pHistory; - ULONG nSttNd, nEndNd; - USHORT nAdjust; - sal_Unicode cTrenner; - USHORT nHdlnRpt; - BOOL bCheckNumFmt : 1; - -public: - SwUndoTblToTxt( const SwTable& rTbl, sal_Unicode cCh ); - virtual ~SwUndoTblToTxt(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void SetRange( const SwNodeRange& ); - void AddBoxPos( SwDoc& rDoc, ULONG nNdIdx, ULONG nEndIdx, - xub_StrLen nCntntIdx = STRING_MAXLEN); -}; - -class SwUndoAttrTbl : public SwUndo -{ - ULONG nSttNode; - _SaveTable* pSaveTbl; - BOOL bClearTabCol : 1; -public: - SwUndoAttrTbl( const SwTableNode& rTblNd, BOOL bClearTabCols = FALSE ); - virtual ~SwUndoAttrTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -class SwUndoTblAutoFmt : public SwUndo -{ - ULONG nSttNode; - _SaveTable* pSaveTbl; - SwUndos* pUndos; - BOOL bSaveCntntAttr; - - void UndoRedo( BOOL bUndo, SwUndoIter& rUndoIter ); - -public: - SwUndoTblAutoFmt( const SwTableNode& rTblNd, const SwTableAutoFmt& ); - virtual ~SwUndoTblAutoFmt(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - void SaveBoxCntnt( const SwTableBox& rBox ); -}; - -class SwUndoTblNdsChg : public SwUndo -{ - _SaveTable* pSaveTbl; - SvULongs aBoxes; - - union { - SvULongs* pNewSttNds; - SwUndoSaveSections* pDelSects; - } Ptrs; - std::vector<bool> aMvBoxes; // fuers SplitRow (aufgeteilte Nodes einer Box) - long nMin, nMax; // for redo of delete column - ULONG nSttNode, nCurrBox; - USHORT nCount, nRelDiff, nAbsDiff, nSetColType; - BOOL bFlag; - BOOL bSameHeight; // only used for SplitRow -public: - SwUndoTblNdsChg( SwUndoId UndoId, - const SwSelBoxes& rBoxes, - const SwTableNode& rTblNd, - long nMn, long nMx, - USHORT nCnt, BOOL bFlg, BOOL bSameHeight ); - - // fuer SetColWidth - SwUndoTblNdsChg( SwUndoId UndoId, const SwSelBoxes& rBoxes, - const SwTableNode& rTblNd ); - - virtual ~SwUndoTblNdsChg(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld ); - void SaveNewBoxes( const SwTableNode& rTblNd, const SwTableSortBoxes& rOld, - const SwSelBoxes& rBoxes, const SvULongs& rNodeCnts ); - void SaveSection( SwStartNode* pSttNd ); - void ReNewBoxes( const SwSelBoxes& rBoxes ); - - void SetColWidthParam( ULONG nBoxIdx, USHORT nMode, USHORT nType, - SwTwips nAbsDif, SwTwips nRelDif ) - { - nCurrBox = nBoxIdx; - nCount = nMode; - nSetColType = nType; - nAbsDiff = (USHORT)nAbsDif; - nRelDiff = (USHORT)nRelDif; - } - -}; - -class SwUndoTblMerge : public SwUndo, private SwUndRng -{ - ULONG nTblNode; - _SaveTable* pSaveTbl; - SvULongs aBoxes, aNewSttNds; - SwUndoMoves* pMoves; - SwHistory* pHistory; - -public: - SwUndoTblMerge( const SwPaM& rTblSel ); - virtual ~SwUndoTblMerge(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void MoveBoxCntnt( SwDoc* pDoc, SwNodeRange& rRg, SwNodeIndex& rPos ); - - void SetSelBoxes( const SwSelBoxes& rBoxes ); - - void AddNewBox( ULONG nSttNdIdx ) - { aNewSttNds.Insert( nSttNdIdx, aNewSttNds.Count() ); } - - void SaveCollection( const SwTableBox& rBox ); - -}; - -class SwUndoTblNumFmt : public SwUndo -{ - SfxItemSet *pBoxSet; - SwHistory* pHistory; - String aStr, aNewFml; - - ULONG nFmtIdx, nNewFmtIdx; - double fNum, fNewNum; - ULONG nNode; - ULONG nNdPos; - - BOOL bNewFmt : 1; - BOOL bNewFml : 1; - BOOL bNewValue : 1; - -public: - SwUndoTblNumFmt( const SwTableBox& rBox, const SfxItemSet* pNewSet = 0 ); - virtual ~SwUndoTblNumFmt(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void SetNumFmt( ULONG nNewNumFmtIdx, const double& rNewNumber ) - { nFmtIdx = nNewNumFmtIdx; fNum = rNewNumber; } - void SetBox( const SwTableBox& rBox ); -}; - -class _UndoTblCpyTbl_Entries; - -class SwUndoTblCpyTbl : public SwUndo -{ - _UndoTblCpyTbl_Entries* pArr; - SwUndoTblNdsChg* pInsRowUndo; - - //b6341295: When redlining is active, PrepareRedline has to create the redlining attributes - //for the new and the old table cell content - SwUndo* PrepareRedline( SwDoc* pDoc, const SwTableBox& rBox, const SwPosition& rPos, - bool& rJoin, bool bRedo ); -public: - SwUndoTblCpyTbl(); - virtual ~SwUndoTblCpyTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddBoxBefore( const SwTableBox& rBox, BOOL bDelCntnt ); - void AddBoxAfter( const SwTableBox& rBox, const SwNodeIndex& rIdx, BOOL bDelCntnt ); - - BOOL IsEmpty() const; - BOOL InsertRow( SwTable& rTbl, const SwSelBoxes& rBoxes, USHORT nCnt ); -}; - -class SwUndoCpyTbl : public SwUndo -{ - SwUndoDelete* pDel; - ULONG nTblNode; -public: - SwUndoCpyTbl(); - virtual ~SwUndoCpyTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void SetTableSttIdx( ULONG nIdx ) { nTblNode = nIdx; } -}; - -class SwUndoSplitTbl : public SwUndo -{ - ULONG nTblNode, nOffset; - SwSaveRowSpan* mpSaveRowSpan; // stores the row span values at the splitting row - _SaveTable* pSavTbl; - SwHistory* pHistory; - USHORT nMode, nFmlEnd; - BOOL bCalcNewSize; -public: - SwUndoSplitTbl( const SwTableNode& rTblNd, SwSaveRowSpan* pRowSp, USHORT nMode, BOOL bCalcNewSize ); - virtual ~SwUndoSplitTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void SetTblNodeOffset( ULONG nIdx ) { nOffset = nIdx - nTblNode; } - SwHistory* GetHistory() { return pHistory; } - void SaveFormula( SwHistory& rHistory ); -}; - -class SwUndoMergeTbl : public SwUndo -{ - String aName; - ULONG nTblNode; - _SaveTable* pSavTbl, *pSavHdl; - SwHistory* pHistory; - USHORT nMode; - BOOL bWithPrev; -public: - SwUndoMergeTbl( const SwTableNode& rTblNd, const SwTableNode& rDelTblNd, - BOOL bWithPrev, USHORT nMode ); - virtual ~SwUndoMergeTbl(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void SaveFormula( SwHistory& rHistory ); -}; - -class SwUndoBookmark : public SwUndo -{ - const ::std::auto_ptr<SwHistoryBookmark> m_pHistoryBookmark; - -protected: - SwUndoBookmark( SwUndoId nUndoId, const ::sw::mark::IMark& ); - - void SetInDoc( SwDoc* ); - void ResetInDoc( SwDoc* ); - -public: - virtual ~SwUndoBookmark(); - - /** - Returns the rewriter for this undo object. - - The rewriter contains the following rule: - - $1 -> <name of bookmark> - - <name of bookmark> is the name of the bookmark whose - insertion/deletion is recorded by this undo object. - - @return the rewriter for this undo object - */ - virtual SwRewriter GetRewriter() const; -}; - -class SwUndoInsBookmark : public SwUndoBookmark -{ -public: - SwUndoInsBookmark( const ::sw::mark::IMark& ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -/*-------------------------------------------------------------------- - Beschreibung: Undo auf Sorting - --------------------------------------------------------------------*/ - -struct SwSortUndoElement -{ - union { - struct { - ULONG nKenn; - ULONG nSource, nTarget; - } TXT; - struct { - String *pSource, *pTarget; - } TBL; - } SORT_TXT_TBL; - - SwSortUndoElement( const String& aS, const String& aT ) - { - SORT_TXT_TBL.TBL.pSource = new String( aS ); - SORT_TXT_TBL.TBL.pTarget = new String( aT ); - } - SwSortUndoElement( ULONG nS, ULONG nT ) - { - SORT_TXT_TBL.TXT.nSource = nS; - SORT_TXT_TBL.TXT.nTarget = nT; - SORT_TXT_TBL.TXT.nKenn = 0xffffffff; - } - ~SwSortUndoElement(); -}; - -SV_DECL_PTRARR_DEL(SwSortList, SwSortUndoElement*, 10,30) -SV_DECL_PTRARR(SwUndoSortList, SwNodeIndex*, 10,30) - -class SwUndoSort : public SwUndo, private SwUndRng -{ - SwSortOptions* pSortOpt; // die Optionen mit den Sortier-Kriterien - SwSortList aSortList; - SwUndoAttrTbl* pUndoTblAttr; - SwRedlineData* pRedlData; - ULONG nTblNd; - - void RemoveIdx( SwPaM& rPam ); -public: - SwUndoSort( const SwPaM&, const SwSortOptions& ); - SwUndoSort( ULONG nStt, ULONG nEnd, const SwTableNode&, - const SwSortOptions&, BOOL bSaveTable ); - virtual ~SwUndoSort(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void Insert( const String& rOrgPos, const String& rNewPos ); - void Insert( ULONG nOrgPos, ULONG nNewPos ); - -}; - //-------------------------------------------------------------------- class SwUndoFlyBase : public SwUndo, private SwUndoSaveSection { protected: SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat - ULONG nNdPgPos; + sal_uLong nNdPgPos; xub_StrLen nCntPos; // Seite/am Absatz/im Absatz - USHORT nRndId; - BOOL bDelFmt; // loesche das gespeicherte Format + sal_uInt16 nRndId; + sal_Bool bDelFmt; // loesche das gespeicherte Format - void InsFly( SwUndoIter&, BOOL bShowSel = TRUE ); + void InsFly(::sw::UndoRedoContext & rContext, bool bShowSel = true); void DelFly( SwDoc* ); SwUndoFlyBase( SwFrmFmt* pFormat, SwUndoId nUndoId ); SwNodeIndex* GetMvSttIdx() const { return SwUndoSaveSection::GetMvSttIdx(); } - ULONG GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } + sal_uLong GetMvNodeCnt() const { return SwUndoSaveSection::GetMvNodeCnt(); } public: virtual ~SwUndoFlyBase(); - virtual void Undo( SwUndoIter& ) = 0; - virtual void Redo( SwUndoIter& ) = 0; - }; class SwUndoInsLayFmt : public SwUndoFlyBase { - ULONG mnCrsrSaveIndexPara; // Cursor position + sal_uLong mnCrsrSaveIndexPara; // Cursor position xub_StrLen mnCrsrSaveIndexPos; // for undo public: - SwUndoInsLayFmt( SwFrmFmt* pFormat, ULONG nNodeIdx, xub_StrLen nCntIdx ); - ~SwUndoInsLayFmt(); + SwUndoInsLayFmt( SwFrmFmt* pFormat, sal_uLong nNodeIdx, xub_StrLen nCntIdx ); + + virtual ~SwUndoInsLayFmt(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); + virtual void UndoImpl( ::sw::UndoRedoContext & ); + virtual void RedoImpl( ::sw::UndoRedoContext & ); + virtual void RepeatImpl( ::sw::RepeatContext & ); String GetComment() const; @@ -1173,688 +309,21 @@ public: class SwUndoDelLayFmt : public SwUndoFlyBase { - BOOL bShowSelFrm; + sal_Bool bShowSelFrm; public: SwUndoDelLayFmt( SwFrmFmt* pFormat ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - void Redo(); // Schnittstelle fuers Rollback - - void ChgShowSel( BOOL bNew ) { bShowSelFrm = bNew; } - - virtual SwRewriter GetRewriter() const; - -}; - -class SwUndoSetFlyFmt : public SwUndo, public SwClient -{ - SwFrmFmt* pFrmFmt; // das gespeicherte FlyFormat - SwFrmFmt* pOldFmt; // die alte Fly Vorlage - SwFrmFmt* pNewFmt; // die neue Fly Vorlage - SfxItemSet* pItemSet; // die zurueck-/ gesetzten Attribute - ULONG nOldNode, nNewNode; - xub_StrLen nOldCntnt, nNewCntnt; - USHORT nOldAnchorTyp, nNewAnchorTyp; - BOOL bAnchorChgd; - - void PutAttr( USHORT nWhich, const SfxPoolItem* pItem ); - void Modify( SfxPoolItem*, SfxPoolItem* ); - void GetAnchor( SwFmtAnchor& rAnhor, ULONG nNode, xub_StrLen nCntnt ); - -public: - SwUndoSetFlyFmt( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFrmFmt ); - virtual ~SwUndoSetFlyFmt(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - virtual SwRewriter GetRewriter() const; -}; - -//-------------------------------------------------------------------- - -class _UnReplaceData; -SV_DECL_PTRARR_DEL( _UnReplaceDatas, _UnReplaceData*, 10, 25 ) - -class SwUndoReplace : public SwUndo -{ - friend class SwDoc; - - BOOL bOldIterFlag; // Status vom Undo-Iter vorm 1. Aufruf - USHORT nAktPos; // fuer GetUndoRange und Undo/Redo - _UnReplaceDatas aArr; - SwRedlineData* pRedlData; - -public: - SwUndoReplace(); - virtual ~SwUndoReplace(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - /** - Returns the rewriter of this undo object. - - If this undo object represents several replacements the - rewriter contains the following rules: - - $1 -> <number of replacements> - $2 -> occurrences of - $3 -> <replaced text> - - If this undo object represents one replacement the rewriter - contains these rules: - - $1 -> <replaced text> - $2 -> "->" (STR_YIELDS) - $3 -> <replacing text> - - @return the rewriter of this undo object - */ - virtual SwRewriter GetRewriter() const; - - void AddEntry( const SwPaM& rPam, const String& rInsert, BOOL bRegExp ); - void SetEntryEnd( const SwPaM& rPam ); - - BOOL IsFull() const - { return ((USHRT_MAX / sizeof( void* )) - 50 ) < aArr.Count(); } - -}; - -//-------------------------------------------------------------------- - -class SwUndoTblHeadline : public SwUndo -{ - ULONG nTblNd; - USHORT nOldHeadline; - USHORT nNewHeadline; -public: - SwUndoTblHeadline( const SwTable&, USHORT nOldHdl, USHORT nNewHdl ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -//------------ Undo of Insert-/Delete-Sections ---------------------- - -class SwUndoInsSection : public SwUndo, private SwUndRng -{ -private: - const ::std::auto_ptr<SwSectionData> m_pSectionData; - const ::std::auto_ptr<SwTOXBase> m_pTOXBase; /// set iff section is TOX - const ::std::auto_ptr<SfxItemSet> m_pAttrSet; - ::std::auto_ptr<SwHistory> m_pHistory; - ::std::auto_ptr<SwRedlineData> m_pRedlData; - ULONG m_nSectionNodePos; - bool m_bSplitAtStart : 1; - bool m_bSplitAtEnd : 1; - bool m_bUpdateFtn : 1; - - void Join( SwDoc& rDoc, ULONG nNode ); - -public: - SwUndoInsSection(SwPaM const&, SwSectionData const&, - SfxItemSet const*const pSet, SwTOXBase const*const pTOXBase); - virtual ~SwUndoInsSection(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void SetSectNdPos(ULONG const nPos) { m_nSectionNodePos = nPos; } - void SaveSplitNode(SwTxtNode *const pTxtNd, bool const bAtStart); - void SetUpdtFtnFlag(bool const bFlag) { m_bUpdateFtn = bFlag; } -}; - -SW_DLLPRIVATE SwUndo * MakeUndoDelSection(SwSectionFmt const&); - -SW_DLLPRIVATE SwUndo * MakeUndoUpdateSection(SwSectionFmt const&, bool const); - -//------------ Undo von verschieben/stufen von Gliederung ---------------- - -class SwUndoOutlineLeftRight : public SwUndo, private SwUndRng -{ - short nOffset; -public: - SwUndoOutlineLeftRight( const SwPaM& rPam, short nOffset ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoDefaultAttr : public SwUndo -{ - ::std::auto_ptr<SfxItemSet> m_pOldSet; // the old attributes - ::std::auto_ptr<SvxTabStopItem> m_pTabStop; - -public: - // registers at the format and saves old attributes - SwUndoDefaultAttr( const SfxItemSet& rOldSet ); - virtual ~SwUndoDefaultAttr(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- -// ---------- Undo for Numbering ---------------------------------- - -class SwUndoInsNum : public SwUndo, private SwUndRng -{ - SwNumRule aNumRule; - SwHistory* pHistory; - ULONG nSttSet; - SwNumRule* pOldNumRule; - String sReplaceRule; - USHORT nLRSavePos; -public: - SwUndoInsNum( const SwPaM& rPam, const SwNumRule& rRule ); - SwUndoInsNum( const SwNumRule& rOldRule, const SwNumRule& rNewRule, - SwUndoId nUndoId = UNDO_INSFMTATTR ); - SwUndoInsNum( const SwPosition& rPos, const SwNumRule& rRule, - const String& rReplaceRule ); - virtual ~SwUndoInsNum(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - virtual SwRewriter GetRewriter() const; - - SwHistory* GetHistory(); // wird ggfs. neu angelegt! - void SetSttNum( ULONG nNdIdx ) { nSttSet = nNdIdx; } - void SaveOldNumRule( const SwNumRule& rOld ); - - void SetLRSpaceEndPos(); - -}; - -class SwUndoDelNum : public SwUndo, private SwUndRng -{ - struct NodeLevel - { - ULONG index; - int level; - inline NodeLevel(ULONG idx, int lvl) : index(idx), level(lvl) {}; - }; - std::vector<NodeLevel> aNodes; - SwHistory* pHistory; -public: - SwUndoDelNum( const SwPaM& rPam ); - virtual ~SwUndoDelNum(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - void AddNode( const SwTxtNode& rNd, BOOL bResetLRSpace ); - SwHistory* GetHistory() { return pHistory; } - -}; - -class SwUndoMoveNum : public SwUndo, private SwUndRng -{ - ULONG nNewStt; - long nOffset; -public: - SwUndoMoveNum( const SwPaM& rPam, long nOffset, BOOL bIsOutlMv = FALSE ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - void SetStartNode( ULONG nValue ) { nNewStt = nValue; } -}; - -class SwUndoNumUpDown : public SwUndo, private SwUndRng -{ - short nOffset; -public: - SwUndoNumUpDown( const SwPaM& rPam, short nOffset ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoNumOrNoNum : public SwUndo -{ - ULONG nIdx; - BOOL mbNewNum, mbOldNum; - -public: - SwUndoNumOrNoNum( const SwNodeIndex& rIdx, BOOL mbOldNum, - BOOL mbNewNum ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoNumRuleStart : public SwUndo -{ - ULONG nIdx; - USHORT nOldStt, nNewStt; - BOOL bSetSttValue : 1; - BOOL bFlag : 1; -public: - SwUndoNumRuleStart( const SwPosition& rPos, BOOL bDelete ); - SwUndoNumRuleStart( const SwPosition& rPos, USHORT nStt ); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- -// ---------- Undo for DrawObjecte ---------------------------------- - -class SwSdrUndo : public SwUndo -{ - SdrUndoAction* pSdrUndo; - SdrMarkList* pMarkList; // MarkList for all selected SdrObjects -public: - SwSdrUndo( SdrUndoAction* , const SdrMarkList* pMarkList ); - virtual ~SwSdrUndo(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - String GetComment() const; -}; - -class SwUndoDrawGroup : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawGroup( USHORT nCnt ); - virtual ~SwUndoDrawGroup(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt*, SdrObject* ); - void SetGroupFmt( SwDrawFrmFmt* ); -}; - -// Action "ungroup drawing object" is now splitted into three parts - see -// method <SwDoc::UnGroupSelection(..)>: -// - creation for <SwDrawFrmFmt> instances for the group members of the -// selected group objects -// - intrinsic ungroup of the selected group objects -// - creation of <SwDrawContact> instances for the former group members and -// connection to the Writer layout. -// Thus, two undo actions (instances of <SwUndo>) are needed: -// - Existing class <SwUndoDrawUnGroup> takes over the part for the formats. -// - New class <SwUndoDrawUnGroupConnectToLayout> takes over the part for -// contact object. -class SwUndoDrawUnGroup : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawUnGroup( SdrObjGroup* ); - virtual ~SwUndoDrawUnGroup(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt* ); -}; - -class SwUndoDrawUnGroupConnectToLayout : public SwUndo -{ - private: - std::vector< std::pair< SwDrawFrmFmt*, SdrObject* > > aDrawFmtsAndObjs; - - public: - SwUndoDrawUnGroupConnectToLayout(); - virtual ~SwUndoDrawUnGroupConnectToLayout(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddFmtAndObj( SwDrawFrmFmt* pDrawFrmFmt, - SdrObject* pDrawObject ); -}; - -class SwUndoDrawDelete : public SwUndo -{ - SwUndoGroupObjImpl* pObjArr; - SdrMarkList* pMarkLst; // MarkList for all selected SdrObjects - USHORT nSize; - BOOL bDelFmt; - -public: - SwUndoDrawDelete( USHORT nCnt ); - virtual ~SwUndoDrawDelete(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - void AddObj( USHORT nPos, SwDrawFrmFmt*, const SdrMark& ); -}; + virtual void UndoImpl( ::sw::UndoRedoContext & ); + virtual void RedoImpl( ::sw::UndoRedoContext & ); -//-------------------------------------------------------------------- - -class SwUndoReRead : public SwUndo -{ - Graphic *pGrf; - String *pNm, *pFltr; - ULONG nPos; - USHORT nMirr; - - void SaveGraphicData( const SwGrfNode& ); - void SetAndSave( SwUndoIter& ); - -public: - SwUndoReRead( const SwPaM& rPam, const SwGrfNode& pGrfNd ); - virtual ~SwUndoReRead(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoInsertLabel : public SwUndo -{ - union { - struct { - // for NoTxtFrms - SwUndoInsLayFmt* pUndoFly; - SwUndoFmtAttr* pUndoAttr; - } OBJECT; - struct { - // for Tables/TextBoxes - SwUndoDelete* pUndoInsNd; - ULONG nNode; - } NODE; - }; - - String sText; - String sSeparator; - String sNumberSeparator; - String sCharacterStyle; - USHORT nFldId; - SwLabelType eType; - BYTE nLayerId; // fuer Zeichen-Objekte - BOOL bBefore :1; - BOOL bUndoKeep :1; - BOOL bCpyBrd :1; - -public: - SwUndoInsertLabel( const SwLabelType eTyp, const String &rText, - const String& rSeparator, - const String& rNumberSeparator, - const BOOL bBefore, const USHORT nId, - const String& rCharacterStyle, - const BOOL bCpyBrd ); - virtual ~SwUndoInsertLabel(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - /** - Returns the rewriter of this undo object. + void RedoForRollback(); - The rewriter contains this rule: + void ChgShowSel( sal_Bool bNew ) { bShowSelFrm = bNew; } - $1 -> '<text of inserted label>' - - <text of inserted label> is shortened to nUndoStringLength - characters. - - @return the rewriter of this undo object - */ virtual SwRewriter GetRewriter() const; - void SetNodePos( ULONG nNd ) - { if( LTYPE_OBJECT != eType ) NODE.nNode = nNd; } - - void SetUndoKeep() { bUndoKeep = TRUE; } - void SetFlys( SwFrmFmt& rOldFly, SfxItemSet& rChgSet, SwFrmFmt& rNewFly ); - void SetDrawObj( BYTE nLayerId ); -}; - -//-------------------------------------------------------------------- - -class SwUndoChangeFootNote : public SwUndo, private SwUndRng -{ - const ::std::auto_ptr<SwHistory> m_pHistory; - const String m_Text; - const USHORT m_nNumber; - const bool m_bEndNote; - -public: - SwUndoChangeFootNote( const SwPaM& rRange, const String& rTxt, - USHORT nNum, bool bIsEndNote ); - virtual ~SwUndoChangeFootNote(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - virtual void Repeat( SwUndoIter& ); - - SwHistory& GetHistory() { return *m_pHistory; } -}; - -class SwUndoFootNoteInfo : public SwUndo -{ - ::std::auto_ptr<SwFtnInfo> m_pFootNoteInfo; - -public: - SwUndoFootNoteInfo( const SwFtnInfo &rInfo ); - virtual ~SwUndoFootNoteInfo(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -class SwUndoEndNoteInfo : public SwUndo -{ - ::std::auto_ptr<SwEndNoteInfo> m_pEndNoteInfo; - -public: - SwUndoEndNoteInfo( const SwEndNoteInfo &rInfo ); - virtual ~SwUndoEndNoteInfo(); - - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); }; -//-------------------------------------------------------------------- - -struct _UndoTransliterate_Data; -class SwUndoTransliterate : public SwUndo, public SwUndRng -{ - std::vector< _UndoTransliterate_Data * > aChanges; - sal_uInt32 nType; - -public: - SwUndoTransliterate( const SwPaM& rPam, - const utl::TransliterationWrapper& rTrans ); - virtual ~SwUndoTransliterate(); - - virtual void Undo( SwUndoIter& rUndoIter ); - virtual void Redo( SwUndoIter& rUndoIter ); - virtual void Repeat( SwUndoIter& rUndoIter ); - - void AddChanges( SwTxtNode& rTNd, xub_StrLen nStart, xub_StrLen nLen, - ::com::sun::star::uno::Sequence <sal_Int32>& rOffsets ); - BOOL HasData() const { return aChanges.size() > 0; } -}; - -//-------------------------------------------------------------------- - -class SwUndoRedline : public SwUndo, public SwUndRng -{ -protected: - SwRedlineData* pRedlData; - SwRedlineSaveDatas* pRedlSaveData; - SwUndoId nUserId; - BOOL bHiddenRedlines; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedline( SwUndoId nUserId, const SwPaM& rRange ); - virtual ~SwUndoRedline(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); - - SwUndoId GetUserId() const { return nUserId; } - USHORT GetRedlSaveCount() const - { return pRedlSaveData ? pRedlSaveData->Count() : 0; } -}; - -class SwUndoRedlineDelete : public SwUndoRedline -{ - BOOL bCanGroup : 1; - BOOL bIsDelim : 1; - BOOL bIsBackspace : 1; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedlineDelete( const SwPaM& rRange, SwUndoId nUserId = UNDO_EMPTY ); - - BOOL CanGrouping( const SwUndoRedlineDelete& rPrev ); -}; - -class SwUndoRedlineSort : public SwUndoRedline -{ - SwSortOptions* pOpt; - ULONG nSaveEndNode, nOffset; - xub_StrLen nSaveEndCntnt; - - virtual void _Undo( SwUndoIter& ); - virtual void _Redo( SwUndoIter& ); - -public: - SwUndoRedlineSort( const SwPaM& rRange, const SwSortOptions& rOpt ); - virtual ~SwUndoRedlineSort(); - virtual void Repeat( SwUndoIter& ); - - void SetSaveRange( const SwPaM& rRange ); - void SetOffset( const SwNodeIndex& rIdx ); -}; - -class SwUndoAcceptRedline : public SwUndoRedline -{ - virtual void _Redo( SwUndoIter& ); -public: - SwUndoAcceptRedline( const SwPaM& rRange ); - virtual void Repeat( SwUndoIter& ); -}; - -class SwUndoRejectRedline : public SwUndoRedline -{ - virtual void _Redo( SwUndoIter& ); -public: - SwUndoRejectRedline( const SwPaM& rRange ); - virtual void Repeat( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -class SwUndoCompDoc : public SwUndo, public SwUndRng -{ - SwRedlineData* pRedlData; - SwUndoDelete* pUnDel, *pUnDel2; - SwRedlineSaveDatas* pRedlSaveData; - BOOL bInsert; -public: - SwUndoCompDoc( const SwPaM& rRg, BOOL bIns ); - SwUndoCompDoc( const SwRedline& rRedl ); - - virtual ~SwUndoCompDoc(); - virtual void Undo( SwUndoIter& ); - virtual void Redo( SwUndoIter& ); -}; - -//-------------------------------------------------------------------- - -// Object der als Iterator durch die Undo-Liste laeuft, bis die -// letze oder die angegebene Klammerung/Id erreicht ist. - -class SwUndoIter -{ - friend class SwDoc; // um im SwDoc::Undo bWeiter zu stezen - friend void SwUndoEnd::Undo( SwUndoIter& ); - friend void SwUndoStart::Undo( SwUndoIter& ); - friend void SwUndoEnd::Redo( SwUndoIter& ); - friend void SwUndoStart::Redo( SwUndoIter& ); - friend void SwUndoEnd::Repeat( SwUndoIter& ); - friend void SwUndoStart::Repeat( SwUndoIter& ); - friend void SwUndoReplace::Undo( SwUndoIter& ); - friend void SwUndoReplace::Redo( SwUndoIter& ); - - SwUndoId nUndoId; - USHORT nEndCnt; - BOOL bWeiter : 1; - BOOL bUpdateAttr : 1; // Setze das GCAttr an der CursorShell - -public: - SwPaM * pAktPam; // Member fuer das Undo - SwUndo* pLastUndoObj; // fuers Redo, das vorherige UndoObj. - SwFrmFmt* pSelFmt; // ggfs. das Format Rahmen/Object-Selektionen - SdrMarkList* pMarkList; // MarkList for all selected SdrObjects - - SwUndoIter( SwPaM * pPam, SwUndoId nId = UNDO_EMPTY ); - - BOOL IsNextUndo() const { return bWeiter; } - BOOL IsUpdateAttr() const { return bUpdateAttr; } - void SetUpdateAttr( BOOL bNew ) { bUpdateAttr = bNew; } - - inline SwDoc& GetDoc() const; - SwUndoId GetId() const { return nUndoId; } - SwUndoId GetLastUndoId() const - { return pLastUndoObj ? pLastUndoObj->GetId() : UNDO_EMPTY ; } - void ClearSelections() { pSelFmt = 0; pMarkList = 0; } -}; - -const int nUndoStringLength = 20; - -/** - Shortens a string to a maximum length. - - @param rStr the string to be shortened - @param nLength the maximum length for rStr - @param rFillStr string to replace cut out characters with - - If rStr has less than nLength characters it will be returned unaltered. - - If rStr has more than nLength characters the following algorithm - generates the shortened string: - - frontLength = (nLength - length(rFillStr)) / 2 - rearLength = nLength - length(rFillStr) - frontLength - shortenedString = concat(<first frontLength characters of rStr, - rFillStr, - <last rearLength characters of rStr>) - - Preconditions: - - nLength - length(rFillStr) >= 2 - - @return the shortened string - */ -String ShortenString(const String & rStr, xub_StrLen nLength, const String & rFillStr); - -/** - Denotes special characters in a string. - - The rStr is split into parts containing special characters and - parts not containing special characters. In a part containing - special characters all characters are equal. These parts are - maximal. - - @param rStr the string to denote in - - The resulting string is generated by concatenating the found - parts. The parts without special characters are surrounded by - "'". The parts containing special characters are denoted as "n x", - where n is the length of the part and x is the representation of - the special character (i. e. "tab(s)"). - - @return the denoted string -*/ -String DenoteSpecialCharacters(const String & rStr); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/unoatxt.hxx b/sw/inc/unoatxt.hxx index 16de110daa0a..b0d73c249132 100644 --- a/sw/inc/unoatxt.hxx +++ b/sw/inc/unoatxt.hxx @@ -229,9 +229,9 @@ public: //XText virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, BOOL bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, sal_Bool bAbsorb) throw( ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); + virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, sal_Bool bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException ); virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException); //XTextRange @@ -280,7 +280,7 @@ public: protected: virtual void replaceByName( - const USHORT nEvent, /// item ID of event + const sal_uInt16 nEvent, /// item ID of event const SvxMacro& rMacro) /// event (will be copied) throw( ::com::sun::star::lang::IllegalArgumentException, @@ -290,7 +290,7 @@ protected: virtual void getByName( SvxMacro& rMacro, /// macro to be filled - const USHORT nEvent ) /// item ID of event + const sal_uInt16 nEvent ) /// item ID of event throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx index 86c2df6bad22..c88d62be1d9e 100644 --- a/sw/inc/unochart.hxx +++ b/sw/inc/unochart.hxx @@ -213,7 +213,7 @@ public: void DisposeAllDataSequences( const SwTable *pTable ); // functionality needed to get notified about new added rows/cols - void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, USHORT nLines, BOOL bBehind ); + void AddRowCols( const SwTable &rTable, const SwSelBoxes& rBoxes, sal_uInt16 nLines, sal_Bool bBehind ); }; ////////////////////////////////////////////////////////////////////// diff --git a/sw/inc/unocrsr.hxx b/sw/inc/unocrsr.hxx index 0b1f93e9b057..0fc9b61b557a 100644 --- a/sw/inc/unocrsr.hxx +++ b/sw/inc/unocrsr.hxx @@ -33,9 +33,9 @@ class SwUnoCrsr : public virtual SwCursor, public SwModify { - BOOL bRemainInSection : 1; - BOOL bSkipOverHiddenSections : 1; - BOOL bSkipOverProtectSections : 1; + sal_Bool bRemainInSection : 1; + sal_Bool bSkipOverHiddenSections : 1; + sal_Bool bSkipOverProtectSections : 1; public: SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing = 0 ); @@ -49,31 +49,31 @@ private: protected: virtual const SwCntntFrm* DoSetBidiLevelLeftRight( - BOOL & io_rbLeft, BOOL bVisualAllowed, BOOL bInsertCrsr); + sal_Bool & io_rbLeft, sal_Bool bVisualAllowed, sal_Bool bInsertCrsr); virtual void DoSetBidiLevelUpDown(); public: // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); virtual bool IsReadOnlyAvailable() const; - BOOL IsRemainInSection() const { return bRemainInSection; } - void SetRemainInSection( BOOL bFlag ) { bRemainInSection = bFlag; } + sal_Bool IsRemainInSection() const { return bRemainInSection; } + void SetRemainInSection( sal_Bool bFlag ) { bRemainInSection = bFlag; } - virtual BOOL IsSkipOverProtectSections() const + virtual sal_Bool IsSkipOverProtectSections() const { return bSkipOverProtectSections; } - void SetSkipOverProtectSections( BOOL bFlag ) + void SetSkipOverProtectSections( sal_Bool bFlag ) { bSkipOverProtectSections = bFlag; } - virtual BOOL IsSkipOverHiddenSections() const + virtual sal_Bool IsSkipOverHiddenSections() const { return bSkipOverHiddenSections; } - void SetSkipOverHiddenSections( BOOL bFlag ) + void SetSkipOverHiddenSections( sal_Bool bFlag ) { bSkipOverHiddenSections = bFlag; } // make copy of cursor @@ -99,7 +99,7 @@ public: // gibt es eine Selection vom Content in die Tabelle // Return Wert gibt an, ob der Crsr auf der alten Position verbleibt - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx index befe97aac662..efbc46173350 100644 --- a/sw/inc/unocrsrhelper.hxx +++ b/sw/inc/unocrsrhelper.hxx @@ -78,8 +78,8 @@ namespace SwUnoCursorHelper public: ~SwAnyMapHelper(); - void SetValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any& rAny ); - bool FillValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any*& pAny ); + void SetValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any& rAny ); + bool FillValue( sal_uInt16 nWhichId, sal_uInt16 nMemberId, const com::sun::star::uno::Any*& pAny ); }; ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > diff --git a/sw/inc/unoevtlstnr.hxx b/sw/inc/unoevtlstnr.hxx index fb9387e40dcb..86c8918f571b 100644 --- a/sw/inc/unoevtlstnr.hxx +++ b/sw/inc/unoevtlstnr.hxx @@ -53,7 +53,7 @@ class SwEventListenerContainer ~SwEventListenerContainer(); void AddListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); - BOOL RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); + sal_Bool RemoveListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & rxListener); void Disposing(); }; #endif diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx index 39cc6f0e9271..ed36b278a652 100644 --- a/sw/inc/unofield.hxx +++ b/sw/inc/unofield.hxx @@ -298,7 +298,7 @@ public: SwXFieldEnumeration(SwDoc* pDoc); //XEnumeration - virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo diff --git a/sw/inc/unoflatpara.hxx b/sw/inc/unoflatpara.hxx index ff18c5c3b543..9eb36c20c1b3 100644 --- a/sw/inc/unoflatpara.hxx +++ b/sw/inc/unoflatpara.hxx @@ -137,9 +137,9 @@ private: const sal_Int32 mnType; const sal_Bool mbAutomatic; - ULONG mnCurrentNode; // used for non-automatic mode - ULONG mnStartNode; // used for non-automatic mode - ULONG mnEndNode; // used for non-automatic mode + sal_uLong mnCurrentNode; // used for non-automatic mode + sal_uLong mnStartNode; // used for non-automatic mode + sal_uLong mnEndNode; // used for non-automatic mode sal_Bool mbWrapped; // used for non-automatic mode }; diff --git a/sw/inc/unomailmerge.hxx b/sw/inc/unomailmerge.hxx index 11a15cfc91a2..b81056e21307 100644 --- a/sw/inc/unomailmerge.hxx +++ b/sw/inc/unomailmerge.hxx @@ -42,7 +42,7 @@ #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/text/XMailMergeBroadcaster.hpp> #include <svl/itemprop.hxx> -#include <sfx2/objsh.hxx> // SfxObjectShellRef +#include <sfx2/objsh.hxx> namespace com { namespace sun { namespace star { @@ -78,14 +78,14 @@ namespace rtl { // helper function call class struct PropHashType_Impl { - size_t operator()(const INT32 &s) const { return s; } + size_t operator()(const sal_Int32 &s) const { return s; } }; typedef cppu::OMultiTypeInterfaceContainerHelperVar < - INT32, + sal_Int32, PropHashType_Impl, - std::equal_to< INT32 > + std::equal_to< sal_Int32 > > OPropertyListenerContainerHelper; //////////////////////////////////////////////////////////// diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 7e29591c91fb..cfc373e9887b 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -130,8 +130,10 @@ #define PROPERTY_MAP_PARA_AUTO_STYLE 96 #define PROPERTY_MAP_FLDTYP_DOCINFO_CUSTOM 97 #define PROPERTY_MAP_METAFIELD 98 - -#define PROPERTY_MAP_END 99 +//IAccessibility2 Implementation 2009----- +#define PROPERTY_MAP_ACCESSIBILITY_TEXT_ATTRIBUTE 99 +//-----IAccessibility2 Implementation 2009 +#define PROPERTY_MAP_END 100 //S&E #define WID_WORDS 0 diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx index 54bde1ecd1d6..e9a2deb5e8c9 100644 --- a/sw/inc/unoprnms.hxx +++ b/sw/inc/unoprnms.hxx @@ -800,7 +800,9 @@ enum SwPropNameIds /* 0736 */ UNO_NAME_OUTLINE_LEVEL, /* 0737 */ UNO_NAME_DESCRIPTION, +/* 0740 */ UNO_NAME_EMBEDDED_OBJECT, +// FIXME: these number comments cannot be right post merge - fix them up ... /* 0738 */ UNO_NAME_META, /* 0739 */ UNO_NAME_IS_TEMPLATE, /* 0740 */ UNO_NAME_VBA_DOCOBJ, @@ -811,7 +813,7 @@ enum SwPropNameIds struct SwPropNameLen { const char* pName; - USHORT nNameLen; + sal_uInt16 nNameLen; operator const char*() const { return pName; } }; @@ -821,8 +823,8 @@ extern const SwPropNameTab aPropNameTab; // !!! function must not(!) be inline because it is called via the below !!! // !!! listed macros from the swui DLL and that can not access the !!! // !!! array aPropNameTab which is located in a different DLL. !!! -SW_DLLPUBLIC const SwPropNameLen& GetPropName( USHORT nId ); -SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( USHORT nId ); +SW_DLLPUBLIC const SwPropNameLen& GetPropName( sal_uInt16 nId ); +SW_DLLPUBLIC const SwPropNameLen& SwGetPropName( sal_uInt16 nId ); #define SW_PROP_NAME(nId) \ GetPropName( nId ).pName, GetPropName( nId ).nNameLen diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx index b059647d5f8d..bf0a0173808f 100644 --- a/sw/inc/unoredline.hxx +++ b/sw/inc/unoredline.hxx @@ -81,7 +81,7 @@ public: SwXRedlinePortion( const SwRedline* pRed, const SwUnoCrsr* pPortionCrsr, ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > xParent, - BOOL bIsStart); + sal_Bool bIsStart); ~SwXRedlinePortion(); diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx index 737a5211fbe2..56ba53446922 100644 --- a/sw/inc/unoredlines.hxx +++ b/sw/inc/unoredlines.hxx @@ -79,7 +79,7 @@ class SwXRedlineEnumeration , public SwClient { SwDoc* pDoc; - USHORT nCurrentIndex; + sal_uInt16 nCurrentIndex; protected: virtual ~SwXRedlineEnumeration(); public: @@ -87,7 +87,7 @@ public: //XEnumeration - virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); + virtual sal_Bool SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException ); //XServiceInfo diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 9e90e2b9bd7e..919c930f1fe6 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -202,7 +202,7 @@ protected: ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); public: - SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, BOOL bConditional = FALSE); + SwXStyle(SwDoc* pDoc, SfxStyleFamily eFam = SFX_STYLE_FAMILY_PARA, sal_Bool bConditional = sal_False); SwXStyle(SfxStyleSheetBasePool& rPool, SfxStyleFamily eFam, SwDoc* pDoc, const String& rStyleName); diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index ce118946d1a0..72c5c6a76865 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -87,7 +87,7 @@ class SwXCell : public SwXCellBaseClass, public SwClient { friend void lcl_setString( SwXCell &rCell, const rtl::OUString &rTxt, - BOOL bKeepNumberFmt = FALSE ); + sal_Bool bKeepNumberFmt = sal_False ); friend double lcl_getValue( SwXCell &rCell ); friend void lcl_setValue( SwXCell &rCell, double nVal ); diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx index eab9d4591f85..feeb227a3d65 100644 --- a/sw/inc/unotextrange.hxx +++ b/sw/inc/unotextrange.hxx @@ -79,7 +79,7 @@ namespace sw { CreateParentXText(SwDoc & rDoc, const SwPosition& rPos); bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny, - const ::rtl::OUString& rPropertyName, USHORT nWID = 0); + const ::rtl::OUString& rPropertyName, sal_uInt16 nWID = 0); } // namespace sw diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 8e4e20063648..82512aa9af5e 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -130,7 +130,6 @@ class SfxViewFrame; class SwPrintUIOptions; class SwPrintData; class SwRenderData; -class SwPrtOptions; class SwWrtShell; @@ -595,7 +594,7 @@ public: SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions ); ~SwViewOptionAdjust_Impl(); - void AdjustViewOptions( const SwPrtOptions *pPrtOptions ); + void AdjustViewOptions( SwPrintData const*const pPrtOptions ); bool checkShell( const SwWrtShell& rCompare ) const { return &rCompare == &m_rShell; } diff --git a/sw/inc/usrfld.hxx b/sw/inc/usrfld.hxx index 8ad0112ecd50..5b041e620d9a 100644 --- a/sw/inc/usrfld.hxx +++ b/sw/inc/usrfld.hxx @@ -25,8 +25,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _USRFLD_HXX -#define _USRFLD_HXX +#ifndef SW_USRFLD_HXX +#define SW_USRFLD_HXX #include "swdllapi.h" #include "fldbas.hxx" @@ -41,12 +41,12 @@ class SwDoc; class SW_DLLPUBLIC SwUserFieldType : public SwValueFieldType { - BOOL bValidValue : 1; - BOOL bDeleted : 1; + sal_Bool bValidValue : 1; + sal_Bool bDeleted : 1; double nValue; String aName; String aContent; - USHORT nType; + sal_uInt16 nType; public: SwUserFieldType( SwDoc* pDocPtr, const String& ); @@ -54,13 +54,13 @@ public: virtual const String& GetName() const; virtual SwFieldType* Copy() const; - String Expand(sal_uInt32 nFmt, USHORT nSubType, USHORT nLng); + String Expand(sal_uInt32 nFmt, sal_uInt16 nSubType, sal_uInt16 nLng); String GetContent( sal_uInt32 nFmt = 0 ); void SetContent( const String& rStr, sal_uInt32 nFmt = 0 ); - inline BOOL IsValid() const; - inline void ChgValid( BOOL bNew ); + inline sal_Bool IsValid() const; + inline void ChgValid( sal_Bool bNew ); virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew ); @@ -68,20 +68,20 @@ public: inline double GetValue() const; inline void SetValue(const double nVal); - inline USHORT GetType() const; - inline void SetType(USHORT); + inline sal_uInt16 GetType() const; + inline void SetType(sal_uInt16); - BOOL IsDeleted() const { return bDeleted; } - void SetDeleted( BOOL b ) { bDeleted = b; } + sal_Bool IsDeleted() const { return bDeleted; } + void SetDeleted( sal_Bool b ) { bDeleted = b; } - 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nMId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nMId ); }; -inline BOOL SwUserFieldType::IsValid() const +inline sal_Bool SwUserFieldType::IsValid() const { return bValidValue; } -inline void SwUserFieldType::ChgValid( BOOL bNew ) +inline void SwUserFieldType::ChgValid( sal_Bool bNew ) { bValidValue = bNew; } inline double SwUserFieldType::GetValue() const @@ -90,10 +90,10 @@ inline double SwUserFieldType::GetValue() const inline void SwUserFieldType::SetValue(const double nVal) { nValue = nVal; } -inline USHORT SwUserFieldType::GetType() const +inline sal_uInt16 SwUserFieldType::GetType() const { return nType; } -inline void SwUserFieldType::SetType(USHORT nSub) +inline void SwUserFieldType::SetType(sal_uInt16 nSub) { nType = nSub; EnableFormat(!(nSub & nsSwGetSetExpType::GSE_STRING)); @@ -105,20 +105,21 @@ inline void SwUserFieldType::SetType(USHORT nSub) class SW_DLLPUBLIC SwUserField : public SwValueField { - USHORT nSubType; + sal_uInt16 nSubType; + + virtual String Expand() const; + virtual SwField* Copy() const; public: - SwUserField(SwUserFieldType*, USHORT nSub = 0, sal_uInt32 nFmt = 0); + SwUserField(SwUserFieldType*, sal_uInt16 nSub = 0, sal_uInt32 nFmt = 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 SetValue( const double& rVal ); - virtual String Expand() const; - virtual SwField* Copy() const; - virtual String GetCntnt(BOOL bName = FALSE) const; + virtual String GetFieldName() const; // Name kann nicht geaendert werden virtual const String& GetPar1() const; @@ -126,10 +127,10 @@ public: // Inhalt virtual String GetPar2() const; 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 bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const; + virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ); }; -#endif // _USRFLD_HXX +#endif // SW_USRFLD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index 42fa32f1007b..af12afe42bbc 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -138,48 +138,48 @@ class SwViewOption static sal_Int32 nAppearanceFlags; // protected: - static USHORT nPixelTwips;// 1 Pixel == ? Twips + static sal_uInt16 nPixelTwips;// 1 Pixel == ? Twips String sSymbolFont; // Symbolzeichensatz - UINT32 nCoreOptions; // Bits fuer die ViewShell - UINT32 nCore2Options; // Bits fuer die ViewShell - UINT32 nUIOptions; // UI-Bits + sal_uInt32 nCoreOptions; // Bits fuer die ViewShell + sal_uInt32 nCore2Options; // Bits fuer die ViewShell + sal_uInt32 nUIOptions; // UI-Bits Color aRetoucheColor; // DefaultBackground fuer BrowseView Size aSnapSize; // Beschreibt hori. wie vert. Snap - USHORT mnViewLayoutColumns;// # columns for edit view + sal_uInt16 mnViewLayoutColumns;// # columns for edit view short nDivisionX; // Rasterunterteilung short nDivisionY; - BYTE nPagePrevRow; // Page Preview Row/Columns - BYTE nPagePrevCol; // Page Preview Row/Columns - BYTE nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr - BOOL bReadonly : 1; // Readonly-Doc - BOOL bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) - BOOL bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings - BOOL bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents - BOOL bFormView : 1; - BOOL bBookview : 1; // view mode for page preview - BOOL mbViewLayoutBookMode : 1; // book view mode for edit view + sal_uInt8 nPagePrevRow; // Page Preview Row/Columns + sal_uInt8 nPagePrevCol; // Page Preview Row/Columns + sal_uInt8 nShdwCrsrFillMode; // FillMode fuer den ShadowCrsr + sal_Bool bReadonly : 1; // Readonly-Doc + sal_Bool bStarOneSetting : 1;// prevent from UI automatics (no scrollbars in readonly documents) + sal_Bool bIsPagePreview : 1; // the preview mustn't print field/footnote/... shadings + sal_Bool bSelectionInReadonly : 1; //determines whether selection is switched on in readonly documents + sal_Bool bFormView : 1; + sal_Bool bBookview : 1; // view mode for page preview + sal_Bool mbViewLayoutBookMode : 1; // book view mode for edit view sal_Bool bShowPlaceHolderFields : 1; //only used in printing! mutable bool bIdle; // Maszstab - USHORT nZoom; // Angaben in Prozent + sal_uInt16 nZoom; // Angaben in Prozent SvxZoomType eZoom; // 'enum' fuer Zoom - BYTE nTblDest; // Ziel fuer Tabellenhintergrund + sal_uInt8 nTblDest; // Ziel fuer Tabellenhintergrund #if OSL_DEBUG_LEVEL > 1 // korrespondieren zu den Angaben in ui/config/cfgvw.src - BOOL bTest1 :1; // Test-Flag "Layout not loading" - BOOL bTest2 :1; // Test-Flag "WYSIWYG++" - BOOL bTest3 :1; // Test-Flag "" - BOOL bTest4 :1; // Test-Flag "WYSIWYG debug" - BOOL bTest5 :1; // Test-Flag "No idle format" - BOOL bTest6 :1; // Test-Flag "No screen adj" - BOOL bTest7 :1; // Test-Flag "win format" - BOOL bTest8 :1; // Test-Flag "" - static BOOL bTest9; // Test-Flag "DrawingLayerNotLoading" - BOOL bTest10 :1; // Test-Flag "Format by Input" + sal_Bool bTest1 :1; // Test-Flag "Layout not loading" + sal_Bool bTest2 :1; // Test-Flag "WYSIWYG++" + sal_Bool bTest3 :1; // Test-Flag "" + sal_Bool bTest4 :1; // Test-Flag "WYSIWYG debug" + sal_Bool bTest5 :1; // Test-Flag "No idle format" + sal_Bool bTest6 :1; // Test-Flag "No screen adj" + sal_Bool bTest7 :1; // Test-Flag "win format" + sal_Bool bTest8 :1; // Test-Flag "" + static sal_Bool bTest9; // Test-Flag "DrawingLayerNotLoading" + sal_Bool bTest10 :1; // Test-Flag "Format by Input" #endif public: @@ -189,200 +189,200 @@ public: void Init( Window *pWin ); // Initialisierung der statischen Daten - USHORT GetPixelTwips() const { return nPixelTwips; } + sal_uInt16 GetPixelTwips() const { return nPixelTwips; } - inline UINT32 GetCoreOptions() const {return nCoreOptions;} + inline sal_uInt32 GetCoreOptions() const {return nCoreOptions;} inline void SetUIOptions( const SwViewOption& ); /*--------------------------------------------------------------------------- Optionen aus nCoreOptions ----------------------------------------------------------------------------*/ - inline BOOL IsIdle() const + inline sal_Bool IsIdle() const { return bIdle; } // logically this is a const function since it does not modify the viewoptions // but only effects idle formatting. Of course that member is already implement // in the wrong place here... Also currently there are many const modifying casts in the code // just to call this function on otherwise const objects. Thus declaring it as const now. - inline void SetIdle( BOOL b ) const + inline void SetIdle( sal_Bool b ) const { bIdle = b; } - inline BOOL IsTab(BOOL bHard = FALSE) const + inline sal_Bool IsTab(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_TAB) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetTab( BOOL b ) { + ? sal_True : sal_False; } + inline void SetTab( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_TAB ) : ( nCoreOptions &= ~VIEWOPT_1_TAB); } - inline BOOL IsBlank(BOOL bHard = FALSE) const + inline sal_Bool IsBlank(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_BLANK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetBlank( BOOL b ) + ? sal_True : sal_False; } + inline void SetBlank( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_BLANK ) : ( nCoreOptions &= ~VIEWOPT_1_BLANK); } - inline BOOL IsHardBlank() const - { return !bReadonly && nCoreOptions & VIEWOPT_1_HARDBLANK ? TRUE : FALSE; } - inline void SetHardBlank( BOOL b ) + inline sal_Bool IsHardBlank() const + { return !bReadonly && nCoreOptions & VIEWOPT_1_HARDBLANK ? sal_True : sal_False; } + inline void SetHardBlank( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_HARDBLANK ) : ( nCoreOptions &= ~VIEWOPT_1_HARDBLANK); } - inline BOOL IsParagraph(BOOL bHard = FALSE) const + inline sal_Bool IsParagraph(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_PARAGRAPH) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetParagraph( BOOL b ) + ? sal_True : sal_False; } + inline void SetParagraph( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PARAGRAPH ) : ( nCoreOptions &= ~VIEWOPT_1_PARAGRAPH); } - inline BOOL IsLineBreak(BOOL bHard = FALSE) const + inline sal_Bool IsLineBreak(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_LINEBREAK) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } - inline void SetLineBreak( BOOL b ) + ? sal_True : sal_False; } + inline void SetLineBreak( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_LINEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_LINEBREAK); } - inline void SetPageBreak( BOOL b ) + inline void SetPageBreak( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBREAK); } - inline void SetColumnBreak( BOOL b) + inline void SetColumnBreak( sal_Bool b) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_COLUMNBREAK ) : ( nCoreOptions &= ~VIEWOPT_1_COLUMNBREAK); } - inline BOOL IsSoftHyph() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) ? TRUE : FALSE; } - inline void SetSoftHyph( BOOL b ) + inline sal_Bool IsSoftHyph() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_SOFTHYPH) ? sal_True : sal_False; } + inline void SetSoftHyph( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOFTHYPH ) : ( nCoreOptions &= ~VIEWOPT_1_SOFTHYPH); } - inline BOOL IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? TRUE : FALSE; } - inline void SetFldName( BOOL b ) + inline sal_Bool IsFldName() const { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLDNAME) ? sal_True : sal_False; } + inline void SetFldName( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLDNAME ) : ( nCoreOptions &= ~VIEWOPT_1_FLDNAME); } - inline BOOL IsPostIts() const - { return (nCoreOptions & VIEWOPT_1_POSTITS) ? TRUE : FALSE; } - inline void SetPostIts( BOOL b ) + inline sal_Bool IsPostIts() const + { return (nCoreOptions & VIEWOPT_1_POSTITS) ? sal_True : sal_False; } + inline void SetPostIts( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_POSTITS ) : ( nCoreOptions &= ~VIEWOPT_1_POSTITS); } void PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bool bIsScript ) const; - USHORT GetPostItsWidth( const OutputDevice *pOut = 0 ) const; + sal_uInt16 GetPostItsWidth( const OutputDevice *pOut = 0 ) const; - inline BOOL IsShowHiddenChar(sal_Bool bHard = sal_False) const + inline sal_Bool IsShowHiddenChar(sal_Bool bHard = sal_False) const { return !bReadonly && (nCoreOptions & VIEWOPT_1_CHAR_HIDDEN) && ((nCoreOptions & VIEWOPT_1_VIEWMETACHARS)||bHard) - ? TRUE : FALSE; } + ? sal_True : sal_False; } - inline void SetShowHiddenChar( BOOL b ) + inline void SetShowHiddenChar( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CHAR_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_CHAR_HIDDEN); } - inline BOOL IsShowHiddenField() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? TRUE : FALSE; } - inline void SetShowHiddenField( BOOL b ) + inline sal_Bool IsShowHiddenField() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_FLD_HIDDEN) ? sal_True : sal_False; } + inline void SetShowHiddenField( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_FLD_HIDDEN ) : ( nCoreOptions &= ~VIEWOPT_1_FLD_HIDDEN); } - inline BOOL IsGraphic() const - { return nCoreOptions & VIEWOPT_1_GRAPHIC ? TRUE : FALSE; } - inline void SetGraphic( BOOL b ) + inline sal_Bool IsGraphic() const + { return nCoreOptions & VIEWOPT_1_GRAPHIC ? sal_True : sal_False; } + inline void SetGraphic( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRAPHIC ) : ( nCoreOptions &= ~VIEWOPT_1_GRAPHIC); } - inline BOOL IsPageBack() const - { return nCoreOptions & VIEWOPT_1_PAGEBACK ? TRUE : FALSE; } - inline void SetPageBack( BOOL b ) + inline sal_Bool IsPageBack() const + { return nCoreOptions & VIEWOPT_1_PAGEBACK ? sal_True : sal_False; } + inline void SetPageBack( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_PAGEBACK) : ( nCoreOptions &= ~VIEWOPT_1_PAGEBACK); } - inline BOOL IsSolidMarkHdl() const - { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? TRUE : FALSE; } - inline void SetSolidMarkHdl( BOOL b ) + inline sal_Bool IsSolidMarkHdl() const + { return nCoreOptions & VIEWOPT_1_SOLIDMARKHDL ? sal_True : sal_False; } + inline void SetSolidMarkHdl( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SOLIDMARKHDL) : ( nCoreOptions &= ~VIEWOPT_1_SOLIDMARKHDL); } - inline BOOL IsBigMarkHdl() const - { return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? TRUE : FALSE;} - inline void SetBigMarkHdl(BOOL b) + inline sal_Bool IsBigMarkHdl() const + { return nCore2Options & VIEWOPT_CORE2_BIGMARKHDL ? sal_True : sal_False;} + inline void SetBigMarkHdl(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BIGMARKHDL ) : (nCore2Options &= ~VIEWOPT_CORE2_BIGMARKHDL);} - inline BOOL IsTable() const - { return nCoreOptions & VIEWOPT_1_TABLE ? TRUE : FALSE; } - inline void SetTable( BOOL b ) + inline sal_Bool IsTable() const + { return nCoreOptions & VIEWOPT_1_TABLE ? sal_True : sal_False; } + inline void SetTable( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_TABLE ) : ( nCoreOptions &= ~VIEWOPT_1_TABLE); } - inline BOOL IsDraw() const - { return nCoreOptions & VIEWOPT_1_DRAW ? TRUE : FALSE; } - inline void SetDraw( BOOL b ) + inline sal_Bool IsDraw() const + { return nCoreOptions & VIEWOPT_1_DRAW ? sal_True : sal_False; } + inline void SetDraw( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_DRAW ) : ( nCoreOptions &= ~VIEWOPT_1_DRAW); } - inline BOOL IsControl() const - { return nCoreOptions & VIEWOPT_1_CONTROL ? TRUE : FALSE; } - inline void SetControl( BOOL b ) + inline sal_Bool IsControl() const + { return nCoreOptions & VIEWOPT_1_CONTROL ? sal_True : sal_False; } + inline void SetControl( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CONTROL ) : ( nCoreOptions &= ~VIEWOPT_1_CONTROL); } - inline BOOL IsSnap() const - { return nCoreOptions & VIEWOPT_1_SNAP ? TRUE : FALSE; } - inline void SetSnap( BOOL b ) + inline sal_Bool IsSnap() const + { return nCoreOptions & VIEWOPT_1_SNAP ? sal_True : sal_False; } + inline void SetSnap( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SNAP ) : ( nCoreOptions &= ~VIEWOPT_1_SNAP); } inline void SetSnapSize( Size &rSz ){ aSnapSize = rSz; } inline const Size &GetSnapSize() const { return aSnapSize; } - inline BOOL IsGridVisible() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) ? TRUE : FALSE; } - inline void SetGridVisible( BOOL b ) + inline sal_Bool IsGridVisible() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_GRIDVISIBLE) ? sal_True : sal_False; } + inline void SetGridVisible( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_GRIDVISIBLE ) : ( nCoreOptions &= ~VIEWOPT_1_GRIDVISIBLE); } - inline BOOL IsOnlineSpell() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) ? TRUE : FALSE; } - inline void SetOnlineSpell( BOOL b ) + inline sal_Bool IsOnlineSpell() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_ONLINESPELL) ? sal_True : sal_False; } + inline void SetOnlineSpell( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_ONLINESPELL ) : ( nCoreOptions &= ~VIEWOPT_1_ONLINESPELL); } - inline BOOL IsViewMetaChars() const - { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? TRUE : FALSE; } - inline void SetViewMetaChars( BOOL b) + inline sal_Bool IsViewMetaChars() const + { return !bReadonly && (nCoreOptions & VIEWOPT_1_VIEWMETACHARS) ? sal_True : sal_False; } + inline void SetViewMetaChars( sal_Bool b) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_VIEWMETACHARS ) : ( nCoreOptions &= ~VIEWOPT_1_VIEWMETACHARS); } - inline BOOL IsSynchronize() const - { return nCoreOptions & VIEWOPT_1_SYNCHRONIZE ? TRUE : FALSE;} - inline void SetSynchronize( BOOL b ) + inline sal_Bool IsSynchronize() const + { return nCoreOptions & VIEWOPT_1_SYNCHRONIZE ? sal_True : sal_False;} + inline void SetSynchronize( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_SYNCHRONIZE ) : ( nCoreOptions &= ~VIEWOPT_1_SYNCHRONIZE); } - inline BOOL IsCrossHair() const - { return nCoreOptions & VIEWOPT_1_CROSSHAIR ? TRUE : FALSE; } - inline void SetCrossHair( BOOL b ) + inline sal_Bool IsCrossHair() const + { return nCoreOptions & VIEWOPT_1_CROSSHAIR ? sal_True : sal_False; } + inline void SetCrossHair( sal_Bool b ) { (b != 0) ? (nCoreOptions |= VIEWOPT_1_CROSSHAIR ) : ( nCoreOptions &= ~VIEWOPT_1_CROSSHAIR); } /*--------------------------------------------------------------------------- Optionen aus nCore2Options ----------------------------------------------------------------------------*/ - inline BOOL IsBlackFont() const - {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? TRUE : FALSE;} + inline sal_Bool IsBlackFont() const + {return nCore2Options & VIEWOPT_CORE2_BLACKFONT ? sal_True : sal_False;} - inline void SetBlackFont(BOOL b) + inline void SetBlackFont(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_BLACKFONT) : (nCore2Options &= ~VIEWOPT_CORE2_BLACKFONT);} - inline BOOL IsShowHiddenPara() const - {return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? TRUE : FALSE;} + inline sal_Bool IsShowHiddenPara() const + {return nCore2Options & VIEWOPT_CORE2_HIDDENPARA ? sal_True : sal_False;} - inline void SetShowHiddenPara(BOOL b) + inline void SetShowHiddenPara(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_HIDDENPARA) : (nCore2Options &= ~VIEWOPT_CORE2_HIDDENPARA);} - inline BOOL IsSmoothScroll() const - {return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? TRUE : FALSE;} + inline sal_Bool IsSmoothScroll() const + {return nCore2Options & VIEWOPT_CORE2_SMOOTHSCROLL ? sal_True : sal_False;} - inline void SetSmoothScroll(BOOL b) + inline void SetSmoothScroll(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_SMOOTHSCROLL) : (nCore2Options &= ~VIEWOPT_CORE2_SMOOTHSCROLL);} - inline BOOL IsCursorInProtectedArea() const - {return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? TRUE : FALSE;} + inline sal_Bool IsCursorInProtectedArea() const + {return nCore2Options & VIEWOPT_CORE2_CRSR_IN_PROT ? sal_True : sal_False;} - inline void SetCursorInProtectedArea(BOOL b) + inline void SetCursorInProtectedArea(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_CRSR_IN_PROT) : (nCore2Options &= ~VIEWOPT_CORE2_CRSR_IN_PROT);} - inline BOOL IsPDFExport() const - {return nCore2Options & VIEWOPT_CORE2_PDF_EXPORT ? TRUE : FALSE;} + inline sal_Bool IsPDFExport() const + {return nCore2Options & VIEWOPT_CORE2_PDF_EXPORT ? sal_True : sal_False;} - inline void SetPDFExport(BOOL b) + inline void SetPDFExport(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);} - inline BOOL IsPrinting() const - {return nCore2Options & VIEWOPT_CORE2_PRINTING ? TRUE : FALSE;} + inline sal_Bool IsPrinting() const + {return nCore2Options & VIEWOPT_CORE2_PRINTING ? sal_True : sal_False;} - inline void SetPrinting(BOOL b) + inline void SetPrinting(sal_Bool b) { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);} inline short GetDivisionX() const { return nDivisionX; } @@ -390,102 +390,102 @@ public: inline short GetDivisionY() const { return nDivisionY; } inline void SetDivisionY( short n ){ nDivisionY = n; } - inline BYTE GetPagePrevRow() const { return nPagePrevRow; } - inline void SetPagePrevRow( BYTE n ) { nPagePrevRow = n; } - inline BYTE GetPagePrevCol() const { return nPagePrevCol; } - inline void SetPagePrevCol( BYTE n ) { nPagePrevCol = n; } - BOOL IsReadonly() const { return bReadonly; } - void SetReadonly(BOOL bSet) { bReadonly = bSet; } + inline sal_uInt8 GetPagePrevRow() const { return nPagePrevRow; } + inline void SetPagePrevRow( sal_uInt8 n ) { nPagePrevRow = n; } + inline sal_uInt8 GetPagePrevCol() const { return nPagePrevCol; } + inline void SetPagePrevCol( sal_uInt8 n ) { nPagePrevCol = n; } + sal_Bool IsReadonly() const { return bReadonly; } + void SetReadonly(sal_Bool bSet) { bReadonly = bSet; } - BOOL IsSelectionInReadonly() const {return bSelectionInReadonly;} - void SetSelectionInReadonly(BOOL bSet) {bSelectionInReadonly = bSet;} + sal_Bool IsSelectionInReadonly() const {return bSelectionInReadonly;} + void SetSelectionInReadonly(sal_Bool bSet) {bSelectionInReadonly = bSet;} - BOOL IsFormView() const { return bFormView; } - void SetFormView( BOOL bSet ) { bFormView = bSet; } + sal_Bool IsFormView() const { return bFormView; } + void SetFormView( sal_Bool bSet ) { bFormView = bSet; } - inline BOOL IsPagePrevBookview() const { return bBookview; } - inline void SetPagePrevBookview(BOOL bSet) { bBookview = bSet; } + inline sal_Bool IsPagePrevBookview() const { return bBookview; } + inline void SetPagePrevBookview(sal_Bool bSet) { bBookview = bSet; } - BOOL IsAutoCompleteWords() const; + sal_Bool IsAutoCompleteWords() const; bool IsViewLayoutBookMode() const { return mbViewLayoutBookMode; } void SetViewLayoutBookMode( bool bNew ) { mbViewLayoutBookMode = bNew; } - USHORT GetViewLayoutColumns() const { return mnViewLayoutColumns; } - void SetViewLayoutColumns( USHORT nNew ) { mnViewLayoutColumns = nNew; } + sal_uInt16 GetViewLayoutColumns() const { return mnViewLayoutColumns; } + void SetViewLayoutColumns( sal_uInt16 nNew ) { mnViewLayoutColumns = nNew; } #if OSL_DEBUG_LEVEL > 1 // korrespondieren zu den Angaben in ui/config/cfgvw.src - inline BOOL IsTest1() const { return bTest1; } - inline void SetTest1( BOOL b ) { bTest1 = b; } - inline BOOL IsTest2() const { return bTest2; } - inline void SetTest2( BOOL b ) { bTest2 = b; } - inline BOOL IsTest3() const { return bTest3; } - inline void SetTest3( BOOL b ) { bTest3 = b; } - inline BOOL IsTest4() const { return bTest4; } - inline void SetTest4( BOOL b ) { bTest4 = b; } - inline BOOL IsTest5() const { return bTest5; } - inline void SetTest5( BOOL b ) { bTest5 = b; } - inline BOOL IsTest6() const { return bTest6; } - inline void SetTest6( BOOL b ) { bTest6 = b; } - inline BOOL IsTest7() const { return bTest7; } - inline void SetTest7( BOOL b ) { bTest7 = b; } - inline BOOL IsTest8() const { return bTest8; } - inline void SetTest8( BOOL b ) { bTest8 = b; } - static inline BOOL IsTest9() { return bTest9; } - static inline void SetTest9( BOOL b ) { bTest9 = b; } - inline BOOL IsTest10() const { return bTest10; } - inline void SetTest10( BOOL b ) { bTest10 = b; } + inline sal_Bool IsTest1() const { return bTest1; } + inline void SetTest1( sal_Bool b ) { bTest1 = b; } + inline sal_Bool IsTest2() const { return bTest2; } + inline void SetTest2( sal_Bool b ) { bTest2 = b; } + inline sal_Bool IsTest3() const { return bTest3; } + inline void SetTest3( sal_Bool b ) { bTest3 = b; } + inline sal_Bool IsTest4() const { return bTest4; } + inline void SetTest4( sal_Bool b ) { bTest4 = b; } + inline sal_Bool IsTest5() const { return bTest5; } + inline void SetTest5( sal_Bool b ) { bTest5 = b; } + inline sal_Bool IsTest6() const { return bTest6; } + inline void SetTest6( sal_Bool b ) { bTest6 = b; } + inline sal_Bool IsTest7() const { return bTest7; } + inline void SetTest7( sal_Bool b ) { bTest7 = b; } + inline sal_Bool IsTest8() const { return bTest8; } + inline void SetTest8( sal_Bool b ) { bTest8 = b; } + static inline sal_Bool IsTest9() { return bTest9; } + static inline void SetTest9( sal_Bool b ) { bTest9 = b; } + inline sal_Bool IsTest10() const { return bTest10; } + inline void SetTest10( sal_Bool b ) { bTest10 = b; } #endif - inline USHORT GetZoom() const { return nZoom; } - inline void SetZoom( USHORT n ){ nZoom = n; } + inline sal_uInt16 GetZoom() const { return nZoom; } + inline void SetZoom( sal_uInt16 n ){ nZoom = n; } void DrawRect( OutputDevice* pOut, const SwRect &rRect, long nCol ) const; void DrawRectPrinter( OutputDevice* pOut, const SwRect& rRect ) const; SwViewOption& operator=( const SwViewOption &rOpt ); // Vergleichsmethoden - BOOL IsEqualFlags ( const SwViewOption &rOpt ) const; - inline BOOL operator == ( const SwViewOption &rOpt ) const; - inline BOOL operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } + sal_Bool IsEqualFlags ( const SwViewOption &rOpt ) const; + inline sal_Bool operator == ( const SwViewOption &rOpt ) const; + inline sal_Bool operator != ( const SwViewOption &rOpt ) const { return !(*this == rOpt); } /*--------------------------------------------------------------------------- Optionen aus nUIOptions ----------------------------------------------------------------------------*/ - BOOL IsViewVScrollBar() const - { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? TRUE : FALSE; } - BOOL IsViewHScrollBar() const - { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? TRUE : FALSE; } - BOOL IsKeepRatio() const - { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? TRUE : FALSE; } - BOOL IsGrfKeepZoom() const - { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? TRUE : FALSE; } - BOOL IsPreventTips() const - { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? TRUE : FALSE; } - BOOL IsPrtFormat() const - { return nUIOptions & VIEWOPT_2_PRTFORMAT ? TRUE : FALSE; } + sal_Bool IsViewVScrollBar() const + { return nUIOptions & VIEWOPT_2_VSCROLLBAR ? sal_True : sal_False; } + sal_Bool IsViewHScrollBar() const + { return nUIOptions & VIEWOPT_2_HSCROLLBAR ? sal_True : sal_False; } + sal_Bool IsKeepRatio() const + { return nUIOptions & VIEWOPT_2_KEEPASPECTRATIO ? sal_True : sal_False; } + sal_Bool IsGrfKeepZoom() const + { return nUIOptions & VIEWOPT_2_GRFKEEPZOOM ? sal_True : sal_False; } + sal_Bool IsPreventTips() const + { return nUIOptions & VIEWOPT_2_PREVENT_TIPS ? sal_True : sal_False; } + sal_Bool IsPrtFormat() const + { return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; } SvxZoomType GetZoomType() const { return eZoom; } - BYTE GetTblDest() const { return nTblDest; } + sal_uInt8 GetTblDest() const { return nTblDest; } - void SetViewVScrollBar(BOOL b) + void SetViewVScrollBar(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_VSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_VSCROLLBAR); } - void SetViewHScrollBar(BOOL b) + void SetViewHScrollBar(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_HSCROLLBAR ) : ( nUIOptions &= ~VIEWOPT_2_HSCROLLBAR); } - void SetKeepRatio (BOOL b) + void SetKeepRatio (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_KEEPASPECTRATIO ) : ( nUIOptions &= ~VIEWOPT_2_KEEPASPECTRATIO); } - void SetGrfKeepZoom (BOOL b) + void SetGrfKeepZoom (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_GRFKEEPZOOM ) : ( nUIOptions &= ~VIEWOPT_2_GRFKEEPZOOM); } - void SetPreventTips( BOOL b) + void SetPreventTips( sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_PREVENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_PREVENT_TIPS); } - void SetPrtFormat( BOOL b) + void SetPrtFormat( sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); } void SetZoomType (SvxZoomType eZoom_){ eZoom = eZoom_; } - void SetTblDest( BYTE nNew ) { nTblDest = nNew; } + void SetTblDest( sal_uInt8 nNew ) { nTblDest = nNew; } const String& GetSymbolFont() const {return sSymbolFont;} void SetSymbolFont(const String& sSet) {sSymbolFont = sSet;} @@ -493,56 +493,56 @@ public: const Color& GetRetoucheColor() const { return aRetoucheColor;} void SetRetoucheColor(const Color&r) { aRetoucheColor = r; } - BOOL IsViewAnyRuler() const {return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);} - void SetViewAnyRuler(BOOL bSet) + sal_Bool IsViewAnyRuler() const {return 0 != (nUIOptions & VIEWOPT_2_ANY_RULER);} + void SetViewAnyRuler(sal_Bool bSet) { bSet ? (nUIOptions |= VIEWOPT_2_ANY_RULER) : (nUIOptions &= ~VIEWOPT_2_ANY_RULER);} - BOOL IsViewHRuler(BOOL bDirect = FALSE) const + sal_Bool IsViewHRuler(sal_Bool bDirect = sal_False) const { - BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? + sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 != (nUIOptions & VIEWOPT_2_H_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_H_RULER) - : FALSE ); + : sal_False ); return bRet; } - void SetViewHRuler (BOOL b) + void SetViewHRuler (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_H_RULER ) : ( nUIOptions &= ~VIEWOPT_2_H_RULER);} - BOOL IsViewVRuler(BOOL bDirect = FALSE) const + sal_Bool IsViewVRuler(sal_Bool bDirect = sal_False) const { - BOOL bRet = sal::static_int_cast< BOOL >( bDirect ? + sal_Bool bRet = sal::static_int_cast< sal_Bool >( bDirect ? 0 !=(nUIOptions & VIEWOPT_2_V_RULER) : !bReadonly ? (nUIOptions & (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER)) == (VIEWOPT_2_ANY_RULER|VIEWOPT_2_V_RULER) - : FALSE ); + : sal_False ); return bRet; } - void SetViewVRuler (BOOL b) + void SetViewVRuler (sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER);} // ShadowCursor ein schalten/abfragen/Farbe setzen/Modus setzen - BOOL IsShadowCursor() const - { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? TRUE : FALSE; } - void SetShadowCursor(BOOL b) + sal_Bool IsShadowCursor() const + { return nUIOptions & VIEWOPT_2_SHADOWCRSR ? sal_True : sal_False; } + void SetShadowCursor(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_SHADOWCRSR ) : ( nUIOptions &= ~VIEWOPT_2_SHADOWCRSR); } //move vertical ruler to the right - BOOL IsVRulerRight() const - { return nUIOptions & VIEWOPT_2_V_RULER_RIGHT ? TRUE : FALSE; } - void SetVRulerRight(BOOL b) + sal_Bool IsVRulerRight() const + { return nUIOptions & VIEWOPT_2_V_RULER_RIGHT ? sal_True : sal_False; } + void SetVRulerRight(sal_Bool b) { b ? (nUIOptions |= VIEWOPT_2_V_RULER_RIGHT ) : ( nUIOptions &= ~VIEWOPT_2_V_RULER_RIGHT); } - BOOL IsStarOneSetting() const {return bStarOneSetting; } - void SetStarOneSetting(BOOL bSet) {bStarOneSetting = bSet; } + sal_Bool IsStarOneSetting() const {return bStarOneSetting; } + void SetStarOneSetting(sal_Bool bSet) {bStarOneSetting = bSet; } - BOOL IsPagePreview() const {return bIsPagePreview; } - void SetPagePreview(BOOL bSet) { bIsPagePreview= bSet; } + sal_Bool IsPagePreview() const {return bIsPagePreview; } + void SetPagePreview(sal_Bool bSet) { bIsPagePreview= bSet; } - BYTE GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } - void SetShdwCrsrFillMode( BYTE nMode ) { nShdwCrsrFillMode = nMode; }; + sal_uInt8 GetShdwCrsrFillMode() const { return nShdwCrsrFillMode; } + void SetShdwCrsrFillMode( sal_uInt8 nMode ) { nShdwCrsrFillMode = nMode; }; sal_Bool IsShowPlaceHolderFields() const { return bShowPlaceHolderFields; } void SetShowPlaceHolderFields(sal_Bool bSet) { bShowPlaceHolderFields = bSet; } @@ -565,27 +565,27 @@ public: static Color& GetSectionBoundColor(); static Color& GetPageBreakColor(); - static BOOL IsAppearanceFlag(sal_Int32 nFlag); + static sal_Bool IsAppearanceFlag(sal_Int32 nFlag); - static BOOL IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} - static BOOL IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} - static BOOL IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} - static BOOL IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} - static BOOL IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} - static BOOL IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} - static BOOL IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} - static BOOL IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} - static BOOL IsShadow() {return IsAppearanceFlag(VIEWOPT_SHADOW );} + static sal_Bool IsDocBoundaries() {return IsAppearanceFlag(VIEWOPT_DOC_BOUNDARIES);} + static sal_Bool IsObjectBoundaries(){return IsAppearanceFlag(VIEWOPT_OBJECT_BOUNDARIES);} + static sal_Bool IsTableBoundaries() {return IsAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES );} + static sal_Bool IsIndexShadings() {return IsAppearanceFlag(VIEWOPT_INDEX_SHADINGS );} + static sal_Bool IsLinks() {return IsAppearanceFlag(VIEWOPT_LINKS );} + static sal_Bool IsVisitedLinks() {return IsAppearanceFlag(VIEWOPT_VISITED_LINKS );} + static sal_Bool IsFieldShadings() {return IsAppearanceFlag(VIEWOPT_FIELD_SHADINGS);} + static sal_Bool IsSectionBoundaries() {return IsAppearanceFlag(VIEWOPT_SECTION_BOUNDARIES);} + static sal_Bool IsShadow() {return IsAppearanceFlag(VIEWOPT_SHADOW );} - static void SetAppearanceFlag(sal_Int32 nFlag, BOOL bSet, BOOL bSaveInConfig = FALSE); + static void SetAppearanceFlag(sal_Int32 nFlag, sal_Bool bSet, sal_Bool bSaveInConfig = sal_False); - void SetDocBoundaries(BOOL bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} + void SetDocBoundaries(sal_Bool bSet) {SetAppearanceFlag(VIEWOPT_DOC_BOUNDARIES, bSet);} static void ApplyColorConfigValues(const svtools::ColorConfig& rConfig); }; -inline BOOL SwViewOption::operator==( const SwViewOption &rOpt ) const +inline sal_Bool SwViewOption::operator==( const SwViewOption &rOpt ) const { return IsEqualFlags( rOpt ) && nZoom == rOpt.GetZoom(); } @@ -599,7 +599,7 @@ inline void SwViewOption::SetUIOptions( const SwViewOption& rVOpt ) // Hilfsfunktion zur Ermittlung der HTML-Faehigkeiten -SW_DLLPUBLIC USHORT GetHtmlMode(const SwDocShell*); +SW_DLLPUBLIC sal_uInt16 GetHtmlMode(const SwDocShell*); #endif diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 19d31b4bec3e..7e07979f47a0 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -25,8 +25,9 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _VIEWSH_HXX -#define _VIEWSH_HXX +#ifndef SW_VIEWSH_HXX +#define SW_VIEWSH_HXX + #include <com/sun/star/embed/XClassifiedObject.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <tools/rtti.hxx> @@ -65,7 +66,6 @@ class SfxItemPool; class SfxViewShell; class SwViewOption; class SwViewImp; -class SwPrtOptions; class SwPrintData; class SwPagePreViewPrtData; class Window; @@ -111,7 +111,7 @@ class SW_DLLPUBLIC ViewShell : public Ring //Umsetzen der SwVisArea, damit vor dem Drucken sauber formatiert //werden kann. - friend void SetSwVisArea( ViewShell *pSh, const SwRect &, BOOL bPDFExport = FALSE ); + friend void SetSwVisArea( ViewShell *pSh, const SwRect &, sal_Bool bPDFExport = sal_False ); static BitmapEx* pReplaceBmp; // replaced display of still loaded images static BitmapEx* pErrorBmp; // error display of missed images @@ -266,7 +266,7 @@ public: Point GetPagePos( sal_uInt16 nPageNum ) const; sal_uInt16 GetNumPages(); //Anzahl der aktuellen Seiten Layout erfragen. - sal_Bool IsDummyPage( USHORT nPageNum ) const; // An empty page? + sal_Bool IsDummyPage( sal_uInt16 nPageNum ) const; // An empty page? //Invalidierung der ersten Sichtbaren Seite fuer alle Shells im Ring. void SetFirstVisPageInvalid(); @@ -329,7 +329,8 @@ public: /** Provides access to the document undo/redo interface */ - IDocumentUndoRedo* getIDocumentUndoRedoAccess(); + IDocumentUndoRedo const& GetIDocumentUndoRedo() const; + IDocumentUndoRedo & GetIDocumentUndoRedo(); const IDocumentListItems* getIDocumentListItemsAccess() const; const IDocumentOutlineNodes* getIDocumentOutlineNodesAccess() const; @@ -350,7 +351,8 @@ public: // printing of one page. // bIsPDFExport == true is: do PDF Export (no printing!) - sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, const SwPrtOptions &rPrintData, + sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, + SwPrintData const& rPrintData, sal_Int32 nRenderer /* offset in vector of pages to print */ ); // printing of one brochure page @@ -361,8 +363,7 @@ public: static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions, OutputDevice* pOleOut, const Rectangle& rRect ); - // creates temporary doc with selected text for PDF export - SwDoc * CreatePrtDoc( SfxObjectShellRef& ); + /// fill temporary doc with selected text for Print or PDF export SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt ); //Wird intern fuer die Shell gerufen die Druckt. Formatiert die Seiten. @@ -454,7 +455,7 @@ public: input parameter - constant reference to print options, to which the view option will be adjusted. */ - void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions ); + void AdjustOptionsForPagePreview( SwPrintData const& rPrintOptions ); sal_Bool IsViewLocked() const { return bViewLocked; } void LockView( sal_Bool b ) { bViewLocked = b; } @@ -490,7 +491,7 @@ public: //wenn sich der BrowdseModus aendert, bBrowseChgd == sal_True //oder, im BrowseModus, wenn sich die Groessenverhaeltnisse //aendern (bBrowseChgd == sal_False) - void CheckBrowseView( BOOL bBrowseChgd ); + void CheckBrowseView( sal_Bool bBrowseChgd ); const Size& GetBrowseBorder() const; sal_Int32 GetBrowseWidth() const; @@ -609,6 +610,6 @@ inline const SfxItemPool& ViewShell::GetAttrPool() const -#endif //_VIEWSH_HXX +#endif // SW_VIEWSH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx index 07f082e0c8c3..e8e917b888ff 100644 --- a/sw/inc/viscrs.hxx +++ b/sw/inc/viscrs.hxx @@ -46,11 +46,11 @@ class SwVisCrsr friend void _InitCore(); friend void _FinitCore(); - BOOL bIsVisible : 1; - BOOL bIsDragCrsr : 1; + sal_Bool bIsVisible : 1; + sal_Bool bIsDragCrsr : 1; #ifdef SW_CRSR_TIMER - BOOL bTimerOn : 1; + sal_Bool bTimerOn : 1; #endif Cursor aTxtCrsr; @@ -68,11 +68,11 @@ public: void Show(); void Hide(); - BOOL IsVisible() const { return bIsVisible; } - void SetDragCrsr( BOOL bFlag = TRUE ) { bIsDragCrsr = bFlag; } + sal_Bool IsVisible() const { return bIsVisible; } + void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; } #ifdef SW_CRSR_TIMER - BOOL ChgTimerFlag( BOOL bTimerOn = TRUE ); + sal_Bool ChgTimerFlag( sal_Bool bTimerOn = sal_True ); #endif }; @@ -157,15 +157,15 @@ public: virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - BOOL UpDown( BOOL bUp, USHORT nCnt = 1 ); + sal_Bool UpDown( sal_Bool bUp, sal_uInt16 nCnt = 1 ); - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #if OSL_DEBUG_LEVEL > 1 // zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); @@ -195,7 +195,7 @@ public: virtual void FillRects(); // fuer Table- und normalen Crsr // Pruefe, ob sich der SPoint innerhalb der Tabellen-SSelection befindet - BOOL IsInside( const Point& rPt ) const; + sal_Bool IsInside( const Point& rPt ) const; virtual void SetMark(); virtual SwCursor* Create( SwPaM* pRing = 0 ) const; @@ -203,13 +203,13 @@ public: virtual short MaxReplaceArived(); //returns RET_YES/RET_CANCEL/RET_NO virtual void SaveTblBoxCntnt( const SwPosition* pPos = 0 ); - // TRUE: an die Position kann der Cursor gesetzt werden - virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const; + // sal_True: an die Position kann der Cursor gesetzt werden + virtual sal_Bool IsAtValidPos( sal_Bool bPoint = sal_True ) const; #if OSL_DEBUG_LEVEL > 1 // zum Testen des UNO-Crsr Verhaltens hier die Implementierung // am sichtbaren Cursor - virtual BOOL IsSelOvr( int eFlags = + virtual sal_Bool IsSelOvr( int eFlags = ( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION | nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS )); diff --git a/sw/inc/wdocsh.hxx b/sw/inc/wdocsh.hxx index 8b1e6a68cd60..74ca5f098854 100644 --- a/sw/inc/wdocsh.hxx +++ b/sw/inc/wdocsh.hxx @@ -33,7 +33,7 @@ class SW_DLLPUBLIC SwWebDocShell: public SwDocShell { - USHORT nSourcePara; // aktive Zeile in der SourceView + sal_uInt16 nSourcePara; // aktive Zeile in der SourceView public: @@ -54,9 +54,9 @@ public: String * pUserName, sal_Int32 nFileFormat, sal_Bool bTemplate = sal_False ) const; - USHORT GetSourcePara()const + sal_uInt16 GetSourcePara()const {return nSourcePara;} - void SetSourcePara(USHORT nSet) {nSourcePara = nSet;} + void SetSourcePara(sal_uInt16 nSet) {nSourcePara = nSet;} }; #endif |