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/source/ui/fldui | |
| 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/source/ui/fldui')
34 files changed, 787 insertions, 801 deletions
diff --git a/sw/source/ui/fldui/DropDownFieldDialog.cxx b/sw/source/ui/fldui/DropDownFieldDialog.cxx index 8385b40fb402..247f57fef83d 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.cxx +++ b/sw/source/ui/fldui/DropDownFieldDialog.cxx @@ -33,7 +33,6 @@ #undef SW_DLLIMPLEMENTATION #endif - #include <wrtsh.hxx> #include <fldbas.hxx> #include <fldmgr.hxx> @@ -50,7 +49,7 @@ using namespace ::com::sun::star; Beschreibung: Feldeinfuegen bearbeiten --------------------------------------------------------------------*/ sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS, - SwField* pField, BOOL bNextButton ) : + SwField* pField, sal_Bool bNextButton ) : SvxStandardDialog(pParent, SW_RES(DLG_FLD_DROPDOWN)), aItemsFL( this, SW_RES( FL_ITEMS )), @@ -94,7 +93,7 @@ sw::DropDownFieldDialog::DropDownFieldDialog( Window *pParent, SwWrtShell &rS, aListItemsLB.SelectEntry(pDropField->GetSelectedItem()); } - BOOL bEnable = !rSh.IsCrsrReadonly(); + sal_Bool bEnable = !rSh.IsCrsrReadonly(); aOKPB.Enable( bEnable ); aListItemsLB.GrabFocus(); @@ -114,13 +113,12 @@ void sw::DropDownFieldDialog::Apply() { rSh.StartAllAction(); - SwDropDownField * pCopy = (SwDropDownField *) pDropField->Copy(); + ::std::auto_ptr<SwDropDownField> const pCopy( + static_cast<SwDropDownField *>( pDropField->CopyField() ) ); pCopy->SetPar1(sSelect); rSh.SwEditShell::UpdateFlds(*pCopy); - delete pCopy; - rSh.SetUndoNoResetModified(); rSh.EndAllAction(); } diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src index 407ee199a8ef..e84b3d73c854 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.src +++ b/sw/source/ui/fldui/DropDownFieldDialog.src @@ -45,6 +45,7 @@ ModalDialog DLG_FLD_DROPDOWN }; ListBox LB_LISTITEMS { + HelpID = "sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 115 , 99 ) ; @@ -67,6 +68,7 @@ ModalDialog DLG_FLD_DROPDOWN }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT"; Pos = MAP_APPFONT ( 139 , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -81,6 +83,7 @@ ModalDialog DLG_FLD_DROPDOWN }; PushButton PB_EDIT { + HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT"; Pos = MAP_APPFONT ( 139 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index f90bf0a362d4..5ccadfee991b 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -99,7 +99,7 @@ SwChangeDBDlg::SwChangeDBDlg(SwView& rVw) : aAddDBPB.SetClickHdl(LINK(this, SwChangeDBDlg, AddDBHdl)); aUsedDBTLB.SetSelectionMode(MULTIPLE_SELECTION); - aUsedDBTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); + aUsedDBTLB.SetStyle(aUsedDBTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); aUsedDBTLB.SetSpaceBetweenEntries(0); aUsedDBTLB.SetNodeBitmaps( aImageList.GetImage(IMG_COLLAPSE), aImageList.GetImage(IMG_EXPAND)); @@ -144,12 +144,12 @@ void SwChangeDBDlg::FillDBPopup() SvStringsDtor aDBNameList(5, 1); pSh->GetAllUsedDB( aDBNameList, &aAllDBNames ); - USHORT nCount = aDBNameList.Count(); + sal_uInt16 nCount = aDBNameList.Count(); aUsedDBTLB.Clear(); SvLBoxEntry *pFirst = 0; SvLBoxEntry *pLast = 0; - for (USHORT k = 0; k < nCount; k++) + for (sal_uInt16 k = 0; k < nCount; k++) { sDBName = *aDBNameList.GetObject(k); sDBName = sDBName.GetToken(0); @@ -174,8 +174,8 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) SvLBoxEntry* pParent; SvLBoxEntry* pChild; - USHORT nParent = 0; - USHORT nChild = 0; + sal_uInt16 nParent = 0; + sal_uInt16 nChild = 0; Image aTableImg = aImageList.GetImage(IMG_DBTABLE); Image aDBImg = aImageList.GetImage(IMG_DB); @@ -220,7 +220,7 @@ void SwChangeDBDlg::Apply() void SwChangeDBDlg::UpdateFlds() { - SvStringsDtor aDBNames( (BYTE)aUsedDBTLB.GetSelectionCount(), 1 ); + SvStringsDtor aDBNames( (sal_uInt8)aUsedDBTLB.GetSelectionCount(), 1 ); SvLBoxEntry* pEntry = aUsedDBTLB.FirstSelected(); while( pEntry ) @@ -232,7 +232,7 @@ void SwChangeDBDlg::UpdateFlds() *pTmp += DB_DELIM; *pTmp += aUsedDBTLB.GetEntryText( pEntry ); *pTmp += DB_DELIM; - int nCommandType = (int)(ULONG)pEntry->GetUserData(); + int nCommandType = (int)(sal_uLong)pEntry->GetUserData(); *pTmp += String::CreateFromInt32(nCommandType); aDBNames.Insert(pTmp, aDBNames.Count() ); } @@ -268,14 +268,14 @@ IMPL_LINK( SwChangeDBDlg, ButtonHdl, Button *, EMPTYARG ) IMPL_LINK( SwChangeDBDlg, TreeSelectHdl, SvTreeListBox *, EMPTYARG ) { - BOOL bEnable = FALSE; + sal_Bool bEnable = sal_False; SvLBoxEntry* pEntry = aAvailDBTLB.GetCurEntry(); if (pEntry) { if (aAvailDBTLB.GetParent(pEntry)) - bEnable = TRUE; + bEnable = sal_True; aOKBT.Enable( bEnable ); } return 0; @@ -291,7 +291,7 @@ void SwChangeDBDlg::ShowDBName(const SwDBData& rDBData) sTmp += '.'; sTmp += (String)rDBData.sCommand; - for (USHORT i = 0; i < sTmp.Len(); i++) + for (sal_uInt16 i = 0; i < sTmp.Len(); i++) { sName += sTmp.GetChar(i); if (sTmp.GetChar(i) == '~') diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index babf0b5bba13..7a67a360eda7 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.src @@ -31,6 +31,7 @@ ModalDialog DLG_CHANGE_DB { + HelpID = "sw:ModalDialog:DLG_CHANGE_DB"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 286 , 175 ) ; @@ -74,6 +75,7 @@ ModalDialog DLG_CHANGE_DB }; PushButton PB_ADDDB { + HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB"; Pos = MAP_APPFONT ( 118 , 90 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Browse..." ; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 4a0f75eb8139..cacd4f024ab7 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -55,7 +55,7 @@ SwFldDBPage::SwFldDBPage(Window* pParent, const SfxItemSet& rCoreSet ) : aTypeFT (this, SW_RES(FT_DBTYPE)), aTypeLB (this, SW_RES(LB_DBTYPE)), aSelectionFT(this, SW_RES(FT_DBSELECTION)), - aDatabaseTLB(this, SW_RES(TLB_DBLIST), 0, aEmptyStr, FALSE), + aDatabaseTLB(this, SW_RES(TLB_DBLIST), 0, aEmptyStr, sal_False), aAddDBFT(this, SW_RES(FT_ADDDB)), aAddDBPB(this, SW_RES(PB_ADDDB)), aConditionFT(this, SW_RES(FT_DBCONDITION)), @@ -92,13 +92,13 @@ void SwFldDBPage::Reset(const SfxItemSet&) { Init(); // Allgemeine initialisierung - aTypeLB.SetUpdateMode(FALSE); - USHORT nOldPos = aTypeLB.GetSelectEntryPos(); + aTypeLB.SetUpdateMode(sal_False); + sal_uInt16 nOldPos = aTypeLB.GetSelectEntryPos(); sOldDBName = aDatabaseTLB.GetDBName(sOldTableName, sOldColumnName); aTypeLB.Clear(); - USHORT nPos, nTypeId, i; + sal_uInt16 nPos, nTypeId, i; if (!IsFldEdit()) { @@ -125,11 +125,11 @@ void SwFldDBPage::Reset(const SfxItemSet&) aFormatLB.Clear(); - USHORT nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, FALSE, IsFldDlgHtmlMode()); + sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, sal_False, IsFldDlgHtmlMode()); for( i = 0; i < nSize; ++i ) { - USHORT nEntryPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i)); - USHORT nFmtId = GetFldMgr().GetFormatId( TYP_DBSETNUMBERFLD, i ); + sal_uInt16 nEntryPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i)); + sal_uInt16 nFmtId = GetFldMgr().GetFormatId( TYP_DBSETNUMBERFLD, i ); aFormatLB.SetEntryData( nEntryPos, reinterpret_cast<void*>(nFmtId) ); if( SVX_NUM_ARABIC == nFmtId ) aFormatLB.SelectEntryPos( nEntryPos ); @@ -163,11 +163,11 @@ void SwFldDBPage::Reset(const SfxItemSet&) if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) { String sVal = sUserData.GetToken(1, ';'); - USHORT nVal = (USHORT)sVal.ToInt32(); + sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32(); if(nVal != USHRT_MAX) { for(i = 0; i < aTypeLB.GetEntryCount(); i++) - if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i)) + if(nVal == (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(i)) { aTypeLB.SelectEntryPos(i); break; @@ -177,7 +177,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } TypeHdl(0); - aTypeLB.SetUpdateMode(TRUE); + aTypeLB.SetUpdateMode(sal_True); aTypeLB.SetSelectHdl(LINK(this, SwFldDBPage, TypeHdl)); aTypeLB.SetDoubleClickHdl(LINK(this, SwFldDBPage, InsertHdl)); @@ -191,7 +191,7 @@ void SwFldDBPage::Reset(const SfxItemSet&) } } -BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldDBPage::FillItemSet(SfxItemSet& ) { String sTableName, sColumnName; SwDBData aData; @@ -208,11 +208,11 @@ BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) if(aData.sDataSource.getLength()) // Ohne Datenbank kein neuer Feldbefehl { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); String aVal(aValueED.GetText()); String aName(aConditionED.GetText()); - ULONG nFormat = 0; - USHORT nSubType = 0; + sal_uLong nFormat = 0; + sal_uInt16 nSubType = 0; String sDBName = aData.sDataSource; sDBName += DB_DELIM; @@ -237,7 +237,7 @@ BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) break; case TYP_DBSETNUMBERFLD: - nFormat = (USHORT)(ULONG)aFormatLB.GetEntryData( + nFormat = (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData( aFormatLB.GetSelectEntryPos() ); break; } @@ -245,7 +245,7 @@ BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) String sTempDBName, sTempTableName, sTempColumnName; sTempDBName = aDatabaseTLB.GetDBName(sTempTableName, sTempColumnName); - BOOL bDBListBoxChanged = sOldDBName != sTempDBName || + sal_Bool bDBListBoxChanged = sOldDBName != sTempDBName || sOldTableName != sTempTableName || sOldColumnName != sTempColumnName; if (!IsFldEdit() || aConditionED.GetSavedValue() != aConditionED.GetText() || @@ -257,7 +257,7 @@ BOOL SwFldDBPage::FillItemSet(SfxItemSet& ) } } - return FALSE; + return sal_False; } SfxTabPage* SwFldDBPage::Create( Window* pParent, @@ -266,7 +266,7 @@ SfxTabPage* SwFldDBPage::Create( Window* pParent, return ( new SwFldDBPage( pParent, rAttrSet ) ); } -USHORT SwFldDBPage::GetGroup() +sal_uInt16 SwFldDBPage::GetGroup() { return GRP_DB; } @@ -274,7 +274,7 @@ USHORT SwFldDBPage::GetGroup() IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) { // Alte ListBoxPos sichern - const USHORT nOld = GetTypeSel(); + const sal_uInt16 nOld = GetTypeSel(); // Aktuelle ListBoxPos SetTypeSel(aTypeLB.GetSelectEntryPos()); @@ -290,8 +290,8 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) SwWrtShell *pSh = GetWrtShell(); if(!pSh) pSh = ::GetActiveWrtShell(); - BOOL bCond = FALSE, bSetNo = FALSE, bFormat = FALSE, bDBFormat = FALSE; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bCond = sal_False, bSetNo = sal_False, bFormat = sal_False, bDBFormat = sal_False; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); aDatabaseTLB.ShowColumns(nTypeId == TYP_DBFLD); @@ -314,8 +314,8 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) switch (nTypeId) { case TYP_DBFLD: - bFormat = TRUE; - bDBFormat = TRUE; + bFormat = sal_True; + bDBFormat = sal_True; aNumFormatLB.Show(); aFormatLB.Hide(); @@ -335,10 +335,10 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) break; case TYP_DBNUMSETFLD: - bSetNo = TRUE; + bSetNo = sal_True; // kein break! case TYP_DBNEXTSETFLD: - bCond = TRUE; + bCond = sal_True; if (IsFldEdit()) { aConditionED.SetText(GetCurField()->GetPar1()); @@ -350,14 +350,14 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) break; case TYP_DBSETNUMBERFLD: - bFormat = TRUE; + bFormat = sal_True; aNewFormatRB.Check(); aNumFormatLB.Hide(); aFormatLB.Show(); if( IsFldEdit() ) { - for( USHORT nI = aFormatLB.GetEntryCount(); nI; ) - if( GetCurField()->GetFormat() == (USHORT)(ULONG) + for( sal_uInt16 nI = aFormatLB.GetEntryCount(); nI; ) + if( GetCurField()->GetFormat() == (sal_uInt16)(sal_uLong) aFormatLB.GetEntryData( --nI )) { aFormatLB.SelectEntryPos( nI ); @@ -385,7 +385,7 @@ IMPL_LINK( SwFldDBPage, TypeHdl, ListBox *, pBox ) aValueED.SetText(aEmptyStr); if (bCond) aConditionED.SetText( String::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "TRUE" ))); + RTL_CONSTASCII_STRINGPARAM( "sal_True" ))); else aConditionED.SetText(aEmptyStr); } @@ -406,8 +406,8 @@ IMPL_LINK( SwFldDBPage, NumSelectHdl, NumFormatListBox *, pLB ) void SwFldDBPage::CheckInsert() { - BOOL bInsert = TRUE; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bInsert = sal_True; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); SvLBoxEntry* pEntry = aDatabaseTLB.GetCurEntry(); @@ -421,11 +421,11 @@ void SwFldDBPage::CheckInsert() bInsert &= pEntry != 0; } else - bInsert = FALSE; + bInsert = sal_False; if (nTypeId == TYP_DBNUMSETFLD) { - BOOL bHasValue = aValueED.GetText().Len() != 0; + sal_Bool bHasValue = aValueED.GetText().Len() != 0; bInsert &= bHasValue; } @@ -439,7 +439,7 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) SvLBoxEntry* pEntry = pColEntry = pBox->GetCurEntry(); if (pEntry) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); pEntry = aDatabaseTLB.GetParent(pEntry); @@ -450,13 +450,13 @@ IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) if (nTypeId == TYP_DBFLD) { - BOOL bNumFormat = FALSE; + sal_Bool bNumFormat = sal_False; if (pEntry != 0) { String sTableName; String sColumnName; - BOOL bIsTable; + sal_Bool bIsTable; String sDBName = aDatabaseTLB.GetDBName(sTableName, sColumnName, &bIsTable); bNumFormat = GetFldMgr().IsDBNumeric(sDBName, sTableName, @@ -499,19 +499,19 @@ void SwFldDBPage::FillUserData() String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); sData += ';'; - USHORT nTypeSel = aTypeLB.GetSelectEntryPos(); + sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = (USHORT)(ULONG)aTypeLB.GetEntryData( nTypeSel ); + nTypeSel = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData( nTypeSel ); sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } void SwFldDBPage::ActivateMailMergeAddress() { - ULONG nData = TYP_DBFLD; + sal_uLong nData = TYP_DBFLD; aTypeLB.SelectEntryPos(aTypeLB.GetEntryPos( (const void*) nData )); aTypeLB.GetSelectHdl().Call(&aTypeLB); const SwDBData& rData = SW_MOD()->GetDBConfig()->GetAddressSource(); diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index d473d6bf828f..07e76a171708 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -63,8 +63,8 @@ class SwFldDBPage : public SwFldPage String sOldDBName; String sOldTableName; String sOldColumnName; - ULONG nOldFormat; - USHORT nOldSubType; + sal_uLong nOldFormat; + sal_uInt16 nOldSubType; Link aOldNumSelectHdl; DECL_LINK( TypeHdl, ListBox* ); @@ -78,7 +78,7 @@ class SwFldDBPage : public SwFldPage using SwFldPage::SetWrtShell; protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldDBPage(Window* pParent, const SfxItemSet& rSet); @@ -87,7 +87,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index ce9f3dd8a09a..6e715c455473 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -43,6 +43,7 @@ TabPage TP_FLD_DB }; ListBox LB_DBTYPE { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 104 ) ; @@ -67,6 +68,7 @@ TabPage TP_FLD_DB }; Edit ED_DBCONDITION { + HelpID = "sw:Edit:TP_FLD_DB:ED_DBCONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 137 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -82,6 +84,7 @@ TabPage TP_FLD_DB }; Edit ED_DBSETNUMBER { + HelpID = "sw:Edit:TP_FLD_DB:ED_DBSETNUMBER"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 167 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -110,6 +113,7 @@ TabPage TP_FLD_DB }; PushButton PB_ADDDB { + HelpID = "sw:PushButton:TP_FLD_DB:PB_ADDDB"; Pos = MAP_APPFONT ( 198 , 121) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Browse..." ; @@ -117,6 +121,7 @@ TabPage TP_FLD_DB RadioButton RB_DBOWNFORMAT { + HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT"; Pos = MAP_APPFONT ( 94 , 153 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Check = TRUE ; @@ -124,12 +129,14 @@ TabPage TP_FLD_DB }; RadioButton RB_DBFORMAT { + HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBFORMAT"; Pos = MAP_APPFONT ( 94 , 166 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "User-defined" ; }; ListBox LB_DBNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 164 ) ; Size = MAP_APPFONT ( 53 , 60 ) ; @@ -139,6 +146,7 @@ TabPage TP_FLD_DB }; ListBox LB_DBFORMAT { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 163 ) ; Size = MAP_APPFONT ( 53 , 60 ) ; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 91b5934c2307..22409a6cc86b 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -81,16 +81,16 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : aTypeTLB.SetHelpId(HID_FIELD_DINF_TYPE); aTypeTLB.SetSelectionMode(SINGLE_SELECTION); - aTypeTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); + aTypeTLB.SetStyle(aTypeTLB.GetStyle()|WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // Font nicht setzen, damit der Font des Controls uebernommen wird! // Sonst bei falschem Font Bug an OV. aTypeTLB.SetSpaceBetweenEntries(0); aTypeTLB.SetNodeDefaultImages(); //enable 'active' language selection - aFormatLB.SetShowLanguageControl(TRUE); + aFormatLB.SetShowLanguageControl(sal_True); - SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, FALSE ); + SFX_ITEMSET_ARG( &rCoreSet, pItem, SfxUnoAnyItem, SID_DOCINFO, sal_False ); if ( pItem ) pItem->GetValue() >>= xCustomPropertySet; } @@ -104,17 +104,17 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) Init(); // Allgemeine initialisierung // TypeListBox initialisieren - aTypeTLB.SetUpdateMode(FALSE); + aTypeTLB.SetUpdateMode(sal_False); aTypeTLB.Clear(); pSelEntry = 0; // SubTypes in der TypeLB anzeigen - USHORT nTypeId = TYP_DOCINFOFLD; + sal_uInt16 nTypeId = TYP_DOCINFOFLD; SvLBoxEntry* pEntry = 0; SvLBoxEntry* pInfo = 0; - USHORT nSubType = USHRT_MAX; + sal_uInt16 nSubType = USHRT_MAX; if (IsFldEdit()) { const SwField* pCurField = GetCurField(); @@ -133,17 +133,17 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) } } - USHORT nSelEntryData = USHRT_MAX; + sal_uInt16 nSelEntryData = USHRT_MAX; String sUserData = GetUserData(); if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) { String sVal = sUserData.GetToken(1, ';'); - nSelEntryData = static_cast< USHORT >(sVal.ToInt32()); + nSelEntryData = static_cast< sal_uInt16 >(sVal.ToInt32()); } SvStringsDtor aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); - for (USHORT i = 0; i < aLst.Count(); ++i) + for (sal_uInt16 i = 0; i < aLst.Count(); ++i) { if (!IsFldEdit() || nSubType == i) { @@ -190,19 +190,19 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) if (pSelEntry != 0) { aTypeTLB.Select(pSelEntry); - nSubType = (USHORT)(ULONG)pSelEntry->GetUserData(); + nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); } else if ( aTypeTLB.GetEntry(0) ) { pSelEntry = aTypeTLB.GetEntry(0); - nSubType = (USHORT)(ULONG)pSelEntry->GetUserData(); + nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); } FillSelectionLB(nSubType); if ( pSelEntry ) TypeHdl(); - aTypeTLB.SetUpdateMode(TRUE); + aTypeTLB.SetUpdateMode(sal_True); aTypeTLB.SetSelectHdl(LINK(this, SwFldDokInfPage, TypeHdl)); aTypeTLB.SetDoubleClickHdl(LINK(this, SwFldDokInfPage, InsertHdl)); aSelectionLB.SetSelectHdl(LINK(this, SwFldDokInfPage, SubTypeHdl)); @@ -233,7 +233,7 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) else if (pOldEntry != pSelEntry) - FillSelectionLB((USHORT)(ULONG)pSelEntry->GetUserData()); + FillSelectionLB((sal_uInt16)(sal_uLong)pSelEntry->GetUserData()); SubTypeHdl(); @@ -242,10 +242,10 @@ IMPL_LINK( SwFldDokInfPage, TypeHdl, ListBox *, EMPTYARG ) IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) { - USHORT nSubType = (USHORT)(ULONG)pSelEntry->GetUserData(); - USHORT nPos = aSelectionLB.GetSelectEntryPos(); - USHORT nExtSubType; - USHORT nNewType = 0; + sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nExtSubType; + sal_uInt16 nNewType = 0; if (nSubType != DI_EDIT) { @@ -254,8 +254,8 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) if (!aSelectionLB.GetEntryCount()) { aFormatLB.Clear(); - aFormatLB.Enable(FALSE); - aFormatFT.Enable(FALSE); + aFormatLB.Enable(sal_False); + aFormatFT.Enable(sal_False); if( nSubType == DI_CUSTOM ) { //find out which type the custom field has - for a start set to DATE format @@ -287,14 +287,14 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) nPos = 0; } - nExtSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nExtSubType = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); } else nExtSubType = DI_SUB_TIME; - USHORT nOldType = 0; - BOOL bEnable = FALSE; - BOOL bOneArea = FALSE; + sal_uInt16 nOldType = 0; + sal_Bool bEnable = sal_False; + sal_Bool bOneArea = sal_False; if (aFormatLB.IsEnabled()) nOldType = aFormatLB.GetFormatType(); @@ -306,12 +306,12 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) case DI_SUB_DATE: nNewType = NUMBERFORMAT_DATE; - bOneArea = TRUE; + bOneArea = sal_True; break; case DI_SUB_TIME: nNewType = NUMBERFORMAT_TIME; - bOneArea = TRUE; + bOneArea = sal_True; break; } if (!nNewType) @@ -325,19 +325,19 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) aFormatLB.SetFormatType(nNewType); aFormatLB.SetOneArea(bOneArea); } - bEnable = TRUE; + bEnable = sal_True; } - ULONG nFormat = IsFldEdit() ? ((SwDocInfoField*)GetCurField())->GetFormat() : 0; + sal_uLong nFormat = IsFldEdit() ? ((SwDocInfoField*)GetCurField())->GetFormat() : 0; - USHORT nOldSubType = IsFldEdit() ? (((SwDocInfoField*)GetCurField())->GetSubType() & 0xff00) : 0; + sal_uInt16 nOldSubType = IsFldEdit() ? (((SwDocInfoField*)GetCurField())->GetSubType() & 0xff00) : 0; if (IsFldEdit()) { nPos = aSelectionLB.GetSelectEntryPos(); if (nPos != LISTBOX_ENTRY_NOTFOUND ) { - nSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nSubType = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); nOldSubType &= ~DI_SUB_FIXED; if (nOldSubType == nSubType) @@ -375,10 +375,10 @@ IMPL_LINK( SwFldDokInfPage, SubTypeHdl, ListBox *, EMPTYARG ) return 0; } -USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) +sal_uInt16 SwFldDokInfPage::FillSelectionLB(sal_uInt16 nSubType) { // Format-Listbox fuellen - USHORT nTypeId = TYP_DOCINFOFLD; + sal_uInt16 nTypeId = TYP_DOCINFOFLD; EnableInsert(nSubType != USHRT_MAX); @@ -387,9 +387,9 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) aSelectionLB.Clear(); - USHORT nSize = 0; - USHORT nSelPos = USHRT_MAX; - USHORT nExtSubType = IsFldEdit() ? (((SwDocInfoField*)GetCurField())->GetSubType() & 0xff00) : 0; + sal_uInt16 nSize = 0; + sal_uInt16 nSelPos = USHRT_MAX; + sal_uInt16 nExtSubType = IsFldEdit() ? (((SwDocInfoField*)GetCurField())->GetSubType() & 0xff00) : 0; if (IsFldEdit()) { @@ -403,24 +403,24 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) } else { - nSize = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode()); - for (USHORT i = 0; i < nSize; i++) + nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); + for (sal_uInt16 i = 0; i < nSize; i++) { - USHORT nPos = aSelectionLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); + sal_uInt16 nPos = aSelectionLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId(nTypeId, i))); if (IsFldEdit() && i == nExtSubType) nSelPos = nPos; } } - BOOL bEnable = nSize != 0; + sal_Bool bEnable = nSize != 0; if (nSize) { if (!aSelectionLB.GetSelectEntryCount()) aSelectionLB.SelectEntryPos(nSelPos == USHRT_MAX ? 0 : nSelPos); - bEnable = TRUE; + bEnable = sal_True; } aSelectionFT.Enable(bEnable); @@ -429,24 +429,24 @@ USHORT SwFldDokInfPage::FillSelectionLB(USHORT nSubType) return nSize; } -BOOL SwFldDokInfPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldDokInfPage::FillItemSet(SfxItemSet& ) { - if (!pSelEntry || (USHORT)(ULONG)pSelEntry->GetUserData() == USHRT_MAX) - return FALSE; + if (!pSelEntry || (sal_uInt16)(sal_uLong)pSelEntry->GetUserData() == USHRT_MAX) + return sal_False; - USHORT nTypeId = TYP_DOCINFOFLD; - USHORT nSubType = (USHORT)(ULONG)pSelEntry->GetUserData(); + sal_uInt16 nTypeId = TYP_DOCINFOFLD; + sal_uInt16 nSubType = (sal_uInt16)(sal_uLong)pSelEntry->GetUserData(); - ULONG nFormat = 0; + sal_uLong nFormat = 0; - USHORT nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); ::rtl::OUString aName; if (DI_CUSTOM == nSubType) aName = aTypeTLB.GetEntryText(pSelEntry); if (nPos != LISTBOX_ENTRY_NOTFOUND) - nSubType |= (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nSubType |= (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); if (aFixedCB.IsChecked()) nSubType |= DI_SUB_FIXED; @@ -463,7 +463,7 @@ BOOL SwFldDokInfPage::FillItemSet(SfxItemSet& ) ' ', aFormatLB.IsAutomaticLanguage()); } - return FALSE; + return sal_False; } SfxTabPage* SwFldDokInfPage::Create( Window* pParent, @@ -472,7 +472,7 @@ SfxTabPage* SwFldDokInfPage::Create( Window* pParent, return ( new SwFldDokInfPage( pParent, rAttrSet ) ); } -USHORT SwFldDokInfPage::GetGroup() +sal_uInt16 SwFldDokInfPage::GetGroup() { return GRP_REG; } @@ -483,7 +483,7 @@ void SwFldDokInfPage::FillUserData() RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); sData += ';'; SvLBoxEntry* pEntry = aTypeTLB.FirstSelected(); - USHORT nTypeSel = pEntry ? sal::static_int_cast< USHORT >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; + sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index ead747e26774..ac19388d5c9f 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -57,17 +57,17 @@ class SwFldDokInfPage : public SwFldPage String aInfoStr; - USHORT nOldSel; - ULONG nOldFormat; + sal_uInt16 nOldSel; + sal_uLong nOldFormat; ::rtl::OUString m_sOldCustomFieldName; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - USHORT FillSelectionLB(USHORT nSubTypeId); + sal_uInt16 FillSelectionLB(sal_uInt16 nSubTypeId); protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldDokInfPage(Window* pWindow, const SfxItemSet& rSet); @@ -76,7 +76,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index 8a3e86c4548b..824345a7162c 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -57,6 +57,7 @@ TabPage TP_FLD_DOKINF }; ListBox LB_DOKINFSELECTION { + HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 16 ) ; Size = MAP_APPFONT ( 76 , 163 ) ; @@ -78,6 +79,7 @@ TabPage TP_FLD_DOKINF }; ListBox LB_DOKINFFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 16 ) ; Size = MAP_APPFONT ( 84 , 148 ) ; @@ -86,6 +88,7 @@ TabPage TP_FLD_DOKINF }; CheckBox CB_DOKINFFIXEDCONTENT { + HelpID = "sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT"; Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index e2b25738c39f..953a055a5081 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -83,7 +83,7 @@ SwFldDokPage::SwFldDokPage(Window* pWindow, const SfxItemSet& rCoreSet ) : aDateOffsetED.SetMin(LONG_MIN); aDateOffsetED.SetMax(LONG_MAX); //enable 'active' language selection - aNumFormatLB.SetShowLanguageControl(TRUE); + aNumFormatLB.SetShowLanguageControl(sal_True); } SwFldDokPage::~SwFldDokPage() @@ -98,11 +98,11 @@ void SwFldDokPage::Reset(const SfxItemSet& ) // TypeListBox initialisieren const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); - aTypeLB.SetUpdateMode(FALSE); + aTypeLB.SetUpdateMode(sal_False); aTypeLB.Clear(); - USHORT nPos, nTypeId; - BOOL bPage = FALSE; + sal_uInt16 nPos, nTypeId; + sal_Bool bPage = sal_False; if (!IsFldEdit()) { @@ -120,7 +120,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) { nPos = aTypeLB.InsertEntry(SW_RESSTR(FMT_REF_PAGE)); aTypeLB.SetEntryData(nPos, (void*)USHRT_MAX); - bPage = TRUE; + bPage = sal_True; } break; @@ -156,7 +156,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) // alte Pos selektieren RestorePos(&aTypeLB); - aTypeLB.SetUpdateMode(TRUE); + aTypeLB.SetUpdateMode(sal_True); aTypeLB.SetDoubleClickHdl(LINK(this, SwFldDokPage, InsertHdl)); aTypeLB.SetSelectHdl(LINK(this, SwFldDokPage, TypeHdl)); aFormatLB.SetSelectHdl(LINK(this, SwFldDokPage, FormatHdl)); @@ -167,11 +167,11 @@ void SwFldDokPage::Reset(const SfxItemSet& ) if( sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1 )) { String sVal = sUserData.GetToken(1, ';'); - USHORT nVal = static_cast< USHORT >(sVal.ToInt32()); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); if(nVal != USHRT_MAX) { - for(USHORT i = 0; i < aTypeLB.GetEntryCount(); i++) - if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i)) + for(sal_uInt16 i = 0; i < aTypeLB.GetEntryCount(); i++) + if(nVal == (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(i)) { aTypeLB.SelectEntryPos(i); break; @@ -195,7 +195,7 @@ void SwFldDokPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern - const USHORT nOld = GetTypeSel(); + const sal_uInt16 nOld = GetTypeSel(); // Aktuelle ListBoxPos SetTypeSel(aTypeLB.GetSelectEntryPos()); @@ -206,11 +206,11 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) aTypeLB.SelectEntryPos(0); } - USHORT nCount; + sal_uInt16 nCount; if (nOld != GetTypeSel()) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); // Auswahl-Listbox fuellen aSelectionLB.Clear(); @@ -223,11 +223,11 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) if (nTypeId != TYP_AUTHORFLD) nCount = aLst.Count(); else - nCount = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode()); + nCount = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); - USHORT nPos; + sal_uInt16 nPos; - for (USHORT i = 0; i < nCount; ++i) + for (sal_uInt16 i = 0; i < nCount; ++i) { if (!IsFldEdit()) { @@ -240,7 +240,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) } else { - BOOL bInsert = FALSE; + sal_Bool bInsert = sal_False; switch (nTypeId) { @@ -273,7 +273,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) default: if (*aLst[i] == GetCurField()->GetPar1()) - bInsert = TRUE; + bInsert = sal_True; break; } if (bInsert) @@ -291,12 +291,12 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) AddSubType(TYP_PAGENUMBERFLD); AddSubType(TYP_PREVPAGEFLD); AddSubType(TYP_NEXTPAGEFLD); - nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(0); + nTypeId = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(0); nCount = 3; aSelectionLB.SetSelectHdl(LINK(this, SwFldDokPage, SubTypeHdl)); } - BOOL bEnable = nCount != 0; + sal_Bool bEnable = nCount != 0; if (bEnable && !aSelectionLB.GetSelectEntryCount()) aSelectionLB.SelectEntryPos(0); @@ -305,18 +305,18 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) aSelectionFT.Enable( bEnable ); // Format-Listbox fuellen - USHORT nSize = FillFormatLB(nTypeId); + sal_uInt16 nSize = FillFormatLB(nTypeId); - BOOL bValue = FALSE, bLevel = FALSE, bNumFmt = FALSE, bOffset = FALSE; - BOOL bFormat = nSize != 0; - BOOL bOneArea = FALSE; - BOOL bFixed = FALSE; - USHORT nFmtType = 0; + sal_Bool bValue = sal_False, bLevel = sal_False, bNumFmt = sal_False, bOffset = sal_False; + sal_Bool bFormat = nSize != 0; + sal_Bool bOneArea = sal_False; + sal_Bool bFixed = sal_False; + sal_uInt16 nFmtType = 0; switch (nTypeId) { case TYP_DATEFLD: - bFormat = bNumFmt = bOneArea = bOffset = TRUE; + bFormat = bNumFmt = bOneArea = bOffset = sal_True; nFmtType = NUMBERFORMAT_DATE; aValueFT.SetText(sDateOffset); @@ -328,7 +328,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) break; case TYP_TIMEFLD: - bFormat = bNumFmt = bOneArea = bOffset = TRUE; + bFormat = bNumFmt = bOneArea = bOffset = sal_True; nFmtType = NUMBERFORMAT_TIME; aValueFT.SetText(sTimeOffset); @@ -343,13 +343,13 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) case TYP_NEXTPAGEFLD: if (IsFldEdit()) { - USHORT nTmp = (USHORT)(ULONG)aFormatLB.GetEntryData( + sal_uInt16 nTmp = (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData( aFormatLB.GetSelectEntryPos() ); String sOldTxt(aValueFT.GetText()); if(SVX_NUM_CHAR_SPECIAL != nTmp) { - INT32 nOff = GetCurField()->GetPar2().ToInt32(); + sal_Int32 nOff = GetCurField()->GetPar2().ToInt32(); if( TYP_NEXTPAGEFLD == nTypeId && 1 != nOff ) aValueED.SetText( String::CreateFromInt32(nOff - 1) ); @@ -362,27 +362,27 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) else aValueED.SetText(((SwPageNumberField*)GetCurField())->GetUserString()); } - bValue = TRUE; + bValue = sal_True; break; case TYP_CHAPTERFLD: aValueFT.SetText(SW_RESSTR(STR_LEVEL)); if (IsFldEdit()) aLevelED.SetText(String::CreateFromInt32(((SwChapterField*)GetCurField())->GetLevel() + 1)); - bLevel = TRUE; + bLevel = sal_True; break; case TYP_PAGENUMBERFLD: aValueFT.SetText( SW_RESSTR( STR_OFFSET )); if (IsFldEdit()) aValueED.SetText(GetCurField()->GetPar2()); - bValue = TRUE; + bValue = sal_True; break; case TYP_EXTUSERFLD: case TYP_AUTHORFLD: case TYP_FILENAMEFLD: - bFixed = TRUE; + bFixed = sal_True; break; default: @@ -435,7 +435,7 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) aFixedCB.Enable(bFixed); if (IsFldEdit()) - aFixedCB.Check( static_cast< BOOL >(((GetCurField()->GetFormat() & AF_FIXED) != 0) & bFixed)); + aFixedCB.Check( static_cast< sal_Bool >(((GetCurField()->GetFormat() & AF_FIXED) != 0) & bFixed)); if (aNumFormatLB.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND) aNumFormatLB.SelectEntryPos(0); @@ -446,22 +446,22 @@ IMPL_LINK( SwFldDokPage, TypeHdl, ListBox *, EMPTYARG ) return 0; } -void SwFldDokPage::AddSubType(USHORT nTypeId) +void SwFldDokPage::AddSubType(sal_uInt16 nTypeId) { - USHORT nPos = aSelectionLB.InsertEntry(SwFieldType::GetTypeStr(nTypeId)); + sal_uInt16 nPos = aSelectionLB.InsertEntry(SwFieldType::GetTypeStr(nTypeId)); aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(nTypeId)); } IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) { - USHORT nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - USHORT nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); FillFormatLB(nTypeId); - USHORT nTextRes = 0; + sal_uInt16 nTextRes = 0; switch (nTypeId) { case TYP_CHAPTERFLD: @@ -470,7 +470,7 @@ IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) case TYP_PREVPAGEFLD: case TYP_NEXTPAGEFLD: - nTextRes = SVX_NUM_CHAR_SPECIAL == (USHORT)(ULONG)aFormatLB.GetEntryData( + nTextRes = SVX_NUM_CHAR_SPECIAL == (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData( aFormatLB.GetSelectEntryPos() ) ? STR_VALUE : STR_OFFSET; break; @@ -486,7 +486,7 @@ IMPL_LINK( SwFldDokPage, SubTypeHdl, ListBox *, EMPTYARG ) return 0; } -USHORT SwFldDokPage::FillFormatLB(USHORT nTypeId) +sal_uInt16 SwFldDokPage::FillFormatLB(sal_uInt16 nTypeId) { // Format-Listbox fuellen aFormatLB.Clear(); @@ -494,12 +494,12 @@ USHORT SwFldDokPage::FillFormatLB(USHORT nTypeId) if (nTypeId == TYP_AUTHORFLD) return aFormatLB.GetEntryCount(); - USHORT nSize = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode()); + sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); - for( USHORT i = 0; i < nSize; ++i ) + for( sal_uInt16 i = 0; i < nSize; ++i ) { - USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); - USHORT nFmtId = GetFldMgr().GetFormatId( nTypeId, i ); + sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); + sal_uInt16 nFmtId = GetFldMgr().GetFormatId( nTypeId, i ); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>( nFmtId )); if (IsFldEdit() && nFmtId == (GetCurField()->GetFormat() & ~AF_FIXED)) aFormatLB.SelectEntryPos( nPos ); @@ -523,21 +523,21 @@ USHORT SwFldDokPage::FillFormatLB(USHORT nTypeId) IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); if (nTypeId == USHRT_MAX) { - USHORT nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nTypeId = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); } if (nTypeId == TYP_NEXTPAGEFLD || nTypeId == TYP_PREVPAGEFLD) { // Prev/Next - PageNumFelder Sonderbehandlung: - USHORT nTmp = (USHORT)(ULONG)aFormatLB.GetEntryData( + sal_uInt16 nTmp = (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData( aFormatLB.GetSelectEntryPos() ); String sOldTxt( aValueFT.GetText() ); String sNewTxt( SW_RES( SVX_NUM_CHAR_SPECIAL == nTmp ? STR_VALUE @@ -553,34 +553,34 @@ IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG ) return 0; } -BOOL SwFldDokPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldDokPage::FillItemSet(SfxItemSet& ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); if (nTypeId == USHRT_MAX) { - USHORT nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); if(nPos == LISTBOX_ENTRY_NOTFOUND) nPos = 0; - nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nTypeId = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); } String aVal(aValueED.GetText()); - ULONG nFormat = 0; - USHORT nSubType = 0; + sal_uLong nFormat = 0; + sal_uInt16 nSubType = 0; if (aFormatLB.IsEnabled()) { - USHORT nPos = aFormatLB.GetSelectEntryPos(); + sal_uInt16 nPos = aFormatLB.GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) - nFormat = (USHORT)(ULONG)aFormatLB.GetEntryData(nPos); + nFormat = (sal_uInt16)(sal_uLong)aFormatLB.GetEntryData(nPos); } if (aSelectionLB.IsEnabled()) { - USHORT nPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nPos = aSelectionLB.GetSelectEntryPos(); if(nPos != LISTBOX_ENTRY_NOTFOUND) - nSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos); + nSubType = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nPos); } switch (nTypeId) @@ -617,7 +617,7 @@ BOOL SwFldDokPage::FillItemSet(SfxItemSet& ) if( SVX_NUM_CHAR_SPECIAL != nFormat && (TYP_PREVPAGEFLD == nTypeId || TYP_NEXTPAGEFLD == nTypeId)) { - INT32 nVal = aValueED.GetText().ToInt32(); + sal_Int32 nVal = aValueED.GetText().ToInt32(); aVal = String::CreateFromInt32(nVal); } break; @@ -642,7 +642,7 @@ BOOL SwFldDokPage::FillItemSet(SfxItemSet& ) InsertFld( nTypeId, nSubType, aEmptyStr, aVal, nFormat, ' ', aNumFormatLB.IsAutomaticLanguage() ); } - return FALSE; + return sal_False; } SfxTabPage* SwFldDokPage::Create( Window* pParent, @@ -651,7 +651,7 @@ SfxTabPage* SwFldDokPage::Create( Window* pParent, return ( new SwFldDokPage( pParent, rAttrSet ) ); } -USHORT SwFldDokPage::GetGroup() +sal_uInt16 SwFldDokPage::GetGroup() { return GRP_DOC; } @@ -661,11 +661,11 @@ void SwFldDokPage::FillUserData() String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); sData += ';'; - USHORT nTypeSel = aTypeLB.GetSelectEntryPos(); + sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = sal::static_int_cast< USHORT >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); + nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 32031c14c247..9bff88a0bb9c 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -59,18 +59,18 @@ class SwFldDokPage : public SwFldPage Bitmap aRootOpened; Bitmap aRootClosed; - USHORT nOldSel; - ULONG nOldFormat; + sal_uInt16 nOldSel; + sal_uLong nOldFormat; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( FormatHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); - void AddSubType(USHORT nTypeId); - USHORT FillFormatLB(USHORT nTypeId); + void AddSubType(sal_uInt16 nTypeId); + sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldDokPage(Window* pWindow, const SfxItemSet& rSet); @@ -79,7 +79,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index f566ab716362..fe595268ce85 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -43,6 +43,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKTYPE { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -59,6 +60,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKSELECTION { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 15 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -73,6 +75,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 151 ) ; @@ -83,6 +86,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 151 ) ; @@ -100,6 +104,7 @@ TabPage TP_FLD_DOK }; Edit ED_DOKVALUE { + HelpID = "sw:Edit:TP_FLD_DOK:ED_DOKVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -109,6 +114,7 @@ TabPage TP_FLD_DOK }; NumericField ED_DOKLEVEL { + HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -125,6 +131,7 @@ TabPage TP_FLD_DOK }; NumericField ED_DOKDATEOFF { + HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -138,6 +145,7 @@ TabPage TP_FLD_DOK }; CheckBox CB_DOKFIXEDCONTENT { + HelpID = "sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT"; Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 400e3d43c45d..027dd580591a 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -84,11 +84,11 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : /* #108536# Only create selection if there is none already. Normalize PaM instead of swapping. */ if ( ! pSh->HasSelection() ) - pSh->Right(CRSR_SKIP_CHARS, TRUE, 1, FALSE ); + pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False ); pSh->NormalizePam(); - USHORT nGroup = aMgr.GetGroup(FALSE, pCurFld->GetTypeId(), pCurFld->GetSubType()); + sal_uInt16 nGroup = aMgr.GetGroup(sal_False, pCurFld->GetTypeId(), pCurFld->GetSubType()); CreatePage(nGroup); @@ -98,7 +98,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : // Fontgroessen im Wald stehen, und da PB im SingleTabDlg feste Pixelgroessen // fuer seine Buttons und die Dialogbreite verwendet. aPrevBT.SetPosPixel(Point(GetOKButton()->GetPosPixel().X(), aPrevBT.GetPosPixel().Y())); - USHORT nWidth = static_cast< USHORT >(GetOKButton()->GetOutputSize().Width() / 2 - 3); + sal_uInt16 nWidth = static_cast< sal_uInt16 >(GetOKButton()->GetOutputSize().Width() / 2 - 3); Size aNewSize(LogicToPixel(Size(nWidth, GetOKButton()->GetOutputSize().Height()))); aPrevBT.SetSizePixel(aNewSize); @@ -140,7 +140,7 @@ void SwFldEditDlg::Init() pSh->StartAction(); pSh->CreateCrsr(); - BOOL bMove = rMgr.GoNext(); + sal_Bool bMove = rMgr.GoNext(); if( bMove ) rMgr.GoPrev(); aNextBT.Enable(bMove); @@ -160,25 +160,25 @@ void SwFldEditDlg::Init() !pSh->HasReadonlySel() ); } -SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) +SfxTabPage* SwFldEditDlg::CreatePage(sal_uInt16 nGroup) { // TabPage erzeugen SfxTabPage* pTabPage = 0; - USHORT nHelpId = 0; + const char* pHelpId = 0; switch (nGroup) { case GRP_DOC: pTabPage = SwFldDokPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_DOK; + pHelpId = HID_EDIT_FLD_DOK; break; case GRP_FKT: pTabPage = SwFldFuncPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_FUNC; + pHelpId = HID_EDIT_FLD_FUNC; break; case GRP_REF: pTabPage = SwFldRefPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_REF; + pHelpId = HID_EDIT_FLD_REF; break; case GRP_REG: { @@ -194,21 +194,22 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) uno::UNO_QUERY_THROW); pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) ); pTabPage = SwFldDokInfPage::Create(this, *pSet); - nHelpId = HID_EDIT_FLD_DOKINF; + pHelpId = HID_EDIT_FLD_DOKINF; break; } case GRP_DB: pTabPage = SwFldDBPage::Create(this, *(SfxItemSet*)0); static_cast<SwFldDBPage*>(pTabPage)->SetWrtShell(*pSh); - nHelpId = HID_EDIT_FLD_DB; + pHelpId = HID_EDIT_FLD_DB; break; case GRP_VAR: pTabPage = SwFldVarPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_VAR; + pHelpId = HID_EDIT_FLD_VAR; break; } - pTabPage->SetHelpId(nHelpId); + + pTabPage->SetHelpId(pHelpId); static_cast<SwFldPage*>(pTabPage)->SetWrtShell(pSh); SetTabPage(pTabPage); @@ -227,10 +228,10 @@ SwFldEditDlg::~SwFldEditDlg() pSh->EnterStdMode(); } -void SwFldEditDlg::EnableInsert(BOOL bEnable) +void SwFldEditDlg::EnableInsert(sal_Bool bEnable) { if( bEnable && pSh->IsReadOnlyAvailable() && pSh->HasReadonlySel() ) - bEnable = FALSE; + bEnable = sal_False; GetOKButton()->Enable( bEnable ); } @@ -269,7 +270,7 @@ short SwFldEditDlg::Execute() --------------------------------------------------------------------*/ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) { - BOOL bNext = pButton == &aNextBT; + sal_Bool bNext = pButton == &aNextBT; pSh->EnterStdMode(); @@ -292,11 +293,11 @@ IMPL_LINK( SwFldEditDlg, NextPrevHdl, Button *, pButton ) /* #108536# Only create selection if there is none already. Normalize PaM instead of swapping. */ if ( ! pSh->HasSelection() ) - pSh->Right(CRSR_SKIP_CHARS, TRUE, 1, FALSE ); + pSh->Right(CRSR_SKIP_CHARS, sal_True, 1, sal_False ); pSh->NormalizePam(); - USHORT nGroup = rMgr.GetGroup(FALSE, pCurFld->GetTypeId(), pCurFld->GetSubType()); + sal_uInt16 nGroup = rMgr.GetGroup(sal_False, pCurFld->GetTypeId(), pCurFld->GetSubType()); if (nGroup != pTabPage->GetGroup()) pTabPage = (SwFldPage*)CreatePage(nGroup); @@ -318,7 +319,7 @@ IMPL_LINK( SwFldEditDlg, AddressHdl, PushButton *, EMPTYARG ) SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS, 0L ); - USHORT nEditPos = UNKNOWN_EDIT; + sal_uInt16 nEditPos = UNKNOWN_EDIT; switch(pCurFld->GetSubType()) { diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index c690acdd136a..dd6365056043 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -95,8 +95,8 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) : sOldValueFT = aValueFT.GetText(); sOldNameFT = aNameFT.GetText(); - aCond1ED.ShowBrackets(FALSE); - aCond2ED.ShowBrackets(FALSE); + aCond1ED.ShowBrackets(sal_False); + aCond2ED.ShowBrackets(sal_False); } @@ -109,10 +109,10 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) SavePos(&aTypeLB); Init(); // Allgemeine initialisierung - aTypeLB.SetUpdateMode(FALSE); + aTypeLB.SetUpdateMode(sal_False); aTypeLB.Clear(); - USHORT nPos, nTypeId; + sal_uInt16 nPos, nTypeId; if (!IsFldEdit()) { @@ -165,11 +165,11 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) if(sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) { String sVal = sUserData.GetToken(1, ';'); - USHORT nVal = static_cast< USHORT >(sVal.ToInt32()); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); if(nVal != USHRT_MAX) { - for(USHORT i = 0; i < aTypeLB.GetEntryCount(); i++) - if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i)) + for(sal_uInt16 i = 0; i < aTypeLB.GetEntryCount(); i++) + if(nVal == (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(i)) { aTypeLB.SelectEntryPos(i); break; @@ -179,7 +179,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) } TypeHdl(0); - aTypeLB.SetUpdateMode(TRUE); + aTypeLB.SetUpdateMode(sal_True); if (IsFldEdit()) { @@ -194,7 +194,7 @@ void SwFldFuncPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern - const USHORT nOld = GetTypeSel(); + const sal_uInt16 nOld = GetTypeSel(); // Aktuelle ListBoxPos SetTypeSel(aTypeLB.GetSelectEntryPos()); @@ -207,7 +207,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) if (nOld != GetTypeSel()) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); // Auswahl-Listbox fuellen UpdateSubType(); @@ -215,30 +215,30 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) // Format-Listbox fuellen aFormatLB.Clear(); - USHORT nSize = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode()); + sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); - for (USHORT i = 0; i < nSize; i++) + for (sal_uInt16 i = 0; i < nSize; i++) { - USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); + sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i )) ); } if (nSize) { if (IsFldEdit() && nTypeId == TYP_JUMPEDITFLD) - aFormatLB.SelectEntry(SW_RESSTR(FMT_MARK_BEGIN + (USHORT)GetCurField()->GetFormat())); + aFormatLB.SelectEntry(SW_RESSTR(FMT_MARK_BEGIN + (sal_uInt16)GetCurField()->GetFormat())); if (!aFormatLB.GetSelectEntryCount()) aFormatLB.SelectEntryPos(0); } - BOOL bValue = FALSE, bName = FALSE, bMacro = FALSE, bInsert = TRUE; - BOOL bShowSelection = FALSE; - BOOL bFormat = nSize != 0; + sal_Bool bValue = sal_False, bName = sal_False, bMacro = sal_False, bInsert = sal_True; + sal_Bool bShowSelection = sal_False; + sal_Bool bFormat = nSize != 0; // fuer Conditional Text zwei Controls - BOOL bDropDown = TYP_DROPDOWN == nTypeId; - BOOL bCondTxtFld = TYP_CONDTXTFLD == nTypeId; + sal_Bool bDropDown = TYP_DROPDOWN == nTypeId; + sal_Bool bCondTxtFld = TYP_CONDTXTFLD == nTypeId; aCond1FT.Show(!bDropDown && bCondTxtFld); aCond1ED.Show(!bDropDown && bCondTxtFld); @@ -261,7 +261,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) aListNameFT.Show(bDropDown); aListNameED.Show(bDropDown); - aNameED.SetDropEnable(FALSE); + aNameED.SetDropEnable(sal_False); if (IsFldEdit()) { @@ -300,67 +300,81 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) switch (nTypeId) { case TYP_MACROFLD: - bMacro = TRUE; + bMacro = sal_True; if (GetFldMgr().GetMacroPath().Len()) - bValue = TRUE; + bValue = sal_True; else - bInsert = FALSE; + bInsert = sal_False; aNameFT.SetText(SW_RESSTR(STR_MACNAME)); aValueFT.SetText(SW_RESSTR(STR_PROMPT)); aNameED.SetText(GetFldMgr().GetMacroName()); + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); break; case TYP_HIDDENPARAFLD: aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(TRUE); - bName = TRUE; + aNameED.SetDropEnable(sal_True); + bName = sal_True; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); break; case TYP_HIDDENTXTFLD: { aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(TRUE); + aNameED.SetDropEnable(sal_True); aValueFT.SetText(SW_RESSTR(STR_INSTEXT)); SwWrtShell* pSh = GetActiveWrtShell(); if (!IsFldEdit() && pSh ) aValueED.SetText(pSh->GetSelTxt()); - bName = bValue = TRUE; + bName = bValue = sal_True; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); } break; case TYP_CONDTXTFLD: aNameFT.SetText(SW_RESSTR(STR_COND)); - aNameED.SetDropEnable(TRUE); + aNameED.SetDropEnable(sal_True); if (IsFldEdit()) { aCond1ED.SetText(GetCurField()->GetPar2().GetToken(0, '|')); aCond2ED.SetText(GetCurField()->GetPar2().GetToken(1, '|')); } - bName = bValue = TRUE; + bName = bValue = sal_True; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); break; case TYP_JUMPEDITFLD: aNameFT.SetText(SW_RESSTR(STR_JUMPEDITFLD)); aValueFT.SetText(SW_RESSTR(STR_PROMPT)); - bName = bValue = TRUE; + bName = bValue = sal_True; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); break; case TYP_INPUTFLD: aValueFT.SetText(SW_RESSTR(STR_PROMPT)); - bValue = TRUE; + bValue = sal_True; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); break; case TYP_COMBINED_CHARS: { aNameFT.SetText(SW_RESSTR(STR_COMBCHRS_FT)); - aNameED.SetDropEnable(TRUE); - bName = TRUE; + aNameED.SetDropEnable(sal_True); + bName = sal_True; - const USHORT nLen = aNameED.GetText().Len(); + const sal_uInt16 nLen = aNameED.GetText().Len(); if( !nLen || nLen > MAX_COMBINED_CHARACTERS ) - bInsert = FALSE; + bInsert = sal_False; + aNameED.SetAccessibleName(aNameFT.GetText()); + aValueED.SetAccessibleName(aValueFT.GetText()); } break; case TYP_DROPDOWN : @@ -400,7 +414,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, EMPTYARG ) IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, EMPTYARG ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); if( TYP_MACROFLD == nTypeId ) aNameED.SetText( aSelectionLB.GetSelectEntry() ); @@ -418,7 +432,7 @@ IMPL_LINK( SwFldFuncPage, InsertMacroHdl, ListBox *, EMPTYARG ) IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) { - aListItemsLB.SetUpdateMode(FALSE); + aListItemsLB.SetUpdateMode(sal_False); if(pControl == &aListAddPB || (pControl == &aListItemED && aListAddPB.IsEnabled())) { @@ -428,7 +442,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) } else if(aListItemsLB.GetSelectEntryCount()) { - USHORT nSelPos = aListItemsLB.GetSelectEntryPos(); + sal_uInt16 nSelPos = aListItemsLB.GetSelectEntryPos(); if(pControl == &aListRemovePB) { aListItemsLB.RemoveEntry(nSelPos); @@ -458,7 +472,7 @@ IMPL_LINK( SwFldFuncPage, ListModifyHdl, Control*, pControl) } } bDropDownLBChanged = true; - aListItemsLB.SetUpdateMode(TRUE); + aListItemsLB.SetUpdateMode(sal_True); ListEnableHdl(0); return 0; } @@ -468,7 +482,7 @@ IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG) //enable "Add" button when text is in the Edit that's not already member of the box aListAddPB.Enable(aListItemED.GetText().Len() && LISTBOX_ENTRY_NOTFOUND == aListItemsLB.GetEntryPos(aListItemED.GetText())); - BOOL bEnableButtons = aListItemsLB.GetSelectEntryCount() > 0; + sal_Bool bEnableButtons = aListItemsLB.GetSelectEntryCount() > 0; aListRemovePB.Enable(bEnableButtons); aListUpPB.Enable(bEnableButtons && (aListItemsLB.GetSelectEntryPos() > 0)); aListDownPB.Enable(bEnableButtons && @@ -482,23 +496,23 @@ IMPL_LINK( SwFldFuncPage, ListEnableHdl, void*, EMPTYARG) --------------------------------------------------------------------*/ void SwFldFuncPage::UpdateSubType() { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); // Auswahl-Listbox fuellen - aSelectionLB.SetUpdateMode(FALSE); + aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); SvStringsDtor aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); - USHORT nCount = aLst.Count(); + sal_uInt16 nCount = aLst.Count(); - for (USHORT i = 0; i < nCount; ++i) + for (sal_uInt16 i = 0; i < nCount; ++i) { - USHORT nPos = aSelectionLB.InsertEntry(*aLst[i]); + sal_uInt16 nPos = aSelectionLB.InsertEntry(*aLst[i]); aSelectionLB.SetEntryData(nPos, reinterpret_cast<void*>(i)); } - BOOL bEnable = nCount != 0; + sal_Bool bEnable = nCount != 0; aSelectionLB.Enable( bEnable ); aSelectionFT.Enable( bEnable ); @@ -510,7 +524,7 @@ void SwFldFuncPage::UpdateSubType() if (nTypeId == TYP_MACROFLD) { - BOOL bHasMacro = GetFldMgr().GetMacroPath().Len() != 0; + sal_Bool bHasMacro = GetFldMgr().GetMacroPath().Len() != 0; if (bHasMacro) { @@ -521,7 +535,7 @@ void SwFldFuncPage::UpdateSubType() EnableInsert(bHasMacro); } - aSelectionLB.SetUpdateMode(TRUE); + aSelectionLB.SetUpdateMode(sal_True); } /*-------------------------------------------------------------------- @@ -543,18 +557,18 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) return 0; } -BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldFuncPage::FillItemSet(SfxItemSet& ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - USHORT nSubType = 0; + sal_uInt16 nSubType = 0; - ULONG nFormat = aFormatLB.GetSelectEntryPos(); + sal_uLong nFormat = aFormatLB.GetSelectEntryPos(); if(nFormat == LISTBOX_ENTRY_NOTFOUND) nFormat = 0; else - nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); + nFormat = (sal_uLong)aFormatLB.GetEntryData((sal_uInt16)nFormat); String aVal(aValueED.GetText()); String aName(aNameED.GetText()); @@ -582,7 +596,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) case TYP_DROPDOWN : { aName = aListNameED.GetText(); - for(USHORT i = 0; i < aListItemsLB.GetEntryCount(); i++) + for(sal_uInt16 i = 0; i < aListItemsLB.GetEntryCount(); i++) { if(i) aVal += DB_DELIM; @@ -608,7 +622,7 @@ BOOL SwFldFuncPage::FillItemSet(SfxItemSet& ) ModifyHdl(); // Insert ggf enablen/disablen - return FALSE; + return sal_False; } String SwFldFuncPage::TurnMacroString(const String &rMacro) @@ -617,9 +631,9 @@ String SwFldFuncPage::TurnMacroString(const String &rMacro) { // Inhalt von aName umdrehen String sTmp, sBuf; - USHORT nPos = 0; + sal_uInt16 nPos = 0; - for (USHORT i = 0; i < 4 && nPos != STRING_NOTFOUND; i++) + for (sal_uInt16 i = 0; i < 4 && nPos != STRING_NOTFOUND; i++) { if (i == 3) sTmp = rMacro.Copy(nPos); @@ -642,7 +656,7 @@ SfxTabPage* SwFldFuncPage::Create( Window* pParent, return ( new SwFldFuncPage( pParent, rAttrSet ) ); } -USHORT SwFldFuncPage::GetGroup() +sal_uInt16 SwFldFuncPage::GetGroup() { return GRP_FKT; } @@ -652,11 +666,11 @@ void SwFldFuncPage::FillUserData() String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); sData += ';'; - USHORT nTypeSel = aTypeLB.GetSelectEntryPos(); + sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = sal::static_int_cast< USHORT >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); + nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } @@ -664,14 +678,14 @@ void SwFldFuncPage::FillUserData() IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG ) { String aName(aNameED.GetText()); - const USHORT nLen = aName.Len(); + const sal_uInt16 nLen = aName.Len(); - BOOL bEnable = TRUE; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bEnable = sal_True; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); if( TYP_COMBINED_CHARS == nTypeId && (!nLen || nLen > MAX_COMBINED_CHARACTERS )) - bEnable = FALSE; + bEnable = sal_False; EnableInsert( bEnable ); diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index ab021b3892b7..9df5911abe51 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -72,7 +72,7 @@ class SwFldFuncPage : public SwFldPage String sOldValueFT; String sOldNameFT; - ULONG nOldFormat; + sal_uLong nOldFormat; bool bDropDownLBChanged; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); @@ -89,7 +89,7 @@ class SwFldFuncPage : public SwFldPage String TurnMacroString(const String &rMacro); protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldFuncPage(Window* pParent, const SfxItemSet& rSet); @@ -98,7 +98,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index 312299fac02d..538aeb8e1ce3 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -43,6 +43,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCTYPE { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -60,6 +61,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCSELECTION { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -77,6 +79,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCFORMAT { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -91,6 +94,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCNAME { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -106,6 +110,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCVALUE { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -122,6 +127,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCCOND1 { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -139,6 +145,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCCOND2 { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 68 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -148,6 +155,7 @@ TabPage TP_FLD_FUNC }; PushButton BT_FUNCMACRO { + HelpID = "sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO"; Pos = MAP_APPFONT ( 204 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Macro..." ; @@ -163,6 +171,7 @@ TabPage TP_FLD_FUNC }; Edit ED_LISTITEM { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTITEM"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -172,6 +181,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTADD { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTADD"; Pos = MAP_APPFONT ( 170 , 29 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -186,6 +196,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_LISTITEMS { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 57 ) ; Size = MAP_APPFONT ( 83 , 44 ) ; @@ -195,6 +206,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTREMOVE { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE"; Pos = MAP_APPFONT ( 203 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -202,6 +214,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTUP { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTUP"; Pos = MAP_APPFONT ( 203 , 121 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -209,6 +222,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTDOWN { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN"; Pos = MAP_APPFONT ( 203 , 138 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -223,6 +237,7 @@ TabPage TP_FLD_FUNC }; Edit ED_LISTNAME { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index a9c334cff80b..a2e810c19805 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -144,7 +144,7 @@ enum /*-------------------------------------------------------------------- Beschreibung: Formate in der richtigen Reihenfolge --------------------------------------------------------------------*/ -static const USHORT aSetFmt[] = +static const sal_uInt16 aSetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -152,14 +152,14 @@ static const USHORT aSetFmt[] = 0 }; -static const USHORT aGetFmt[] = +static const sal_uInt16 aGetFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_GETVAR_??? // uebereinstimmen 0 }; -static const USHORT aUsrFmt[] = +static const sal_uInt16 aUsrFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_SETVAR_??? // uebereinstimmen @@ -167,29 +167,29 @@ static const USHORT aUsrFmt[] = nsSwExtendedSubType::SUB_CMD }; -static const USHORT aDBFmt[] = +static const sal_uInt16 aDBFmt[] = { // die Reihenfolge muss zu Beginn mit den ResourceIds fuer FMT_DBFLD_??? // uebereinstimmen nsSwExtendedSubType::SUB_OWN_FMT }; -static const USHORT VF_COUNT = sizeof(aGetFmt) / sizeof(USHORT); -static const USHORT VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(USHORT); -static const USHORT VF_DB_COUNT = sizeof(aDBFmt) / sizeof(USHORT); +static const sal_uInt16 VF_COUNT = sizeof(aGetFmt) / sizeof(sal_uInt16); +static const sal_uInt16 VF_USR_COUNT = sizeof(aUsrFmt) / sizeof(sal_uInt16); +static const sal_uInt16 VF_DB_COUNT = sizeof(aDBFmt) / sizeof(sal_uInt16); /*-------------------------------------------------------------------- Beschreibung: Feldtypen und Subtypes --------------------------------------------------------------------*/ struct SwFldPack { - USHORT nTypeId; + sal_uInt16 nTypeId; - USHORT nSubTypeStart; - USHORT nSubTypeEnd; + sal_uInt16 nSubTypeStart; + sal_uInt16 nSubTypeEnd; - ULONG nFmtBegin; - ULONG nFmtEnd; + sal_uLong nFmtBegin; + sal_uLong nFmtEnd; }; /*-------------------------------------------------------------------- @@ -261,7 +261,7 @@ static SwWrtShell* lcl_GetShell() return 0; } -inline USHORT GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } +inline sal_uInt16 GetPackCount() { return sizeof(aSwFlds) / sizeof(SwFldPack); } /*-------------------------------------------------------------------- Beschreibung: FieldManager regelt das Einfuegen und Updaten @@ -272,7 +272,7 @@ SwFldMgr::SwFldMgr(SwWrtShell* pSh ) : pModule(0), pMacroItem(0), pWrtShell(pSh), - bEvalExp(TRUE) + bEvalExp(sal_True) { // aktuelles Feld ermitteln falls vorhanden GetCurFld(); @@ -287,14 +287,14 @@ SwFldMgr::~SwFldMgr() Beschreibung: RefMark ueber Namen organisieren --------------------------------------------------------------------*/ -BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) +sal_Bool SwFldMgr::CanInsertRefMark( const String& rStr ) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); if(pSh) { - USHORT nCnt = pSh->GetCrsrCnt(); + sal_uInt16 nCnt = pSh->GetCrsrCnt(); // der letzte Crsr muss keine aufgespannte Selektion if( 1 < nCnt && !pSh->SwCrsrShell::HasSelection() ) @@ -309,7 +309,7 @@ BOOL SwFldMgr::CanInsertRefMark( const String& rStr ) Beschreibung: Zugriff ueber ResIds --------------------------------------------------------------------*/ -void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) +void SwFldMgr::RemoveFldType(sal_uInt16 nResId, const String& rName ) { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); @@ -317,7 +317,7 @@ void SwFldMgr::RemoveFldType(USHORT nResId, const String& rName ) pSh->RemoveFldType(nResId, rName); } -USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const +sal_uInt16 SwFldMgr::GetFldTypeCount(sal_uInt16 nResId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); @@ -325,7 +325,7 @@ USHORT SwFldMgr::GetFldTypeCount(USHORT nResId) const } -SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const +SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, sal_uInt16 nId) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); @@ -333,7 +333,7 @@ SwFieldType* SwFldMgr::GetFldType(USHORT nResId, USHORT nId) const } -SwFieldType* SwFldMgr::GetFldType(USHORT nResId, const String& rName) const +SwFieldType* SwFldMgr::GetFldType(sal_uInt16 nResId, const String& rName) const { SwWrtShell * pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); @@ -365,7 +365,7 @@ SwField* SwFldMgr::GetCurFld() // Aktuelle Werte aufbereiten Parameter 1 und Parameter 2 // als auch das Format ermitteln // - const USHORT nTypeId = pCurFld->GetTypeId(); + const sal_uInt16 nTypeId = pCurFld->GetTypeId(); nCurFmt = pCurFld->GetFormat(); aCurPar1 = pCurFld->GetPar1(); @@ -389,7 +389,7 @@ SwField* SwFldMgr::GetCurFld() --------------------------------------------------------------------*/ -const SwFldGroupRgn& SwFldMgr::GetGroupRange(BOOL bHtmlMode, USHORT nGrpId) const +const SwFldGroupRgn& SwFldMgr::GetGroupRange(sal_Bool bHtmlMode, sal_uInt16 nGrpId) const { static SwFldGroupRgn const aRanges[] = { @@ -411,16 +411,16 @@ static SwFldGroupRgn const aWebRanges[] = }; if (bHtmlMode) - return aWebRanges[(USHORT)nGrpId]; + return aWebRanges[(sal_uInt16)nGrpId]; else - return aRanges[(USHORT)nGrpId]; + return aRanges[(sal_uInt16)nGrpId]; } /*-------------------------------------------------------------------- Beschreibung: GroupId bestimmen --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const +sal_uInt16 SwFldMgr::GetGroup(sal_Bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const { if (nTypeId == TYP_SETINPFLD) nTypeId = TYP_SETFLD; @@ -434,10 +434,10 @@ USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const if (nTypeId == TYP_FIXTIMEFLD) nTypeId = TYP_TIMEFLD; - for (USHORT i = GRP_DOC; i <= GRP_VAR; i++) + for (sal_uInt16 i = GRP_DOC; i <= GRP_VAR; i++) { const SwFldGroupRgn& rRange = GetGroupRange(bHtmlMode, i); - for (USHORT nPos = rRange.nStart; nPos < rRange.nEnd; nPos++) + for (sal_uInt16 nPos = rRange.nStart; nPos < rRange.nEnd; nPos++) { if (aSwFlds[nPos].nTypeId == nTypeId) return i; @@ -452,18 +452,18 @@ USHORT SwFldMgr::GetGroup(BOOL bHtmlMode, USHORT nTypeId, USHORT nSubType) const --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetTypeId(USHORT nPos) +sal_uInt16 SwFldMgr::GetTypeId(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden Pos"); return aSwFlds[ nPos ].nTypeId; } -const String& SwFldMgr::GetTypeStr(USHORT nPos) +const String& SwFldMgr::GetTypeStr(sal_uInt16 nPos) { OSL_ENSURE(nPos < ::GetPackCount(), "forbidden TypeId"); - USHORT nFldWh = aSwFlds[ nPos ].nTypeId; + sal_uInt16 nFldWh = aSwFlds[ nPos ].nTypeId; // Sonderbehandlung fuer Datum/Zeit Felder (ohne var/fix) if( TYP_DATEFLD == nFldWh ) @@ -485,7 +485,7 @@ const String& SwFldMgr::GetTypeStr(USHORT nPos) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetPos(USHORT nTypeId) +sal_uInt16 SwFldMgr::GetPos(sal_uInt16 nTypeId) { switch( nTypeId ) { @@ -495,7 +495,7 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) case TYP_USRINPFLD: nTypeId = TYP_USERFLD; break; } - for(USHORT i = 0; i < GetPackCount(); i++) + for(sal_uInt16 i = 0; i < GetPackCount(); i++) if(aSwFlds[i].nTypeId == nTypeId) return i; @@ -506,14 +506,14 @@ USHORT SwFldMgr::GetPos(USHORT nTypeId) Beschreibung: Subtypen eines Feldes lokalisieren --------------------------------------------------------------------*/ -BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) +sal_Bool SwFldMgr::GetSubTypes(sal_uInt16 nTypeId, SvStringsDtor& rToFill) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwWrtShell *pSh = pWrtShell ? pWrtShell : lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); if(pSh) { - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); switch(nTypeId) { @@ -541,11 +541,11 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) case TYP_USERFLD: { - const USHORT nCount = pSh->GetFldTypeCount(); - for(USHORT i = 0; i < nCount; ++i) + const sal_uInt16 nCount = pSh->GetFldTypeCount(); + for(sal_uInt16 i = 0; i < nCount; ++i) { SwFieldType* pFldType = pSh->GetFldType( i ); - const USHORT nWhich = pFldType->Which(); + const sal_uInt16 nWhich = pFldType->Which(); if((nTypeId == TYP_DDEFLD && pFldType->Which() == RES_DDEFLD) || @@ -563,7 +563,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) ((nTypeId == TYP_INPUTFLD || nTypeId == TYP_FORMELFLD) && (nWhich == RES_USERFLD || (nWhich == RES_SETEXPFLD && - !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ)) )) ) + !(((SwSetExpFieldType*)pFldType)->GetType() & nsSwGetSetExpType::GSE_SEQ))) ) ) { String* pNew = new String(pFldType->GetName()); rToFill.Insert(pNew, rToFill.Count()); @@ -582,13 +582,13 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) // statische SubTypes if(nPos != USHRT_MAX) { - USHORT nCount; + sal_uInt16 nCount; if (nTypeId == TYP_DOCINFOFLD) nCount = DI_SUBTYPE_END - DI_SUBTYPE_BEGIN; else nCount = aSwFlds[nPos].nSubTypeEnd - aSwFlds[nPos].nSubTypeStart; - for(USHORT i = 0; i < nCount; ++i) + for(sal_uInt16 i = 0; i < nCount; ++i) { String* pNew; if (nTypeId == TYP_DOCINFOFLD) @@ -606,7 +606,7 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) } } } - bRet = TRUE; + bRet = sal_True; } return bRet; } @@ -617,18 +617,18 @@ BOOL SwFldMgr::GetSubTypes(USHORT nTypeId, SvStringsDtor& rToFill) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) const +sal_uInt16 SwFldMgr::GetFormatCount(sal_uInt16 nTypeId, sal_Bool bIsText, sal_Bool bHtmlMode) const { OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); { - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); if(nPos == USHRT_MAX || (bHtmlMode && nTypeId == TYP_SETFLD)) return 0; - ULONG nStart = aSwFlds[nPos].nFmtBegin; - ULONG nEnd = aSwFlds[nPos].nFmtEnd; + sal_uLong nStart = aSwFlds[nPos].nFmtBegin; + sal_uLong nEnd = aSwFlds[nPos].nFmtEnd; if (bIsText && nEnd - nStart >= 2) return 2; @@ -644,7 +644,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co case FMT_DBFLD_BEGIN: return VF_DB_COUNT; case FMT_NUM_BEGIN: { - USHORT nCount = (USHORT)(nEnd - nStart); + sal_uInt16 nCount = (sal_uInt16)(nEnd - nStart); GetNumberingInfo(); if(xNumberingInfo.is()) { @@ -665,7 +665,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co } } - return (USHORT)(nEnd - nStart); + return (sal_uInt16)(nEnd - nStart); } } @@ -674,17 +674,17 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co --------------------------------------------------------------------*/ -String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const +String SwFldMgr::GetFormatStr(sal_uInt16 nTypeId, sal_uLong nFormatId) const { String aRet; OSL_ENSURE(nTypeId < TYP_END, "forbidden TypeId"); - const USHORT nPos = GetPos(nTypeId); + const sal_uInt16 nPos = GetPos(nTypeId); if(nPos == USHRT_MAX) return aRet; - ULONG nStart; + sal_uLong nStart; nStart = aSwFlds[nPos].nFmtBegin; @@ -692,7 +692,7 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const nFormatId &= ~FF_FIXED; // Fixed-Flag ausmaskieren if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd) - aRet = SW_RESSTR((USHORT)(nStart + nFormatId)); + aRet = SW_RESSTR((sal_uInt16)(nStart + nFormatId)); else if( FMT_NUM_BEGIN == nStart) { if(xNumberingInfo.is()) @@ -724,9 +724,9 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const Beschreibung: FormatId aus Pseudo-ID ermitteln --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const +sal_uInt16 SwFldMgr::GetFormatId(sal_uInt16 nTypeId, sal_uLong nFormatId) const { - USHORT nId = (USHORT)nFormatId; + sal_uInt16 nId = (sal_uInt16)nFormatId; switch( nTypeId ) { @@ -747,9 +747,9 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const case TYP_SEQFLD: case TYP_GETREFPAGEFLD: { - USHORT nPos = GetPos( nTypeId ); - ULONG nBegin = aSwFlds[ nPos ].nFmtBegin; - ULONG nEnd = aSwFlds[nPos].nFmtEnd; + sal_uInt16 nPos = GetPos( nTypeId ); + sal_uLong nBegin = aSwFlds[ nPos ].nFmtBegin; + sal_uLong nEnd = aSwFlds[nPos].nFmtEnd; if((nBegin + nFormatId) < nEnd) { switch( nBegin + nFormatId ) @@ -805,15 +805,15 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const --------------------------------------------------------------------*/ -BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp ) +sal_Bool SwFldMgr::GoNextPrev( sal_Bool bNext, SwFieldType* pTyp ) { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); if(!pSh) - return FALSE; + return sal_False; if( !pTyp && pCurFld ) { - const USHORT nTypeId = pCurFld->GetTypeId(); + const sal_uInt16 nTypeId = pCurFld->GetTypeId(); if( TYP_SETINPFLD == nTypeId || TYP_USRINPFLD == nTypeId ) pTyp = pSh->GetFldType( 0, RES_INPUTFLD ); else @@ -826,7 +826,7 @@ BOOL SwFldMgr::GoNextPrev( BOOL bNext, SwFieldType* pTyp ) return pSh->MoveFldType( 0, bNext, USHRT_MAX, RES_DBFLD ); } - return pTyp && pSh ? pSh->MoveFldType( pTyp, bNext ) : FALSE; + return pTyp && pSh ? pSh->MoveFldType( pTyp, bNext ) : sal_False; } /*-------------------------------------------------------------------- @@ -847,7 +847,7 @@ void SwFldMgr::InsertFldType(SwFieldType& rType) --------------------------------------------------------------------*/ -USHORT SwFldMgr::GetCurTypeId() const +sal_uInt16 SwFldMgr::GetCurTypeId() const { return pCurFld ? pCurFld->GetTypeId() : USHRT_MAX; } @@ -857,21 +857,21 @@ USHORT SwFldMgr::GetCurTypeId() const --------------------------------------------------------------------*/ -BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) +sal_Bool SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwField* pFld = 0; - BOOL bExp = FALSE; - BOOL bTbl = FALSE; - BOOL bPageVar = FALSE; - ULONG nFormatId = rData.nFormatId; - USHORT nSubType = rData.nSubType; + sal_Bool bExp = sal_False; + sal_Bool bTbl = sal_False; + sal_Bool bPageVar = sal_False; + sal_uLong nFormatId = rData.nFormatId; + sal_uInt16 nSubType = rData.nSubType; sal_Unicode cSeparator = rData.cSeparator; SwWrtShell* pCurShell = rData.pSh; if(!pCurShell) pCurShell = pWrtShell ? pWrtShell : ::lcl_GetShell(); OSL_ENSURE(pCurShell, "no SwWrtShell found"); if(!pCurShell) - return FALSE; + return sal_False; switch(rData.nTypeId) { // ACHTUNG dieses Feld wird ueber einen gesonderten Dialog eingefuegt @@ -885,7 +885,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwScriptFieldType* pType = (SwScriptFieldType*)pCurShell->GetFldType(0, RES_SCRIPTFLD); - pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (BOOL)nFormatId); + pFld = new SwScriptField(pType, rData.sPar1, rData.sPar2, (sal_Bool)nFormatId); break; } case TYP_COMBINED_CHARS: @@ -911,7 +911,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DATEFLD: case TYP_TIMEFLD: { - USHORT nSub = static_cast< USHORT >(rData.nTypeId == TYP_DATEFLD ? DATEFLD : TIMEFLD); + sal_uInt16 nSub = static_cast< sal_uInt16 >(rData.nTypeId == TYP_DATEFLD ? DATEFLD : TIMEFLD); nSub |= nSubType == DATE_VAR ? 0 : FIXEDFLD; SwDateTimeFieldType* pTyp = @@ -936,14 +936,14 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } case TYP_CHAPTERFLD: { - USHORT nByte = (USHORT)rData.sPar2.ToInt32(); + sal_uInt16 nByte = (sal_uInt16)rData.sPar2.ToInt32(); SwChapterFieldType* pTyp = (SwChapterFieldType*)pCurShell->GetFldType(0, RES_CHAPTERFLD); pFld = new SwChapterField(pTyp, nFormatId); - nByte = Max(USHORT(1), nByte); - nByte = Min(nByte, USHORT(MAXLEVEL)); + nByte = Max(sal_uInt16(1), nByte); + nByte = Min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - ((SwChapterField*)pFld)->SetLevel((BYTE)nByte); + ((SwChapterField*)pFld)->SetLevel((sal_uInt8)nByte); break; } case TYP_NEXTPAGEFLD: @@ -997,8 +997,8 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) { SwHiddenTxtFieldType* pTyp = (SwHiddenTxtFieldType*)pCurShell->GetFldType(0, RES_HIDDENTXTFLD); - pFld = new SwHiddenTxtField(pTyp, TRUE, rData.sPar1, rData.sPar2, FALSE, rData.nTypeId); - bExp = TRUE; + pFld = new SwHiddenTxtField(pTyp, sal_True, rData.sPar1, rData.sPar2, sal_False, rData.nTypeId); + bExp = sal_True; break; } case TYP_HIDDENPARAFLD: @@ -1006,7 +1006,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwHiddenParaFieldType* pTyp = (SwHiddenParaFieldType*)pCurShell->GetFldType(0, RES_HIDDENPARAFLD); pFld = new SwHiddenParaField(pTyp, rData.sPar1); - bExp = TRUE; + bExp = sal_True; break; } case TYP_SETREFFLD: @@ -1014,17 +1014,17 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) if( rData.sPar1.Len() > 0 && CanInsertRefMark( rData.sPar1 ) ) { pCurShell->SetAttr( SwFmtRefMark( rData.sPar1 ) ); - return TRUE; + return sal_True; } - return FALSE; + return sal_False; } case TYP_GETREFFLD: { SwGetRefFieldType* pTyp = (SwGetRefFieldType*)pCurShell->GetFldType(0, RES_GETREFFLD); - USHORT nSeqNo = (USHORT)rData.sPar2.ToInt32(); + sal_uInt16 nSeqNo = (sal_uInt16)rData.sPar2.ToInt32(); pFld = new SwGetRefField(pTyp, rData.sPar1, nSubType, nSeqNo, nFormatId); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DDEFLD: @@ -1032,11 +1032,11 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. String sCmd( rData.sPar2 ); - USHORT nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sCmd.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); SwDDEFieldType* pTyp = (SwDDEFieldType*)pCurShell->InsertFldType( - SwDDEFieldType( rData.sPar1, sCmd, (USHORT)nFormatId )); + SwDDEFieldType( rData.sPar1, sCmd, (sal_uInt16)nFormatId )); pFld = new SwDDEField( pTyp ); break; } @@ -1124,7 +1124,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) } pFld->ChangeFormat( nFormatId ); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBSETNUMBERFLD: @@ -1132,7 +1132,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) case TYP_DBNEXTSETFLD: case TYP_DBNAMEFLD: { - USHORT nPos, nTablePos, nCmdTypePos, nExpPos; + sal_uInt16 nPos, nTablePos, nCmdTypePos, nExpPos; String sPar1; SwDBData aDBData; @@ -1173,7 +1173,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBNextSetFieldType* pTyp = (SwDBNextSetFieldType*)pCurShell->GetFldType( 0, RES_DBNEXTSETFLD); pFld = new SwDBNextSetField(pTyp, sPar1, rData.sPar2, aDBData); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBNUMSETFLD: @@ -1181,7 +1181,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBNumSetFieldType* pTyp = (SwDBNumSetFieldType*)pCurShell->GetFldType( 0, RES_DBNUMSETFLD); pFld = new SwDBNumSetField( pTyp, sPar1, rData.sPar2, aDBData); - bExp = TRUE; + bExp = sal_True; break; } case TYP_DBSETNUMBERFLD: @@ -1189,7 +1189,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwDBSetNumberFieldType* pTyp = (SwDBSetNumberFieldType*) pCurShell->GetFldType(0, RES_DBSETNUMBERFLD); pFld = new SwDBSetNumberField( pTyp, aDBData, nFormatId); - bExp = TRUE; + bExp = sal_True; break; } } @@ -1211,7 +1211,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pFld = new SwUserField(pTyp, 0, nFormatId); if (pFld->GetSubType() != nSubType) pFld->SetSubType(nSubType); - bTbl = TRUE; + bTbl = sal_True; break; } case TYP_INPUTFLD: @@ -1228,16 +1228,16 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) new SwSetExpField(pTyp, aEmptyStr, nFormatId); // Typ vom SwSetExpFieldType nicht veraendern: - USHORT nOldSubType = pExpFld->GetSubType(); + sal_uInt16 nOldSubType = pExpFld->GetSubType(); pExpFld->SetSubType(nOldSubType | (nSubType & 0xff00)); pExpFld->SetPromptText(rData.sPar2); - pExpFld->SetInputFlag(TRUE) ; - bExp = TRUE; + pExpFld->SetInputFlag(sal_True) ; + bExp = sal_True; pFld = pExpFld; } else - return FALSE; + return sal_False; } else { @@ -1251,13 +1251,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) // Dialog starten // - pCurShell->StartInputFldDlg(pFld, FALSE, rData.pParent); + pCurShell->StartInputFldDlg(pFld, sal_False, rData.pParent); break; } case TYP_SETFLD: { if (!rData.sPar2.Len()) // Leere Variablen sind nicht erlaubt - return FALSE; + return sal_False; SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType( SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1) ); @@ -1265,7 +1265,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwSetExpField* pExpFld = new SwSetExpField( pTyp, rData.sPar2, nFormatId); pExpFld->SetSubType(nSubType); pExpFld->SetPar2(rData.sPar2); - bExp = TRUE; + bExp = sal_True; pFld = pExpFld; break; } @@ -1274,7 +1274,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pCurShell->InsertFldType( SwSetExpFieldType(pCurShell->GetDoc(), rData.sPar1, nsSwGetSetExpType::GSE_SEQ)); - BYTE nLevel = static_cast< BYTE >(nSubType & 0xff); + sal_uInt8 nLevel = static_cast< sal_uInt8 >(nSubType & 0xff); pTyp->SetOutlineLvl(nLevel); if (nLevel != 0x7f && cSeparator == 0) @@ -1282,7 +1282,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pTyp->SetDelimiter(cSeparator); SwSetExpField* pExpFld = new SwSetExpField(pTyp, rData.sPar2, nFormatId); - bExp = TRUE; + bExp = sal_True; pFld = pExpFld; nSubType = nsSwGetSetExpType::GSE_SEQ; break; @@ -1299,15 +1299,15 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) 0, RES_GETEXPFLD); pFld = new SwGetExpField(pTyp, rData.sPar1, pSetTyp->GetType(), nFormatId); pFld->SetSubType(nSubType | pSetTyp->GetType()); - bExp = TRUE; + bExp = sal_True; } else - return FALSE; + return sal_False; break; } case TYP_FORMELFLD: { - if(pCurShell->GetFrmType(0,FALSE) & FRMTYPE_TABLE) + if(pCurShell->GetFrmType(0,sal_False) & FRMTYPE_TABLE) { pCurShell->StartAllAction(); @@ -1334,7 +1334,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->UpdateTable(); pCurShell->EndAllAction(); - return TRUE; + return sal_True; } else @@ -1343,7 +1343,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->GetFldType(0, RES_GETEXPFLD); pFld = new SwGetExpField(pTyp, rData.sPar2, nsSwGetSetExpType::GSE_FORMULA, nFormatId); pFld->SetSubType(nSubType); - bExp = TRUE; + bExp = sal_True; } break; } @@ -1351,13 +1351,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pFld = new SwRefPageSetField( (SwRefPageSetFieldType*) pCurShell->GetFldType( 0, RES_REFPAGESETFLD ), (short)rData.sPar2.ToInt32(), 0 != nSubType ); - bPageVar = TRUE; + bPageVar = sal_True; break; case TYP_GETREFPAGEFLD: pFld = new SwRefPageGetField( (SwRefPageGetFieldType*) pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ), nFormatId ); - bPageVar = TRUE; + bPageVar = sal_True; break; case TYP_DROPDOWN : { @@ -1373,7 +1373,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) break; default: { OSL_ENSURE(!this, "wrong field type"); - return FALSE; + return sal_False; } } OSL_ENSURE(pFld, "field not available"); @@ -1381,7 +1381,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) //the auto language flag has to be set prior to the language! pFld->SetAutomaticLanguage(rData.bIsAutomaticLanguage); - USHORT nLang = GetCurrLanguage(); + sal_uInt16 nLang = GetCurrLanguage(); pFld->SetLanguage(nLang); // Einfuegen @@ -1390,13 +1390,13 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) pCurShell->Insert(*pFld); if(bExp && bEvalExp) - pCurShell->UpdateExpFlds(TRUE); + pCurShell->UpdateExpFlds(sal_True); if(bTbl) { - pCurShell->Left(CRSR_SKIP_CHARS, FALSE, 1, FALSE ); + pCurShell->Left(CRSR_SKIP_CHARS, sal_False, 1, sal_False ); pCurShell->UpdateFlds(*pFld); - pCurShell->Right(CRSR_SKIP_CHARS, FALSE, 1, FALSE ); + pCurShell->Right(CRSR_SKIP_CHARS, sal_False, 1, sal_False ); } else if( bPageVar ) ((SwRefPageGetFieldType*)pCurShell->GetFldType( 0, RES_REFPAGEGETFLD ))->UpdateFlds(); @@ -1407,7 +1407,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) delete pFld; pCurShell->EndAllAction(); - return TRUE; + return sal_True; } /*-------------------------------------------------------------------- @@ -1415,7 +1415,7 @@ BOOL SwFldMgr::InsertFld( const SwInsertFld_Data& rData ) --------------------------------------------------------------------*/ -void SwFldMgr::UpdateCurFld(ULONG nFormat, +void SwFldMgr::UpdateCurFld(sal_uLong nFormat, const String& rPar1, const String& rPar2, SwField * _pTmpFld) // #111840# @@ -1436,7 +1436,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, } SwFieldType* pType = pTmpFld->GetTyp(); - const USHORT nTypeId = pTmpFld->GetTypeId(); + const sal_uInt16 nTypeId = pTmpFld->GetTypeId(); SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); OSL_ENSURE(pSh, "no SwWrtShell found"); @@ -1444,8 +1444,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, return; pSh->StartAllAction(); - BOOL bSetPar2 = TRUE; - BOOL bSetPar1 = TRUE; + sal_Bool bSetPar2 = sal_True; + sal_Bool bSetPar1 = sal_True; String sPar1( rPar1 ); String sPar2( rPar2 ); @@ -1456,24 +1456,24 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sPar2.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); break; } case TYP_CHAPTERFLD: { - USHORT nByte = (USHORT)rPar2.ToInt32(); - nByte = Max(USHORT(1), nByte); - nByte = Min(nByte, USHORT(MAXLEVEL)); + sal_uInt16 nByte = (sal_uInt16)rPar2.ToInt32(); + nByte = Max(sal_uInt16(1), nByte); + nByte = Min(nByte, sal_uInt16(MAXLEVEL)); nByte -= 1; - ((SwChapterField*)pTmpFld)->SetLevel((BYTE)nByte); - bSetPar2 = FALSE; + ((SwChapterField*)pTmpFld)->SetLevel((sal_uInt8)nByte); + bSetPar2 = sal_False; break; } case TYP_SCRIPTFLD: - ((SwScriptField*)pTmpFld)->SetCodeURL((BOOL)nFormat); + ((SwScriptField*)pTmpFld)->SetCodeURL((sal_Bool)nFormat); break; case TYP_NEXTPAGEFLD: @@ -1517,11 +1517,11 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, case TYP_GETREFFLD: { - bSetPar2 = FALSE; - ((SwGetRefField*)pTmpFld)->SetSubType( (USHORT)rPar2.ToInt32() ); - USHORT nPos = rPar2.Search( '|' ); + bSetPar2 = sal_False; + ((SwGetRefField*)pTmpFld)->SetSubType( (sal_uInt16)rPar2.ToInt32() ); + sal_uInt16 nPos = rPar2.Search( '|' ); if( STRING_NOTFOUND != nPos ) - ((SwGetRefField*)pTmpFld)->SetSeqNo( (USHORT)rPar2.Copy( nPos + 1 ).ToInt32()); + ((SwGetRefField*)pTmpFld)->SetSeqNo( (sal_uInt16)rPar2.Copy( nPos + 1 ).ToInt32()); } break; case TYP_DROPDOWN: @@ -1533,7 +1533,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, pArray[nToken] = sPar2.GetToken(nToken, DB_DELIM); ((SwDropDownField*)pTmpFld)->SetItems(aEntries); ((SwDropDownField*)pTmpFld)->SetName(sPar1); - bSetPar1 = bSetPar2 = FALSE; + bSetPar1 = bSetPar2 = sal_False; } break; case TYP_AUTHORITY : @@ -1542,7 +1542,7 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, SwAuthorityField* pAuthorityField = static_cast<SwAuthorityField*>(pTmpFld); SwAuthorityFieldType* pAuthorityType = static_cast<SwAuthorityFieldType*>(pType); SwAuthEntry aTempEntry; - for( USHORT i = 0; i < AUTH_FIELD_END; ++i ) + for( sal_uInt16 i = 0; i < AUTH_FIELD_END; ++i ) aTempEntry.SetAuthorField( (ToxAuthorityField)i, rPar1.GetToken( i, TOX_STYLE_DELIMITER )); if( pAuthorityType->ChangeEntryContent( &aTempEntry ) ) @@ -1553,8 +1553,8 @@ void SwFldMgr::UpdateCurFld(ULONG nFormat, if( aTempEntry.GetAuthorField( AUTH_FIELD_IDENTIFIER ) == pAuthorityField->GetFieldText( AUTH_FIELD_IDENTIFIER ) ) - bSetPar1 = FALSE; //otherwise it's a new or changed entry, the field needs to be updated - bSetPar2 = FALSE; + bSetPar1 = sal_False; //otherwise it's a new or changed entry, the field needs to be updated + bSetPar2 = sal_False; } break; } @@ -1599,11 +1599,11 @@ void SwFldMgr::EvalExpFlds(SwWrtShell* pSh) if(pSh) { pSh->StartAllAction(); - pSh->UpdateExpFlds(TRUE); + pSh->UpdateExpFlds(sal_True); pSh->EndAllAction(); } } -USHORT SwFldMgr::GetCurrLanguage() const +sal_uInt16 SwFldMgr::GetCurrLanguage() const { SwWrtShell* pSh = pWrtShell ? pWrtShell : ::lcl_GetShell(); if( pSh ) @@ -1613,9 +1613,9 @@ USHORT SwFldMgr::GetCurrLanguage() const void SwFieldType::_GetFldName() { - static const USHORT coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; + static const sal_uInt16 coFldCnt = STR_TYPE_END - STR_TYPE_BEGIN; - static USHORT const coFldNms[ coFldCnt ] = { + static sal_uInt16 coFldNms[ coFldCnt ] = { FLD_DATE_STD, FLD_TIME_STD, STR_FILENAMEFLD, @@ -1662,8 +1662,8 @@ void SwFieldType::_GetFldName() }; // Infos fuer Felder einfuegen - SwFieldType::pFldNames = new SvStringsDtor( (BYTE)coFldCnt, 2 ); - for( USHORT nIdx = 0; nIdx < coFldCnt; ++nIdx ) + SwFieldType::pFldNames = new SvStringsDtor( (sal_uInt8)coFldCnt, 2 ); + for( sal_uInt16 nIdx = 0; nIdx < coFldCnt; ++nIdx ) { String* pTmp = new SW_RESSTR( coFldNms[ nIdx ] ); pTmp->Assign( MnemonicGenerator::EraseAllMnemonicChars( *pTmp ) ); @@ -1671,9 +1671,9 @@ void SwFieldType::_GetFldName() } } -BOOL SwFldMgr::ChooseMacro(const String&) +sal_Bool SwFldMgr::ChooseMacro(const String&) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; // choose script dialog ::rtl::OUString aScriptURL = SfxApplication::ChooseScript(); @@ -1682,7 +1682,7 @@ BOOL SwFldMgr::ChooseMacro(const String&) if ( aScriptURL.getLength() != 0 ) { SetMacroPath( aScriptURL ); - bRet = TRUE; + bRet = sal_True; } return bRet; @@ -1716,7 +1716,7 @@ void SwFldMgr::SetMacroPath(const String& rPath) } } -ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter* pFormatter, double* pVal) +sal_uLong SwFldMgr::GetDefaultFormat(sal_uInt16 nTypeId, sal_Bool bIsText, SvNumberFormatter* pFormatter, double* pVal) { double fValue; short nDefFormat; @@ -1733,8 +1733,8 @@ ULONG SwFldMgr::GetDefaultFormat(USHORT nTypeId, BOOL bIsText, SvNumberFormatter Time aTime; - ULONG nNumFmtTime = (ULONG)aTime.GetSec() + (ULONG)aTime.GetMin() * 60L + - (ULONG)aTime.GetHour() * 3600L; + sal_uLong nNumFmtTime = (sal_uLong)aTime.GetSec() + (sal_uLong)aTime.GetMin() * 60L + + (sal_uLong)aTime.GetHour() * 3600L; fValue += (double)nNumFmtTime / 86400.0; diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index c1936806bbe4..c6d9dc1e673a 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -62,14 +62,14 @@ SwFldPage::SwFldPage( Window *pParent, const ResId &rId, :SfxTabPage (pParent, rId, rAttrSet), m_pCurFld (0), m_pWrtShell (0), - m_nPageId ( static_cast< USHORT >(rId.GetId()) ), + m_nPageId ( static_cast< sal_uInt16 >(rId.GetId()) ), m_nTypeSel (LISTBOX_ENTRY_NOTFOUND), m_nSelectionSel (LISTBOX_ENTRY_NOTFOUND), - m_bFldEdit (FALSE), - m_bInsert (TRUE), - m_bFldDlgHtmlMode (FALSE), - m_bRefresh (FALSE), - m_bFirstHTMLInit (TRUE) + m_bFldEdit (sal_False), + m_bInsert (sal_True), + m_bFldDlgHtmlMode (sal_False), + m_bRefresh (sal_False), + m_bFirstHTMLInit (sal_True) { } @@ -85,7 +85,7 @@ SwFldPage::~SwFldPage() void SwFldPage::Init() { SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current(); - BOOL bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON); + sal_Bool bNewMode = 0 != (::GetHtmlMode(pDocSh) & HTMLMODE_ON); m_bFldEdit = 0 == GetTabDialog(); @@ -100,7 +100,7 @@ void SwFldPage::Init() // Bereichslistbox initialisieren if( m_bFldDlgHtmlMode && m_bFirstHTMLInit ) { - m_bFirstHTMLInit = FALSE; + m_bFirstHTMLInit = sal_False; SwWrtShell *pSh = m_pWrtShell; if(! pSh) pSh = ::GetActiveWrtShell(); @@ -129,27 +129,27 @@ void SwFldPage::ActivatePage() Beschreibung: Kompletter Reset; neues Feld editieren --------------------------------------------------------------------*/ -void SwFldPage::EditNewField( BOOL bOnlyActivate ) +void SwFldPage::EditNewField( sal_Bool bOnlyActivate ) { if( !bOnlyActivate ) { m_nTypeSel = LISTBOX_ENTRY_NOTFOUND; } m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND; - m_bRefresh = TRUE; + m_bRefresh = sal_True; Reset(*(SfxItemSet*)0); - m_bRefresh = FALSE; + m_bRefresh = sal_False; } /*-------------------------------------------------------------------- Beschreibung: Feld einfuegen --------------------------------------------------------------------*/ -BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, - const String& rPar2, ULONG nFormatId, - sal_Unicode cSeparator, BOOL bIsAutomaticLanguage) +sal_Bool SwFldPage::InsertFld(sal_uInt16 nTypeId, sal_uInt16 nSubType, const String& rPar1, + const String& rPar2, sal_uLong nFormatId, + sal_Unicode cSeparator, sal_Bool bIsAutomaticLanguage) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; SwView* pView = GetActiveView(); SwWrtShell *pSh = m_pWrtShell ? m_pWrtShell : pView->GetWrtShellPtr(); @@ -164,7 +164,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, pView->GetViewFrame()->GetBindings().GetRecorder(); if ( xRecorder.is() ) { - BOOL bRecordDB = TYP_DBFLD == nTypeId || + sal_Bool bRecordDB = TYP_DBFLD == nTypeId || TYP_DBSETNUMBERFLD == nTypeId || TYP_DBNUMSETFLD == nTypeId || TYP_DBNEXTSETFLD == nTypeId || @@ -207,7 +207,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, { case TYP_DATEFLD: case TYP_TIMEFLD: - nSubType = static_cast< USHORT >(((nTypeId == TYP_DATEFLD) ? DATEFLD : TIMEFLD) | + nSubType = static_cast< sal_uInt16 >(((nTypeId == TYP_DATEFLD) ? DATEFLD : TIMEFLD) | ((nSubType == DATE_VAR) ? 0 : FIXEDFLD)); break; @@ -258,7 +258,7 @@ BOOL SwFldPage::InsertFld(USHORT nTypeId, USHORT nSubType, const String& rPar1, case TYP_SEQFLD: { SwSetExpFieldType* pTyp = (SwSetExpFieldType*)pTmpFld->GetTyp(); - pTyp->SetOutlineLvl( static_cast< BYTE >(nSubType & 0xff)); + pTyp->SetOutlineLvl( static_cast< sal_uInt8 >(nSubType & 0xff)); pTyp->SetDelimiter(cSeparator); nSubType = nsSwGetSetExpType::GSE_SEQ; @@ -327,7 +327,7 @@ void SwFldPage::SavePos( const ListBox* pLst1, const ListBox* pLst2, void SwFldPage::RestorePos(ListBox* pLst1, ListBox* pLst2, ListBox* pLst3) { - USHORT nPos = 0; + sal_uInt16 nPos = 0; ListBox* aLBArr [ coLBCount ] = { pLst1, pLst2, pLst3 }; ListBox** ppLB = aLBArr; for( int i = 0; i < coLBCount; ++i, ++ppLB ) @@ -365,7 +365,7 @@ IMPL_LINK( SwFldPage, InsertHdl, Button *, pBtn ) Beschreibung: "Einfuegen"-Button Enablen/Disablen --------------------------------------------------------------------*/ -void SwFldPage::EnableInsert(BOOL bEnable) +void SwFldPage::EnableInsert(sal_Bool bEnable) { SwFldDlg *pDlg = (SwFldDlg*)GetTabDialog(); diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index f5adda90169f..db5ce3a5f4c8 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -41,23 +41,23 @@ class SwFldPage : public SfxTabPage SwFldMgr m_aMgr; SwField *m_pCurFld; SwWrtShell* m_pWrtShell; - USHORT m_nPageId; - USHORT m_nTypeSel; - USHORT m_nSelectionSel; - BOOL m_bFldEdit; - BOOL m_bInsert; - BOOL m_bFldDlgHtmlMode; - BOOL m_bRefresh; - BOOL m_bFirstHTMLInit; + sal_uInt16 m_nPageId; + sal_uInt16 m_nTypeSel; + sal_uInt16 m_nSelectionSel; + sal_Bool m_bFldEdit; + sal_Bool m_bInsert; + sal_Bool m_bFldDlgHtmlMode; + sal_Bool m_bRefresh; + sal_Bool m_bFirstHTMLInit; protected: - USHORT GetTypeSel() const { return m_nTypeSel;} - void SetTypeSel(USHORT nSet) { m_nTypeSel = nSet;} - USHORT GetSelectionSel() const { return m_nSelectionSel;} - void SetSelectionSel(USHORT nSet){ m_nSelectionSel = nSet;} - BOOL IsFldDlgHtmlMode() const { return m_bFldDlgHtmlMode;} - BOOL IsRefresh() const { return m_bRefresh;} + sal_uInt16 GetTypeSel() const { return m_nTypeSel;} + void SetTypeSel(sal_uInt16 nSet) { m_nTypeSel = nSet;} + sal_uInt16 GetSelectionSel() const { return m_nSelectionSel;} + void SetSelectionSel(sal_uInt16 nSet){ m_nSelectionSel = nSet;} + sal_Bool IsFldDlgHtmlMode() const { return m_bFldDlgHtmlMode;} + sal_Bool IsRefresh() const { return m_bRefresh;} SwField* GetCurField() { return m_pCurFld;} SwWrtShell* GetWrtShell() { return m_pWrtShell;} @@ -70,17 +70,17 @@ protected: const ListBox* pLst3 = 0); void RestorePos( ListBox* pLst1, ListBox* pLst2 = 0, ListBox* pLst3 = 0 ); - void EnableInsert(BOOL bEnable = TRUE); - inline BOOL IsFldEdit() const { return m_bFldEdit; } + void EnableInsert(sal_Bool bEnable = sal_True); + inline sal_Bool IsFldEdit() const { return m_bFldEdit; } // Feld einfuegen - BOOL InsertFld( USHORT nTypeId, - USHORT nSubType, + sal_Bool InsertFld( sal_uInt16 nTypeId, + sal_uInt16 nSubType, const String& rPar1, const String& rPar2, - ULONG nFormatId, + sal_uLong nFormatId, sal_Unicode cDelim = ' ', - BOOL bIsAutomaticLanguage = TRUE); + sal_Bool bIsAutomaticLanguage = sal_True); using SfxTabPage::ActivatePage; @@ -95,8 +95,8 @@ public: inline SwFldMgr& GetFldMgr() { return m_aMgr; } void SetWrtShell( SwWrtShell* m_pWrtShell ); - void EditNewField( BOOL bOnlyActivate = FALSE ); - virtual USHORT GetGroup() = 0; + void EditNewField( sal_Bool bOnlyActivate = sal_False ); + virtual sal_uInt16 GetGroup() = 0; }; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 60fd51cfbd4f..3f1c671b4439 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -65,7 +65,7 @@ SV_IMPL_PTRARR( _SwSeqFldList, _SeqFldLstElem* ) #define REFFLDFLAG_NUMITEM 0x7200 // <-- -USHORT nFldDlgFmtSel = 0; +sal_uInt16 nFldDlgFmtSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 @@ -112,7 +112,7 @@ SwFldRefPage::SwFldRefPage(Window* pParent, const SfxItemSet& rCoreSet ) : // --> OD 2007-11-21 #i83479# aSelectionToolTipLB.SetSelectHdl( LINK(this, SwFldRefPage, SubTypeHdl) ); aSelectionToolTipLB.SetDoubleClickHdl( LINK(this, SwFldRefPage, InsertHdl) ); - aSelectionToolTipLB.SetWindowBits( aSelectionToolTipLB.GetWindowBits() | WB_HSCROLL ); + aSelectionToolTipLB.SetStyle( aSelectionToolTipLB.GetStyle() | WB_HSCROLL ); aSelectionToolTipLB.SetSpaceBetweenEntries(1); aSelectionToolTipLB.SetHighlightRange(); // <-- @@ -132,7 +132,7 @@ void SwFldRefPage::SaveSelectedTxtNode() SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); if ( pEntry ) { - const USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); SwWrtShell *pSh = GetWrtShell(); if ( !pSh ) { @@ -140,7 +140,7 @@ void SwFldRefPage::SaveSelectedTxtNode() } if ( nTypeId == REFFLDFLAG_HEADING ) { - mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())); + mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())); if ( mnSavedSelectedPos < maOutlineNodes.size() ) { mpSavedSelectedTxtNode = maOutlineNodes[mnSavedSelectedPos]; @@ -148,7 +148,7 @@ void SwFldRefPage::SaveSelectedTxtNode() } else if ( nTypeId == REFFLDFLAG_NUMITEM ) { - mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())); + mnSavedSelectedPos = static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())); if ( mnSavedSelectedPos < maNumItems.size() ) { mpSavedSelectedTxtNode = maNumItems[mnSavedSelectedPos]->GetTxtNode(); @@ -184,18 +184,18 @@ void SwFldRefPage::Reset(const SfxItemSet& ) Init(); // Allgemeine initialisierung // TypeListBox initialisieren - aTypeLB.SetUpdateMode(FALSE); + aTypeLB.SetUpdateMode(sal_False); aTypeLB.Clear(); // Typ-Listbox fuellen - USHORT nPos; + sal_uInt16 nPos; // Referenz setzen / einfuegen const SwFldGroupRgn& rRg = GetFldMgr().GetGroupRange(IsFldDlgHtmlMode(), GetGroup()); for (short i = rRg.nStart; i < rRg.nEnd; ++i) { - const USHORT nTypeId = GetFldMgr().GetTypeId(i); + const sal_uInt16 nTypeId = GetFldMgr().GetTypeId(i); if (!IsFldEdit() || nTypeId != TYP_SETREFFLD) { @@ -217,9 +217,9 @@ void SwFldRefPage::Reset(const SfxItemSet& ) if(!pSh) pSh = ::GetActiveWrtShell(); - USHORT nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD); + sal_uInt16 nFldTypeCnt = pSh->GetFldTypeCount(RES_SETEXPFLD); - for (USHORT n = 0; n < nFldTypeCnt; ++n) + for (sal_uInt16 n = 0; n < nFldTypeCnt; ++n) { SwSetExpFieldType* pType = (SwSetExpFieldType*)pSh->GetFldType(n, RES_SETEXPFLD); @@ -252,7 +252,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) if (!IsFldEdit()) RestorePos(&aTypeLB); - aTypeLB.SetUpdateMode(TRUE); + aTypeLB.SetUpdateMode(sal_True); nFldDlgFmtSel = 0; @@ -263,11 +263,11 @@ void SwFldRefPage::Reset(const SfxItemSet& ) EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) { String sVal = sUserData.GetToken(1, ';'); - USHORT nVal = static_cast< USHORT >(sVal.ToInt32()); + sal_uInt16 nVal = static_cast< sal_uInt16 >(sVal.ToInt32()); if(nVal != USHRT_MAX) { - for(USHORT i = 0; i < aTypeLB.GetEntryCount(); i++) - if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i)) + for(sal_uInt16 i = 0; i < aTypeLB.GetEntryCount(); i++) + if(nVal == (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(i)) { aTypeLB.SelectEntryPos(i); break; @@ -290,7 +290,7 @@ void SwFldRefPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern - const USHORT nOld = GetTypeSel(); + const sal_uInt16 nOld = GetTypeSel(); // Aktuelle ListBoxPos SetTypeSel(aTypeLB.GetSelectEntryPos()); @@ -301,7 +301,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) { // Positionen selektieren String sName; - USHORT nFlag = 0; + sal_uInt16 nFlag = 0; switch( GetCurField()->GetSubType() ) { @@ -353,7 +353,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) if (aTypeLB.GetEntryPos(sName) == LISTBOX_ENTRY_NOTFOUND) // Referenz zu gel?schter Marke { - USHORT nPos = aTypeLB.InsertEntry(sName); + sal_uInt16 nPos = aTypeLB.InsertEntry(sName); aTypeLB.SetEntryData(nPos, reinterpret_cast<void*>(nFlag)); } @@ -369,12 +369,12 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) if (nOld != GetTypeSel()) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); // Auswahl-Listbox fuellen UpdateSubType(); - BOOL bName = FALSE; nFldDlgFmtSel = 0; + sal_Bool bName = sal_False; nFldDlgFmtSel = 0; if ( ( !IsFldEdit() || aSelectionLB.GetEntryCount() ) && nOld != LISTBOX_ENTRY_NOTFOUND ) @@ -386,23 +386,23 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) switch (nTypeId) { case TYP_GETREFFLD: - if (REFFLDFLAG & (USHORT)(ULONG)aTypeLB.GetEntryData(nOld)) + if (REFFLDFLAG & (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(nOld)) // dann bleibt die alte bestehen nFldDlgFmtSel = aFormatLB.GetSelectEntryPos(); - bName = TRUE; + bName = sal_True; break; case TYP_SETREFFLD: - bName = TRUE; + bName = sal_True; break; case REFFLDFLAG_BOOKMARK: - bName = TRUE; + bName = sal_True; // kein break!!! default: if( REFFLDFLAG & nTypeId ) { - USHORT nOldId = (USHORT)(ULONG)aTypeLB.GetEntryData(nOld); + sal_uInt16 nOldId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(nOld); if( nOldId & REFFLDFLAG || nOldId == TYP_GETREFFLD ) // dann bleibt die alte bestehen nFldDlgFmtSel = aFormatLB.GetSelectEntryPos(); @@ -414,8 +414,8 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) aNameFT.Enable(bName); // Format-Listbox fuellen - USHORT nSize = FillFormatLB(nTypeId); - BOOL bFormat = nSize != 0; + sal_uInt16 nSize = FillFormatLB(nTypeId); + sal_Bool bFormat = nSize != 0; aFormatLB.Enable(bFormat); aFormatFT.Enable(bFormat); @@ -428,7 +428,7 @@ IMPL_LINK( SwFldRefPage, TypeHdl, ListBox *, EMPTYARG ) IMPL_LINK( SwFldRefPage, SubTypeHdl, ListBox *, EMPTYARG ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); switch(nTypeId) { @@ -484,13 +484,13 @@ void SwFldRefPage::UpdateSubType() if(!pSh) pSh = ::GetActiveWrtShell(); SwGetRefField* pRefFld = (SwGetRefField*)GetCurField(); - const USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); String sOldSel; // --> OD 2007-11-22 #i83479# if ( aSelectionLB.IsVisible() ) { - const USHORT nSelectionSel = aSelectionLB.GetSelectEntryPos(); + const sal_uInt16 nSelectionSel = aSelectionLB.GetSelectEntryPos(); if (nSelectionSel != LISTBOX_ENTRY_NOTFOUND) { sOldSel = aSelectionLB.GetEntry(nSelectionSel); @@ -500,10 +500,10 @@ void SwFldRefPage::UpdateSubType() if (IsFldEdit() && !sOldSel.Len()) sOldSel = String::CreateFromInt32( pRefFld->GetSeqNo() + 1 ); - aSelectionLB.SetUpdateMode(FALSE); + aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); // --> OD 2007-11-21 #i83479# - aSelectionToolTipLB.SetUpdateMode(FALSE); + aSelectionToolTipLB.SetUpdateMode(sal_False); aSelectionToolTipLB.Clear(); bool bShowSelectionToolTipLB( false ); // <-- @@ -530,9 +530,9 @@ void SwFldRefPage::UpdateSubType() { aSelectionLB.SetStyle(aSelectionLB.GetStyle() & ~WB_SORT); SwSeqFldList aArr; - USHORT nCnt = pSh->GetSeqFtnList( aArr ); + sal_uInt16 nCnt = pSh->GetSeqFtnList( aArr ); - for( USHORT n = 0; n < nCnt; ++n ) + for( sal_uInt16 n = 0; n < nCnt; ++n ) { aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry ); if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo) @@ -543,9 +543,9 @@ void SwFldRefPage::UpdateSubType() { aSelectionLB.SetStyle(aSelectionLB.GetStyle() & ~WB_SORT); SwSeqFldList aArr; - USHORT nCnt = pSh->GetSeqFtnList( aArr, true ); + sal_uInt16 nCnt = pSh->GetSeqFtnList( aArr, true ); - for( USHORT n = 0; n < nCnt; ++n ) + for( sal_uInt16 n = 0; n < nCnt; ++n ) { aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry ); if (IsFldEdit() && pRefFld->GetSeqNo() == aArr[ n ]->nSeqNo) @@ -628,8 +628,8 @@ void SwFldRefPage::UpdateSubType() if(IsFldEdit()) sOldSel.Erase(); - USHORT nCnt = pType->GetSeqFldList( aArr ); - for( USHORT n = 0; n < nCnt; ++n ) + sal_uInt16 nCnt = pType->GetSeqFldList( aArr ); + for( sal_uInt16 n = 0; n < nCnt; ++n ) { aSelectionLB.InsertEntry( aArr[ n ]->sDlgEntry ); if (IsFldEdit() && !sOldSel.Len() && @@ -646,7 +646,7 @@ void SwFldRefPage::UpdateSubType() { SvStringsDtor aLst; GetFldMgr().GetSubTypes(nTypeId, aLst); - for (USHORT i = 0; i < aLst.Count(); ++i) + for (sal_uInt16 i = 0; i < aLst.Count(); ++i) aSelectionLB.InsertEntry(*aLst[i]); if (IsFldEdit()) @@ -658,9 +658,9 @@ void SwFldRefPage::UpdateSubType() aSelectionLB.Show( !bShowSelectionToolTipLB ); if ( bShowSelectionToolTipLB ) { - aSelectionToolTipLB.SetUpdateMode(TRUE); + aSelectionToolTipLB.SetUpdateMode(sal_True); - BOOL bEnable = aSelectionToolTipLB.GetEntryCount() != 0; + sal_Bool bEnable = aSelectionToolTipLB.GetEntryCount() != 0; aSelectionToolTipLB.Enable( bEnable ); aSelectionFT.Enable( bEnable ); @@ -676,10 +676,10 @@ void SwFldRefPage::UpdateSubType() } else { - aSelectionLB.SetUpdateMode(TRUE); + aSelectionLB.SetUpdateMode(sal_True); // Enable oder Disable - BOOL bEnable = aSelectionLB.GetEntryCount() != 0; + sal_Bool bEnable = aSelectionLB.GetEntryCount() != 0; aSelectionLB.Enable( bEnable ); aSelectionFT.Enable( bEnable ); @@ -696,11 +696,11 @@ void SwFldRefPage::UpdateSubType() // <-- } -USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) +sal_uInt16 SwFldRefPage::FillFormatLB(sal_uInt16 nTypeId) { String sOldSel; - USHORT nFormatSel = aFormatLB.GetSelectEntryPos(); + sal_uInt16 nFormatSel = aFormatLB.GetSelectEntryPos(); if (nFormatSel != LISTBOX_ENTRY_NOTFOUND) sOldSel = aFormatLB.GetEntry(nFormatSel); @@ -708,7 +708,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) aFormatLB.Clear(); // Referenz hat weniger als die Beschriftung - USHORT nSize( 0 ); + sal_uInt16 nSize( 0 ); bool bAddCrossRefFormats( false ); switch (nTypeId) { @@ -735,7 +735,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) } else { - nSize = GetFldMgr().GetFormatCount( nTypeId, FALSE, IsFldDlgHtmlMode() ); + nSize = GetFldMgr().GetFormatCount( nTypeId, sal_False, IsFldDlgHtmlMode() ); } break; } @@ -743,16 +743,16 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) if (REFFLDFLAG & nTypeId) nTypeId = TYP_GETREFFLD; - for (USHORT i = 0; i < nSize; i++) + for (sal_uInt16 i = 0; i < nSize; i++) { - USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, i )); + sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, i )); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, i ))); } // --> OD 2007-11-16 #i83479# if ( bAddCrossRefFormats ) { - USHORT nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN; - USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat )); + sal_uInt16 nFormat = FMT_REF_NUMBER - FMT_REF_BEGIN; + sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat )); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(GetFldMgr().GetFormatId( nTypeId, nFormat ))); nFormat = FMT_REF_NUMBER_NO_CONTEXT - FMT_REF_BEGIN; nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr( nTypeId, nFormat )); @@ -770,7 +770,7 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) if (!IsFldEdit()) aFormatLB.SelectEntry(sOldSel); else - aFormatLB.SelectEntry(SW_RESSTR(FMT_REF_BEGIN + (USHORT)GetCurField()->GetFormat())); + aFormatLB.SelectEntry(SW_RESSTR(FMT_REF_BEGIN + (sal_uInt16)GetCurField()->GetFormat())); if (!aFormatLB.GetSelectEntryCount()) { @@ -790,15 +790,15 @@ USHORT SwFldRefPage::FillFormatLB(USHORT nTypeId) IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG ) { String aName(aNameED.GetText()); - const USHORT nLen = aName.Len(); + const sal_uInt16 nLen = aName.Len(); - BOOL bEnable = TRUE; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bEnable = sal_True; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); if ((nTypeId == TYP_SETREFFLD && !GetFldMgr().CanInsertRefMark(aName)) || (nLen == 0 && (nTypeId == TYP_GETREFFLD || nTypeId == TYP_SETREFFLD || nTypeId == REFFLDFLAG_BOOKMARK))) - bEnable = FALSE; + bEnable = sal_False; EnableInsert(bEnable); @@ -807,20 +807,20 @@ IMPL_LINK( SwFldRefPage, ModifyHdl, Edit *, EMPTYARG ) return 0; } -BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) { - BOOL bModified = FALSE; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bModified = sal_False; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - USHORT nSubType = 0; - ULONG nFormat; + sal_uInt16 nSubType = 0; + sal_uLong nFormat; nFormat = aFormatLB.GetSelectEntryPos(); if(nFormat == LISTBOX_ENTRY_NOTFOUND) nFormat = 0; else - nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); + nFormat = (sal_uLong)aFormatLB.GetEntryData((sal_uInt16)nFormat); String aVal(aValueED.GetText()); String aName(aNameED.GetText()); @@ -865,7 +865,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); - USHORT nPos; + sal_uInt16 nPos; nTypeId = TYP_GETREFFLD; nSubType = REF_FOOTNOTE; @@ -876,7 +876,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) - bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde + bModified = sal_True; // Kann bei Feldern passieren, deren Referenz geloescht wurde } else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); @@ -886,7 +886,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); - USHORT nPos; + sal_uInt16 nPos; nTypeId = TYP_GETREFFLD; nSubType = REF_ENDNOTE; @@ -897,7 +897,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) - bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde + bModified = sal_True; // Kann bei Feldern passieren, deren Referenz geloescht wurde } else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); @@ -910,7 +910,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) { - const sal_uInt16 nOutlIdx( static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())) ); + const sal_uInt16 nOutlIdx( static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())) ); pSh->getIDocumentOutlineNodesAccess()->getOutlineNodes( maOutlineNodes ); if ( nOutlIdx < maOutlineNodes.size() ) { @@ -930,7 +930,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) { - const sal_uInt16 nNumItemIdx( static_cast<sal_uInt16>(reinterpret_cast<ULONG>(pEntry->GetUserData())) ); + const sal_uInt16 nNumItemIdx( static_cast<sal_uInt16>(reinterpret_cast<sal_uLong>(pEntry->GetUserData())) ); pSh->getIDocumentListItemsAccess()->getNumItems( maNumItems ); if ( nNumItemIdx < maNumItems.size() ) { @@ -954,7 +954,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) SwSeqFldList aArr; _SeqFldLstElem aElem( aSelectionLB.GetSelectEntry(), 0 ); - USHORT nPos; + sal_uInt16 nPos; nTypeId = TYP_GETREFFLD; nSubType = REF_SEQUENCEFLD; @@ -965,7 +965,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) aVal = String::CreateFromInt32( aArr[nPos]->nSeqNo ); if (IsFldEdit() && aArr[nPos]->nSeqNo == pRefFld->GetSeqNo()) - bModified = TRUE; // Kann bei Feldern passieren, deren Referenz geloescht wurde + bModified = sal_True; // Kann bei Feldern passieren, deren Referenz geloescht wurde } else if (IsFldEdit()) aVal = String::CreateFromInt32( pRefFld->GetSeqNo() ); @@ -991,7 +991,7 @@ BOOL SwFldRefPage::FillItemSet(SfxItemSet& ) ModifyHdl(); // Insert ggf enablen/disablen - return FALSE; + return sal_False; } SfxTabPage* SwFldRefPage::Create( Window* pParent, @@ -1000,7 +1000,7 @@ SfxTabPage* SwFldRefPage::Create( Window* pParent, return ( new SwFldRefPage( pParent, rAttrSet ) ); } -USHORT SwFldRefPage::GetGroup() +sal_uInt16 SwFldRefPage::GetGroup() { return GRP_REF; } @@ -1010,11 +1010,11 @@ void SwFldRefPage::FillUserData() String sData( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( USER_DATA_VERSION ))); sData += ';'; - USHORT nTypeSel = aTypeLB.GetSelectEntryPos(); + sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = sal::static_int_cast< USHORT >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); + nTypeSel = sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(aTypeLB.GetEntryData( nTypeSel ))); sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index b1daeaf3684f..f0b407c36ecf 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -80,7 +80,7 @@ class SwFldRefPage : public SwFldPage DECL_LINK( ModifyHdl, Edit *pEd = 0 ); void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); // --> OD 2007-12-05 #i83479# void SaveSelectedTxtNode(); @@ -89,7 +89,7 @@ class SwFldRefPage : public SwFldPage // <-- protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldRefPage(Window* pParent, const SfxItemSet& rSet); @@ -98,7 +98,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 847c9358db69..5a589e276592 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -43,6 +43,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFTYPE { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -58,6 +59,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFSELECTION { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 166 , 73 ) ; @@ -82,6 +84,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFFORMAT { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 104 ) ; Size = MAP_APPFONT ( 76 , 75 ) ; @@ -98,6 +101,7 @@ TabPage TP_FLD_REF }; Edit ED_REFNAME { + HelpID = "sw:Edit:TP_FLD_REF:ED_REFNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 104 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -114,6 +118,7 @@ TabPage TP_FLD_REF }; Edit ED_REFVALUE { + HelpID = "sw:Edit:TP_FLD_REF:ED_REFVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 136 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 595aada6d195..4e26ec2cb204 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -75,7 +75,7 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) : SfxTabDialog( pParent, SW_RES( DLG_FLD_INSERT )), m_pChildWin(pCW), m_pBindings(pB), - m_bDataBaseMode(FALSE) + m_bDataBaseMode(sal_False) { SetStyle(GetStyle()|WB_STDMODELESS); m_bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; @@ -133,12 +133,12 @@ SwFldDlg::~SwFldDlg() { } -BOOL SwFldDlg::Close() +sal_Bool SwFldDlg::Close() { m_pBindings->GetDispatcher()-> Execute(m_bDataBaseMode ? FN_INSERT_FIELD_DATA_ONLY : FN_INSERT_FIELD, SFX_CALLMODE_ASYNCHRON|SFX_CALLMODE_RECORD); - return TRUE; + return sal_True; } void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) @@ -187,7 +187,7 @@ void SwFldDlg::Initialize(SfxChildWinInfo *pInfo) SetPosPixel( aPos ); } -SfxItemSet* SwFldDlg::CreateInputItemSet( USHORT nID ) +SfxItemSet* SwFldDlg::CreateInputItemSet( sal_uInt16 nID ) { if ( nID == TP_FLD_DOKINF ) { @@ -232,7 +232,7 @@ IMPL_LINK( SwFldDlg, OKHdl, Button *, EMPTYARG ) void SwFldDlg::ReInitDlg() { SwDocShell* pDocSh = (SwDocShell*)SfxObjectShell::Current(); - BOOL bNewMode = (::GetHtmlMode(pDocSh) & HTMLMODE_ON) != 0; + sal_Bool bNewMode = (::GetHtmlMode(pDocSh) & HTMLMODE_ON) != 0; if (bNewMode != m_bHtmlMode) { @@ -266,7 +266,7 @@ void SwFldDlg::ReInitDlg() Beschreibung: Nach Dok-Wechsel TabPage neu initialisieren --------------------------------------------------------------------*/ -void SwFldDlg::ReInitTabPage( USHORT nPageId, BOOL bOnlyActivate ) +void SwFldDlg::ReInitTabPage( sal_uInt16 nPageId, sal_Bool bOnlyActivate ) { SwFldPage* pPage = (SwFldPage* )GetTabPage(nPageId); @@ -283,22 +283,22 @@ void SwFldDlg::Activate() SwView* pView = ::GetActiveView(); if( pView ) { - BOOL bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; + sal_Bool bHtmlMode = (::GetHtmlMode((SwDocShell*)SfxObjectShell::Current()) & HTMLMODE_ON) != 0; const SwWrtShell& rSh = pView->GetWrtShell(); GetOKButton().Enable( !rSh.IsReadOnlyAvailable() || !rSh.HasReadonlySel() ); - ReInitTabPage( TP_FLD_VAR, TRUE ); + ReInitTabPage( TP_FLD_VAR, sal_True ); if( !bHtmlMode ) { - ReInitTabPage( TP_FLD_REF, TRUE ); - ReInitTabPage( TP_FLD_FUNC, TRUE ); + ReInitTabPage( TP_FLD_REF, sal_True ); + ReInitTabPage( TP_FLD_FUNC, sal_True ); } } } -void SwFldDlg::EnableInsert(BOOL bEnable) +void SwFldDlg::EnableInsert(sal_Bool bEnable) { if( bEnable ) { @@ -307,7 +307,7 @@ void SwFldDlg::EnableInsert(BOOL bEnable) if( !pView || (pView->GetWrtShell().IsReadOnlyAvailable() && pView->GetWrtShell().HasReadonlySel()) ) - bEnable = FALSE; + bEnable = sal_False; } GetOKButton().Enable(bEnable); } @@ -319,7 +319,7 @@ void SwFldDlg::InsertHdl() void SwFldDlg::ActivateDatabasePage() { - m_bDataBaseMode = TRUE; + m_bDataBaseMode = sal_True; ShowPage( TP_FLD_DB ); SfxTabPage* pDBPage = GetTabPage( TP_FLD_DB ); if( pDBPage ) @@ -334,7 +334,7 @@ void SwFldDlg::ActivateDatabasePage() RemoveTabPage(TP_FLD_FUNC); } -void SwFldDlg::PageCreated(USHORT nId, SfxTabPage& rPage) +void SwFldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) { if( TP_FLD_DB == nId) { diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index d5b8aba751f5..d2418506b47b 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -74,7 +74,7 @@ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : aSeparatorFT (this, SW_RES(FT_VARSEPARATOR)), aSeparatorED (this, SW_RES(ED_VARSEPARATOR)), aNewDelTBX (this, SW_RES(TBX_VARNEWDEL)), - bInit (TRUE) + bInit (sal_True) { FreeResource(); @@ -89,12 +89,12 @@ SwFldVarPage::SwFldVarPage(Window* pParent, const SfxItemSet& rCoreSet ) : sOldValueFT = aValueFT.GetText(); sOldNameFT = aNameFT.GetText(); - for (USHORT i = 1; i <= MAXLEVEL; i++) + for (sal_uInt16 i = 1; i <= MAXLEVEL; i++) aChapterLevelLB.InsertEntry(String::CreateFromInt32(i)); aChapterLevelLB.SelectEntryPos(0); //enable 'active' language selection - aNumFormatLB.SetShowLanguageControl(TRUE); + aNumFormatLB.SetShowLanguageControl(sal_True); } SwFldVarPage::~SwFldVarPage() @@ -107,10 +107,10 @@ void SwFldVarPage::Reset(const SfxItemSet& ) Init(); // Allgemeine initialisierung - aTypeLB.SetUpdateMode(FALSE); + aTypeLB.SetUpdateMode(sal_False); aTypeLB.Clear(); - USHORT nPos, nTypeId; + sal_uInt16 nPos, nTypeId; if (!IsFldEdit()) { @@ -165,11 +165,11 @@ void SwFldVarPage::Reset(const SfxItemSet& ) if(!IsRefresh() && sUserData.GetToken(0, ';').EqualsIgnoreCaseAscii(USER_DATA_VERSION_1)) { String sVal = sUserData.GetToken(1, ';'); - USHORT nVal = (USHORT)sVal.ToInt32(); + sal_uInt16 nVal = (sal_uInt16)sVal.ToInt32(); if( USHRT_MAX != nVal ) { - for(USHORT i = 0; i < aTypeLB.GetEntryCount(); i++) - if(nVal == (USHORT)(ULONG)aTypeLB.GetEntryData(i)) + for(sal_uInt16 i = 0; i < aTypeLB.GetEntryCount(); i++) + if(nVal == (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(i)) { aTypeLB.SelectEntryPos(i); break; @@ -179,7 +179,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) } TypeHdl(0); - aTypeLB.SetUpdateMode(TRUE); + aTypeLB.SetUpdateMode(sal_True); if (IsFldEdit()) { @@ -197,7 +197,7 @@ void SwFldVarPage::Reset(const SfxItemSet& ) IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) { // Alte ListBoxPos sichern - const USHORT nOld = GetTypeSel(); + const sal_uInt16 nOld = GetTypeSel(); // Aktuelle ListBoxPos SetTypeSel(aTypeLB.GetSelectEntryPos()); @@ -210,29 +210,29 @@ IMPL_LINK( SwFldVarPage, TypeHdl, ListBox *, EMPTYARG ) if (nOld != GetTypeSel() || nOld == LISTBOX_ENTRY_NOTFOUND) { - bInit = TRUE; + bInit = sal_True; if (nOld != LISTBOX_ENTRY_NOTFOUND) { aNameED.SetText(aEmptyStr); aValueED.SetText(aEmptyStr); } - aValueED.SetDropEnable(FALSE); + aValueED.SetDropEnable(sal_False); UpdateSubType(); // Auswahl-Listboxen initialisieren } - bInit = FALSE; + bInit = sal_False; return 0; } IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); - USHORT nSelPos = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nSelPos = aSelectionLB.GetSelectEntryPos(); if (nSelPos != LISTBOX_ENTRY_NOTFOUND) - nSelPos = (USHORT)(ULONG)aSelectionLB.GetEntryData(nSelPos); + nSelPos = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nSelPos); if (IsFldEdit() && (!pBox || bInit)) { @@ -247,15 +247,15 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (aValueFT.GetText() != sOldValueFT) aValueFT.SetText(sOldValueFT); - aNumFormatLB.SetUpdateMode(FALSE); - aFormatLB.SetUpdateMode(FALSE); + aNumFormatLB.SetUpdateMode(sal_False); + aFormatLB.SetUpdateMode(sal_False); FillFormatLB(nTypeId); - USHORT nSize = aFormatLB.GetEntryCount(); + sal_uInt16 nSize = aFormatLB.GetEntryCount(); - BOOL bValue = FALSE, bName = FALSE, bNumFmt = FALSE, - bInvisible = FALSE, bSeparator = FALSE, bChapterLevel = FALSE; - BOOL bFormat = nSize != 0; + sal_Bool bValue = sal_False, bName = sal_False, bNumFmt = sal_False, + bInvisible = sal_False, bSeparator = sal_False, bChapterLevel = sal_False; + sal_Bool bFormat = nSize != 0; switch (nTypeId) { @@ -293,23 +293,23 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aValueED.SetText(aEmptyStr); } } - bValue = bName = bNumFmt = bInvisible = TRUE; + bValue = bName = bNumFmt = bInvisible = sal_True; - aValueED.SetDropEnable(TRUE); + aValueED.SetDropEnable(sal_True); break; } case TYP_SETFLD: - bValue = TRUE; + bValue = sal_True; - bNumFmt = bInvisible = TRUE; + bNumFmt = bInvisible = sal_True; if (!IsFldDlgHtmlMode()) - bName = TRUE; + bName = sal_True; else { aNumFormatLB.Clear(); - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); aNumFormatLB.SelectEntryPos(0); } @@ -346,15 +346,15 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) // (statt test2 = test + 1) aValueED.SetText(((SwSetExpField*)GetCurField())->GetFormula()); } - aValueED.SetDropEnable(TRUE); + aValueED.SetDropEnable(sal_True); break; case TYP_FORMELFLD: { - bValue = TRUE; - bNumFmt = TRUE; + bValue = sal_True; + bNumFmt = sal_True; aValueFT.SetText(SW_RESSTR(STR_FORMULA)); - aValueED.SetDropEnable(TRUE); + aValueED.SetDropEnable(sal_True); } break; @@ -384,14 +384,14 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if(pSetTyp) { if (pSetTyp->GetType() & nsSwGetSetExpType::GSE_STRING) // Textuell? - bFormat = TRUE; + bFormat = sal_True; else // Numerisch - bNumFmt = TRUE; + bNumFmt = sal_True; } } } else - bFormat = FALSE; + bFormat = sal_False; EnableInsert(bFormat|bNumFmt); } @@ -402,7 +402,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (nSelPos != LISTBOX_ENTRY_NOTFOUND) { - bValue = bNumFmt = TRUE; + bValue = bNumFmt = sal_True; String sName; @@ -410,8 +410,8 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aNameED.SetText( sName ); // User- oder SetField ? - USHORT nInpType = 0; - nInpType = static_cast< USHORT >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD); + sal_uInt16 nInpType = 0; + nInpType = static_cast< sal_uInt16 >(GetFldMgr().GetFldType(RES_USERFLD, sName) ? 0 : TYP_SETINPFLD); if (nInpType) // SETEXPFLD { @@ -425,7 +425,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) { aNumFormatLB.Clear(); - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_USERVAR_TEXT), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_USERVAR_TEXT), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); aNumFormatLB.SelectEntryPos(0); } @@ -434,7 +434,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aValueED.SetText(((SwSetExpField*)GetCurField())->GetPromptText()); } else // USERFLD - bFormat = bNumFmt = FALSE; + bFormat = bNumFmt = sal_False; } break; @@ -455,7 +455,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet String sCmd( pType->GetCmd() ); - USHORT nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); + sal_uInt16 nTmpPos = sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ' ); sCmd.SearchAndReplace( sfx2::cTokenSeperator, ' ', nTmpPos ); aValueED.SetText( sCmd ); @@ -463,12 +463,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) } } } - bName = bValue = TRUE; + bName = bValue = sal_True; break; case TYP_SEQFLD: { - bName = bValue = bSeparator = bChapterLevel = TRUE; + bName = bValue = bSeparator = bChapterLevel = sal_True; SwFieldType* pFldTyp; if( IsFldEdit() ) @@ -492,7 +492,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if( pFldTyp ) { - BYTE nLevel = ((SwSetExpFieldType*)pFldTyp)->GetOutlineLvl(); + sal_uInt8 nLevel = ((SwSetExpFieldType*)pFldTyp)->GetOutlineLvl(); if( 0x7f == nLevel ) aChapterLevelLB.SelectEntryPos( 0 ); else @@ -506,7 +506,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) case TYP_SETREFPAGEFLD: { - bValue = FALSE; + bValue = sal_False; aValueFT.SetText( SW_RESSTR( STR_OFFSET )); if (IsFldEdit() || pBox) // Nur bei Interaktion mit Maus @@ -514,7 +514,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND) { - bValue = TRUE; // SubType OFF - kennt keinen Offset + bValue = sal_True; // SubType OFF - kennt keinen Offset if (IsFldEdit()) aValueED.SetText(String::CreateFromInt32(((SwRefPageSetField*)GetCurField())->GetOffset())); } @@ -531,7 +531,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) aFormatLB.Show(!bNumFmt); if (IsFldEdit()) - bName = FALSE; + bName = sal_False; aFormatLB.Enable(bFormat); aFormatFT.Enable(bFormat|bNumFmt); @@ -559,12 +559,12 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) ModifyHdl(); // Anwenden/Einfuegen/Loeschen Status update - aNumFormatLB.SetUpdateMode(TRUE); - aFormatLB.SetUpdateMode(TRUE); + aNumFormatLB.SetUpdateMode(sal_True); + aFormatLB.SetUpdateMode(sal_True); if(aSelectionLB.IsCallAddSelection()) { - nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); switch (nTypeId) { @@ -573,7 +573,7 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) nSelPos = aSelectionLB.GetSelectEntryPos(); if (nSelPos != LISTBOX_ENTRY_NOTFOUND) - nSelPos = (USHORT)(ULONG)aSelectionLB.GetEntryData(nSelPos); + nSelPos = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nSelPos); if (nSelPos != LISTBOX_ENTRY_NOTFOUND && pBox && !bInit) { @@ -594,22 +594,22 @@ IMPL_LINK( SwFldVarPage, SubTypeHdl, ListBox *, pBox ) void SwFldVarPage::UpdateSubType() { String sOldSel; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); SetSelectionSel(aSelectionLB.GetSelectEntryPos()); if(GetSelectionSel() != LISTBOX_ENTRY_NOTFOUND) sOldSel = aSelectionLB.GetEntry(GetSelectionSel()); // Auswahl-Listbox fuellen - aSelectionLB.SetUpdateMode(FALSE); + aSelectionLB.SetUpdateMode(sal_False); aSelectionLB.Clear(); SvStringsDtor aList; GetFldMgr().GetSubTypes(nTypeId, aList); - USHORT nCount = aList.Count(); - USHORT nPos; + sal_uInt16 nCount = aList.Count(); + sal_uInt16 nPos; - for (USHORT i = 0; i < nCount; ++i) + for (sal_uInt16 i = 0; i < nCount; ++i) { if (nTypeId != TYP_INPUTFLD || i) { @@ -620,29 +620,29 @@ void SwFldVarPage::UpdateSubType() } else { - BOOL bInsert = FALSE; + sal_Bool bInsert = sal_False; switch (nTypeId) { case TYP_INPUTFLD: if (*aList[i] == GetCurField()->GetPar1()) - bInsert = TRUE; + bInsert = sal_True; break; case TYP_FORMELFLD: - bInsert = TRUE; + bInsert = sal_True; break; case TYP_GETFLD: if (*aList[i] == ((SwFormulaField*)GetCurField())->GetFormula()) - bInsert = TRUE; + bInsert = sal_True; break; case TYP_SETFLD: case TYP_USERFLD: if (*aList[i] == GetCurField()->GetTyp()->GetName()) { - bInsert = TRUE; + bInsert = sal_True; if (GetCurField()->GetSubType() & nsSwExtendedSubType::SUB_INVISIBLE) aInvisibleCB.Check(); } @@ -660,7 +660,7 @@ void SwFldVarPage::UpdateSubType() default: if (*aList[i] == GetCurField()->GetPar1()) - bInsert = TRUE; + bInsert = sal_True; break; } if (bInsert) @@ -674,7 +674,7 @@ void SwFldVarPage::UpdateSubType() } } - BOOL bEnable = aSelectionLB.GetEntryCount() != 0; + sal_Bool bEnable = aSelectionLB.GetEntryCount() != 0; ListBox *pLB = 0; if (bEnable) @@ -691,19 +691,19 @@ void SwFldVarPage::UpdateSubType() aSelectionFT.Enable( bEnable ); SubTypeHdl(pLB); - aSelectionLB.SetUpdateMode(TRUE); + aSelectionLB.SetUpdateMode(sal_True); } -USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) +sal_uInt16 SwFldVarPage::FillFormatLB(sal_uInt16 nTypeId) { String sOldSel, sOldNumSel; - ULONG nOldNumFormat = 0; + sal_uLong nOldNumFormat = 0; - USHORT nFormatSel = aFormatLB.GetSelectEntryPos(); + sal_uInt16 nFormatSel = aFormatLB.GetSelectEntryPos(); if (nFormatSel != LISTBOX_ENTRY_NOTFOUND) sOldSel = aFormatLB.GetEntry(nFormatSel); - USHORT nNumFormatSel = aNumFormatLB.GetSelectEntryPos(); + sal_uInt16 nNumFormatSel = aNumFormatLB.GetSelectEntryPos(); if (nNumFormatSel != LISTBOX_ENTRY_NOTFOUND) { sOldNumSel = aNumFormatLB.GetEntry(nNumFormatSel); @@ -713,7 +713,7 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) // Format-Listbox fuellen aFormatLB.Clear(); aNumFormatLB.Clear(); - BOOL bSpecialFmt = FALSE; + sal_Bool bSpecialFmt = sal_False; if( TYP_GETREFPAGEFLD != nTypeId ) { @@ -745,7 +745,7 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) { if (!IsFldEdit() || bSpecialFmt) { - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_MARK_TEXT), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_MARK_TEXT), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_USERVAR_CMD), 1); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); @@ -757,7 +757,7 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) { if (!IsFldEdit() || bSpecialFmt) { - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_SETVAR_TEXT), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); } } @@ -765,14 +765,14 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) case TYP_FORMELFLD: { - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); } break; case TYP_GETFLD: { - USHORT nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); + sal_uInt16 nPos = aNumFormatLB.InsertEntry(SW_RESSTR(FMT_GETVAR_NAME), 0); aNumFormatLB.SetEntryData(nPos, (void *)ULONG_MAX); } break; @@ -793,12 +793,12 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) aNumFormatLB.SelectEntry(sOldSel); } - USHORT nSize = GetFldMgr().GetFormatCount(nTypeId, FALSE, IsFldDlgHtmlMode()); + sal_uInt16 nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False, IsFldDlgHtmlMode()); - for (USHORT i = 0; i < nSize; i++) + for (sal_uInt16 i = 0; i < nSize; i++) { - USHORT nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); - USHORT nFldId = GetFldMgr().GetFormatId( nTypeId, i ); + sal_uInt16 nPos = aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i)); + sal_uInt16 nFldId = GetFldMgr().GetFormatId( nTypeId, i ); aFormatLB.SetEntryData( nPos, reinterpret_cast<void*>(nFldId) ); if (IsFldEdit() && nFldId == GetCurField()->GetFormat()) aFormatLB.SelectEntryPos( nPos ); @@ -829,9 +829,9 @@ USHORT SwFldVarPage::FillFormatLB(USHORT nTypeId) IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) { String sValue(aValueED.GetText()); - BOOL bHasValue = sValue.Len() != 0; - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); - BOOL bInsert = FALSE, bApply = FALSE, bDelete = FALSE; + sal_Bool bHasValue = sValue.Len() != 0; + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); + sal_Bool bInsert = sal_False, bApply = sal_False, bDelete = sal_False; String sName( aNameED.GetText() ); xub_StrLen nLen = sName.Len(); @@ -861,7 +861,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) if( nLen ) { // Gibts schon einen entsprechenden Type - bInsert = bApply = TRUE; + bInsert = bApply = sal_True; SwFieldType* pType = GetFldMgr().GetFldType(RES_DDEFLD, sName); @@ -890,13 +890,13 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) { // Benutzerfelder duerfen auch ohne Inhalt eingefuegt werden! // Bug #56845 - bInsert = bApply = TRUE; + bInsert = bApply = sal_True; } } break; default: - bInsert = TRUE; + bInsert = sal_True; if (nTypeId == TYP_SETFLD || nTypeId == TYP_SEQFLD) { @@ -912,7 +912,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) if(pSh) { const SwFldTypes* p = pSh->GetDoc()->GetFldTypes(); - USHORT i; + sal_uInt16 i; for (i = 0; i < INIT_FLDTYPES; i++) { @@ -922,26 +922,26 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) } if (i >= INIT_FLDTYPES && !pSh->IsUsed(*pFldType)) - bDelete = TRUE; + bDelete = sal_True; if (nTypeId == TYP_SEQFLD && !(pFldType->GetType() & nsSwGetSetExpType::GSE_SEQ)) - bInsert = FALSE; + bInsert = sal_False; if (nTypeId == TYP_SETFLD && (pFldType->GetType() & nsSwGetSetExpType::GSE_SEQ)) - bInsert = FALSE; + bInsert = sal_False; } } if (GetFldMgr().GetFldType(RES_USERFLD, sName)) - bInsert = FALSE; + bInsert = sal_False; } if( !nLen && ( nTypeId == TYP_SETFLD || (!IsFldEdit() && nTypeId == TYP_GETFLD ) ) ) - bInsert = FALSE; + bInsert = sal_False; if( (nTypeId == TYP_SETFLD || nTypeId == TYP_FORMELFLD) && !bHasValue ) - bInsert = FALSE; + bInsert = sal_False; break; } @@ -954,7 +954,7 @@ IMPL_LINK( SwFldVarPage, ModifyHdl, Edit *, EMPTYARG ) IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); switch (pBox->GetCurItemId()) { @@ -964,7 +964,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) GetFldMgr().RemoveFldType(RES_USERFLD, aSelectionLB.GetSelectEntry()); else { - USHORT nWhich; + sal_uInt16 nWhich; switch(nTypeId) { @@ -995,8 +995,8 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { String sName(aNameED.GetText()), sValue(aValueED.GetText()); SwFieldType* pType = 0; - USHORT nId = 0; - USHORT nNumFormatPos = aNumFormatLB.GetSelectEntryPos(); + sal_uInt16 nId = 0; + sal_uInt16 nNumFormatPos = aNumFormatLB.GetSelectEntryPos(); switch (nTypeId) { @@ -1006,9 +1006,9 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) } pType = GetFldMgr().GetFldType(nId, sName); - ULONG nFormat = aFormatLB.GetSelectEntryPos(); + sal_uLong nFormat = aFormatLB.GetSelectEntryPos(); if (nFormat != LISTBOX_ENTRY_NOTFOUND) - nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); + nFormat = (sal_uLong)aFormatLB.GetEntryData((sal_uInt16)nFormat); if (pType) // Aendern { @@ -1023,7 +1023,7 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { if (nNumFormatPos != LISTBOX_ENTRY_NOTFOUND) { - ULONG nFmt = nNumFormatPos == 0 ? 0 : aNumFormatLB.GetFormat(); + sal_uLong nFmt = nNumFormatPos == 0 ? 0 : aNumFormatLB.GetFormat(); if (nFmt) { // Sprache auf Office-Sprache umstellen, da String im Office // Format vom Kalkulator erwartet wird und so in den Dlg @@ -1041,10 +1041,10 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); ((SwDDEFieldType*)pType)->SetCmd(sValue); - ((SwDDEFieldType*)pType)->SetType((USHORT)nFormat); + ((SwDDEFieldType*)pType)->SetType((sal_uInt16)nFormat); } } pType->UpdateFlds(); @@ -1079,10 +1079,10 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) { //JP 28.08.95: DDE-Topics/-Items koennen Blanks in ihren // Namen haben! Wird hier noch nicht beachtet. - USHORT nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); + sal_uInt16 nTmpPos = sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator ); sValue.SearchAndReplace( ' ', sfx2::cTokenSeperator, nTmpPos ); - SwDDEFieldType aType(sName, sValue, (USHORT)nFormat); + SwDDEFieldType aType(sName, sValue, (sal_uInt16)nFormat); aSelectionLB.InsertEntry(sName); aSelectionLB.SelectEntry(sName); GetFldMgr().InsertFldType(aType); // DDE-Feld Neu @@ -1097,12 +1097,12 @@ IMPL_LINK( SwFldVarPage, TBClickHdl, ToolBox *, pBox ) break; } - return TRUE; + return sal_True; } IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) { - BOOL bEnable = aChapterLevelLB.GetSelectEntryPos() != 0; + sal_Bool bEnable = aChapterLevelLB.GetSelectEntryPos() != 0; aSeparatorED.Enable(bEnable); aSeparatorFT.Enable(bEnable); @@ -1113,27 +1113,27 @@ IMPL_LINK( SwFldVarPage, ChapterHdl, ListBox *, EMPTYARG ) IMPL_LINK( SwFldVarPage, SeparatorHdl, Edit *, EMPTYARG ) { - BOOL bEnable = aSeparatorED.GetText().Len() != 0 || + sal_Bool bEnable = aSeparatorED.GetText().Len() != 0 || aChapterLevelLB.GetSelectEntryPos() == 0; EnableInsert(bEnable); return 0; } -BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) +sal_Bool SwFldVarPage::FillItemSet(SfxItemSet& ) { - USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel()); + sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); String aVal(aValueED.GetText()); String aName(aNameED.GetText()); - USHORT nSubType = aSelectionLB.GetSelectEntryPos(); + sal_uInt16 nSubType = aSelectionLB.GetSelectEntryPos(); if(nSubType == LISTBOX_ENTRY_NOTFOUND) nSubType = 0; else - nSubType = (USHORT)(ULONG)aSelectionLB.GetEntryData(nSubType); + nSubType = (sal_uInt16)(sal_uLong)aSelectionLB.GetEntryData(nSubType); - ULONG nFormat; + sal_uLong nFormat; if (!aNumFormatLB.IsVisible()) { @@ -1142,7 +1142,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) if(nFormat == LISTBOX_ENTRY_NOTFOUND) nFormat = 0; else - nFormat = (ULONG)aFormatLB.GetEntryData((USHORT)nFormat); + nFormat = (sal_uLong)aFormatLB.GetEntryData((sal_uInt16)nFormat); } else { @@ -1193,7 +1193,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) case TYP_INPUTFLD: { SwFieldType* pType = GetFldMgr().GetFldType(RES_USERFLD, aName); - nSubType = static_cast< USHORT >((nSubType & 0xff00) | ((pType) ? INP_USR : INP_VAR)); + nSubType = static_cast< sal_uInt16 >((nSubType & 0xff00) | ((pType) ? INP_USR : INP_VAR)); break; } @@ -1246,7 +1246,7 @@ BOOL SwFldVarPage::FillItemSet(SfxItemSet& ) UpdateSubType(); - return FALSE; + return sal_False; } SfxTabPage* SwFldVarPage::Create( Window* pParent, @@ -1255,7 +1255,7 @@ SfxTabPage* SwFldVarPage::Create( Window* pParent, return ( new SwFldVarPage( pParent, rAttrSet ) ); } -USHORT SwFldVarPage::GetGroup() +sal_uInt16 SwFldVarPage::GetGroup() { return GRP_VAR; } @@ -1263,7 +1263,7 @@ USHORT SwFldVarPage::GetGroup() SelectionListBox::SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ) : ListBox (pDialog, rResId), pDlg (pDialog), - bCallAddSelection(FALSE) + bCallAddSelection(sal_False) { } @@ -1274,16 +1274,16 @@ long SelectionListBox::PreNotify( NotifyEvent& rNEvt ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); const KeyCode aKeyCode = pKEvt->GetKeyCode(); - const USHORT nModifier = aKeyCode.GetModifier(); + const sal_uInt16 nModifier = aKeyCode.GetModifier(); if( aKeyCode.GetCode() == KEY_SPACE && !nModifier) - bCallAddSelection = TRUE; + bCallAddSelection = sal_True; } if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); if (pMEvt && (pMEvt->IsMod1() || pMEvt->IsMod2())) // Alt oder Ctrl - bCallAddSelection = TRUE; + bCallAddSelection = sal_True; } return nHandled; @@ -1293,11 +1293,11 @@ void SwFldVarPage::FillUserData() { String sData(String::CreateFromAscii(USER_DATA_VERSION)); sData += ';'; - USHORT nTypeSel = aTypeLB.GetSelectEntryPos(); + sal_uInt16 nTypeSel = aTypeLB.GetSelectEntryPos(); if( LISTBOX_ENTRY_NOTFOUND == nTypeSel ) nTypeSel = USHRT_MAX; else - nTypeSel = (USHORT)(ULONG)aTypeLB.GetEntryData( nTypeSel ); + nTypeSel = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData( nTypeSel ); sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); } diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 5f671402372e..7cc8c15a54ba 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -45,7 +45,7 @@ class SwFldVarPage; class SelectionListBox : public ListBox { SwFldVarPage* pDlg; - BOOL bCallAddSelection; + sal_Bool bCallAddSelection; virtual long PreNotify( NotifyEvent& rNEvt ); @@ -53,8 +53,8 @@ public: SelectionListBox( SwFldVarPage* pDialog, const ResId& rResId ); // Selektieren per Ctrl oder Alt erkennen und mit SelectHdl auswerten - BOOL IsCallAddSelection() const {return bCallAddSelection;} - void ResetCallAddSelection() {bCallAddSelection = FALSE;} + sal_Bool IsCallAddSelection() const {return bCallAddSelection;} + void ResetCallAddSelection() {bCallAddSelection = sal_False;} }; class SwFldVarPage : public SwFldPage @@ -83,8 +83,8 @@ class SwFldVarPage : public SwFldPage String sOldValueFT; String sOldNameFT; - ULONG nOldFormat; - BOOL bInit; + sal_uLong nOldFormat; + sal_Bool bInit; DECL_LINK( TypeHdl, ListBox* pLB = 0 ); DECL_LINK( SubTypeHdl, ListBox* pLB = 0 ); @@ -94,10 +94,10 @@ class SwFldVarPage : public SwFldPage DECL_LINK( SeparatorHdl, Edit *pED = 0 ); void UpdateSubType(); - USHORT FillFormatLB(USHORT nTypeId); + sal_uInt16 FillFormatLB(sal_uInt16 nTypeId); protected: - virtual USHORT GetGroup(); + virtual sal_uInt16 GetGroup(); public: SwFldVarPage(Window* pParent, const SfxItemSet& rSet); @@ -106,7 +106,7 @@ public: static SfxTabPage* Create(Window* pParent, const SfxItemSet& rAttrSet); - virtual BOOL FillItemSet( SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); virtual void Reset( const SfxItemSet& rSet ); virtual void FillUserData(); diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index 7405a2956849..7057096f72ab 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -44,6 +44,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARTYPE { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 135 ) ; @@ -60,6 +61,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARSELECTION { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 135 ) ; @@ -75,6 +77,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARFORMAT { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 123 ) ; @@ -83,6 +86,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 123 ) ; @@ -91,6 +95,7 @@ TabPage TP_FLD_VAR }; CheckBox CB_VARINVISIBLE { + HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE"; Pos = MAP_APPFONT ( 170 , 141 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "Invisi~ble" ; @@ -112,6 +117,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARCHAPTERLEVEL { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 208 , 123 ) ; @@ -132,6 +138,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARSEPARATOR { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR"; Pos = MAP_APPFONT ( 208 , 138 ) ; Size = MAP_APPFONT ( 46 , 12 ) ; Border = TRUE ; @@ -148,6 +155,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARNAME { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -163,6 +171,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARVALUE { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; diff --git a/sw/source/ui/fldui/fldwrap.cxx b/sw/source/ui/fldui/fldwrap.cxx index b8d3a53f7351..d24aa5f89b04 100644 --- a/sw/source/ui/fldui/fldwrap.cxx +++ b/sw/source/ui/fldui/fldwrap.cxx @@ -52,7 +52,7 @@ SFX_IMPL_CHILDWINDOW(SwFldDlgWrapper, FN_INSERT_FIELD) -SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, USHORT nId) : +SwChildWinWrapper::SwChildWinWrapper(Window *pParentWindow, sal_uInt16 nId) : SfxChildWindow(pParentWindow, nId), m_pDocSh(0) { @@ -71,14 +71,14 @@ IMPL_LINK( SwChildWinWrapper, UpdateHdl, void*, EMPTYARG ) /*-------------------------------------------------------------------- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren --------------------------------------------------------------------*/ -BOOL SwChildWinWrapper::ReInitDlg(SwDocShell *) +sal_Bool SwChildWinWrapper::ReInitDlg(SwDocShell *) { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if (m_pDocSh != GetOldDocShell()) { m_aUpdateTimer.Stop(); - bRet = TRUE; // Sofortiges Update + bRet = sal_True; // Sofortiges Update } else m_aUpdateTimer.Start(); @@ -93,7 +93,7 @@ SfxChildWinInfo SwFldDlgWrapper::GetInfo() const return aInfo; } -SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, +SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* ) : SwChildWinWrapper( _pParent, nId ) @@ -112,11 +112,11 @@ SwFldDlgWrapper::SwFldDlgWrapper( Window* _pParent, USHORT nId, /*-------------------------------------------------------------------- Beschreibung: Nach Dok-Wechsel Dialog neu initialisieren --------------------------------------------------------------------*/ -BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) +sal_Bool SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { - BOOL bRet; + sal_Bool bRet; - if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True) // Sofort aktualisieren, Dok-Wechsel { pDlgInterface->ReInitDlg(); } @@ -124,7 +124,7 @@ BOOL SwFldDlgWrapper::ReInitDlg(SwDocShell *pDocSh) return bRet; } -void SwFldDlgWrapper::ShowPage(USHORT nPage) +void SwFldDlgWrapper::ShowPage(sal_uInt16 nPage) { pDlgInterface->ShowPage(nPage ? nPage : TP_FLD_REF); } @@ -136,11 +136,11 @@ SfxChildWinInfo SwFldDataOnlyDlgWrapper::GetInfo() const SfxChildWinInfo aInfo = SfxChildWindow::GetInfo(); // prevent instatiation of dialog other than by calling // the mail merge dialog - aInfo.bVisible = FALSE; + aInfo.bVisible = sal_False; return aInfo; } -SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, +SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, sal_uInt16 nId, SfxBindings* pB, SfxChildWinInfo* pInfo ) : SwChildWinWrapper( _pParent, nId ) @@ -162,10 +162,10 @@ SwFldDataOnlyDlgWrapper::SwFldDataOnlyDlgWrapper( Window* _pParent, USHORT nId, /* -----------------04.02.2003 14:17----------------- * re-init after doc activation * --------------------------------------------------*/ -BOOL SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh) +sal_Bool SwFldDataOnlyDlgWrapper::ReInitDlg(SwDocShell *pDocSh) { - BOOL bRet; - if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == TRUE) // Sofort aktualisieren, Dok-Wechsel + sal_Bool bRet; + if ((bRet = SwChildWinWrapper::ReInitDlg(pDocSh)) == sal_True) // Sofort aktualisieren, Dok-Wechsel { pDlgInterface->ReInitDlg(); } diff --git a/sw/source/ui/fldui/inpdlg.cxx b/sw/source/ui/fldui/inpdlg.cxx index f822dc3d9883..404d27034e63 100644 --- a/sw/source/ui/fldui/inpdlg.cxx +++ b/sw/source/ui/fldui/inpdlg.cxx @@ -33,10 +33,6 @@ #undef SW_DLLIMPLEMENTATION #endif - - -#define _INPDLG_CXX - #include <vcl/msgbox.hxx> #include <unotools/charclass.hxx> #include <editeng/unolingu.hxx> @@ -56,7 +52,7 @@ --------------------------------------------------------------------*/ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, - SwField* pField, BOOL bNextButton ) : + SwField* pField, sal_Bool bNextButton ) : SvxStandardDialog(pParent, SW_RES(DLG_FLD_INPUT)), @@ -99,7 +95,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, // pInpFld = (SwInputField*)pField; aLabelED.SetText( pInpFld->GetPar2() ); - USHORT nSubType = pInpFld->GetSubType(); + sal_uInt16 nSubType = pInpFld->GetSubType(); switch(nSubType & 0xff) { @@ -123,7 +119,9 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, //values are formatted - formulas are not CharClass aCC( SvxCreateLocale( pSetFld->GetLanguage() )); if( aCC.isNumeric( sFormula )) - aStr = pSetFld->Expand(); + { + aStr = pSetFld->ExpandField(true); + } else aStr = sFormula; aLabelED.SetText( pSetFld->GetPromptText() ); @@ -131,7 +129,7 @@ SwFldInputDlg::SwFldInputDlg( Window *pParent, SwWrtShell &rS, // JP 31.3.00: Inputfields in readonly regions must be allowed to // input any content. - 74639 - BOOL bEnable = !rSh.IsCrsrReadonly(); + sal_Bool bEnable = !rSh.IsCrsrReadonly(); aOKBT.Enable( bEnable ); aEditED.SetReadOnly( !bEnable ); @@ -162,7 +160,7 @@ void SwFldInputDlg::Apply() aTmp.EraseAllChars( '\r' ); rSh.StartAllAction(); - BOOL bModified = FALSE; + sal_Bool bModified = sal_False; if(pInpFld) { if(pUsrType) @@ -171,21 +169,21 @@ void SwFldInputDlg::Apply() { pUsrType->SetContent(aTmp); pUsrType->UpdateFlds(); - bModified = TRUE; + bModified = sal_True; } } else if( aTmp != pInpFld->GetPar1() ) { pInpFld->SetPar1(aTmp); rSh.SwEditShell::UpdateFlds(*pInpFld); - bModified = TRUE; + bModified = sal_True; } } else if( aTmp != pSetFld->GetPar2() ) { pSetFld->SetPar2(aTmp); rSh.SwEditShell::UpdateFlds(*pSetFld); - bModified = TRUE; + bModified = sal_True; } if( bModified ) diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 8b60525dfe5c..799afe0ceaa8 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -46,6 +46,7 @@ ModalDialog DLG_FLD_INPUT };*/ Edit ED_LABEL { + HelpID = "sw:Edit:DLG_FLD_INPUT:ED_LABEL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; @@ -56,6 +57,7 @@ ModalDialog DLG_FLD_INPUT }; MultiLineEdit ED_EDIT { + HelpID = "sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 32 ) ; Size = MAP_APPFONT ( 115 , 72 ) ; @@ -83,6 +85,7 @@ ModalDialog DLG_FLD_INPUT }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_FLD_INPUT:PB_NEXT"; Pos = MAP_APPFONT ( 139 , 40 ) ; Size = MAP_APPFONT ( 50 , 15 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx index 6953dd257192..60db0ab163e3 100644 --- a/sw/source/ui/fldui/javaedit.cxx +++ b/sw/source/ui/fldui/javaedit.cxx @@ -82,8 +82,8 @@ SwJavaEditDialog::SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh) : aNextBtn ( this, SW_RES( BTN_NEXT ) ), aHelpBtn ( this, SW_RES( BTN_POST_HELP ) ), - bNew(TRUE), - bIsUrl(FALSE), + bNew(sal_True), + bIsUrl(sal_False), pSh(pWrtSh), pFileDlg(NULL), @@ -165,8 +165,8 @@ void SwJavaEditDialog::Apply() void SwJavaEditDialog::CheckTravel() { - BOOL bTravel = FALSE; - BOOL bNext(FALSE), bPrev(FALSE); + sal_Bool bTravel = sal_False; + sal_Bool bNext(sal_False), bPrev(sal_False); if(!bNew) { @@ -248,14 +248,14 @@ void SwJavaEditDialog::SetFld() aType = String::CreateFromAscii("JavaScript"); } -BOOL SwJavaEditDialog::IsUpdate() +sal_Bool SwJavaEditDialog::IsUpdate() { return pFld && ( bIsUrl != pFld->GetFormat() || pFld->GetPar2() != aType || pFld->GetPar1() != aText ); } IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG ) { - BOOL bEnable = aUrlRB.IsChecked(); + sal_Bool bEnable = aUrlRB.IsChecked(); aUrlPB.Enable(bEnable); aUrlED.Enable(bEnable); aEditED.Enable(!bEnable); @@ -268,7 +268,7 @@ IMPL_LINK( SwJavaEditDialog, RadioButtonHdl, RadioButton *, EMPTYARG ) aEditED.SetReadOnly( !bEnable); aTypeED.SetReadOnly( !bEnable); if( aUrlPB.IsEnabled() && !bEnable ) - aUrlPB.Enable( FALSE ); + aUrlPB.Enable( sal_False ); } return 0; } diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 373230024893..a5ebb890fb50 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -33,6 +33,7 @@ // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog DLG_JAVAEDIT { + HelpID = "sw:ModalDialog:DLG_JAVAEDIT"; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 248 , 157 ) ; @@ -45,6 +46,7 @@ ModalDialog DLG_JAVAEDIT }; Edit ED_TYPE { + HelpID = "sw:Edit:DLG_JAVAEDIT:ED_TYPE"; Border = TRUE ; Text = "JavaScript" ; // Nicht uebersetzen!!! @@ -54,6 +56,7 @@ ModalDialog DLG_JAVAEDIT }; RadioButton RB_URL { + HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_URL"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 55 , 10 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_JAVAEDIT }; Edit ED_URL { + HelpID = "sw:Edit:DLG_JAVAEDIT:ED_URL"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 27 ) ; Size = MAP_APPFONT ( 87 , 12 ) ; @@ -68,6 +72,7 @@ ModalDialog DLG_JAVAEDIT }; PushButton PB_URL { + HelpID = "sw:PushButton:DLG_JAVAEDIT:PB_URL"; Pos = MAP_APPFONT ( 163 , 26 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -75,6 +80,7 @@ ModalDialog DLG_JAVAEDIT }; RadioButton RB_EDIT { + HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_EDIT"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 140 , 10 ) ; Text [ en-US ] = "~Text" ; @@ -83,6 +89,7 @@ ModalDialog DLG_JAVAEDIT }; MultiLineEdit ED_EDIT { + HelpID = "sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 23 , 54 ) ; Size = MAP_APPFONT ( 155 , 91 ) ; @@ -116,12 +123,14 @@ ModalDialog DLG_JAVAEDIT }; ImageButton BTN_PREV { + HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_PREV"; Pos = MAP_APPFONT ( 191 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT ; }; ImageButton BTN_NEXT { + HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT"; Pos = MAP_APPFONT ( 217 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT ; diff --git a/sw/source/ui/fldui/makefile.mk b/sw/source/ui/fldui/makefile.mk deleted file mode 100644 index 212c3da6bacf..000000000000 --- a/sw/source/ui/fldui/makefile.mk +++ /dev/null @@ -1,90 +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=..$/..$/.. -LIBTARGET=no -PRJNAME=sw -TARGET=fldui - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/inc$/swpre.mk -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/inc$/sw.mk - -# --- Files -------------------------------------------------------- - -SRS1NAME=$(TARGET) -SRC1FILES = \ - changedb.src \ - DropDownFieldDialog.src\ - flddb.src \ - flddinf.src \ - flddok.src \ - fldfunc.src \ - fldref.src \ - fldtdlg.src \ - fldui.src \ - fldvar.src \ - javaedit.src \ - inpdlg.src - -SLOFILES = \ - $(EXCEPTIONSFILES) - -EXCEPTIONSFILES = \ - $(SLO)$/DropDownFieldDialog.obj \ - $(SLO)$/FldRefTreeListBox.obj \ - $(SLO)$/changedb.obj \ - $(SLO)$/flddb.obj \ - $(SLO)$/flddinf.obj \ - $(SLO)$/flddok.obj \ - $(SLO)$/fldedt.obj \ - $(SLO)$/fldfunc.obj \ - $(SLO)$/fldmgr.obj \ - $(SLO)$/fldpage.obj \ - $(SLO)$/fldref.obj \ - $(SLO)$/fldtdlg.obj \ - $(SLO)$/fldvar.obj \ - $(SLO)$/fldwrap.obj \ - $(SLO)$/inpdlg.obj \ - $(SLO)$/javaedit.obj \ - $(SLO)$/xfldui.obj - -LIB1TARGET = $(SLB)$/$(TARGET).lib - -LIB1OBJFILES = \ - $(SLO)$/fldmgr.obj \ - $(SLO)$/fldwrap.obj \ - $(SLO)$/xfldui.obj - -# $(SLO)$/DropDownFieldDialog.obj \ - -# --- Tagets ------------------------------------------------------- - -.INCLUDE : target.mk - diff --git a/sw/source/ui/fldui/xfldui.cxx b/sw/source/ui/fldui/xfldui.cxx index 0e84693a8b17..2bbcd4e65598 100644 --- a/sw/source/ui/fldui/xfldui.cxx +++ b/sw/source/ui/fldui/xfldui.cxx @@ -64,13 +64,13 @@ using namespace ::com::sun::star::beans; /*-------------------------------------------------------------------- Beschreibung: Ist das Datenbankfeld numerisch? - Anm: Im Fehlerfall wird TRUE returnt. + Anm: Im Fehlerfall wird sal_True returnt. --------------------------------------------------------------------*/ -BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, - BOOL bIsTable, const String& rFldName) +sal_Bool SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, + sal_Bool bIsTable, const String& rFldName) { - BOOL bNumeric = TRUE; + sal_Bool bNumeric = sal_True; SwNewDBMgr* pDBMgr = pWrtShell ? pWrtShell->GetNewDBMgr() : ::GetActiveView()->GetWrtShell().GetNewDBMgr(); @@ -171,7 +171,7 @@ BOOL SwFldMgr::IsDBNumeric( const String& rDBName, const String& rTblQryName, case DataType::VARCHAR: case DataType::LONGVARCHAR: default: - bNumeric = FALSE; + bNumeric = sal_False; } } } |