[Libreoffice-commits] .: Branch 'libreoffice-3-3' - sw/inc sw/source sw/util
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Thu Nov 25 08:22:36 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 | 41 +-
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 | 4
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 | 40 +-
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 | 18 -
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 | 10
sw/source/core/docnode/ndsect.cxx | 24 -
sw/source/core/docnode/ndtbl.cxx | 78 ++---
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 | 82 ++---
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 | 57 ---
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 | 8
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 | 20 -
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 | 22 -
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 | 10
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 | 60 ++--
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 | 122 ++++----
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 | 20 -
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 | 10
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 | 20 -
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 | 12
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 | 150 +++++-----
sw/source/filter/ww1/w1par.cxx | 2
sw/source/filter/ww1/w1sprm.cxx | 24 -
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 | 2
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 | 30 +-
sw/source/filter/ww8/wrtw8num.cxx | 10
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 | 64 ++--
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 | 74 ++--
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 | 42 +-
sw/source/filter/xml/xmltbli.cxx | 74 ++--
sw/source/filter/xml/xmltexte.cxx | 10
sw/source/filter/xml/xmltexti.cxx | 36 +-
sw/source/ui/dbui/dbinsdlg.cxx | 2
sw/source/ui/dbui/mmoutputpage.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 2
sw/source/ui/docvw/edtwin.cxx | 6
sw/source/ui/docvw/srcedtw.cxx | 6
sw/source/ui/shells/drwtxtsh.cxx | 2
sw/source/ui/table/swtablerep.cxx | 2
sw/source/ui/table/tabledlg.cxx | 12
sw/util/makefile.mk | 2
400 files changed, 4139 insertions(+), 4198 deletions(-)
New commits:
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 )
{
- ASSERT( SwAccessibleEvent_Impl::CARET_OR_STATES == meType,
+ OSL_ENSURE( SwAccessibleEvent_Impl::CARET_OR_STATES == meType,
"wrong event constructor, CARET_OR_STATES only" );
}
@@ -679,7 +679,7 @@ void SwAccPreviewData::Update( const SwAccessibleMap& rAccMap,
void SwAccPreviewData::InvalidateSelection( const SwPageFrm* _pSelectedPageFrm )
{
mpSelPage = _pSelectedPageFrm;
- ASSERT( mpSelPage, "selected page not found" );
+ OSL_ENSURE( mpSelPage, "selected page not found" );
}
struct ContainsPredicate
@@ -815,7 +815,7 @@ void SwAccessibleMap::FireEvent( const SwAccessibleEvent_Impl& rEvent )
rEvent.GetOldBox() );
break;
case SwAccessibleEvent_Impl::DISPOSE:
- ASSERT( xAccImpl.is(),
+ OSL_ENSURE( xAccImpl.is(),
"dispose event has been stored" );
break;
case SwAccessibleEvent_Impl::INVALID_ATTR:
@@ -867,7 +867,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
{
// While events are fired new ones are generated. They have to be fired
// now. This does not work for DISPOSE events!
- ASSERT( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
+ OSL_ENSURE( rEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
"dispose event while firing events" );
FireEvent( rEvent );
}
@@ -879,7 +879,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
if( aIter != mpEventMap->end() )
{
SwAccessibleEvent_Impl aEvent( *(*aIter).second );
- ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
+ OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::DISPOSE,
"dispose events should not be stored" );
sal_Bool bAppendEvent = sal_True;
switch( rEvent.GetType() )
@@ -888,7 +888,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
// A CARET_OR_STATES event is added to any other
// event only. It is broadcasted after any other event, so the
// event should be put to the back.
- ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+ OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
"invalid event combination" );
aEvent.SetStates( rEvent.GetAllStates() );
break;
@@ -898,7 +898,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
// POS_CHANGED event.
// Therefor, the event's type has to be adapted and the event
// has to be put at the end.
- ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+ OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
"invalid event combination" );
if( aEvent.GetType() == SwAccessibleEvent_Impl::CARET_OR_STATES )
aEvent.SetType( SwAccessibleEvent_Impl::INVALID_CONTENT );
@@ -908,7 +908,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
// flags) as well as INVALID_CONTENT. The old box position
// has to be stored however if the old event is not a
// POS_CHANGED itself.
- ASSERT( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+ OSL_ENSURE( aEvent.GetType() != SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
"invalid event combination" );
if( aEvent.GetType() != SwAccessibleEvent_Impl::POS_CHANGED )
aEvent.SetOldBox( rEvent.GetOldBox() );
@@ -919,11 +919,11 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
// events. The only action that needs to be done again is
// to put the old event to the back. The new one cannot be used,
// because we are interested in the old frame bounds.
- ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
+ OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::CHILD_POS_CHANGED,
"invalid event combination" );
break;
case SwAccessibleEvent_Impl::SHAPE_SELECTION:
- ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION,
+ OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::SHAPE_SELECTION,
"invalid event combination" );
break;
case SwAccessibleEvent_Impl::DISPOSE:
@@ -934,7 +934,7 @@ void SwAccessibleMap::AppendEvent( const SwAccessibleEvent_Impl& rEvent )
bAppendEvent = sal_False;
break;
case SwAccessibleEvent_Impl::INVALID_ATTR:
- ASSERT( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR,
+ OSL_ENSURE( aEvent.GetType() == SwAccessibleEvent_Impl::INVALID_ATTR,
"invalid event combination" );
break;
}
@@ -963,8 +963,8 @@ void SwAccessibleMap::InvalidateCursorPosition(
{
SwAccessibleContext *pAccImpl =
static_cast< SwAccessibleContext *>( rAcc.get() );
- ASSERT( pAccImpl, "no caret context" );
- ASSERT( pAccImpl->GetFrm(), "caret context is disposed" );
+ OSL_ENSURE( pAccImpl, "no caret context" );
+ OSL_ENSURE( pAccImpl->GetFrm(), "caret context is disposed" );
if( GetShell()->ActionPend() )
{
SwAccessibleEvent_Impl aEvent( SwAccessibleEvent_Impl::CARET_OR_STATES,
@@ -1175,8 +1175,8 @@ SwAccessibleMap::~SwAccessibleMap()
{
osl::MutexGuard aGuard( maMutex );
-#ifdef DBG_UTIL
- ASSERT( !mpFrmMap || mpFrmMap->empty(),
+#if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE( !mpFrmMap || mpFrmMap->empty(),
"Frame map should be empty after disposing the root frame" );
if( mpFrmMap )
{
@@ -1193,7 +1193,7 @@ SwAccessibleMap::~SwAccessibleMap()
++aIter;
}
}
- ASSERT( !mpShapeMap || mpShapeMap->empty(),
+ OSL_ENSURE( !mpShapeMap || mpShapeMap->empty(),
"Object map should be empty after disposing the root frame" );
if( mpShapeMap )
{
@@ -1226,8 +1226,8 @@ SwAccessibleMap::~SwAccessibleMap()
{
osl::MutexGuard aGuard( maEventMutex );
-#ifdef DBG_UTIL
- ASSERT( !(mpEvents || mpEventMap), "pending events" );
+#if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE( !(mpEvents || mpEventMap), "pending events" );
if( mpEvents )
{
SwAccessibleEventList_Impl::iterator aIter = mpEvents->begin();
@@ -1265,13 +1265,13 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
if( !mpFrmMap )
{
mpFrmMap = new SwAccessibleContextMap_Impl;
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
mpFrmMap->mbLocked = sal_False;
#endif
}
-#ifdef DBG_UTIL
- ASSERT( !mpFrmMap->mbLocked, "Map is locked" );
+#if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE( !mpFrmMap->mbLocked, "Map is locked" );
mpFrmMap->mbLocked = sal_True;
#endif
@@ -1302,7 +1302,7 @@ uno::Reference< XAccessible > SwAccessibleMap::_GetDocumentView(
}
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
mpFrmMap->mbLocked = sal_False;
#endif
}
@@ -1418,7 +1418,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrm *pFrm,
}
xAcc = pAcc;
- ASSERT( xAcc.is(), "unknown frame type" );
+ OSL_ENSURE( xAcc.is(), "unknown frame type" );
if( xAcc.is() )
{
if( aIter != mpFrmMap->end() )
@@ -1519,7 +1519,7 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
}
xAcc = pAcc;
- ASSERT( xAcc.is(), "unknown shape type" );
+ OSL_ENSURE( xAcc.is(), "unknown shape type" );
if( xAcc.is() )
{
pAcc->Init();
@@ -1580,7 +1580,7 @@ void SwAccessibleMap::RemoveContext( const SwFrm *pFrm )
{
SwAccessibleContext *pOldAccImpl =
static_cast< SwAccessibleContext *>( xOldAcc.get() );
- ASSERT( pOldAccImpl->GetFrm(), "old caret context is disposed" );
+ OSL_ENSURE( pOldAccImpl->GetFrm(), "old caret context is disposed" );
if( pOldAccImpl->GetFrm() == pFrm )
{
xOldAcc.clear(); // get an empty ref
@@ -1634,7 +1634,7 @@ void SwAccessibleMap::Dispose( const SwFrm *pFrm,
// because that's the one that is evaluated in the layout. The frame
// might not be accessible anyway. That's the case for cell frames that
// contain further cells.
- ASSERT( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
+ OSL_ENSURE( !aFrmOrObj.GetSwFrm() || aFrmOrObj.GetSwFrm()->IsAccessibleFrm(),
"non accessible frame should be disposed" );
if( aFrmOrObj.IsAccessible( GetShell()->IsPreView() ) )
@@ -1931,7 +1931,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
const SwFrm *pFlyFrm = pFESh->GetCurrFlyFrm();
if( pFlyFrm )
{
- ASSERT( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
+ OSL_ENSURE( !pFrm || pFrm->FindFlyFrm() == pFlyFrm,
"cursor is not contained in fly frame" );
aFrmOrObj = pFlyFrm;
}
@@ -1943,7 +1943,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrm *pFrm )
}
}
- ASSERT( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()),
+ OSL_ENSURE( bShapeSelected || aFrmOrObj.IsAccessible(GetShell()->IsPreView()),
"frame is not accessible" );
uno::Reference < XAccessible > xOldAcc;
@@ -2633,7 +2633,7 @@ SwAccessibleSelectedParas_Impl* SwAccessibleMap::_BuildSelectedParas()
pFrm;
pFrm = (SwFrm*)aIter.Next() )
{
- ASSERT( dynamic_cast<SwTxtFrm*>(pFrm),
+ OSL_ENSURE( dynamic_cast<SwTxtFrm*>(pFrm),
"<SwAccessibleMap::_BuildSelectedParas()> - unexpected frame type" );
SwTxtFrm* pTxtFrm( dynamic_cast<SwTxtFrm*>(pFrm) );
if ( pTxtFrm )
@@ -2734,7 +2734,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
{
const SwTxtFrm* pTxtFrm(
dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
- ASSERT( pTxtFrm,
+ OSL_ENSURE( pTxtFrm,
"<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" );
if ( pTxtFrm )
{
@@ -2762,7 +2762,7 @@ void SwAccessibleMap::InvalidateTextSelectionOfAllParas()
{
const SwTxtFrm* pTxtFrm(
dynamic_cast<const SwTxtFrm*>(xAccImpl->GetFrm()) );
- ASSERT( pTxtFrm,
+ OSL_ENSURE( pTxtFrm,
"<SwAccessibleMap::_SubmitTextSelectionChangedEvents()> - unexcepted type of frame" );
if ( pTxtFrm )
{
diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx
index fb5bc5b..7b6e586 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -106,7 +106,7 @@ void SwAccessibleNoTextFrame::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
}
const SwNoTxtNode *pNd = GetNoTxtNode();
- ASSERT( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
+ OSL_ENSURE( pNd == aDepend.GetRegisteredIn(), "invalid frame" );
switch( nWhich )
{
// --> OD 2009-07-14 #i73249#
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index a1015ca..cd1dc8a 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -69,7 +69,7 @@ void SwAccessiblePage::GetStates(
// FOCUSED
if( IsSelected() )
{
- ASSERT( bIsSelected, "bSelected out of sync" );
+ OSL_ENSURE( bIsSelected, "bSelected out of sync" );
::rtl::Reference < SwAccessibleContext > xThis( this );
GetMap()->SetCursorContext( xThis );
@@ -117,7 +117,7 @@ void SwAccessiblePage::_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 );
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 1da057e..5774d78 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -484,7 +484,7 @@ void SwAccessibleParagraph::_InvalidateFocus()
osl::MutexGuard aGuard( aMutex );
nPos = nOldCaretPos;
}
- ASSERT( nPos != -1, "focus object should be selected" );
+ OSL_ENSURE( nPos != -1, "focus object should be selected" );
FireStateChangedEvent( AccessibleStateType::FOCUSED,
pWin->HasFocus() && nPos != -1 );
@@ -877,7 +877,7 @@ uno::Reference<XAccessibleRelationSet> SAL_CALL SwAccessibleParagraph::getAccess
utl::AccessibleRelationSetHelper* pHelper = new utl::AccessibleRelationSetHelper();
const SwTxtFrm* pTxtFrm = dynamic_cast<const SwTxtFrm*>(GetFrm());
- ASSERT( pTxtFrm,
+ OSL_ENSURE( pTxtFrm,
"<SwAccessibleParagraph::getAccessibleRelationSet()> - missing text frame");
if ( pTxtFrm )
{
@@ -1147,7 +1147,7 @@ sal_Int32 SwAccessibleParagraph::getCaretPosition()
sal_Int32 nRet = GetCaretPos();
{
osl::MutexGuard aOldCaretPosGuard( aMutex );
- ASSERT( nRet == nOldCaretPos, "caret pos out of sync" );
+ OSL_ENSURE( nRet == nOldCaretPos, "caret pos out of sync" );
nOldCaretPos = nRet;
}
if( -1 != nRet )
@@ -1330,7 +1330,7 @@ void SwAccessibleParagraph::_getDefaultAttributesImpl(
pSet->Put( aParaSet );
}
// get default character attributes and merge these into <pSet>
- ASSERT( pTxtNode->GetTxtColl(),
+ OSL_ENSURE( pTxtNode->GetTxtColl(),
"<SwAccessibleParagraph::_getDefaultAttributesImpl(..)> - missing paragraph style. Serious defect, please inform OD!" );
if ( pTxtNode->GetTxtColl() )
{
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index 2a4bf50..28e01cd 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -237,17 +237,17 @@ sal_Bool SwAccessibleTableData_Impl::FindCell(
{
const SwAccessibleChild& rLower = *aIter;
const SwFrm *pLower = rLower.GetSwFrm();
- ASSERT( pLower, "child should be a frame" );
+ OSL_ENSURE( pLower, "child should be a frame" );
if( pLower )
{
if( rLower.IsAccessible( mbIsInPagePreview ) )
{
- ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" );
+ OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
const SwRect& rFrm = pLower->Frm();
if( rFrm.Right() >= rPos.X() && rFrm.Bottom() >= rPos.Y() )
{
// We have found the cell
- ASSERT( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
+ OSL_ENSURE( rFrm.Left() <= rPos.X() && rFrm.Top() <= rPos.Y(),
"find frame moved to far!" );
bFound = sal_True;
if( !bExact ||
@@ -289,13 +289,13 @@ void SwAccessibleTableData_Impl::GetSelection(
{
const SwAccessibleChild& rLower = *aIter;
const SwFrm *pLower = rLower.GetSwFrm();
- ASSERT( pLower, "child should be a frame" );
+ OSL_ENSURE( pLower, "child should be a frame" );
const SwRect& rBox = rLower.GetBox( mrAccMap );
if( pLower && rBox.IsOver( rArea ) )
{
if( rLower.IsAccessible( mbIsInPagePreview ) )
{
- ASSERT( pLower->IsCellFrm(), "lower is not a cell frame" );
+ OSL_ENSURE( pLower->IsCellFrm(), "lower is not a cell frame" );
const SwCellFrm *pCFrm =
static_cast < const SwCellFrm * >( pLower );
SwTableBox *pBox =
@@ -561,7 +561,7 @@ inline SwAccAllTableSelHander_Impl::SwAccAllTableSelHander_Impl( sal_Int32 nSize
uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
{
- ASSERT( nCount >= 0, "underflow" );
+ OSL_ENSURE( nCount >= 0, "underflow" );
uno::Sequence < sal_Int32 > aRet( nCount );
sal_Int32 *pRet = aRet.getArray();
sal_Int32 nPos = 0;
@@ -575,7 +575,7 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
}
}
- ASSERT( nPos == nCount, "count is wrong" );
+ OSL_ENSURE( nPos == nCount, "count is wrong" );
return aRet;
}
@@ -583,9 +583,9 @@ uno::Sequence < sal_Int32 > SwAccAllTableSelHander_Impl::GetSelSequence()
void SwAccAllTableSelHander_Impl::Unselect( sal_Int32 nRowOrCol,
sal_Int32 nExt )
{
- ASSERT( static_cast< size_t >( nRowOrCol ) < aSelected.size(),
+ OSL_ENSURE( static_cast< size_t >( nRowOrCol ) < aSelected.size(),
"index to large" );
- ASSERT( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(),
+ OSL_ENSURE( static_cast< size_t >( nRowOrCol+nExt ) <= aSelected.size(),
"extent to large" );
while( nExt )
{
@@ -751,7 +751,7 @@ void SwAccessibleTable::Modify( SfxPoolItem *pOld, SfxPoolItem *pNew)
if( pTabFrm )
{
const SwFrmFmt *pFrmFmt = pTabFrm->GetFmt();
- ASSERT( pFrmFmt == GetRegisteredIn(), "invalid frame" );
+ OSL_ENSURE( pFrmFmt == GetRegisteredIn(), "invalid frame" );
OUString sOldName( GetName() );
@@ -919,7 +919,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleRowDescription(
{
uno::Reference< XAccessible > xRowHeaderCell =
xTableRowHeader->getAccessibleCellAt( nRow, 0 );
- ASSERT( xRowHeaderCell.is(),
+ OSL_ENSURE( xRowHeaderCell.is(),
"<SwAccessibleTable::getAccessibleRowDescription(..)> - missing row header cell -> serious issue." );
uno::Reference< XAccessibleContext > xRowHeaderCellContext =
xRowHeaderCell->getAccessibleContext();
@@ -955,7 +955,7 @@ OUString SAL_CALL SwAccessibleTable::getAccessibleColumnDescription(
{
uno::Reference< XAccessible > xColumnHeaderCell =
xTableColumnHeader->getAccessibleCellAt( 0, nColumn );
- ASSERT( xColumnHeaderCell.is(),
+ OSL_ENSURE( xColumnHeaderCell.is(),
"<SwAccessibleTable::getAccessibleColumnDescription(..)> - missing column header cell -> serious issue." );
uno::Reference< XAccessibleContext > xColumnHeaderCellContext =
xColumnHeaderCell->getAccessibleContext();
@@ -1271,7 +1271,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleRow( sal_Int32 nChildIndex )
}
else
{
- ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
+ OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
"aCell not expected to be valid.");
throw lang::IndexOutOfBoundsException();
@@ -1310,7 +1310,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
}
else
{
- ASSERT( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
+ OSL_ENSURE( !aCell.IsValid(), "SwAccessibleTable::getAccessibleColumn:"
"aCell not expected to be valid.");
throw lang::IndexOutOfBoundsException();
@@ -1372,7 +1372,7 @@ void SwAccessibleTable::DisposeChild( const SwAccessibleChild& rChildFrmOrObj,
SolarMutexGuard aGuard;
const SwFrm *pFrm = rChildFrmOrObj.GetSwFrm();
- ASSERT( pFrm, "frame expected" );
+ OSL_ENSURE( pFrm, "frame expected" );
if( HasTableData() )
{
FireTableChangeEvent( GetTableData() );
@@ -1396,7 +1396,7 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const SwAccessibleChild& rChil
if( HasTableData() )
{
- ASSERT( !HasTableData() ||
+ OSL_ENSURE( !HasTableData() ||
GetFrm()->Frm().Pos() == GetTableData().GetTablePos(),
"table has invalid position" );
if( HasTableData() )
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index e3b9c4f..8dd2af0 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -57,7 +57,7 @@ namespace {
if ( !rTxtFrm.GetTxtNode() )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<initChangeTrackTextMarkupLists(..) - missing <SwTxtNode> instance!" );
return;
}
@@ -66,7 +66,7 @@ namespace {
const IDocumentRedlineAccess* pIDocChangeTrack( rTxtNode.getIDocumentRedlineAccess() );
if ( !pIDocChangeTrack )
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<initChangeTrackTextMarkupLists(..) - missing <IDocumentRedlineAccess> instance!" );
return;
}
@@ -194,9 +194,9 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
if ( mpChangeTrackInsertionTextMarkupList == 0 )
{
- ASSERT( mpChangeTrackDeletionTextMarkupList == 0,
+ OSL_ENSURE( mpChangeTrackDeletionTextMarkupList == 0,
"<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackDeletionTextMarkupList> expected to be NULL." );
- ASSERT( mpChangeTrackFormatChangeTextMarkupList == 0,
+ OSL_ENSURE( mpChangeTrackFormatChangeTextMarkupList == 0,
"<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..) - <mpChangeTrackFormatChangeTextMarkupList> expected to be NULL." );
initChangeTrackTextMarkupLists( mrTxtFrm,
mpChangeTrackInsertionTextMarkupList,
@@ -223,7 +223,7 @@ const SwWrongList* SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList( co
break;
default:
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwParaChangeTrackingInfo::getChangeTrackingTextMarkupList(..)> - misusage - unexpected text markup type for change tracking." );
}
}
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index c62a298..e490548 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -162,7 +162,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
}
else
{
- ASSERT( false,
+ OSL_ENSURE( false,
"<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
}
}
@@ -204,7 +204,7 @@ sal_Int32 SwTextMarkupHelper::getTextMarkupCount( const sal_Int32 nTextMarkupTyp
{
const SwWrongArea* pTextMarkup =
pTextMarkupList->GetElement( static_cast<USHORT>(nTextMarkupIdx) );
- ASSERT( pTextMarkup,
+ OSL_ENSURE( pTextMarkup,
"<SwTextMarkupHelper::getTextMarkup(..)> - missing <SwWrongArea> instance" );
if ( pTextMarkup &&
pTextMarkup->mnPos <= nCoreCharIndex &&
diff --git a/sw/source/core/attr/calbck.cxx b/sw/source/core/attr/calbck.cxx
index 9e52944..6381df1 100644
--- a/sw/source/core/attr/calbck.cxx
+++ b/sw/source/core/attr/calbck.cxx
@@ -36,7 +36,7 @@
#include <swcache.hxx>
#include <swfntcch.hxx>
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
#include <unotextmarkup.hxx>
#endif
@@ -107,7 +107,7 @@ SwClient::~SwClient()
if( pRegisteredIn && pRegisteredIn->GetDepends() )
pRegisteredIn->Remove( this );
- ASSERT( !IsModifyLocked(), "Modify destroyed but locked." );
+ OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
}
@@ -209,9 +209,7 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
LockModify();
-#ifndef DBG_UTIL
- bInModify = TRUE;
-#else
+#if OSL_DEBUG_LEVEL > 1
if( !pOldValue )
bInModify = TRUE;
else
@@ -232,6 +230,8 @@ void SwModify::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
default:
bInModify = TRUE;
}
+#else
+ bInModify = TRUE;
#endif
SwClientIter aIter( *this );
@@ -280,16 +280,16 @@ BOOL SwModify::GetInfo( SfxPoolItem& rInfo ) const
void SwModify::Add(SwClient *pDepend)
{
- ASSERT( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
+ OSL_ENSURE( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
// nur wenn das hier noch nicht eingetragen ist einfuegen
if(pDepend->pRegisteredIn != this )
{
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
SwClientIter* pTmp = pClientIters;
while( pTmp )
{
- ASSERT( &pTmp->rRoot != pRoot,
+ OSL_ENSURE( &pTmp->rRoot != pRoot,
"Client beim angemeldeten ClientIter einfuegen?" );
pTmp = pTmp->pNxtIter;
}
@@ -331,7 +331,9 @@ void SwModify::Add(SwClient *pDepend)
SwClient *SwModify::_Remove(SwClient * pDepend)
{
// FME 2007-07-16 #i79641# SwXTextMarkup is allowed to be removed ...
- ASSERT( !bInModify || 0 != dynamic_cast<SwXTextMarkup*>(pDepend), "Client innerhalb des eigenen Modifies loeschen?" );
+#if OSL_DEBUG_LEVEL > 1
+ OSL_ENSURE( !bInModify || 0 != dynamic_cast<SwXTextMarkup*>(pDepend), "Client innerhalb des eigenen Modifies loeschen?" );
+#endif
// loesche das Object aus der Liste und setze den
// Registrierungs-Pointer zurueck
@@ -366,7 +368,7 @@ SwClient *SwModify::_Remove(SwClient * pDepend)
pDepend->pRight = 0;
}
else {
- ASSERT( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
+ OSL_ENSURE( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
}
pDepend->pRegisteredIn = 0;
return pDepend;
@@ -495,7 +497,7 @@ SwClientIter::~SwClientIter()
while( pTmp->pNxtIter != this )
if( 0 == ( pTmp = pTmp->pNxtIter ) )
{
- ASSERT( this, "wo ist mein Pointer" );
+ OSL_ENSURE( this, "wo ist mein Pointer" );
return ;
}
pTmp->pNxtIter = pNxtIter;
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 064242d..21a281a 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -60,7 +60,7 @@ SwTblBoxNumFormat::SwTblBoxNumFormat( UINT32 nFormat, BOOL bFlag )
int SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
{
- ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
return GetValue() == ((SwTblBoxNumFormat&)rAttr).GetValue() &&
bAuto == ((SwTblBoxNumFormat&)rAttr).bAuto;
}
@@ -88,7 +88,7 @@ SwTblBoxFormula::SwTblBoxFormula( const String& rFormula )
int SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
{
- ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
return GetFormula() == ((SwTblBoxFormula&)rAttr).GetFormula() &&
pDefinedIn == ((SwTblBoxFormula&)rAttr).pDefinedIn;
}
@@ -251,7 +251,7 @@ SwTblBoxValue::SwTblBoxValue( const double nVal )
int SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
{
- ASSERT(SfxPoolItem::operator==(rAttr), "SwTblBoxValue: item not equal");
+ OSL_ENSURE(SfxPoolItem::operator==(rAttr), "SwTblBoxValue: item not equal");
SwTblBoxValue const& rOther( static_cast<SwTblBoxValue const&>(rAttr) );
// items with NaN should be equal to enable pooling
return ::rtl::math::isNan(nValue)
diff --git a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
index f5c2b5c..49de186 100644
--- a/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
+++ b/sw/source/core/attr/fmtwrapinfluenceonobjpos.cxx
@@ -65,7 +65,7 @@ SwFmtWrapInfluenceOnObjPos& SwFmtWrapInfluenceOnObjPos::operator=(
int SwFmtWrapInfluenceOnObjPos::operator==( const SfxPoolItem& _rAttr ) const
{
- ASSERT( SfxPoolItem::operator==( _rAttr ), "keine gleichen Attribute" );
+ OSL_ENSURE( SfxPoolItem::operator==( _rAttr ), "keine gleichen Attribute" );
return ( mnWrapInfluenceOnPosition ==
static_cast<const SwFmtWrapInfluenceOnObjPos&>(_rAttr).
GetWrapInfluenceOnObjPos() );
@@ -88,7 +88,7 @@ bool SwFmtWrapInfluenceOnObjPos::QueryValue( Any& rVal, BYTE nMemberId ) const
}
break;
default:
- ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+ OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
bRet = false;
}
@@ -117,13 +117,13 @@ bool SwFmtWrapInfluenceOnObjPos::PutValue( const Any& rVal, BYTE nMemberId )
}
else
{
- ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
+ OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::PutValue(..)> - invalid attribute value" );
bRet = false;
}
}
break;
default:
- ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
+ OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::QueryValue()> - unknown MemberId" );
bRet = false;
}
@@ -143,7 +143,7 @@ void SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos( sal_Int16 _nWrapInflu
}
else
{
- ASSERT( false, "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
+ OSL_ENSURE( false, "<SwFmtWrapInfluenceOnObjPos::SetWrapInfluenceOnObjPos(..)> - invalid attribute value" );
}
}
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 9fc3271..9b4aace 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -165,7 +165,7 @@ SwFmt &SwFmt::operator=(const SwFmt& rFmt)
void SwFmt::SetName( const String& rNewName, sal_Bool bBroadcast )
{
- ASSERT(!IsDefault(), "SetName: Defaultformat" );
+ OSL_ENSURE(!IsDefault(), "SetName: Defaultformat" );
if( bBroadcast )
{
SwStringMsgPoolItem aOld( RES_NAME_CHANGED, aFmtName );
@@ -253,7 +253,7 @@ SwFmt::~SwFmt()
/* alle Abhaengigen auf DerivedFrom umhaengen */
if( GetDepends() )
{
- ASSERT(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
+ OSL_ENSURE(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
bFmtInDTOR = TRUE;
@@ -372,9 +372,9 @@ void SwFmt::Modify( SfxPoolItem* pOldValue, SfxPoolItem* pNewValue )
{
// wie finde ich heraus, ob nicht ich die Message versende ??
// aber wer ruft das hier ????
-//ASSERT( FALSE, "Modify ohne Absender verschickt" );
+// OSL_ENSURE( FALSE, "Modify ohne Absender verschickt" );
//JP 11.06.96: DropCaps koennen hierher kommen
-ASSERT( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
+ OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
bWeiter = FALSE;
}
@@ -414,7 +414,7 @@ BOOL SwFmt::SetDerivedFrom(SwFmt *pDerFrom)
if ( (pDerFrom == DerivedFrom()) || (pDerFrom == this) )
return FALSE;
- ASSERT( Which()==pDerFrom->Which()
+ OSL_ENSURE( Which()==pDerFrom->Which()
|| ( Which()==RES_CONDTXTFMTCOLL && pDerFrom->Which()==RES_TXTFMTCOLL)
|| ( Which()==RES_TXTFMTCOLL && pDerFrom->Which()==RES_CONDTXTFMTCOLL)
|| ( Which()==RES_FLYFRMFMT && pDerFrom->Which()==RES_FRMFMT ),
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index cb1b895..f065413 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -84,7 +84,7 @@ SwRefMarkFldUpdate::SwRefMarkFldUpdate( const OutputDevice* pOutput )
: SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
pOut( pOutput )
{
- ASSERT( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
+ OSL_ENSURE( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
}
@@ -103,7 +103,7 @@ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
{
DATA.pDelTbl = 0;
bModified = bBehindSplitLine = FALSE;
- ASSERT( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
+ OSL_ENSURE( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
}
@@ -137,11 +137,11 @@ SwAttrSetChg::~SwAttrSetChg()
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
void SwAttrSetChg::ClearItem( USHORT nWhch )
{
- ASSERT( bDelSet, "der Set darf nicht veraendert werden!" );
+ OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" );
pChgSet->ClearItem( nWhch );
}
@@ -156,14 +156,14 @@ SwMsgPoolItem::SwMsgPoolItem( USHORT nWhch )
// "Overhead" vom SfxPoolItem
int SwMsgPoolItem::operator==( const SfxPoolItem& ) const
{
- ASSERT( FALSE, "SwMsgPoolItem kennt kein ==" );
+ OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein ==" );
return 0;
}
SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
{
- ASSERT( FALSE, "SwMsgPoolItem kennt kein Clone" );
+ OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein Clone" );
return 0;
}
@@ -173,21 +173,21 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
* Ist keines vorhanden, returnt ein 0-Pointer !!!
* Used to be inlined (hintids.hxx) in PRODUCT.
******************************************************************************/
-#ifndef DBG_UTIL
-const SfxPoolItem* GetDfltAttr( USHORT nWhich )
-{
- return aAttrTab[ nWhich - POOLATTR_BEGIN ];
-}
-#else
+#if OSL_DEBUG_LEVEL > 1
const SfxPoolItem* GetDfltAttr( USHORT nWhich )
{
ASSERT_ID( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN,
ERR_OUTOFSCOPE );
SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
- ASSERT( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+ OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
return pHt;
}
+#else
+const SfxPoolItem* GetDfltAttr( USHORT nWhich )
+{
+ return aAttrTab[ nWhich - POOLATTR_BEGIN ];
+}
#endif
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 0a65d55..c7bf788 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -158,7 +158,7 @@ USHORT SwAttrSet::ClearItem_BC( USHORT nWhich,
USHORT SwAttrSet::ClearItem_BC( USHORT nWhich1, USHORT nWhich2,
SwAttrSet* pOld, SwAttrSet* pNew )
{
- ASSERT( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
+ OSL_ENSURE( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
pNewSet = pNew;
pOldSet = pOld;
USHORT nRet = 0;
@@ -383,9 +383,9 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
// <--
}
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
else
- ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
+ OSL_ENSURE( !this, "weder Format noch ContentNode - keine Attribute kopiert");
#endif
}
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index f82f23b..28a4daa 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -39,11 +39,7 @@
// immer ~ 20 * MAXENTRY == 20000 Eintraege
const USHORT nBlockGrowSize = 20;
-#ifndef DBG_UTIL
-
-#define CHECKIDX( p, n, i, c )
-
-#else
+#if OSL_DEBUG_LEVEL > 2
#define CHECKIDX( p, n, i, c ) CheckIdx( p, n, i, c );
@@ -63,6 +59,10 @@ void CheckIdx( BlockInfo** ppInf, USHORT nBlock, ULONG nSize, USHORT nCur )
DBG_ASSERT( nIdx == nSize, "BigPtrArray: Anzahl ungueltig" );
}
+#else
+
+#define CHECKIDX( p, n, i, c )
+
#endif
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 2782d8d..a40f065 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -606,7 +606,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
pMgr->OpenDataSource(sSourceName, sTableName, -1, false))
{
String sColumnName( GetColumnName( sTmpName ));
- ASSERT (sColumnName.Len(), "DB-Spaltenname fehlt!");
+ OSL_ENSURE(sColumnName.Len(), "DB-Spaltenname fehlt!");
String sDBNum( SwFieldType::GetTypeStr(TYP_DBSETNUMBERFLD) );
pCharClass->toLower(sDBNum);
@@ -656,7 +656,7 @@ SwCalcExp* SwCalc::VarLook( const String& rStr, USHORT ins )
VarTable[ ii ] = pNewExp;
String sColumnName( GetColumnName( sTmpName ));
- ASSERT( sColumnName.Len(), "DB-Spaltenname fehlt!" );
+ OSL_ENSURE( sColumnName.Len(), "DB-Spaltenname fehlt!" );
if( sColumnName.EqualsIgnoreCaseAscii(
SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
{
@@ -737,7 +737,7 @@ BOOL SwCalc::Push( const VoidPtr pPtr )
void SwCalc::Pop( const VoidPtr )
{
- ASSERT( aRekurStk.Count(), "SwCalc: Pop auf ungueltigen Ptr" );
+ OSL_ENSURE( aRekurStk.Count(), "SwCalc: Pop auf ungueltigen Ptr" );
aRekurStk.Remove( aRekurStk.Count() - 1 );
}
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index abb2a07..bff4170 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -37,7 +37,7 @@
#include "index.hxx"
#include "error.h" // fuers ASSERT
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
int SwIndex::nSerial = 0;
#endif
@@ -53,7 +53,7 @@ TYPEINIT0(SwIndexReg); // rtti
void SwIndexReg::ChkArr()
{
- ASSERT( (pFirst && pLast) || (!pFirst && !pLast),
+ OSL_ENSURE( (pFirst && pLast) || (!pFirst && !pLast),
"Array falsch Indiziert" );
if( !pFirst )
@@ -61,15 +61,15 @@ void SwIndexReg::ChkArr()
xub_StrLen nVal = 0;
const SwIndex* pIdx = pFirst, *pPrev = 0;
- ASSERT( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
+ OSL_ENSURE( !pIdx->pPrev, "Array-pFirst nicht am Anfang" );
while( pIdx != pLast )
{
- ASSERT( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
- "Index zeigt auf sich selbst" )
+ OSL_ENSURE( pIdx->pPrev != pIdx && pIdx->pNext != pIdx,
+ "Index zeigt auf sich selbst" );
- ASSERT( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
- ASSERT( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
+ OSL_ENSURE( pIdx->nIndex >= nVal, "Reihenfolge stimmt nicht" );
+ OSL_ENSURE( pPrev == pIdx->pPrev, "Verkettung stimmt nicht" );
pPrev = pIdx;
pIdx = pIdx->pNext;
nVal = pPrev->nIndex;
@@ -101,7 +101,7 @@ SwIndex::SwIndex(SwIndexReg *const pArr, xub_StrLen const nIdx)
else
ChgValue( *pArray->pFirst, nIdx );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
@@ -113,7 +113,7 @@ SwIndex::SwIndex( const SwIndex& rIdx, short nIdx )
{
ChgValue( rIdx, rIdx.nIndex + nIdx );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
@@ -124,7 +124,7 @@ SwIndex::SwIndex( const SwIndex& rIdx )
: nIndex( rIdx.nIndex ), pArray( rIdx.pArray ), pNext( 0 ), pPrev( 0 )
{
ChgValue( rIdx, rIdx.nIndex );
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
MySerial = ++nSerial; // nur in der nicht PRODUCT-Version
#endif
IDX_CHK_ARRAY
@@ -321,7 +321,7 @@ SwIndexReg::SwIndexReg()
SwIndexReg::~SwIndexReg()
{
- ASSERT( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
+ OSL_ENSURE( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
}
@@ -369,7 +369,7 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff,
ARR_CHK_ARRAY
}
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
#ifndef CFRONT
/*************************************************************************
@@ -505,7 +505,7 @@ xub_StrLen SwIndex::operator-=( const SwIndex & rIndex )
BOOL SwIndex::operator<( const SwIndex & rIndex ) const
{
- ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
return nIndex < rIndex.nIndex;
}
@@ -521,7 +521,7 @@ BOOL SwIndex::operator<( const SwIndex & rIndex ) const
BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
{
- ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
return nIndex <= rIndex.nIndex;
}
@@ -537,7 +537,7 @@ BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
BOOL SwIndex::operator>( const SwIndex & rIndex ) const
{
- ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list