[Libreoffice-commits] .: 10 commits - sw/inc sw/source sw/util
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Nov 25 12:13:29 PST 2010
sw/inc/SwNumberTree.hxx | 4
sw/inc/calbck.hxx | 2
sw/inc/crsrsh.hxx | 8
sw/inc/dcontact.hxx | 4
sw/inc/doc.hxx | 4
sw/inc/errhdl.hxx | 17 -
sw/inc/fldbas.hxx | 8
sw/inc/hints.hxx | 6
sw/inc/index.hxx | 10
sw/inc/ndhints.hxx | 2
sw/inc/ndindex.hxx | 2
sw/inc/node.hxx | 4
sw/inc/numrule.hxx | 6
sw/inc/pam.hxx | 6
sw/inc/swrect.hxx | 3
sw/inc/swtable.hxx | 21 -
sw/inc/tox.hxx | 38 +-
sw/inc/txatbase.hxx | 22 -
sw/inc/txtatr.hxx | 2
sw/inc/txtfld.hxx | 2
sw/inc/txtftn.hxx | 2
sw/inc/txtinet.hxx | 2
sw/inc/txtrfmrk.hxx | 2
sw/inc/txttxmrk.hxx | 2
sw/inc/viscrs.hxx | 12
sw/source/core/SwNumberTree/SwNodeNum.cxx | 20 -
sw/source/core/SwNumberTree/SwNumberTree.cxx | 62 ++--
sw/source/core/access/acccell.cxx | 8
sw/source/core/access/acccontext.cxx | 50 +--
sw/source/core/access/accdoc.cxx | 6
sw/source/core/access/accframe.cxx | 4
sw/source/core/access/accframebase.cxx | 10
sw/source/core/access/accfrmobj.cxx | 10
sw/source/core/access/accfrmobjmap.cxx | 2
sw/source/core/access/acchyperlink.cxx | 2
sw/source/core/access/accmap.cxx | 80 ++---
sw/source/core/access/accnotextframe.cxx | 2
sw/source/core/access/accpage.cxx | 4
sw/source/core/access/accpara.cxx | 8
sw/source/core/access/acctable.cxx | 32 +-
sw/source/core/access/parachangetrackinginfo.cxx | 10
sw/source/core/access/textmarkuphelper.cxx | 4
sw/source/core/attr/calbck.cxx | 24 -
sw/source/core/attr/cellatr.cxx | 6
sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx | 10
sw/source/core/attr/format.cxx | 10
sw/source/core/attr/hints.cxx | 26 -
sw/source/core/attr/swatrset.cxx | 6
sw/source/core/bastyp/bparr.cxx | 10
sw/source/core/bastyp/calc.cxx | 6
sw/source/core/bastyp/index.cxx | 32 +-
sw/source/core/bastyp/init.cxx | 2
sw/source/core/bastyp/swcache.cxx | 64 ++--
sw/source/core/bastyp/swrect.cxx | 4
sw/source/core/bastyp/tabcol.cxx | 4
sw/source/core/crsr/callnk.cxx | 2
sw/source/core/crsr/crsrsh.cxx | 58 +--
sw/source/core/crsr/crstrvl.cxx | 8
sw/source/core/crsr/findattr.cxx | 6
sw/source/core/crsr/findtxt.cxx | 2
sw/source/core/crsr/pam.cxx | 4
sw/source/core/crsr/swcrsr.cxx | 8
sw/source/core/crsr/trvltbl.cxx | 10
sw/source/core/crsr/unocrsr.cxx | 2
sw/source/core/crsr/viscrs.cxx | 10
sw/source/core/doc/acmplwrd.cxx | 32 +-
sw/source/core/doc/dbgoutsw.cxx | 4
sw/source/core/doc/doc.cxx | 12
sw/source/core/doc/docchart.cxx | 2
sw/source/core/doc/doccomp.cxx | 2
sw/source/core/doc/docdesc.cxx | 12
sw/source/core/doc/docdraw.cxx | 36 +-
sw/source/core/doc/docedt.cxx | 30 +-
sw/source/core/doc/docfld.cxx | 40 +-
sw/source/core/doc/docfly.cxx | 24 -
sw/source/core/doc/docfmt.cxx | 20 -
sw/source/core/doc/docglbl.cxx | 4
sw/source/core/doc/doclay.cxx | 56 +--
sw/source/core/doc/docnew.cxx | 14
sw/source/core/doc/docnum.cxx | 39 +-
sw/source/core/doc/docredln.cxx | 33 +-
sw/source/core/doc/docsort.cxx | 14
sw/source/core/doc/doctxm.cxx | 28 -
sw/source/core/doc/extinput.cxx | 2
sw/source/core/doc/fmtcol.cxx | 8
sw/source/core/doc/gctable.cxx | 2
sw/source/core/doc/htmltbl.cxx | 72 ++--
sw/source/core/doc/lineinfo.cxx | 2
sw/source/core/doc/notxtfrm.cxx | 4
sw/source/core/doc/number.cxx | 30 +-
sw/source/core/doc/poolfmt.cxx | 28 -
sw/source/core/doc/swstylemanager.cxx | 2
sw/source/core/doc/tblafmt.cxx | 8
sw/source/core/doc/tblcpy.cxx | 12
sw/source/core/doc/tblrwcl.cxx | 86 ++---
sw/source/core/docnode/finalthreadmanager.cxx | 13
sw/source/core/docnode/ndcopy.cxx | 27 -
sw/source/core/docnode/ndindex.cxx | 8
sw/source/core/docnode/ndnotxt.cxx | 20 -
sw/source/core/docnode/ndnum.cxx | 6
sw/source/core/docnode/ndsect.cxx | 24 -
sw/source/core/docnode/ndtbl.cxx | 77 ++---
sw/source/core/docnode/ndtbl1.cxx | 6
sw/source/core/docnode/node.cxx | 30 +-
sw/source/core/docnode/node2lay.cxx | 20 -
sw/source/core/docnode/nodes.cxx | 20 -
sw/source/core/docnode/section.cxx | 26 -
sw/source/core/docnode/swbaslnk.cxx | 6
sw/source/core/docnode/threadmanager.cxx | 4
sw/source/core/draw/dcontact.cxx | 80 ++---
sw/source/core/draw/dobjfac.cxx | 2
sw/source/core/draw/dpage.cxx | 2
sw/source/core/draw/drawdoc.cxx | 2
sw/source/core/draw/dview.cxx | 12
sw/source/core/edit/acorrect.cxx | 4
sw/source/core/edit/autofmt.cxx | 4
sw/source/core/edit/edattr.cxx | 6
sw/source/core/edit/eddel.cxx | 4
sw/source/core/edit/edfcol.cxx | 2
sw/source/core/edit/edfld.cxx | 2
sw/source/core/edit/edglbldc.cxx | 2
sw/source/core/edit/edglss.cxx | 2
sw/source/core/edit/editsh.cxx | 38 +-
sw/source/core/edit/edlingu.cxx | 54 +--
sw/source/core/edit/ednumber.cxx | 10
sw/source/core/edit/edsect.cxx | 4
sw/source/core/edit/edtox.cxx | 14
sw/source/core/edit/edundo.cxx | 6
sw/source/core/edit/edws.cxx | 2
sw/source/core/except/dbgloop.cxx | 10
sw/source/core/except/errhdl.cxx | 56 ---
sw/source/core/except/makefile.mk | 2
sw/source/core/fields/authfld.cxx | 16 -
sw/source/core/fields/cellfml.cxx | 12
sw/source/core/fields/chpfld.cxx | 9
sw/source/core/fields/dbfld.cxx | 2
sw/source/core/fields/ddefld.cxx | 4
sw/source/core/fields/ddetbl.cxx | 14
sw/source/core/fields/docufld.cxx | 14
sw/source/core/fields/expfld.cxx | 10
sw/source/core/fields/fldbas.cxx | 16 -
sw/source/core/fields/fldlst.cxx | 2
sw/source/core/fields/postithelper.cxx | 4
sw/source/core/fields/reffld.cxx | 8
sw/source/core/frmedt/fecopy.cxx | 22 -
sw/source/core/frmedt/fedesc.cxx | 8
sw/source/core/frmedt/fefly1.cxx | 50 +--
sw/source/core/frmedt/feflyole.cxx | 2
sw/source/core/frmedt/feshview.cxx | 96 +++---
sw/source/core/frmedt/fetab.cxx | 20 -
sw/source/core/frmedt/fews.cxx | 26 -
sw/source/core/frmedt/tblsel.cxx | 74 ++--
sw/source/core/graphic/grfatr.cxx | 4
sw/source/core/graphic/ndgrf.cxx | 34 +-
sw/source/core/inc/dbg_lay.hxx | 2
sw/source/core/inc/dbgloop.hxx | 2
sw/source/core/inc/drawfont.hxx | 98 ++++--
sw/source/core/inc/flyfrm.hxx | 2
sw/source/core/inc/fntcache.hxx | 2
sw/source/core/inc/ftnfrm.hxx | 14
sw/source/core/inc/layact.hxx | 4
sw/source/core/inc/laycache.hxx | 2
sw/source/core/inc/rootfrm.hxx | 6
sw/source/core/inc/scriptinfo.hxx | 18 -
sw/source/core/inc/swcache.hxx | 18 -
sw/source/core/inc/swfntcch.hxx | 2
sw/source/core/inc/swfont.hxx | 10
sw/source/core/inc/tblrwcl.hxx | 2
sw/source/core/inc/txtfrm.hxx | 6
sw/source/core/layout/anchoreddrawobject.cxx | 10
sw/source/core/layout/anchoredobject.cxx | 10
sw/source/core/layout/atrfrm.cxx | 90 +++---
sw/source/core/layout/calcmove.cxx | 52 +--
sw/source/core/layout/colfrm.cxx | 8
sw/source/core/layout/dbg_lay.cxx | 6
sw/source/core/layout/findfrm.cxx | 56 +--
sw/source/core/layout/flowfrm.cxx | 62 ++--
sw/source/core/layout/fly.cxx | 54 +--
sw/source/core/layout/flycnt.cxx | 8
sw/source/core/layout/flyincnt.cxx | 4
sw/source/core/layout/flylay.cxx | 38 +-
sw/source/core/layout/frmtool.cxx | 42 +-
sw/source/core/layout/ftnfrm.cxx | 140 ++++-----
sw/source/core/layout/hffrm.cxx | 18 -
sw/source/core/layout/layact.cxx | 33 +-
sw/source/core/layout/laycache.cxx | 42 +-
sw/source/core/layout/layouter.cxx | 24 -
sw/source/core/layout/makefile.mk | 2
sw/source/core/layout/newfrm.cxx | 10
sw/source/core/layout/objectformatter.cxx | 10
sw/source/core/layout/objectformatterlayfrm.cxx | 8
sw/source/core/layout/objectformattertxtfrm.cxx | 18 -
sw/source/core/layout/pagechg.cxx | 58 +--
sw/source/core/layout/pagedesc.cxx | 4
sw/source/core/layout/paintfrm.cxx | 66 ++--
sw/source/core/layout/sectfrm.cxx | 74 ++--
sw/source/core/layout/sortedobjsimpl.cxx | 8
sw/source/core/layout/ssfrm.cxx | 12
sw/source/core/layout/tabfrm.cxx | 120 ++++----
sw/source/core/layout/trvlfrm.cxx | 46 +--
sw/source/core/layout/unusedf.cxx | 20 -
sw/source/core/layout/virtoutp.cxx | 6
sw/source/core/layout/wsfrm.cxx | 102 +++---
sw/source/core/makefile.mk | 2
sw/source/core/objectpositioning/anchoredobjectposition.cxx | 20 -
sw/source/core/objectpositioning/ascharanchoredobjectposition.cxx | 8
sw/source/core/objectpositioning/environmentofanchoredobject.cxx | 8
sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 10
sw/source/core/objectpositioning/tolayoutanchoredobjectposition.cxx | 2
sw/source/core/ole/ndole.cxx | 18 -
sw/source/core/para/paratr.cxx | 4
sw/source/core/sw3io/swacorr.cxx | 2
sw/source/core/swg/SwXMLTextBlocks.cxx | 2
sw/source/core/swg/SwXMLTextBlocks1.cxx | 24 -
sw/source/core/swg/swblocks.cxx | 4
sw/source/core/table/swnewtable.cxx | 132 ++++----
sw/source/core/table/swtable.cxx | 34 +-
sw/source/core/text/EnhancedPDFExportHelper.cxx | 54 +--
sw/source/core/text/atrhndl.hxx | 6
sw/source/core/text/atrstck.cxx | 12
sw/source/core/text/frmcrsr.cxx | 24 -
sw/source/core/text/frmform.cxx | 70 ++--
sw/source/core/text/frmpaint.cxx | 14
sw/source/core/text/guess.cxx | 26 -
sw/source/core/text/inftxt.cxx | 42 +-
sw/source/core/text/inftxt.hxx | 10
sw/source/core/text/itradj.cxx | 14
sw/source/core/text/itratr.cxx | 8
sw/source/core/text/itrcrsr.cxx | 26 -
sw/source/core/text/itrform2.cxx | 44 +-
sw/source/core/text/itrpaint.cxx | 8
sw/source/core/text/itrtxt.cxx | 6
sw/source/core/text/makefile.mk | 2
sw/source/core/text/noteurl.cxx | 2
sw/source/core/text/porfld.cxx | 16 -
sw/source/core/text/porfly.cxx | 20 -
sw/source/core/text/porglue.cxx | 4
sw/source/core/text/porlay.cxx | 58 +--
sw/source/core/text/porlay.hxx | 2
sw/source/core/text/porlin.cxx | 24 -
sw/source/core/text/porlin.hxx | 4
sw/source/core/text/pormulti.cxx | 36 +-
sw/source/core/text/porrst.cxx | 10
sw/source/core/text/portxt.cxx | 12
sw/source/core/text/redlnitr.cxx | 14
sw/source/core/text/redlnitr.hxx | 2
sw/source/core/text/txtcache.cxx | 6
sw/source/core/text/txtdrop.cxx | 14
sw/source/core/text/txtfly.cxx | 50 +--
sw/source/core/text/txtfly.hxx | 4
sw/source/core/text/txtfrm.cxx | 42 +-
sw/source/core/text/txtftn.cxx | 56 +--
sw/source/core/text/txthyph.cxx | 24 -
sw/source/core/text/txtinit.cxx | 2
sw/source/core/text/txtio.cxx | 8
sw/source/core/text/txtpaint.cxx | 2
sw/source/core/text/txtpaint.hxx | 2
sw/source/core/text/txttab.cxx | 18 -
sw/source/core/text/widorp.cxx | 12
sw/source/core/text/wrong.cxx | 2
sw/source/core/tox/tox.cxx | 14
sw/source/core/tox/toxhlp.cxx | 24 -
sw/source/core/tox/txmsrt.cxx | 18 -
sw/source/core/txtnode/atrfld.cxx | 12
sw/source/core/txtnode/atrflyin.cxx | 10
sw/source/core/txtnode/atrftn.cxx | 10
sw/source/core/txtnode/atrref.cxx | 2
sw/source/core/txtnode/fmtatr2.cxx | 26 -
sw/source/core/txtnode/fntcache.cxx | 62 ++--
sw/source/core/txtnode/fntcap.cxx | 14
sw/source/core/txtnode/ndhints.cxx | 30 +-
sw/source/core/txtnode/ndtxt.cxx | 90 +++---
sw/source/core/txtnode/swfont.cxx | 16 -
sw/source/core/txtnode/thints.cxx | 98 +++---
sw/source/core/txtnode/txtatr2.cxx | 6
sw/source/core/txtnode/txtedt.cxx | 16 -
sw/source/core/undo/SwUndoField.cxx | 6
sw/source/core/undo/SwUndoPageDesc.cxx | 8
sw/source/core/undo/docundo.cxx | 22 -
sw/source/core/undo/rolbck.cxx | 40 +-
sw/source/core/undo/unattr.cxx | 10
sw/source/core/undo/undel.cxx | 6
sw/source/core/undo/undobj.cxx | 20 -
sw/source/core/undo/undobj1.cxx | 18 -
sw/source/core/undo/undoflystrattr.cxx | 2
sw/source/core/undo/undraw.cxx | 16 -
sw/source/core/undo/unins.cxx | 18 -
sw/source/core/undo/unnum.cxx | 2
sw/source/core/undo/unovwr.cxx | 6
sw/source/core/undo/unredln.cxx | 2
sw/source/core/undo/unsect.cxx | 8
sw/source/core/undo/unspnd.cxx | 2
sw/source/core/undo/untbl.cxx | 125 +++-----
sw/source/core/undo/untblk.cxx | 2
sw/source/core/unocore/swunohelper.cxx | 8
sw/source/core/unocore/unodraw.cxx | 42 +-
sw/source/core/unocore/unofield.cxx | 4
sw/source/core/unocore/unoframe.cxx | 14
sw/source/core/unocore/unoobj.cxx | 8
sw/source/core/unocore/unoportenum.cxx | 16 -
sw/source/core/unocore/unorefmk.cxx | 12
sw/source/core/unocore/unosett.cxx | 2
sw/source/core/unocore/unostyle.cxx | 4
sw/source/core/unocore/unotext.cxx | 2
sw/source/core/unocore/unotextmarkup.cxx | 8
sw/source/core/view/pagepreviewlayout.cxx | 22 -
sw/source/core/view/vdraw.cxx | 6
sw/source/core/view/viewimp.cxx | 22 -
sw/source/core/view/viewpg.cxx | 2
sw/source/core/view/viewsh.cxx | 26 -
sw/source/core/view/vnew.cxx | 4
sw/source/core/view/vprint.cxx | 14
sw/source/filter/ascii/parasc.cxx | 8
sw/source/filter/basflt/fltini.cxx | 7
sw/source/filter/basflt/iodetect.cxx | 4
sw/source/filter/basflt/shellio.cxx | 10
sw/source/filter/html/css1atr.cxx | 52 +--
sw/source/filter/html/htmlatr.cxx | 54 +--
sw/source/filter/html/htmlbas.cxx | 8
sw/source/filter/html/htmlcss1.cxx | 26 -
sw/source/filter/html/htmlctxt.cxx | 14
sw/source/filter/html/htmldraw.cxx | 14
sw/source/filter/html/htmlfld.cxx | 8
sw/source/filter/html/htmlfldw.cxx | 14
sw/source/filter/html/htmlfly.cxx | 32 +-
sw/source/filter/html/htmlform.cxx | 74 ++--
sw/source/filter/html/htmlforw.cxx | 40 +-
sw/source/filter/html/htmlftn.cxx | 18 -
sw/source/filter/html/htmlgrin.cxx | 10
sw/source/filter/html/htmlnum.cxx | 10
sw/source/filter/html/htmlplug.cxx | 4
sw/source/filter/html/htmlsect.cxx | 6
sw/source/filter/html/htmltab.cxx | 136 ++++-----
sw/source/filter/html/htmltabw.cxx | 8
sw/source/filter/html/swhtml.cxx | 150 +++++-----
sw/source/filter/html/swhtml.hxx | 2
sw/source/filter/html/wrthtml.cxx | 20 -
sw/source/filter/inc/fltshell.hxx | 14
sw/source/filter/inc/wrtswtbl.hxx | 2
sw/source/filter/rtf/rtffld.cxx | 6
sw/source/filter/rtf/rtffly.cxx | 8
sw/source/filter/rtf/rtfnum.cxx | 4
sw/source/filter/rtf/rtftbl.cxx | 8
sw/source/filter/rtf/swparrtf.cxx | 68 ++--
sw/source/filter/writer/writer.cxx | 16 -
sw/source/filter/writer/wrt_fn.cxx | 6
sw/source/filter/writer/wrtswtbl.cxx | 60 ++--
sw/source/filter/ww1/fltshell.cxx | 148 +++++----
sw/source/filter/ww1/w1par.cxx | 2
sw/source/filter/ww1/w1sprm.cxx | 22 -
sw/source/filter/ww8/WW8TableInfo.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 2
sw/source/filter/ww8/docxexport.cxx | 2
sw/source/filter/ww8/dump/dump8a.cxx | 8
sw/source/filter/ww8/dump/ww8scan.cxx | 84 ++---
sw/source/filter/ww8/fields.cxx | 5
sw/source/filter/ww8/hash_wrap.hxx | 4
sw/source/filter/ww8/rtfattributeoutput.cxx | 5
sw/source/filter/ww8/sortedarray.hxx | 4
sw/source/filter/ww8/writerhelper.cxx | 16 -
sw/source/filter/ww8/writerwordglue.cxx | 6
sw/source/filter/ww8/wrtw8esh.cxx | 42 +-
sw/source/filter/ww8/wrtw8nds.cxx | 28 -
sw/source/filter/ww8/wrtw8num.cxx | 9
sw/source/filter/ww8/wrtw8sty.cxx | 32 +-
sw/source/filter/ww8/wrtww8.cxx | 56 +--
sw/source/filter/ww8/wrtww8gr.cxx | 14
sw/source/filter/ww8/ww8atr.cxx | 53 +--
sw/source/filter/ww8/ww8glsy.cxx | 2
sw/source/filter/ww8/ww8graf.cxx | 58 +--
sw/source/filter/ww8/ww8graf2.cxx | 6
sw/source/filter/ww8/ww8par.cxx | 83 +++--
sw/source/filter/ww8/ww8par2.cxx | 96 +++---
sw/source/filter/ww8/ww8par3.cxx | 30 +-
sw/source/filter/ww8/ww8par4.cxx | 22 -
sw/source/filter/ww8/ww8par5.cxx | 42 +-
sw/source/filter/ww8/ww8par6.cxx | 72 ++--
sw/source/filter/ww8/ww8scan.cxx | 86 ++---
sw/source/filter/ww8/ww8scan.hxx | 2
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 8
sw/source/filter/xml/swxml.cxx | 12
sw/source/filter/xml/wrtxml.cxx | 16 -
sw/source/filter/xml/xmlexp.cxx | 22 -
sw/source/filter/xml/xmlfmt.cxx | 8
sw/source/filter/xml/xmlfmte.cxx | 10
sw/source/filter/xml/xmlfonte.cxx | 4
sw/source/filter/xml/xmlimp.cxx | 36 +-
sw/source/filter/xml/xmltble.cxx | 44 +-
sw/source/filter/xml/xmltbli.cxx | 77 ++---
sw/source/filter/xml/xmltexte.cxx | 10
sw/source/filter/xml/xmltexti.cxx | 36 +-
sw/source/ui/dbui/dbinsdlg.cxx | 4
sw/source/ui/dbui/mmoutputpage.cxx | 4
sw/source/ui/dialog/swdlgfact.cxx | 4
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/docvw/srcedtw.cxx | 6
sw/source/ui/inc/misc.hrc | 1
sw/source/ui/misc/glossary.cxx | 5
sw/source/ui/misc/glossary.src | 93 ------
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/shells/textsh1.cxx | 21 -
sw/source/ui/table/swtablerep.cxx | 2
sw/source/ui/table/tabledlg.cxx | 12
sw/util/makefile.mk | 2
404 files changed, 4144 insertions(+), 4302 deletions(-)
New commits:
commit 72274f70976e4347b1e5e7ff2a11e4c558c71b0c
Merge: d6c29a6... 1c48845...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 21:01:08 2010 +0100
Merge branch 'master' of ssh://git.freedesktop.org/git/libreoffice/writer
commit d6c29a6c27745e2526f5e83c3018fc8a47450a61
Merge: e84f5d6... df07d39...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Thu Nov 25 18:50:04 2010 +0100
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sw/inc/SwNumberTree.hxx
sw/inc/calbck.hxx
sw/inc/tox.hxx
sw/inc/viscrs.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/finalthreadmanager.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/text/makefile.mk
sw/source/core/txtnode/txtedt.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/srcedtw.cxx
diff --cc sw/inc/SwNumberTree.hxx
index 8451f22,4d880b6..c314041
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@@ -347,7 -353,30 +347,7 @@@ public
*/
const SwNumberTreeNode* GetPrecedingNodeOf( const SwNumberTreeNode& rNode ) const;
- #ifdef DBG_UTIL
-// /**
-// Returns a string representation of this node.
-
-// @return the string representation of this node
-// */
-// virtual String ToString() const = 0;
-
-// /**
-// Print this subtree.
-
-// @param o output stream to direct output to
-// @param rIndent additional indent for the children of this node
-// @param rMyIndent indent to use for this node
-// @param nDepth number of levels to print (-1 means all levels)
-
-// @return output stream after output of this subtree
-// */
-// String print(const String & rIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// const String & rMyIndent = String(" ",
-// RTL_TEXTENCODING_ASCII_US),
-// int nDepth = -1) const;
-
+ #if OSL_DEBUG_LEVEL > 1
static unsigned long GetInstances();
unsigned long GetSerial();
#endif
diff --cc sw/inc/calbck.hxx
index 979fb08,4c5c449..c23cb9f
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@@ -194,8 -197,8 +194,8 @@@ private
class SwClientIter
{
- friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
- friend void SwModify::Add(SwClient *); // nur fuer OSL_ENSURE(!
+ friend SwClient* SwModify::_Remove(SwClient *); // for ptr correction
- friend void SwModify::Add(SwClient *); // only for ASSERT !
++ friend void SwModify::Add(SwClient *); // only for OSL_ENSURE !
SwModify const& rRoot;
SwClient *pAkt, *pDelNext;
diff --cc sw/inc/doc.hxx
index df0bab8,bc0f6e5..3636b88
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@@ -1047,9 -1075,9 +1047,9 @@@ public
*/
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
inline void SetOLEPrtNotifyPending( bool bSet = true );
- void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
+ void PrtOLENotify( sal_Bool bAll ); //All or only marked
- #ifdef DBG_UTIL
+ #if OSL_DEBUG_LEVEL > 1
bool InXMLExport() const { return mbXMLExport; }
void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; }
#endif
diff --cc sw/inc/swrect.hxx
index c279f4d,2d210df..38882b6
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@@ -300,10 -305,10 +301,10 @@@ inline SwRect &SwRect::operator-=( cons
}
-//--------------------------- Sonstiges
+// other
inline Rectangle SwRect::SVRect() const
{
- ASSERT( !IsEmpty(), "SVRect() without Width or Height" );
+ OSL_ENSURE( !IsEmpty(), "SVRect() without Width or Height" );
return Rectangle( m_Point.getX(), m_Point.getY(),
m_Point.getX() + m_Size.getWidth() - 1, //Right()
m_Point.getY() + m_Size.getHeight() - 1 ); //Bottom()
diff --cc sw/inc/tox.hxx
index b66f4ca,ce31eca..c78236e
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@@ -756,9 -771,12 +757,8 @@@ inline USHORT SwTOXBase::GetLevel() con
inline void SwTOXBase::SetTemplateName(const String& rName)
{
-// OSL_ENSURE(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
-// OSL_ENSURE(aData.pTemplateName, "pTemplateName == 0");
-// (*aData.pTemplateName) = rName;
DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
aStyleNames[0] = rName;
--
}
inline USHORT SwTOXBase::GetOptions() const
diff --cc sw/inc/viscrs.hxx
index 0927cf5,42213d2..5008005
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@@ -162,9 -165,9 +162,9 @@@ public
// TRUE: an die Position kann der Cursor gesetzt werden
virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
- #ifdef DBG_UTIL
- // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
- // am sichtbaren Cursor
+ #if OSL_DEBUG_LEVEL > 1
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
++ // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
++ // am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
@@@ -206,9 -209,9 +206,9 @@@ public
// TRUE: an die Position kann der Cursor gesetzt werden
virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
- #ifdef DBG_UTIL
- // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
- // am sichtbaren Cursor
+ #if OSL_DEBUG_LEVEL > 1
-// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
-// am sichtbaren Cursor
++ // zum Testen des UNO-Crsr Verhaltens hier die Implementierung
++ // am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
( nsSwCursorSelOverFlags::SELOVER_CHECKNODESSECTION |
nsSwCursorSelOverFlags::SELOVER_TOGGLE |
diff --cc sw/source/core/crsr/crsrsh.cxx
index 171233c,334e818..5b92560
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@@ -1444,13 -1465,14 +1444,13 @@@ void SwCrsrShell::UpdateCrsr( USHORT eF
Point aCentrPt( aCharRect.Center() );
aTmpState.bSetInReadOnly = IsReadOnlyAvailable();
pTblFrm->GetCrsrOfst( pTblCrsr->GetPoint(), aCentrPt, &aTmpState );
- #ifndef DBG_UTIL
- pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
- #else
+ #if OSL_DEBUG_LEVEL > 1
if ( !pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() ) )
- ASSERT( !this, "GetCharRect failed." );
+ OSL_ENSURE( !this, "GetCharRect failed." );
+ #else
+ pTblFrm->GetCharRect( aCharRect, *pTblCrsr->GetPoint() );
#endif
}
-// ALIGNRECT( aCharRect );
pVisCrsr->Hide(); // sichtbaren Cursor immer verstecken
// Curosr in den sichtbaren Bereich scrollen
diff --cc sw/source/core/crsr/findattr.cxx
index 17a094c,57bf8c4..65b6c96
--- a/sw/source/core/crsr/findattr.cxx
+++ b/sw/source/core/crsr/findattr.cxx
@@@ -435,9 -435,12 +435,9 @@@ int SwAttrCheckArr::SetAttrFwd( const S
// vorhanden, auf den Stack. Aber nur wenn es noch grosser ist
if( pCmp->nEnd > aTmp.nEnd )
{
- ASSERT( !pStackArr[ nWhch - nArrStart ].nWhich,
+ OSL_ENSURE( !pStackArr[ nWhch - nArrStart ].nWhich,
"Stack-Platz ist noch belegt" );
- // ---------
- // JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
- // pCmp->nStt = aTmp.nEnd;
if( aTmp.nStt <= pCmp->nStt )
pCmp->nStt = aTmp.nEnd;
else
@@@ -588,9 -591,12 +588,9 @@@ int SwAttrCheckArr::SetAttrBwd( const S
// vorhanden, auf den Stack. Aber nur wenn es noch grosser ist
if( pCmp->nStt < aTmp.nStt )
{
- ASSERT( !pStackArr[ nWhch - nArrStart ].nWhich,
+ OSL_ENSURE( !pStackArr[ nWhch - nArrStart ].nWhich,
"Stack-Platz ist noch belegt" );
-// ---------
-// JP 22.08.96: nur Ende manipulieren reicht nicht. Bug 30547
-// pCmp->nEnd = aTmp.nStt;
if( aTmp.nEnd <= pCmp->nEnd )
pCmp->nEnd = aTmp.nStt;
else
diff --cc sw/source/core/doc/docfmt.cxx
index f0d97bf,f3329d1..7dc1642
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@@ -2426,11 -2439,13 +2426,11 @@@ void SwDoc::_CreateNumberFormatter(
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::_CreateNumberFormatter" );
- ASSERT( !pNumberFormatter, "ist doch schon vorhanden" );
+ OSL_ENSURE( !pNumberFormatter, "ist doch schon vorhanden" );
- LanguageType eLang = LANGUAGE_SYSTEM; //System::GetLanguage();
-/* ((const SvxLanguageItem&)GetAttrPool().
- GetDefaultItem( RES_CHRATR_LANGUAGE )).GetLanguage();
-*/
+ LanguageType eLang = LANGUAGE_SYSTEM;
+
Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
pNumberFormatter = new SvNumberFormatter( xMSF, eLang );
pNumberFormatter->SetEvalDateFormat( NF_EVALDATEFORMAT_FORMAT_INTL );
diff --cc sw/source/core/doc/docnum.cxx
index 580af91,cc9b780..a38f9ca
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@@ -365,10 -372,12 +365,9 @@@ BOOL SwDoc::OutlineUpDown( const SwPaM
if( pColl->IsAssignedToListLevelOfOutlineStyle() )
{
-
- // OSL_ENSURE(pColl->GetOutlineLevel() < MAXLEVEL, //#outline level,removed by zhaojianwei
- // "non outline node in outline nodes?");
- //int nLevel = pColl->GetOutlineLevel();
const int nLevel = pColl->GetAssignedOutlineStyleLevel();//#outline level,add by zhaojianwei
- ASSERT(aMoveArr[nLevel] >= 0,
+ OSL_ENSURE(aMoveArr[nLevel] >= 0,
"move table: current TxtColl not found when building table!");
@@@ -1218,8 -1445,9 +1217,8 @@@ namespac
void SwDoc::MakeUniqueNumRules(const SwPaM & rPaM)
{
- ASSERT( rPaM.GetDoc() == this, "need same doc" );
+ OSL_ENSURE( rPaM.GetDoc() == this, "need same doc" );
-// map<SwNumRule *, SwNumRule *> aMyNumRuleMap;
::std::map<SwNumRule *, ListStyleData> aMyNumRuleMap;
ULONG nStt = rPaM.Start()->nNode.GetIndex();
diff --cc sw/source/core/doc/number.cxx
index 5aeb117,166a53c..504ee06
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@@ -869,8 -925,9 +869,8 @@@ void SwNumRule::SetInvalidRule(BOOL bFl
{
const SwTxtNode* pTxtNode = *aIter;
// --> OD 2010-06-04 #i111681# - applying patch from cmc
-// aLists.insert( pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() ) );
SwList* pList = pTxtNode->GetDoc()->getListByName( pTxtNode->GetListId() );
- ASSERT( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
+ OSL_ENSURE( pList, "<SwNumRule::SetInvalidRule(..)> - list at which the text node is registered at does not exist. This is a serious issue --> please inform OD.");
if ( pList )
{
aLists.insert( pList );
diff --cc sw/source/core/docnode/finalthreadmanager.cxx
index bfd9fa6,1517b00..6d5d0c9
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@@ -493,11 -498,11 +493,6 @@@ void SAL_CALL FinalThreadManager::notif
if ( mpCancelJobsThread != 0 )
{
-- if ( !mpCancelJobsThread->allJobsCancelled() )
-- {
-
- }
-
- // OSL_ENSURE( false, "<FinalThreadManager::notifyTermination()> - cancellation of registered jobs not yet finished -> wait for its finish" );
- }
-
mpCancelJobsThread->stopWhenAllJobsCancelled();
mpCancelJobsThread->join();
delete mpCancelJobsThread;
diff --cc sw/source/core/docnode/ndtbl.cxx
index 4936b20,6d59124..b9463a0
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@@ -1209,9 -1221,15 +1203,9 @@@ const SwTable* SwDoc::TextToTable( cons
GetTxtCollFromPool( RES_POOLCOLL_STANDARD )/*, pUndo*/ );
SwTable * pNdTbl = &pTblNd->GetTable();
- ASSERT( pNdTbl, "kein Tabellen-Node angelegt." )
+ OSL_ENSURE( pNdTbl, "kein Tabellen-Node angelegt." );
pTableFmt->Add( pNdTbl ); // das Frame-Format setzen
-// const USHORT nRowsToRepeat =
-// tabopts::HEADLINE == (rInsTblOpts.mnInsMode & tabopts::HEADLINE) ?
-// rInsTblOpts.mnRowsToRepeat :
-// 0;
-// pNdTbl->SetRowsToRepeat( nRowsToRepeat );
-
BOOL bUseBoxFmt = FALSE;
if( !pBoxFmt->GetDepends() )
{
@@@ -1369,9 -1414,13 +1363,8 @@@ SwTableNode* SwNodes::TextToTable( cons
std::vector<std::vector < SwNodeRange > >::const_iterator aRowIter = rTableNodes.begin();
for( nLines = 0, nBoxes = 0;
aRowIter != rTableNodes.end();
- ++aRowIter, /*aSttIdx += 2, */nLines++, nBoxes = 0 )
+ ++aRowIter, nLines++, nBoxes = 0 )
{
-
-// SwTxtNode* pTxtNd = aSttIdx.GetNode().GetTxtNode();
-// OSL_ENSURE( pTxtNd, "nur TextNodes in der Tabelle aufnehmen" );
-
pLine = new SwTableLine( pLineFmt, 1, 0 );
pTable->GetTabLines().C40_INSERT( SwTableLine, pLine, nLines );
diff --cc sw/source/core/edit/edlingu.cxx
index 724541f,6dcdcd7..a1344dd
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@@ -356,7 -358,9 +356,7 @@@ uno::Any SwSpellIter::Continue( sal_uIn
if( !pMySh )
return aSpellRet;
- ASSERT( GetEnd(), "SwEditShell::SpellContinue() ohne Start?");
-// const SwPosition *pEnd = GetEnd();
-
+ OSL_ENSURE( GetEnd(), "SwEditShell::SpellContinue() ohne Start?");
uno::Reference< uno::XInterface > xSpellRet;
sal_Bool bGoOn = sal_True;
@@@ -430,7 -434,9 +430,7 @@@ uno::Any SwConvIter::Continue( sal_uInt
if( !pMySh )
return aConvRet;
- ASSERT( GetEnd(), "SwConvIter::Continue() ohne Start?");
-// const SwPosition *pEnd = GetEnd();
-
+ OSL_ENSURE( GetEnd(), "SwConvIter::Continue() ohne Start?");
rtl::OUString aConvText;
sal_Bool bGoOn = sal_True;
@@@ -1240,9 -1256,12 +1240,9 @@@ bool SwEditShell::GetGrammarCorrection
return bRes;
}
-/*-- 18.09.2003 15:08:18---------------------------------------------------
-
- -----------------------------------------------------------------------*/
bool SwEditShell::SpellSentence(::svx::SpellPortions& rPortions, bool bIsGrammarCheck)
{
- ASSERT( pSpellIter, "SpellIter missing" );
+ OSL_ENSURE( pSpellIter, "SpellIter missing" );
if(!pSpellIter)
return false;
bool bRet = pSpellIter->SpellSentence(rPortions, bIsGrammarCheck);
diff --cc sw/source/core/edit/ednumber.cxx
index f9564ed,ed36678..af58212
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@@ -555,11 -559,15 +555,11 @@@ BOOL SwEditShell::IsProtectedOutlinePar
{
SwNodePtr pTmpNd = rOutlNd[ nPos ];
- // --> OD 2008-04-02 #refactorlists#
-// BYTE nTmpLvl = GetRealLevel( pTmpNd->GetTxtNode()->
-// GetTxtColl()->GetOutlineLevel() );
- // int nTmpLvl = pTmpNd->GetTxtNode()->GetOutlineLevel();//#outline level,zhaojianwei
int nTmpLvl = pTmpNd->GetTxtNode()->GetAttrOutlineLevel();
- // OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl < MAXLEVEL,
- OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL, //<-end,zhaojianwei
+
- ASSERT( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL, //<-end,zhaojianwei
++ OSL_ENSURE( nTmpLvl >= 0 && nTmpLvl <= MAXLEVEL,
"<SwEditShell::IsProtectedOutlinePara()>" );
-- // <--
++
if( bFirst )
{
nLvl = nTmpLvl;
diff --cc sw/source/core/edit/edtox.cxx
index 1995d00,370b9d6..33c2685
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@@ -113,19 -113,24 +113,19 @@@ USHORT SwEditShell::GetCurTOXMarks(SwTO
return GetDoc()->GetCurTOXMark( *GetCrsr()->Start(), rMarks );
}
-/* -----------------01.09.99 16:05-------------------
-
- --------------------------------------------------*/
BOOL SwEditShell::IsTOXBaseReadonly(const SwTOXBase& rTOXBase) const
{
- ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
return rTOXSect.IsProtect();
}
-/* -----------------18.10.99 15:53-------------------
- --------------------------------------------------*/
void SwEditShell::SetTOXBaseReadonly(const SwTOXBase& rTOXBase, BOOL bReadonly)
{
- ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
((SwTOXBase&)rTOXBase).SetProtected(bReadonly);
- ASSERT( rTOXSect.SwSection::GetType() == TOX_CONTENT_SECTION, "not a TOXContentSection" );
+ OSL_ENSURE( rTOXSect.SwSection::GetType() == TOX_CONTENT_SECTION, "not a TOXContentSection" );
SwSectionData aSectionData(rTOXSect);
aSectionData.SetProtectFlag(bReadonly);
diff --cc sw/source/core/fields/authfld.cxx
index 80f9ba4,fad6621..1a6619b
--- a/sw/source/core/fields/authfld.cxx
+++ b/sw/source/core/fields/authfld.cxx
@@@ -131,10 -144,12 +131,10 @@@ SwFieldType* SwAuthorityFieldType::Cop
{
return new SwAuthorityFieldType(m_pDoc);
}
-/* -----------------17.09.99 13:43-------------------
- --------------------------------------------------*/
void SwAuthorityFieldType::RemoveField(long nHandle)
{
- #ifdef DBG_UTIL
+ #if OSL_DEBUG_LEVEL > 1
BOOL bRemoved = FALSE;
#endif
for(USHORT j = 0; j < m_pDataArr->Count(); j++)
@@@ -224,10 -245,12 +224,10 @@@ const SwAuthEntry* SwAuthorityFieldType
break;
}
}
- ASSERT( pRet, "invalid Handle" );
+ OSL_ENSURE( pRet, "invalid Handle" );
return pRet;
}
-/* -----------------21.09.99 13:34-------------------
- --------------------------------------------------*/
void SwAuthorityFieldType::GetAllEntryIdentifiers(
SvStringsDtor& rToFill )const
{
@@@ -401,10 -433,14 +401,12 @@@ USHORT SwAuthorityFieldType::GetSequenc
break;
}
}
- ASSERT(bCurrentFieldWithoutTextNode || nRet, "Handle not found")
+ #if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE(bCurrentFieldWithoutTextNode || nRet, "Handle not found");
+ #endif
return nRet;
}
-/* -----------------------------15.11.00 17:33--------------------------------
- ---------------------------------------------------------------------------*/
bool SwAuthorityFieldType::QueryValue( Any& rVal, USHORT nWhichId ) const
{
switch( nWhichId )
diff --cc sw/source/core/fields/cellfml.cxx
index e8302c3,3ed664f..d41e029
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@@ -725,9 -725,23 +725,9 @@@ const SwTable* SwTableFormula::FindTabl
const SwFrm* lcl_GetBoxFrm( const SwTableBox& rBox )
{
-/*
-
- // oder besser ueber die Box den Frame suchen
-
- SwClientIter aIter( *pBox->GetFrmFmt() );
- ULONG nMinPos = ULONG_MAX;
- const SwFrm* pFnd = 0;
- for( SwFrm* pF = (SwFrm*)aIter.First( TYPE( SwCellFrm )); pF;
- pF = (SwFrm*)aIter.Next() )
- {
- if( pF->Frm().Y() <
- }
-*/
-
SwNodeIndex aIdx( *rBox.GetSttNd() );
SwCntntNode* pCNd = aIdx.GetNodes().GoNext( &aIdx );
- ASSERT( pCNd, "Box hat keinen TextNode" );
+ OSL_ENSURE( pCNd, "Box hat keinen TextNode" );
Point aPt; // den im Layout 1. Frame returnen - Tab.Kopfzeile !!
return pCNd->GetFrm( &aPt, NULL, FALSE );
}
diff --cc sw/source/core/fields/chpfld.cxx
index 11c588b,8bf00d8..b38d6a8
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@@ -102,6 -102,22 +102,7 @@@ SwField* SwChapterField::Copy() cons
return pTmp;
}
-// --> OD 2008-02-14 #i53420#
-//void SwChapterField::ChangeExpansion( const SwFrm* pFrm,
-// const SwTxtNode* pTxtNd,
-// sal_Bool bSrchNum )
-//{
-// OSL_ENSURE( pFrm, "in welchem Frame stehe ich denn?" )
-// SwDoc* pDoc = (SwDoc*)pTxtNd->GetDoc();
-// SwPosition aPos( pDoc->GetNodes().GetEndOfContent() );
-
-// if( pFrm->IsInDocBody() )
-// aPos.nNode = *pTxtNd;
-// else if( 0 == (pTxtNd = GetBodyTxtNode( *pDoc, aPos, *pFrm )) )
-// // kein TxtNode (Formatierung Kopf/Fusszeile)
-// return;
-// ChangeExpansion(*pTxtNd, bSrchNum);
-//}
++// #i53420#
void SwChapterField::ChangeExpansion(const SwFrm* pFrm,
const SwCntntNode* pCntntNode,
sal_Bool bSrchNum )
@@@ -121,7 -137,7 +122,6 @@@
ChangeExpansion( *pTxtNode, bSrchNum );
}
}
--// <--
void SwChapterField::ChangeExpansion(const SwTxtNode &rTxtNd, sal_Bool bSrchNum)
{
@@@ -137,10 -153,16 +137,9 @@@
{
BYTE nPrevLvl = nLevel;
- ASSERT( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
- // --> OD 2008-04-02 #refactorlists#
-// nLevel = GetRealLevel( pONd->GetTxtColl()->
-// GetOutlineLevel() );
- // OSL_ENSURE( pONd->GetOutlineLevel() >= 0 && pONd->GetOutlineLevel() < MAXLEVEL, //#outline level,zhaojianwei
- // "<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
- //nLevel = static_cast<BYTE>(pONd->GetOutlineLevel());
+ OSL_ENSURE( pONd->GetAttrOutlineLevel() >= 0 && pONd->GetAttrOutlineLevel() <= MAXLEVEL,
"<SwChapterField::ChangeExpansion(..)> - outline node with inconsistent outline level. Serious defect -> please inform OD." );
-- nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel()); //<-end,zhaojianwei
-- // <--
++ nLevel = static_cast<BYTE>(pONd->GetAttrOutlineLevel());
if( nPrevLvl < nLevel )
nLevel = nPrevLvl;
diff --cc sw/source/core/layout/makefile.mk
index 408fea4,af69ec7..e986ec8
--- a/sw/source/core/layout/makefile.mk
+++ b/sw/source/core/layout/makefile.mk
@@@ -81,15 -100,8 +81,15 @@@ EXCEPTIONSFILES =
$(SLO)$/virtoutp.obj \
$(SLO)$/wsfrm.obj
+SLOFILES = \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/objectformattertxtfrm.obj \
+ $(SLO)$/objectformatterlayfrm.obj \
+ $(SLO)$/sortedobjs.obj \
+ $(SLO)$/swselectionlist.obj \
+ $(SLO)$/unusedf.obj
+
- .IF "$(dbgutil)"!=""
+ .IF "$(DBG_LEVEL)">="2"
SLOFILES += \
$(SLO)$/dbg_lay.obj
.ENDIF
diff --cc sw/source/core/objectpositioning/anchoredobjectposition.cxx
index c0cbe6a,78b9ba8..61028b5
--- a/sw/source/core/objectpositioning/anchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/anchoredobjectposition.cxx
@@@ -327,8 -327,12 +327,8 @@@ void SwAnchoredObjectPosition::_GetVert
break;
// no break here, because text::RelOrientation::CHAR is invalid, if !mbAnchorToChar
default:
- //case text::RelOrientation::PAGE_LEFT: not valid for vertical alignment
- //case text::RelOrientation::PAGE_RIGHT: not valid for vertical alignment
- //case text::RelOrientation::FRAME_LEFT: not valid for vertical alignment
- //case text::RelOrientation::FRAME_RIGHT: not valid for vertical alignment
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAnchoredObjectPosition::_GetVertAlignmentValues(..)> - invalid relative alignment" );
}
}
diff --cc sw/source/core/text/makefile.mk
index 51e3ffb,f7786a5..c140462
--- a/sw/source/core/text/makefile.mk
+++ b/sw/source/core/text/makefile.mk
@@@ -47,20 -47,8 +47,20 @@@ CFLAGS+=-DENABLE_GRAPHIT
# --- Files --------------------------------------------------------
SLOFILES = \
- $(SLO)$/atrstck.obj \
- $(SLO)$/EnhancedPDFExportHelper.obj \
+ $(EXCEPTIONSFILES) \
+ $(SLO)$/txtcache.obj \
+ $(SLO)$/txtinit.obj
+
- .IF "$(dbgutil)"!=""
++.IF "$(DBG_LEVEL)">="2"
+SLOFILES += \
+ $(SLO)$/txtio.obj
+.ENDIF
+
+EXCEPTIONSFILES = \
+ $(SLO)$/EnhancedPDFExportHelper.obj \
+ $(SLO)$/SwGrammarMarkUp.obj \
+ $(SLO)$/atrstck.obj \
+ $(SLO)$/blink.obj \
$(SLO)$/frmcrsr.obj \
$(SLO)$/frmform.obj \
$(SLO)$/frminf.obj \
diff --cc sw/source/filter/basflt/fltini.cxx
index a024cbd,9676bd3..14a8a0f
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@@ -229,7 -243,82 +229,6 @@@ ULONG StgReader::OpenMainStream( SvStor
return nRet;
}
--/* */
-/*
-ULONG Sw3Reader::Read( SwDoc &rDoc, SwPaM &rPam, const String & )
-{
- ULONG nRet;
- if( pStg && pIO )
- {
- // TRUE: Vorlagen ueberschreiben
- pIO->SetReadOptions( aOpt,TRUE );
- if( !bInsertMode )
- {
- // Im Laden-Modus darf der PaM-Content-Teil nicht
- // in den Textbereich zeigen (Nodes koennen geloescht werden)
- rPam.GetBound( TRUE ).nContent.Assign( 0, 0 );
- rPam.GetBound( FALSE ).nContent.Assign( 0, 0 );
- }
- nRet = pIO->Load( pStg, bInsertMode ? &rPam : 0 );
- aOpt.ResetAllFmtsOnly();
- pIO->SetReadOptions( aOpt, TRUE );
- }
- else
- {
- OSL_ENSURE( !this, "Sw3-Read ohne Storage und/oder IO-System" );
- nRet = ERR_SWG_READ_ERROR;
- }
- return nRet;
-}
-
- // read the sections of the document, which is equal to the medium.
- // returns the count of it
-USHORT Sw3Reader::GetSectionList( SfxMedium& rMedium,
- SvStrings& rStrings ) const
-{
- SvStorageRef aStg( rMedium.GetStorage() );
- const SfxFilter* pFlt = rMedium.GetFilter();
- OSL_ENSURE( pFlt && pFlt->GetVersion(),
- "Kein Filter oder Filter ohne FF-Version" );
- if( pFlt && pFlt->GetVersion() )
- aStg->SetVersion( (long)pFlt->GetVersion() );
-
- if( pIO )
- pIO->GetSectionList( &aStg, rStrings );
- return rStrings.Count();
- return 0;
-}
-*/
-
-/*ULONG Sw3Writer::WriteStorage()
-{
- ULONG nRet;
- if( pIO )
- {
- // der gleiche Storage -> Save, sonst SaveAs aufrufen
- if( !bSaveAs )
- nRet = pIO->Save( pOrigPam, bWriteAll );
- else
- nRet = pIO->SaveAs( pStg, pOrigPam, bWriteAll );
-
- pIO = 0; // nach dem Schreiben ist der Pointer ungueltig !!
- }
- else
- {
- OSL_ENSURE( !this, "Sw3-Writer ohne IO-System" );
- nRet = ERR_SWG_WRITE_ERROR;
- }
- return nRet;
-}
-
-ULONG Sw3Writer::WriteMedium( SfxMedium& )
-{
- DBG_ERROR( "Shouldn't be used currently!");
- return WriteStorage();
-}
-
-BOOL Sw3Writer::IsSw3Writer() const { return TRUE; }
-*/
void Writer::SetPasswd( const String& ) {}
diff --cc sw/source/filter/html/htmlcss1.cxx
index 5162de0,f4c8f5e..7359a60
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@@ -1512,8 -1516,12 +1512,8 @@@ BOOL SwCSS1Parser::MayBePositioned( con
void SwCSS1Parser::AddClassName( String& rFmtName, const String& rClass )
{
- ASSERT( rClass.Len(), "Style-Klasse ohne Laenge?" );
+ OSL_ENSURE( rClass.Len(), "Style-Klasse ohne Laenge?" );
-// ??????????
-// String aTmp( rClass );
-// GetpApp()->GetAppInternational().ToLower( aTmp );
-
(rFmtName += '.') += rClass;
}
diff --cc sw/source/filter/html/htmltab.cxx
index bc97260,ee4cd64..b4a0775
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@@ -2273,10 -2275,11 +2275,10 @@@ void HTMLTable::InsertCell( HTMLTableCn
inline void HTMLTable::CloseSection( sal_Bool bHead )
{
// die vorhergende Section beenden, falls es schon eine Zeile gibt
- ASSERT( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
+ OSL_ENSURE( nCurRow<=nRows, "ungeultige aktuelle Zeile" );
if( nCurRow>0 && nCurRow<=nRows )
((*pRows)[nCurRow-1])->SetEndOfGroup();
- if( bHead /*&& nCurRow==1*/ )
-// bHeadlineRepeat = sal_True;
+ if( bHead )
nHeadlineRepeat = nCurRow;
}
@@@ -3636,8 -3649,16 +3638,8 @@@ void SwHTMLParser::BuildTableCell( HTML
// Entweder kommt die Tabelle in keinen Rahmen und befindet
// sich in keinem Rahmen (wird also durch Zellen simuliert),
// oder es gibt bereits Inhalt an der entsprechenden Stelle.
- ASSERT( !bForceFrame || pCurTable->HasParentSection(),
+ OSL_ENSURE( !bForceFrame || pCurTable->HasParentSection(),
"Tabelle im Rahmen hat keine Umgebung!" );
-// SCHOEN WAER'S, aber wie bekommen den Inhalt nicht zurueck
-// in die umgebende Zelle
-// if( bForceFrame && !pCurTable->HasParentSection() )
-// {
-// pCurTable->SetParentContents(
-// InsertTableContents( sal_False, SVX_ADJUST_END ) );
-// pCurTable->SetHasParentSection( sal_True );
-// }
sal_Bool bAppend = sal_False;
if( bForceFrame )
diff --cc sw/source/filter/html/swhtml.cxx
index 6cf9f7f,0fd023a..075dfab
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@@ -475,10 -476,11 +475,10 @@@ __EXPORT SwHTMLParser::~SwHTMLParser(
DeleteFormImpl();
DeleteFootEndNoteImpl();
- ASSERT( !pTable, "Es existiert noch eine offene Tabelle" );
+ OSL_ENSURE( !pTable, "Es existiert noch eine offene Tabelle" );
delete pImageMaps;
- //delete pTable;
- ASSERT( !pPendStack,
+ OSL_ENSURE( !pPendStack,
"SwHTMLParser::~SwHTMLParser: Hier sollte es keinen Pending-Stack mehr geben" );
while( pPendStack )
{
@@@ -2966,7 -2972,12 +2966,7 @@@ void SwHTMLParser::EndAttr( _HTMLAttr*
while( pLast && pLast->GetNext() != pAttr )
pLast = pLast->GetNext();
- ASSERT( pLast, "Attribut nicht in eigener Liste gefunden!" );
+ OSL_ENSURE( pLast, "Attribut nicht in eigener Liste gefunden!" );
-
- // das Attribut nicht an der PaM-Psoition beenden, sondern da,
- // wo das danch gestartete Attribut anfing???
- //pEndIdx = &pPrev->GetSttPara();
- //nEndCnt = pPrev->GetSttCnt();
}
BOOL bMoveBack = FALSE;
diff --cc sw/source/filter/ww8/rtfattributeoutput.cxx
index b876a9e,66fb119..65ae866
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@@ -2462,10 -2455,13 +2462,10 @@@ void RtfAttributeOutput::ParaNumRule_Im
const SwNumRule* pRule = pTxtNd->GetNumRule();
- // --> OD 2008-03-18 #refactorlists#
- // if( pRule && MAXLEVEL > pTxtNd->GetActualListLevel() )
if( pRule && pTxtNd->IsInList() )
- // <--
{
// --> OD 2008-03-18 #refactorlists#
- ASSERT( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
+ OSL_ENSURE( pTxtNd->GetActualListLevel() >= 0 && pTxtNd->GetActualListLevel() < MAXLEVEL,
"<SwRTFWriter::OutListNum(..)> - text node does not have valid list level. Serious defect -> please inform OD" );
// <--
@@@ -2663,33 -2665,15 +2663,32 @@@ void RtfAttributeOutput::FormatULSpace
{
if( m_rExport.bOutPageDescs )
{
-
- ASSERT( m_rExport.GetCurItemSet(), "Impossible" );
- if( rULSpace.GetUpper() )
++ OSL_ENSURE( m_rExport.GetCurItemSet(), "Impossible" );
+ if ( !m_rExport.GetCurItemSet() )
+ return;
+
+ HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() );
+
+ if ( aDistances.HasHeader() )
{
- m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
- m_aSectionBreaks.append((sal_Int32)rULSpace.GetUpper());
+ if( aDistances.dyaTop )
+ {
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGTSXN);
+ m_aSectionBreaks.append((sal_Int32)aDistances.dyaTop);
+ }
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_HEADERY);
+ m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrTop);
}
- if( rULSpace.GetLower() )
+
+ if( aDistances.HasFooter() )
{
- m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
- m_aSectionBreaks.append((sal_Int32)rULSpace.GetLower());
+ if( aDistances.dyaBottom )
+ {
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_MARGBSXN);
+ m_aSectionBreaks.append((sal_Int32)aDistances.dyaBottom);
+ }
+ m_aSectionBreaks.append(OOO_STRING_SVTOOLS_RTF_FOOTERY);
+ m_aSectionBreaks.append((sal_Int32)aDistances.dyaHdrBottom);
}
if (!m_bBufferSectionBreaks)
m_rExport.Strm() << m_aSectionBreaks.makeStringAndClear();
diff --cc sw/source/filter/ww8/wrtw8num.cxx
index 9d9e3c8,5a4cd5a..129b628
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@@ -609,8 -609,10 +609,7 @@@ void WW8Export::Out_WwNumLvl( BYTE nWwL
void WW8Export::Out_SwNumLvl( BYTE nSwLevel )
{
-
- ASSERT( nSwLevel < MAXLEVEL, "numbered?");
- // --> OD 2008-04-02 #refactorlists#
-// OSL_ENSURE(IsNum(nSwLevel), "numbered?");
+ OSL_ENSURE( nSwLevel < MAXLEVEL, "numbered?");
- // <--
Out_WwNumLvl( nSwLevel + 1 );
}
diff --cc sw/source/filter/ww8/wrtw8sty.cxx
index 7e55f86,c82f2b1..c2bd9fd
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@@ -2153,8 -2155,9 +2153,8 @@@ void WW8_WrPlcSubDoc::WriteGenericPlc(
{
pTxtPos->Write( *rWrt.pTableStrm );
const SvULongs* pShapeIds = GetShapeIdArr();
- ASSERT( pShapeIds, "wo sind die ShapeIds?" );
+ OSL_ENSURE( pShapeIds, "wo sind die ShapeIds?" );
- // nLen = pTxtPos->Count();
for ( i = 0; i < nLen; ++i )
{
// write textbox story - FTXBXS
diff --cc sw/source/filter/ww8/ww8par3.cxx
index bbf36bf,2cbe215..b86545e
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@@ -223,8 -223,8 +223,8 @@@ eF_ResT SwWW8ImplReader::Read_F_FormChe
IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
IFieldmark* pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeNoTextFieldBookmark(
*pPaM, aBookmarkName,
- rtl::OUString::createFromAscii( ODF_FORMCHECKBOX ) ) );
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_FORMCHECKBOX )) ) );
- ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+ OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if (pFieldmark!=NULL) {
IFieldmark::parameter_map_t* const pParameters = pFieldmark->GetParameters();
ICheckboxFieldmark* pCheckboxFm = dynamic_cast<ICheckboxFieldmark*>(pFieldmark);
@@@ -296,8 -296,8 +296,8 @@@ eF_ResT SwWW8ImplReader::Read_F_FormLis
IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>(
pMarksAccess->makeNoTextFieldBookmark( *pPaM, aBookmarkName,
- ::rtl::OUString::createFromAscii( ODF_FORMDROPDOWN ) ) );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_FORMDROPDOWN )) ) );
- ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+ OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if ( pFieldmark != NULL )
{
uno::Sequence< ::rtl::OUString > vListEntries(aFormula.maListEntries.size());
diff --cc sw/source/filter/ww8/ww8par5.cxx
index b80cdcf,bb1a210..8076326
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@@ -701,8 -705,8 +701,8 @@@ sal_uInt16 SwWW8ImplReader::End_Field(
SwPaM aFldPam( maFieldStack.back().GetPtNode(), maFieldStack.back().GetPtCntnt(), aEndPos.nNode, aEndPos.nContent.GetIndex());
IDocumentMarkAccess* pMarksAccess = rDoc.getIDocumentMarkAccess( );
IFieldmark *pFieldmark = dynamic_cast<IFieldmark*>( pMarksAccess->makeFieldBookmark(
- aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString::createFromAscii(ODF_FORMTEXT ) ) );
+ aFldPam, maFieldStack.back().GetBookmarkName(), ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(ODF_FORMTEXT )) ) );
- ASSERT(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
+ OSL_ENSURE(pFieldmark!=NULL, "hmmm; why was the bookmark not created?");
if (pFieldmark!=NULL) {
const IFieldmark::parameter_map_t& pParametersToAdd = maFieldStack.back().getParameters();
pFieldmark->GetParameters()->insert(pParametersToAdd.begin(), pParametersToAdd.end());
diff --cc sw/source/filter/ww8/ww8par6.cxx
index 9fa9f82,937fdca..74bf894
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@@ -4753,7 -4763,10 +4753,9 @@@ sal_uInt32 SwWW8ImplReader::ExtractColo
#endif
)
{
- ASSERT(bVer67 == false, "Impossible");
+ #if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE(bVer67 == false, "Impossible");
+ #endif
- // OSL_ENSURE(SVBT32ToUInt32(rpData) == 0xFF000000, "Unknown 1 not 0xff000000");
sal_uInt32 nFore = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
rpData+=4;
sal_uInt32 nBack = wwUtility::BGRToRGB(SVBT32ToUInt32(rpData));
diff --cc sw/source/filter/xml/xmltble.cxx
index 4f1c6bc,bd3b866..fd7fde7
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@@ -178,16 -178,20 +178,12 @@@ SwXMLTableLines_Impl::SwXMLTableLines_I
{
nEndCPos = nCheckPos;
}
-- else
-- {
-
- }
- /*
- OSL_ENSURE( SwXMLTableColumn_impl(nCheckPos) ==
- SwXMLTableColumn_Impl(nEndCPos),
- "rows have different total widths" );
- */
- }
#endif
nCPos = (sal_uInt16)nWidth;
- #ifdef DBG_UTIL
+ #if OSL_DEBUG_LEVEL > 1
SwXMLTableColumn_Impl aCol( (sal_uInt16)nWidth );
- ASSERT( aCols.Seek_Entry(&aCol), "couldn't find last column" );
- ASSERT( SwXMLTableColumn_Impl(nCheckPos) ==
+ OSL_ENSURE( aCols.Seek_Entry(&aCol), "couldn't find last column" );
+ OSL_ENSURE( SwXMLTableColumn_Impl(nCheckPos) ==
SwXMLTableColumn_Impl(nCPos),
"rows have different total widths" );
#endif
diff --cc sw/source/filter/xml/xmltbli.cxx
index f818005,86bbe4a..685a4e0
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@@ -349,13 -349,14 +349,12 @@@ SwXMLTableRow_Impl::SwXMLTableRow_Impl
inline SwXMLTableCell_Impl *SwXMLTableRow_Impl::GetCell( sal_uInt32 nCol ) const
{
- ASSERT( nCol < USHRT_MAX,
+ OSL_ENSURE( nCol < USHRT_MAX,
"SwXMLTableRow_Impl::GetCell: column number is to big" );
-- // --> OD 2009-03-19 #i95726# - some fault tolerance
- ASSERT( nCol < aCells.Count(),
-// return aCells[(sal_uInt16)nCol];
++ // #i95726# - some fault tolerance
+ OSL_ENSURE( nCol < aCells.Count(),
"SwXMLTableRow_Impl::GetCell: column number is out of bound" );
return nCol < aCells.Count() ? aCells[(sal_uInt16)nCol] : 0;
-- // <--
}
void SwXMLTableRow_Impl::Expand( sal_uInt32 nCells, sal_Bool bOneCell )
commit df07d391d83966cf2369ac7fec8d0b88cbe49bcf
Author: Cédric Bosdonnat <cedricbosdo at openoffice.org>
Date: Thu Nov 25 17:08:45 2010 +0100
Removed DBG_UTIL from sw
* Fixed the different dbglevel builds
* This needed to change all the sw local ASSERT to OSL_ENSURE...
diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx
index cf6f790..4d880b6 100644
--- a/sw/inc/SwNumberTree.hxx
+++ b/sw/inc/SwNumberTree.hxx
@@ -376,7 +376,7 @@ public:
// RTL_TEXTENCODING_ASCII_US),
// int nDepth = -1) const;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static unsigned long GetInstances();
unsigned long GetSerial();
#endif
@@ -485,7 +485,7 @@ protected:
*/
mutable tSwNumberTreeChildren::iterator mItLastValid;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
/**
Counter for the number of created instances.
*/
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 3c18b0c..4c5c449 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -198,7 +198,7 @@ private:
class SwClientIter
{
friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
- friend void SwModify::Add(SwClient *); // nur fuer ASSERT !
+ friend void SwModify::Add(SwClient *); // nur fuer OSL_ENSURE(!
SwModify const& rRoot;
SwClient *pAkt, *pDelNext;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 35d27e6..1e06d5f 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -467,13 +467,13 @@ public:
*/
void Combine();
-#if !defined(DBG_UTIL)
+#if OSL_DEBUG_LEVEL > 1
+ void SttCrsrMove();
+ void EndCrsrMove( const BOOL bIdleEnd = FALSE );
+#else
void SttCrsrMove() { ++nCrsrMove; StartAction(); }
void EndCrsrMove( const BOOL bIdleEnd = FALSE )
{ EndAction( bIdleEnd ); --nCrsrMove; }
-#else
- void SttCrsrMove();
- void EndCrsrMove( const BOOL bIdleEnd = FALSE );
#endif
/*
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index dfa869a..2547b16 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -182,7 +182,7 @@ public:
// about the object (Writer fly frame resp. drawing object)
const SwFmtAnchor& GetAnchorFmt() const
{
- ASSERT( GetFmt(),
+ OSL_ENSURE( GetFmt(),
"<SwContact::GetAnchorFmt()> - no frame format -> crash" );
return GetFmt()->GetAnchor();
@@ -197,7 +197,7 @@ public:
const SwPosition& GetCntntAnchor() const
{
- ASSERT( GetAnchorFmt().GetCntntAnchor(),
+ OSL_ENSURE( GetAnchorFmt().GetCntntAnchor(),
"<SwContact::GetCntntAnchor()> - no content anchor -> crash" );
return *(GetAnchorFmt().GetCntntAnchor());
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9a78865..bc0f6e5 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -500,7 +500,7 @@ private:
bool mbColumnSelection : 1; // true: this content has bee created by a column selection
// (clipboard docs only)
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bool mbXMLExport : 1; // TRUE: during XML export
#endif
@@ -1077,7 +1077,7 @@ public:
inline void SetOLEPrtNotifyPending( bool bSet = true );
void PrtOLENotify( sal_Bool bAll ); //Alle oder nur Markierte
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bool InXMLExport() const { return mbXMLExport; }
void SetXMLExport( bool bFlag ) { mbXMLExport = bFlag; }
#endif
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
index 3255671..1b89d0a 100644
--- a/sw/inc/errhdl.hxx
+++ b/sw/inc/errhdl.hxx
@@ -28,13 +28,13 @@
#ifndef _ERRHDL_HXX
#define _ERRHDL_HXX
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
#include <tools/solar.h>
#include <sal/types.h>
#include "swdllapi.h"
-extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam
+extern BOOL bAssert; // TRUE, wenn eine ASSERT Box hochkam
// -----------------------------------------------------------------------
@@ -42,15 +42,7 @@ extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam
// wo der Fehler auftrat.
// Die Funktion darf nicht direkt benutzt werden!
// -----------------------------------------------------------------------
-SW_DLLPUBLIC void AssertFail( const sal_Char*, const sal_Char*, USHORT );
-SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
-
-#define ASSERT( cond, message ) \
- if( !(cond) ) { \
- const char *_pErrorText = #message; \
- const char *_pFileName = __FILE__; \
- ::AssertFail( _pErrorText, _pFileName, __LINE__ ); \
- }
+SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char* );
// -----------------------------------------------------------------------
// Prueft ob die angegebene Bedingung wahr ist, wenn nicht wird eine
@@ -59,7 +51,7 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
#define ASSERT_ID( cond, id ) \
if( !(cond) ) { \
const char *_pFileName = __FILE__; \
- ::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
+ ::AssertFail( (USHORT)id, _pFileName ); \
}
@@ -68,7 +60,6 @@ SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char*, USHORT );
// ignoriert
// -----------------------------------------------------------------------
#else
-#define ASSERT( cond, message ) ;
#define ASSERT_ID( cond, id ) ;
#endif // PRODUCT
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 1fa85fc..9bc2fb1 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -276,7 +276,7 @@ protected:
public:
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
virtual ~SwFieldType();
#endif
static const String& GetTypeStr( USHORT nTypeId );
@@ -344,10 +344,10 @@ public:
// ResId
USHORT Which() const
-#ifndef DBG_UTIL
- { return pType->Which(); }
+#if OSL_DEBUG_LEVEL > 1
+ ; // implemented in fldbas.cxx
#else
- ; // in fldbas.cxx implementiert
+ { return pType->Which(); }
#endif
// TYP_ID
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 8d78bb7..b37d722 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -196,10 +196,10 @@ public:
USHORT Count() const { return pChgSet->Count(); }
void ClearItem( USHORT nWhichL = 0 )
-#ifndef DBG_UTIL
- { pChgSet->ClearItem( nWhichL ); }
-#else
+#if OSL_DEBUG_LEVEL > 1
;
+#else
+ { pChgSet->ClearItem( nWhichL ); }
#endif
};
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 13ffd4e..41f9a2d 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -41,17 +41,17 @@ class SwIndex;
class SwIndexReg;
struct SwPosition;
-#ifndef DBG_UTIL
-#define INLINE inline
-#else
+#if OSL_DEBUG_LEVEL > 1
#define INLINE
+#else
+#define INLINE inline
#endif
class SW_DLLPUBLIC SwIndex
{
friend class SwIndexReg;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static int nSerial;
int MySerial;
#endif
@@ -148,7 +148,7 @@ public:
void MoveTo( SwIndexReg& rArr );
};
-#ifndef DBG_UTIL
+#if !defined(OSL_DEBUG_LEVEL) || OSL_DEBUG_LEVEL < 2
inline xub_StrLen SwIndex::operator++()
{
diff --git a/sw/inc/ndhints.hxx b/sw/inc/ndhints.hxx
index ee5b408..92bfda7 100644
--- a/sw/inc/ndhints.hxx
+++ b/sw/inc/ndhints.hxx
@@ -113,7 +113,7 @@ public:
{ return m_HintStarts[nIdx]; }
inline USHORT Count() const { return m_HintStarts.Count(); }
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bool Check() const;
#endif
};
diff --git a/sw/inc/ndindex.hxx b/sw/inc/ndindex.hxx
index e45a53d..af3f8bc 100644
--- a/sw/inc/ndindex.hxx
+++ b/sw/inc/ndindex.hxx
@@ -43,7 +43,7 @@ class SW_DLLPUBLIC SwNodeIndex
friend void SwNodes::DeRegisterIndex( SwNodeIndex& );
friend void SwNodes::RemoveNode( ULONG, ULONG, BOOL );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static int nSerial;
int MySerial;
#endif
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d91886b..1500d3b 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -93,7 +93,7 @@ class SW_DLLPUBLIC SwNode : private /* public*/ BigPtrEntry
{
friend class SwNodes;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
static long nSerial;
long nMySerial;
#endif
@@ -118,7 +118,7 @@ protected:
public:
virtual ~SwNode();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
long int GetSerial() const { return nMySerial; }
#endif
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 690e20b..aa354f2 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -36,8 +36,8 @@
#include "swdllapi.h"
#include <swtypes.hxx>
#include <calbck.hxx>
-#include <errhdl.hxx> // Fuer die inline-ASSERTs
-#include <error.h> // Fuer die inline-ASSERTs
+#include <errhdl.hxx> // Fuer die inline ASSERT
+#include <error.h> // Fuer die inline ASSERT
#include <hints.hxx>
#include <hash_map>
#include <stringhash.hxx>
@@ -114,7 +114,7 @@ public:
private:
friend void _FinitCore();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
long int nSerial;
static long int nInstances;
#endif
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 1c5eb0a..1f1e9c9 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -190,8 +190,10 @@ public:
m_pMark = m_pPoint;
}
}
-#ifndef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
+ void Exchange();
+#else
void Exchange()
{
if (m_pPoint != m_pMark)
@@ -201,8 +203,6 @@ public:
m_pMark = pTmp;
}
}
-#else
- void Exchange();
#endif
/** A PaM marks a selection if Point and Mark are distinct positions.
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 2fd9e3f..2d210df 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -28,6 +28,7 @@
#ifndef _SWRECT_HXX
#define _SWRECT_HXX
#include "errhdl.hxx"
+#include <osl/diagnose.h>
#include <tools/gen.hxx>
class SvStream;
@@ -307,7 +308,7 @@ inline SwRect &SwRect::operator-=( const Size &rSz )
//--------------------------- Sonstiges
inline Rectangle SwRect::SVRect() const
{
- ASSERT( !IsEmpty(), "SVRect() without Width or Height" );
+ OSL_ENSURE( !IsEmpty(), "SVRect() without Width or Height" );
return Rectangle( m_Point.getX(), m_Point.getY(),
m_Point.getX() + m_Size.getWidth() - 1, //Right()
m_Point.getY() + m_Size.getHeight() - 1 ); //Bottom()
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 595cbfe..f4cedac 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -34,12 +34,13 @@
#include <swtypes.hxx>
#include <calbck.hxx>
#include <swrect.hxx>
-#ifndef DBG_UTIL
-#include <node.hxx> // fuer StartNode->GetMyIndex
-#else
+
+#if OSL_DEBUG_LEVEL > 1
class SwStartNode;
#include <memory>
#include <boost/noncopyable.hpp>
+#else
+#include <node.hxx> // fuer StartNode->GetMyIndex
#endif
class Color;
@@ -109,7 +110,7 @@ protected:
BOOL bModifyLocked :1;
BOOL bNewModel :1; // FALSE: old SubTableModel; TRUE: new RowSpanModel
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bool bDontChangeModel; // This is set by functions (like Merge()) to forbid a laet model change
#endif
@@ -208,7 +209,7 @@ public:
BOOL Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes, const SwSelBoxes& rMerged,
SwTableBox* pMergeBox, SwUndoTblMerge* pUndo = 0 )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bDontChangeModel = true;
#endif
return bNewModel ? NewMerge( pDoc, rBoxes, rMerged, pMergeBox, pUndo ) :
@@ -217,7 +218,7 @@ public:
BOOL SplitRow( SwDoc* pDoc, const SwSelBoxes& rBoxes, USHORT nCnt=1,
BOOL bSameHeight = FALSE )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
bDontChangeModel = true;
#endif
return bNewModel ? NewSplitRow( pDoc, rBoxes, nCnt, bSameHeight ) :
@@ -321,7 +322,7 @@ public:
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
BOOL SetRowHeight( SwTableBox& rAktBox, USHORT eType,
SwTwips nAbsDiff, SwTwips nRelDiff, SwUndo** ppUndo );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
void CheckConsistency() const;
#endif
};
@@ -410,10 +411,10 @@ public:
const SwStartNode *GetSttNd() const { return pSttNd; }
ULONG GetSttIdx() const
-#ifndef DBG_UTIL
- { return pSttNd ? pSttNd->GetIndex() : 0; }
-#else
+#if OSL_DEBUG_LEVEL > 1
;
+#else
+ { return pSttNd ? pSttNd->GetIndex() : 0; }
#endif
// suche nach der naechsten/vorherigen Box mit Inhalt
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index bcdb975..ce31eca 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -32,6 +32,7 @@
#include <i18npool/lang.h>
#include <tools/string.hxx>
+#include <osl/diagnose.h>
#include <editeng/svxenum.hxx>
#include <svl/svarray.hxx>
@@ -619,73 +620,73 @@ inline void SwTOXMark::SetAlternativeText(const String& rAlt)
inline void SwTOXMark::SetLevel( USHORT nLvl )
{
- ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
nLevel = nLvl;
}
inline void SwTOXMark::SetPrimaryKey( const String& rKey )
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE( GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aPrimaryKey = rKey;
}
inline void SwTOXMark::SetSecondaryKey( const String& rKey )
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aSecondaryKey = rKey;
}
inline void SwTOXMark::SetTextReading( const String& rTxt )
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aTextReading = rTxt;
}
inline void SwTOXMark::SetPrimaryKeyReading( const String& rKey )
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aPrimaryKeyReading = rKey;
}
inline void SwTOXMark::SetSecondaryKeyReading( const String& rKey )
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aSecondaryKeyReading = rKey;
}
inline USHORT SwTOXMark::GetLevel() const
{
- ASSERT( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE( !GetTOXType() || GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
return nLevel;
}
inline const String& SwTOXMark::GetPrimaryKey() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aPrimaryKey;
}
inline const String& SwTOXMark::GetSecondaryKey() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aSecondaryKey;
}
inline const String& SwTOXMark::GetTextReading() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aTextReading;
}
inline const String& SwTOXMark::GetPrimaryKeyReading() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aPrimaryKeyReading;
}
inline const String& SwTOXMark::GetSecondaryKeyReading() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aSecondaryKeyReading;
}
@@ -694,13 +695,13 @@ inline const String& SwTOXMark::GetSecondaryKeyReading() const
//
inline void SwForm::SetTemplate(USHORT nLevel, const String& rTemplate)
{
- ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+ OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
aTemplate[nLevel] = rTemplate;
}
inline const String& SwForm::GetTemplate(USHORT nLevel) const
{
- ASSERT(nLevel < GetFormMax(), "Index >= FORM_MAX");
+ OSL_ENSURE(nLevel < GetFormMax(), "Index >= FORM_MAX");
return aTemplate[nLevel];
}
@@ -758,20 +759,20 @@ inline TOXTypes SwTOXBase::GetType() const
inline void SwTOXBase::SetLevel(USHORT nLev)
{
- ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
aData.nLevel = nLev;
}
inline USHORT SwTOXBase::GetLevel() const
{
- ASSERT(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() != TOX_INDEX, "Falscher Feldtyp");
return aData.nLevel;
}
inline void SwTOXBase::SetTemplateName(const String& rName)
{
-// ASSERT(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
-// ASSERT(aData.pTemplateName, "pTemplateName == 0");
+// OSL_ENSURE(GetTOXType()->GetType() == TOX_USER, "Falscher Feldtyp");
+// OSL_ENSURE(aData.pTemplateName, "pTemplateName == 0");
// (*aData.pTemplateName) = rName;
DBG_WARNING("SwTOXBase::SetTemplateName obsolete");
aStyleNames[0] = rName;
@@ -780,13 +781,13 @@ inline void SwTOXBase::SetTemplateName(const String& rName)
inline USHORT SwTOXBase::GetOptions() const
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
return aData.nOptions;
}
inline void SwTOXBase::SetOptions(USHORT nOpt)
{
- ASSERT(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
+ OSL_ENSURE(GetTOXType()->GetType() == TOX_INDEX, "Falscher Feldtyp");
aData.nOptions = nOpt;
}
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 5a5ec2e..062dfaa 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -152,7 +152,7 @@ inline const xub_StrLen* SwTxtAttr::GetAnyEnd() const
inline const SfxPoolItem& SwTxtAttr::GetAttr() const
{
- ASSERT( m_pAttr, "SwTxtAttr: where is my attribute?" );
+ OSL_ENSURE( m_pAttr, "SwTxtAttr: where is my attribute?" );
return *m_pAttr;
}
@@ -174,69 +174,69 @@ inline void SwTxtAttr::SetDontExpand( bool bDontExpand )
inline const SwFmtCharFmt& SwTxtAttr::GetCharFmt() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_CHARFMT,
"Wrong attribute" );
return (const SwFmtCharFmt&)(*m_pAttr);
}
inline const SwFmtAutoFmt& SwTxtAttr::GetAutoFmt() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_AUTOFMT,
"Wrong attribute" );
return (const SwFmtAutoFmt&)(*m_pAttr);
}
inline const SwFmtFld& SwTxtAttr::GetFld() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FIELD,
"Wrong attribute" );
return (const SwFmtFld&)(*m_pAttr);
}
inline const SwFmtFtn& SwTxtAttr::GetFtn() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN, "Wrong attribute" );
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FTN, "Wrong attribute" );
return (const SwFmtFtn&)(*m_pAttr);
}
inline const SwFmtFlyCnt& SwTxtAttr::GetFlyCnt() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_FLYCNT,
"Wrong attribute" );
return (const SwFmtFlyCnt&)(*m_pAttr);
}
inline const SwTOXMark& SwTxtAttr::GetTOXMark() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_TOXMARK,
"Wrong attribute" );
return (const SwTOXMark&)(*m_pAttr);
}
inline const SwFmtRefMark& SwTxtAttr::GetRefMark() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_REFMARK,
"Wrong attribute" );
return (const SwFmtRefMark&)(*m_pAttr);
}
inline const SwFmtINetFmt& SwTxtAttr::GetINetFmt() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_INETFMT,
"Wrong attribute" );
return (const SwFmtINetFmt&)(*m_pAttr);
}
inline const SwFmtRuby& SwTxtAttr::GetRuby() const
{
- ASSERT( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY,
+ OSL_ENSURE( m_pAttr && m_pAttr->Which() == RES_TXTATR_CJK_RUBY,
"Wrong attribute" );
return (const SwFmtRuby&)(*m_pAttr);
}
inline const SwFmtMeta& SwTxtAttr::GetMeta() const
{
- ASSERT( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
+ OSL_ENSURE( m_pAttr && (m_pAttr->Which() == RES_TXTATR_META ||
m_pAttr->Which() == RES_TXTATR_METAFIELD),
"Wrong attribute" );
return (const SwFmtMeta&)(*m_pAttr);
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index f3dc429..aa346e0 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -112,7 +112,7 @@ public:
inline const SwTxtNode& SwTxtRuby::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtRuby: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtRuby: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx
index 4852ba9..d1cdf28 100644
--- a/sw/inc/txtfld.hxx
+++ b/sw/inc/txtfld.hxx
@@ -68,7 +68,7 @@ public:
inline SwTxtNode& SwTxtFld::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/txtftn.hxx b/sw/inc/txtftn.hxx
index c029d99..873ac6b 100644
--- a/sw/inc/txtftn.hxx
+++ b/sw/inc/txtftn.hxx
@@ -74,7 +74,7 @@ public:
inline const SwTxtNode& SwTxtFtn::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtFtn: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx
index 70fe31f..66790f4 100644
--- a/sw/inc/txtinet.hxx
+++ b/sw/inc/txtinet.hxx
@@ -74,7 +74,7 @@ public:
inline const SwTxtNode& SwTxtINetFmt::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtINetFmt: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtINetFmt: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/txtrfmrk.hxx b/sw/inc/txtrfmrk.hxx
index 512b8e3..ac94184 100644
--- a/sw/inc/txtrfmrk.hxx
+++ b/sw/inc/txtrfmrk.hxx
@@ -54,7 +54,7 @@ public:
inline const SwTxtNode& SwTxtRefMark::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtRefMark: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtRefMark: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/txttxmrk.hxx b/sw/inc/txttxmrk.hxx
index 4335de6..ac2738b 100644
--- a/sw/inc/txttxmrk.hxx
+++ b/sw/inc/txttxmrk.hxx
@@ -58,7 +58,7 @@ public:
inline const SwTxtNode& SwTxtTOXMark::GetTxtNode() const
{
- ASSERT( m_pTxtNode, "SwTxtTOXMark: where is my TxtNode?" );
+ OSL_ENSURE( m_pTxtNode, "SwTxtTOXMark: where is my TxtNode?" );
return *m_pTxtNode;
}
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index fd9df1f..42213d2 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -165,7 +165,7 @@ public:
// TRUE: an die Position kann der Cursor gesetzt werden
virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
// am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
@@ -209,7 +209,7 @@ public:
// TRUE: an die Position kann der Cursor gesetzt werden
virtual BOOL IsAtValidPos( BOOL bPoint = TRUE ) const;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
// JP 05.03.98: zum Testen des UNO-Crsr Verhaltens hier die Implementierung
// am sichtbaren Cursor
virtual BOOL IsSelOvr( int eFlags =
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx
index 171ac44..73c19f2 100644
--- a/sw/source/core/SwNumberTree/SwNodeNum.cxx
+++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx
@@ -74,7 +74,7 @@ SwNumRule * SwNodeNum::GetNumRule() const
void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
{
- ASSERT( GetNumRule() && GetTxtNode(),
+ OSL_ENSURE( GetNumRule() && GetTxtNode(),
"<SwNodeNum::ChangeNumRule(..)> - missing list style and/or text node. Serious defect -> please informm OD." );
if ( GetNumRule() && GetTxtNode() )
{
@@ -91,7 +91,7 @@ void SwNodeNum::ChangeNumRule( SwNumRule& rNumRule )
SwPosition SwNodeNum::GetPosition() const
{
- ASSERT( GetTxtNode(),
+ OSL_ENSURE( GetTxtNode(),
"<SwNodeNum::GetPosition()> - no text node set at <SwNodeNum> instance" );
return SwPosition(*mpTxtNode);
}
@@ -110,13 +110,13 @@ SwNumberTreeNode * SwNodeNum::Create() const
// --> OD 2008-02-19 #refactorlists#
void SwNodeNum::PreAdd()
{
- ASSERT( GetTxtNode(),
+ OSL_ENSURE( GetTxtNode(),
"<SwNodeNum::PreAdd()> - no text node set at <SwNodeNum> instance" );
if ( !GetNumRule() && GetTxtNode() )
{
mpNumRule = GetTxtNode()->GetNumRule();
}
- ASSERT( GetNumRule(),
+ OSL_ENSURE( GetNumRule(),
"<SwNodeNum::PreAdd()> - no list style set at <SwNodeNum> instance" );
if ( GetNumRule() && GetTxtNode() )
{
@@ -135,9 +135,9 @@ void SwNodeNum::PreAdd()
void SwNodeNum::PostRemove()
{
- ASSERT( GetTxtNode(),
+ OSL_ENSURE( GetTxtNode(),
"<SwNodeNum::PostRemove()> - no text node set at <SwNodeNum> instance" );
- ASSERT( GetNumRule(),
+ OSL_ENSURE( GetNumRule(),
"<SwNodeNum::PostRemove()> - no list style set at <SwNodeNum> instance" );
if ( GetTxtNode() )
@@ -191,7 +191,7 @@ bool SwNodeNum::IsContinuous() const
}
else
{
- ASSERT( false, "<SwNodeNum::IsContinuous()> - OD debug" );
+ OSL_ENSURE( false, "<SwNodeNum::IsContinuous()> - OD debug" );
}
// <--
@@ -232,7 +232,7 @@ bool SwNodeNum::HasCountedChildren() const
for (aIt = mChildren.begin(); aIt != mChildren.end(); aIt++)
{
SwNodeNum* pChild( dynamic_cast<SwNodeNum*>(*aIt) );
- ASSERT( pChild,
+ OSL_ENSURE( pChild,
"<SwNodeNum::HasCountedChildren()> - unexcepted type of child -> please inform OD" );
if ( pChild &&
( pChild->IsCountedForNumbering() ||
@@ -348,7 +348,7 @@ bool SwNodeNum::IsCountPhantoms() const
mpNumRule->IsCountPhantoms();
else
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwNodeNum::IsCountPhantoms(): missing numbering rule - please inform OD" );
}
// <--
@@ -471,7 +471,7 @@ void SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete( SwNodeNum& rNodeNum )
SwNodeNum* pChildNode( dynamic_cast<SwNodeNum*>((*rNodeNum.mChildren.begin())) );
if ( !pChildNode )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwNodeNum::_UnregisterMeAndChildrenDueToRootDelete(..)> - unknown number tree node child" );
++nAllowedChildCount;
continue;
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 4cfb270..8d28fbf 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -37,7 +37,7 @@
using std::vector;
using std::find;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::nInstances = 0;
#endif
@@ -53,7 +53,7 @@ SwNumberTreeNode::SwNumberTreeNode()
{
mItLastValid = mChildren.end();
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
mnSerial = nInstances;
nInstances++;
#endif
@@ -72,19 +72,19 @@ SwNumberTreeNode::~SwNumberTreeNode()
}
else
{
- ASSERT(false, "lost children!");
+ OSL_ENSURE(false, "lost children!");
}
}
- ASSERT( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
+ OSL_ENSURE( IsPhantom() || mpParent == NULL, ": I'm not supposed to have a parent.");
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
nInstances--;
#endif
mpParent = (SwNumberTreeNode *) 0xdeadbeef;
- ASSERT(mChildren.empty(), "children left!");
+ OSL_ENSURE(mChildren.empty(), "children left!");
}
SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
@@ -94,7 +94,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! mChildren.empty() &&
(*mChildren.begin())->IsPhantom())
{
- ASSERT(false, "phantom already present");
+ OSL_ENSURE(false, "phantom already present");
}
else
{
@@ -107,7 +107,7 @@ SwNumberTreeNode * SwNumberTreeNode::CreatePhantom()
if (! aInsert.second)
{
- ASSERT(false, "insert of phantom failed!");
+ OSL_ENSURE(false, "insert of phantom failed!");
delete pNew;
pNew = NULL;
@@ -158,7 +158,7 @@ void SwNumberTreeNode::ValidateHierarchical(const SwNumberTreeNode * pNode) cons
if (aValidateIt != mChildren.end())
{
- ASSERT((*aValidateIt)->mpParent == this, "wrong parent");
+ OSL_ENSURE((*aValidateIt)->mpParent == this, "wrong parent");
tSwNumberTreeChildren::iterator aIt = mItLastValid;
@@ -501,10 +501,10 @@ void SwNumberTreeNode::MoveChildren(SwNumberTreeNode * pDest)
// <--
}
- ASSERT (mChildren.empty(), "MoveChildren failed!");
+ OSL_ENSURE(mChildren.empty(), "MoveChildren failed!");
#ifdef __SW_NUMBER_TREE_SANITY_CHECK
- ASSERT(IsSane(false) && pDest->IsSane(false), "insanity!");
+ OSL_ENSURE(IsSane(false) && pDest->IsSane(false), "insanity!");
#endif
}
@@ -539,7 +539,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
// --> OD 2008-03-13 #refactorlists#
if ( nDepth < 0 )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwNumberTreeNode::AddChild(..)> - parameter <nDepth> out of valid range. Serious defect -> please inform OD." );
return;
}
@@ -547,7 +547,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
if ( pChild->GetParent() != NULL || pChild->GetChildCount() > 0 )
{
- ASSERT(false, "only orphans allowed.");
+ OSL_ENSURE(false, "only orphans allowed.");
return;
}
@@ -556,7 +556,7 @@ void SwNumberTreeNode::AddChild( SwNumberTreeNode * pChild,
tSwNumberTreeChildren::iterator aInsertDeepIt =
mChildren.upper_bound(pChild);
- ASSERT(! (aInsertDeepIt != mChildren.end() &&
+ OSL_ENSURE(! (aInsertDeepIt != mChildren.end() &&
(*aInsertDeepIt)->IsPhantom()), " unexspected phantom");
@@ -684,7 +684,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
if (pChild->IsPhantom())
{
- ASSERT(false, "not applicable to phantoms!");
+ OSL_ENSURE(false, "not applicable to phantoms!");
return;
}
@@ -744,7 +744,7 @@ void SwNumberTreeNode::RemoveChild(SwNumberTreeNode * pChild)
}
else
{
- ASSERT(false, "RemoveChild: failed!");
+ OSL_ENSURE(false, "RemoveChild: failed!");
}
// --> OD 2008-02-19 #refactorlists#
@@ -857,7 +857,7 @@ bool SwNumberTreeNode::HasPhantomCountedParent() const
{
bool bRet( false );
- ASSERT( IsPhantom(),
+ OSL_ENSURE( IsPhantom(),
"<SwNumberTreeNode::HasPhantomCountedParent()> - wrong usage of method - it's only for phantoms" );
if ( IsPhantom() && mpParent )
{
@@ -934,19 +934,19 @@ void SwNumberTreeNode::SetLevelInListTree( const int nLevel )
{
if ( nLevel < 0 )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwNumberTreeNode::SetLevelInListTree(..)> - parameter <nLevel> out of valid range. Serious defect -> please inform OD." );
return;
}
- ASSERT( GetParent(),
+ OSL_ENSURE( GetParent(),
"<SwNumberTreeNode::SetLevelInListTree(..)> - can only be called for number tree nodes in a list tree" );
if ( GetParent() )
{
if ( nLevel != GetLevelInListTree() )
{
SwNumberTreeNode* pRootTreeNode = GetRoot();
- ASSERT( pRootTreeNode,
+ OSL_ENSURE( pRootTreeNode,
"<SwNumberTreeNode::SetLevelInListTree(..)> - no root tree node found. Serious defect -> please inform OD." );
RemoveMe();
@@ -988,14 +988,14 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (find(rParents.begin(), rParents.end(), this) != rParents.end())
{
- ASSERT(false, " I'm my own ancestor!");
+ OSL_ENSURE(false, " I'm my own ancestor!");
bResult = false;
}
if (! rParents.empty() && rParents.back() != mpParent)
{
- ASSERT(false, " I'm a bastard!");
+ OSL_ENSURE(false, " I'm a bastard!");
bResult = false;
}
@@ -1016,7 +1016,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if (! bFirst)
{
- ASSERT(false, " found phantom not at first position.");
+ OSL_ENSURE(false, " found phantom not at first position.");
bResult = false;
}
@@ -1024,7 +1024,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
if ((*aIt)->mpParent != (SwNumberTreeNode *) this)
{
- ASSERT(false, "found a bastard");
+ OSL_ENSURE(false, "found a bastard");
bResult = false;
}
@@ -1033,7 +1033,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
{
if (!(*aIt)->IsPhantom() && (*aIt)->LessThan(*this))
{
- ASSERT(false, " found child less than me");
+ OSL_ENSURE(false, " found child less than me");
bResult = false;
}
@@ -1041,7 +1041,7 @@ bool SwNumberTreeNode::IsSane(bool bRecursive,
}
else
{
- ASSERT(false, "found child that is NULL");
+ OSL_ENSURE(false, "found child that is NULL");
bResult = false;
}
@@ -1061,7 +1061,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
tSwNumberTreeChildren::iterator aItResult =
mChildren.find(const_cast<SwNumberTreeNode *>(pChild));
- ASSERT( aItResult != mChildren.end(),
+ OSL_ENSURE( aItResult != mChildren.end(),
"something went wrong getting the iterator for a child");
return aItResult;
@@ -1093,7 +1093,7 @@ SwNumberTreeNode::GetIterator(const SwNumberTreeNode * pChild) const
// return aStr;
//}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
unsigned long SwNumberTreeNode::GetInstances()
{
return nInstances;
@@ -1176,7 +1176,7 @@ void SwNumberTreeNode::SetLastValid
( SwNumberTreeNode::tSwNumberTreeChildren::iterator aItValid,
bool bValidating ) const
{
- ASSERT( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
+ OSL_ENSURE( (aItValid == mChildren.end() || GetIterator(*aItValid) != mChildren.end()),
"last-valid iterator");
if (
@@ -1376,7 +1376,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
{
if ( nListLevel < 0 )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwNumberTreeNode::NotifyNodesOnListLevel(..)> - invalid list level provided" );
return;
}
@@ -1388,7 +1388,7 @@ void SwNumberTreeNode::NotifyNodesOnListLevel( const int nListLevel )
void SwNumberTreeNode::NotifyChildrenOnDepth( const int nDepth )
{
- ASSERT( nDepth >= 0,
+ OSL_ENSURE( nDepth >= 0,
"<SwNumberTreeNode::NotifyChildrenOnDepth(..)> - misusage" );
SwNumberTreeNode::tSwNumberTreeChildren::iterator aChildIter =
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index d0ba1db..dbd1b51 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -100,7 +100,7 @@ void SwAccessibleCell::GetStates( ::utl::AccessibleStateSetHelper& rStateSet )
if( IsSelected() )
{
rStateSet.AddState( AccessibleStateType::SELECTED );
- ASSERT( bIsSelected, "bSelected out of sync" );
+ OSL_ENSURE( bIsSelected, "bSelected out of sync" );
::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
}
@@ -160,8 +160,8 @@ sal_Bool SwAccessibleCell::_InvalidateChildrenCursorPos( const SwFrm *pFrm )
GetMap()->GetContextImpl( pLower, sal_False ) );
if( xAccImpl.is() )
{
- ASSERT( xAccImpl->GetFrm()->IsCellFrm(),
- "table child is not a cell frame" )
+ OSL_ENSURE( xAccImpl->GetFrm()->IsCellFrm(),
+ "table child is not a cell frame" );
bChanged |= static_cast< SwAccessibleCell *>(
xAccImpl.get() )->_InvalidateMyCursorPos();
}
@@ -186,7 +186,7 @@ void SwAccessibleCell::_InvalidateCursorPos()
{
const SwFrm *pParent = GetParent( SwAccessibleChild(GetFrm()), IsInPagePreview() );
- ASSERT( pParent->IsTabFrm(), "parent is not a tab frame" );
+ OSL_ENSURE( pParent->IsTabFrm(), "parent is not a tab frame" );
const SwTabFrm *pTabFrm = static_cast< const SwTabFrm * >( pParent );
if( pTabFrm->IsFollow() )
pTabFrm = pTabFrm->FindMaster();
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index ea03b7c..127820f 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -127,11 +127,11 @@ Window *SwAccessibleContext::GetWindow()
if( GetMap() )
{
const ViewShell *pVSh = GetMap()->GetShell();
- ASSERT( pVSh, "no view shell" );
+ OSL_ENSURE( pVSh, "no view shell" );
if( pVSh )
pWin = pVSh->GetWin();
- ASSERT( pWin, "no window" );
+ OSL_ENSURE( pWin, "no window" );
}
return pWin;
@@ -142,7 +142,7 @@ SwCrsrShell* SwAccessibleContext::GetCrsrShell()
{
SwCrsrShell* pCrsrShell;
ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
- ASSERT( pViewShell, "no view shell" );
+ OSL_ENSURE( pViewShell, "no view shell" );
if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
pCrsrShell = static_cast<SwCrsrShell*>( pViewShell );
else
@@ -156,7 +156,7 @@ const SwCrsrShell* SwAccessibleContext::GetCrsrShell() const
// just like non-const GetCrsrShell
const SwCrsrShell* pCrsrShell;
const ViewShell* pViewShell = GetMap() ? GetMap()->GetShell() : 0;
- ASSERT( pViewShell, "no view shell" );
+ OSL_ENSURE( pViewShell, "no view shell" );
if( pViewShell && pViewShell->ISA( SwCrsrShell ) )
pCrsrShell = static_cast<const SwCrsrShell*>( pViewShell );
else
@@ -226,7 +226,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
{
if ( rLower.GetSwFrm() )
{
- ASSERT( !rLower.AlwaysIncludeAsChild(),
+ OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
const SwFrm* pLower( rLower.GetSwFrm() );
::rtl::Reference< SwAccessibleContext > xAccImpl =
@@ -259,7 +259,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
}
else if ( rLower.GetDrawObject() )
{
- ASSERT( !rLower.AlwaysIncludeAsChild(),
+ OSL_ENSURE( !rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - always included child not considered!" );
::rtl::Reference< ::accessibility::AccessibleShape > xAccImpl =
GetMap()->GetContextImpl( rLower.GetDrawObject(),
@@ -297,7 +297,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrm *pFrm,
else if ( rLower.GetWindow() )
{
// nothing to do - as such children are always included as children.
- ASSERT( rLower.AlwaysIncludeAsChild(),
+ OSL_ENSURE( rLower.AlwaysIncludeAsChild(),
"<SwAccessibleContext::ChildrenScrolled(..)> - not always included child not considered!" );
}
}
@@ -347,7 +347,7 @@ void SwAccessibleContext::ScrolledIn()
// This accessible should be freshly created, because it
// was not visisble before. Therefor, its vis area must already
// reflect the scrolling.
- ASSERT( GetVisArea() == GetMap()->GetVisArea(),
+ OSL_ENSURE( GetVisArea() == GetMap()->GetVisArea(),
"Vis area of child is wrong. Did it exist already?" );
// Send child event at parent. That's all we have to do here.
@@ -483,7 +483,7 @@ void SwAccessibleContext::_InvalidateFocus()
void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
{
- ASSERT( GetFrm(), "fire event for diposed frame?" );
+ OSL_ENSURE( GetFrm(), "fire event for diposed frame?" );
if( !GetFrm() )
return;
@@ -653,13 +653,13 @@ uno::Reference< XAccessible> SAL_CALL SwAccessibleContext::getAccessibleParent (
CHECK_FOR_DEFUNC( XAccessibleContext )
const SwFrm *pUpper = GetParent();
- ASSERT( pUpper != 0 || bDisposing, "no upper found" );
+ OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
uno::Reference< XAccessible > xAcc;
if( pUpper )
xAcc = GetMap()->GetContext( pUpper, !bDisposing );
- ASSERT( xAcc.is() || bDisposing, "no parent found" );
+ OSL_ENSURE( xAcc.is() || bDisposing, "no parent found" );
// Remember the parent as weak ref.
{
@@ -678,14 +678,14 @@ sal_Int32 SAL_CALL SwAccessibleContext::getAccessibleIndexInParent (void)
CHECK_FOR_DEFUNC( XAccessibleContext )
const SwFrm *pUpper = GetParent();
- ASSERT( pUpper != 0 || bDisposing, "no upper found" );
+ OSL_ENSURE( pUpper != 0 || bDisposing, "no upper found" );
sal_Int32 nIndex = -1;
if( pUpper )
{
::rtl::Reference < SwAccessibleContext > xAccImpl(
GetMap()->GetContextImpl( pUpper, !bDisposing ) );
- ASSERT( xAccImpl.is() || bDisposing, "no parent found" );
+ OSL_ENSURE( xAccImpl.is() || bDisposing, "no parent found" );
if( xAccImpl.is() )
nIndex = xAccImpl->GetChildIndex( *(GetMap()), SwAccessibleChild(GetFrm()) );
}
@@ -702,7 +702,7 @@ sal_Int16 SAL_CALL SwAccessibleContext::getAccessibleRole (void)
OUString SAL_CALL SwAccessibleContext::getAccessibleDescription (void)
throw (uno::RuntimeException)
{
- ASSERT( !this, "description needs to be overloaded" );
+ OSL_ENSURE( !this, "description needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( XAccessibleContext, "internal error (method must be overloaded)" );
}
@@ -873,7 +873,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
CHECK_FOR_DEFUNC( XAccessibleComponent )
const SwFrm *pParent = GetParent();
- ASSERT( pParent, "no Parent found" );
+ OSL_ENSURE( pParent, "no Parent found" );
Window *pWin = GetWindow();
CHECK_FOR_WINDOW( XAccessibleComponent, pWin && pParent )
@@ -883,7 +883,7 @@ awt::Rectangle SAL_CALL SwAccessibleContext::getBoundsImpl(sal_Bool bRelative)
if( GetFrm()->IsPageFrm() &&
static_cast < const SwPageFrm * >( GetFrm() )->IsEmptyPage() )
{
- ASSERT( GetShell()->IsPreView(), "empty page accessible?" );
+ OSL_ENSURE( GetShell()->IsPreView(), "empty page accessible?" );
if( GetShell()->IsPreView() )
{
// OD 15.01.2003 #103492# - adjust method call <GetMap()->GetPreViewPageSize()>
@@ -1016,7 +1016,7 @@ sal_Int32 SAL_CALL SwAccessibleContext::getBackground()
OUString SAL_CALL SwAccessibleContext::getImplementationName()
throw( uno::RuntimeException )
{
- ASSERT( !this, "implementation name needs to be overloaded" );
+ OSL_ENSURE( !this, "implementation name needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "implementation name needs to be overloaded" )
}
@@ -1025,14 +1025,14 @@ sal_Bool SAL_CALL
SwAccessibleContext::supportsService (const ::rtl::OUString& )
throw (uno::RuntimeException)
{
- ASSERT( !this, "supports service needs to be overloaded" );
+ OSL_ENSURE( !this, "supports service needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supports service needs to be overloaded" )
}
uno::Sequence< OUString > SAL_CALL SwAccessibleContext::getSupportedServiceNames()
throw( uno::RuntimeException )
{
- ASSERT( !this, "supported services names needs to be overloaded" );
+ OSL_ENSURE( !this, "supported services names needs to be overloaded" );
THROW_RUNTIME_EXCEPTION( lang::XServiceInfo, "supported services needs to be overloaded" )
}
@@ -1081,8 +1081,8 @@ void SwAccessibleContext::Dispose( sal_Bool bRecursive )
{
SolarMutexGuard aGuard;
- ASSERT( GetFrm() && GetMap(), "already disposed" );
- ASSERT( GetMap()->GetVisArea() == GetVisArea(),
+ OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
+ OSL_ENSURE( GetMap()->GetVisArea() == GetVisArea(),
"invalid vis area for dispose" );
bDisposing = sal_True;
@@ -1174,7 +1174,7 @@ void SwAccessibleContext::InvalidatePosOrSize( const SwRect& )
{
SolarMutexGuard aGuard;
- ASSERT( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
+ OSL_ENSURE( GetFrm() && !GetFrm()->Frm().IsEmpty(), "context should have a size" );
sal_Bool bIsOldShowingState;
sal_Bool bIsNewShowingState = IsShowing( *(GetMap()) );
@@ -1213,7 +1213,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
{
SolarMutexGuard aGuard;
- ASSERT( !rChildFrmOrObj.GetSwFrm() ||
+ OSL_ENSURE( !rChildFrmOrObj.GetSwFrm() ||
!rChildFrmOrObj.GetSwFrm()->Frm().IsEmpty(),
"child context should have a size" );
@@ -1254,7 +1254,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else
{
- ASSERT( false ,
+ OSL_ENSURE( false ,
"<SwAccessibleContext::InvalidateChildPosOrSize(..)> - no accessible shape found." );
}
// <--
@@ -1295,7 +1295,7 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else if ( rChildFrmOrObj.GetWindow() )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwAccessibleContext::InvalidateChildPosOrSize(..)> - not expected to handle dispose of child of type <Window>." );
}
}
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index e93cf81..e7b8e8b 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -99,7 +99,7 @@ void SwAccessibleDocumentBase::AddChild( Window *pWin, sal_Bool bFireEvent )
{
SolarMutexGuard aGuard;
- ASSERT( !mpChildWin, "only one child window is supported" );
+ OSL_ENSURE( !mpChildWin, "only one child window is supported" );
if( !mpChildWin )
{
mpChildWin = pWin;
@@ -118,7 +118,7 @@ void SwAccessibleDocumentBase::RemoveChild( Window *pWin )
{
SolarMutexGuard aGuard;
- ASSERT( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" );
+ OSL_ENSURE( !mpChildWin || pWin == mpChildWin, "invalid child window to remove" );
if( mpChildWin && pWin == mpChildWin )
{
AccessibleEventObject aEvent;
@@ -338,7 +338,7 @@ SwAccessibleDocument::~SwAccessibleDocument()
void SwAccessibleDocument::Dispose( sal_Bool bRecursive )
{
- ASSERT( GetFrm() && GetMap(), "already disposed" );
+ OSL_ENSURE( GetFrm() && GetMap(), "already disposed" );
Window *pWin = GetMap() ? GetMap()->GetShell()->GetWin() : 0;
if( pWin )
diff --git a/sw/source/core/access/accframe.cxx b/sw/source/core/access/accframe.cxx
index d0e76d1..4bb48d0 100644
--- a/sw/source/core/access/accframe.cxx
+++ b/sw/source/core/access/accframe.cxx
@@ -361,7 +361,7 @@ sal_Bool SwAccessibleFrame::IsEditable( ViewShell *pVSh ) const
if( !pFrm )
return sal_False;
- ASSERT( pVSh, "no view shell" );
+ OSL_ENSURE( pVSh, "no view shell" );
if( pVSh && (pVSh->GetViewOptions()->IsReadonly() ||
pVSh->IsPreView()) )
return sal_False;
@@ -378,7 +378,7 @@ sal_Bool SwAccessibleFrame::IsOpaque( ViewShell *pVSh ) const
if( !aFrm.GetSwFrm() )
return sal_False;
- ASSERT( pVSh, "no view shell" );
+ OSL_ENSURE( pVSh, "no view shell" );
if( !pVSh )
return sal_False;
diff --git a/sw/source/core/access/accframebase.cxx b/sw/source/core/access/accframebase.cxx
index 647258c..f9c77e2 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -90,7 +90,7 @@ void SwAccessibleFrameBase::GetStates(
if( IsSelected() )
{
rStateSet.AddState( AccessibleStateType::SELECTED );
- ASSERT( bIsSelected, "bSelected out of sync" );
+ OSL_ENSURE( bIsSelected, "bSelected out of sync" );
::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
@@ -199,7 +199,7 @@ void SwAccessibleFrameBase::_InvalidateFocus()
osl::MutexGuard aGuard( aMutex );
bSelected = bIsSelected;
}
- ASSERT( bSelected, "focus object should be selected" );
+ OSL_ENSURE( bSelected, "focus object should be selected" );
FireStateChangedEvent( AccessibleStateType::FOCUSED,
pWin->HasFocus() && bSelected );
@@ -227,16 +227,16 @@ void SwAccessibleFrameBase::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
if( pFlyFrm )
{
const SwFrmFmt *pFrmFmt = pFlyFrm->GetFmt();
- ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+ OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
OUString sOldName( GetName() );
- ASSERT( !pOld ||
+ OSL_ENSURE( !pOld ||
static_cast < SwStringMsgPoolItem * >( pOld )->GetString() == String( sOldName ),
"invalid old name" );
const String& rNewName = pFrmFmt->GetName();
SetName( rNewName );
- ASSERT( !pNew ||
+ OSL_ENSURE( !pNew ||
static_cast < SwStringMsgPoolItem * >( pNew )->GetString() == rNewName,
"invalid new name" );
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index a63e9e0..1e72847 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -98,7 +98,7 @@ SwAccessibleChild::SwAccessibleChild( const SwFrm* pFrm,
{
Init( pWindow );
}
- ASSERT( (!pFrm || pFrm == mpFrm) &&
+ OSL_ENSURE( (!pFrm || pFrm == mpFrm) &&
(!pDrawObj || pDrawObj == mpDrawObj) &&
(!pWindow || pWindow == mpWindow),
"invalid frame/object/window combination" );
@@ -347,7 +347,7 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
{
// For FLY_AS_CHAR the parent is the anchor
pParent = pFly->GetAnchorFrm();
- ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+ OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
"parent is not accessible" );
}
else
@@ -374,16 +374,16 @@ const SwFrm* SwAccessibleChild::GetParent( const sal_Bool bInPagePreview ) const
{
const SwDrawContact *pContact =
static_cast< const SwDrawContact* >( GetUserCall( mpDrawObj ) );
- ASSERT( pContact, "sdr contact is missing" );
+ OSL_ENSURE( pContact, "sdr contact is missing" );
if( pContact )
{
const SwFrmFmt *pFrmFmt = pContact->GetFmt();
- ASSERT( pFrmFmt, "frame format is missing" );
+ OSL_ENSURE( pFrmFmt, "frame format is missing" );
if( pFrmFmt && FLY_AS_CHAR == pFrmFmt->GetAnchor().GetAnchorId() )
{
// For FLY_AS_CHAR the parent is the anchor
pParent = pContact->GetAnchorFrm();
- ASSERT( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
+ OSL_ENSURE( SwAccessibleChild( pParent ).IsAccessible( bInPagePreview ),
"parent is not accessible" );
}
diff --git a/sw/source/core/access/accfrmobjmap.cxx b/sw/source/core/access/accfrmobjmap.cxx
index 3ace3e1..e7fd864 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -71,7 +71,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect& rVisArea,
if ( rFrm.IsPageFrm() )
{
- ASSERT( bVisibleChildrenOnly, "page frame within tab frame???" );
+ OSL_ENSURE( bVisibleChildrenOnly, "page frame within tab frame???" );
const SwPageFrm *pPgFrm =
static_cast< const SwPageFrm * >( &rFrm );
const SwSortedObjs *pObjs = pPgFrm->GetSortedObjs();
diff --git a/sw/source/core/access/acchyperlink.cxx b/sw/source/core/access/acchyperlink.cxx
index 4967f02..96fd0c7 100644
--- a/sw/source/core/access/acchyperlink.cxx
+++ b/sw/source/core/access/acchyperlink.cxx
@@ -94,7 +94,7 @@ sal_Bool SAL_CALL SwAccessibleHyperlink::doAccessibleAction( sal_Int32 nIndex )
{
LoadURL( rINetFmt.GetValue(), pVSh, URLLOAD_NOFILTER,
&rINetFmt.GetTargetFrame() );
- ASSERT( pTxtAttr == rINetFmt.GetTxtINetFmt(),
+ OSL_ENSURE( pTxtAttr == rINetFmt.GetTxtINetFmt(),
"lost my txt attr" );
const SwTxtINetFmt* pTxtAttr2 = rINetFmt.GetTxtINetFmt();
if( pTxtAttr2 )
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index e8df924..3c9a7d6 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -95,12 +95,12 @@ class SwAccessibleContextMap_Impl: public _SwAccessibleContextMap_Impl
{
public:
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
sal_Bool mbLocked;
#endif
SwAccessibleContextMap_Impl()
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
: mbLocked( sal_False )
#endif
{}
@@ -165,7 +165,7 @@ void SwDrawModellListener_Impl::Notify( SfxBroadcaster& /*rBC*/,
return;
}
- ASSERT( mpDrawModel, "draw model listener is disposed" );
+ OSL_ENSURE( mpDrawModel, "draw model listener is disposed" );
if( !mpDrawModel )
return;
@@ -218,11 +218,11 @@ class SwAccessibleShapeMap_Impl: public _SwAccessibleShapeMap_Impl
public:
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
sal_Bool mbLocked;
#endif
SwAccessibleShapeMap_Impl( SwAccessibleMap *pMap )
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
: mbLocked( sal_False )
#endif
{
@@ -296,7 +296,7 @@ SwAccessibleObjShape_Impl
}
++aIter;
}
- ASSERT( pSelShape == pShape, "copying shapes went wrong!" );
+ OSL_ENSURE( pSelShape == pShape, "copying shapes went wrong!" );
}
if( pSelStart )
@@ -345,7 +345,7 @@ public:
meType( eT ),
mnStates( 0 )
{
- ASSERT( SwAccessibleEvent_Impl::DISPOSE == meType,
+ OSL_ENSURE( SwAccessibleEvent_Impl::DISPOSE == meType,
"wrong event constructor, DISPOSE only" );
}
@@ -353,7 +353,7 @@ public:
: meType( eT ),
mnStates( 0 )
{
- ASSERT( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType,
+ OSL_ENSURE( SwAccessibleEvent_Impl::SHAPE_SELECTION == meType,
"wrong event constructor, SHAPE_SELECTION only" );
}
@@ -367,7 +367,7 @@ public:
meType( eT ),
mnStates( 0 )
{
- ASSERT( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
+ OSL_ENSURE( SwAccessibleEvent_Impl::CHILD_POS_CHANGED == meType ||
SwAccessibleEvent_Impl::POS_CHANGED == meType,
"wrong event constructor, (CHILD_)POS_CHANGED only" );
}
@@ -381,7 +381,7 @@ public:
meType( eT ),
mnStates( _nStates )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list