summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@novell.com>2011-03-14 16:51:14 +0000
committerMichael Meeks <michael.meeks@novell.com>2011-03-14 16:51:14 +0000
commited40f62e64564d2b22c9285cfdc6778aeac8fd68 (patch)
tree1a29a28c991a80ec1f3c6de1ce0cd28d4996fe21 /sw
parent6cd7d7c69ce62fbf788fc4e971cb14ab24d4c5ed (diff)
parent20529755b301c7af2c5ab461329b2d979b2cdbff (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')
-rw-r--r--sw/AllLangResTarget_sw.mk184
-rwxr-xr-xsw/JunitTest_sw_complex.mk57
-rwxr-xr-x[-rw-r--r--]sw/JunitTest_sw_unoapi.mk (renamed from sw/source/core/attr/makefile.mk)49
-rw-r--r--sw/Library_msword.mk123
-rw-r--r--sw/Library_sw.mk740
-rw-r--r--sw/Library_swd.mk (renamed from sw/source/core/SwNumberTree/makefile.mk)58
-rw-r--r--sw/Library_swui.mk169
-rw-r--r--sw/Library_vbaswobj.mk148
-rw-r--r--sw/Makefile (renamed from sw/inc/sw.mk)19
-rw-r--r--sw/Module_sw.mk (renamed from sw/inc/swpre.mk)35
-rw-r--r--sw/Package_misc.mk (renamed from sw/source/core/inc/makefile.mk)6
-rw-r--r--sw/Package_uiconfig.mk261
-rw-r--r--sw/Package_xml.mk (renamed from sw/source/filter/inc/makefile.mk)5
-rw-r--r--sw/inc/EnhancedPDFExportHelper.hxx2
-rw-r--r--sw/inc/IDocumentDeviceAccess.hxx2
-rw-r--r--sw/inc/IDocumentFieldsAccess.hxx14
-rw-r--r--sw/inc/IDocumentLinksAdministration.hxx2
-rw-r--r--sw/inc/IDocumentRedlineAccess.hxx14
-rw-r--r--sw/inc/IDocumentSettingAccess.hxx9
-rw-r--r--sw/inc/IDocumentUndoRedo.hxx253
-rw-r--r--sw/inc/IShellCursorSupplier.hxx (renamed from sw/source/ui/fmtui/fmtui.src)70
-rw-r--r--sw/inc/PostItMgr.hxx8
-rw-r--r--sw/inc/SidebarWin.hxx10
-rw-r--r--sw/inc/SwAppletImpl.hxx6
-rw-r--r--sw/inc/SwGetPoolIdFromName.hxx2
-rw-r--r--sw/inc/SwRewriter.hxx5
-rw-r--r--sw/inc/SwUndoField.hxx36
-rw-r--r--sw/inc/access.hrc15
-rw-r--r--sw/inc/accessibilityoptions.hxx24
-rw-r--r--sw/inc/acmplwrd.hxx16
-rw-r--r--sw/inc/authfld.hxx54
-rw-r--r--sw/inc/authratr.hxx6
-rw-r--r--sw/inc/bparr.hxx45
-rw-r--r--sw/inc/breakit.hxx4
-rw-r--r--sw/inc/calbck.hxx40
-rw-r--r--sw/inc/calc.hxx22
-rw-r--r--sw/inc/ccoll.hxx14
-rw-r--r--sw/inc/cellatr.hxx22
-rw-r--r--sw/inc/cellfml.hxx14
-rw-r--r--sw/inc/charatr.hxx132
-rw-r--r--sw/inc/charfmt.hxx4
-rw-r--r--sw/inc/chpfld.hxx31
-rw-r--r--sw/inc/cmdid.h8
-rw-r--r--sw/inc/colwd.hxx2
-rw-r--r--sw/inc/crsrsh.hxx424
-rw-r--r--sw/inc/crsskip.hxx6
-rw-r--r--sw/inc/crstate.hxx104
-rw-r--r--sw/inc/cshtyp.hxx8
-rw-r--r--sw/inc/dbfld.hxx106
-rw-r--r--sw/inc/dbgoutsw.hxx2
-rw-r--r--sw/inc/dbmgr.hxx107
-rw-r--r--sw/inc/dcontact.hxx6
-rw-r--r--sw/inc/ddefld.hxx37
-rw-r--r--sw/inc/doc.hxx300
-rw-r--r--sw/inc/docary.hxx33
-rw-r--r--sw/inc/docsh.hxx72
-rw-r--r--sw/inc/docstat.hxx20
-rw-r--r--sw/inc/docstyle.hxx64
-rw-r--r--sw/inc/docufld.hxx201
-rw-r--r--sw/inc/dpage.hxx6
-rw-r--r--sw/inc/edglbldc.hxx6
-rw-r--r--sw/inc/edimp.hxx18
-rw-r--r--sw/inc/editsh.hxx375
-rw-r--r--sw/inc/errhdl.hxx76
-rw-r--r--sw/inc/expfld.hxx184
-rw-r--r--sw/inc/extinput.hxx10
-rw-r--r--sw/inc/fchrfmt.hxx6
-rw-r--r--sw/inc/fesh.hxx343
-rw-r--r--sw/inc/fldbas.hxx92
-rw-r--r--sw/inc/flddat.hxx32
-rw-r--r--sw/inc/flddropdown.hxx51
-rw-r--r--sw/inc/flypos.hxx10
-rw-r--r--sw/inc/fmtanchr.hxx18
-rw-r--r--sw/inc/fmtautofmt.hxx6
-rw-r--r--sw/inc/fmtclbl.hxx6
-rw-r--r--sw/inc/fmtclds.hxx82
-rw-r--r--sw/inc/fmtcnct.hxx6
-rw-r--r--sw/inc/fmtcntnt.hxx4
-rw-r--r--sw/inc/fmtcol.hxx52
-rw-r--r--sw/inc/fmteiro.hxx8
-rw-r--r--sw/inc/fmtfld.hxx6
-rw-r--r--sw/inc/fmtfollowtextflow.hxx6
-rw-r--r--sw/inc/fmtfordr.hxx6
-rw-r--r--sw/inc/fmtfsize.hxx20
-rw-r--r--sw/inc/fmtftn.hxx8
-rw-r--r--sw/inc/fmtftntx.hxx26
-rw-r--r--sw/inc/fmthdft.hxx24
-rw-r--r--sw/inc/fmtinfmt.hxx20
-rw-r--r--sw/inc/fmtline.hxx18
-rw-r--r--sw/inc/fmtlsplt.hxx6
-rw-r--r--sw/inc/fmtmeta.hxx6
-rw-r--r--sw/inc/fmtornt.hxx30
-rw-r--r--sw/inc/fmtpdsc.hxx22
-rw-r--r--sw/inc/fmtrowsplt.hxx6
-rw-r--r--sw/inc/fmtruby.hxx22
-rw-r--r--sw/inc/fmtsrnd.hxx30
-rw-r--r--sw/inc/fmturl.hxx14
-rw-r--r--sw/inc/fmtwrapinfluenceonobjpos.hxx8
-rw-r--r--sw/inc/format.hxx292
-rw-r--r--sw/inc/frmatr.hxx52
-rw-r--r--sw/inc/frmfmt.hxx29
-rw-r--r--sw/inc/ftnidx.hxx6
-rw-r--r--sw/inc/ftninfo.hxx6
-rw-r--r--sw/inc/grfatr.hxx84
-rw-r--r--sw/inc/helpid.h1885
-rw-r--r--sw/inc/hfspacingitem.hxx8
-rw-r--r--sw/inc/hhcwrp.hxx8
-rw-r--r--sw/inc/hintids.hxx52
-rw-r--r--sw/inc/hints.hxx22
-rw-r--r--sw/inc/htmltbl.hxx326
-rw-r--r--sw/inc/index.hxx34
-rw-r--r--sw/inc/inetfld.hxx19
-rw-r--r--sw/inc/io.hxx2
-rw-r--r--sw/inc/iodetect.hxx16
-rw-r--r--sw/inc/itabenum.hxx16
-rw-r--r--sw/inc/lineinfo.hxx44
-rw-r--r--sw/inc/list.hxx2
-rw-r--r--sw/inc/makefile.mk49
-rw-r--r--sw/inc/mdiexp.hxx16
-rw-r--r--sw/inc/modcfg.hxx108
-rw-r--r--sw/inc/ndarr.hxx85
-rw-r--r--sw/inc/ndgrf.hxx66
-rw-r--r--sw/inc/ndhints.hxx34
-rw-r--r--sw/inc/ndindex.hxx131
-rw-r--r--sw/inc/ndnotxt.hxx30
-rw-r--r--sw/inc/ndole.hxx24
-rw-r--r--sw/inc/ndtxt.hxx126
-rw-r--r--sw/inc/ndtyp.hxx24
-rw-r--r--sw/inc/newhdl.hxx6
-rw-r--r--sw/inc/node.hxx168
-rw-r--r--sw/inc/numrule.hxx88
-rw-r--r--sw/inc/pagedesc.hxx66
-rw-r--r--sw/inc/pageiter.hxx8
-rw-r--r--sw/inc/pam.hxx56
-rw-r--r--sw/inc/paratr.hxx110
-rwxr-xr-x[-rw-r--r--]sw/inc/pch/precompiled_sw.hxx9
-rw-r--r--sw/inc/poolfmt.awk31
-rw-r--r--sw/inc/poolfmt.hrc9
-rw-r--r--sw/inc/poolfmt.hxx42
-rw-r--r--sw/inc/postithelper.hxx2
-rw-r--r--sw/inc/printdata.hxx31
-rw-r--r--sw/inc/prtopt.hxx (renamed from sw/source/ui/inc/prtopt.hxx)0
-rw-r--r--sw/inc/pvprtdat.hxx44
-rw-r--r--sw/inc/redline.hxx78
-rw-r--r--sw/inc/redlnaut.hxx2
-rw-r--r--sw/inc/reffld.hxx35
-rw-r--r--sw/inc/section.hxx14
-rw-r--r--sw/inc/shellio.hxx235
-rw-r--r--sw/inc/shellres.hxx2
-rw-r--r--sw/inc/sortopt.hxx12
-rw-r--r--sw/inc/swabstdlg.hxx106
-rw-r--r--sw/inc/swacorr.hxx4
-rw-r--r--sw/inc/swatrset.hxx244
-rw-r--r--sw/inc/swbaslnk.hxx30
-rw-r--r--sw/inc/swcalwrp.hxx4
-rw-r--r--sw/inc/swcli.hxx10
-rw-r--r--sw/inc/swcommands.h437
-rw-r--r--sw/inc/swcrsr.hxx176
-rw-r--r--sw/inc/swdbdata.hxx4
-rw-r--r--sw/inc/swdbtoolsclient.hxx2
-rw-r--r--sw/inc/swddetbl.hxx4
-rw-r--r--sw/inc/swerror.h4
-rw-r--r--sw/inc/swevent.hxx2
-rw-r--r--sw/inc/swgstr.hxx40
-rw-r--r--sw/inc/swmodule.hxx10
-rw-r--r--sw/inc/swprtopt.hxx98
-rw-r--r--sw/inc/swrect.hxx34
-rw-r--r--sw/inc/swregion.hxx8
-rw-r--r--sw/inc/swserv.hxx8
-rw-r--r--sw/inc/swtable.hxx150
-rw-r--r--sw/inc/swtypes.hxx16
-rw-r--r--sw/inc/swundo.hxx32
-rw-r--r--sw/inc/swunohelper.hxx16
-rw-r--r--sw/inc/swurl.hxx2
-rw-r--r--sw/inc/swwait.hxx4
-rw-r--r--sw/inc/tabcol.hxx28
-rw-r--r--sw/inc/tblafmt.hxx66
-rw-r--r--sw/inc/tblenum.hxx2
-rw-r--r--sw/inc/tblsel.hxx30
-rw-r--r--sw/inc/tgrditem.hxx50
-rw-r--r--sw/inc/tox.hxx178
-rw-r--r--sw/inc/toxwrap.hxx2
-rw-r--r--sw/inc/txatbase.hxx4
-rw-r--r--sw/inc/txatritr.hxx4
-rw-r--r--sw/inc/txtatr.hxx10
-rw-r--r--sw/inc/txtfld.hxx3
-rw-r--r--sw/inc/txtftn.hxx12
-rw-r--r--sw/inc/txtinet.hxx4
-rw-r--r--sw/inc/undobj.hxx1701
-rw-r--r--sw/inc/unoatxt.hxx10
-rw-r--r--sw/inc/unochart.hxx2
-rw-r--r--sw/inc/unocrsr.hxx24
-rw-r--r--sw/inc/unocrsrhelper.hxx4
-rw-r--r--sw/inc/unoevtlstnr.hxx2
-rw-r--r--sw/inc/unofield.hxx2
-rw-r--r--sw/inc/unoflatpara.hxx6
-rw-r--r--sw/inc/unomailmerge.hxx8
-rw-r--r--sw/inc/unomap.hxx6
-rw-r--r--sw/inc/unoprnms.hxx8
-rw-r--r--sw/inc/unoredline.hxx2
-rw-r--r--sw/inc/unoredlines.hxx4
-rw-r--r--sw/inc/unostyle.hxx2
-rw-r--r--sw/inc/unotbl.hxx2
-rw-r--r--sw/inc/unotextrange.hxx2
-rw-r--r--sw/inc/unotxdoc.hxx3
-rw-r--r--sw/inc/usrfld.hxx57
-rw-r--r--sw/inc/viewopt.hxx432
-rw-r--r--sw/inc/viewsh.hxx25
-rw-r--r--sw/inc/viscrs.hxx28
-rw-r--r--sw/inc/wdocsh.hxx6
-rw-r--r--[-rwxr-xr-x]sw/prj/build.lst78
-rw-r--r--sw/prj/d.lst59
-rw-r--r--sw/prj/makefile.mk (renamed from sw/uiconfig/layout/makefile.mk)24
-rw-r--r--sw/qa/complex/accessibility/AccessibleRelationSet.java173
-rw-r--r--sw/qa/complex/accessibility/makefile.mk57
-rw-r--r--sw/qa/complex/checkColor/CheckChangeColor.java119
-rw-r--r--sw/qa/complex/checkColor/makefile.mk75
-rw-r--r--sw/qa/complex/indeterminateState/CheckIndeterminateState.java133
-rw-r--r--sw/qa/complex/indeterminateState/makefile.mk82
-rw-r--r--sw/qa/complex/writer/CheckBookmarks.java127
-rw-r--r--sw/qa/complex/writer/CheckCrossReferences.java334
-rw-r--r--sw/qa/complex/writer/CheckFlies.java219
-rw-r--r--sw/qa/complex/writer/CheckIndexedPropertyValues.java184
-rw-r--r--sw/qa/complex/writer/CheckNamedPropertyValues.java200
-rw-r--r--sw/qa/complex/writer/LoadSaveTest.java254
-rw-r--r--sw/qa/complex/writer/TestDocument.java39
-rw-r--r--sw/qa/complex/writer/TextPortionEnumerationTest.java645
-rw-r--r--sw/qa/complex/writer/makefile.mk108
-rw-r--r--sw/qa/core/Test-BigPtrArray.cxx86
-rw-r--r--sw/qa/core/bigpointerarray-new.cxx14
-rw-r--r--sw/qa/core/bigpointerarray-new.hxx20
-rw-r--r--sw/qa/core/filters-test.cxx2
-rw-r--r--sw/qa/core/makefile.mk217
-rw-r--r--sw/qa/core/swdoc-test.cxx2
-rw-r--r--sw/qa/unoapi/Test.java5
-rw-r--r--sw/qa/unoapi/knownissues.xcl14
-rw-r--r--sw/qa/unoapi/lastCheck.txt1
-rw-r--r--sw/qa/unoapi/makefile.mk48
-rw-r--r--sw/qa/unoapi/sw.sce6
-rw-r--r--sw/sdi/_annotsh.sdi6
-rw-r--r--sw/sdi/_docsh.sdi5
-rw-r--r--sw/sdi/_textsh.sdi8
-rw-r--r--sw/sdi/makefile.mk107
-rw-r--r--sw/sdi/swriter.sdi27
-rw-r--r--sw/source/core/SwNumberTree/SwNodeNum.cxx2
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accmap.cxx2
-rw-r--r--sw/source/core/access/accpara.cxx50
-rw-r--r--sw/source/core/access/accpara.hxx2
-rw-r--r--sw/source/core/access/accportions.cxx48
-rw-r--r--sw/source/core/access/accportions.hxx24
-rw-r--r--sw/source/core/access/acctable.cxx2
-rw-r--r--sw/source/core/access/makefile.mk97
-rw-r--r--sw/source/core/access/parachangetrackinginfo.cxx2
-rw-r--r--sw/source/core/access/textmarkuphelper.cxx10
-rw-r--r--sw/source/core/attr/calbck.cxx40
-rw-r--r--sw/source/core/attr/cellatr.cxx12
-rw-r--r--sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx4
-rw-r--r--sw/source/core/attr/format.cxx96
-rw-r--r--sw/source/core/attr/hints.cxx40
-rw-r--r--sw/source/core/attr/swatrset.cxx38
-rw-r--r--sw/source/core/bastyp/bparr.cxx92
-rw-r--r--sw/source/core/bastyp/breakit.cxx12
-rw-r--r--sw/source/core/bastyp/calc.cxx148
-rw-r--r--sw/source/core/bastyp/index.cxx10
-rw-r--r--sw/source/core/bastyp/init.cxx86
-rw-r--r--sw/source/core/bastyp/makefile.mk79
-rw-r--r--sw/source/core/bastyp/swcache.cxx40
-rw-r--r--sw/source/core/bastyp/swrect.cxx18
-rw-r--r--sw/source/core/bastyp/swregion.cxx32
-rw-r--r--sw/source/core/bastyp/swtypes.cxx3
-rw-r--r--sw/source/core/bastyp/tabcol.cxx20
-rw-r--r--sw/source/core/crsr/bookmrk.cxx18
-rw-r--r--sw/source/core/crsr/callnk.cxx14
-rw-r--r--sw/source/core/crsr/callnk.hxx10
-rw-r--r--sw/source/core/crsr/crsrsh.cxx505
-rw-r--r--sw/source/core/crsr/crstrvl.cxx322
-rw-r--r--sw/source/core/crsr/crstrvl1.cxx30
-rw-r--r--sw/source/core/crsr/findattr.cxx243
-rw-r--r--sw/source/core/crsr/findcoll.cxx31
-rw-r--r--sw/source/core/crsr/findfmt.cxx14
-rw-r--r--sw/source/core/crsr/findtxt.cxx94
-rw-r--r--sw/source/core/crsr/makefile.mk80
-rw-r--r--sw/source/core/crsr/pam.cxx220
-rw-r--r--sw/source/core/crsr/paminit.cxx14
-rw-r--r--sw/source/core/crsr/swcrsr.cxx454
-rw-r--r--sw/source/core/crsr/trvlcol.cxx8
-rw-r--r--sw/source/core/crsr/trvlfnfl.cxx60
-rw-r--r--sw/source/core/crsr/trvlreg.cxx74
-rw-r--r--sw/source/core/crsr/trvltbl.cxx122
-rw-r--r--sw/source/core/crsr/unocrsr.cxx32
-rw-r--r--sw/source/core/crsr/viscrs.cxx52
-rw-r--r--sw/source/core/doc/SwStyleNameMapper.cxx8
-rw-r--r--sw/source/core/doc/acmplwrd.cxx58
-rw-r--r--sw/source/core/doc/dbgoutsw.cxx105
-rw-r--r--sw/source/core/doc/doc.cxx480
-rw-r--r--sw/source/core/doc/docbasic.cxx30
-rw-r--r--sw/source/core/doc/docbm.cxx105
-rw-r--r--sw/source/core/doc/docchart.cxx12
-rw-r--r--sw/source/core/doc/doccomp.cxx335
-rw-r--r--sw/source/core/doc/doccorr.cxx243
-rw-r--r--sw/source/core/doc/docdde.cxx42
-rw-r--r--sw/source/core/doc/docdesc.cxx150
-rw-r--r--sw/source/core/doc/docdraw.cxx98
-rw-r--r--sw/source/core/doc/docedt.cxx242
-rw-r--r--sw/source/core/doc/docfld.cxx350
-rw-r--r--sw/source/core/doc/docfly.cxx203
-rw-r--r--sw/source/core/doc/docfmt.cxx395
-rw-r--r--sw/source/core/doc/docftn.cxx74
-rw-r--r--sw/source/core/doc/docglbl.cxx67
-rw-r--r--sw/source/core/doc/docglos.cxx26
-rw-r--r--sw/source/core/doc/doclay.cxx288
-rw-r--r--sw/source/core/doc/docnew.cxx165
-rw-r--r--sw/source/core/doc/docnum.cxx507
-rw-r--r--sw/source/core/doc/docredln.cxx536
-rw-r--r--sw/source/core/doc/docruby.cxx49
-rw-r--r--sw/source/core/doc/docsort.cxx196
-rw-r--r--sw/source/core/doc/docstat.cxx4
-rw-r--r--sw/source/core/doc/doctxm.cxx272
-rw-r--r--sw/source/core/doc/extinput.cxx32
-rw-r--r--sw/source/core/doc/fmtcol.cxx94
-rw-r--r--sw/source/core/doc/ftnidx.cxx68
-rw-r--r--sw/source/core/doc/gctable.cxx128
-rw-r--r--sw/source/core/doc/htmltbl.cxx480
-rw-r--r--sw/source/core/doc/lineinfo.cxx10
-rw-r--r--sw/source/core/doc/list.cxx8
-rw-r--r--sw/source/core/doc/makefile.mk92
-rw-r--r--sw/source/core/doc/notxtfrm.cxx102
-rw-r--r--sw/source/core/doc/number.cxx130
-rw-r--r--sw/source/core/doc/poolfmt.cxx419
-rw-r--r--sw/source/core/doc/sortopt.cxx10
-rw-r--r--sw/source/core/doc/swserv.cxx38
-rw-r--r--sw/source/core/doc/tblafmt.cxx220
-rw-r--r--sw/source/core/doc/tblcpy.cxx213
-rw-r--r--sw/source/core/doc/tblrwcl.cxx1005
-rw-r--r--sw/source/core/doc/visiturl.cxx16
-rw-r--r--sw/source/core/docnode/makefile.mk73
-rw-r--r--sw/source/core/docnode/ndcopy.cxx246
-rw-r--r--sw/source/core/docnode/ndindex.cxx6
-rw-r--r--sw/source/core/docnode/ndnotxt.cxx64
-rw-r--r--sw/source/core/docnode/ndnum.cxx18
-rw-r--r--sw/source/core/docnode/ndsect.cxx212
-rw-r--r--sw/source/core/docnode/ndtbl.cxx1065
-rw-r--r--sw/source/core/docnode/ndtbl1.cxx348
-rw-r--r--sw/source/core/docnode/node.cxx258
-rw-r--r--sw/source/core/docnode/node2lay.cxx54
-rw-r--r--sw/source/core/docnode/nodes.cxx335
-rw-r--r--sw/source/core/docnode/section.cxx171
-rw-r--r--sw/source/core/docnode/swbaslnk.cxx88
-rw-r--r--sw/source/core/draw/dcontact.cxx58
-rw-r--r--sw/source/core/draw/dflyobj.cxx76
-rw-r--r--sw/source/core/draw/dpage.cxx12
-rw-r--r--sw/source/core/draw/drawdoc.cxx16
-rw-r--r--sw/source/core/draw/dview.cxx110
-rw-r--r--sw/source/core/draw/makefile.mk58
-rw-r--r--sw/source/core/edit/acorrect.cxx88
-rw-r--r--sw/source/core/edit/autofmt.cxx502
-rw-r--r--sw/source/core/edit/edatmisc.cxx38
-rw-r--r--sw/source/core/edit/edattr.cxx108
-rw-r--r--sw/source/core/edit/eddel.cxx52
-rw-r--r--sw/source/core/edit/edfcol.cxx23
-rw-r--r--sw/source/core/edit/edfld.cxx97
-rw-r--r--sw/source/core/edit/edfldexp.cxx16
-rw-r--r--sw/source/core/edit/edfmt.cxx22
-rw-r--r--sw/source/core/edit/edglbldc.cxx92
-rw-r--r--sw/source/core/edit/edglss.cxx48
-rw-r--r--sw/source/core/edit/editsh.cxx136
-rw-r--r--sw/source/core/edit/edlingu.cxx55
-rw-r--r--sw/source/core/edit/ednumber.cxx172
-rw-r--r--sw/source/core/edit/edredln.cxx26
-rw-r--r--sw/source/core/edit/edsect.cxx45
-rw-r--r--sw/source/core/edit/edtab.cxx99
-rw-r--r--sw/source/core/edit/edtox.cxx96
-rw-r--r--sw/source/core/edit/edundo.cxx212
-rw-r--r--sw/source/core/edit/edws.cxx56
-rw-r--r--sw/source/core/edit/makefile.mk71
-rw-r--r--sw/source/core/except/dbgloop.cxx168
-rw-r--r--sw/source/core/except/errhdl.cxx136
-rw-r--r--sw/source/core/fields/authfld.cxx79
-rw-r--r--sw/source/core/fields/cellfml.cxx76
-rw-r--r--sw/source/core/fields/chpfld.cxx14
-rw-r--r--sw/source/core/fields/dbfld.cxx129
-rw-r--r--sw/source/core/fields/ddefld.cxx36
-rw-r--r--sw/source/core/fields/ddetbl.cxx18
-rw-r--r--sw/source/core/fields/docufld.cxx143
-rw-r--r--sw/source/core/fields/expfld.cxx210
-rw-r--r--sw/source/core/fields/fldbas.cxx109
-rw-r--r--sw/source/core/fields/flddat.cxx20
-rw-r--r--sw/source/core/fields/flddropdown.cxx6
-rw-r--r--sw/source/core/fields/fldlst.cxx28
-rw-r--r--sw/source/core/fields/macrofld.cxx37
-rw-r--r--sw/source/core/fields/makefile.mk92
-rw-r--r--sw/source/core/fields/reffld.cxx87
-rw-r--r--sw/source/core/fields/scrptfld.cxx6
-rw-r--r--sw/source/core/fields/tblcalc.cxx60
-rw-r--r--sw/source/core/fields/usrfld.cxx41
-rw-r--r--sw/source/core/frmedt/fecopy.cxx191
-rw-r--r--sw/source/core/frmedt/fedesc.cxx46
-rw-r--r--sw/source/core/frmedt/fefly1.cxx166
-rw-r--r--sw/source/core/frmedt/feflyole.cxx12
-rw-r--r--sw/source/core/frmedt/feshview.cxx323
-rw-r--r--sw/source/core/frmedt/fetab.cxx312
-rw-r--r--sw/source/core/frmedt/fews.cxx270
-rw-r--r--sw/source/core/frmedt/makefile.mk76
-rw-r--r--sw/source/core/frmedt/tblsel.cxx402
-rw-r--r--sw/source/core/graphic/grfatr.cxx48
-rw-r--r--sw/source/core/graphic/makefile.mk53
-rw-r--r--sw/source/core/graphic/ndgrf.cxx112
-rw-r--r--sw/source/core/inc/GetMetricVal.hxx6
-rw-r--r--sw/source/core/inc/SwPortionHandler.hxx10
-rw-r--r--sw/source/core/inc/SwUndoFmt.hxx (renamed from sw/inc/SwUndoFmt.hxx)43
-rw-r--r--sw/source/core/inc/SwUndoPageDesc.hxx (renamed from sw/inc/SwUndoPageDesc.hxx)25
-rw-r--r--sw/source/core/inc/SwUndoTOXChange.hxx (renamed from sw/inc/SwUndoTOXChange.hxx)14
-rw-r--r--sw/source/core/inc/SwXMLTextBlocks.hxx58
-rw-r--r--sw/source/core/inc/UndoAttribute.hxx288
-rw-r--r--sw/source/core/inc/UndoBookmark.hxx83
-rw-r--r--sw/source/core/inc/UndoCore.hxx263
-rw-r--r--sw/source/core/inc/UndoDelete.hxx115
-rw-r--r--sw/source/core/inc/UndoDraw.hxx150
-rw-r--r--sw/source/core/inc/UndoInsert.hxx235
-rw-r--r--sw/source/core/inc/UndoManager.hxx124
-rw-r--r--sw/source/core/inc/UndoNumbering.hxx150
-rw-r--r--sw/source/core/inc/UndoOverwrite.hxx105
-rw-r--r--sw/source/core/inc/UndoRedline.hxx145
-rw-r--r--sw/source/core/inc/UndoSection.hxx82
-rw-r--r--sw/source/core/inc/UndoSort.hxx97
-rw-r--r--sw/source/core/inc/UndoSplitMove.hxx96
-rw-r--r--sw/source/core/inc/UndoTable.hxx391
-rw-r--r--sw/source/core/inc/acorrect.hxx36
-rw-r--r--sw/source/core/inc/anchoredobjectposition.hxx58
-rw-r--r--sw/source/core/inc/blink.hxx16
-rw-r--r--sw/source/core/inc/bodyfrm.hxx2
-rw-r--r--sw/source/core/inc/cellfrm.hxx11
-rw-r--r--sw/source/core/inc/cntfrm.hxx44
-rw-r--r--sw/source/core/inc/dbg_lay.hxx20
-rw-r--r--sw/source/core/inc/dbgloop.hxx (renamed from sw/source/ui/ribbar/tblctrl.src)93
-rw-r--r--sw/source/core/inc/dflyobj.hxx16
-rw-r--r--sw/source/core/inc/docfld.hxx32
-rw-r--r--sw/source/core/inc/docsort.hxx60
-rw-r--r--sw/source/core/inc/doctxm.hxx10
-rw-r--r--sw/source/core/inc/drawdev.hxx28
-rw-r--r--sw/source/core/inc/drawfont.hxx154
-rw-r--r--sw/source/core/inc/dview.hxx8
-rw-r--r--sw/source/core/inc/flowfrm.hxx94
-rw-r--r--sw/source/core/inc/flyfrm.hxx129
-rw-r--r--sw/source/core/inc/flyfrms.hxx18
-rw-r--r--sw/source/core/inc/fntcache.hxx46
-rw-r--r--sw/source/core/inc/frame.hxx434
-rw-r--r--sw/source/core/inc/frminf.hxx12
-rw-r--r--sw/source/core/inc/frmtool.hxx152
-rw-r--r--sw/source/core/inc/ftnboss.hxx12
-rw-r--r--sw/source/core/inc/ftnfrm.hxx22
-rw-r--r--sw/source/core/inc/hffrm.hxx8
-rw-r--r--sw/source/core/inc/layact.hxx148
-rw-r--r--sw/source/core/inc/laycache.hxx4
-rw-r--r--sw/source/core/inc/layfrm.hxx47
-rw-r--r--sw/source/core/inc/layouter.hxx10
-rw-r--r--sw/source/core/inc/mvsave.hxx54
-rw-r--r--sw/source/core/inc/node2lay.hxx6
-rw-r--r--sw/source/core/inc/noteurl.hxx6
-rw-r--r--sw/source/core/inc/notxtfrm.hxx19
-rw-r--r--sw/source/core/inc/pagefrm.hxx122
-rw-r--r--sw/source/core/inc/pamtyp.hxx50
-rw-r--r--sw/source/core/inc/rolbck.hxx (renamed from sw/inc/rolbck.hxx)106
-rw-r--r--sw/source/core/inc/rootfrm.hxx116
-rw-r--r--sw/source/core/inc/rowfrm.hxx24
-rw-r--r--sw/source/core/inc/scriptinfo.hxx105
-rw-r--r--sw/source/core/inc/sectfrm.hxx60
-rw-r--r--sw/source/core/inc/swblocks.hxx70
-rw-r--r--sw/source/core/inc/swcache.hxx68
-rw-r--r--sw/source/core/inc/swfont.hxx354
-rw-r--r--sw/source/core/inc/tabfrm.hxx91
-rw-r--r--sw/source/core/inc/tblrwcl.hxx92
-rw-r--r--sw/source/core/inc/toxhlp.hxx2
-rw-r--r--sw/source/core/inc/txmsrt.hxx110
-rw-r--r--sw/source/core/inc/txtfrm.hxx56
-rw-r--r--sw/source/core/inc/txttypes.hxx4
-rw-r--r--sw/source/core/inc/undoflystrattr.hxx11
-rw-r--r--sw/source/core/inc/unometa.hxx2
-rw-r--r--sw/source/core/inc/viewimp.hxx55
-rw-r--r--sw/source/core/inc/wrong.hxx28
-rw-r--r--sw/source/core/layout/anchoreddrawobject.cxx2
-rw-r--r--sw/source/core/layout/atrfrm.cxx101
-rw-r--r--sw/source/core/layout/calcmove.cxx291
-rw-r--r--sw/source/core/layout/colfrm.cxx77
-rw-r--r--sw/source/core/layout/dbg_lay.cxx130
-rw-r--r--sw/source/core/layout/findfrm.cxx85
-rw-r--r--sw/source/core/layout/flowfrm.cxx326
-rw-r--r--sw/source/core/layout/fly.cxx205
-rw-r--r--sw/source/core/layout/flycnt.cxx273
-rw-r--r--sw/source/core/layout/flyincnt.cxx30
-rw-r--r--sw/source/core/layout/flylay.cxx80
-rw-r--r--sw/source/core/layout/flypos.cxx14
-rw-r--r--sw/source/core/layout/frmtool.cxx274
-rw-r--r--sw/source/core/layout/ftnfrm.cxx284
-rw-r--r--sw/source/core/layout/hffrm.cxx38
-rw-r--r--sw/source/core/layout/layact.cxx386
-rw-r--r--sw/source/core/layout/laycache.cxx223
-rw-r--r--sw/source/core/layout/layhelp.hxx86
-rw-r--r--sw/source/core/layout/layouter.cxx36
-rw-r--r--sw/source/core/layout/makefile.mk105
-rw-r--r--sw/source/core/layout/newfrm.cxx92
-rw-r--r--sw/source/core/layout/objectformatter.cxx4
-rw-r--r--sw/source/core/layout/pagechg.cxx216
-rw-r--r--sw/source/core/layout/pagedesc.cxx22
-rw-r--r--sw/source/core/layout/paintfrm.cxx415
-rw-r--r--sw/source/core/layout/sectfrm.cxx332
-rw-r--r--sw/source/core/layout/softpagebreak.cxx4
-rw-r--r--sw/source/core/layout/ssfrm.cxx102
-rw-r--r--sw/source/core/layout/tabfrm.cxx488
-rw-r--r--sw/source/core/layout/trvlfrm.cxx324
-rw-r--r--sw/source/core/layout/unusedf.cxx30
-rw-r--r--sw/source/core/layout/virtoutp.cxx24
-rw-r--r--sw/source/core/layout/virtoutp.hxx8
-rw-r--r--sw/source/core/layout/wsfrm.cxx312
-rw-r--r--sw/source/core/makefile.mk99
-rw-r--r--sw/source/core/objectpositioning/anchoredobjectposition.cxx101
-rw-r--r--sw/source/core/objectpositioning/makefile.mk62
-rw-r--r--sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx123
-rw-r--r--sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx12
-rw-r--r--sw/source/core/ole/makefile.mk55
-rw-r--r--sw/source/core/ole/ndole.cxx88
-rw-r--r--sw/source/core/para/makefile.mk57
-rw-r--r--sw/source/core/para/paratr.cxx8
-rw-r--r--sw/source/core/sw3io/makefile.mk52
-rw-r--r--sw/source/core/sw3io/sw3convert.cxx30
-rw-r--r--sw/source/core/sw3io/swacorr.cxx12
-rw-r--r--sw/source/core/swg/SwXMLBlockListContext.cxx4
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks.cxx125
-rw-r--r--sw/source/core/swg/SwXMLTextBlocks1.cxx34
-rw-r--r--sw/source/core/swg/makefile.mk55
-rw-r--r--sw/source/core/swg/swblocks.cxx180
-rw-r--r--sw/source/core/table/makefile.mk48
-rw-r--r--sw/source/core/table/swnewtable.cxx362
-rw-r--r--sw/source/core/table/swtable.cxx399
-rw-r--r--sw/source/core/text/EnhancedPDFExportHelper.cxx52
-rw-r--r--sw/source/core/text/atrhndl.hxx24
-rw-r--r--sw/source/core/text/atrstck.cxx64
-rw-r--r--sw/source/core/text/blink.cxx2
-rw-r--r--sw/source/core/text/frmcrsr.cxx37
-rw-r--r--sw/source/core/text/frmform.cxx24
-rw-r--r--sw/source/core/text/frmpaint.cxx8
-rw-r--r--sw/source/core/text/guess.cxx18
-rw-r--r--sw/source/core/text/inftxt.cxx110
-rw-r--r--sw/source/core/text/inftxt.hxx42
-rw-r--r--sw/source/core/text/itradj.cxx28
-rw-r--r--sw/source/core/text/itratr.cxx42
-rw-r--r--sw/source/core/text/itratr.hxx6
-rw-r--r--sw/source/core/text/itrcrsr.cxx48
-rw-r--r--sw/source/core/text/itrform2.cxx56
-rw-r--r--sw/source/core/text/itrform2.hxx4
-rw-r--r--sw/source/core/text/itrpaint.cxx22
-rw-r--r--sw/source/core/text/itrtxt.cxx22
-rw-r--r--sw/source/core/text/itrtxt.hxx4
-rw-r--r--sw/source/core/text/makefile.mk104
-rw-r--r--sw/source/core/text/pordrop.hxx6
-rw-r--r--sw/source/core/text/porexp.hxx8
-rw-r--r--sw/source/core/text/porfld.cxx62
-rw-r--r--sw/source/core/text/porfld.hxx12
-rw-r--r--sw/source/core/text/porfly.cxx12
-rw-r--r--sw/source/core/text/porftn.hxx4
-rw-r--r--sw/source/core/text/porglue.cxx2
-rw-r--r--sw/source/core/text/porlay.cxx198
-rw-r--r--sw/source/core/text/porlay.hxx6
-rw-r--r--sw/source/core/text/porlin.cxx16
-rw-r--r--sw/source/core/text/pormulti.cxx174
-rw-r--r--sw/source/core/text/pormulti.hxx24
-rw-r--r--sw/source/core/text/porrst.cxx4
-rw-r--r--sw/source/core/text/porrst.hxx4
-rw-r--r--sw/source/core/text/portab.hxx6
-rw-r--r--sw/source/core/text/portxt.cxx18
-rw-r--r--sw/source/core/text/redlnitr.cxx6
-rw-r--r--sw/source/core/text/redlnitr.hxx2
-rw-r--r--sw/source/core/text/txtdrop.cxx30
-rw-r--r--sw/source/core/text/txtfld.cxx94
-rw-r--r--sw/source/core/text/txtfly.cxx24
-rw-r--r--sw/source/core/text/txtfly.hxx2
-rw-r--r--sw/source/core/text/txtfrm.cxx125
-rw-r--r--sw/source/core/text/txtftn.cxx26
-rw-r--r--sw/source/core/text/txthyph.cxx2
-rw-r--r--sw/source/core/text/txtio.cxx6
-rw-r--r--sw/source/core/text/txttab.cxx19
-rw-r--r--sw/source/core/text/widorp.cxx12
-rw-r--r--sw/source/core/text/wrong.cxx14
-rw-r--r--sw/source/core/tox/makefile.mk56
-rw-r--r--sw/source/core/tox/tox.cxx130
-rw-r--r--sw/source/core/tox/toxhlp.cxx2
-rw-r--r--sw/source/core/tox/txmsrt.cxx123
-rw-r--r--sw/source/core/txtnode/atrfld.cxx21
-rw-r--r--sw/source/core/txtnode/atrflyin.cxx20
-rw-r--r--sw/source/core/txtnode/atrftn.cxx40
-rw-r--r--sw/source/core/txtnode/atrtox.cxx4
-rw-r--r--sw/source/core/txtnode/fmtatr2.cxx44
-rw-r--r--sw/source/core/txtnode/fntcache.cxx198
-rw-r--r--sw/source/core/txtnode/fntcap.cxx60
-rw-r--r--sw/source/core/txtnode/makefile.mk77
-rw-r--r--sw/source/core/txtnode/ndhints.cxx58
-rw-r--r--sw/source/core/txtnode/ndtxt.cxx430
-rw-r--r--sw/source/core/txtnode/swfntcch.cxx8
-rw-r--r--sw/source/core/txtnode/swfont.cxx170
-rw-r--r--sw/source/core/txtnode/thints.cxx245
-rw-r--r--sw/source/core/txtnode/txatritr.cxx14
-rw-r--r--sw/source/core/txtnode/txtatr2.cxx38
-rw-r--r--sw/source/core/txtnode/txtedt.cxx239
-rw-r--r--sw/source/core/undo/SwUndoField.cxx41
-rw-r--r--sw/source/core/undo/SwUndoFmt.cxx123
-rw-r--r--sw/source/core/undo/SwUndoPageDesc.cxx96
-rw-r--r--sw/source/core/undo/SwUndoTOXChange.cxx15
-rw-r--r--sw/source/core/undo/docundo.cxx1128
-rw-r--r--sw/source/core/undo/makefile.mk81
-rw-r--r--sw/source/core/undo/rolbck.cxx164
-rw-r--r--sw/source/core/undo/unattr.cxx332
-rw-r--r--sw/source/core/undo/unbkmk.cxx18
-rw-r--r--sw/source/core/undo/undel.cxx160
-rw-r--r--sw/source/core/undo/undo.src2
-rw-r--r--sw/source/core/undo/undobj.cxx371
-rw-r--r--sw/source/core/undo/undobj1.cxx185
-rw-r--r--sw/source/core/undo/undoflystrattr.cxx9
-rw-r--r--sw/source/core/undo/undraw.cxx109
-rw-r--r--sw/source/core/undo/unfmco.cxx42
-rw-r--r--sw/source/core/undo/unins.cxx347
-rw-r--r--sw/source/core/undo/unmove.cxx49
-rw-r--r--sw/source/core/undo/unnum.cxx208
-rw-r--r--sw/source/core/undo/unoutl.cxx28
-rw-r--r--sw/source/core/undo/unovwr.cxx126
-rw-r--r--sw/source/core/undo/unredln.cxx188
-rw-r--r--sw/source/core/undo/unsect.cxx72
-rw-r--r--sw/source/core/undo/unsort.cxx106
-rw-r--r--sw/source/core/undo/unspnd.cxx56
-rw-r--r--sw/source/core/undo/untbl.cxx695
-rw-r--r--sw/source/core/undo/untblk.cxx90
-rw-r--r--sw/source/core/unocore/makefile.mk122
-rw-r--r--sw/source/core/unocore/swunohelper.cxx52
-rw-r--r--sw/source/core/unocore/unobkm.cxx9
-rw-r--r--sw/source/core/unocore/unochart.cxx12
-rw-r--r--sw/source/core/unocore/unocoll.cxx6
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx36
-rw-r--r--sw/source/core/unocore/unodraw.cxx19
-rw-r--r--sw/source/core/unocore/unoevent.cxx4
-rw-r--r--sw/source/core/unocore/unofield.cxx65
-rw-r--r--sw/source/core/unocore/unoflatpara.cxx18
-rw-r--r--sw/source/core/unocore/unoframe.cxx54
-rw-r--r--sw/source/core/unocore/unoidx.cxx12
-rw-r--r--sw/source/core/unocore/unomap.cxx3
-rw-r--r--sw/source/core/unocore/unoobj.cxx73
-rw-r--r--sw/source/core/unocore/unoobj2.cxx47
-rw-r--r--sw/source/core/unocore/unoparagraph.cxx12
-rw-r--r--sw/source/core/unocore/unoport.cxx8
-rw-r--r--sw/source/core/unocore/unoportenum.cxx54
-rw-r--r--sw/source/core/unocore/unoprnms.cxx6
-rw-r--r--sw/source/core/unocore/unoredline.cxx10
-rw-r--r--sw/source/core/unocore/unoredlines.cxx4
-rw-r--r--sw/source/core/unocore/unorefmk.cxx2
-rw-r--r--sw/source/core/unocore/unosect.cxx15
-rw-r--r--sw/source/core/unocore/unosett.cxx58
-rw-r--r--sw/source/core/unocore/unosrch.cxx64
-rw-r--r--sw/source/core/unocore/unostyle.cxx55
-rw-r--r--sw/source/core/unocore/unotbl.cxx123
-rw-r--r--sw/source/core/unocore/unotext.cxx68
-rw-r--r--sw/source/core/unocore/unotextmarkup.cxx12
-rw-r--r--sw/source/core/view/makefile.mk61
-rw-r--r--sw/source/core/view/pagepreviewlayout.cxx9
-rw-r--r--sw/source/core/view/printdata.cxx198
-rw-r--r--sw/source/core/view/vdraw.cxx30
-rw-r--r--sw/source/core/view/viewimp.cxx28
-rw-r--r--sw/source/core/view/viewpg.cxx6
-rw-r--r--sw/source/core/view/viewsh.cxx281
-rw-r--r--sw/source/core/view/vnew.cxx26
-rw-r--r--sw/source/core/view/vprint.cxx215
-rw-r--r--sw/source/filter/ascii/ascatr.cxx20
-rw-r--r--sw/source/filter/ascii/makefile.mk57
-rw-r--r--sw/source/filter/ascii/parasc.cxx46
-rw-r--r--sw/source/filter/ascii/wrtasc.cxx22
-rw-r--r--sw/source/filter/ascii/wrtasc.hxx2
-rw-r--r--sw/source/filter/basflt/fltini.cxx660
-rw-r--r--sw/source/filter/basflt/iodetect.cxx76
-rw-r--r--sw/source/filter/basflt/makefile.mk57
-rw-r--r--sw/source/filter/basflt/shellio.cxx168
-rw-r--r--sw/source/filter/html/SwAppletImpl.cxx8
-rw-r--r--sw/source/filter/html/css1atr.cxx330
-rw-r--r--sw/source/filter/html/htmlatr.cxx478
-rw-r--r--sw/source/filter/html/htmlbas.cxx30
-rw-r--r--sw/source/filter/html/htmlcss1.cxx412
-rw-r--r--sw/source/filter/html/htmlctxt.cxx108
-rw-r--r--sw/source/filter/html/htmldraw.cxx6
-rw-r--r--sw/source/filter/html/htmlfld.cxx88
-rw-r--r--sw/source/filter/html/htmlfldw.cxx56
-rw-r--r--sw/source/filter/html/htmlfly.cxx262
-rw-r--r--sw/source/filter/html/htmlfly.hxx38
-rw-r--r--sw/source/filter/html/htmlflyt.cxx12
-rw-r--r--sw/source/filter/html/htmlform.cxx24
-rw-r--r--sw/source/filter/html/htmlforw.cxx2
-rw-r--r--sw/source/filter/html/htmlftn.cxx70
-rw-r--r--sw/source/filter/html/htmlgrin.cxx203
-rw-r--r--sw/source/filter/html/htmlnum.cxx8
-rw-r--r--sw/source/filter/html/htmlplug.cxx114
-rw-r--r--sw/source/filter/html/htmlsect.cxx18
-rw-r--r--sw/source/filter/html/htmltab.cxx29
-rw-r--r--sw/source/filter/html/htmltabw.cxx17
-rw-r--r--sw/source/filter/html/makefile.mk79
-rw-r--r--sw/source/filter/html/parcss1.cxx154
-rw-r--r--sw/source/filter/html/svxcss1.cxx642
-rw-r--r--sw/source/filter/html/swcss1.hxx94
-rw-r--r--sw/source/filter/html/swhtml.cxx602
-rw-r--r--sw/source/filter/html/swhtml.hxx8
-rw-r--r--sw/source/filter/html/wrthtml.cxx16
-rw-r--r--sw/source/filter/html/wrthtml.hxx6
-rw-r--r--sw/source/filter/inc/fltbase.hxx26
-rw-r--r--sw/source/filter/inc/fltglbls.hxx46
-rw-r--r--sw/source/filter/inc/fltini.hxx12
-rw-r--r--sw/source/filter/inc/fltshell.hxx240
-rw-r--r--sw/source/filter/inc/msfilter.hxx12
-rw-r--r--sw/source/filter/inc/rtf.hxx70
-rw-r--r--sw/source/filter/inc/wrt_fn.hxx2
-rw-r--r--sw/source/filter/inc/wrtswtbl.hxx172
-rw-r--r--sw/source/filter/makefile.mk67
-rw-r--r--sw/source/filter/rtf/makefile.mk60
-rw-r--r--sw/source/filter/rtf/rtffld.cxx58
-rw-r--r--sw/source/filter/rtf/rtffly.cxx182
-rw-r--r--sw/source/filter/rtf/rtfnum.cxx137
-rw-r--r--sw/source/filter/rtf/rtftbl.cxx143
-rw-r--r--sw/source/filter/rtf/swparrtf.cxx463
-rw-r--r--sw/source/filter/rtf/swparrtf.hxx61
-rw-r--r--sw/source/filter/writer/makefile.mk58
-rw-r--r--sw/source/filter/writer/writer.cxx86
-rw-r--r--sw/source/filter/writer/wrt_fn.cxx10
-rw-r--r--sw/source/filter/writer/wrtswtbl.cxx220
-rw-r--r--sw/source/filter/ww1/fltshell.cxx381
-rw-r--r--sw/source/filter/ww1/makefile.mk93
-rw-r--r--sw/source/filter/ww1/w1class.cxx354
-rw-r--r--sw/source/filter/ww1/w1class.hxx612
-rw-r--r--sw/source/filter/ww1/w1filter.cxx206
-rw-r--r--sw/source/filter/ww1/w1par.cxx16
-rw-r--r--sw/source/filter/ww1/w1par.hxx2
-rw-r--r--sw/source/filter/ww1/w1sprm.cxx139
-rw-r--r--sw/source/filter/ww1/w1struct.hxx516
-rw-r--r--sw/source/filter/ww8/README-rtf.txt31
-rw-r--r--sw/source/filter/ww8/WW8FFData.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.cxx2
-rw-r--r--sw/source/filter/ww8/WW8Sttbf.hxx6
-rw-r--r--sw/source/filter/ww8/WW8TableInfo.cxx6
-rw-r--r--sw/source/filter/ww8/attributeoutputbase.hxx46
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx121
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.hxx42
-rw-r--r--sw/source/filter/ww8/docxexport.cxx21
-rw-r--r--sw/source/filter/ww8/docxexport.hxx14
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx125
-rw-r--r--sw/source/filter/ww8/docxexportfilter.hxx7
-rw-r--r--sw/source/filter/ww8/docxfootnotes.hxx1
-rw-r--r--sw/source/filter/ww8/escher.hxx32
-rw-r--r--sw/source/filter/ww8/makefile.mk91
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx112
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.hxx48
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx145
-rw-r--r--sw/source/filter/ww8/rtfexport.hxx37
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx9
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.hxx9
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.cxx10
-rw-r--r--sw/source/filter/ww8/rtfimportfilter.hxx7
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.cxx13
-rw-r--r--sw/source/filter/ww8/rtfsdrexport.hxx9
-rw-r--r--sw/source/filter/ww8/writerhelper.cxx40
-rw-r--r--sw/source/filter/ww8/writerhelper.hxx8
-rw-r--r--sw/source/filter/ww8/writerwordglue.cxx18
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx193
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx114
-rw-r--r--sw/source/filter/ww8/wrtw8num.cxx137
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx277
-rw-r--r--sw/source/filter/ww8/wrtww8.cxx466
-rw-r--r--sw/source/filter/ww8/wrtww8.hxx364
-rw-r--r--sw/source/filter/ww8/wrtww8gr.cxx78
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx374
-rw-r--r--sw/source/filter/ww8/ww8attributeoutput.hxx50
-rw-r--r--sw/source/filter/ww8/ww8glsy.cxx20
-rw-r--r--sw/source/filter/ww8/ww8glsy.hxx10
-rw-r--r--sw/source/filter/ww8/ww8graf.cxx296
-rw-r--r--sw/source/filter/ww8/ww8graf.hxx26
-rw-r--r--sw/source/filter/ww8/ww8graf2.cxx58
-rw-r--r--sw/source/filter/ww8/ww8par.cxx497
-rw-r--r--sw/source/filter/ww8/ww8par.hxx402
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx332
-rw-r--r--sw/source/filter/ww8/ww8par2.hxx68
-rw-r--r--sw/source/filter/ww8/ww8par3.cxx74
-rw-r--r--sw/source/filter/ww8/ww8par4.cxx50
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx142
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx466
-rw-r--r--sw/source/filter/ww8/ww8scan.cxx636
-rw-r--r--sw/source/filter/ww8/ww8scan.hxx940
-rw-r--r--sw/source/filter/ww8/ww8struc.hxx300
-rw-r--r--sw/source/filter/xml/XMLRedlineImportHelper.cxx6
-rw-r--r--sw/source/filter/xml/makefile.mk76
-rw-r--r--sw/source/filter/xml/swxml.cxx28
-rw-r--r--sw/source/filter/xml/wrtxml.cxx6
-rw-r--r--sw/source/filter/xml/wrtxml.hxx6
-rw-r--r--sw/source/filter/xml/xmlexp.cxx4
-rw-r--r--sw/source/filter/xml/xmlexp.hxx2
-rw-r--r--sw/source/filter/xml/xmlfonte.cxx6
-rw-r--r--sw/source/filter/xml/xmlimp.cxx8
-rw-r--r--sw/source/filter/xml/xmlimpit.cxx30
-rw-r--r--sw/source/filter/xml/xmlimpit.hxx8
-rw-r--r--sw/source/filter/xml/xmlitem.cxx6
-rw-r--r--sw/source/filter/xml/xmlitem.hxx6
-rw-r--r--sw/source/filter/xml/xmliteme.cxx2
-rw-r--r--sw/source/filter/xml/xmlitemi.cxx2
-rw-r--r--sw/source/filter/xml/xmlitmpr.cxx4
-rw-r--r--sw/source/filter/xml/xmlmeta.cxx4
-rw-r--r--sw/source/filter/xml/xmltble.cxx38
-rw-r--r--sw/source/filter/xml/xmltbli.cxx16
-rw-r--r--sw/source/filter/xml/xmltbli.hxx6
-rw-r--r--sw/source/filter/xml/xmltexte.cxx6
-rw-r--r--sw/source/ui/app/appenv.cxx78
-rw-r--r--sw/source/ui/app/apphdl.cxx44
-rw-r--r--sw/source/ui/app/applab.cxx2
-rw-r--r--sw/source/ui/app/appopt.cxx114
-rw-r--r--sw/source/ui/app/docsh.cxx211
-rw-r--r--sw/source/ui/app/docsh2.cxx303
-rw-r--r--sw/source/ui/app/docshini.cxx91
-rw-r--r--sw/source/ui/app/docst.cxx155
-rw-r--r--sw/source/ui/app/docstyle.cxx430
-rw-r--r--sw/source/ui/app/mainwn.cxx12
-rw-r--r--sw/source/ui/app/makefile.mk95
-rw-r--r--sw/source/ui/app/mn.src506
-rw-r--r--sw/source/ui/app/swmodul1.cxx20
-rw-r--r--sw/source/ui/app/swmodule.cxx2
-rw-r--r--sw/source/ui/app/swwait.cxx18
-rw-r--r--sw/source/ui/cctrl/actctrl.cxx12
-rw-r--r--sw/source/ui/cctrl/makefile.mk59
-rw-r--r--sw/source/ui/cctrl/popbox.cxx4
-rw-r--r--sw/source/ui/cctrl/swlbox.cxx30
-rw-r--r--sw/source/ui/chrdlg/break.cxx45
-rw-r--r--sw/source/ui/chrdlg/ccoll.cxx12
-rw-r--r--sw/source/ui/chrdlg/ccoll.src5
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx30
-rw-r--r--sw/source/ui/chrdlg/chardlg.src8
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx142
-rw-r--r--sw/source/ui/chrdlg/drpcps.src7
-rw-r--r--sw/source/ui/chrdlg/makefile.mk72
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx66
-rw-r--r--sw/source/ui/chrdlg/numpara.src8
-rw-r--r--sw/source/ui/chrdlg/pardlg.cxx26
-rw-r--r--sw/source/ui/chrdlg/swbreak.src8
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx48
-rw-r--r--sw/source/ui/config/barcfg.cxx4
-rw-r--r--sw/source/ui/config/caption.cxx8
-rw-r--r--sw/source/ui/config/cfgitems.cxx38
-rw-r--r--sw/source/ui/config/fontcfg.cxx16
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/config/mailconfigpage.src22
-rw-r--r--sw/source/ui/config/makefile.mk87
-rw-r--r--sw/source/ui/config/modcfg.cxx44
-rw-r--r--sw/source/ui/config/optcomp.cxx82
-rw-r--r--sw/source/ui/config/optcomp.src3
-rw-r--r--sw/source/ui/config/optdlg.hrc15
-rw-r--r--sw/source/ui/config/optdlg.src107
-rw-r--r--sw/source/ui/config/optload.cxx112
-rw-r--r--sw/source/ui/config/optload.src18
-rw-r--r--sw/source/ui/config/optpage.cxx481
-rw-r--r--sw/source/ui/config/prtopt.cxx5
-rw-r--r--sw/source/ui/config/redlopt.src8
-rw-r--r--sw/source/ui/config/uinums.cxx114
-rw-r--r--sw/source/ui/config/usrpref.cxx186
-rw-r--r--sw/source/ui/config/viewopt.cxx44
-rw-r--r--sw/source/ui/dbui/addresslistdialog.cxx10
-rw-r--r--sw/source/ui/dbui/addresslistdialog.src5
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.cxx18
-rw-r--r--sw/source/ui/dbui/createaddresslistdialog.src13
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.cxx16
-rw-r--r--sw/source/ui/dbui/customizeaddresslistdialog.src7
-rw-r--r--sw/source/ui/dbui/dbinsdlg.cxx210
-rw-r--r--sw/source/ui/dbui/dbinsdlg.src21
-rw-r--r--sw/source/ui/dbui/dbmgr.cxx347
-rw-r--r--sw/source/ui/dbui/dbtree.cxx34
-rw-r--r--sw/source/ui/dbui/dbui.src1
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.cxx6
-rw-r--r--sw/source/ui/dbui/mailmergechildwindow.src1
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx8
-rw-r--r--sw/source/ui/dbui/mailmergewizard.src1
-rw-r--r--sw/source/ui/dbui/makefile.mk108
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx87
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.src23
-rw-r--r--sw/source/ui/dbui/mmconfigitem.cxx12
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.src8
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx20
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.src6
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx20
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.src6
-rw-r--r--sw/source/ui/dbui/mmmergepage.src6
-rw-r--r--sw/source/ui/dbui/mmoutputpage.cxx63
-rw-r--r--sw/source/ui/dbui/mmoutputpage.src27
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.src2
-rw-r--r--sw/source/ui/dbui/mmpreparemergepage.src7
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.cxx4
-rw-r--r--sw/source/ui/dbui/selectdbtabledialog.src1
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx4
-rw-r--r--sw/source/ui/dialog/SwSpellDialogChildWindow.cxx38
-rw-r--r--sw/source/ui/dialog/abstract.cxx8
-rw-r--r--sw/source/ui/dialog/abstract.src2
-rw-r--r--sw/source/ui/dialog/ascfldlg.cxx68
-rw-r--r--sw/source/ui/dialog/ascfldlg.src6
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx32
-rw-r--r--sw/source/ui/dialog/docstdlg.src1
-rw-r--r--sw/source/ui/dialog/macassgn.cxx16
-rw-r--r--sw/source/ui/dialog/makefile.mk99
-rw-r--r--sw/source/ui/dialog/regionsw.cxx44
-rw-r--r--sw/source/ui/dialog/regionsw.src44
-rw-r--r--sw/source/ui/dialog/swabstdlg.cxx5
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx122
-rw-r--r--sw/source/ui/dialog/swdlgfact.hxx117
-rw-r--r--sw/source/ui/dialog/swwrtshitem.cxx2
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx378
-rw-r--r--sw/source/ui/dochdl/gloshdl.cxx182
-rw-r--r--sw/source/ui/dochdl/makefile.mk65
-rw-r--r--sw/source/ui/dochdl/selglos.src3
-rw-r--r--sw/source/ui/dochdl/swdtflvr.cxx392
-rw-r--r--sw/source/ui/docvw/AnnotationMenuButton.cxx21
-rw-r--r--sw/source/ui/docvw/AnnotationWin.cxx17
-rw-r--r--sw/source/ui/docvw/PostItMgr.cxx15
-rw-r--r--sw/source/ui/docvw/SidebarTxtControl.cxx11
-rw-r--r--sw/source/ui/docvw/SidebarTxtControlAcc.cxx2
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx27
-rw-r--r--sw/source/ui/docvw/access.src19
-rw-r--r--sw/source/ui/docvw/docvw.src22
-rw-r--r--sw/source/ui/docvw/edtdd.cxx84
-rw-r--r--sw/source/ui/docvw/edtwin.cxx884
-rw-r--r--sw/source/ui/docvw/edtwin2.cxx43
-rw-r--r--sw/source/ui/docvw/edtwin3.cxx24
-rw-r--r--sw/source/ui/docvw/extedit.cxx2
-rw-r--r--sw/source/ui/docvw/makefile.mk70
-rw-r--r--sw/source/ui/docvw/romenu.cxx80
-rw-r--r--sw/source/ui/docvw/romenu.hxx8
-rw-r--r--sw/source/ui/docvw/srcedtw.cxx127
-rw-r--r--sw/source/ui/envelp/envfmt.cxx70
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envfmt.src9
-rw-r--r--sw/source/ui/envelp/envimg.cxx14
-rw-r--r--sw/source/ui/envelp/envlop.src7
-rw-r--r--sw/source/ui/envelp/envlop1.cxx52
-rw-r--r--sw/source/ui/envelp/envprt.cxx20
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/envprt.src17
-rw-r--r--sw/source/ui/envelp/label.src44
-rw-r--r--sw/source/ui/envelp/label1.cxx20
-rw-r--r--sw/source/ui/envelp/labelcfg.cxx4
-rw-r--r--sw/source/ui/envelp/labelexp.cxx2
-rw-r--r--sw/source/ui/envelp/labfmt.cxx52
-rw-r--r--sw/source/ui/envelp/labfmt.hxx6
-rw-r--r--sw/source/ui/envelp/labfmt.src11
-rw-r--r--sw/source/ui/envelp/labimg.cxx6
-rw-r--r--sw/source/ui/envelp/labprt.cxx18
-rw-r--r--sw/source/ui/envelp/labprt.hxx6
-rw-r--r--sw/source/ui/envelp/labprt.src6
-rw-r--r--sw/source/ui/envelp/mailmrge.cxx51
-rw-r--r--sw/source/ui/envelp/mailmrge.src29
-rw-r--r--sw/source/ui/envelp/makefile.mk79
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx7
-rw-r--r--sw/source/ui/envelp/syncbtn.cxx2
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.cxx10
-rw-r--r--sw/source/ui/fldui/DropDownFieldDialog.src3
-rw-r--r--sw/source/ui/fldui/changedb.cxx20
-rw-r--r--sw/source/ui/fldui/changedb.src2
-rw-r--r--sw/source/ui/fldui/flddb.cxx78
-rw-r--r--sw/source/ui/fldui/flddb.hxx8
-rw-r--r--sw/source/ui/fldui/flddb.src8
-rw-r--r--sw/source/ui/fldui/flddinf.cxx100
-rw-r--r--sw/source/ui/fldui/flddinf.hxx10
-rw-r--r--sw/source/ui/fldui/flddinf.src3
-rw-r--r--sw/source/ui/fldui/flddok.cxx128
-rw-r--r--sw/source/ui/fldui/flddok.hxx12
-rw-r--r--sw/source/ui/fldui/flddok.src8
-rw-r--r--sw/source/ui/fldui/fldedt.cxx39
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx142
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx6
-rw-r--r--sw/source/ui/fldui/fldfunc.src15
-rw-r--r--sw/source/ui/fldui/fldmgr.cxx288
-rw-r--r--sw/source/ui/fldui/fldpage.cxx40
-rw-r--r--sw/source/ui/fldui/fldpage.hxx44
-rw-r--r--sw/source/ui/fldui/fldref.cxx146
-rw-r--r--sw/source/ui/fldui/fldref.hxx6
-rw-r--r--sw/source/ui/fldui/fldref.src5
-rw-r--r--sw/source/ui/fldui/fldtdlg.cxx28
-rw-r--r--sw/source/ui/fldui/fldvar.cxx238
-rw-r--r--sw/source/ui/fldui/fldvar.hxx16
-rw-r--r--sw/source/ui/fldui/fldvar.src9
-rw-r--r--sw/source/ui/fldui/fldwrap.cxx28
-rw-r--r--sw/source/ui/fldui/inpdlg.cxx22
-rw-r--r--sw/source/ui/fldui/inpdlg.src3
-rw-r--r--sw/source/ui/fldui/javaedit.cxx14
-rw-r--r--sw/source/ui/fldui/javaedit.src9
-rw-r--r--sw/source/ui/fldui/makefile.mk90
-rw-r--r--sw/source/ui/fldui/xfldui.cxx10
-rw-r--r--sw/source/ui/fmtui/makefile.mk54
-rw-r--r--sw/source/ui/fmtui/tmpdlg.cxx52
-rw-r--r--sw/source/ui/frmdlg/colex.cxx74
-rw-r--r--sw/source/ui/frmdlg/colmgr.cxx34
-rw-r--r--sw/source/ui/frmdlg/column.cxx253
-rw-r--r--sw/source/ui/frmdlg/column.hrc1
-rw-r--r--sw/source/ui/frmdlg/column.src27
-rw-r--r--sw/source/ui/frmdlg/cption.cxx8
-rw-r--r--sw/source/ui/frmdlg/cption.src13
-rw-r--r--sw/source/ui/frmdlg/frmdlg.cxx19
-rw-r--r--sw/source/ui/frmdlg/frmmgr.cxx64
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx575
-rw-r--r--sw/source/ui/frmdlg/frmpage.src44
-rw-r--r--sw/source/ui/frmdlg/makefile.mk78
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx2
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx90
-rw-r--r--sw/source/ui/frmdlg/wrap.src14
-rw-r--r--sw/source/ui/globdoc/makefile.mk54
-rw-r--r--sw/source/ui/inc/DropDownFieldDialog.hxx2
-rw-r--r--sw/source/ui/inc/SwSpellDialogChildWindow.hxx2
-rw-r--r--sw/source/ui/inc/abstract.hxx4
-rw-r--r--sw/source/ui/inc/annotsh.hxx5
-rw-r--r--sw/source/ui/inc/ascfldlg.hxx2
-rw-r--r--sw/source/ui/inc/basesh.hxx4
-rw-r--r--sw/source/ui/inc/bmpwin.hxx16
-rw-r--r--sw/source/ui/inc/bookctrl.hxx4
-rw-r--r--sw/source/ui/inc/bookmark.hxx12
-rw-r--r--sw/source/ui/inc/break.hxx12
-rw-r--r--sw/source/ui/inc/caption.hxx40
-rw-r--r--sw/source/ui/inc/cfgdesc.hxx14
-rw-r--r--sw/source/ui/inc/cfgitems.hxx132
-rw-r--r--sw/source/ui/inc/chldwrap.hxx4
-rw-r--r--sw/source/ui/inc/chrdlg.hxx10
-rw-r--r--sw/source/ui/inc/cnttab.hxx8
-rw-r--r--sw/source/ui/inc/colex.hxx8
-rw-r--r--sw/source/ui/inc/colmgr.hxx48
-rw-r--r--sw/source/ui/inc/column.hxx44
-rw-r--r--sw/source/ui/inc/conarc.hxx8
-rw-r--r--sw/source/ui/inc/concustomshape.hxx6
-rw-r--r--sw/source/ui/inc/condedit.hxx8
-rw-r--r--sw/source/ui/inc/conform.hxx4
-rw-r--r--sw/source/ui/inc/conpoly.hxx8
-rw-r--r--sw/source/ui/inc/conrect.hxx10
-rw-r--r--sw/source/ui/inc/content.hxx66
-rw-r--r--sw/source/ui/inc/conttree.hxx120
-rw-r--r--sw/source/ui/inc/dbinsdlg.hxx16
-rw-r--r--sw/source/ui/inc/dbtree.hxx10
-rw-r--r--sw/source/ui/inc/docfnote.hxx2
-rw-r--r--sw/source/ui/inc/docstdlg.hxx19
-rw-r--r--sw/source/ui/inc/drawbase.hxx26
-rw-r--r--sw/source/ui/inc/drpcps.hxx16
-rw-r--r--sw/source/ui/inc/drwbassh.hxx8
-rw-r--r--sw/source/ui/inc/drwtxtsh.hxx9
-rw-r--r--sw/source/ui/inc/dselect.hxx4
-rw-r--r--sw/source/ui/inc/edtwin.hxx90
-rw-r--r--sw/source/ui/inc/envimg.hxx4
-rw-r--r--sw/source/ui/inc/envlop.hxx8
-rw-r--r--sw/source/ui/inc/fldedt.hxx6
-rw-r--r--sw/source/ui/inc/fldmgr.hxx80
-rw-r--r--sw/source/ui/inc/fldtdlg.hxx16
-rw-r--r--sw/source/ui/inc/fldwrap.hxx10
-rw-r--r--sw/source/ui/inc/fontcfg.hxx12
-rw-r--r--sw/source/ui/inc/formedt.hxx6
-rw-r--r--sw/source/ui/inc/frmdlg.hxx19
-rw-r--r--sw/source/ui/inc/frmmgr.hxx23
-rw-r--r--sw/source/ui/inc/frmpage.hxx104
-rw-r--r--sw/source/ui/inc/glosbib.hxx9
-rw-r--r--sw/source/ui/inc/glosdoc.hxx24
-rw-r--r--sw/source/ui/inc/gloshdl.hxx50
-rw-r--r--sw/source/ui/inc/gloslst.hxx16
-rw-r--r--sw/source/ui/inc/glossary.hxx12
-rw-r--r--sw/source/ui/inc/glshell.hxx4
-rw-r--r--sw/source/ui/inc/initui.hxx2
-rw-r--r--sw/source/ui/inc/inpdlg.hxx2
-rw-r--r--sw/source/ui/inc/inputwin.hxx33
-rw-r--r--sw/source/ui/inc/insfnote.hxx14
-rw-r--r--sw/source/ui/inc/insrule.hxx6
-rw-r--r--sw/source/ui/inc/instable.hxx2
-rw-r--r--sw/source/ui/inc/javaedit.hxx12
-rw-r--r--sw/source/ui/inc/label.hxx8
-rw-r--r--sw/source/ui/inc/langhelper.hxx8
-rw-r--r--sw/source/ui/inc/linenum.hxx8
-rw-r--r--sw/source/ui/inc/macassgn.hxx2
-rw-r--r--sw/source/ui/inc/mailconfigpage.hxx2
-rw-r--r--sw/source/ui/inc/mailmergechildwindow.hxx2
-rw-r--r--sw/source/ui/inc/mailmrge.hxx8
-rw-r--r--sw/source/ui/inc/makefile.mk42
-rw-r--r--sw/source/ui/inc/mergetbl.hxx4
-rw-r--r--sw/source/ui/inc/mmconfigitem.hxx10
-rw-r--r--sw/source/ui/inc/multmrk.hxx2
-rw-r--r--sw/source/ui/inc/navicont.hxx8
-rw-r--r--sw/source/ui/inc/navipi.hxx36
-rw-r--r--sw/source/ui/inc/navmgr.hxx4
-rw-r--r--sw/source/ui/inc/num.hxx24
-rw-r--r--sw/source/ui/inc/numberingtypelistbox.hxx4
-rw-r--r--sw/source/ui/inc/numfmtlb.hxx32
-rw-r--r--sw/source/ui/inc/numpara.hxx10
-rw-r--r--sw/source/ui/inc/numprevw.hxx10
-rw-r--r--sw/source/ui/inc/olmenu.hxx4
-rw-r--r--sw/source/ui/inc/optcomp.hxx8
-rw-r--r--sw/source/ui/inc/optload.hxx12
-rw-r--r--sw/source/ui/inc/optpage.hxx70
-rw-r--r--sw/source/ui/inc/outline.hxx20
-rw-r--r--sw/source/ui/inc/pgfnote.hxx8
-rw-r--r--sw/source/ui/inc/pggrid.hxx4
-rw-r--r--sw/source/ui/inc/prcntfld.hxx10
-rw-r--r--sw/source/ui/inc/pview.hxx57
-rw-r--r--sw/source/ui/inc/redlndlg.hxx36
-rw-r--r--sw/source/ui/inc/regionsw.hxx22
-rw-r--r--sw/source/ui/inc/ribbar.hrc3
-rw-r--r--sw/source/ui/inc/rowht.hxx2
-rw-r--r--sw/source/ui/inc/scroll.hxx24
-rw-r--r--sw/source/ui/inc/selglos.hxx8
-rw-r--r--sw/source/ui/inc/shdwcrsr.hxx10
-rw-r--r--sw/source/ui/inc/split.hxx10
-rw-r--r--sw/source/ui/inc/splittbl.hxx4
-rw-r--r--sw/source/ui/inc/srcedtw.hxx30
-rw-r--r--sw/source/ui/inc/srcview.hxx20
-rw-r--r--sw/source/ui/inc/srtdlg.hxx8
-rw-r--r--sw/source/ui/inc/swcont.hxx16
-rw-r--r--sw/source/ui/inc/swdtflvr.hxx68
-rw-r--r--sw/source/ui/inc/swlbox.hxx34
-rw-r--r--sw/source/ui/inc/swmn_tmpl.hrc386
-rw-r--r--sw/source/ui/inc/swmodalredlineacceptdlg.hxx2
-rw-r--r--sw/source/ui/inc/swrenamexnameddlg.hxx2
-rw-r--r--sw/source/ui/inc/swtablerep.hxx46
-rw-r--r--sw/source/ui/inc/swuiccoll.hxx8
-rw-r--r--sw/source/ui/inc/swuicnttab.hxx66
-rw-r--r--sw/source/ui/inc/swuiidxmrk.hxx12
-rw-r--r--sw/source/ui/inc/swuipardlg.hxx14
-rw-r--r--sw/source/ui/inc/swwrtshitem.hxx2
-rw-r--r--sw/source/ui/inc/syncbtn.hxx2
-rw-r--r--sw/source/ui/inc/tabledlg.hxx4
-rw-r--r--sw/source/ui/inc/tablemgr.hxx18
-rw-r--r--sw/source/ui/inc/tabsh.hxx4
-rw-r--r--sw/source/ui/inc/tautofmt.hxx14
-rw-r--r--sw/source/ui/inc/tblctrl.hxx2
-rw-r--r--sw/source/ui/inc/tbxanchr.hxx6
-rw-r--r--sw/source/ui/inc/textcontrolcombo.hxx10
-rw-r--r--sw/source/ui/inc/textsh.hxx2
-rw-r--r--sw/source/ui/inc/titlepage.hxx2
-rw-r--r--sw/source/ui/inc/tmpdlg.hxx14
-rw-r--r--sw/source/ui/inc/tmplctrl.hxx4
-rw-r--r--sw/source/ui/inc/toolbox.hrc (renamed from sw/source/ui/inc/toolbox_tmpl.hrc)0
-rw-r--r--sw/source/ui/inc/toxmgr.hxx104
-rw-r--r--sw/source/ui/inc/uiborder.hxx2
-rw-r--r--sw/source/ui/inc/uiitems.hxx16
-rw-r--r--sw/source/ui/inc/uinums.hxx20
-rw-r--r--sw/source/ui/inc/uitool.hxx20
-rw-r--r--sw/source/ui/inc/uivwimp.hxx9
-rw-r--r--sw/source/ui/inc/unotools.hxx2
-rw-r--r--sw/source/ui/inc/unotxvw.hxx14
-rw-r--r--sw/source/ui/inc/usrpref.hxx31
-rw-r--r--sw/source/ui/inc/view.hxx220
-rw-r--r--sw/source/ui/inc/viewlayoutctrl.hxx6
-rw-r--r--sw/source/ui/inc/workctrl.hxx30
-rw-r--r--sw/source/ui/inc/wrap.hxx32
-rw-r--r--sw/source/ui/inc/wrtsh.hxx382
-rw-r--r--sw/source/ui/inc/zoomctrl.hxx4
-rw-r--r--sw/source/ui/index/cntex.cxx12
-rw-r--r--sw/source/ui/index/cnttab.cxx137
-rw-r--r--sw/source/ui/index/cnttab.hrc1
-rw-r--r--sw/source/ui/index/cnttab.src78
-rw-r--r--sw/source/ui/index/idxmrk.src13
-rw-r--r--sw/source/ui/index/makefile.mk67
-rw-r--r--sw/source/ui/index/multmrk.cxx4
-rw-r--r--sw/source/ui/index/multmrk.src3
-rw-r--r--sw/source/ui/index/swuiidxmrk.cxx61
-rw-r--r--sw/source/ui/index/toxmgr.cxx68
-rw-r--r--sw/source/ui/lingu/hhcwrp.cxx6
-rw-r--r--sw/source/ui/lingu/makefile.mk56
-rw-r--r--sw/source/ui/lingu/olmenu.cxx61
-rw-r--r--sw/source/ui/makefile.mk101
-rw-r--r--sw/source/ui/misc/bookmark.cxx45
-rw-r--r--sw/source/ui/misc/bookmark.src4
-rw-r--r--sw/source/ui/misc/docfnote.cxx65
-rw-r--r--sw/source/ui/misc/docfnote.src26
-rw-r--r--sw/source/ui/misc/glosbib.cxx97
-rw-r--r--sw/source/ui/misc/glosbib.src5
-rw-r--r--sw/source/ui/misc/glosdoc.cxx14
-rw-r--r--sw/source/ui/misc/glossary.cxx35
-rw-r--r--sw/source/ui/misc/glossary.src23
-rw-r--r--sw/source/ui/misc/glshell.cxx30
-rw-r--r--sw/source/ui/misc/impfnote.hxx16
-rw-r--r--sw/source/ui/misc/insfnote.cxx56
-rw-r--r--sw/source/ui/misc/insfnote.hrc4
-rw-r--r--sw/source/ui/misc/insfnote.src15
-rw-r--r--sw/source/ui/misc/insrule.cxx8
-rw-r--r--sw/source/ui/misc/linenum.cxx41
-rw-r--r--sw/source/ui/misc/linenum.src11
-rw-r--r--sw/source/ui/misc/makefile.mk93
-rw-r--r--sw/source/ui/misc/num.cxx169
-rw-r--r--sw/source/ui/misc/num.src12
-rw-r--r--sw/source/ui/misc/numberingtypelistbox.cxx20
-rw-r--r--sw/source/ui/misc/outline.cxx219
-rw-r--r--sw/source/ui/misc/outline.src10
-rw-r--r--sw/source/ui/misc/pgfnote.cxx56
-rw-r--r--sw/source/ui/misc/pgfnote.src8
-rw-r--r--sw/source/ui/misc/pggrid.cxx18
-rw-r--r--sw/source/ui/misc/pggrid.src13
-rw-r--r--sw/source/ui/misc/redlndlg.cxx227
-rw-r--r--sw/source/ui/misc/srtdlg.cxx126
-rw-r--r--sw/source/ui/misc/srtdlg.src25
-rw-r--r--sw/source/ui/misc/swmodalredlineacceptdlg.cxx16
-rw-r--r--sw/source/ui/misc/titlepage.cxx48
-rw-r--r--sw/source/ui/ribbar/conarc.cxx16
-rw-r--r--sw/source/ui/ribbar/concustomshape.cxx8
-rw-r--r--sw/source/ui/ribbar/conform.cxx28
-rw-r--r--sw/source/ui/ribbar/conpoly.cxx18
-rw-r--r--sw/source/ui/ribbar/conrect.cxx34
-rw-r--r--sw/source/ui/ribbar/drawbase.cxx143
-rw-r--r--sw/source/ui/ribbar/dselect.cxx18
-rwxr-xr-x[-rw-r--r--]sw/source/ui/ribbar/inputwin.cxx165
-rw-r--r--sw/source/ui/ribbar/inputwin.src12
-rw-r--r--sw/source/ui/ribbar/makefile.mk69
-rw-r--r--sw/source/ui/ribbar/tblctrl.cxx4
-rw-r--r--sw/source/ui/ribbar/tbxanchr.cxx10
-rw-r--r--sw/source/ui/ribbar/workctrl.cxx110
-rw-r--r--sw/source/ui/ribbar/workctrl.src145
-rw-r--r--sw/source/ui/shells/annotsh.cxx124
-rw-r--r--sw/source/ui/shells/basesh.cxx377
-rw-r--r--sw/source/ui/shells/beziersh.cxx30
-rw-r--r--sw/source/ui/shells/drawdlg.cxx38
-rw-r--r--sw/source/ui/shells/drawsh.cxx44
-rw-r--r--sw/source/ui/shells/drwbassh.cxx107
-rw-r--r--sw/source/ui/shells/drwtxtex.cxx30
-rw-r--r--sw/source/ui/shells/drwtxtsh.cxx84
-rw-r--r--sw/source/ui/shells/frmsh.cxx116
-rw-r--r--sw/source/ui/shells/grfsh.cxx68
-rw-r--r--sw/source/ui/shells/grfshex.cxx1
-rwxr-xr-x[-rw-r--r--]sw/source/ui/shells/langhelper.cxx44
-rw-r--r--sw/source/ui/shells/listsh.cxx28
-rw-r--r--sw/source/ui/shells/makefile.mk84
-rw-r--r--sw/source/ui/shells/mediash.cxx12
-rw-r--r--sw/source/ui/shells/navsh.cxx14
-rw-r--r--sw/source/ui/shells/shells.src834
-rw-r--r--sw/source/ui/shells/tabsh.cxx233
-rw-r--r--sw/source/ui/shells/textdrw.cxx2
-rw-r--r--sw/source/ui/shells/textfld.cxx148
-rw-r--r--sw/source/ui/shells/textglos.cxx24
-rw-r--r--sw/source/ui/shells/textidx.cxx26
-rw-r--r--sw/source/ui/shells/textsh.cxx200
-rw-r--r--sw/source/ui/shells/textsh1.cxx202
-rw-r--r--sw/source/ui/shells/textsh2.cxx22
-rw-r--r--sw/source/ui/shells/txtattr.cxx76
-rw-r--r--sw/source/ui/shells/txtcrsr.cxx84
-rw-r--r--sw/source/ui/shells/txtnum.cxx30
-rw-r--r--sw/source/ui/smartmenu/makefile.mk53
-rw-r--r--sw/source/ui/smartmenu/stmenu.cxx14
-rw-r--r--sw/source/ui/table/chartins.cxx8
-rw-r--r--sw/source/ui/table/chartins.src6
-rw-r--r--sw/source/ui/table/colwd.cxx14
-rw-r--r--sw/source/ui/table/colwd.src4
-rw-r--r--sw/source/ui/table/convert.cxx26
-rw-r--r--sw/source/ui/table/convert.hrc3
-rw-r--r--sw/source/ui/table/convert.src20
-rw-r--r--sw/source/ui/table/instable.cxx16
-rw-r--r--sw/source/ui/table/instable.src11
-rw-r--r--sw/source/ui/table/makefile.mk81
-rw-r--r--sw/source/ui/table/mergetbl.cxx2
-rw-r--r--sw/source/ui/table/mergetbl.src4
-rw-r--r--sw/source/ui/table/rowht.cxx2
-rw-r--r--sw/source/ui/table/rowht.src4
-rw-r--r--sw/source/ui/table/splittbl.src6
-rw-r--r--sw/source/ui/table/swtablerep.cxx34
-rw-r--r--sw/source/ui/table/tabledlg.cxx384
-rw-r--r--sw/source/ui/table/tabledlg.hrc1
-rw-r--r--sw/source/ui/table/tabledlg.src41
-rw-r--r--sw/source/ui/table/tablemgr.cxx48
-rw-r--r--sw/source/ui/table/tablepg.hxx45
-rw-r--r--sw/source/ui/table/tautofmt.cxx118
-rw-r--r--sw/source/ui/table/tautofmt.src11
-rw-r--r--sw/source/ui/uiview/formatclipboard.cxx54
-rw-r--r--sw/source/ui/uiview/makefile.mk77
-rw-r--r--sw/source/ui/uiview/pview.cxx273
-rw-r--r--sw/source/ui/uiview/pview.src91
-rw-r--r--sw/source/ui/uiview/scroll.cxx26
-rw-r--r--sw/source/ui/uiview/srcview.cxx128
-rw-r--r--sw/source/ui/uiview/swcli.cxx23
-rw-r--r--sw/source/ui/uiview/uivwimp.cxx16
-rw-r--r--sw/source/ui/uiview/view.cxx111
-rwxr-xr-x[-rw-r--r--]sw/source/ui/uiview/view.hrc0
-rw-r--r--sw/source/ui/uiview/view.src154
-rw-r--r--sw/source/ui/uiview/view0.cxx24
-rw-r--r--sw/source/ui/uiview/view1.cxx20
-rw-r--r--sw/source/ui/uiview/view2.cxx307
-rw-r--r--sw/source/ui/uiview/viewcoll.cxx6
-rw-r--r--sw/source/ui/uiview/viewdlg.cxx12
-rw-r--r--sw/source/ui/uiview/viewdlg2.cxx24
-rw-r--r--sw/source/ui/uiview/viewdraw.cxx8
-rw-r--r--sw/source/ui/uiview/viewfunc.hxx12
-rw-r--r--sw/source/ui/uiview/viewling.cxx6
-rw-r--r--sw/source/ui/uiview/viewmdi.cxx80
-rw-r--r--sw/source/ui/uiview/viewport.cxx244
-rw-r--r--sw/source/ui/uiview/viewprt.cxx76
-rw-r--r--sw/source/ui/uiview/viewsrch.cxx129
-rw-r--r--sw/source/ui/uiview/viewstat.cxx13
-rw-r--r--sw/source/ui/uiview/viewtab.cxx395
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx34
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.cxx370
-rw-r--r--sw/source/ui/uno/SwXPrintPreviewSettings.hxx90
-rw-r--r--sw/source/ui/uno/detreg.cxx24
-rw-r--r--sw/source/ui/uno/makefile.mk82
-rw-r--r--sw/source/ui/uno/swdet2.cxx6
-rw-r--r--sw/source/ui/uno/swdetect.cxx31
-rw-r--r--sw/source/ui/uno/swdetect.hxx4
-rw-r--r--sw/source/ui/uno/unoatxt.cxx16
-rw-r--r--sw/source/ui/uno/unofreg.cxx93
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx42
-rw-r--r--sw/source/ui/uno/unomod.cxx64
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx223
-rw-r--r--sw/source/ui/uno/unotxvw.cxx33
-rw-r--r--sw/source/ui/utlui/attrdesc.cxx36
-rw-r--r--sw/source/ui/utlui/bookctrl.cxx18
-rw-r--r--sw/source/ui/utlui/condedit.cxx2
-rw-r--r--sw/source/ui/utlui/content.cxx31
-rw-r--r--sw/source/ui/utlui/glbltree.cxx224
-rw-r--r--sw/source/ui/utlui/gloslst.cxx76
-rw-r--r--sw/source/ui/utlui/gloslst.src1
-rw-r--r--sw/source/ui/utlui/initui.cxx18
-rw-r--r--sw/source/ui/utlui/makefile.mk79
-rw-r--r--sw/source/ui/utlui/navicfg.cxx4
-rw-r--r--sw/source/ui/utlui/navipi.cxx201
-rw-r--r--sw/source/ui/utlui/navipi.hrc1
-rw-r--r--sw/source/ui/utlui/navipi.src13
-rw-r--r--sw/source/ui/utlui/numfmtlb.cxx78
-rw-r--r--sw/source/ui/utlui/poolfmt.src23
-rw-r--r--sw/source/ui/utlui/prcntfld.cxx10
-rw-r--r--sw/source/ui/utlui/shdwcrsr.cxx10
-rw-r--r--sw/source/ui/utlui/swrenamexnameddlg.cxx4
-rw-r--r--sw/source/ui/utlui/textcontrolcombo.cxx6
-rw-r--r--sw/source/ui/utlui/tmplctrl.cxx14
-rw-r--r--sw/source/ui/utlui/uiitems.cxx20
-rw-r--r--sw/source/ui/utlui/uitool.cxx108
-rw-r--r--sw/source/ui/utlui/unotools.cxx8
-rw-r--r--sw/source/ui/utlui/unotools.src1
-rw-r--r--sw/source/ui/utlui/viewlayoutctrl.cxx14
-rw-r--r--sw/source/ui/utlui/zoomctrl.cxx6
-rw-r--r--sw/source/ui/vba/makefile.mk140
-rw-r--r--sw/source/ui/vba/service.cxx14
-rw-r--r--sw/source/ui/vba/vbadocumentproperties.cxx2
-rw-r--r--sw/source/ui/vba/vbadocuments.cxx25
-rw-r--r--sw/source/ui/vba/vbadocuments.hxx5
-rw-r--r--sw/source/ui/vba/vbaeventshelper.cxx5
-rw-r--r--sw/source/ui/vba/vbaeventshelper.hxx1
-rw-r--r--sw/source/ui/vba/vbafield.cxx10
-rw-r--r--sw/source/ui/vba/vbaselection.cxx2
-rw-r--r--sw/source/ui/vba/vbatablehelper.cxx18
-rw-r--r--sw/source/ui/vba/vbatablehelper.hxx6
-rw-r--r--sw/source/ui/web/makefile.mk62
-rw-r--r--sw/source/ui/web/web.src262
-rw-r--r--sw/source/ui/web/wtextsh.cxx2
-rw-r--r--sw/source/ui/web/wview.cxx29
-rw-r--r--sw/source/ui/wrtsh/delete.cxx36
-rw-r--r--sw/source/ui/wrtsh/makefile.mk62
-rw-r--r--sw/source/ui/wrtsh/move.cxx202
-rw-r--r--sw/source/ui/wrtsh/navmgr.cxx4
-rw-r--r--sw/source/ui/wrtsh/select.cxx238
-rw-r--r--sw/source/ui/wrtsh/wrtsh1.cxx209
-rw-r--r--sw/source/ui/wrtsh/wrtsh2.cxx91
-rw-r--r--sw/source/ui/wrtsh/wrtsh3.cxx16
-rw-r--r--sw/source/ui/wrtsh/wrtsh4.cxx56
-rw-r--r--sw/source/ui/wrtsh/wrtundo.cxx72
-rw-r--r--sw/util/hidother.src18
-rw-r--r--sw/util/makefile.mk390
-rw-r--r--sw/util/msword.component37
-rw-r--r--sw/util/msword.map14
-rw-r--r--sw/util/sw.component104
-rw-r--r--sw/util/sw.flt136
-rw-r--r--sw/util/swd.component36
-rw-r--r--sw/util/swui.map6
-rw-r--r--sw/util/vbaswobj.component43
1364 files changed, 52605 insertions, 55668 deletions
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
new file mode 100644
index 000000000000..d59ddd700a92
--- /dev/null
+++ b/sw/AllLangResTarget_sw.mk
@@ -0,0 +1,184 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sw))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sw,\
+ sw/res \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,sw/res))
+
+$(eval $(call gb_SrsTarget_set_include,sw/res,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(WORKDIR)/inc/sw \
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/source/core/undo \
+ -I$(SRCDIR)/sw/source/core/unocore \
+ -I$(SRCDIR)/sw/source/ui/chrdlg \
+ -I$(SRCDIR)/sw/source/ui/config \
+ -I$(SRCDIR)/sw/source/ui/dbui \
+ -I$(SRCDIR)/sw/source/ui/dialog \
+ -I$(SRCDIR)/sw/source/ui/docvw \
+ -I$(SRCDIR)/sw/source/ui/envelp \
+ -I$(SRCDIR)/sw/source/ui/fldui \
+ -I$(SRCDIR)/sw/source/ui/fmtui \
+ -I$(SRCDIR)/sw/source/ui/frmdlg \
+ -I$(SRCDIR)/sw/source/ui/globdoc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/source/ui/index \
+ -I$(SRCDIR)/sw/source/ui/lingu \
+ -I$(SRCDIR)/sw/source/ui/misc \
+ -I$(SRCDIR)/sw/source/ui/ribbar \
+ -I$(SRCDIR)/sw/source/ui/shells \
+ -I$(SRCDIR)/sw/source/ui/smartmenu \
+ -I$(SRCDIR)/sw/source/ui/table \
+ -I$(SRCDIR)/sw/source/ui/uiview \
+ -I$(SRCDIR)/sw/source/ui/utlui \
+ -I$(SRCDIR)/sw/source/ui/web \
+ -I$(SRCDIR)/sw/source/ui/wrtsh \
+))
+
+$(eval $(call gb_SrsTarget_add_files,sw/res,\
+ sw/source/core/undo/undo.src \
+ sw/source/core/unocore/unocore.src \
+ sw/source/ui/app/app.src \
+ sw/source/ui/app/error.src \
+ sw/source/ui/app/mn.src \
+ sw/source/ui/chrdlg/ccoll.src \
+ sw/source/ui/chrdlg/chardlg.src \
+ sw/source/ui/chrdlg/chrdlg.src \
+ sw/source/ui/chrdlg/drpcps.src \
+ sw/source/ui/chrdlg/numpara.src \
+ sw/source/ui/chrdlg/paradlg.src \
+ sw/source/ui/chrdlg/swbreak.src \
+ sw/source/ui/config/mailconfigpage.src \
+ sw/source/ui/config/optcomp.src \
+ sw/source/ui/config/optdlg.src \
+ sw/source/ui/config/optload.src \
+ sw/source/ui/config/redlopt.src \
+ sw/source/ui/dbui/addresslistdialog.src \
+ sw/source/ui/dbui/createaddresslistdialog.src \
+ sw/source/ui/dbui/customizeaddresslistdialog.src \
+ sw/source/ui/dbui/dbinsdlg.src \
+ sw/source/ui/dbui/dbtablepreviewdialog.src \
+ sw/source/ui/dbui/dbui.src \
+ sw/source/ui/dbui/mailmergechildwindow.src \
+ sw/source/ui/dbui/mailmergewizard.src \
+ sw/source/ui/dbui/mmaddressblockpage.src \
+ sw/source/ui/dbui/mmdocselectpage.src \
+ sw/source/ui/dbui/mmgreetingspage.src \
+ sw/source/ui/dbui/mmlayoutpage.src \
+ sw/source/ui/dbui/mmmergepage.src \
+ sw/source/ui/dbui/mmoutputpage.src \
+ sw/source/ui/dbui/mmoutputtypepage.src \
+ sw/source/ui/dbui/mmpreparemergepage.src \
+ sw/source/ui/dbui/selectdbtabledialog.src \
+ sw/source/ui/dialog/abstract.src \
+ sw/source/ui/dialog/ascfldlg.src \
+ sw/source/ui/dialog/dialog.src \
+ sw/source/ui/dialog/docstdlg.src \
+ sw/source/ui/dialog/regionsw.src \
+ sw/source/ui/dialog/wordcountdialog.src \
+ sw/source/ui/dochdl/dochdl.src \
+ sw/source/ui/dochdl/selglos.src \
+ sw/source/ui/docvw/access.src \
+ sw/source/ui/docvw/docvw.src \
+ sw/source/ui/envelp/envelp.src \
+ sw/source/ui/envelp/envfmt.src \
+ sw/source/ui/envelp/envlop.src \
+ sw/source/ui/envelp/envprt.src \
+ sw/source/ui/envelp/label.src \
+ sw/source/ui/envelp/labfmt.src \
+ sw/source/ui/envelp/labprt.src \
+ sw/source/ui/envelp/mailmrge.src \
+ sw/source/ui/fldui/DropDownFieldDialog.src \
+ sw/source/ui/fldui/changedb.src \
+ sw/source/ui/fldui/flddb.src \
+ sw/source/ui/fldui/flddinf.src \
+ sw/source/ui/fldui/flddok.src \
+ sw/source/ui/fldui/fldfunc.src \
+ sw/source/ui/fldui/fldref.src \
+ sw/source/ui/fldui/fldtdlg.src \
+ sw/source/ui/fldui/fldui.src \
+ sw/source/ui/fldui/fldvar.src \
+ sw/source/ui/fldui/inpdlg.src \
+ sw/source/ui/fldui/javaedit.src \
+ sw/source/ui/fmtui/tmpdlg.src \
+ sw/source/ui/frmdlg/column.src \
+ sw/source/ui/frmdlg/cption.src \
+ sw/source/ui/frmdlg/frmpage.src \
+ sw/source/ui/frmdlg/frmui.src \
+ sw/source/ui/frmdlg/wrap.src \
+ sw/source/ui/globdoc/globdoc.src \
+ sw/source/ui/index/cnttab.src \
+ sw/source/ui/index/idxmrk.src \
+ sw/source/ui/index/multmrk.src \
+ sw/source/ui/lingu/olmenu.src \
+ sw/source/ui/misc/autocorr.src \
+ sw/source/ui/misc/bookmark.src \
+ sw/source/ui/misc/docfnote.src \
+ sw/source/ui/misc/glosbib.src \
+ sw/source/ui/misc/glossary.src \
+ sw/source/ui/misc/insfnote.src \
+ sw/source/ui/misc/insrule.src \
+ sw/source/ui/misc/linenum.src \
+ sw/source/ui/misc/num.src \
+ sw/source/ui/misc/numberingtypelistbox.src \
+ sw/source/ui/misc/outline.src \
+ sw/source/ui/misc/pgfnote.src \
+ sw/source/ui/misc/pggrid.src \
+ sw/source/ui/misc/redlndlg.src \
+ sw/source/ui/misc/srtdlg.src \
+ sw/source/ui/ribbar/inputwin.src \
+ sw/source/ui/ribbar/tbxanchr.src \
+ sw/source/ui/ribbar/workctrl.src \
+ sw/source/ui/shells/shells.src \
+ sw/source/ui/smartmenu/stmenu.src \
+ sw/source/ui/table/chartins.src \
+ sw/source/ui/table/colwd.src \
+ sw/source/ui/table/convert.src \
+ sw/source/ui/table/instable.src \
+ sw/source/ui/table/mergetbl.src \
+ sw/source/ui/table/rowht.src \
+ sw/source/ui/table/splittbl.src \
+ sw/source/ui/table/table.src \
+ sw/source/ui/table/tabledlg.src \
+ sw/source/ui/table/tautofmt.src \
+ sw/source/ui/uiview/pview.src \
+ sw/source/ui/uiview/view.src \
+ sw/source/ui/utlui/attrdesc.src \
+ sw/source/ui/utlui/gloslst.src \
+ sw/source/ui/utlui/initui.src \
+ sw/source/ui/utlui/navipi.src \
+ sw/source/ui/utlui/poolfmt.src \
+ sw/source/ui/utlui/unotools.src \
+ sw/source/ui/utlui/utlui.src \
+ sw/source/ui/web/web.src \
+ sw/source/ui/wrtsh/wrtsh.src \
+))
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
new file mode 100755
index 000000000000..4eb0dc405264
--- /dev/null
+++ b/sw/JunitTest_sw_complex.mk
@@ -0,0 +1,57 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_JunitTest_JunitTest,sw_complex))
+
+$(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
+ sw/qa/complex/checkColor/CheckChangeColor \
+ sw/qa/complex/indeterminateState/CheckIndeterminateState \
+ sw/qa/complex/writer/CheckCrossReferences \
+ sw/qa/complex/writer/LoadSaveTest \
+ sw/qa/complex/writer/CheckNamedPropertyValues \
+ sw/qa/complex/writer/CheckIndexedPropertyValues \
+ sw/qa/complex/writer/TestDocument \
+ sw/qa/complex/writer/CheckBookmarks \
+ sw/qa/complex/writer/CheckFlies \
+ sw/qa/complex/writer/TextPortionEnumerationTest \
+ sw/qa/complex/accessibility/AccessibleRelationSet \
+))
+
+$(eval $(call gb_JunitTest_add_jars,sw_complex,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
+
+$(eval $(call gb_JunitTest_add_classes,sw_complex,\
+ complex.accessibility.AccessibleRelationSet \
+ complex.checkColor.CheckChangeColor \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/source/core/attr/makefile.mk b/sw/JunitTest_sw_unoapi.mk
index baf327dcac36..d41ebcd2e839 100644..100755
--- a/sw/source/core/attr/makefile.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,34 +25,29 @@
#
#*************************************************************************
-PRJ=..$/..$/..
+$(eval $(call gb_JunitTest_JunitTest,sw_unoapi))
-PRJNAME=sw
-TARGET=attr
+$(eval $(call gb_JunitTest_set_defs,sw_unoapi,\
+ $$(DEFS) \
+ -Dorg.openoffice.test.arg.sce=$(SRCDIR)/sw/qa/unoapi/sw.sce \
+ -Dorg.openoffice.test.arg.xcl=$(SRCDIR)/sw/qa/unoapi/knownissues.xcl \
+ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/sw/qa/unoapi/testdocuments \
+))
-AUTOSEG=true
+$(eval $(call gb_JunitTest_add_jars,sw_unoapi,\
+ $(OUTDIR)/bin/OOoRunner.jar \
+ $(OUTDIR)/bin/ridl.jar \
+ $(OUTDIR)/bin/test.jar \
+ $(OUTDIR)/bin/unoil.jar \
+ $(OUTDIR)/bin/jurt.jar \
+))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_JunitTest_add_sourcefiles,sw_unoapi,\
+ sw/qa/unoapi/Test \
+))
-.INCLUDE : $(PRJ)$/inc$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/sw.mk
-
-# --- Files --------------------------------------------------------
-
-EXCEPTIONSFILES = \
- $(SLO)$/cellatr.obj \
- $(SLO)$/format.obj \
- $(SLO)$/hints.obj \
- $(SLO)$/swatrset.obj
-
-SLOFILES = \
- $(EXCEPTIONSFILES) \
- $(SLO)$/calbck.obj \
- $(SLO)$/fmtfollowtextflow.obj \
- $(SLO)$/fmtwrapinfluenceonobjpos.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_JunitTest_add_classes,sw_unoapi,\
+ org.openoffice.sw.qa.unoapi.Test \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
new file mode 100644
index 000000000000..507802ecdc47
--- /dev/null
+++ b/sw/Library_msword.mk
@@ -0,0 +1,123 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,msword))
+
+$(eval $(call gb_Library_set_componentfile,msword,sw/util/msword))
+
+$(eval $(call gb_Library_set_include,msword,\
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/inc/pch \
+ -I$(SRCDIR)/sw/inc \
+ -I$(WORKDIR)/inc/sw/sdi \
+ -I$(WORKDIR)/Misc/sw/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/sw \
+))
+
+$(eval $(call gb_Library_set_defs,msword,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,msword,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18nisolang1 \
+ i18nutil \
+ icuuc \
+ msfilter \
+ sal \
+ sax \
+ sb \
+ oox \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svx \
+ svxcore \
+ sw \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,msword,\
+ sw/source/filter/rtf/rtffld \
+ sw/source/filter/rtf/rtffly \
+ sw/source/filter/rtf/rtfnum \
+ sw/source/filter/rtf/rtftbl \
+ sw/source/filter/rtf/swparrtf \
+ sw/source/filter/ww8/docxattributeoutput \
+ sw/source/filter/ww8/docxexport \
+ sw/source/filter/ww8/docxexportfilter \
+ sw/source/filter/ww8/rtfattributeoutput \
+ sw/source/filter/ww8/rtfexport \
+ sw/source/filter/ww8/rtfexportfilter \
+ sw/source/filter/ww8/rtfimportfilter \
+ sw/source/filter/ww8/rtfsdrexport \
+ sw/source/filter/ww8/WW8FFData \
+ sw/source/filter/ww8/WW8FibData \
+ sw/source/filter/ww8/WW8Sttbf \
+ sw/source/filter/ww8/WW8TableInfo \
+ sw/source/filter/ww8/fields \
+ sw/source/filter/ww8/styles \
+ sw/source/filter/ww8/tracer \
+ sw/source/filter/ww8/writerhelper \
+ sw/source/filter/ww8/writerwordglue \
+ sw/source/filter/ww8/wrtw8esh \
+ sw/source/filter/ww8/wrtw8nds \
+ sw/source/filter/ww8/wrtw8num \
+ sw/source/filter/ww8/wrtw8sty \
+ sw/source/filter/ww8/wrtww8 \
+ sw/source/filter/ww8/wrtww8gr \
+ sw/source/filter/ww8/ww8atr \
+ sw/source/filter/ww8/ww8glsy \
+ sw/source/filter/ww8/ww8graf \
+ sw/source/filter/ww8/ww8graf2 \
+ sw/source/filter/ww8/ww8par \
+ sw/source/filter/ww8/ww8par2 \
+ sw/source/filter/ww8/ww8par3 \
+ sw/source/filter/ww8/ww8par4 \
+ sw/source/filter/ww8/ww8par5 \
+ sw/source/filter/ww8/ww8par6 \
+ sw/source/filter/ww8/ww8scan \
+ sw/source/filter/ww8/ww8toolbar \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
new file mode 100644
index 000000000000..b79e71d1d7e6
--- /dev/null
+++ b/sw/Library_sw.mk
@@ -0,0 +1,740 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,sw))
+
+$(eval $(call gb_Library_add_sdi_headers,sw,sw/sdi/swslots))
+
+$(eval $(call gb_Library_add_precompiled_header,sw,$(SRCDIR)/sw/inc/pch/precompiled_sw))
+
+$(eval $(call gb_Library_set_componentfile,sw,sw/util/sw))
+
+$(eval $(call gb_Library_set_include,sw,\
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/inc/pch \
+ -I$(SRCDIR)/sw/inc \
+ -I$(WORKDIR)/SdiTarget/sw/sdi \
+ -I$(WORKDIR)/Misc/sw/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_set_defs,sw,\
+ $$(DEFS) \
+ -DSW_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sw,\
+ avmedia \
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ i18nisolang1 \
+ i18nutil \
+ icuuc \
+ lng \
+ sal \
+ salhelper \
+ sb \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vbahelper \
+ vcl \
+ xo \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,sw,\
+ sw/source/core/SwNumberTree/SwNodeNum \
+ sw/source/core/SwNumberTree/SwNumberTree \
+ sw/source/core/access/acccell \
+ sw/source/core/access/acccontext \
+ sw/source/core/access/accdoc \
+ sw/source/core/access/accembedded \
+ sw/source/core/access/accfootnote \
+ sw/source/core/access/accframe \
+ sw/source/core/access/accframebase\
+ sw/source/core/access/accfrmobj \
+ sw/source/core/access/accfrmobjmap \
+ sw/source/core/access/accfrmobjslist \
+ sw/source/core/access/accgraphic \
+ sw/source/core/access/accheaderfooter \
+ sw/source/core/access/acchyperlink \
+ sw/source/core/access/acchypertextdata \
+ sw/source/core/access/accmap \
+ sw/source/core/access/accnotextframe \
+ sw/source/core/access/accpage \
+ sw/source/core/access/accpara \
+ sw/source/core/access/accportions \
+ sw/source/core/access/accpreview \
+ sw/source/core/access/accselectionhelper \
+ sw/source/core/access/acctable \
+ sw/source/core/access/acctextframe \
+ sw/source/core/access/parachangetrackinginfo \
+ sw/source/core/access/textmarkuphelper \
+ sw/source/core/attr/calbck \
+ sw/source/core/attr/cellatr \
+ sw/source/core/attr/fmtfollowtextflow \
+ sw/source/core/attr/fmtwrapinfluenceonobjpos \
+ sw/source/core/attr/format \
+ sw/source/core/attr/hints \
+ sw/source/core/attr/swatrset \
+ sw/source/core/bastyp/SwSmartTagMgr \
+ sw/source/core/bastyp/bparr \
+ sw/source/core/bastyp/breakit \
+ sw/source/core/bastyp/calc \
+ sw/source/core/bastyp/checkit \
+ sw/source/core/bastyp/index \
+ sw/source/core/bastyp/init \
+ sw/source/core/bastyp/ring \
+ sw/source/core/bastyp/swcache \
+ sw/source/core/bastyp/swrect \
+ sw/source/core/bastyp/swregion \
+ sw/source/core/bastyp/swtypes \
+ sw/source/core/bastyp/tabcol \
+ sw/source/core/crsr/BlockCursor \
+ sw/source/core/crsr/bookmrk \
+ sw/source/core/crsr/callnk \
+ sw/source/core/crsr/crbm \
+ sw/source/core/crsr/crossrefbookmark \
+ sw/source/core/crsr/crsrsh \
+ sw/source/core/crsr/crstrvl \
+ sw/source/core/crsr/crstrvl1 \
+ sw/source/core/crsr/findattr \
+ sw/source/core/crsr/findcoll \
+ sw/source/core/crsr/findfmt \
+ sw/source/core/crsr/findtxt \
+ sw/source/core/crsr/pam \
+ sw/source/core/crsr/paminit \
+ sw/source/core/crsr/swcrsr \
+ sw/source/core/crsr/trvlcol \
+ sw/source/core/crsr/trvlfnfl \
+ sw/source/core/crsr/trvlreg \
+ sw/source/core/crsr/trvltbl \
+ sw/source/core/crsr/unocrsr \
+ sw/source/core/crsr/viscrs \
+ sw/source/core/doc/SwStyleNameMapper \
+ sw/source/core/doc/acmplwrd \
+ sw/source/core/doc/dbgoutsw \
+ sw/source/core/doc/doc \
+ sw/source/core/doc/docbasic \
+ sw/source/core/doc/docbm \
+ sw/source/core/doc/docchart \
+ sw/source/core/doc/doccomp \
+ sw/source/core/doc/doccorr \
+ sw/source/core/doc/docdde \
+ sw/source/core/doc/docdesc \
+ sw/source/core/doc/docdraw \
+ sw/source/core/doc/docedt \
+ sw/source/core/doc/docfld \
+ sw/source/core/doc/docfly \
+ sw/source/core/doc/docfmt \
+ sw/source/core/doc/docftn \
+ sw/source/core/doc/docglbl \
+ sw/source/core/doc/docglos \
+ sw/source/core/doc/doclay \
+ sw/source/core/doc/docnew \
+ sw/source/core/doc/docnum \
+ sw/source/core/doc/docredln \
+ sw/source/core/doc/docruby \
+ sw/source/core/doc/docsort \
+ sw/source/core/doc/docstat \
+ sw/source/core/doc/doctxm \
+ sw/source/core/doc/docxforms \
+ sw/source/core/doc/extinput \
+ sw/source/core/doc/fmtcol \
+ sw/source/core/doc/ftnidx \
+ sw/source/core/doc/gctable \
+ sw/source/core/doc/htmltbl \
+ sw/source/core/doc/lineinfo \
+ sw/source/core/doc/list \
+ sw/source/core/doc/notxtfrm \
+ sw/source/core/doc/number \
+ sw/source/core/doc/poolfmt \
+ sw/source/core/doc/sortopt \
+ sw/source/core/doc/swserv \
+ sw/source/core/doc/swstylemanager \
+ sw/source/core/doc/tblafmt \
+ sw/source/core/doc/tblcpy \
+ sw/source/core/doc/tblrwcl \
+ sw/source/core/doc/visiturl \
+ sw/source/core/docnode/cancellablejob \
+ sw/source/core/docnode/finalthreadmanager \
+ sw/source/core/docnode/ndcopy \
+ sw/source/core/docnode/ndindex \
+ sw/source/core/docnode/ndnotxt \
+ sw/source/core/docnode/ndnum \
+ sw/source/core/docnode/ndsect \
+ sw/source/core/docnode/ndtbl \
+ sw/source/core/docnode/ndtbl1 \
+ sw/source/core/docnode/node \
+ sw/source/core/docnode/node2lay \
+ sw/source/core/docnode/nodes \
+ sw/source/core/docnode/observablethread \
+ sw/source/core/docnode/pausethreadstarting \
+ sw/source/core/docnode/retrievedinputstreamdata \
+ sw/source/core/docnode/retrieveinputstream \
+ sw/source/core/docnode/retrieveinputstreamconsumer \
+ sw/source/core/docnode/section \
+ sw/source/core/docnode/swbaslnk \
+ sw/source/core/docnode/swthreadjoiner \
+ sw/source/core/docnode/swthreadmanager \
+ sw/source/core/docnode/threadlistener \
+ sw/source/core/docnode/threadmanager \
+ sw/source/core/draw/dcontact \
+ sw/source/core/draw/dflyobj \
+ sw/source/core/draw/dobjfac \
+ sw/source/core/draw/dpage \
+ sw/source/core/draw/drawdoc \
+ sw/source/core/draw/dview \
+ sw/source/core/edit/acorrect \
+ sw/source/core/edit/autofmt \
+ sw/source/core/edit/edatmisc \
+ sw/source/core/edit/edattr \
+ sw/source/core/edit/eddel \
+ sw/source/core/edit/edfcol \
+ sw/source/core/edit/edfld \
+ sw/source/core/edit/edfldexp \
+ sw/source/core/edit/edfmt \
+ sw/source/core/edit/edglbldc \
+ sw/source/core/edit/edglss \
+ sw/source/core/edit/editsh \
+ sw/source/core/edit/edlingu \
+ sw/source/core/edit/ednumber \
+ sw/source/core/edit/edredln \
+ sw/source/core/edit/edsect \
+ sw/source/core/edit/edtab \
+ sw/source/core/edit/edtox \
+ sw/source/core/edit/edundo \
+ sw/source/core/edit/edws \
+ sw/source/core/except/dbgloop \
+ sw/source/core/except/errhdl \
+ sw/source/core/fields/authfld \
+ sw/source/core/fields/cellfml \
+ sw/source/core/fields/chpfld \
+ sw/source/core/fields/dbfld \
+ sw/source/core/fields/ddefld \
+ sw/source/core/fields/ddetbl \
+ sw/source/core/fields/docufld \
+ sw/source/core/fields/expfld \
+ sw/source/core/fields/fldbas \
+ sw/source/core/fields/flddat \
+ sw/source/core/fields/flddropdown \
+ sw/source/core/fields/fldlst \
+ sw/source/core/fields/macrofld \
+ sw/source/core/fields/postithelper \
+ sw/source/core/fields/reffld \
+ sw/source/core/fields/scrptfld \
+ sw/source/core/fields/tblcalc \
+ sw/source/core/fields/textapi \
+ sw/source/core/fields/usrfld \
+ sw/source/core/frmedt/fecopy \
+ sw/source/core/frmedt/fedesc \
+ sw/source/core/frmedt/fefly1 \
+ sw/source/core/frmedt/feflyole \
+ sw/source/core/frmedt/feshview \
+ sw/source/core/frmedt/fetab \
+ sw/source/core/frmedt/fews \
+ sw/source/core/frmedt/tblsel \
+ sw/source/core/graphic/grfatr \
+ sw/source/core/graphic/ndgrf \
+ sw/source/core/layout/anchoreddrawobject \
+ sw/source/core/layout/anchoredobject \
+ sw/source/core/layout/atrfrm \
+ sw/source/core/layout/calcmove \
+ sw/source/core/layout/colfrm \
+ sw/source/core/layout/dbg_lay \
+ sw/source/core/layout/findfrm \
+ sw/source/core/layout/flowfrm \
+ sw/source/core/layout/fly \
+ sw/source/core/layout/flycnt \
+ sw/source/core/layout/flyincnt \
+ sw/source/core/layout/flylay \
+ sw/source/core/layout/flypos \
+ sw/source/core/layout/frmtool \
+ sw/source/core/layout/ftnfrm \
+ sw/source/core/layout/hffrm \
+ sw/source/core/layout/layact \
+ sw/source/core/layout/laycache \
+ sw/source/core/layout/layouter \
+ sw/source/core/layout/movedfwdfrmsbyobjpos \
+ sw/source/core/layout/newfrm \
+ sw/source/core/layout/objectformatter \
+ sw/source/core/layout/objectformatterlayfrm \
+ sw/source/core/layout/objectformattertxtfrm \
+ sw/source/core/layout/objstmpconsiderwrapinfl \
+ sw/source/core/layout/pagechg \
+ sw/source/core/layout/pagedesc \
+ sw/source/core/layout/paintfrm \
+ sw/source/core/layout/sectfrm \
+ sw/source/core/layout/softpagebreak \
+ sw/source/core/layout/sortedobjs \
+ sw/source/core/layout/sortedobjsimpl \
+ sw/source/core/layout/ssfrm \
+ sw/source/core/layout/swselectionlist \
+ sw/source/core/layout/tabfrm \
+ sw/source/core/layout/trvlfrm \
+ sw/source/core/layout/unusedf \
+ sw/source/core/layout/virtoutp \
+ sw/source/core/layout/wsfrm \
+ sw/source/core/objectpositioning/anchoredobjectposition \
+ sw/source/core/objectpositioning/ascharanchoredobjectposition \
+ sw/source/core/objectpositioning/environmentofanchoredobject \
+ sw/source/core/objectpositioning/tocntntanchoredobjectposition \
+ sw/source/core/objectpositioning/tolayoutanchoredobjectposition \
+ sw/source/core/ole/ndole \
+ sw/source/core/para/paratr \
+ sw/source/core/sw3io/sw3convert \
+ sw/source/core/sw3io/swacorr \
+ sw/source/core/swg/SwXMLBlockExport \
+ sw/source/core/swg/SwXMLBlockImport \
+ sw/source/core/swg/SwXMLBlockListContext \
+ sw/source/core/swg/SwXMLSectionList \
+ sw/source/core/swg/SwXMLTextBlocks \
+ sw/source/core/swg/SwXMLTextBlocks1 \
+ sw/source/core/swg/swblocks \
+ sw/source/core/table/swnewtable \
+ sw/source/core/table/swtable \
+ sw/source/core/text/EnhancedPDFExportHelper \
+ sw/source/core/text/SwGrammarMarkUp \
+ sw/source/core/text/atrstck \
+ sw/source/core/text/blink \
+ sw/source/core/text/frmcrsr \
+ sw/source/core/text/frmform \
+ sw/source/core/text/frminf \
+ sw/source/core/text/frmpaint \
+ sw/source/core/text/guess \
+ sw/source/core/text/inftxt \
+ sw/source/core/text/itradj \
+ sw/source/core/text/itratr \
+ sw/source/core/text/itrcrsr \
+ sw/source/core/text/itrform2 \
+ sw/source/core/text/itrpaint \
+ sw/source/core/text/itrtxt \
+ sw/source/core/text/noteurl \
+ sw/source/core/text/porexp \
+ sw/source/core/text/porfld \
+ sw/source/core/text/porfly \
+ sw/source/core/text/porglue \
+ sw/source/core/text/porlay \
+ sw/source/core/text/porlin \
+ sw/source/core/text/pormulti \
+ sw/source/core/text/porref \
+ sw/source/core/text/porrst \
+ sw/source/core/text/portox \
+ sw/source/core/text/portxt \
+ sw/source/core/text/redlnitr \
+ sw/source/core/text/txtcache \
+ sw/source/core/text/txtdrop \
+ sw/source/core/text/txtfld \
+ sw/source/core/text/txtfly \
+ sw/source/core/text/txtfrm \
+ sw/source/core/text/txtftn \
+ sw/source/core/text/txthyph \
+ sw/source/core/text/txtinit \
+ sw/source/core/text/txtio \
+ sw/source/core/text/txtpaint \
+ sw/source/core/text/txttab \
+ sw/source/core/text/widorp \
+ sw/source/core/text/wrong \
+ sw/source/core/tox/tox \
+ sw/source/core/tox/toxhlp \
+ sw/source/core/tox/txmsrt \
+ sw/source/core/txtnode/SwGrammarContact \
+ sw/source/core/txtnode/atrfld \
+ sw/source/core/txtnode/atrflyin \
+ sw/source/core/txtnode/atrftn \
+ sw/source/core/txtnode/atrref \
+ sw/source/core/txtnode/atrtox \
+ sw/source/core/txtnode/chrfmt \
+ sw/source/core/txtnode/fmtatr2 \
+ sw/source/core/txtnode/fntcache \
+ sw/source/core/txtnode/fntcap \
+ sw/source/core/txtnode/modeltoviewhelper \
+ sw/source/core/txtnode/ndhints \
+ sw/source/core/txtnode/ndtxt \
+ sw/source/core/txtnode/swfntcch \
+ sw/source/core/txtnode/swfont \
+ sw/source/core/txtnode/thints \
+ sw/source/core/txtnode/txatbase \
+ sw/source/core/txtnode/txatritr \
+ sw/source/core/txtnode/txtatr2 \
+ sw/source/core/txtnode/txtedt \
+ sw/source/core/undo/SwRewriter \
+ sw/source/core/undo/SwUndoField \
+ sw/source/core/undo/SwUndoFmt \
+ sw/source/core/undo/SwUndoPageDesc \
+ sw/source/core/undo/SwUndoTOXChange \
+ sw/source/core/undo/docundo \
+ sw/source/core/undo/rolbck \
+ sw/source/core/undo/unattr \
+ sw/source/core/undo/unbkmk \
+ sw/source/core/undo/undel \
+ sw/source/core/undo/undobj \
+ sw/source/core/undo/undobj1 \
+ sw/source/core/undo/undoflystrattr \
+ sw/source/core/undo/undraw \
+ sw/source/core/undo/unfmco \
+ sw/source/core/undo/unins \
+ sw/source/core/undo/unmove \
+ sw/source/core/undo/unnum \
+ sw/source/core/undo/unoutl \
+ sw/source/core/undo/unovwr \
+ sw/source/core/undo/unredln \
+ sw/source/core/undo/unsect \
+ sw/source/core/undo/unsort \
+ sw/source/core/undo/unspnd \
+ sw/source/core/undo/untbl \
+ sw/source/core/undo/untblk \
+ sw/source/core/unocore/SwXTextDefaults \
+ sw/source/core/unocore/TextCursorHelper \
+ sw/source/core/unocore/XMLRangeHelper \
+ sw/source/core/unocore/swunohelper \
+ sw/source/core/unocore/unobkm \
+ sw/source/core/unocore/unochart \
+ sw/source/core/unocore/unocoll \
+ sw/source/core/unocore/unocrsrhelper \
+ sw/source/core/unocore/unodraw \
+ sw/source/core/unocore/unoevent \
+ sw/source/core/unocore/unoevtlstnr \
+ sw/source/core/unocore/unofield \
+ sw/source/core/unocore/unoflatpara \
+ sw/source/core/unocore/unoframe \
+ sw/source/core/unocore/unoftn \
+ sw/source/core/unocore/unoidx \
+ sw/source/core/unocore/unomap \
+ sw/source/core/unocore/unoobj \
+ sw/source/core/unocore/unoobj2 \
+ sw/source/core/unocore/unoparagraph \
+ sw/source/core/unocore/unoport \
+ sw/source/core/unocore/unoportenum \
+ sw/source/core/unocore/unoprnms \
+ sw/source/core/unocore/unoredline \
+ sw/source/core/unocore/unoredlines \
+ sw/source/core/unocore/unorefmk \
+ sw/source/core/unocore/unosect \
+ sw/source/core/unocore/unosett \
+ sw/source/core/unocore/unosrch \
+ sw/source/core/unocore/unostyle \
+ sw/source/core/unocore/unotbl \
+ sw/source/core/unocore/unotext \
+ sw/source/core/unocore/unotextmarkup \
+ sw/source/core/view/pagepreviewlayout \
+ sw/source/core/view/printdata \
+ sw/source/core/view/vdraw \
+ sw/source/core/view/viewimp \
+ sw/source/core/view/viewpg \
+ sw/source/core/view/viewsh \
+ sw/source/core/view/vnew \
+ sw/source/core/view/vprint \
+ sw/source/filter/ascii/ascatr \
+ sw/source/filter/ascii/parasc \
+ sw/source/filter/ascii/wrtasc \
+ sw/source/filter/basflt/docfact \
+ sw/source/filter/basflt/fltini \
+ sw/source/filter/basflt/iodetect \
+ sw/source/filter/basflt/shellio \
+ sw/source/filter/html/SwAppletImpl \
+ sw/source/filter/html/css1atr \
+ sw/source/filter/html/css1kywd \
+ sw/source/filter/html/htmlatr \
+ sw/source/filter/html/htmlbas \
+ sw/source/filter/html/htmlcss1 \
+ sw/source/filter/html/htmlctxt \
+ sw/source/filter/html/htmldraw \
+ sw/source/filter/html/htmlfld \
+ sw/source/filter/html/htmlfldw \
+ sw/source/filter/html/htmlfly \
+ sw/source/filter/html/htmlflyt \
+ sw/source/filter/html/htmlform \
+ sw/source/filter/html/htmlforw \
+ sw/source/filter/html/htmlftn \
+ sw/source/filter/html/htmlgrin \
+ sw/source/filter/html/htmlnum \
+ sw/source/filter/html/htmlplug \
+ sw/source/filter/html/htmlsect \
+ sw/source/filter/html/htmltab \
+ sw/source/filter/html/htmltabw \
+ sw/source/filter/html/parcss1 \
+ sw/source/filter/html/svxcss1 \
+ sw/source/filter/html/swhtml \
+ sw/source/filter/html/wrthtml \
+ sw/source/filter/writer/writer \
+ sw/source/filter/writer/wrt_fn \
+ sw/source/filter/writer/wrtswtbl \
+ sw/source/filter/ww1/fltshell \
+ sw/source/filter/ww1/w1class \
+ sw/source/filter/ww1/w1filter \
+ sw/source/filter/ww1/w1par \
+ sw/source/filter/ww1/w1sprm \
+ sw/source/filter/xml/XMLRedlineImportHelper \
+ sw/source/filter/xml/swxml \
+ sw/source/filter/xml/wrtxml \
+ sw/source/filter/xml/xmlbrsh \
+ sw/source/filter/xml/xmlexp \
+ sw/source/filter/xml/xmlexpit \
+ sw/source/filter/xml/xmlfmt \
+ sw/source/filter/xml/xmlfmte \
+ sw/source/filter/xml/xmlfonte \
+ sw/source/filter/xml/xmlimp \
+ sw/source/filter/xml/xmlimpit \
+ sw/source/filter/xml/xmlitem \
+ sw/source/filter/xml/xmliteme \
+ sw/source/filter/xml/xmlitemi \
+ sw/source/filter/xml/xmlitemm \
+ sw/source/filter/xml/xmlithlp \
+ sw/source/filter/xml/xmlitmpr \
+ sw/source/filter/xml/xmlmeta \
+ sw/source/filter/xml/xmlscript \
+ sw/source/filter/xml/xmltble \
+ sw/source/filter/xml/xmltbli \
+ sw/source/filter/xml/xmltext \
+ sw/source/filter/xml/xmltexte \
+ sw/source/filter/xml/xmltexti \
+ sw/source/ui/app/appenv \
+ sw/source/ui/app/apphdl \
+ sw/source/ui/app/applab \
+ sw/source/ui/app/appopt \
+ sw/source/ui/app/docsh \
+ sw/source/ui/app/docsh2 \
+ sw/source/ui/app/docshdrw \
+ sw/source/ui/app/docshini \
+ sw/source/ui/app/docst \
+ sw/source/ui/app/docstyle \
+ sw/source/ui/app/mainwn \
+ sw/source/ui/app/swdll \
+ sw/source/ui/app/swmodul1 \
+ sw/source/ui/app/swmodule \
+ sw/source/ui/app/swwait \
+ sw/source/ui/cctrl/actctrl \
+ sw/source/ui/cctrl/popbox \
+ sw/source/ui/cctrl/swlbox \
+ sw/source/ui/chrdlg/ccoll \
+ sw/source/ui/config/barcfg \
+ sw/source/ui/config/caption \
+ sw/source/ui/config/cfgitems \
+ sw/source/ui/config/dbconfig \
+ sw/source/ui/config/fontcfg \
+ sw/source/ui/config/modcfg \
+ sw/source/ui/config/prtopt \
+ sw/source/ui/config/uinums \
+ sw/source/ui/config/usrpref \
+ sw/source/ui/config/viewopt \
+ sw/source/ui/dbui/dbmgr \
+ sw/source/ui/dbui/dbtree \
+ sw/source/ui/dbui/dbui \
+ sw/source/ui/dbui/maildispatcher \
+ sw/source/ui/dbui/mailmergechildwindow \
+ sw/source/ui/dbui/mailmergehelper \
+ sw/source/ui/dbui/mmconfigitem \
+ sw/source/ui/dbui/swdbtoolsclient \
+ sw/source/ui/dialog/SwSpellDialogChildWindow \
+ sw/source/ui/dialog/regionsw \
+ sw/source/ui/dialog/swabstdlg \
+ sw/source/ui/dialog/swwrtshitem \
+ sw/source/ui/dochdl/gloshdl \
+ sw/source/ui/dochdl/swdtflvr \
+ sw/source/ui/docvw/AnchorOverlayObject \
+ sw/source/ui/docvw/AnnotationMenuButton \
+ sw/source/ui/docvw/AnnotationWin \
+ sw/source/ui/docvw/PostItMgr \
+ sw/source/ui/docvw/ShadowOverlayObject \
+ sw/source/ui/docvw/SidebarTxtControl \
+ sw/source/ui/docvw/SidebarTxtControlAcc \
+ sw/source/ui/docvw/SidebarWin \
+ sw/source/ui/docvw/SidebarWinAcc \
+ sw/source/ui/docvw/edtdd \
+ sw/source/ui/docvw/edtwin \
+ sw/source/ui/docvw/edtwin2 \
+ sw/source/ui/docvw/edtwin3 \
+ sw/source/ui/docvw/extedit \
+ sw/source/ui/docvw/frmsidebarwincontainer \
+ sw/source/ui/docvw/romenu \
+ sw/source/ui/docvw/srcedtw \
+ sw/source/ui/envelp/envimg \
+ sw/source/ui/envelp/labelcfg \
+ sw/source/ui/envelp/labimg \
+ sw/source/ui/envelp/syncbtn \
+ sw/source/ui/fldui/fldmgr \
+ sw/source/ui/fldui/fldwrap \
+ sw/source/ui/fldui/xfldui \
+ sw/source/ui/frmdlg/colex \
+ sw/source/ui/frmdlg/colmgr \
+ sw/source/ui/frmdlg/frmmgr \
+ sw/source/ui/globdoc/globdoc \
+ sw/source/ui/index/idxmrk \
+ sw/source/ui/index/toxmgr \
+ sw/source/ui/lingu/hhcwrp \
+ sw/source/ui/lingu/hyp \
+ sw/source/ui/lingu/olmenu \
+ sw/source/ui/lingu/sdrhhcwrap \
+ sw/source/ui/misc/glosdoc \
+ sw/source/ui/misc/glshell \
+ sw/source/ui/misc/numberingtypelistbox \
+ sw/source/ui/misc/redlndlg \
+ sw/source/ui/ribbar/conarc \
+ sw/source/ui/ribbar/concustomshape \
+ sw/source/ui/ribbar/conform \
+ sw/source/ui/ribbar/conpoly \
+ sw/source/ui/ribbar/conrect \
+ sw/source/ui/ribbar/drawbase \
+ sw/source/ui/ribbar/dselect \
+ sw/source/ui/ribbar/inputwin \
+ sw/source/ui/ribbar/tblctrl \
+ sw/source/ui/ribbar/tbxanchr \
+ sw/source/ui/ribbar/workctrl \
+ sw/source/ui/shells/annotsh \
+ sw/source/ui/shells/basesh \
+ sw/source/ui/shells/beziersh \
+ sw/source/ui/shells/drawdlg \
+ sw/source/ui/shells/drawsh \
+ sw/source/ui/shells/drformsh \
+ sw/source/ui/shells/drwbassh \
+ sw/source/ui/shells/drwtxtex \
+ sw/source/ui/shells/drwtxtsh \
+ sw/source/ui/shells/frmsh \
+ sw/source/ui/shells/grfsh \
+ sw/source/ui/shells/grfshex \
+ sw/source/ui/shells/langhelper \
+ sw/source/ui/shells/listsh \
+ sw/source/ui/shells/mediash \
+ sw/source/ui/shells/navsh \
+ sw/source/ui/shells/olesh \
+ sw/source/ui/shells/slotadd \
+ sw/source/ui/shells/tabsh \
+ sw/source/ui/shells/textdrw \
+ sw/source/ui/shells/textfld \
+ sw/source/ui/shells/textglos \
+ sw/source/ui/shells/textidx \
+ sw/source/ui/shells/textsh \
+ sw/source/ui/shells/textsh1 \
+ sw/source/ui/shells/textsh2 \
+ sw/source/ui/shells/txtattr \
+ sw/source/ui/shells/txtcrsr \
+ sw/source/ui/shells/txtnum \
+ sw/source/ui/smartmenu/stmenu \
+ sw/source/ui/table/chartins \
+ sw/source/ui/table/swtablerep \
+ sw/source/ui/table/tablemgr \
+ sw/source/ui/uiview/formatclipboard \
+ sw/source/ui/uiview/pview \
+ sw/source/ui/uiview/scroll \
+ sw/source/ui/uiview/srcview \
+ sw/source/ui/uiview/swcli \
+ sw/source/ui/uiview/uivwimp \
+ sw/source/ui/uiview/view \
+ sw/source/ui/uiview/view0 \
+ sw/source/ui/uiview/view1 \
+ sw/source/ui/uiview/view2 \
+ sw/source/ui/uiview/viewcoll \
+ sw/source/ui/uiview/viewdlg \
+ sw/source/ui/uiview/viewdlg2 \
+ sw/source/ui/uiview/viewdraw \
+ sw/source/ui/uiview/viewling \
+ sw/source/ui/uiview/viewmdi \
+ sw/source/ui/uiview/viewport \
+ sw/source/ui/uiview/viewprt \
+ sw/source/ui/uiview/viewsrch \
+ sw/source/ui/uiview/viewstat \
+ sw/source/ui/uiview/viewtab \
+ sw/source/ui/uno/RefreshListenerContainer \
+ sw/source/ui/uno/SwXDocumentSettings \
+ sw/source/ui/uno/SwXFilterOptions \
+ sw/source/ui/uno/dlelstnr \
+ sw/source/ui/uno/unoatxt \
+ sw/source/ui/uno/unodefaults \
+ sw/source/ui/uno/unodispatch \
+ sw/source/ui/uno/unodoc \
+ sw/source/ui/uno/unofreg \
+ sw/source/ui/uno/unomailmerge \
+ sw/source/ui/uno/unomod \
+ sw/source/ui/uno/unomodule \
+ sw/source/ui/uno/unotxdoc \
+ sw/source/ui/uno/unotxvw \
+ sw/source/ui/utlui/attrdesc \
+ sw/source/ui/utlui/bookctrl \
+ sw/source/ui/utlui/condedit \
+ sw/source/ui/utlui/content \
+ sw/source/ui/utlui/glbltree \
+ sw/source/ui/utlui/gloslst \
+ sw/source/ui/utlui/initui \
+ sw/source/ui/utlui/navicfg \
+ sw/source/ui/utlui/navipi \
+ sw/source/ui/utlui/numfmtlb \
+ sw/source/ui/utlui/prcntfld \
+ sw/source/ui/utlui/shdwcrsr \
+ sw/source/ui/utlui/textcontrolcombo \
+ sw/source/ui/utlui/tmplctrl \
+ sw/source/ui/utlui/uiitems \
+ sw/source/ui/utlui/uitool \
+ sw/source/ui/utlui/unotools \
+ sw/source/ui/utlui/viewlayoutctrl \
+ sw/source/ui/utlui/zoomctrl \
+ sw/source/ui/web/wdocsh \
+ sw/source/ui/web/wformsh \
+ sw/source/ui/web/wfrmsh \
+ sw/source/ui/web/wgrfsh \
+ sw/source/ui/web/wlistsh \
+ sw/source/ui/web/wolesh \
+ sw/source/ui/web/wtabsh \
+ sw/source/ui/web/wtextsh \
+ sw/source/ui/web/wview \
+ sw/source/ui/wrtsh/delete \
+ sw/source/ui/wrtsh/move \
+ sw/source/ui/wrtsh/navmgr \
+ sw/source/ui/wrtsh/select \
+ sw/source/ui/wrtsh/wrtsh1 \
+ sw/source/ui/wrtsh/wrtsh2 \
+ sw/source/ui/wrtsh/wrtsh3 \
+ sw/source/ui/wrtsh/wrtsh4 \
+ sw/source/ui/wrtsh/wrtundo \
+))
+
+$(eval $(call gb_SdiTarget_SdiTarget,sw/sdi/swslots,sw/sdi/swriter))
+
+$(eval $(call gb_SdiTarget_set_include,sw/sdi/swslots,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/sdi \
+ $$(INCLUDE) \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/source/core/SwNumberTree/makefile.mk b/sw/Library_swd.mk
index a7cfff9cecd2..a0dcfaf29c3a 100644
--- a/sw/source/core/SwNumberTree/makefile.mk
+++ b/sw/Library_swd.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -24,27 +24,49 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
-PRJ=..$/..$/..
-PRJNAME=sw
-TARGET=SwNumberTree
+$(eval $(call gb_Library_Library,swd))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Library_set_componentfile,swd,sw/util/swd))
-.INCLUDE : $(PRJ)$/inc$/swpre.mk
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/sw.mk
+$(eval $(call gb_Library_set_include,swd,\
+ $$(INCLUDE) \
+ -I$(WORKDIR)/inc/sw/sdi \
+ -I$(WORKDIR)/inc/sw \
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/inc/pch \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(OUTDIR)/inc/offuh \
+))
-# --- Files --------------------------------------------------------
+$(eval $(call gb_Library_set_defs,swd,\
+ $$(DEFS) \
+))
-SLOFILES = \
- $(EXCEPTIONSFILES)
+$(eval $(call gb_Library_add_linked_libs,swd,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
-EXCEPTIONSFILES = \
- $(SLO)$/SwNodeNum.obj \
- $(SLO)$/SwNumberTree.obj
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
+$(eval $(call gb_Library_add_exception_objects,swd,\
+ sw/source/core/except/errhdl \
+ sw/source/filter/basflt/iodetect \
+ sw/source/ui/uno/detreg \
+ sw/source/ui/uno/swdet2 \
+ sw/source/ui/uno/swdetect \
+))
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
new file mode 100644
index 000000000000..9991435f151c
--- /dev/null
+++ b/sw/Library_swui.mk
@@ -0,0 +1,169 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,swui))
+
+$(eval $(call gb_Library_set_include,swui,\
+ -I$(SRCDIR)/sw/inc \
+ -I$(SRCDIR)/sw/inc/pch \
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(WORKDIR)/SdiTarget/sw/sdi \
+ -I$(WORKDIR)/Misc/sw \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+))
+
+$(eval $(call gb_Library_set_defs,swui,\
+ $$(DEFS) \
+))
+
+$(eval $(call gb_Library_add_linked_libs,swui,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18nisolang1 \
+ msfilter \
+ sal \
+ sfx \
+ sot \
+ stl \
+ svl \
+ svt \
+ svx \
+ svx \
+ svxcore \
+ sw \
+ tk \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,swui,\
+ sw/source/core/undo/SwRewriter \
+ sw/source/ui/chrdlg/break \
+ sw/source/ui/chrdlg/chardlg \
+ sw/source/ui/chrdlg/drpcps \
+ sw/source/ui/chrdlg/numpara \
+ sw/source/ui/chrdlg/pardlg \
+ sw/source/ui/chrdlg/swuiccoll \
+ sw/source/ui/chrdlg/tblnumfm \
+ sw/source/ui/config/mailconfigpage \
+ sw/source/ui/config/optcomp \
+ sw/source/ui/config/optload \
+ sw/source/ui/config/optpage \
+ sw/source/ui/dbui/addresslistdialog \
+ sw/source/ui/dbui/createaddresslistdialog \
+ sw/source/ui/dbui/customizeaddresslistdialog \
+ sw/source/ui/dbui/dbinsdlg \
+ sw/source/ui/dbui/dbtablepreviewdialog \
+ sw/source/ui/dbui/mailmergewizard \
+ sw/source/ui/dbui/mmaddressblockpage \
+ sw/source/ui/dbui/mmdocselectpage \
+ sw/source/ui/dbui/mmgreetingspage \
+ sw/source/ui/dbui/mmlayoutpage \
+ sw/source/ui/dbui/mmmergepage \
+ sw/source/ui/dbui/mmoutputpage \
+ sw/source/ui/dbui/mmoutputtypepage \
+ sw/source/ui/dbui/mmpreparemergepage \
+ sw/source/ui/dbui/selectdbtabledialog \
+ sw/source/ui/dialog/abstract \
+ sw/source/ui/dialog/addrdlg \
+ sw/source/ui/dialog/ascfldlg \
+ sw/source/ui/dialog/docstdlg \
+ sw/source/ui/dialog/macassgn \
+ sw/source/ui/dialog/swdialmgr \
+ sw/source/ui/dialog/swdlgfact \
+ sw/source/ui/dialog/swuiexp \
+ sw/source/ui/dialog/uiregionsw \
+ sw/source/ui/dialog/wordcountdialog \
+ sw/source/ui/dochdl/selglos \
+ sw/source/ui/envelp/envfmt \
+ sw/source/ui/envelp/envlop1 \
+ sw/source/ui/envelp/envprt \
+ sw/source/ui/envelp/label1 \
+ sw/source/ui/envelp/labelexp \
+ sw/source/ui/envelp/labfmt \
+ sw/source/ui/envelp/labprt \
+ sw/source/ui/envelp/mailmrge \
+ sw/source/ui/fldui/DropDownFieldDialog \
+ sw/source/ui/fldui/FldRefTreeListBox \
+ sw/source/ui/fldui/changedb \
+ sw/source/ui/fldui/flddb \
+ sw/source/ui/fldui/flddinf \
+ sw/source/ui/fldui/flddok \
+ sw/source/ui/fldui/fldedt \
+ sw/source/ui/fldui/fldfunc \
+ sw/source/ui/fldui/fldpage \
+ sw/source/ui/fldui/fldref \
+ sw/source/ui/fldui/fldtdlg \
+ sw/source/ui/fldui/fldvar \
+ sw/source/ui/fldui/inpdlg \
+ sw/source/ui/fldui/javaedit \
+ sw/source/ui/fmtui/tmpdlg \
+ sw/source/ui/frmdlg/column \
+ sw/source/ui/frmdlg/cption \
+ sw/source/ui/frmdlg/frmdlg \
+ sw/source/ui/frmdlg/frmpage \
+ sw/source/ui/frmdlg/pattern \
+ sw/source/ui/frmdlg/uiborder \
+ sw/source/ui/frmdlg/wrap \
+ sw/source/ui/index/cntex \
+ sw/source/ui/index/cnttab \
+ sw/source/ui/index/multmrk \
+ sw/source/ui/index/swuiidxmrk \
+ sw/source/ui/misc/bookmark \
+ sw/source/ui/misc/docfnote \
+ sw/source/ui/misc/glosbib \
+ sw/source/ui/misc/glossary \
+ sw/source/ui/misc/insfnote \
+ sw/source/ui/misc/insrule \
+ sw/source/ui/misc/linenum \
+ sw/source/ui/misc/num \
+ sw/source/ui/misc/outline \
+ sw/source/ui/misc/pgfnote \
+ sw/source/ui/misc/pggrid \
+ sw/source/ui/misc/srtdlg \
+ sw/source/ui/misc/swmodalredlineacceptdlg \
+ sw/source/ui/misc/titlepage \
+ sw/source/ui/table/colwd \
+ sw/source/ui/table/convert \
+ sw/source/ui/table/instable \
+ sw/source/ui/table/mergetbl \
+ sw/source/ui/table/rowht \
+ sw/source/ui/table/splittbl \
+ sw/source/ui/table/tabledlg \
+ sw/source/ui/table/tautofmt \
+ sw/source/ui/utlui/swrenamexnameddlg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
new file mode 100644
index 000000000000..f5cd44dc8ae5
--- /dev/null
+++ b/sw/Library_vbaswobj.mk
@@ -0,0 +1,148 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Library_Library,vbaswobj))
+
+$(eval $(call gb_Library_set_componentfile,vbaswobj,sw/util/vbaswobj))
+
+$(eval $(call gb_Library_set_include,vbaswobj,\
+ -I$(SRCDIR)/sw/source/core/inc \
+ -I$(SRCDIR)/sw/source/filter/inc \
+ -I$(SRCDIR)/sw/source/ui/inc \
+ -I$(SRCDIR)/sw/inc/pch \
+ -I$(SRCDIR)/sw/inc \
+ -I$(WORKDIR)/Misc/sw/ \
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/offuh \
+ -I$(OUTDIR)/inc/ \
+))
+
+$(eval $(call gb_Library_add_linked_libs,vbaswobj,\
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ i18nisolang1 \
+ sal \
+ sb \
+ sfx \
+ stl \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ sw \
+ tk \
+ tl \
+ utl \
+ vbahelper \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,vbaswobj,\
+ sw/source/ui/vba/service \
+ sw/source/ui/vba/vbarange \
+ sw/source/ui/vba/vbacell \
+ sw/source/ui/vba/vbacells \
+ sw/source/ui/vba/vbacolumn \
+ sw/source/ui/vba/vbacolumns \
+ sw/source/ui/vba/vbaframe \
+ sw/source/ui/vba/vbaframes \
+ sw/source/ui/vba/vbalistformat \
+ sw/source/ui/vba/vbalistgallery \
+ sw/source/ui/vba/vbalistgalleries \
+ sw/source/ui/vba/vbalisthelper \
+ sw/source/ui/vba/vbalistlevel \
+ sw/source/ui/vba/vbalistlevels \
+ sw/source/ui/vba/vbalisttemplate \
+ sw/source/ui/vba/vbalisttemplates \
+ sw/source/ui/vba/vbarevision \
+ sw/source/ui/vba/vbarevisions \
+ sw/source/ui/vba/vbarow \
+ sw/source/ui/vba/vbarows \
+ sw/source/ui/vba/vbadocument \
+ sw/source/ui/vba/vbasections \
+ sw/source/ui/vba/vbadialog \
+ sw/source/ui/vba/vbawrapformat \
+ sw/source/ui/vba/vbafont \
+ sw/source/ui/vba/vbarangehelper \
+ sw/source/ui/vba/vbaaddin \
+ sw/source/ui/vba/vbaautotextentry \
+ sw/source/ui/vba/vbadocumentproperties \
+ sw/source/ui/vba/vbaeventshelper \
+ sw/source/ui/vba/vbastyle \
+ sw/source/ui/vba/vbapane \
+ sw/source/ui/vba/vbaglobals \
+ sw/source/ui/vba/vbatemplate \
+ sw/source/ui/vba/vbaaddins \
+ sw/source/ui/vba/vbaview \
+ sw/source/ui/vba/vbaheaderfooter \
+ sw/source/ui/vba/vbaheadersfooters \
+ sw/source/ui/vba/vbaheaderfooterhelper \
+ sw/source/ui/vba/vbabookmarks \
+ sw/source/ui/vba/vbaoptions \
+ sw/source/ui/vba/vbadialogs \
+ sw/source/ui/vba/vbapalette \
+ sw/source/ui/vba/vbaparagraph \
+ sw/source/ui/vba/vbafind \
+ sw/source/ui/vba/vbasection \
+ sw/source/ui/vba/vbabookmark \
+ sw/source/ui/vba/vbaapplication \
+ sw/source/ui/vba/vbawindow \
+ sw/source/ui/vba/vbareplacement \
+ sw/source/ui/vba/vbatable \
+ sw/source/ui/vba/vbatablehelper \
+ sw/source/ui/vba/vbatabstop \
+ sw/source/ui/vba/vbatabstops \
+ sw/source/ui/vba/vbaselection \
+ sw/source/ui/vba/vbasystem \
+ sw/source/ui/vba/vbainformationhelper \
+ sw/source/ui/vba/vbapagesetup \
+ sw/source/ui/vba/vbafield \
+ sw/source/ui/vba/vbatables \
+ sw/source/ui/vba/vbatableofcontents \
+ sw/source/ui/vba/vbatablesofcontents \
+ sw/source/ui/vba/vbavariable \
+ sw/source/ui/vba/vbadocuments \
+ sw/source/ui/vba/vbaparagraphformat \
+ sw/source/ui/vba/vbaborders \
+ sw/source/ui/vba/vbavariables \
+ sw/source/ui/vba/vbastyles \
+ sw/source/ui/vba/vbapanes \
+ sw/source/ui/vba/wordvbahelper \
+))
+
+ifeq ($(OS),LINUX)
+$(eval $(call gb_Library_set_ldflags,vbaswobj,\
+ $$(LDFLAGS) \
+ -Wl$(COMMA)-O1 \
+ -Wl$(COMMA)-z$(COMMA)noexecstack \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/inc/sw.mk b/sw/Makefile
index c7ba1233d708..a79aff831024 100644
--- a/sw/inc/sw.mk
+++ b/sw/Makefile
@@ -25,17 +25,14 @@
#
#*************************************************************************
-# Bereiche aktivieren
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
-CDEFS+=-DACCESSIBLE_LAYOUT
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
-# define SW_DLLIMPLEMENTATION (see @ swdllapi.h)
-.IF "$(MAKING_LIBMSWORD)" != "TRUE"
-CDEFS += -DSW_DLLIMPLEMENTATION
-.ENDIF
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
-VISIBILITY_HIDDEN=TRUE
-
-.IF "$(DBG_LEVEL)">="2"
-CFLAGS += $(LIBXML_CFLAGS)
-.ENDIF
+# vim: set noet sw=4 ts=4:
diff --git a/sw/inc/swpre.mk b/sw/Module_sw.mk
index b19440a01a55..c6257e22fc93 100644
--- a/sw/inc/swpre.mk
+++ b/sw/Module_sw.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -25,22 +25,23 @@
#
#*************************************************************************
+$(eval $(call gb_Module_Module,sw))
-#======================================================================
-# standardmaessig mit Optimierung, muss explizit mit nopt=t ausgeschaltet
-# werden, wenn nicht gewuenscht
-#----------------------------------------------------------------------
-
-.IF "$(nopt)"!="" || "$(NOPT)"!=""
-nopt=true
-NOPT=TRUE
-optimize=
-OPTIMIZE=
-.ELSE
-.IF "$(debug)$(DEBUG)"==""
-optimize=true
-OPTIMIZE=TRUE
-.ENDIF
-.ENDIF
+$(eval $(call gb_Module_add_targets,sw,\
+ AllLangResTarget_sw \
+ Library_msword \
+ Library_sw \
+ Library_swd \
+ Library_swui \
+ Library_vbaswobj \
+ Package_misc \
+ Package_uiconfig \
+ Package_xml \
+))
+$(eval $(call gb_Module_add_subsequentcheck_targets,sw,\
+ JunitTest_sw_complex \
+ JunitTest_sw_unoapi \
+))
+# vim: set noet ts=4 sw=4:
diff --git a/sw/source/core/inc/makefile.mk b/sw/Package_misc.mk
index 1b35ca49549d..60f721be4322 100644
--- a/sw/source/core/inc/makefile.mk
+++ b/sw/Package_misc.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -24,3 +24,7 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
+
+$(eval $(call gb_Package_Package,sw_misc,$(SRCDIR)/sw/misc))
+# TODO:
+#COPY sw/unxlngx6.pro/misc/swslots_sid.hid unxlngx6.pro/bin/hid/swslots_sid.hid
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
new file mode 100644
index 000000000000..2cad9784eb92
--- /dev/null
+++ b/sw/Package_uiconfig.mk
@@ -0,0 +1,261 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2011 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.
+#
+#*************************************************************************
+
+$(eval $(call gb_Package_Package,sw_uiconfig,$(SRCDIR)/sw/uiconfig))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/menubar/menubar.xml,sglobal/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/statusbar/statusbar.xml,sglobal/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/alignmentbar.xml,sglobal/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/arrowshapes.xml,sglobal/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/basicshapes.xml,sglobal/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/bezierobjectbar.xml,sglobal/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/calloutshapes.xml,sglobal/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/colorbar.xml,sglobal/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawbar.xml,sglobal/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawingobjectbar.xml,sglobal/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/drawtextobjectbar.xml,sglobal/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/extrusionobjectbar.xml,sglobal/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/findbar.xml,sglobal/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/flowchartshapes.xml,sglobal/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkobjectbar.xml,sglobal/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fontworkshapetype.xml,sglobal/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formcontrols.xml,sglobal/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formdesign.xml,sglobal/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsfilterbar.xml,sglobal/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formsnavigationbar.xml,sglobal/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/formtextobjectbar.xml,sglobal/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/frameobjectbar.xml,sglobal/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/fullscreenbar.xml,sglobal/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graffilterbar.xml,sglobal/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/graphicobjectbar.xml,sglobal/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertbar.xml,sglobal/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/insertobjectbar.xml,sglobal/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/mediaobjectbar.xml,sglobal/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/moreformcontrols.xml,sglobal/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/numobjectbar.xml,sglobal/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/oleobjectbar.xml,sglobal/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/optimizetablebar.xml,sglobal/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/previewobjectbar.xml,sglobal/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/standardbar.xml,sglobal/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/starshapes.xml,sglobal/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/symbolshapes.xml,sglobal/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/tableobjectbar.xml,sglobal/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/textobjectbar.xml,sglobal/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/toolbar.xml,sglobal/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sglobal/toolbar/viewerbar.xml,sglobal/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/menubar/menubar.xml,sweb/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/statusbar/statusbar.xml,sweb/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/arrowshapes.xml,sweb/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/basicshapes.xml,sweb/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/bezierobjectbar.xml,sweb/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/calloutshapes.xml,sweb/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/colorbar.xml,sweb/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawingobjectbar.xml,sweb/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/drawtextobjectbar.xml,sweb/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/extrusionobjectbar.xml,sweb/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/findbar.xml,sweb/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/flowchartshapes.xml,sweb/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkobjectbar.xml,sweb/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fontworkshapetype.xml,sweb/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formcontrols.xml,sweb/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formdesign.xml,sweb/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsfilterbar.xml,sweb/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formsnavigationbar.xml,sweb/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/formtextobjectbar.xml,sweb/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/frameobjectbar.xml,sweb/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/fullscreenbar.xml,sweb/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graffilterbar.xml,sweb/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/graphicobjectbar.xml,sweb/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/insertbar.xml,sweb/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/mediaobjectbar.xml,sweb/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/numobjectbar.xml,sweb/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/oleobjectbar.xml,sweb/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/optimizetablebar.xml,sweb/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/previewobjectbar.xml,sweb/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/standardbar.xml,sweb/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/starshapes.xml,sweb/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/symbolshapes.xml,sweb/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/tableobjectbar.xml,sweb/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/textobjectbar.xml,sweb/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/toolbar.xml,sweb/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/sweb/toolbar/viewerbar.xml,sweb/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/menubar/menubar.xml,swform/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/statusbar/statusbar.xml,swform/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/alignmentbar.xml,swform/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/arrowshapes.xml,swform/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/basicshapes.xml,swform/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/bezierobjectbar.xml,swform/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/calloutshapes.xml,swform/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/colorbar.xml,swform/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawbar.xml,swform/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawingobjectbar.xml,swform/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/drawtextobjectbar.xml,swform/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/extrusionobjectbar.xml,swform/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/flowchartshapes.xml,swform/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkobjectbar.xml,swform/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fontworkshapetype.xml,swform/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formcontrols.xml,swform/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formdesign.xml,swform/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsfilterbar.xml,swform/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formsnavigationbar.xml,swform/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/formtextobjectbar.xml,swform/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/frameobjectbar.xml,swform/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/fullscreenbar.xml,swform/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graffilterbar.xml,swform/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/graphicobjectbar.xml,swform/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertbar.xml,swform/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/insertobjectbar.xml,swform/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/mediaobjectbar.xml,swform/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/moreformcontrols.xml,swform/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/numobjectbar.xml,swform/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/oleobjectbar.xml,swform/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/optimizetablebar.xml,swform/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/previewobjectbar.xml,swform/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/standardbar.xml,swform/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/starshapes.xml,swform/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/symbolshapes.xml,swform/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/tableobjectbar.xml,swform/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/textobjectbar.xml,swform/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/toolbar.xml,swform/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swform/toolbar/viewerbar.xml,swform/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/menubar/menubar.xml,swreport/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/statusbar/statusbar.xml,swreport/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/alignmentbar.xml,swreport/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/arrowshapes.xml,swreport/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/basicshapes.xml,swreport/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/bezierobjectbar.xml,swreport/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/calloutshapes.xml,swreport/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/colorbar.xml,swreport/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawbar.xml,swreport/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawingobjectbar.xml,swreport/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/drawtextobjectbar.xml,swreport/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/extrusionobjectbar.xml,swreport/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/flowchartshapes.xml,swreport/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkobjectbar.xml,swreport/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fontworkshapetype.xml,swreport/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formcontrols.xml,swreport/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formdesign.xml,swreport/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsfilterbar.xml,swreport/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formsnavigationbar.xml,swreport/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/formtextobjectbar.xml,swreport/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/frameobjectbar.xml,swreport/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/fullscreenbar.xml,swreport/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graffilterbar.xml,swreport/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/graphicobjectbar.xml,swreport/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertbar.xml,swreport/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/insertobjectbar.xml,swreport/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/mediaobjectbar.xml,swreport/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/moreformcontrols.xml,swreport/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/numobjectbar.xml,swreport/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/oleobjectbar.xml,swreport/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/optimizetablebar.xml,swreport/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/previewobjectbar.xml,swreport/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/standardbar.xml,swreport/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/starshapes.xml,swreport/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/symbolshapes.xml,swreport/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/tableobjectbar.xml,swreport/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/textobjectbar.xml,swreport/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/toolbar.xml,swreport/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swreport/toolbar/viewerbar.xml,swreport/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/menubar/menubar.xml,swriter/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/statusbar/statusbar.xml,swriter/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/alignmentbar.xml,swriter/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/arrowshapes.xml,swriter/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/basicshapes.xml,swriter/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/bezierobjectbar.xml,swriter/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/calloutshapes.xml,swriter/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/colorbar.xml,swriter/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawbar.xml,swriter/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawingobjectbar.xml,swriter/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/drawtextobjectbar.xml,swriter/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/extrusionobjectbar.xml,swriter/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/findbar.xml,swriter/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/flowchartshapes.xml,swriter/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkobjectbar.xml,swriter/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fontworkshapetype.xml,swriter/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formcontrols.xml,swriter/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formdesign.xml,swriter/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsfilterbar.xml,swriter/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formsnavigationbar.xml,swriter/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/formtextobjectbar.xml,swriter/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/frameobjectbar.xml,swriter/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/fullscreenbar.xml,swriter/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graffilterbar.xml,swriter/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/graphicobjectbar.xml,swriter/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/insertbar.xml,swriter/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/mediaobjectbar.xml,swriter/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/moreformcontrols.xml,swriter/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/numobjectbar.xml,swriter/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/oleobjectbar.xml,swriter/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/optimizetablebar.xml,swriter/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/previewobjectbar.xml,swriter/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/standardbar.xml,swriter/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/starshapes.xml,swriter/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/symbolshapes.xml,swriter/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/tableobjectbar.xml,swriter/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/textobjectbar.xml,swriter/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/toolbar.xml,swriter/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swriter/toolbar/viewerbar.xml,swriter/toolbar/viewerbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/menubar/menubar.xml,swxform/menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/statusbar/statusbar.xml,swxform/statusbar/statusbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/alignmentbar.xml,swxform/toolbar/alignmentbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/arrowshapes.xml,swxform/toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/basicshapes.xml,swxform/toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/bezierobjectbar.xml,swxform/toolbar/bezierobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/calloutshapes.xml,swxform/toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/colorbar.xml,swxform/toolbar/colorbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawbar.xml,swxform/toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawingobjectbar.xml,swxform/toolbar/drawingobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/drawtextobjectbar.xml,swxform/toolbar/drawtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/extrusionobjectbar.xml,swxform/toolbar/extrusionobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/findbar.xml,swxform/toolbar/findbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/flowchartshapes.xml,swxform/toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkobjectbar.xml,swxform/toolbar/fontworkobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fontworkshapetype.xml,swxform/toolbar/fontworkshapetype.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formcontrols.xml,swxform/toolbar/formcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formdesign.xml,swxform/toolbar/formdesign.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsfilterbar.xml,swxform/toolbar/formsfilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formsnavigationbar.xml,swxform/toolbar/formsnavigationbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/formtextobjectbar.xml,swxform/toolbar/formtextobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/frameobjectbar.xml,swxform/toolbar/frameobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/fullscreenbar.xml,swxform/toolbar/fullscreenbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graffilterbar.xml,swxform/toolbar/graffilterbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/graphicobjectbar.xml,swxform/toolbar/graphicobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertbar.xml,swxform/toolbar/insertbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/insertobjectbar.xml,swxform/toolbar/insertobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/mediaobjectbar.xml,swxform/toolbar/mediaobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/moreformcontrols.xml,swxform/toolbar/moreformcontrols.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/numobjectbar.xml,swxform/toolbar/numobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/oleobjectbar.xml,swxform/toolbar/oleobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/optimizetablebar.xml,swxform/toolbar/optimizetablebar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/previewobjectbar.xml,swxform/toolbar/previewobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/standardbar.xml,swxform/toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/starshapes.xml,swxform/toolbar/starshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/symbolshapes.xml,swxform/toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/tableobjectbar.xml,swxform/toolbar/tableobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/textobjectbar.xml,swxform/toolbar/textobjectbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/toolbar.xml,swxform/toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,sw_uiconfig,xml/uiconfig/modules/swxform/toolbar/viewerbar.xml,swxform/toolbar/viewerbar.xml))
diff --git a/sw/source/filter/inc/makefile.mk b/sw/Package_xml.mk
index 1b35ca49549d..dee52fdd97f3 100644
--- a/sw/source/filter/inc/makefile.mk
+++ b/sw/Package_xml.mk
@@ -2,7 +2,7 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
@@ -24,3 +24,6 @@
# for a copy of the LGPLv3 License.
#
#*************************************************************************
+
+$(eval $(call gb_Package_Package,sw_xml,$(SRCDIR)/sw/xml))
+$(eval $(call gb_Package_add_file,sw_xml,xml/writer.xml,writer.xml))
diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx
index 7c4e522daf3b..e8befb722fc0 100644
--- a/sw/inc/EnhancedPDFExportHelper.hxx
+++ b/sw/inc/EnhancedPDFExportHelper.hxx
@@ -149,7 +149,7 @@ class SwTaggedPDFHelper
// This will be incremented for each BeginTag() call.
// It denotes the number of tags to close during EndStructureElements();
- BYTE nEndStructureElement;
+ sal_uInt8 nEndStructureElement;
// If an already existing tag is reopened for follows of flow frames,
// this value stores the tag id which has to be restored.
diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 6b1a30b8d06f..40c680bb597f 100644
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -130,7 +130,7 @@
@returns
the current PrintData
*/
- virtual SwPrintData* getPrintData() const = 0;
+ virtual const SwPrintData & getPrintData() const = 0;
/** Sets the PrintData
diff --git a/sw/inc/IDocumentFieldsAccess.hxx b/sw/inc/IDocumentFieldsAccess.hxx
index 1f28006ad5a2..4cc0318cd852 100644
--- a/sw/inc/IDocumentFieldsAccess.hxx
+++ b/sw/inc/IDocumentFieldsAccess.hxx
@@ -77,10 +77,10 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
@param rVal the value
@param nMId
- @retval TRUE putting of value was successful
- @retval FALSE else
+ @retval sal_True putting of value was successful
+ @retval sal_False else
*/
- virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, USHORT nWhich) = 0;
+ virtual bool PutValueToField(const SwPosition & rPos, const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich) = 0;
// Call update of expression fields. All expressions are re-evaluated.
@@ -91,8 +91,8 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
@param pMsgHnt
@param bUpdateTblFlds TRUE: update table fields, too.
- @retval TRUE update was successful
- @retval FALSE else
+ @retval sal_True update was successful
+ @retval sal_False else
*/
virtual bool UpdateFld(SwTxtFld * rDstFmtFld, SwField & rSrcFld, SwMsgPoolItem * pMsgHnt, bool bUpdateTblFlds) = 0;
@@ -118,7 +118,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
SwNode (see parameter pChk) is (?) part of the private
data structure of SwDoc and should not be exposed
*/
- virtual bool SetFieldsDirty(bool b, const SwNode* pChk, ULONG nLen) = 0;
+ virtual bool SetFieldsDirty(bool b, const SwNode* pChk, sal_uLong nLen) = 0;
virtual void SetFixFields(bool bOnlyTimeDate, const DateTime* pNewDateTime) = 0;
@@ -127,7 +127,7 @@ namespace com { namespace sun { namespace star { namespace uno { class Any; } }
// (Node [ + ::com::sun::star::ucb::Content]).
// A generated list of all fields may be passed along too
// (if the addreess != 0 and the pointer == 0 a new list will be returned).
- virtual void FldsToCalc(SwCalc& rCalc, ULONG nLastNd, sal_uInt16 nLastCnt) = 0;
+ virtual void FldsToCalc(SwCalc& rCalc, sal_uLong nLastNd, sal_uInt16 nLastCnt) = 0;
virtual void FldsToCalc(SwCalc& rCalc, const _SetGetExpFld& rToThisFld) = 0;
diff --git a/sw/inc/IDocumentLinksAdministration.hxx b/sw/inc/IDocumentLinksAdministration.hxx
index 66a2e4ae0e67..fb3d3c8c89e0 100644
--- a/sw/inc/IDocumentLinksAdministration.hxx
+++ b/sw/inc/IDocumentLinksAdministration.hxx
@@ -53,7 +53,7 @@ namespace sfx2 { class SvLinkSource; class LinkManager; }
/** #i42634# Moved common code of SwReader::Read() and
SwDocShell::UpdateLinks() to new SwDoc::UpdateLinks():
*/
- virtual void UpdateLinks(BOOL bUI) = 0;
+ virtual void UpdateLinks(sal_Bool bUI) = 0;
/** SS fuers Linken von Dokumentteilen / ?? for linking of parts of documents.
*/
diff --git a/sw/inc/IDocumentRedlineAccess.hxx b/sw/inc/IDocumentRedlineAccess.hxx
index 52517e495dfc..ffa24645181b 100644
--- a/sw/inc/IDocumentRedlineAccess.hxx
+++ b/sw/inc/IDocumentRedlineAccess.hxx
@@ -50,7 +50,7 @@
class SwNode;
class String;
-typedef USHORT RedlineMode_t;
+typedef sal_uInt16 RedlineMode_t;
namespace nsRedlineMode_t
{
const RedlineMode_t REDLINE_NONE = 0; // no RedlineMode
@@ -71,7 +71,7 @@ namespace nsRedlineMode_t
const RedlineMode_t REDLINE_DONTCOMBINE_REDLINES = 0x400;
}
-typedef USHORT RedlineType_t;
+typedef sal_uInt16 RedlineType_t;
namespace nsRedlineType_t
{
// Range of RedlineTypes is 0 to 127.
@@ -93,16 +93,16 @@ class IDocumentRedlineAccess
{
// Static helper functions
public:
- static bool IsShowChanges(const USHORT eM)
+ static bool IsShowChanges(const sal_uInt16 eM)
{ return (nsRedlineMode_t::REDLINE_SHOW_INSERT | nsRedlineMode_t::REDLINE_SHOW_DELETE) == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsHideChanges(const USHORT eM)
+ static bool IsHideChanges(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_SHOW_INSERT == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsShowOriginal(const USHORT eM)
+ static bool IsShowOriginal(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_SHOW_DELETE == (eM & nsRedlineMode_t::REDLINE_SHOW_MASK); }
- static bool IsRedlineOn(const USHORT eM)
+ static bool IsRedlineOn(const sal_uInt16 eM)
{ return nsRedlineMode_t::REDLINE_ON == (eM & (nsRedlineMode_t::REDLINE_ON | nsRedlineMode_t::REDLINE_IGNORE )); }
public:
@@ -135,7 +135,7 @@ public:
/** Query if redlining is on.
@returns
- </TRUE> if redlining is on </FALSE> otherwise
+ <TRUE/> if redlining is on <FALSE/> otherwise
*/
virtual bool IsRedlineOn() const = 0;
diff --git a/sw/inc/IDocumentSettingAccess.hxx b/sw/inc/IDocumentSettingAccess.hxx
index 931c2266536d..76e3d977d447 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -89,7 +89,8 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
GLOBAL_DOCUMENT_SAVE_LINKS,
LABEL_DOCUMENT,
PURGE_OLE,
- KERN_ASIAN_PUNCTUATION
+ KERN_ASIAN_PUNCTUATION,
+ MATH_BASELINE_ALIGNMENT
};
public:
@@ -128,7 +129,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
a list of forbidden characters.
*/
virtual const com::sun::star::i18n::ForbiddenCharacters*
- getForbiddenCharacters(/*[in]*/ USHORT nLang, /*[in]*/ bool bLocaleData ) const = 0;
+ getForbiddenCharacters(/*[in]*/ sal_uInt16 nLang, /*[in]*/ bool bLocaleData ) const = 0;
/** Set the forbidden characters.
@@ -138,7 +139,7 @@ namespace com { namespace sun { namespace star { namespace i18n { struct Forbidd
@param rForbiddenCharacters
[in] the new list of forbidden characters for language lang.
*/
- virtual void setForbiddenCharacters(/*[in]*/ USHORT nLang,
+ virtual void setForbiddenCharacters(/*[in]*/ sal_uInt16 nLang,
/*[in]*/ const com::sun::star::i18n::ForbiddenCharacters& rForbiddenCharacters ) = 0;
/** Get the forbidden character table and creates one if necessary.
@@ -209,6 +210,6 @@ protected:
virtual ~IDocumentSettingAccess() {};
};
- #endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
+#endif // IDOCUMENTSETTINGACCESS_HXX_INCLUDED
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/IDocumentUndoRedo.hxx b/sw/inc/IDocumentUndoRedo.hxx
index 38e558668858..33ae7efb8e64 100644
--- a/sw/inc/IDocumentUndoRedo.hxx
+++ b/sw/inc/IDocumentUndoRedo.hxx
@@ -30,51 +30,87 @@
#define IDOCUMENTUNDOREDO_HXX_INCLUDED
#include <sal/types.h>
+
#include <swundo.hxx>
-class SwUndoIter;
class SwRewriter;
-class String;
-class SwUndoIds;
class SwNodes;
class SwUndo;
+namespace sw {
+ class RepeatContext;
+}
+
-typedef sal_uInt16 SwUndoNoModifiedPosition;
/** IDocumentUndoRedo
*/
class IDocumentUndoRedo
{
public:
- virtual void SetUndoNoResetModified() = 0;
- virtual bool IsUndoNoResetModified() const = 0;
-
- /** Care for UndoHistory of document.
- UndoHistory is reset at Save, SaveAs, Create ???
+ /** Enable/Disable Undo.
*/
- virtual void DoUndo(bool bUn) = 0;
+ virtual void DoUndo(bool const bDoUndo) = 0;
+ /** Is Undo enabled?
+ */
virtual bool DoesUndo() const = 0;
- /** Concatenate continuous Insert/Delete/Overwrite of characters.
- Default is ::com::sun::star::sdbcx::Group-Undo.
+ /** Enable/Disable Group Undo.
+ This determines whether successive Insert/Delete/Overwrite
+ actions are combined.
*/
- virtual void DoGroupUndo(bool bUn) = 0;
+ virtual void DoGroupUndo(bool const bDoUndo) = 0;
+ /** Is Group Undo enabled?
+ */
virtual bool DoesGroupUndo() const = 0;
- /* Undo:
- 0 last action, else actions until start of parenthesis nUndoId.
- Restored range is set in rUndoRange.
+ /** Enable/Disable Undo for Drawing objects.
+ */
+ virtual void DoDrawUndo(bool const bDoUndo) = 0;
+
+ /** Is Undo for Drawing objects enabled?
+ for Draw-Undo: writer wants to handle actions on Flys on its own.
+ */
+ virtual bool DoesDrawUndo() const = 0;
+
+ /** Set the position at which the document is in the "unmodified" state
+ to the current position in the Undo stack.
+ */
+ virtual void SetUndoNoModifiedPosition() = 0;
+
+ /** Prevent updates to the "unmodified" state position
+ via SetUndoNoResetModified().
+ */
+ virtual void LockUndoNoModifiedPosition() = 0;
+
+ /** Allow updates to the "unmodified" state position
+ via SetUndoNoResetModified().
*/
- virtual bool Undo( SwUndoIter& ) = 0;
+ virtual void UnLockUndoNoModifiedPosition() = 0;
+
+ /** Disable (re)setting the document modified flag on Undo/Redo.
+ */
+ virtual void SetUndoNoResetModified() = 0;
+
+ /** Is setting the document modified flag on Undo/Redo disabled?
+ */
+ virtual bool IsUndoNoResetModified() const = 0;
+
+ /** Execute Undo.
+
+ @return true if executing the last Undo action was successful.
+ */
+ virtual sal_Bool Undo() = 0;
/** Opens undo block.
- @param nUndoId undo ID for the start object
+ @remark StartUndo() and EndUndo() do nothing if !DoesUndo().
+
+ @param nUndoId undo ID for the list action
@param pRewriter rewriter for comments @see SwUndo::GetComment
If the given nUndoId is equal to zero an undo object with ID
@@ -82,95 +118,168 @@ public:
@return the undo ID of the created object
*/
- virtual SwUndoId StartUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0;
+ virtual SwUndoId StartUndo(SwUndoId const eUndoId,
+ SwRewriter const*const pRewriter) = 0;
/**
Closes undo block.
- @param nUndoId undo ID for the closure object
- @param pRewriter rewriter for comments @see SwUndo::GetComment
+ @remark StartUndo() and EndUndo() do nothing if !DoesUndo().
- If the given nUndoId is equal to zero an undo object with ID
- UNDO_START will be generated.
+ @param nUndoId undo ID for the list action
+ @param pRewriter rewriter for comments @see SwUndo::GetComment
- If pRewriter is not equal to zero the given rewriter will be
- set for the generated closure object and the corresponding
- start object. Otherwise an existent rewriter in theIDocumentRedlineAccess
- corresponding start object will be propagated to the generated
- closure object.
+ If the given nUndoId is not UNDO_EMPTY or UNDO_END, the comment of
+ the resulting list action will be set via the nUndoId, applying the
+ given pRewriter (if not 0). Otherwise the comment of the resulting
+ list action is unchanged if it has an UndoId that is not UNDO_START
+ set by StartUndo, and in case the UndoId is UNDO_START the comment
+ of the list action defaults to the comment of the last action
+ contained in the list action.
*/
- virtual SwUndoId EndUndo( SwUndoId eUndoId, const SwRewriter * pRewriter) = 0;
+ virtual SwUndoId EndUndo(SwUndoId const eUndoId,
+ SwRewriter const*const pRewriter) = 0;
/**
- Deletes all UndoObjects (for methods that do something with the Nodes Array
- without corresponding Undo!)
+ Delete all Undo actions.
+ Of course Undo will be disabled during deletion.
*/
virtual void DelAllUndoObj() = 0;
- /** Returns the ID of the last action that can be undone.
- Alternatively USHRT_MAX is filling VARARR with ::com::sun::star::sdbcx::User-UndoIdDs
+ /** Get Id and comment of last Undo action.
+ @param o_pStr if not 0, receives comment of last Undo action.
+ @param o_pId if not 0, receives Id of last Undo action.
+ @return true if there is a Undo action, false if none
+ */
+ virtual bool GetLastUndoInfo(::rtl::OUString *const o_pStr,
+ SwUndoId *const o_pId) const = 0;
+
+ /** Get comments of Undo actions.
+ @return comments of all top-level Undo actions.
*/
- virtual SwUndoId GetUndoIds(String* pStr, SwUndoIds *pUndoIds) const = 0;
+ virtual SwUndoComments_t GetUndoComments() const = 0;
- virtual String GetUndoIdsStr(String* pStr, SwUndoIds *pUndoIds) const = 0;
+ /** Execute Redo.
- /** Are there parentheses with this ID?
+ @return true if executing the first Redo action was successful.
*/
- virtual bool HasUndoId(SwUndoId eId) const = 0;
+ virtual sal_Bool Redo() = 0;
- /* @@@MAINTAINABILITY-HORROR@@@
- Implementation details made public.
- The following three methods are required only for Undo.
- They should not be called otherwise.
+ /** Get comment of first Redo action.
+ @param o_pStr if not 0, receives comment of first Redo action.
+ @return true if there is a Redo action, false if none
*/
- virtual const SwNodes* GetUndoNds() const = 0;
+ virtual bool GetFirstRedoInfo(::rtl::OUString *const o_pStr) const = 0;
- virtual SwUndo* RemoveLastUndo(SwUndoId eUndoId) = 0;
+ /** Get comments of Redo actions.
+ @return comments of all top-level Redo actions.
+ */
+ virtual SwUndoComments_t GetRedoComments() const = 0;
- /** To prevent an undo array overflow when
- doing nested undos, undo may have to be disabled. Undo-intensive
- actions (like auto-format) should check this manually.
+ /** Repeat the last Undo action.
+ @return true if repeating the last Undo Redo action was attempted.
*/
- virtual bool HasTooManyUndos() const = 0;
+ virtual bool Repeat(::sw::RepeatContext & rContext,
+ sal_uInt16 const nRepeatCnt) = 0;
+
+ /** Get Id and comment of last Undo action, if it is Repeat capable.
+ @param o_pStr if not 0, receives comment of last Undo action
+ if it is Repeat capable.
+ @return Id of last Undo action if it is Repeat capable,
+ or UNDO_EMPTY if there is none or it is not Repeat capable.
+ */
+ virtual SwUndoId GetRepeatInfo(::rtl::OUString *const o_pStr) const = 0;
- virtual bool Redo( SwUndoIter& ) = 0;
+ /** Add new Undo action.
+ Takes over ownership of pUndo.
+ @remark calls ClearRedo(), except for UNDO_START/UNDO_END.
+ @remark does nothing if !DoesUndo().
+ */
+ virtual void AppendUndo(SwUndo *const pUndo) = 0;
- /** Return the ID of the last undoable action.
- Fills VARARR with RedoIds if required.
+ /** Delete all Redo actions.
*/
- virtual SwUndoId GetRedoIds( String* pStr, SwUndoIds *pRedoIds) const = 0;
+ virtual void ClearRedo() = 0;
- virtual String GetRedoIdsStr( String* pStr, SwUndoIds *pRedoIds) const = 0;
+ /* Is the given nodes array the Undo nodes array?
+ */
+ virtual bool IsUndoNodes(SwNodes const& rNodes) const = 0;
- virtual bool Repeat( SwUndoIter&, sal_uInt16 nRepeatCnt) = 0;
+protected:
+ virtual ~IDocumentUndoRedo() {};
+};
- /** Return the ID of the last repeatable action.
- Fills VARARR mit RedoIds if required.
- */
- virtual SwUndoId GetRepeatIds( String* pStr, SwUndoIds *pRedoIds) const = 0;
- virtual String GetRepeatIdsStr( String* pStr, SwUndoIds *pRedoIds) const = 0;
+namespace sw {
- /** Internal shortcut for Insert at end.
- */
- virtual void AppendUndo(SwUndo*) = 0;
+class UndoGuard
+{
+public:
- /** Delete all UndoObjects of nUndoPos until the end of the Undo-Array.
- */
- virtual void ClearRedo() = 0;
+ UndoGuard(IDocumentUndoRedo & rUndoRedo)
+ : m_rUndoRedo(rUndoRedo)
+ , m_bUndoWasEnabled(rUndoRedo.DoesUndo())
+ {
+ m_rUndoRedo.DoUndo(false);
+ }
+ ~UndoGuard()
+ {
+ m_rUndoRedo.DoUndo(m_bUndoWasEnabled);
+ }
+
+ bool UndoWasEnabled() const
+ {
+ return m_bUndoWasEnabled;
+ }
+
+private:
+ IDocumentUndoRedo & m_rUndoRedo;
+ bool const m_bUndoWasEnabled;
+};
- /** Manipulates the position of the undo stack which reset the modified flag
- */
- virtual void setUndoNoModifiedPosition( SwUndoNoModifiedPosition ) = 0;
+class GroupUndoGuard
+{
+public:
- /** Gets the position of the undo stack which reset the modified flag
- */
- virtual SwUndoNoModifiedPosition getUndoNoModifiedPosition() const = 0;
+ GroupUndoGuard(IDocumentUndoRedo & rUndoRedo)
+ : m_rUndoRedo(rUndoRedo)
+ , m_bGroupUndoWasEnabled(rUndoRedo.DoesGroupUndo())
+ {
+ m_rUndoRedo.DoGroupUndo(false);
+ }
+ ~GroupUndoGuard()
+ {
+ m_rUndoRedo.DoGroupUndo(m_bGroupUndoWasEnabled);
+ }
+
+private:
+ IDocumentUndoRedo & m_rUndoRedo;
+ bool const m_bGroupUndoWasEnabled;
+};
-protected:
- virtual ~IDocumentUndoRedo() {};
+class DrawUndoGuard
+{
+public:
+
+ DrawUndoGuard(IDocumentUndoRedo & rUndoRedo)
+ : m_rUndoRedo(rUndoRedo)
+ , m_bDrawUndoWasEnabled(rUndoRedo.DoesDrawUndo())
+ {
+ m_rUndoRedo.DoDrawUndo(false);
+ }
+ ~DrawUndoGuard()
+ {
+ m_rUndoRedo.DoDrawUndo(m_bDrawUndoWasEnabled);
+ }
+
+private:
+ IDocumentUndoRedo & m_rUndoRedo;
+ bool const m_bDrawUndoWasEnabled;
};
+
+} // namespace sw
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/fmtui/fmtui.src b/sw/inc/IShellCursorSupplier.hxx
index 162959f5992d..a160f43d40dd 100644
--- a/sw/source/ui/fmtui/fmtui.src
+++ b/sw/inc/IShellCursorSupplier.hxx
@@ -24,64 +24,28 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include "fmtui.hrc"
-#include "globals.hrc"
-
-String STR_FMT_STD
-{
- Text [ en-US ] = "(none)" ;
-};
-String STR_TEMPLATE_WILDCARD
-{
- TEXT = "*.vor" ;
-};
- //String STR_NONAME //!! VB
- //{
- // TEXT = "Unbenannt ";
- // TEXT [English] = "Noname ";
- // TEXT [norwegian] = "Noname ";
- // TEXT [italian] = "Senza nome";
- // TEXT [portuguese_brazilian] = "Semnome ";
- // TEXT [portuguese] = "Semnome ";
- // TEXT [finnish] = "Nimetön ";
- // TEXT [danish] = "Intet navn";
- // TEXT [french] = "Sansnom ";
- // TEXT [swedish] = "Namnlös";
- // TEXT [dutch] = "Naamloos";
- // TEXT [spanish] = "Sin nombre ";
- // TEXT [english_us] = "Noname ";
- //};
-String STR_OVERWRITE
-{
- Text [ en-US ] = "\nAre you sure you want to delete this template?" ;
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+#ifndef ISHELLCURSORSUPPLIER_HXX
+#define ISHELLCURSORSUPPLIER_HXX
+class SwPaM;
+namespace sw {
+/** The Undo actions need to create new Shell cursors.
+ Just creating new SwPaMs in the Undo actions is not sufficient,
+ because only Shell cursors are corrected by doccorr.cxx.
+ */
+class IShellCursorSupplier
+{
+public:
+ virtual ~IShellCursorSupplier() { }
+ virtual SwPaM & CreateNewShellCursor() = 0;
+ virtual SwPaM & GetCurrentShellCursor() = 0;
+};
+} // namespace sw
+#endif // ISHELLCURSORSUPPLIER_HXX
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 2a3b6d956e13..96c5d74a319e 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -151,7 +151,7 @@ class SwPostItMgr: public SfxListener
SwEditWin* mpEditWin;
std::list< SwSidebarItem*> mvPostItFlds;
std::vector<SwPostItPageItem*> mPages;
- ULONG mnEventId;
+ sal_uLong mnEventId;
bool mbWaitingForCalcRects;
sw::sidebarwindows::SwSidebarWin* mpActivePostIt;
bool mbLayout;
@@ -178,7 +178,7 @@ class SwPostItMgr: public SfxListener
const Rectangle aBorder,
long lNeededHeight);
void CheckForRemovedPostIts();
- bool ArrowEnabled(USHORT aDirection,unsigned long aPage) const;
+ bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const;
bool BorderOverPageBorder(unsigned long aPage) const;
bool HasScrollbars() const;
void Focus(SfxBroadcaster& rBC);
@@ -238,11 +238,11 @@ class SwPostItMgr: public SfxListener
Rectangle GetTopScrollRect(const unsigned long aPage) const;
bool IsHit(const Point &aPointPixel);
- Color GetArrowColor(USHORT aDirection,unsigned long aPage) const;
+ Color GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) const;
sw::annotation::SwAnnotationWin* GetAnnotationWin(const SwPostItField* pFld) const;
- sw::sidebarwindows::SwSidebarWin* GetNextPostIt( USHORT aDirection,
+ sw::sidebarwindows::SwSidebarWin* GetNextPostIt( sal_uInt16 aDirection,
sw::sidebarwindows::SwSidebarWin* aPostIt);
long GetNextBorder();
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 83389d6f0442..24f3fd11cc30 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -98,7 +98,7 @@ class SwSidebarWin : public Window
long GetPostItTextHeight();
- void SwitchToPostIt(USHORT aDirection);
+ void SwitchToPostIt(sal_uInt16 aDirection);
virtual void SwitchToFieldPos();
virtual sal_uInt32 MoveCaret() = 0;
@@ -112,7 +112,7 @@ class SwSidebarWin : public Window
virtual Date GetDate() = 0;
virtual Time GetTime() = 0;
- void ExecuteCommand(USHORT nSlot);
+ void ExecuteCommand(sal_uInt16 nSlot);
void InitControls();
void HidePostIt();
void DoResize();
@@ -130,8 +130,8 @@ class SwSidebarWin : public Window
void ResetAttributes();
void SetSidebarPosition(sw::sidebarwindows::SidebarPosition eSidebarPosition);
- void SetReadonly(BOOL bSet);
- BOOL IsReadOnly() { return mbReadonly;}
+ void SetReadonly(sal_Bool bSet);
+ sal_Bool IsReadOnly() { return mbReadonly;}
bool IsPreview() { return nFlags & PB_Preview;}
void SetColor(Color aColorDark,Color aColorLight, Color aColorAnchor);
@@ -201,7 +201,7 @@ class SwSidebarWin : public Window
SwView& mrView;
const SwPostItBits nFlags;
- ULONG mnEventId;
+ sal_uLong mnEventId;
OutlinerView* mpOutlinerView;
Outliner* mpOutliner;
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index dcd6d2fad7b7..3c936b3a14f9 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -58,12 +58,12 @@ class SwApplet_Impl
String sAlt;
public:
- static USHORT GetOptionType( const String& rName, BOOL bApplet );
- SwApplet_Impl( SfxItemPool& rPool, USHORT nWhich1, USHORT nWhich2 );
+ static sal_uInt16 GetOptionType( const String& rName, sal_Bool bApplet );
+ SwApplet_Impl( SfxItemPool& rPool, sal_uInt16 nWhich1, sal_uInt16 nWhich2 );
SwApplet_Impl( SfxItemSet& rSet ): aItemSet ( rSet) {}
~SwApplet_Impl();
void CreateApplet( const String& rCode, const String& rName,
- BOOL bMayScript, const String& rCodeBase,
+ sal_Bool bMayScript, const String& rCodeBase,
const String& rBaseURL );
#ifdef SOLAR_JAVA
sal_Bool CreateApplet( const String& rBaseURL );
diff --git a/sw/inc/SwGetPoolIdFromName.hxx b/sw/inc/SwGetPoolIdFromName.hxx
index 25e1a4181755..f1f91524530e 100644
--- a/sw/inc/SwGetPoolIdFromName.hxx
+++ b/sw/inc/SwGetPoolIdFromName.hxx
@@ -31,7 +31,7 @@
/* When using the NameMapper to translate pool ids to UI or programmatic
* names, this enum is used to define which family is required */
-typedef USHORT SwGetPoolIdFromName;
+typedef sal_uInt16 SwGetPoolIdFromName;
namespace nsSwGetPoolIdFromName
{
diff --git a/sw/inc/SwRewriter.hxx b/sw/inc/SwRewriter.hxx
index 8de178aac4bb..7e581cfcc854 100644
--- a/sw/inc/SwRewriter.hxx
+++ b/sw/inc/SwRewriter.hxx
@@ -31,6 +31,11 @@
#include <vector>
#include <tools/string.hxx>
+#include <swdllapi.h>
+
+extern SW_DLLPUBLIC String const UNDO_ARG1;
+extern SW_DLLPUBLIC String const UNDO_ARG2;
+extern SW_DLLPUBLIC String const UNDO_ARG3;
typedef std::pair<String, String> SwRewriteRule;
diff --git a/sw/inc/SwUndoField.hxx b/sw/inc/SwUndoField.hxx
index b2d8671a8a8b..dceb43a16c69 100644
--- a/sw/inc/SwUndoField.hxx
+++ b/sw/inc/SwUndoField.hxx
@@ -25,18 +25,21 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _SW_UNDO_FIELD_HXX
-#define _SW_UNDO_FIELD_HXX
+#ifndef SW_UNDO_FIELD_HXX
+#define SW_UNDO_FIELD_HXX
#include <undobj.hxx>
+#include <com/sun/star/uno/Any.h>
+
+
class SwDoc;
class SwField;
class SwMsgPoolItem;
class SwUndoField : public SwUndo
{
- ULONG nNodeIndex;
+ sal_uLong nNodeIndex;
xub_StrLen nOffset;
protected:
@@ -52,37 +55,42 @@ class SwUndoFieldFromDoc : public SwUndoField
{
SwField * pOldField, * pNewField;
SwMsgPoolItem * pHnt;
- BOOL bUpdate;
+ sal_Bool bUpdate;
+
+ void DoImpl();
public:
SwUndoFieldFromDoc(const SwPosition & rPos, const SwField & aOldField,
const SwField & aNewField,
- SwMsgPoolItem * pHnt, BOOL bUpdate,
+ SwMsgPoolItem * pHnt, sal_Bool bUpdate,
SwUndoId nId = UNDO_FIELD );
+
virtual ~SwUndoFieldFromDoc();
- virtual void Undo(SwUndoIter & rIt);
- virtual void Redo(SwUndoIter & rIt);
- virtual void Repeat(SwUndoIter & rIt);
+ virtual void UndoImpl( ::sw::UndoRedoContext & );
+ virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void RepeatImpl( ::sw::RepeatContext & );
};
class SwUndoFieldFromAPI : public SwUndoField
{
com::sun::star::uno::Any aOldVal, aNewVal;
- USHORT nWhich;
+ sal_uInt16 nWhich;
+
+ void DoImpl();
public:
SwUndoFieldFromAPI(const SwPosition & rPos,
const com::sun::star::uno::Any & rOldVal,
const com::sun::star::uno::Any & rNewVal,
- USHORT nWhich);
+ sal_uInt16 nWhich);
virtual ~SwUndoFieldFromAPI();
- virtual void Undo(SwUndoIter & rIt);
- virtual void Redo(SwUndoIter & rIt);
- virtual void Repeat(SwUndoIter & rIt);
+ virtual void UndoImpl( ::sw::UndoRedoContext & );
+ virtual void RedoImpl( ::sw::UndoRedoContext & );
+ virtual void RepeatImpl( ::sw::RepeatContext & );
};
-#endif // _SW_UNDO_FIELD_HXX
+#endif // SW_UNDO_FIELD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/access.hrc b/sw/inc/access.hrc
index b6c6bb30086e..b33b19b814c7 100644
--- a/sw/inc/access.hrc
+++ b/sw/inc/access.hrc
@@ -52,7 +52,20 @@
#define STR_ACCESS_ANNOTATION_BUTTON_NAME (RC_ACCESS_BEGIN + 20)
#define STR_ACCESS_ANNOTATION_BUTTON_DESC (RC_ACCESS_BEGIN + 21)
-#define ACCESS_ACT_END STR_ACCESS_ANNOTATION_BUTTON_DESC
+//IAccessibility2 Implementation 2009-----
+#define STR_ACCESS_PREVIEW_DOC_NAME (RC_ACCESS_BEGIN + 22)
+//#define STR_ACCESS_PREVIEW_DOC_DESC (RC_ACCESS_BEGIN + 23)
+#define STR_ACCESS_PREVIEW_DOC_SUFFIX (RC_ACCESS_BEGIN + 24)
+#define STR_ACCESS_DOC_WORDPROCESSING (RC_ACCESS_BEGIN + 25)
+#define STR_ACCESS_DOC_WORDPROCESSING_READONLY (RC_ACCESS_BEGIN + 26)
+#define STR_ACCESS_COLUMN_WIDTH (RC_ACCESS_BEGIN + 27)
+#define STR_ACCESS_PAGESETUP_SPACING (RC_ACCESS_BEGIN + 28)
+#define STR_ACCESS_SW_CATEGORY (RC_ACCESS_BEGIN + 29)
+#define STR_ACCESS_TL_GLOBAL (RC_ACCESS_BEGIN + 30)
+#define STR_ACCESS_TL_CONTENT (RC_ACCESS_BEGIN + 31)
+//-----IAccessibility2 Implementation 2009
+
+#define ACCESS_ACT_END STR_ACCESS_TL_CONTENT
#if ACCESS_ACT_END > RC_ACCESS_END
#error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 445d0c401e00..ff5c934a89da 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -32,23 +32,23 @@
struct SwAccessibilityOptions
{
- BOOL bIsAlwaysAutoColor :1;
- BOOL bIsStopAnimatedText :1;
- BOOL bIsStopAnimatedGraphics :1;
+ sal_Bool bIsAlwaysAutoColor :1;
+ sal_Bool bIsStopAnimatedText :1;
+ sal_Bool bIsStopAnimatedGraphics :1;
SwAccessibilityOptions() :
- bIsAlwaysAutoColor(FALSE),
- bIsStopAnimatedText(FALSE),
- bIsStopAnimatedGraphics(FALSE) {}
+ bIsAlwaysAutoColor(sal_False),
+ bIsStopAnimatedText(sal_False),
+ bIsStopAnimatedGraphics(sal_False) {}
- inline BOOL IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; }
- inline void SetAlwaysAutoColor( BOOL b ) { bIsAlwaysAutoColor = b; }
+ inline sal_Bool IsAlwaysAutoColor() const { return bIsAlwaysAutoColor; }
+ inline void SetAlwaysAutoColor( sal_Bool b ) { bIsAlwaysAutoColor = b; }
- inline BOOL IsStopAnimatedGraphics() const { return bIsStopAnimatedText;}
- inline void SetStopAnimatedGraphics( BOOL b ) { bIsStopAnimatedText = b; }
+ inline sal_Bool IsStopAnimatedGraphics() const { return bIsStopAnimatedText;}
+ inline void SetStopAnimatedGraphics( sal_Bool b ) { bIsStopAnimatedText = b; }
- inline BOOL IsStopAnimatedText() const { return bIsStopAnimatedGraphics; }
- inline void SetStopAnimatedText( BOOL b ) { bIsStopAnimatedGraphics = b;}
+ inline sal_Bool IsStopAnimatedText() const { return bIsStopAnimatedGraphics; }
+ inline void SetStopAnimatedText( sal_Bool b ) { bIsStopAnimatedGraphics = b;}
};
#endif
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 476e72f8ec81..ad7a0de42414 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -44,27 +44,27 @@ class SwAutoCompleteWord
SvPtrarr aLRULst;
SwAutoCompleteWord_Impl* pImpl;
- USHORT nMaxCount, nMinWrdLen;
+ sal_uInt16 nMaxCount, nMinWrdLen;
bool bLockWordLst;
void DocumentDying(const SwDoc& rDoc);
public:
- SwAutoCompleteWord( USHORT nWords = 500, USHORT nMWrdLen = 10 );
+ SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 );
~SwAutoCompleteWord();
- BOOL InsertWord( const String& rWord, SwDoc& rDoc );
+ sal_Bool InsertWord( const String& rWord, SwDoc& rDoc );
- BOOL GetRange( const String& rWord, USHORT& rStt, USHORT& rEnd ) const;
+ sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd ) const;
- const String& operator[]( USHORT n ) const { return *aWordLst[ n ]; }
+ const String& operator[]( sal_uInt16 n ) const { return *aWordLst[ n ]; }
bool IsLockWordLstLocked() const { return bLockWordLst; }
void SetLockWordLstLocked( bool bFlag ) { bLockWordLst = bFlag; }
- void SetMaxCount( USHORT n );
+ void SetMaxCount( sal_uInt16 n );
- USHORT GetMinWordLen() const { return nMinWrdLen; }
- void SetMinWordLen( USHORT n );
+ sal_uInt16 GetMinWordLen() const { return nMinWrdLen; }
+ void SetMinWordLen( sal_uInt16 n );
const SvStringsISortDtor& GetWordList() const { return aWordLst; }
void CheckChangedList( const SvStringsISortDtor& rNewLst );
diff --git a/sw/inc/authfld.hxx b/sw/inc/authfld.hxx
index 4f95403864d5..ebac43554a44 100644
--- a/sw/inc/authfld.hxx
+++ b/sw/inc/authfld.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _AUTHFLD_HXX
-#define _AUTHFLD_HXX
+#ifndef SW_AUTHFLD_HXX
+#define SW_AUTHFLD_HXX
#include "swdllapi.h"
#include <fldbas.hxx>
@@ -38,11 +38,11 @@ class SwAuthDataArr;
class SwAuthEntry
{
String aAuthFields[AUTH_FIELD_END];
- USHORT nRefCount;
+ sal_uInt16 nRefCount;
public:
SwAuthEntry() : nRefCount(0){}
SwAuthEntry( const SwAuthEntry& rCopy );
- BOOL operator==(const SwAuthEntry& rComp);
+ sal_Bool operator==(const SwAuthEntry& rComp);
inline const String& GetAuthorField(ToxAuthorityField ePos)const;
inline void SetAuthorField(ToxAuthorityField ePos,
@@ -50,16 +50,16 @@ public:
void AddRef() { ++nRefCount; }
void RemoveRef() { --nRefCount; }
- USHORT GetRefCount() { return nRefCount; }
+ sal_uInt16 GetRefCount() { return nRefCount; }
};
struct SwTOXSortKey
{
ToxAuthorityField eField;
- BOOL bSortAscending;
+ sal_Bool bSortAscending;
SwTOXSortKey() :
eField(AUTH_FIELD_END),
- bSortAscending(TRUE){}
+ bSortAscending(sal_True){}
};
class SwAuthorityField;
@@ -73,8 +73,8 @@ class SW_DLLPUBLIC SwAuthorityFieldType : public SwFieldType
SortKeyArr* m_pSortKeyArr;
sal_Unicode m_cPrefix;
sal_Unicode m_cSuffix;
- BOOL m_bIsSequence :1;
- BOOL m_bSortByDocument :1;
+ sal_Bool m_bIsSequence :1;
+ sal_Bool m_bSortByDocument :1;
LanguageType m_eLanguage;
String m_sSortAlgorithm;
@@ -89,14 +89,14 @@ public:
virtual SwFieldType* Copy() const;
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew );
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
inline void SetDoc(SwDoc* pNewDoc) { m_pDoc = pNewDoc; }
SwDoc* GetDoc(){ return m_pDoc; }
void RemoveField(long nHandle);
long AddField(const String& rFieldContents);
- BOOL AddField(long nHandle);
+ sal_Bool AddField(long nHandle);
void DelSequenceArray()
{
m_SequArr.clear();
@@ -109,13 +109,13 @@ public:
bool ChangeEntryContent(const SwAuthEntry* pNewEntry);
// import interface
- USHORT AppendField(const SwAuthEntry& rInsert);
- long GetHandle(USHORT nPos);
+ sal_uInt16 AppendField(const SwAuthEntry& rInsert);
+ long GetHandle(sal_uInt16 nPos);
- USHORT GetSequencePos(long nHandle);
+ sal_uInt16 GetSequencePos(long nHandle);
- BOOL IsSequence() const {return m_bIsSequence;}
- void SetSequence(BOOL bSet)
+ sal_Bool IsSequence() const {return m_bIsSequence;}
+ void SetSequence(sal_Bool bSet)
{
DelSequenceArray();
m_bIsSequence = bSet;
@@ -129,16 +129,16 @@ public:
sal_Unicode GetPrefix() const { return m_cPrefix;}
sal_Unicode GetSuffix() const { return m_cSuffix;}
- BOOL IsSortByDocument() const {return m_bSortByDocument;}
- void SetSortByDocument(BOOL bSet)
+ sal_Bool IsSortByDocument() const {return m_bSortByDocument;}
+ void SetSortByDocument(sal_Bool bSet)
{
DelSequenceArray();
m_bSortByDocument = bSet;
}
- USHORT GetSortKeyCount() const ;
- const SwTOXSortKey* GetSortKey(USHORT nIdx) const ;
- void SetSortKeys(USHORT nKeyCount, SwTOXSortKey nKeys[]);
+ sal_uInt16 GetSortKeyCount() const ;
+ const SwTOXSortKey* GetSortKey(sal_uInt16 nIdx) const ;
+ void SetSortKeys(sal_uInt16 nKeyCount, SwTOXSortKey nKeys[]);
//initui.cxx
static const String& GetAuthFieldName(ToxAuthorityField eType);
@@ -156,6 +156,10 @@ class SwAuthorityField : public SwField
{
long m_nHandle;
mutable long m_nTempSequencePos;
+
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
+
public:
SwAuthorityField(SwAuthorityFieldType* pType, const String& rFieldContents);
SwAuthorityField(SwAuthorityFieldType* pType, long nHandle);
@@ -163,13 +167,11 @@ public:
const String& GetFieldText(ToxAuthorityField eField) const;
- virtual String Expand() const;
- virtual SwField* Copy() const;
virtual void SetPar1(const String& rStr);
virtual SwFieldType* ChgTyp( SwFieldType* );
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhichId ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhichId );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhichId );
long GetHandle() const { return m_nHandle; }
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 7c369a6acecc..b4a3e0dde9b4 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -38,13 +38,13 @@
class SW_DLLPUBLIC AuthorCharAttr
{
public:
- USHORT nItemId;
- USHORT nAttr;
+ sal_uInt16 nItemId;
+ sal_uInt16 nAttr;
ColorData nColor;
AuthorCharAttr();
- inline BOOL operator == ( const AuthorCharAttr& rAttr ) const
+ inline sal_Bool operator == ( const AuthorCharAttr& rAttr ) const
{
return nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
nColor == rAttr.nColor;
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 32f4e751b5e3..236cc46fc1d0 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -40,19 +40,19 @@ class BigPtrEntry
{
friend class BigPtrArray;
BlockInfo* pBlock;
- USHORT nOffset;
+ sal_uInt16 nOffset;
public:
virtual ~BigPtrEntry() {}
protected:
BigPtrEntry() : pBlock(0), nOffset(0) {}
- inline ULONG GetPos() const;
+ inline sal_uLong GetPos() const;
inline BigPtrArray& GetArray() const;
};
typedef BigPtrEntry* ElementPtr;
-typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
+typedef sal_Bool (*FnForEach)( const ElementPtr&, void* pArgs );
// 1000 entries per Block = a bit less then 4K
#define MAXENTRY 1000
@@ -67,52 +67,51 @@ typedef BOOL (*FnForEach)( const ElementPtr&, void* pArgs );
struct BlockInfo { // block info:
BigPtrArray* pBigArr; // in this array the block is located
ElementPtr* pData; // data block
- ULONG nStart, nEnd; // start- and end index
- USHORT nElem; // number of elements
+ sal_uLong nStart, nEnd; // start- and end index
+ sal_uInt16 nElem; // number of elements
};
class SW_DLLPUBLIC BigPtrArray
{
BlockInfo** ppInf; // block info
- ULONG nSize; // number of elements
- USHORT nMaxBlock; // current max. number of blocks
- USHORT nBlock; // number of blocks
- USHORT nCur; // last block
+ sal_uLong nSize; // number of elements
+ sal_uInt16 nMaxBlock; // current max. number of blocks
+ sal_uInt16 nBlock; // number of blocks
+ sal_uInt16 nCur; // last block
- USHORT Index2Block( ULONG ) const; // block search
- BlockInfo* InsBlock( USHORT ); // insert block
- void BlockDel( USHORT ); // some blocks were deleted
- void UpdIndex( USHORT ); // recalculate indices
+ sal_uInt16 Index2Block( sal_uLong ) const; // block search
+ BlockInfo* InsBlock( sal_uInt16 ); // insert block
+ void BlockDel( sal_uInt16 ); // some blocks were deleted
+ void UpdIndex( sal_uInt16 ); // recalculate indices
protected:
// fill all blocks
// the short parameter specifies in percent, how full the blocks should be
// made
- // the return value specifies that something was done
- USHORT Compress( short = COMPRESSLVL );
+ sal_uInt16 Compress( short = COMPRESSLVL );
public:
BigPtrArray();
~BigPtrArray();
- ULONG Count() const { return nSize; }
+ sal_uLong Count() const { return nSize; }
- void Insert( const ElementPtr& r, ULONG pos );
- void Remove( ULONG pos, ULONG n = 1 );
- void Move( ULONG from, ULONG to );
- void Replace( ULONG pos, const ElementPtr& r);
+ void Insert( const ElementPtr& r, sal_uLong pos );
+ void Remove( sal_uLong pos, sal_uLong n = 1 );
+ void Move( sal_uLong from, sal_uLong to );
+ void Replace( sal_uLong pos, const ElementPtr& r);
- ElementPtr operator[]( ULONG ) const;
+ ElementPtr operator[]( sal_uLong ) const;
void ForEach( FnForEach fn, void* pArgs = NULL )
{
ForEach( 0, nSize, fn, pArgs );
}
- void ForEach( ULONG nStart, ULONG nEnd, FnForEach fn, void* pArgs = NULL );
+ void ForEach( sal_uLong nStart, sal_uLong nEnd, FnForEach fn, void* pArgs = NULL );
};
-inline ULONG BigPtrEntry::GetPos() const
+inline sal_uLong BigPtrEntry::GetPos() const
{
DBG_ASSERT( this == pBlock->pData[ nOffset ], "element not in the block" );
return pBlock->nStart + nOffset;
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index ac95208423e1..ae05468aa16b 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -109,8 +109,8 @@ public:
return *m_pForbidden;
}
- USHORT GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const;
- USHORT GetAllScriptsOfText( const String& rTxt ) const;
+ sal_uInt16 GetRealScriptOfText( const String& rTxt, xub_StrLen nPos ) const;
+ sal_uInt16 GetAllScriptsOfText( const String& rTxt ) const;
};
#define SW_BREAKITER() SwBreakIt::Get()
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index cf39c2518b81..e778e0366007 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -62,16 +62,16 @@ class SW_DLLPUBLIC SwClient
friend class SwClientIter;
SwClient *pLeft, *pRight; // for AVL sorting
- BOOL bModifyLocked : 1; // used in SwModify::Modify,
+ sal_Bool bModifyLocked : 1; // used in SwModify::Modify,
// is really a member of SwModify
// but here for lack of space
- BOOL bInModify : 1; // is in a modify. (Debug!!!)
- BOOL bInDocDTOR : 1; // Doc gets destroyed,
+ sal_Bool bInModify : 1; // is in a modify. (Debug!!!)
+ sal_Bool bInDocDTOR : 1; // Doc gets destroyed,
// do not "unsubscribe"
- BOOL bInCache : 1; // is in BorderAttrCache of the layout,
+ sal_Bool bInCache : 1; // is in BorderAttrCache of the layout,
// unsubscribes itself then in Modify!
- BOOL bInSwFntCache : 1; // is in SwFont cache of the formatting
+ sal_Bool bInSwFntCache : 1; // is in SwFont cache of the formatting
protected:
SwModify *pRegisteredIn;
@@ -90,17 +90,17 @@ public:
//casted typesafely via the dependency list of a Modify
TYPEINFO();
- void LockModify() { bModifyLocked = TRUE; }
- void UnlockModify() { bModifyLocked = FALSE; }
- void SetInCache( BOOL bNew ) { bInCache = bNew; }
- void SetInSwFntCache( BOOL bNew ) { bInSwFntCache = bNew; }
- BOOL IsModifyLocked() const { return bModifyLocked; }
- BOOL IsInDocDTOR() const { return bInDocDTOR; }
- BOOL IsInCache() const { return bInCache; }
- BOOL IsInSwFntCache() const { return bInSwFntCache; }
+ void LockModify() { bModifyLocked = sal_True; }
+ void UnlockModify() { bModifyLocked = sal_False; }
+ void SetInCache( sal_Bool bNew ) { bInCache = bNew; }
+ void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; }
+ sal_Bool IsModifyLocked() const { return bModifyLocked; }
+ sal_Bool IsInDocDTOR() const { return bInDocDTOR; }
+ sal_Bool IsInCache() const { return bInCache; }
+ sal_Bool IsInSwFntCache() const { return bInSwFntCache; }
// get client Information
- virtual BOOL GetInfo( SfxPoolItem& ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& ) const;
private:
SwClient( const SwClient& );
@@ -109,7 +109,7 @@ private:
inline SwClient::SwClient() :
pLeft(0), pRight(0), pRegisteredIn(0)
-{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = FALSE; }
+{ bModifyLocked = bInModify = bInDocDTOR = bInCache = bInSwFntCache = sal_False; }
// ----------
@@ -142,13 +142,13 @@ public:
const SwClient* GetDepends() const { return pRoot; }
// get client information
- virtual BOOL GetInfo( SfxPoolItem& ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem& ) const;
- void SetInDocDTOR() { bInDocDTOR = TRUE; }
+ void SetInDocDTOR() { bInDocDTOR = sal_True; }
- void CheckCaching( const USHORT nWhich );
+ void CheckCaching( const sal_uInt16 nWhich );
- BOOL IsLastDepend() const
+ sal_Bool IsLastDepend() const
{ return pRoot && !pRoot->pLeft && !pRoot->pRight; }
private:
@@ -183,7 +183,7 @@ public:
virtual void Modify( SfxPoolItem *pOldValue, SfxPoolItem *pNewValue );
// get Client information
- virtual BOOL GetInfo( SfxPoolItem & ) const;
+ virtual sal_Bool GetInfo( SfxPoolItem & ) const;
private:
// forbidden and not implemented (see @ SwClient).
diff --git a/sw/inc/calc.hxx b/sw/inc/calc.hxx
index 0e13c010d418..69ab36a84e38 100644
--- a/sw/inc/calc.hxx
+++ b/sw/inc/calc.hxx
@@ -131,7 +131,7 @@ public:
virtual ~SwSbxValue();
- BOOL GetBool() const;
+ sal_Bool GetBool() const;
double GetDouble() const;
SwSbxValue& MakeDouble();
@@ -160,9 +160,9 @@ struct SwCalcExp : public SwHash
};
SwHash* Find( const String& rSrch, SwHash** ppTable,
- USHORT nTblSize, USHORT* pPos = 0 );
+ sal_uInt16 nTblSize, sal_uInt16* pPos = 0 );
-void DeleteHashTable( SwHash** ppTable, USHORT nTblSize );
+void DeleteHashTable( SwHash** ppTable, sal_uInt16 nTblSize );
// if _CalcOp != 0, this is a valid operator
struct _CalcOp;
@@ -187,7 +187,7 @@ class SwCalc
const LocaleDataWrapper* pLclData;
CharClass* pCharClass;
- USHORT nListPor;
+ sal_uInt16 nListPor;
SwCalcOper eCurrOper;
SwCalcOper eCurrListOper;
SwCalcError eError;
@@ -198,7 +198,7 @@ class SwCalc
SwSbxValue Term();
SwSbxValue Prim();
- BOOL ParseTime( USHORT*, USHORT*, USHORT* );
+ sal_Bool ParseTime( sal_uInt16*, sal_uInt16*, sal_uInt16* );
String GetColumnName( const String& rName );
String GetDBName( const String& rName );
@@ -212,20 +212,20 @@ public:
~SwCalc();
SwSbxValue Calculate( const String &rStr );
- String GetStrResult( const SwSbxValue& rValue, BOOL bRound = TRUE );
- String GetStrResult( double, BOOL bRound = TRUE );
+ String GetStrResult( const SwSbxValue& rValue, sal_Bool bRound = sal_True );
+ String GetStrResult( double, sal_Bool bRound = sal_True );
SwCalcExp* VarInsert( const String& r );
- SwCalcExp* VarLook( const String &rStr, USHORT ins = 0 );
+ SwCalcExp* VarLook( const String &rStr, sal_uInt16 ins = 0 );
void VarChange( const String& rStr, const SwSbxValue& rValue );
void VarChange( const String& rStr, double );
SwHash** GetVarTable() { return VarTable; }
- BOOL Push( const VoidPtr pPtr );
+ sal_Bool Push( const VoidPtr pPtr );
void Pop( const VoidPtr pPtr );
void SetCalcError( SwCalcError eErr ) { eError = eErr; }
- BOOL IsCalcError() const { return 0 != eError; }
+ sal_Bool IsCalcError() const { return 0 != eError; }
static bool Str2Double( const String& rStr, xub_StrLen& rPos,
double& rVal,
@@ -233,7 +233,7 @@ public:
static bool Str2Double( const String& rStr, xub_StrLen& rPos,
double& rVal, SwDoc *const pDoc );
- SW_DLLPUBLIC static BOOL IsValidVarName( const String& rStr,
+ SW_DLLPUBLIC static sal_Bool IsValidVarName( const String& rStr,
String* pValidName = 0 );
};
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index 5a44c3a2bc5e..35ea265e13d1 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -47,8 +47,8 @@
//***********************************************************
struct CollName {
- ULONG nCnd;
- ULONG nSubCond;
+ sal_uLong nCnd;
+ sal_uLong nSubCond;
};
//***********************************************************
@@ -57,8 +57,8 @@ struct CollName {
struct CommandStruct
{
- ULONG nCnd;
- ULONG nSubCond;
+ sal_uLong nCnd;
+ sal_uLong nSubCond;
};
//***********************************************************
@@ -75,7 +75,7 @@ class SW_DLLPUBLIC SwCondCollItem : public SfxPoolItem
String sStyles[COND_COMMAND_COUNT];
public:
- SwCondCollItem(USHORT nWhich = FN_COND_COLL);
+ SwCondCollItem(sal_uInt16 nWhich = FN_COND_COLL);
~SwCondCollItem();
TYPEINFO();
@@ -85,8 +85,8 @@ public:
static const CommandStruct* GetCmds();
- const String& GetStyle(USHORT nPos) const;
- void SetStyle( const String* pStyle, USHORT nPos);
+ const String& GetStyle(sal_uInt16 nPos) const;
+ void SetStyle( const String* pStyle, sal_uInt16 nPos);
};
diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index b899c2573780..e081375a5495 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -37,10 +37,10 @@
class SW_DLLPUBLIC SwTblBoxNumFormat : public SfxUInt32Item
{
- BOOL bAuto; // automatically given flag
+ sal_Bool bAuto; // automatically given flag
public:
- SwTblBoxNumFormat( UINT32 nFormat = NUMBERFORMAT_TEXT,
- BOOL bAuto = FALSE );
+ SwTblBoxNumFormat( sal_uInt32 nFormat = NUMBERFORMAT_TEXT,
+ sal_Bool bAuto = sal_False );
// "pure virtual methods" of SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
@@ -53,8 +53,8 @@ public:
return *this;
}
- BOOL GetAutoFlag() const { return bAuto; }
- void SetAutoFlag( BOOL bFlag = TRUE ) { bAuto = bFlag; }
+ sal_Bool GetAutoFlag() const { return bAuto; }
+ void SetAutoFlag( sal_Bool bFlag = sal_True ) { bAuto = bFlag; }
};
class SwTblBoxFormula : public SfxPoolItem, public SwTableFormula
@@ -107,20 +107,20 @@ public:
//***************************************************************************
-inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(BOOL bInP) const
+inline const SwTblBoxNumFormat &SwAttrSet::GetTblBoxNumFmt(sal_Bool bInP) const
{ return (const SwTblBoxNumFormat&)Get( RES_BOXATR_FORMAT,bInP); }
-inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwAttrSet::GetTblBoxFormula(sal_Bool bInP) const
{ return (const SwTblBoxFormula&)Get( RES_BOXATR_FORMULA,bInP); }
-inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwAttrSet::GetTblBoxValue(sal_Bool bInP) const
{ return (const SwTblBoxValue&)Get( RES_BOXATR_VALUE, bInP); }
//***************************************************************************
-inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(BOOL bInP) const
+inline const SwTblBoxNumFormat &SwFmt::GetTblBoxNumFmt(sal_Bool bInP) const
{ return aSet.GetTblBoxNumFmt(bInP); }
-inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(BOOL bInP) const
+inline const SwTblBoxFormula &SwFmt::GetTblBoxFormula(sal_Bool bInP) const
{ return aSet.GetTblBoxFormula(bInP); }
-inline const SwTblBoxValue &SwFmt::GetTblBoxValue(BOOL bInP) const
+inline const SwTblBoxValue &SwFmt::GetTblBoxValue(sal_Bool bInP) const
{ return aSet.GetTblBoxValue(bInP); }
#endif
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index e806e215d5d4..3a8566f14ecc 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -44,7 +44,7 @@ class String;
class SwTblCalcPara
{
const SwTableBox* pLastTblBox;
- USHORT nStackCnt, nMaxSize;
+ sal_uInt16 nStackCnt, nMaxSize;
public:
SwTableSortBoxes *pBoxStk; // stack for recognizing recursion
@@ -54,9 +54,9 @@ public:
SwTblCalcPara( SwCalc& rCalculator, const SwTable& rTable );
~SwTblCalcPara();
- bool CalcWithStackOverflow();
- bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
- bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
+ sal_Bool CalcWithStackOverflow();
+ sal_Bool IsStackOverFlow() const { return nMaxSize == nStackCnt; }
+ sal_Bool IncStackCnt() { return nMaxSize == ++nStackCnt; }
void DecStackCnt() { if( nStackCnt ) --nStackCnt; }
void SetLastTblBox( const SwTableBox* pBox ) { pLastTblBox = pBox; }
};
@@ -99,7 +99,7 @@ protected:
String sFormel; // current formula
NameType eNmType; // current display method
- bool bValidValue; // TRUE: recalculate formula
+ sal_Bool bValidValue; // sal_True: recalculate formula
// find the node in which the formula is located
// TextFeld -> TextNode,
@@ -115,7 +115,7 @@ protected:
*rCalcPara.pTbl, &rCalcPara );
}
- static USHORT GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
+ static sal_uInt16 GetLnPosInTbl( const SwTable& rTbl, const SwTableBox* pBox );
public:
@@ -152,7 +152,7 @@ public:
eNmType = EXTRNL_NAME;
}
- USHORT GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
+ sal_uInt16 GetBoxesOfFormula( const SwTable& rTbl, SwSelBoxes& rBoxes );
// are all boxes valid which this formula relies on?
bool HasValidBoxes() const;
};
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 5e4a397ea648..ed45ed922c46 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -34,140 +34,140 @@
// implementation of the character attribute methods of SwAttrSet
-inline const SvxPostureItem &SwAttrSet::GetPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_POSTURE,bInP); }
-inline const SvxPostureItem &SwAttrSet::GetCJKPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetCJKPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_CJK_POSTURE,bInP); }
-inline const SvxPostureItem &SwAttrSet::GetCTLPosture(BOOL bInP) const
+inline const SvxPostureItem &SwAttrSet::GetCTLPosture(sal_Bool bInP) const
{ return (const SvxPostureItem&)Get( RES_CHRATR_CTL_POSTURE,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_WEIGHT,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetCJKWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetCJKWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_CJK_WEIGHT,bInP); }
-inline const SvxWeightItem &SwAttrSet::GetCTLWeight(BOOL bInP) const
+inline const SvxWeightItem &SwAttrSet::GetCTLWeight(sal_Bool bInP) const
{ return (const SvxWeightItem&)Get( RES_CHRATR_CTL_WEIGHT,bInP); }
-inline const SvxShadowedItem &SwAttrSet::GetShadowed(BOOL bInP) const
+inline const SvxShadowedItem &SwAttrSet::GetShadowed(sal_Bool bInP) const
{ return (const SvxShadowedItem&)Get( RES_CHRATR_SHADOWED,bInP); }
-inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(BOOL bInP) const
+inline const SvxAutoKernItem &SwAttrSet::GetAutoKern(sal_Bool bInP) const
{ return (const SvxAutoKernItem&)Get( RES_CHRATR_AUTOKERN,bInP); }
-inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(BOOL bInP) const
+inline const SvxWordLineModeItem &SwAttrSet::GetWordLineMode(sal_Bool bInP) const
{ return (const SvxWordLineModeItem&)Get( RES_CHRATR_WORDLINEMODE,bInP); }
-inline const SvxContourItem &SwAttrSet::GetContour(BOOL bInP) const
+inline const SvxContourItem &SwAttrSet::GetContour(sal_Bool bInP) const
{ return (const SvxContourItem&)Get( RES_CHRATR_CONTOUR,bInP); }
-inline const SvxKerningItem &SwAttrSet::GetKerning(BOOL bInP) const
+inline const SvxKerningItem &SwAttrSet::GetKerning(sal_Bool bInP) const
{ return (const SvxKerningItem&)Get( RES_CHRATR_KERNING,bInP); }
-inline const SvxUnderlineItem &SwAttrSet::GetUnderline(BOOL bInP) const
+inline const SvxUnderlineItem &SwAttrSet::GetUnderline(sal_Bool bInP) const
{ return (const SvxUnderlineItem&)Get( RES_CHRATR_UNDERLINE,bInP); }
-inline const SvxOverlineItem &SwAttrSet::GetOverline(BOOL bInP) const
+inline const SvxOverlineItem &SwAttrSet::GetOverline(sal_Bool bInP) const
{ return (const SvxOverlineItem&)Get( RES_CHRATR_OVERLINE,bInP); }
-inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(BOOL bInP) const
+inline const SvxCrossedOutItem &SwAttrSet::GetCrossedOut(sal_Bool bInP) const
{ return (const SvxCrossedOutItem&)Get( RES_CHRATR_CROSSEDOUT,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_FONTSIZE,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetCJKSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CJK_FONTSIZE,bInP); }
-inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwAttrSet::GetCTLSize(sal_Bool bInP) const
{ return (const SvxFontHeightItem&)Get( RES_CHRATR_CTL_FONTSIZE,bInP); }
-inline const SvxPropSizeItem &SwAttrSet::GetPropSize(BOOL bInP) const
+inline const SvxPropSizeItem &SwAttrSet::GetPropSize(sal_Bool bInP) const
{ return (const SvxPropSizeItem&)Get( RES_CHRATR_PROPORTIONALFONTSIZE,bInP); }
-inline const SvxFontItem &SwAttrSet::GetFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_FONT,bInP); }
-inline const SvxFontItem &SwAttrSet::GetCJKFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetCJKFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CJK_FONT,bInP); }
-inline const SvxFontItem &SwAttrSet::GetCTLFont(BOOL bInP) const
+inline const SvxFontItem &SwAttrSet::GetCTLFont(sal_Bool bInP) const
{ return (const SvxFontItem&)Get( RES_CHRATR_CTL_FONT,bInP); }
-inline const SvxColorItem &SwAttrSet::GetColor(BOOL bInP) const
+inline const SvxColorItem &SwAttrSet::GetColor(sal_Bool bInP) const
{ return (const SvxColorItem&)Get( RES_CHRATR_COLOR,bInP); }
-inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(BOOL bInP) const
+inline const SvxCharSetColorItem &SwAttrSet::GetCharSetColor(sal_Bool bInP) const
{ return (const SvxCharSetColorItem&)Get( RES_CHRATR_CHARSETCOLOR,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_LANGUAGE,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetCJKLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_CJK_LANGUAGE,bInP); }
-inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwAttrSet::GetCTLLanguage(sal_Bool bInP) const
{ return (const SvxLanguageItem&)Get( RES_CHRATR_CTL_LANGUAGE,bInP); }
-inline const SvxEscapementItem &SwAttrSet::GetEscapement(BOOL bInP) const
+inline const SvxEscapementItem &SwAttrSet::GetEscapement(sal_Bool bInP) const
{ return (const SvxEscapementItem&)Get( RES_CHRATR_ESCAPEMENT,bInP); }
-inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem &SwAttrSet::GetCaseMap(sal_Bool bInP) const
{ return (const SvxCaseMapItem&)Get( RES_CHRATR_CASEMAP,bInP); }
-inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem &SwAttrSet::GetNoHyphenHere(sal_Bool bInP) const
{ return (const SvxNoHyphenItem&)Get( RES_CHRATR_NOHYPHEN,bInP); }
-inline const SvxBlinkItem &SwAttrSet::GetBlink(BOOL bInP) const
+inline const SvxBlinkItem &SwAttrSet::GetBlink(sal_Bool bInP) const
{ return (const SvxBlinkItem&)Get( RES_CHRATR_BLINK,bInP); }
-inline const SvxBrushItem &SwAttrSet::GetChrBackground( BOOL bInP ) const
+inline const SvxBrushItem &SwAttrSet::GetChrBackground( sal_Bool bInP ) const
{ return (const SvxBrushItem&)Get( RES_CHRATR_BACKGROUND, bInP ); }
-inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( BOOL bInP ) const
+inline const SvxEmphasisMarkItem &SwAttrSet::GetEmphasisMark( sal_Bool bInP ) const
{ return (const SvxEmphasisMarkItem&)Get( RES_CHRATR_EMPHASIS_MARK, bInP ); }
-inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem &SwAttrSet::Get2Lines( sal_Bool bInP ) const
{ return (const SvxTwoLinesItem&)Get( RES_CHRATR_TWO_LINES, bInP ); }
-inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( BOOL bInP ) const
+inline const SvxCharScaleWidthItem &SwAttrSet::GetCharScaleW( sal_Bool bInP ) const
{ return (const SvxCharScaleWidthItem&)Get( RES_CHRATR_SCALEW, bInP ); }
-inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( BOOL bInP ) const
+inline const SvxCharRotateItem &SwAttrSet::GetCharRotate( sal_Bool bInP ) const
{ return (const SvxCharRotateItem&)Get( RES_CHRATR_ROTATE, bInP ); }
-inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( BOOL bInP ) const
+inline const SvxCharReliefItem &SwAttrSet::GetCharRelief( sal_Bool bInP ) const
{ return (const SvxCharReliefItem&)Get( RES_CHRATR_RELIEF, bInP ); }
-inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( BOOL bInP ) const
+inline const SvxCharHiddenItem &SwAttrSet::GetCharHidden( sal_Bool bInP ) const
{ return (const SvxCharHiddenItem&)Get( RES_CHRATR_HIDDEN, bInP ); }
// implementation of the character attribute methods of SwFmt
-inline const SvxPostureItem &SwFmt::GetPosture(BOOL bInP) const
+inline const SvxPostureItem &SwFmt::GetPosture(sal_Bool bInP) const
{ return aSet.GetPosture(bInP); }
-inline const SvxWeightItem &SwFmt::GetWeight(BOOL bInP) const
+inline const SvxWeightItem &SwFmt::GetWeight(sal_Bool bInP) const
{ return aSet.GetWeight(bInP); }
-inline const SvxShadowedItem &SwFmt::GetShadowed(BOOL bInP) const
+inline const SvxShadowedItem &SwFmt::GetShadowed(sal_Bool bInP) const
{ return aSet.GetShadowed(bInP); }
-inline const SvxAutoKernItem &SwFmt::GetAutoKern(BOOL bInP) const
+inline const SvxAutoKernItem &SwFmt::GetAutoKern(sal_Bool bInP) const
{ return aSet.GetAutoKern(bInP); }
-inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(BOOL bInP) const
+inline const SvxWordLineModeItem &SwFmt::GetWordLineMode(sal_Bool bInP) const
{ return aSet.GetWordLineMode(bInP); }
-inline const SvxContourItem &SwFmt::GetContour(BOOL bInP) const
+inline const SvxContourItem &SwFmt::GetContour(sal_Bool bInP) const
{ return aSet.GetContour(bInP); }
-inline const SvxKerningItem &SwFmt::GetKerning(BOOL bInP) const
+inline const SvxKerningItem &SwFmt::GetKerning(sal_Bool bInP) const
{ return aSet.GetKerning(bInP); }
-inline const SvxUnderlineItem &SwFmt::GetUnderline(BOOL bInP) const
+inline const SvxUnderlineItem &SwFmt::GetUnderline(sal_Bool bInP) const
{ return aSet.GetUnderline(bInP); }
-inline const SvxOverlineItem &SwFmt::GetOverline(BOOL bInP) const
+inline const SvxOverlineItem &SwFmt::GetOverline(sal_Bool bInP) const
{ return aSet.GetOverline(bInP); }
-inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(BOOL bInP) const
+inline const SvxCrossedOutItem &SwFmt::GetCrossedOut(sal_Bool bInP) const
{ return aSet.GetCrossedOut(bInP); }
-inline const SvxFontHeightItem &SwFmt::GetSize(BOOL bInP) const
+inline const SvxFontHeightItem &SwFmt::GetSize(sal_Bool bInP) const
{ return aSet.GetSize(bInP); }
-inline const SvxPropSizeItem &SwFmt::GetPropSize(BOOL bInP) const
+inline const SvxPropSizeItem &SwFmt::GetPropSize(sal_Bool bInP) const
{ return aSet.GetPropSize(bInP); }
-inline const SvxFontItem &SwFmt::GetFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetFont(sal_Bool bInP) const
{ return aSet.GetFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCJKFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetCJKFont(sal_Bool bInP) const
{ return aSet.GetCJKFont(bInP); }
-inline const SvxFontItem &SwFmt::GetCTLFont(BOOL bInP) const
+inline const SvxFontItem &SwFmt::GetCTLFont(sal_Bool bInP) const
{ return aSet.GetCTLFont(bInP); }
-inline const SvxColorItem &SwFmt::GetColor(BOOL bInP) const
+inline const SvxColorItem &SwFmt::GetColor(sal_Bool bInP) const
{ return aSet.GetColor(bInP); }
- inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(BOOL bInP) const
+ inline const SvxCharSetColorItem &SwFmt::GetCharSetColor(sal_Bool bInP) const
{ return aSet.GetCharSetColor(bInP); }
-inline const SvxLanguageItem &SwFmt::GetLanguage(BOOL bInP) const
+inline const SvxLanguageItem &SwFmt::GetLanguage(sal_Bool bInP) const
{ return aSet.GetLanguage(bInP); }
-inline const SvxEscapementItem &SwFmt::GetEscapement(BOOL bInP) const
+inline const SvxEscapementItem &SwFmt::GetEscapement(sal_Bool bInP) const
{ return aSet.GetEscapement(bInP); }
-inline const SvxCaseMapItem &SwFmt::GetCaseMap(BOOL bInP) const
+inline const SvxCaseMapItem &SwFmt::GetCaseMap(sal_Bool bInP) const
{ return aSet.GetCaseMap(bInP); }
-inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(BOOL bInP) const
+inline const SvxNoHyphenItem &SwFmt::GetNoHyphenHere(sal_Bool bInP) const
{ return aSet.GetNoHyphenHere(bInP); }
-inline const SvxBlinkItem &SwFmt::GetBlink(BOOL bInP) const
+inline const SvxBlinkItem &SwFmt::GetBlink(sal_Bool bInP) const
{ return aSet.GetBlink(bInP); }
-inline const SvxBrushItem &SwFmt::GetChrBackground(BOOL bInP) const
+inline const SvxBrushItem &SwFmt::GetChrBackground(sal_Bool bInP) const
{ return aSet.GetChrBackground(bInP); }
-inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( BOOL bInP ) const
+inline const SvxEmphasisMarkItem &SwFmt::GetEmphasisMark( sal_Bool bInP ) const
{ return aSet.GetEmphasisMark(bInP); }
-inline const SvxTwoLinesItem &SwFmt::Get2Lines( BOOL bInP ) const
+inline const SvxTwoLinesItem &SwFmt::Get2Lines( sal_Bool bInP ) const
{ return aSet.Get2Lines(bInP); }
-inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( BOOL bInP ) const
+inline const SvxCharScaleWidthItem &SwFmt::GetCharScaleW( sal_Bool bInP ) const
{ return aSet.GetCharScaleW(bInP); }
-inline const SvxCharRotateItem &SwFmt::GetCharRotate( BOOL bInP ) const
+inline const SvxCharRotateItem &SwFmt::GetCharRotate( sal_Bool bInP ) const
{ return aSet.GetCharRotate(bInP); }
-inline const SvxCharReliefItem &SwFmt::GetCharRelief( BOOL bInP ) const
+inline const SvxCharReliefItem &SwFmt::GetCharRelief( sal_Bool bInP ) const
{ return aSet.GetCharRelief(bInP); }
-inline const SvxCharHiddenItem &SwFmt::GetCharHidden( BOOL bInP ) const
+inline const SvxCharHiddenItem &SwFmt::GetCharHidden( sal_Bool bInP ) const
{ return aSet.GetCharHidden(bInP); }
#endif
diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index 2708b1770cae..f40029d7290b 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -52,8 +52,8 @@ public:
namespace CharFmt
{
extern const SfxItemSet* GetItemSet( const SfxPoolItem& rAttr );
- extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, USHORT nWhich );
- extern BOOL IsItemIncluded( const USHORT nWhich, const SwTxtAttr *pAttr );
+ extern const SfxPoolItem* GetItem( const SwTxtAttr& rAttr, sal_uInt16 nWhich );
+ extern sal_Bool IsItemIncluded( const sal_uInt16 nWhich, const SwTxtAttr *pAttr );
}
#endif
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index d4f0c2a7bb76..cf45a3412569 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _CHPFLD_HXX
-#define _CHPFLD_HXX
+#ifndef SW_CHPFLD_HXX
+#define SW_CHPFLD_HXX
#include "fldbas.hxx"
@@ -59,34 +59,35 @@ public:
class SW_DLLPUBLIC SwChapterField : public SwField
{
friend class SwChapterFieldType;
- BYTE nLevel;
+ sal_uInt8 nLevel;
String sTitle, sNumber, sPre, sPost;
+
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
+
public:
SwChapterField(SwChapterFieldType*, sal_uInt32 nFmt = 0);
// #i53420#
void ChangeExpansion( const SwFrm*,
const SwCntntNode*,
- BOOL bSrchNum = FALSE);
- void ChangeExpansion(const SwTxtNode &rNd, BOOL bSrchNum);
-
- virtual String Expand() const;
- virtual SwField* Copy() const;
+ sal_Bool bSrchNum = sal_False);
+ void ChangeExpansion(const SwTxtNode &rNd, sal_Bool bSrchNum);
- inline BYTE GetLevel() const;
- inline void SetLevel(BYTE);
+ inline sal_uInt8 GetLevel() const;
+ inline void SetLevel(sal_uInt8);
inline const String& GetNumber() const;
inline const String& GetTitle() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BYTE SwChapterField::GetLevel() const { return nLevel; }
-inline void SwChapterField::SetLevel(BYTE nLev) { nLevel = nLev; }
+inline sal_uInt8 SwChapterField::GetLevel() const { return nLevel; }
+inline void SwChapterField::SetLevel(sal_uInt8 nLev) { nLevel = nLev; }
inline const String& SwChapterField::GetNumber() const { return sNumber; }
inline const String& SwChapterField::GetTitle() const { return sTitle; }
-#endif // _CHPFLD_HXX
+#endif // SW_CHPFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index b88f7c63a424..5c5ab9a71505 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -866,6 +866,12 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_NAVIGATION_FORWARD (FN_EXTRA2 + 116)
+// #i972: bool items to be passed to SwFrmPage for evaluation
+#define FN_OLE_IS_MATH (FN_EXTRA2 + 114)
+#define FN_MATH_BASELINE_ALIGNMENT (FN_EXTRA2 + 115)
+
+#define FN_EMBEDDED_OBJECT (FN_EXTRA2 + 116)
+
/*------------------------------------------------ --------------------
Area: Help
-------------------------------------------------- ------------------*/
@@ -997,7 +1003,7 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_ENVELOP (FN_ENVELP )
-#define FN_DELETE_NOTE (FN_NOTES+0)
+
#define FN_DELETE_NOTE_AUTHOR (FN_NOTES+1)
#define FN_DELETE_ALL_NOTES (FN_NOTES+2)
#define FN_HIDE_NOTE (FN_NOTES+3)
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 26b6f54d79e3..f42fe3c2b695 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -40,11 +40,11 @@ class SwTableFUNC;
class SwTableWidthDlg : public SvxStandardDialog
{
+ FixedLine aWidthFL;
FixedText aColFT;
NumericField aColEdit;
FixedText aWidthFT;
MetricField aWidthEdit;
- FixedLine aWidthFL;
OKButton aOKBtn;
CancelButton aCancelBtn;
HelpButton aHelpBtn;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 93ecfc9ae3b1..9d69a0be7f12 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -25,14 +25,16 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _CRSRSH_HXX
-#define _CRSRSH_HXX
+#ifndef SW_CRSRSH_HXX
+#define SW_CRSRSH_HXX
#include <com/sun/star/i18n/WordType.hpp>
#include <tools/string.hxx>
#include <tools/link.hxx>
#include <tools/rtti.hxx>
+
+#include <IShellCursorSupplier.hxx>
#include "swdllapi.h"
#include <swtypes.hxx> // for SWPOSDOC
#include <viewsh.hxx> // for ViewShell
@@ -136,7 +138,7 @@ struct SwContentAtPos
nDist = 0; // #i23726#
}
- BOOL IsInProtectSect() const;
+ sal_Bool IsInProtectSect() const;
bool IsInRTLText()const;
};
@@ -148,7 +150,10 @@ const int CRSR_POSOLD = 0x01, // cursor stays at old position
String *ReplaceBackReferences( const com::sun::star::util::SearchOptions& rSearchOpt, SwPaM* pPam );
-class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify
+class SW_DLLPUBLIC SwCrsrShell
+ : public ViewShell
+ , public SwModify
+ , public ::sw::IShellCursorSupplier
{
friend class SwCallLink;
friend class SwVisCrsr;
@@ -156,7 +161,7 @@ class SW_DLLPUBLIC SwCrsrShell : public ViewShell, public SwModify
friend class SwChgLinkFlag;
// requires the Crsr as InternalCrsr
- friend BOOL GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
+ friend sal_Bool GetAutoSumSel( const SwCrsrShell&, SwCellFrms& );
public:
@@ -197,9 +202,9 @@ private:
long nUpDownX; // try to move the cursor on up/down always
// in the same column
long nLeftFrmPos;
- ULONG nAktNode; // save CursorPos at Start-Action
+ sal_uLong nAktNode; // save CursorPos at Start-Action
xub_StrLen nAktCntnt;
- USHORT nAktNdTyp;
+ sal_uInt16 nAktNdTyp;
bool bAktSelection;
/*
@@ -208,40 +213,40 @@ private:
* current Cursor gets no update. This way, "complicated" cursor movements
* (via Find()) can be realised.
*/
- USHORT nCrsrMove;
- USHORT nBasicActionCnt; // Actions which are parenthesized by Basic
+ sal_uInt16 nCrsrMove;
+ sal_uInt16 nBasicActionCnt; // Actions which are parenthesized by Basic
CrsrMoveState eMvState; // Status for Crsr-Travelling - GetCrsrOfst
String sMarkedListId;
int nMarkedListLevel;
- BOOL bHasFocus : 1; // Shell is "active" in a window
- BOOL bSVCrsrVis : 1; // SV-Cursor visible/invisible
- BOOL bChgCallFlag : 1; // attribute change inside Start- and EndAction
- BOOL bVisPortChgd : 1; // in VisPortChg-Call
+ sal_Bool bHasFocus : 1; // Shell is "active" in a window
+ sal_Bool bSVCrsrVis : 1; // SV-Cursor visible/invisible
+ sal_Bool bChgCallFlag : 1; // attribute change inside Start- and EndAction
+ sal_Bool bVisPortChgd : 1; // in VisPortChg-Call
// (used in Invalidate by the Cursor)
- BOOL bCallChgLnk : 1; // flag for derived classes
+ sal_Bool bCallChgLnk : 1; // flag for derived classes
// TRUE -> call ChgLnk
// access only via SwChgLinkFlag
- BOOL bAllProtect : 1; // Flag for areas
+ sal_Bool bAllProtect : 1; // Flag for areas
// TRUE -> everything protected / hidden
- BOOL bInCMvVisportChgd : 1; // Flag for CrsrMoves
+ sal_Bool bInCMvVisportChgd : 1; // Flag for CrsrMoves
// TRUE -> view was moved
- BOOL bGCAttr : 1; // TRUE -> non expanded attributes exist.
- BOOL bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next
+ sal_Bool bGCAttr : 1; // TRUE -> non expanded attributes exist.
+ sal_Bool bIgnoreReadonly : 1; // TRUE -> make the cursor visible on next
// EndAction in spite of Readonly
- BOOL bSelTblCells : 1; // TRUE -> select cells over the InputWin
- BOOL bAutoUpdateCells : 1; // TRUE -> autoformat cells
- BOOL bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic
- BOOL bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas
- BOOL bOverwriteCrsr : 1; // TRUE -> show Overwrite Crsr
+ sal_Bool bSelTblCells : 1; // TRUE -> select cells over the InputWin
+ sal_Bool bAutoUpdateCells : 1; // TRUE -> autoformat cells
+ sal_Bool bBasicHideCrsr : 1; // TRUE -> HideCrsr from Basic
+ sal_Bool bSetCrsrInReadOnly : 1;// TRUE -> Cursor is allowed in ReadOnly-Areas
+ sal_Bool bOverwriteCrsr : 1; // sal_True -> show Overwrite Crsr
bool mbMacroExecAllowed : 1;
- SW_DLLPRIVATE void UpdateCrsr( USHORT eFlags
+ SW_DLLPRIVATE void UpdateCrsr( sal_uInt16 eFlags
=SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE,
- BOOL bIdleEnd = FALSE );
+ sal_Bool bIdleEnd = sal_False );
SW_DLLPRIVATE void _ParkPams( SwPaM* pDelRg, SwShellCrsr** ppDelRing );
@@ -258,21 +263,21 @@ private:
const int nLevel );
// private method(s) accessed from public inline method(s) must be exported.
- BOOL LeftRight( BOOL, USHORT, USHORT, BOOL );
- SW_DLLPRIVATE BOOL UpDown( BOOL, USHORT );
- SW_DLLPRIVATE BOOL LRMargin( BOOL, BOOL bAPI = FALSE );
- SW_DLLPRIVATE BOOL IsAtLRMargin( BOOL, BOOL bAPI = FALSE ) const;
+ sal_Bool LeftRight( sal_Bool, sal_uInt16, sal_uInt16, sal_Bool );
+ SW_DLLPRIVATE sal_Bool UpDown( sal_Bool, sal_uInt16 );
+ SW_DLLPRIVATE sal_Bool LRMargin( sal_Bool, sal_Bool bAPI = sal_False );
+ SW_DLLPRIVATE sal_Bool IsAtLRMargin( sal_Bool, sal_Bool bAPI = sal_False ) const;
SW_DLLPRIVATE short GetTextDirection( const Point* pPt = 0 ) const;
-typedef BOOL (SwCursor:: *FNCrsr)();
- SW_DLLPRIVATE BOOL CallCrsrFN( FNCrsr );
+typedef sal_Bool (SwCursor:: *FNCrsr)();
+ SW_DLLPRIVATE sal_Bool CallCrsrFN( FNCrsr );
- SW_DLLPRIVATE const SwRedline* _GotoRedline( USHORT nArrPos, BOOL bSelect );
+ SW_DLLPRIVATE const SwRedline* _GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect );
protected:
- inline SwMoveFnCollection* MakeFindRange( USHORT, USHORT, SwPaM* ) const;
+ inline SwMoveFnCollection* MakeFindRange( sal_uInt16, sal_uInt16, SwPaM* ) const;
/*
* Compare-Methode for the StackCursor and the current Cursor.
@@ -293,9 +298,9 @@ protected:
void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
const xub_StrLen nOffset = 0 );
- BOOL _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+ sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
- bool SetInFrontOfLabel( BOOL bNew );
+ bool SetInFrontOfLabel( sal_Bool bNew );
void RefreshBlockCursor();
@@ -313,9 +318,12 @@ public:
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
// create new cursor and append the old one
+ virtual SwPaM & CreateNewShellCursor();
+ virtual SwPaM & GetCurrentShellCursor();
+
SwPaM * CreateCrsr();
// delete the current cursor and make the following into the current
- BOOL DestroyCrsr();
+ sal_Bool DestroyCrsr();
// transform TableCursor to normal cursor, nullify Tablemode
void TblCrsrToCursor();
// enter block mode, change normal cursor into block cursor
@@ -328,8 +336,8 @@ public:
// only for usage in special cases allowed!
void ExtendedSelectAll();
- SwPaM* GetCrsr( BOOL bMakeTblCrsr = TRUE ) const;
- inline SwCursor* GetSwCrsr( BOOL bMakeTblCrsr = TRUE ) const;
+ SwPaM* GetCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
+ inline SwCursor* GetSwCrsr( sal_Bool bMakeTblCrsr = sal_True ) const;
// return only the current cursor
SwShellCrsr* _GetCrsr() { return pCurCrsr; }
const SwShellCrsr* _GetCrsr() const { return pCurCrsr; }
@@ -347,42 +355,42 @@ public:
// start parenthesing, hide SV-Cursor and selected areas
void StartAction();
// end parenthesing, show SV-Cursor and selected areas
- void EndAction( const BOOL bIdleEnd = FALSE );
+ void EndAction( const sal_Bool bIdleEnd = sal_False );
// basic cursor travelling
long GetUpDownX() const { return nUpDownX; }
- BOOL Left( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
- { return LeftRight( TRUE, nCnt, nMode, bAllowVisual ); }
- BOOL Right( USHORT nCnt, USHORT nMode, BOOL bAllowVisual = FALSE )
- { return LeftRight( FALSE, nCnt, nMode, bAllowVisual ); }
- BOOL Up( USHORT nCnt = 1 ) { return UpDown( TRUE, nCnt ); }
- BOOL Down( USHORT nCnt = 1 ) { return UpDown( FALSE, nCnt ); }
- BOOL LeftMargin() { return LRMargin( TRUE ); }
- BOOL RightMargin(BOOL bAPI = FALSE) { return LRMargin( FALSE, bAPI ); }
- BOOL SttEndDoc( BOOL bStt );
-
- BOOL MovePage( SwWhichPage, SwPosPage );
- BOOL MovePara( SwWhichPara, SwPosPara );
- BOOL MoveSection( SwWhichSection, SwPosSection );
- BOOL MoveTable( SwWhichTable, SwPosTable );
- BOOL MoveColumn( SwWhichColumn, SwPosColumn );
- BOOL MoveRegion( SwWhichRegion, SwPosRegion );
-
- ULONG Find( const com::sun::star::util::SearchOptions& rSearchOpt,
- BOOL bSearchInNotes,
+ sal_Bool Left( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False )
+ { return LeftRight( sal_True, nCnt, nMode, bAllowVisual ); }
+ sal_Bool Right( sal_uInt16 nCnt, sal_uInt16 nMode, sal_Bool bAllowVisual = sal_False )
+ { return LeftRight( sal_False, nCnt, nMode, bAllowVisual ); }
+ sal_Bool Up( sal_uInt16 nCnt = 1 ) { return UpDown( sal_True, nCnt ); }
+ sal_Bool Down( sal_uInt16 nCnt = 1 ) { return UpDown( sal_False, nCnt ); }
+ sal_Bool LeftMargin() { return LRMargin( sal_True ); }
+ sal_Bool RightMargin(sal_Bool bAPI = sal_False) { return LRMargin( sal_False, bAPI ); }
+ sal_Bool SttEndDoc( sal_Bool bStt );
+
+ sal_Bool MovePage( SwWhichPage, SwPosPage );
+ sal_Bool MovePara( SwWhichPara, SwPosPara );
+ sal_Bool MoveSection( SwWhichSection, SwPosSection );
+ sal_Bool MoveTable( SwWhichTable, SwPosTable );
+ sal_Bool MoveColumn( SwWhichColumn, SwPosColumn );
+ sal_Bool MoveRegion( SwWhichRegion, SwPosRegion );
+
+ sal_uLong Find( const com::sun::star::util::SearchOptions& rSearchOpt,
+ sal_Bool bSearchInNotes,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
- FindRanges eRng, int bReplace = FALSE );
+ sal_Bool& bCancel,
+ FindRanges eRng, int bReplace = sal_False );
- ULONG Find( const SwTxtFmtColl& rFmtColl,
+ sal_uLong Find( const SwTxtFmtColl& rFmtColl,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
+ sal_Bool& bCancel,
FindRanges eRng, const SwTxtFmtColl* pReplFmt = 0 );
- ULONG Find( const SfxItemSet& rSet, BOOL bNoCollections,
+ sal_uLong Find( const SfxItemSet& rSet, sal_Bool bNoCollections,
SwDocPositions eStart, SwDocPositions eEnde,
- BOOL& bCancel,
+ sal_Bool& bCancel,
FindRanges eRng,
const com::sun::star::util::SearchOptions* pSearchOpt = 0,
const SfxItemSet* rReplSet = 0 );
@@ -391,7 +399,7 @@ public:
// return values:
// CRSR_POSCHG: when cursor was corrected from SPoint by the layout
// CRSR_POSOLD: when the cursor was not changed
- int SetCrsr( const Point &rPt, BOOL bOnlyText = FALSE, bool bBlock = true );
+ int SetCrsr( const Point &rPt, sal_Bool bOnlyText = sal_False, bool bBlock = true );
/*
* Notification that the visible area was changed. aVisArea is reset, then
@@ -407,7 +415,7 @@ public:
// Areas
inline void SetMark();
- inline BOOL HasMark();
+ inline sal_Bool HasMark();
void ClearMark();
@@ -418,12 +426,12 @@ public:
swap the PaM. FALSE: If the mark is behind the point then swap
the PaM.
*/
- void NormalizePam(BOOL bPointFirst = TRUE);
+ void NormalizePam(sal_Bool bPointFirst = sal_True);
void SwapPam();
- BOOL ChgCurrPam( const Point & rPt,
- BOOL bTstOnly = TRUE, // test only, don't set
- BOOL bTstHit = FALSE ); // only exact matches
+ sal_Bool ChgCurrPam( const Point & rPt,
+ sal_Bool bTstOnly = sal_True, // test only, don't set
+ sal_Bool bTstHit = sal_False ); // only exact matches
void KillPams();
// story a copy of the cursor in the stack
@@ -435,7 +443,7 @@ public:
* stack
* Return: whether there was one left one the stack
*/
- BOOL Pop( BOOL bOldCrsr = TRUE );
+ sal_Bool Pop( sal_Bool bOldCrsr = sal_True );
/*
* Combine 2 Cursors.
* Delete the topmost from the stack and move its Mark into the current.
@@ -444,10 +452,10 @@ public:
#if OSL_DEBUG_LEVEL > 1
void SttCrsrMove();
- void EndCrsrMove( const BOOL bIdleEnd = FALSE );
+ void EndCrsrMove( const sal_Bool bIdleEnd = FALSE );
#else
void SttCrsrMove() { ++nCrsrMove; StartAction(); }
- void EndCrsrMove( const BOOL bIdleEnd = FALSE )
+ void EndCrsrMove( const sal_Bool bIdleEnd = sal_False )
{ EndAction( bIdleEnd ); --nCrsrMove; }
#endif
@@ -456,35 +464,35 @@ public:
* On the other hand, on receiving the focus all selected ranges are displayed again
* (ranges must be recalculated!).
*/
- BOOL HasShFcs() const { return bHasFocus; }
+ sal_Bool HasShFcs() const { return bHasFocus; }
void ShLooseFcs();
- void ShGetFcs( BOOL bUpdate = TRUE );
+ void ShGetFcs( sal_Bool bUpdate = sal_True );
// Methods for displaying or hiding the visible text cursor.
void ShowCrsr();
void HideCrsr();
// Methods for displaying or hiding the selected ranges with visible cursor.
- void ShowCrsrs( BOOL bCrsrVis );
+ void ShowCrsrs( sal_Bool bCrsrVis );
void HideCrsrs();
- BOOL IsOverwriteCrsr() const { return bOverwriteCrsr; }
- void SetOverwriteCrsr( BOOL bFlag ) { bOverwriteCrsr = bFlag; }
+ sal_Bool IsOverwriteCrsr() const { return bOverwriteCrsr; }
+ void SetOverwriteCrsr( sal_Bool bFlag ) { bOverwriteCrsr = bFlag; }
// Return current frame in which the cursor is placed.
- SwCntntFrm *GetCurrFrm( const BOOL bCalcFrm = TRUE ) const;
+ SwCntntFrm *GetCurrFrm( const sal_Bool bCalcFrm = sal_True ) const;
//TRUE if cursor is hidden because of readonly.
//FALSE if it is working despite readonly.
- BOOL IsCrsrReadonly() const;
+ sal_Bool IsCrsrReadonly() const;
// Cursor is placed in something that is protected or selection contains
// something that is protected.
- BOOL HasReadonlySel() const;
+ sal_Bool HasReadonlySel() const;
// Can the cursor be set to read only ranges?
- BOOL IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
- void SetReadOnlyAvailable( BOOL bFlag );
- BOOL IsOverReadOnlyPos( const Point& rPt ) const;
+ sal_Bool IsReadOnlyAvailable() const { return bSetCrsrInReadOnly; }
+ void SetReadOnlyAvailable( sal_Bool bFlag );
+ sal_Bool IsOverReadOnlyPos( const Point& rPt ) const;
// Methods for aFlyMacroLnk.
void SetFlyMacroLnk( const Link& rLnk ) { aFlyMacroLnk = rLnk; }
@@ -503,21 +511,23 @@ public:
// Check if the current cursor contains a selection, i.e.
// if Mark is set and SPoint and Mark are different.
- BOOL HasSelection() const;
+ sal_Bool HasSelection() const;
// Check if a selection exists, i.e. if the current cursor comprises a selection.
- inline BOOL IsSelection() const;
+ inline sal_Bool IsSelection() const;
// returns if multiple cursors are available
- inline BOOL IsMultiSelection() const;
+ inline sal_Bool IsMultiSelection() const;
// Check if a complete paragraph was selected.
- BOOL IsSelFullPara() const;
+ sal_Bool IsSelFullPara() const;
// Check if selection is within one paragraph.
- inline BOOL IsSelOnePara() const;
//Should WaitPtr be activated for Clipboard.
- BOOL ShouldWait() const;
+ sal_Bool ShouldWait() const;
+
+ // Check if selection is within one paragraph.
+ inline sal_Bool IsSelOnePara() const;
/*
* Returns SRectangle, at which the cursor is located.
@@ -526,25 +536,25 @@ public:
/*
* Returns if cursor is wholly or partly within visible range.
*/
- BOOL IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
+ sal_Bool IsCrsrVisible() const { return VisArea().IsOver( GetCharRect() ); }
// Return current page number:
// TRUE: in which cursor is located.
// FALSE: which is visible at the upper margin.
- void GetPageNum( USHORT &rnPhyNum, USHORT &rnVirtNum,
- BOOL bAtCrsrPos = TRUE, const BOOL bCalcFrm = TRUE );
+ void GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum,
+ sal_Bool bAtCrsrPos = sal_True, const sal_Bool bCalcFrm = sal_True );
// Determine how "empty pages" are handled
// (used in PhyPage).
- USHORT GetNextPrevPageNum( BOOL bNext = TRUE );
+ sal_uInt16 GetNextPrevPageNum( sal_Bool bNext = sal_True );
// Move cursor at the bginning of page "nPage".
- BOOL GotoPage( USHORT nPage );
+ sal_Bool GotoPage( sal_uInt16 nPage );
- USHORT GetPageCnt();
+ sal_uInt16 GetPageCnt();
- BOOL GoNextCrsr();
+ sal_Bool GoNextCrsr();
- BOOL GoPrevCrsr();
+ sal_Bool GoPrevCrsr();
// at CurCrsr.SPoint
::sw::mark::IMark* SetBookmark(
@@ -575,47 +585,47 @@ public:
String GetText() const;
// Check of SPoint or Mark of current cursor are placed within a table.
- inline const SwTableNode* IsCrsrInTbl( BOOL bIsPtInTbl = TRUE ) const;
+ inline const SwTableNode* IsCrsrInTbl( sal_Bool bIsPtInTbl = sal_True ) const;
- inline Point& GetCrsrDocPos( BOOL bPoint = TRUE ) const;
- inline BOOL IsCrsrPtAtEnd() const;
+ inline Point& GetCrsrDocPos( sal_Bool bPoint = sal_True ) const;
+ inline sal_Bool IsCrsrPtAtEnd() const;
inline const SwPaM* GetTblCrs() const;
inline SwPaM* GetTblCrs();
- BOOL IsTblComplex() const;
- BOOL IsTblComplexForChart();
+ sal_Bool IsTblComplex() const;
+ sal_Bool IsTblComplexForChart();
// get current table selection as text
String GetBoxNms() const;
// set Crsr to the next/previous cell
- BOOL GoNextCell( BOOL bAppendLine = TRUE );
- BOOL GoPrevCell();
+ sal_Bool GoNextCell( sal_Bool bAppendLine = sal_True );
+ sal_Bool GoPrevCell();
// go to this box (if available and inside of table)
- BOOL GotoTable( const String& rName );
+ sal_Bool GotoTable( const String& rName );
// select a table row, column or box (based on the current cursor)
- BOOL SelTblRow() { return _SelTblRowOrCol( true ); }
- BOOL SelTblCol() { return _SelTblRowOrCol( false ); }
- BOOL SelTblBox();
+ sal_Bool SelTblRow() { return _SelTblRowOrCol( true ); }
+ sal_Bool SelTblCol() { return _SelTblRowOrCol( false ); }
+ sal_Bool SelTblBox();
- BOOL SelTbl();
+ sal_Bool SelTbl();
- BOOL GotoNextNum();
- BOOL GotoPrevNum();
+ sal_Bool GotoNextNum();
+ sal_Bool GotoPrevNum();
- BOOL GotoOutline( const String& rName );
+ sal_Bool GotoOutline( const String& rName );
// to the next/previous or the given OutlineNode
- void GotoOutline( USHORT nIdx );
+ void GotoOutline( sal_uInt16 nIdx );
// find the "outline position" in the nodes array of the current chapter
- USHORT GetOutlinePos( BYTE nLevel = UCHAR_MAX );
+ sal_uInt16 GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX );
// select the given range of OutlineNodes. Optionally including the children
- // the USHORTs are the positions in OutlineNodes-Array (EditShell)
- BOOL MakeOutlineSel( USHORT nSttPos, USHORT nEndPos,
- BOOL bWithChilds = FALSE );
+ // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
+ sal_Bool MakeOutlineSel( sal_uInt16 nSttPos, sal_uInt16 nEndPos,
+ sal_Bool bWithChilds = sal_False );
- BOOL GotoNextOutline();
- BOOL GotoPrevOutline();
+ sal_Bool GotoNextOutline();
+ sal_Bool GotoPrevOutline();
/** Delivers the current shell cursor
@@ -640,125 +650,125 @@ public:
IBlockCursor* GetBlockCrsr() { return pBlockCrsr; }
// is the Crsr in a table and is the selection over 2 columns
- BOOL IsTableMode() const { return 0 != pTblCrsr; }
+ sal_Bool IsTableMode() const { return 0 != pTblCrsr; }
const SwShellTableCrsr* GetTableCrsr() const { return pTblCrsr; }
SwShellTableCrsr* GetTableCrsr() { return pTblCrsr; }
- USHORT UpdateTblSelBoxes();
+ sal_uInt16 UpdateTblSelBoxes();
- BOOL GotoFtnTxt(); // jump from content to footnote
- BOOL GotoFtnAnchor(); // jump from footnote to anchor
- BOOL GotoPrevFtnAnchor();
- BOOL GotoNextFtnAnchor();
+ sal_Bool GotoFtnTxt(); // jump from content to footnote
+ sal_Bool GotoFtnAnchor(); // jump from footnote to anchor
+ sal_Bool GotoPrevFtnAnchor();
+ sal_Bool GotoNextFtnAnchor();
- BOOL GotoFlyAnchor(); // jump from the frame to the anchor
- BOOL GotoHeaderTxt(); // jump from the content to the header
- BOOL GotoFooterTxt(); // jump from the content to the footer
+ sal_Bool GotoFlyAnchor(); // jump from the frame to the anchor
+ sal_Bool GotoHeaderTxt(); // jump from the content to the header
+ sal_Bool GotoFooterTxt(); // jump from the content to the footer
// jump to the header/footer of the given or current PageDesc
- BOOL SetCrsrInHdFt( USHORT nDescNo = USHRT_MAX,
- BOOL bInHeader = TRUE );
- // is point of cursor in header/footer. pbInHeader return TRUE if it is
+ sal_Bool SetCrsrInHdFt( sal_uInt16 nDescNo = USHRT_MAX,
+ sal_Bool bInHeader = sal_True );
+ // is point of cursor in header/footer. pbInHeader return sal_True if it is
// in a headerframe otherwise in a footerframe
- BOOL IsInHeaderFooter( BOOL* pbInHeader = 0 ) const;
+ sal_Bool IsInHeaderFooter( sal_Bool* pbInHeader = 0 ) const;
- BOOL GotoNextTOXBase( const String* = 0 );
- BOOL GotoPrevTOXBase( const String* = 0 );
- BOOL GotoTOXMarkBase();
+ sal_Bool GotoNextTOXBase( const String* = 0 );
+ sal_Bool GotoPrevTOXBase( const String* = 0 );
+ sal_Bool GotoTOXMarkBase();
// jump to the next or previous index entry
- BOOL GotoNxtPrvTOXMark( BOOL bNext = TRUE );
+ sal_Bool GotoNxtPrvTOXMark( sal_Bool bNext = sal_True );
// jump to the next/previous index mark of this type
const SwTOXMark& GotoTOXMark( const SwTOXMark& rStart, SwTOXSearch eDir );
// jump to the next or previous table formula
// optionally only to broken formulas
- BOOL GotoNxtPrvTblFormula( BOOL bNext = TRUE,
- BOOL bOnlyErrors = FALSE );
+ sal_Bool GotoNxtPrvTblFormula( sal_Bool bNext = sal_True,
+ sal_Bool bOnlyErrors = sal_False );
// jump to the next / previous hyperlink - inside text and also
// on graphics
- BOOL SelectNxtPrvHyperlink( BOOL bNext = TRUE );
+ sal_Bool SelectNxtPrvHyperlink( sal_Bool bNext = sal_True );
- BOOL GotoRefMark( const String& rRefMark, USHORT nSubType = 0,
- USHORT nSeqNo = 0 );
+ sal_Bool GotoRefMark( const String& rRefMark, sal_uInt16 nSubType = 0,
+ sal_uInt16 nSeqNo = 0 );
// get the nth character from the start or end of the current selection
- sal_Unicode GetChar( BOOL bEnd = TRUE, long nOffset = 0 );
- BOOL ExtendSelection( BOOL bEnd = TRUE, xub_StrLen nCount = 1 );
+ sal_Unicode GetChar( sal_Bool bEnd = sal_True, long nOffset = 0 );
+ sal_Bool ExtendSelection( sal_Bool bEnd = sal_True, xub_StrLen nCount = 1 );
// Place only the visible cursor at the given position in the document.
// Return FALSE if SPoint was corrected by layout.
// (This is needed for displaying the Drag&Drop/Copy-Cursor.)
- BOOL SetVisCrsr( const Point &rPt );
+ sal_Bool SetVisCrsr( const Point &rPt );
inline void UnSetVisCrsr();
// jump to the next or previous field of the corresponding type
- BOOL MoveFldType( const SwFieldType* pFldType, BOOL bNext,
- USHORT nSubType = USHRT_MAX,
- USHORT nResType = USHRT_MAX );
- BOOL GotoFld( const SwFmtFld& rFld );
+ sal_Bool MoveFldType( const SwFieldType* pFldType, sal_Bool bNext,
+ sal_uInt16 nSubType = USHRT_MAX,
+ sal_uInt16 nResType = USHRT_MAX );
+ sal_Bool GotoFld( const SwFmtFld& rFld );
// Return number of cursors in ring (The flag indicates whether
// only cursors containing selections are requested).
- USHORT GetCrsrCnt( BOOL bAll = TRUE ) const;
+ sal_uInt16 GetCrsrCnt( sal_Bool bAll = sal_True ) const;
// Char Travelling - methods (in crstrvl1.cxx)
- BOOL GoStartWord();
- BOOL GoEndWord();
- BOOL GoNextWord();
- BOOL GoPrevWord();
- BOOL GoNextSentence();
- BOOL GoPrevSentence();
- BOOL GoStartSentence();
- BOOL GoEndSentence();
- BOOL SelectWord( const Point* pPt = 0 );
- BOOL ExpandToSentenceBorders();
+ sal_Bool GoStartWord();
+ sal_Bool GoEndWord();
+ sal_Bool GoNextWord();
+ sal_Bool GoPrevWord();
+ sal_Bool GoNextSentence();
+ sal_Bool GoPrevSentence();
+ sal_Bool GoStartSentence();
+ sal_Bool GoEndSentence();
+ sal_Bool SelectWord( const Point* pPt = 0 );
+ sal_Bool ExpandToSentenceBorders();
// get position from current cursor
- BOOL IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
- BOOL IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- BOOL IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
- BOOL IsStartSentence() const;
- BOOL IsEndSentence() const;
- BOOL IsSttPara() const;
- BOOL IsEndPara() const;
- BOOL IsStartOfDoc() const;
- BOOL IsEndOfDoc() const;
- BOOL IsInFrontOfLabel() const;
- BOOL IsAtLeftMargin() const { return IsAtLRMargin( TRUE ); }
- BOOL IsAtRightMargin(BOOL bAPI = FALSE) const { return IsAtLRMargin( FALSE, bAPI ); }
+ sal_Bool IsStartWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES )const;
+ sal_Bool IsEndWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+ sal_Bool IsInWord( sal_Int16 nWordType = com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
+ sal_Bool IsStartSentence() const;
+ sal_Bool IsEndSentence() const;
+ sal_Bool IsSttPara() const;
+ sal_Bool IsEndPara() const;
+ sal_Bool IsStartOfDoc() const;
+ sal_Bool IsEndOfDoc() const;
+ sal_Bool IsInFrontOfLabel() const;
+ sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True ); }
+ sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return IsAtLRMargin( sal_False, bAPI ); }
// delete all created cursors, set the table cursor and the last cursor to
// its TextNode (or StartNode?)
// They all get created on the next ::GetCrsr again
// Used for Drag&Drop/Clipboard-Paste in tables
- BOOL ParkTblCrsr();
+ sal_Bool ParkTblCrsr();
// Non expanded attributes?
- BOOL IsGCAttr() const { return bGCAttr; }
- void ClearGCAttr() { bGCAttr = FALSE; }
- void UpdateAttr() { bGCAttr = TRUE; }
+ sal_Bool IsGCAttr() const { return bGCAttr; }
+ void ClearGCAttr() { bGCAttr = sal_False; }
+ void UpdateAttr() { bGCAttr = sal_True; }
// is the whole document protected/hidden (for UI...)
- BOOL IsAllProtect() const { return bAllProtect; }
+ sal_Bool IsAllProtect() const { return bAllProtect; }
#ifdef SW_CRSR_TIMER
// Set flag at VisCrsr. Is it triggered by Timer (TRUE) or directly (FALSE).
// Default is triggert by Timer.
- BOOL ChgCrsrTimerFlag( BOOL bTimerOn = TRUE );
+ sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True );
#endif
- BOOL BasicActionPend() const { return nBasicActionCnt != nStartAction; }
+ sal_Bool BasicActionPend() const { return nBasicActionCnt != nStartAction; }
- BOOL GotoRegion( const String& rName );
+ sal_Bool GotoRegion( const String& rName );
// show the current selection
virtual void MakeSelVisible();
// set the cursor to a NOT protected/hidden node
- BOOL FindValidCntntNode( BOOL bOnlyText = FALSE );
+ sal_Bool FindValidCntntNode( sal_Bool bOnlyText = sal_False );
- BOOL GetContentAtPos( const Point& rPt,
+ sal_Bool GetContentAtPos( const Point& rPt,
SwContentAtPos& rCntntAtPos,
- BOOL bSetCrsr = FALSE,
+ sal_Bool bSetCrsr = sal_False,
SwRect* pFldRect = 0 );
const SwPostItField* GetPostItFieldAtCursor() const;
@@ -775,39 +785,39 @@ public:
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::container::XStringKeyMap > >& rStringKeyMaps,
::com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rRange ) const;
- BOOL IsPageAtPos( const Point &rPt ) const;
+ sal_Bool IsPageAtPos( const Point &rPt ) const;
- BOOL SelectTxtAttr( USHORT nWhich, BOOL bExpand, const SwTxtAttr* pAttr = 0 );
- BOOL GotoINetAttr( const SwTxtINetFmt& rAttr );
+ sal_Bool SelectTxtAttr( sal_uInt16 nWhich, sal_Bool bExpand, const SwTxtAttr* pAttr = 0 );
+ sal_Bool GotoINetAttr( const SwTxtINetFmt& rAttr );
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
- BOOL CheckTblBoxCntnt( const SwPosition* pPos = 0 );
+ sal_Bool CheckTblBoxCntnt( const SwPosition* pPos = 0 );
void SaveTblBoxCntnt( const SwPosition* pPos = 0 );
void ClearTblBoxCntnt();
- BOOL EndAllTblBoxEdit();
+ sal_Bool EndAllTblBoxEdit();
// gets called when a table selection gets created in UpdateCrsr without
// the UI knowing of it
virtual void NewCoreSelection();
- void SetSelTblCells( BOOL bFlag ) { bSelTblCells = bFlag; }
- BOOL IsSelTblCells() const { return bSelTblCells; }
+ void SetSelTblCells( sal_Bool bFlag ) { bSelTblCells = bFlag; }
+ sal_Bool IsSelTblCells() const { return bSelTblCells; }
- BOOL IsAutoUpdateCells() const { return bAutoUpdateCells; }
- void SetAutoUpdateCells( BOOL bFlag ) { bAutoUpdateCells = bFlag; }
+ sal_Bool IsAutoUpdateCells() const { return bAutoUpdateCells; }
+ void SetAutoUpdateCells( sal_Bool bFlag ) { bAutoUpdateCells = bFlag; }
- BOOL GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
+ sal_Bool GetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode,
SwRect& rRect, short& rOrient );
- BOOL SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
+ sal_Bool SetShadowCrsrPos( const Point& rPt, SwFillMode eFillMode );
const SwRedline* SelNextRedline();
const SwRedline* SelPrevRedline();
- const SwRedline* GotoRedline( USHORT nArrPos, BOOL bSelect = FALSE );
+ const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False );
// is cursor or the point in/over a vertical formatted text?
- BOOL IsInVerticalText( const Point* pPt = 0 ) const;
+ sal_Bool IsInVerticalText( const Point* pPt = 0 ) const;
// is cursor or the point in/over a right to left formatted text?
- BOOL IsInRightToLeftText( const Point* pPt = 0 ) const;
+ sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const;
// If the current cursor position is inside a hidden range, the hidden range
// is selected and true is returned:
@@ -841,12 +851,12 @@ public:
// Cursor Inlines:
inline SwMoveFnCollection* SwCrsrShell::MakeFindRange(
- USHORT nStt, USHORT nEnd, SwPaM* pPam ) const
+ sal_uInt16 nStt, sal_uInt16 nEnd, SwPaM* pPam ) const
{
return pCurCrsr->MakeFindRange( (SwDocPositions)nStt, (SwDocPositions)nEnd, pPam );
}
-inline SwCursor* SwCrsrShell::GetSwCrsr( BOOL bMakeTblCrsr ) const
+inline SwCursor* SwCrsrShell::GetSwCrsr( sal_Bool bMakeTblCrsr ) const
{
return (SwCursor*)GetCrsr( bMakeTblCrsr );
}
@@ -855,35 +865,35 @@ inline SwPaM* SwCrsrShell::GetStkCrsr() const { return pCrsrStk; }
inline void SwCrsrShell::SetMark() { pCurCrsr->SetMark(); }
-inline BOOL SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
+inline sal_Bool SwCrsrShell::HasMark() { return( pCurCrsr->HasMark() ); }
-inline BOOL SwCrsrShell::IsSelection() const
+inline sal_Bool SwCrsrShell::IsSelection() const
{
return IsTableMode() || pCurCrsr->HasMark() ||
pCurCrsr->GetNext() != pCurCrsr;
}
-inline BOOL SwCrsrShell::IsMultiSelection() const
+inline sal_Bool SwCrsrShell::IsMultiSelection() const
{
return pCurCrsr->GetNext() != pCurCrsr;
}
-inline BOOL SwCrsrShell::IsSelOnePara() const
+inline sal_Bool SwCrsrShell::IsSelOnePara() const
{
return pCurCrsr == pCurCrsr->GetNext() &&
pCurCrsr->GetPoint()->nNode == pCurCrsr->GetMark()->nNode;
}
-inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( BOOL bIsPtInTbl ) const
+inline const SwTableNode* SwCrsrShell::IsCrsrInTbl( sal_Bool bIsPtInTbl ) const
{
return pCurCrsr->GetNode( bIsPtInTbl )->FindTableNode();
}
-inline BOOL SwCrsrShell::IsCrsrPtAtEnd() const
+inline sal_Bool SwCrsrShell::IsCrsrPtAtEnd() const
{
return pCurCrsr->End() == pCurCrsr->GetPoint();
}
-inline Point& SwCrsrShell::GetCrsrDocPos( BOOL bPoint ) const
+inline Point& SwCrsrShell::GetCrsrDocPos( sal_Bool bPoint ) const
{
return bPoint ? pCurCrsr->GetPtPos() : pCurCrsr->GetMkPos();
}
@@ -901,7 +911,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs()
inline void SwCrsrShell::UnSetVisCrsr()
{
pVisCrsr->Hide();
- pVisCrsr->SetDragCrsr( FALSE );
+ pVisCrsr->SetDragCrsr( sal_False );
}
#endif // _CRSRSH_HXX
diff --git a/sw/inc/crsskip.hxx b/sw/inc/crsskip.hxx
index 0066b28e2aca..8393174b7837 100644
--- a/sw/inc/crsskip.hxx
+++ b/sw/inc/crsskip.hxx
@@ -36,9 +36,9 @@
// the same, but in complex text cell skip over legatures and char skip
// into it.
// These defines exist only to cut off the dependicies to I18N project.
-const USHORT CRSR_SKIP_CHARS = 0;
-const USHORT CRSR_SKIP_CELLS = 1;
-const USHORT CRSR_SKIP_HIDDEN = 2;
+const sal_uInt16 CRSR_SKIP_CHARS = 0;
+const sal_uInt16 CRSR_SKIP_CELLS = 1;
+const sal_uInt16 CRSR_SKIP_HIDDEN = 2;
#endif
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 00595afbcb8c..53a449e7e804 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -45,11 +45,11 @@ enum SwFillMode
struct SwFillCrsrPos
{
SwRect aCrsr; // position and size of the ShadowCursor
- USHORT nParaCnt; // number of paragraphs to insert
- USHORT nTabCnt; // number of tabs respectively size of indentation
- USHORT nSpaceCnt; // number of spaces to insert
- USHORT nColumnCnt; // number of necessary column breaks
- sal_Int16 eOrient; // paragraph alignment
+ sal_uInt16 nParaCnt; // number of paragraphs to insert
+ sal_uInt16 nTabCnt; // number of tabs respectively size of indentation
+ sal_uInt16 nSpaceCnt; // number of spaces to insert
+ sal_uInt16 nColumnCnt; // number of necessary column breaks
+ sal_Int16 eOrient; // paragraph alignment
SwFillMode eMode; // desired fill-up rule
SwFillCrsrPos( SwFillMode eMd = FILL_TAB ) :
nParaCnt( 0 ), nTabCnt( 0 ), nSpaceCnt( 0 ), nColumnCnt( 0 ),
@@ -70,7 +70,7 @@ struct Sw2LinesPos
SwRect aLine; // Position and size of the line
SwRect aPortion; // Position and size of the multi portion
SwRect aPortion2; // needed for nested multi portions
- BYTE nMultiType; // Multiportion type
+ sal_uInt8 nMultiType; // Multiportion type
};
/**
@@ -111,8 +111,8 @@ struct Sw2LinesPos
struct SwSpecialPos
{
xub_StrLen nCharOfst;
- USHORT nLineOfst;
- BYTE nExtendRange;
+ sal_uInt16 nLineOfst;
+ sal_uInt8 nExtendRange;
// #i27615#
SwSpecialPos() : nCharOfst(0), nLineOfst(0),
@@ -139,31 +139,31 @@ struct SwCrsrMoveState
SwSpecialPos* pSpecialPos; // for positions inside fields
Point aRealHeight; // contains then the position/height of the cursor
CrsrMoveState eState;
- BYTE nCursorBidiLevel;
- BOOL bStop :1;
- BOOL bRealHeight :1; // should the real height be calculated?
- BOOL bFieldInfo :1; // should be fields recognized?
- BOOL bPosCorr :1; // Point had to be corrected
- BOOL bFtnNoInfo :1; // recognized footnote numbering
- BOOL bExactOnly :1; // let GetCrsrOfst look for exact matches only,
+ sal_uInt8 nCursorBidiLevel;
+ sal_Bool bStop :1;
+ sal_Bool bRealHeight :1; // should the real height be calculated?
+ sal_Bool bFieldInfo :1; // should be fields recognized?
+ sal_Bool bPosCorr :1; // Point had to be corrected
+ sal_Bool bFtnNoInfo :1; // recognized footnote numbering
+ sal_Bool bExactOnly :1; // let GetCrsrOfst look for exact matches only,
// i.e. never let it run into GetCntntPos
- BOOL bFillRet :1; // only used temporary in FillMode
- BOOL bSetInReadOnly :1; // ReadOnly areas may be entered
- BOOL bRealWidth :1; // Calculation of the width required
- BOOL b2Lines :1; // Check 2line portions and fill p2Lines
- BOOL bNoScroll :1; // No scrolling of undersized textframes
- BOOL bPosMatchesBounds :1; // GetCrsrOfst should not return the next
+ sal_Bool bFillRet :1; // only used temporary in FillMode
+ sal_Bool bSetInReadOnly :1; // ReadOnly areas may be entered
+ sal_Bool bRealWidth :1; // Calculation of the width required
+ sal_Bool b2Lines :1; // Check 2line portions and fill p2Lines
+ sal_Bool bNoScroll :1; // No scrolling of undersized textframes
+ sal_Bool bPosMatchesBounds :1; // GetCrsrOfst should not return the next
// position if screen position is inside second
// have of bound rect
- BOOL bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <--
+ sal_Bool bCntntCheck :1; // --> FME 2005-05-13 #i43742# Cursor position over content? <--
// #i27615#
/**
cursor in front of label
*/
- BOOL bInFrontOfLabel :1;
- BOOL bInNumPortion :1; // point is in number portion #i23726#
+ sal_Bool bInFrontOfLabel :1;
+ sal_Bool bInNumPortion :1; // point is in number portion #i23726#
int nInNumPostionOffset; // distance from number portion's start
SwCrsrMoveState( CrsrMoveState eSt = MV_NONE ) :
@@ -172,20 +172,20 @@ struct SwCrsrMoveState
pSpecialPos( NULL ),
eState( eSt ),
nCursorBidiLevel( 0 ),
- bStop( FALSE ),
- bRealHeight( FALSE ),
- bFieldInfo( FALSE ),
- bPosCorr( FALSE ),
- bFtnNoInfo( FALSE ),
- bExactOnly( FALSE ),
- bSetInReadOnly( FALSE ),
- bRealWidth( FALSE ),
- b2Lines( FALSE ),
- bNoScroll( FALSE ),
- bPosMatchesBounds( FALSE ),
- bCntntCheck( FALSE ), // #i43742#
- bInFrontOfLabel( FALSE ), // #i27615#
- bInNumPortion(FALSE), // #i26726#
+ bStop( sal_False ),
+ bRealHeight( sal_False ),
+ bFieldInfo( sal_False ),
+ bPosCorr( sal_False ),
+ bFtnNoInfo( sal_False ),
+ bExactOnly( sal_False ),
+ bSetInReadOnly( sal_False ),
+ bRealWidth( sal_False ),
+ b2Lines( sal_False ),
+ bNoScroll( sal_False ),
+ bPosMatchesBounds( sal_False ),
+ bCntntCheck( sal_False ), // #i43742#
+ bInFrontOfLabel( sal_False ), // #i27615#
+ bInNumPortion(sal_False), // #i26726#
nInNumPostionOffset(0) // #i26726#
{}
SwCrsrMoveState( SwFillCrsrPos *pInitFill ) :
@@ -193,20 +193,20 @@ struct SwCrsrMoveState
pSpecialPos( NULL ),
eState( MV_SETONLYTEXT ),
nCursorBidiLevel( 0 ),
- bStop( FALSE ),
- bRealHeight( FALSE ),
- bFieldInfo( FALSE ),
- bPosCorr( FALSE ),
- bFtnNoInfo( FALSE ),
- bExactOnly( FALSE ),
- bSetInReadOnly( FALSE ),
- bRealWidth( FALSE ),
- b2Lines( FALSE ),
- bNoScroll( FALSE ),
- bPosMatchesBounds( FALSE ),
- bCntntCheck( FALSE ), // #i43742#
- bInFrontOfLabel( FALSE ), // #i27615#
- bInNumPortion(FALSE), // #i23726#
+ bStop( sal_False ),
+ bRealHeight( sal_False ),
+ bFieldInfo( sal_False ),
+ bPosCorr( sal_False ),
+ bFtnNoInfo( sal_False ),
+ bExactOnly( sal_False ),
+ bSetInReadOnly( sal_False ),
+ bRealWidth( sal_False ),
+ b2Lines( sal_False ),
+ bNoScroll( sal_False ),
+ bPosMatchesBounds( sal_False ),
+ bCntntCheck( sal_False ), // #i43742#
+ bInFrontOfLabel( sal_False ), // #i27615#
+ bInNumPortion(sal_False), // #i23726#
nInNumPostionOffset(0) // #i23726#
{}
};
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index f06d77fee4d6..a28f146123a0 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -49,19 +49,19 @@ extern SwPosPage fnPageStart, fnPageEnd;
// Direction-parameter for MovePara (initialized in SwCntntFrm).
typedef SwMoveFnCollection* SwPosPara;
-typedef BOOL (*SwWhichPara)( SwPaM&, SwPosPara );
+typedef sal_Bool (*SwWhichPara)( SwPaM&, SwPosPara );
extern SwWhichPara fnParaPrev, fnParaCurr, fnParaNext;
extern SwPosPara fnParaStart, fnParaEnd;
// Direction-parameter for MoveSection.
typedef SwMoveFnCollection* SwPosSection;
-typedef BOOL (*SwWhichSection)( SwPaM&, SwPosSection );
+typedef sal_Bool (*SwWhichSection)( SwPaM&, SwPosSection );
extern SwWhichSection fnSectionPrev, fnSectionCurr, fnSectionNext;
extern SwPosSection fnSectionStart, fnSectionEnd;
// Direction-parameter for MoveTable
typedef SwMoveFnCollection* SwPosTable;
-typedef BOOL (*SwWhichTable)( SwPaM&, SwPosTable, BOOL bInReadOnly );
+typedef sal_Bool (*SwWhichTable)( SwPaM&, SwPosTable, sal_Bool bInReadOnly );
extern SwWhichTable fnTablePrev, fnTableCurr, fnTableNext;
extern SwPosTable fnTableStart, fnTableEnd;
@@ -73,7 +73,7 @@ extern SwPosColumn fnColumnStart, fnColumnEnd;
// Direction-parameter for MoveRegion (ranges!)
typedef SwMoveFnCollection* SwPosRegion;
-typedef BOOL (*SwWhichRegion)( SwPaM&, SwPosRegion, BOOL bInReadOnly );
+typedef sal_Bool (*SwWhichRegion)( SwPaM&, SwPosRegion, sal_Bool bInReadOnly );
extern SwWhichRegion fnRegionPrev, fnRegionCurr, fnRegionNext, fnRegionCurrAndSkip;
extern SwPosRegion fnRegionStart, fnRegionEnd;
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 9b2795f9149b..8273b39ce119 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#ifndef _DBFLD_HXX
-#define _DBFLD_HXX
+#ifndef SW_DBFLD_HXX
+#define SW_DBFLD_HXX
#include "swdllapi.h"
#include "fldbas.hxx"
@@ -61,8 +61,8 @@ public:
const String& GetColumnName() const {return sColumn;}
const SwDBData& GetDBData() const {return aDBData;}
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -74,30 +74,30 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
{
String aContent;
String sFieldCode; // contains Word's field code
- USHORT nSubType;
- BOOL bIsInBodyTxt : 1;
- BOOL bValidValue : 1;
- BOOL bInitialized : 1;
+ sal_uInt16 nSubType;
+ sal_Bool bIsInBodyTxt : 1;
+ sal_Bool bValidValue : 1;
+ sal_Bool bInitialized : 1;
+
+ virtual String Expand() const;
+ virtual SwField* Copy() const;
public:
- SwDBField(SwDBFieldType*, ULONG nFmt = 0);
+ SwDBField(SwDBFieldType*, sal_uLong nFmt = 0);
virtual ~SwDBField();
virtual SwFieldType* ChgTyp( SwFieldType* );
// Current text.
inline void SetExpansion(const String& rStr);
- virtual String Expand() const;
- virtual SwField* Copy() const;
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
- // Name or content.
- virtual String GetCntnt(BOOL bName = FALSE) const;
+ virtual String GetFieldName() const;
// For calculations in expressions.
- void ChgValue( double d, BOOL bVal );
+ void ChgValue( double d, sal_Bool bVal );
// Get the evaluation via DBMgr string.
void Evaluate();
@@ -107,11 +107,11 @@ public:
void InitContent();
void InitContent(const String& rExpansion);
- inline void ChgBodyTxtFlag( BOOL bIsInBody );
+ inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
- inline BOOL IsInitialized() const { return bInitialized; }
- inline void ClearInitialized() { bInitialized = FALSE; }
- inline void SetInitialized() { bInitialized = TRUE; }
+ inline sal_Bool IsInitialized() const { return bInitialized; }
+ inline void ClearInitialized() { bInitialized = sal_False; }
+ inline void SetInitialized() { bInitialized = sal_True; }
// Get name.
virtual const String& GetPar1() const;
@@ -124,15 +124,15 @@ public:
// DBName
inline const SwDBData& GetDBData() const { return ((SwDBFieldType*)GetTyp())->GetDBData(); }
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
inline void SwDBField::SetExpansion(const String& rStr)
{ aContent = rStr; }
// set from UpdateExpFlds (the Node-Position is known there)
-inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
+inline void SwDBField::ChgBodyTxtFlag( sal_Bool bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
/*--------------------------------------------------------------------
@@ -142,13 +142,13 @@ inline void SwDBField::ChgBodyTxtFlag( BOOL bIsInBody )
class SW_DLLPUBLIC SwDBNameInfField : public SwField
{
SwDBData aDBData;
- USHORT nSubType;
+ sal_uInt16 nSubType;
protected:
const SwDBData& GetDBData() const {return aDBData;}
SwDBData& GetDBData() {return aDBData;}
- SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBNameInfField(SwFieldType* pTyp, const SwDBData& rDBData, sal_uLong nFmt = 0);
public:
// DBName
@@ -157,12 +157,12 @@ public:
SwDBData GetDBData(SwDoc* pDoc);
void SetDBData(const SwDBData& rDBData);
- // Name or content.
- virtual String GetCntnt(BOOL bName = FALSE) const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
- virtual USHORT GetSubType() const;
- virtual void SetSubType(USHORT nType);
+ virtual String GetFieldName() const;
+
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
+ virtual sal_uInt16 GetSubType() const;
+ virtual void SetSubType(sal_uInt16 nType);
};
/*--------------------------------------------------------------------
@@ -184,7 +184,7 @@ public:
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
{
String aCond;
- BOOL bCondValid;
+ sal_Bool bCondValid;
public:
SwDBNextSetField( SwDBNextSetFieldType*,
@@ -194,20 +194,20 @@ public:
virtual SwField* Copy() const;
void Evaluate(SwDoc*);
- inline void SetCondValid(BOOL bCond);
- inline BOOL IsCondValid() const;
+ inline void SetCondValid(sal_Bool bCond);
+ inline sal_Bool IsCondValid() const;
// Condition
virtual const String& GetPar1() const;
virtual void SetPar1(const String& rStr);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BOOL SwDBNextSetField::IsCondValid() const
+inline sal_Bool SwDBNextSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNextSetField::SetCondValid(BOOL bCond)
+inline void SwDBNextSetField::SetCondValid(sal_Bool bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -231,7 +231,7 @@ class SwDBNumSetField : public SwDBNameInfField
{
String aCond;
String aPar2;
- BOOL bCondValid;
+ sal_Bool bCondValid;
public:
SwDBNumSetField(SwDBNumSetFieldType*, const String& rCond, const String& rDBNum, const SwDBData& rDBData);
@@ -239,8 +239,8 @@ public:
virtual String Expand() const;
virtual SwField* Copy() const;
- inline BOOL IsCondValid() const;
- inline void SetCondValid(BOOL bCond);
+ inline sal_Bool IsCondValid() const;
+ inline void SetCondValid(sal_Bool bCond);
void Evaluate(SwDoc*);
// Condition
@@ -252,14 +252,14 @@ public:
virtual void SetPar2(const String& rStr);
// Number of data record is in nFormat!!
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
-inline BOOL SwDBNumSetField::IsCondValid() const
+inline sal_Bool SwDBNumSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNumSetField::SetCondValid(BOOL bCond)
+inline void SwDBNumSetField::SetCondValid(sal_Bool bCond)
{ bCondValid = bCond; }
/*--------------------------------------------------------------------
@@ -272,7 +272,7 @@ class SwDBNameFieldType : public SwFieldType
public:
SwDBNameFieldType(SwDoc*);
- String Expand(ULONG) const;
+ String Expand(sal_uLong) const;
virtual SwFieldType* Copy() const;
};
@@ -283,12 +283,12 @@ public:
class SW_DLLPUBLIC SwDBNameField : public SwDBNameInfField
{
public:
- SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBNameField(SwDBNameFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
virtual String Expand() const;
virtual SwField* Copy() const;
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
/*--------------------------------------------------------------------
@@ -312,7 +312,7 @@ class SW_DLLPUBLIC SwDBSetNumberField : public SwDBNameInfField
long nNumber;
public:
- SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, ULONG nFmt = 0);
+ SwDBSetNumberField(SwDBSetNumberFieldType*, const SwDBData& rDBData, sal_uLong nFmt = 0);
virtual String Expand() const;
virtual SwField* Copy() const;
@@ -320,8 +320,8 @@ public:
inline long GetSetNumber() const;
inline void SetSetNumber(long nNum);
- virtual bool QueryValue( com::sun::star::uno::Any& rVal, USHORT nWhich ) const;
- virtual bool PutValue( const com::sun::star::uno::Any& rVal, USHORT nWhich );
+ virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt16 nWhich ) const;
+ virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt16 nWhich );
};
inline long SwDBSetNumberField::GetSetNumber() const
@@ -330,6 +330,6 @@ inline long SwDBSetNumberField::GetSetNumber() const
inline void SwDBSetNumberField::SetSetNumber(long nNum)
{ nNumber = nNum; }
-#endif // _DBFLD_HXX
+#endif // SW_DBFLD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/dbgoutsw.hxx b/sw/inc/dbgoutsw.hxx
index 11a30f4e026f..fdedacbb5232 100644
--- a/sw/inc/dbgoutsw.hxx
+++ b/sw/inc/dbgoutsw.hxx
@@ -48,7 +48,6 @@ struct SwPosition;
class SwPaM;
class SwNodeNum;
class SwUndo;
-class SwUndos;
class SwRect;
class SwFrmFmt;
class SwFrmFmts;
@@ -87,7 +86,6 @@ SW_DLLPUBLIC const char * dbg_out(const SwPosition & rPos);
SW_DLLPUBLIC const char * dbg_out(const SwPaM & rPam);
SW_DLLPUBLIC const char * dbg_out(const SwNodeNum & rNum);
SW_DLLPUBLIC const char * dbg_out(const SwUndo & rUndo);
-SW_DLLPUBLIC const char * dbg_out(const SwUndos & rUndos);
SW_DLLPUBLIC const char * dbg_out(const SwRewriter & rRewriter);
SW_DLLPUBLIC const char * dbg_out(const SwNumRule & rRule);
SW_DLLPUBLIC const char * dbg_out(const SwTxtFmtColl & rFmt);
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index 0b47de63a758..3c16000c5f89 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -74,7 +74,6 @@ struct SwDBFormatData
class SwView;
class SwWrtShell;
-class SwPrtOptions;
class SfxProgress;
class ListBox;
class Button;</