[Libreoffice-commits] .: 7 commits - binfilter/bf_sw binfilter/inc binfilter/prj writerfilter/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Thu Feb 24 09:06:52 PST 2011
binfilter/bf_sw/source/core/attr/sw_calbck.cxx | 12
binfilter/bf_sw/source/core/attr/sw_cellatr.cxx | 8
binfilter/bf_sw/source/core/attr/sw_format.cxx | 8
binfilter/bf_sw/source/core/attr/sw_hints.cxx | 20 -
binfilter/bf_sw/source/core/attr/sw_swatrset.cxx | 4
binfilter/bf_sw/source/core/bastyp/sw_calc.cxx | 2
binfilter/bf_sw/source/core/bastyp/sw_index.cxx | 19 -
binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx | 44 +-
binfilter/bf_sw/source/core/crsr/sw_bookmrk.cxx | 3
binfilter/bf_sw/source/core/crsr/sw_callnk.cxx | 2
binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx | 12
binfilter/bf_sw/source/core/crsr/sw_findcoll.cxx | 2
binfilter/bf_sw/source/core/crsr/sw_paminit.cxx | 2
binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx | 4
binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx | 4
binfilter/bf_sw/source/core/doc/sw_docbm.cxx | 13
binfilter/bf_sw/source/core/doc/sw_docchart.cxx | 14
binfilter/bf_sw/source/core/doc/sw_doccorr.cxx | 10
binfilter/bf_sw/source/core/doc/sw_docdde.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docdesc.cxx | 12
binfilter/bf_sw/source/core/doc/sw_docdraw.cxx | 18 -
binfilter/bf_sw/source/core/doc/sw_docedt.cxx | 6
binfilter/bf_sw/source/core/doc/sw_docfld.cxx | 20 -
binfilter/bf_sw/source/core/doc/sw_docfly.cxx | 24 -
binfilter/bf_sw/source/core/doc/sw_docfmt.cxx | 10
binfilter/bf_sw/source/core/doc/sw_doclay.cxx | 10
binfilter/bf_sw/source/core/doc/sw_docnew.cxx | 8
binfilter/bf_sw/source/core/doc/sw_docnum.cxx | 6
binfilter/bf_sw/source/core/doc/sw_docredln.cxx | 18 -
binfilter/bf_sw/source/core/doc/sw_docruby.cxx | 2
binfilter/bf_sw/source/core/doc/sw_docsort.cxx | 2
binfilter/bf_sw/source/core/doc/sw_doctxm.cxx | 12
binfilter/bf_sw/source/core/doc/sw_extinput.cxx | 2
binfilter/bf_sw/source/core/doc/sw_fmtcol.cxx | 2
binfilter/bf_sw/source/core/doc/sw_gctable.cxx | 4
binfilter/bf_sw/source/core/doc/sw_htmltbl.cxx | 2
binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx | 2
binfilter/bf_sw/source/core/doc/sw_notxtfrm.cxx | 2
binfilter/bf_sw/source/core/doc/sw_number.cxx | 4
binfilter/bf_sw/source/core/doc/sw_numpara.cxx | 2
binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx | 22 -
binfilter/bf_sw/source/core/doc/sw_swserv.cxx | 2
binfilter/bf_sw/source/core/doc/sw_swtable.cxx | 12
binfilter/bf_sw/source/core/doc/sw_tblafmt.cxx | 2
binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx | 17 -
binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx | 10
binfilter/bf_sw/source/core/docnode/sw_ndindex.cxx | 3
binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx | 8
binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx | 8
binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx | 8
binfilter/bf_sw/source/core/docnode/sw_ndtbl.cxx | 8
binfilter/bf_sw/source/core/docnode/sw_ndtbl1.cxx | 4
binfilter/bf_sw/source/core/docnode/sw_node.cxx | 15
binfilter/bf_sw/source/core/docnode/sw_node2lay.cxx | 18 -
binfilter/bf_sw/source/core/docnode/sw_nodes.cxx | 8
binfilter/bf_sw/source/core/docnode/sw_section.cxx | 6
binfilter/bf_sw/source/core/docnode/sw_swbaslnk.cxx | 6
binfilter/bf_sw/source/core/draw/sw_dcontact.cxx | 6
binfilter/bf_sw/source/core/draw/sw_dobjfac.cxx | 4
binfilter/bf_sw/source/core/draw/sw_dpage.cxx | 2
binfilter/bf_sw/source/core/draw/sw_drawdoc.cxx | 10
binfilter/bf_sw/source/core/edit/sw_edredln.cxx | 2
binfilter/bf_sw/source/core/except/makefile.mk | 65 ----
binfilter/bf_sw/source/core/except/sw_errhdl.cxx | 152 ----------
binfilter/bf_sw/source/core/fields/sw_authfld.cxx | 6
binfilter/bf_sw/source/core/fields/sw_cellfml.cxx | 2
binfilter/bf_sw/source/core/fields/sw_chpfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_dbfld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_ddefld.cxx | 4
binfilter/bf_sw/source/core/fields/sw_ddetbl.cxx | 2
binfilter/bf_sw/source/core/fields/sw_docufld.cxx | 8
binfilter/bf_sw/source/core/fields/sw_expfld.cxx | 10
binfilter/bf_sw/source/core/fields/sw_fldbas.cxx | 18 -
binfilter/bf_sw/source/core/fields/sw_reffld.cxx | 4
binfilter/bf_sw/source/core/frmedt/sw_fefly1.cxx | 4
binfilter/bf_sw/source/core/frmedt/sw_tblsel.cxx | 36 +-
binfilter/bf_sw/source/core/graphic/sw_grfatr.cxx | 6
binfilter/bf_sw/source/core/graphic/sw_ndgrf.cxx | 26 -
binfilter/bf_sw/source/core/inc/atrhndl.hxx | 6
binfilter/bf_sw/source/core/inc/drawfont.hxx | 70 ++--
binfilter/bf_sw/source/core/inc/swfont.hxx | 2
binfilter/bf_sw/source/core/layout/sw_atrfrm.cxx | 70 ++--
binfilter/bf_sw/source/core/layout/sw_calcmove.cxx | 32 +-
binfilter/bf_sw/source/core/layout/sw_colfrm.cxx | 9
binfilter/bf_sw/source/core/layout/sw_findfrm.cxx | 12
binfilter/bf_sw/source/core/layout/sw_flowfrm.cxx | 36 +-
binfilter/bf_sw/source/core/layout/sw_fly.cxx | 20 -
binfilter/bf_sw/source/core/layout/sw_flycnt.cxx | 12
binfilter/bf_sw/source/core/layout/sw_flyincnt.cxx | 4
binfilter/bf_sw/source/core/layout/sw_flylay.cxx | 24 -
binfilter/bf_sw/source/core/layout/sw_flypos.cxx | 2
binfilter/bf_sw/source/core/layout/sw_frmtool.cxx | 38 +-
binfilter/bf_sw/source/core/layout/sw_ftnfrm.cxx | 78 ++---
binfilter/bf_sw/source/core/layout/sw_hffrm.cxx | 16 -
binfilter/bf_sw/source/core/layout/sw_layact.cxx | 14
binfilter/bf_sw/source/core/layout/sw_laycache.cxx | 40 +-
binfilter/bf_sw/source/core/layout/sw_layouter.cxx | 8
binfilter/bf_sw/source/core/layout/sw_newfrm.cxx | 6
binfilter/bf_sw/source/core/layout/sw_pagechg.cxx | 48 +--
binfilter/bf_sw/source/core/layout/sw_sectfrm.cxx | 48 +--
binfilter/bf_sw/source/core/layout/sw_ssfrm.cxx | 2
binfilter/bf_sw/source/core/layout/sw_tabfrm.cxx | 52 +--
binfilter/bf_sw/source/core/layout/sw_trvlfrm.cxx | 8
binfilter/bf_sw/source/core/layout/sw_unusedf.cxx | 4
binfilter/bf_sw/source/core/layout/sw_wsfrm.cxx | 84 ++---
binfilter/bf_sw/source/core/makefile.mk | 5
binfilter/bf_sw/source/core/ole/sw_ndole.cxx | 24 -
binfilter/bf_sw/source/core/para/sw_paratr.cxx | 4
binfilter/bf_sw/source/core/sw3io/sw_sw3attr.cxx | 66 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3block.cxx | 2
binfilter/bf_sw/source/core/sw3io/sw_sw3doc.cxx | 10
binfilter/bf_sw/source/core/sw3io/sw_sw3field.cxx | 28 -
binfilter/bf_sw/source/core/sw3io/sw_sw3fmts.cxx | 30 -
binfilter/bf_sw/source/core/sw3io/sw_sw3imp.cxx | 96 +++---
binfilter/bf_sw/source/core/sw3io/sw_sw3io.cxx | 4
binfilter/bf_sw/source/core/sw3io/sw_sw3misc.cxx | 88 ++---
binfilter/bf_sw/source/core/sw3io/sw_sw3nodes.cxx | 52 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx | 66 ++--
binfilter/bf_sw/source/core/sw3io/sw_sw3num.cxx | 24 -
binfilter/bf_sw/source/core/sw3io/sw_sw3page.cxx | 6
binfilter/bf_sw/source/core/sw3io/sw_sw3redln.cxx | 52 +--
binfilter/bf_sw/source/core/sw3io/sw_sw3sectn.cxx | 16 -
binfilter/bf_sw/source/core/sw3io/sw_sw3style.cxx | 24 -
binfilter/bf_sw/source/core/sw3io/sw_sw3table.cxx | 24 -
binfilter/bf_sw/source/core/swg/sw_rdcont.cxx | 2
binfilter/bf_sw/source/core/swg/sw_rdfmts.cxx | 18 -
binfilter/bf_sw/source/core/swg/sw_rdhnt.cxx | 8
binfilter/bf_sw/source/core/swg/sw_rdnum.cxx | 4
binfilter/bf_sw/source/core/swg/sw_rdpage.cxx | 2
binfilter/bf_sw/source/core/swg/sw_rdswg.cxx | 6
binfilter/bf_sw/source/core/swg/sw_rdtox.cxx | 2
binfilter/bf_sw/source/core/text/sw_atrstck.cxx | 8
binfilter/bf_sw/source/core/text/sw_frmcrsr.cxx | 8
binfilter/bf_sw/source/core/text/sw_frmform.cxx | 50 +--
binfilter/bf_sw/source/core/text/sw_frmpaint.cxx | 2
binfilter/bf_sw/source/core/text/sw_guess.cxx | 22 -
binfilter/bf_sw/source/core/text/sw_inftxt.cxx | 10
binfilter/bf_sw/source/core/text/sw_itradj.cxx | 6
binfilter/bf_sw/source/core/text/sw_itratr.cxx | 4
binfilter/bf_sw/source/core/text/sw_itrcrsr.cxx | 18 -
binfilter/bf_sw/source/core/text/sw_itrform2.cxx | 42 +-
binfilter/bf_sw/source/core/text/sw_itrpaint.cxx | 2
binfilter/bf_sw/source/core/text/sw_itrtxt.cxx | 12
binfilter/bf_sw/source/core/text/sw_porfld.cxx | 2
binfilter/bf_sw/source/core/text/sw_porfly.cxx | 18 -
binfilter/bf_sw/source/core/text/sw_porlay.cxx | 34 +-
binfilter/bf_sw/source/core/text/sw_porlin.cxx | 12
binfilter/bf_sw/source/core/text/sw_pormulti.cxx | 4
binfilter/bf_sw/source/core/text/sw_porrst.cxx | 8
binfilter/bf_sw/source/core/text/sw_portxt.cxx | 8
binfilter/bf_sw/source/core/text/sw_redlnitr.cxx | 4
binfilter/bf_sw/source/core/text/sw_txtcache.cxx | 6
binfilter/bf_sw/source/core/text/sw_txtdrop.cxx | 6
binfilter/bf_sw/source/core/text/sw_txtfly.cxx | 42 +-
binfilter/bf_sw/source/core/text/sw_txtfrm.cxx | 35 +-
binfilter/bf_sw/source/core/text/sw_txtftn.cxx | 30 -
binfilter/bf_sw/source/core/text/sw_txthyph.cxx | 2
binfilter/bf_sw/source/core/text/sw_txtio.cxx | 6
binfilter/bf_sw/source/core/text/sw_txttab.cxx | 12
binfilter/bf_sw/source/core/text/sw_widorp.cxx | 10
binfilter/bf_sw/source/core/tox/sw_tox.cxx | 6
binfilter/bf_sw/source/core/tox/sw_txmsrt.cxx | 2
binfilter/bf_sw/source/core/txtnode/sw_atrfld.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_atrflyin.cxx | 8
binfilter/bf_sw/source/core/txtnode/sw_atrftn.cxx | 6
binfilter/bf_sw/source/core/txtnode/sw_fmtatr1.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_fmtatr2.cxx | 6
binfilter/bf_sw/source/core/txtnode/sw_fntcache.cxx | 10
binfilter/bf_sw/source/core/txtnode/sw_fntcap.cxx | 9
binfilter/bf_sw/source/core/txtnode/sw_ndhints.cxx | 10
binfilter/bf_sw/source/core/txtnode/sw_ndtxt.cxx | 34 +-
binfilter/bf_sw/source/core/txtnode/sw_swfont.cxx | 8
binfilter/bf_sw/source/core/txtnode/sw_thints.cxx | 24 -
binfilter/bf_sw/source/core/txtnode/sw_txtatr2.cxx | 4
binfilter/bf_sw/source/core/txtnode/sw_txtedt.cxx | 12
binfilter/bf_sw/source/core/unocore/sw_TextCursorHelper.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_swunohelper.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unobkm.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoclbck.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unocoll.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unocrsrhelper.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unodraw.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoevent.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unofield.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoframe.cxx | 6
binfilter/bf_sw/source/core/unocore/sw_unoftn.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoidx.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoobj.cxx | 4
binfilter/bf_sw/source/core/unocore/sw_unoobj2.cxx | 10
binfilter/bf_sw/source/core/unocore/sw_unoparagraph.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoport.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoportenum.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoredline.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unoredlines.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unorefmk.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unosect.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unosett.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unosrch.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unostyle.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unotbl.cxx | 2
binfilter/bf_sw/source/core/unocore/sw_unotext.cxx | 2
binfilter/bf_sw/source/core/view/sw_scrrect.cxx | 4
binfilter/bf_sw/source/core/view/sw_vdraw.cxx | 2
binfilter/bf_sw/source/core/view/sw_viewsh.cxx | 2
binfilter/bf_sw/source/core/view/sw_vnew.cxx | 4
binfilter/bf_sw/source/filter/basflt/sw_docfact.cxx | 2
binfilter/bf_sw/source/filter/basflt/sw_fltini.cxx | 21 -
binfilter/bf_sw/source/filter/basflt/sw_shellio.cxx | 8
binfilter/bf_sw/source/filter/excel/sw_exlpar.cxx | 2
binfilter/bf_sw/source/filter/lotus/sw_lotpar.cxx | 4
binfilter/bf_sw/source/filter/sw6/sw_sw6file.cxx | 4
binfilter/bf_sw/source/filter/sw6/sw_sw6par.cxx | 2
binfilter/bf_sw/source/filter/w4w/sw_w4wpar1.cxx | 14
binfilter/bf_sw/source/filter/w4w/sw_w4wpar2.cxx | 32 +-
binfilter/bf_sw/source/filter/w4w/sw_w4wpar3.cxx | 4
binfilter/bf_sw/source/filter/w4w/sw_w4wstk.cxx | 11
binfilter/bf_sw/source/filter/writer/sw_wrtswtbl.cxx | 4
binfilter/bf_sw/source/filter/xml/sw_XMLRedlineImportHelper.cxx | 2
binfilter/bf_sw/source/filter/xml/sw_swxml.cxx | 16 -
binfilter/bf_sw/source/filter/xml/sw_swxmlat.cxx | 10
binfilter/bf_sw/source/filter/xml/sw_xmlexp.cxx | 20 -
binfilter/bf_sw/source/filter/xml/sw_xmlfmt.cxx | 28 -
binfilter/bf_sw/source/filter/xml/sw_xmlfmte.cxx | 8
binfilter/bf_sw/source/filter/xml/sw_xmlfonte.cxx | 6
binfilter/bf_sw/source/filter/xml/sw_xmlimp.cxx | 30 -
binfilter/bf_sw/source/filter/xml/sw_xmlmeta.cxx | 10
binfilter/bf_sw/source/filter/xml/sw_xmltble.cxx | 30 -
binfilter/bf_sw/source/filter/xml/sw_xmltbli.cxx | 68 ++--
binfilter/bf_sw/source/filter/xml/sw_xmltexte.cxx | 22 -
binfilter/bf_sw/source/filter/xml/sw_xmltexti.cxx | 34 +-
binfilter/bf_sw/source/ui/app/sw_docsh.cxx | 6
binfilter/bf_sw/source/ui/app/sw_docsh2.cxx | 4
binfilter/bf_sw/source/ui/app/sw_docshini.cxx | 20 -
binfilter/bf_sw/source/ui/app/sw_docstyle.cxx | 48 +--
binfilter/bf_sw/source/ui/uno/sw_unomod.cxx | 2
binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx | 11
binfilter/inc/bf_sw/errhdl.hxx | 98 ------
binfilter/inc/bf_sw/error.h | 53 ---
binfilter/inc/bf_sw/fmtcol.hxx | 4
binfilter/inc/bf_sw/ndtxt.hxx | 6
binfilter/inc/bf_sw/numrule.hxx | 11
binfilter/inc/bf_sw/swrect.hxx | 4
binfilter/inc/bf_sw/tox.hxx | 42 +-
binfilter/inc/bf_sw/txatbase.hxx | 76 ++---
binfilter/inc/bf_sw/txtatr.hxx | 2
binfilter/inc/bf_sw/txtfld.hxx | 2
binfilter/inc/bf_sw/txtftn.hxx | 2
binfilter/inc/bf_sw/txtinet.hxx | 2
binfilter/inc/bf_sw/txtrfmrk.hxx | 2
binfilter/inc/bf_sw/txttxmrk.hxx | 2
binfilter/prj/build.lst | 3
writerfilter/source/dmapper/FFDataHandler.cxx | 30 -
writerfilter/source/dmapper/FFDataHandler.hxx | 6
253 files changed, 1672 insertions(+), 2103 deletions(-)
New commits:
commit 2daea9d167c5414f440500be28a4605d8abad72d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Feb 24 17:58:06 2011 +0100
ASSERT: Some final cleanup
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 43c1869..233d121 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -37,7 +37,6 @@
#include <osl/diagnose.h>
#include "index.hxx"
-#include "error.h" // fuers ASSERT
#include <tools/string.hxx>
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index cffe962..864222c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -36,6 +36,7 @@
#define _ZFORLIST_DECLARE_TABLE
#define ITEMID_BOXINFO SID_ATTR_BORDER_INNER
+#include <osl/diagnose.h>
#include <bf_svx/boxitem.hxx>
#include <fmtfsize.hxx>
@@ -427,7 +428,7 @@ void lcl_LastBoxSetWidth( SwTableBoxes &rBoxes, const long nOffset,
BOOL SwTable::DeleteSel( SwDoc* pDoc, const SwSelBoxes& rBoxes,
const BOOL bDelMakeFrms, const BOOL bCorrBorder )
{
- ASSERT( pDoc && rBoxes.Count(), "keine gueltigen Werte" );
+ OSL_ENSURE( pDoc && rBoxes.Count(), "keine gueltigen Werte" );
SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
if( !pTblNd )
return FALSE;
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndindex.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndindex.cxx
index 687c926..b43f4b8 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndindex.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndindex.cxx
@@ -32,7 +32,6 @@
#endif
#include <osl/diagnose.h>
-#include "error.h" // fuers ASSERT
#include "ndindex.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/docnode/sw_node.cxx b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
index ec2b1b7..ad7486e 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_node.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_node.cxx
@@ -39,9 +39,8 @@
#include <fmtanchr.hxx>
#include <txtftn.hxx>
#include <ftnfrm.hxx>
-
+#include <osl/diagnose.h>
#include <horiornt.hxx>
-
#include <doc.hxx>
#include <docary.hxx>
#include <swtable.hxx>
@@ -744,7 +743,7 @@ using namespace ::com::sun::star::i18n;
/*N*/ void SwCntntNode::MakeFrms( SwCntntNode& rNode )
/*N*/ {
-/*N*/ ASSERT( &rNode != this,
+/*N*/ OSL_ENSURE( &rNode != this,
/*N*/ "Kein Contentnode oder Copy-Node und neuer Node identisch." );
/*N*/
/*N*/ if( !GetDepends() || &rNode == this ) // gibt es ueberhaupt Frames ??
diff --git a/binfilter/bf_sw/source/core/layout/sw_colfrm.cxx b/binfilter/bf_sw/source/core/layout/sw_colfrm.cxx
index 9de47b2..edff4c8 100644
--- a/binfilter/bf_sw/source/core/layout/sw_colfrm.cxx
+++ b/binfilter/bf_sw/source/core/layout/sw_colfrm.cxx
@@ -34,6 +34,7 @@
#include "cntfrm.hxx"
#include <horiornt.hxx>
+#include <osl/diagnose.h>
#include "doc.hxx"
@@ -302,7 +303,7 @@ namespace binfilter {
/*N*/ //unnuetzte Aktionen beim Einstellen zur Folge haben.
/*N*/ if ( pSave )
/*N*/ {
-/*N*/ ASSERT( Lower() && Lower()->IsLayoutFrm() &&
+/*N*/ OSL_ENSURE( Lower() && Lower()->IsLayoutFrm() &&
/*N*/ ((SwLayoutFrm*)Lower())->Lower() &&
/*N*/ ((SwLayoutFrm*)Lower())->Lower()->IsLayoutFrm(),
/*N*/ "Gesucht: Spaltenbody (Tod oder Lebend)." ); // ColumnFrms jetzt mit BodyFrm
diff --git a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
index 7b6d616..df372d1 100644
--- a/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
+++ b/binfilter/bf_sw/source/core/text/sw_txtfly.cxx
@@ -42,7 +42,7 @@
#include "dflyobj.hxx" // SdrObject
#include "frmtool.hxx" // ::DrawGraphic
#include <pormulti.hxx> // SwMultiPortion
-
+#include <osl/diagnose.h>
#include <bf_svx/obj3d.hxx>
#include <bf_svx/txtrange.hxx>
#include <bf_svx/lrspitem.hxx>
@@ -805,7 +805,7 @@ namespace binfilter {
/*N*/ sal_Bool SwTxtFly::IsAnyObj( const SwRect &rRect ) const
/*N*/ {
-/*N*/ ASSERT ( bOn, "SwTxtFly::IsAnyObj: Who's knocking?" );
+/*N*/ OSL_ENSURE( bOn, "SwTxtFly::IsAnyObj: Who's knocking?" );
/*N*/
/*N*/ SwRect aRect( rRect );
/*N*/ if ( aRect.IsEmpty() )
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
index d30cb17..4b643b0 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
@@ -34,7 +34,7 @@
#include <hintids.hxx>
#include <uiparam.hxx>
-
+#include <osl/diagnose.h>
#include <bf_svx/tstpitem.hxx>
#include <bf_svx/boxitem.hxx>
@@ -315,7 +315,7 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwFmtHeader &rHeaderFmt = rMaster.GetHeader();
/*N*/ const SwFrmFmt *pHeaderFmt = rHeaderFmt.GetHeaderFmt();
-/*N*/ ASSERT(pHeaderFmt != 0, kein HeaderFormat.);
+/*N*/ OSL_ENSURE(pHeaderFmt != 0, "kein HeaderFormat.");
/*N*/
/*N*/ // HeaderInfo, Raender, Hintergrund, Umrandung
/*N*/ //
@@ -361,7 +361,7 @@ namespace binfilter {
/*N*/ {
/*N*/ const SwFmtFooter &rFooterFmt = rMaster.GetFooter();
/*N*/ const SwFrmFmt *pFooterFmt = rFooterFmt.GetFooterFmt();
-/*N*/ ASSERT(pFooterFmt != 0, kein FooterFormat.);
+/*N*/ OSL_ENSURE(pFooterFmt != 0, "kein FooterFormat.");
/*N*/
/*N*/ // FooterInfo, Raender, Hintergrund, Umrandung
/*N*/ //
commit 7cd1a68c501c1b3816050550e32e276d8f881f53
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Feb 24 12:15:02 2011 +0100
Remove except from tree and clean up
diff --git a/binfilter/bf_sw/source/core/attr/sw_hints.cxx b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
index ad6b999..af352dc 100644
--- a/binfilter/bf_sw/source/core/attr/sw_hints.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
@@ -36,7 +36,6 @@
#include <ndtxt.hxx>
#include <osl/diagnose.h>
#include <hints.hxx>
-#include <error.h>
namespace binfilter {
diff --git a/binfilter/bf_sw/source/core/except/makefile.mk b/binfilter/bf_sw/source/core/except/makefile.mk
deleted file mode 100644
index c74d280..0000000
--- a/binfilter/bf_sw/source/core/except/makefile.mk
+++ /dev/null
@@ -1,65 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-PRJ=..$/..$/..$/..
-BFPRJ=..$/..$/..
-
-PRJNAME=binfilter
-TARGET=sw_except
-
-NO_HIDS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/swpre.mk
-
-# hier kein PCH!
-prjpch=
-PRJPCH=
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/inc$/bf_sw$/sw.mk
-INC+= -I$(PRJ)$/inc$/bf_sw
-
-# --- Files --------------------------------------------------------
-
-CXXFILES =
-
-.IF "$(dbgutil)"!=""
-CXXFILES += \
- sw_errhdl.cxx
-
-SLOFILES += \
- $(SLO)$/sw_errhdl.obj
-.ENDIF
-
-# --- Tagets -------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/binfilter/bf_sw/source/core/except/sw_errhdl.cxx b/binfilter/bf_sw/source/core/except/sw_errhdl.cxx
deleted file mode 100644
index e9cebfe..0000000
--- a/binfilter/bf_sw/source/core/except/sw_errhdl.cxx
+++ /dev/null
@@ -1,152 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#define _ERRHDL_CXX
-
-
-#ifdef _MSC_VER
-#pragma hdrstop
-#endif
-
-#include "stdlib.h"
-#ifdef WIN
-#include <svwin.h> // fuer die Goodies der Windows User
-#include <dos.h>
-#endif
-
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/sound.hxx>
-
-#include <error.h> // fuer die defines von ERR_SW6MSG_ ...
-namespace binfilter {
-
-// break into CodeView
-#if defined(MSC) && defined(WIN)
-#define CVBREAK __asm int 3;
-#endif
-#ifndef CVBREAK
-#define CVBREAK
-#endif
-
-BOOL bAssertFail = FALSE; // ist gerade eine Assertbox oben ?
-BOOL bAssert = FALSE; // TRUE, wenn mal ein ASSERT kam.
-
-/*------------------------------------------------------------------------
- Ausgabe einer Fehlermeldung inkl. Bedingung, Dateiname und Zeilennummer
- wo der Fehler auftrat.
- Die Funktion wird durch das ASSERT Makro gerufen!
- Parameter:
- char *pError Fehlermeldung
- char *pFileName Filename in dem der Fehler auftrat
- USHORT nLine Zeilennummer in dem der Fehler auftrat
-------------------------------------------------------------------------*/
-
-/*N*/ void AssertFail( const sal_Char* pError, const sal_Char* pFileName, USHORT nLine )
-/*N*/ {
-/*N*/ CVBREAK;
-/*N*/ // NOTE4("ASSERT: %s at %d: %s\n", pFileName, nLine, pError);
-/*N*/ bAssert = TRUE;
-/*N*/
-/*N*/ if( !bAssertFail && GetpApp() && GetpApp()->IsInMain() )
-/*N*/ {
-/*N*/ bAssertFail = TRUE;
-/*N*/ ByteString aErr;
-/*N*/ aErr = "Assertion failed\n==================\nFILE : ";
-/*N*/ aErr += pFileName;
-/*N*/ aErr += " at line ";
-/*N*/ aErr += ByteString::CreateFromInt32( nLine );
-/*N*/ aErr += "\nERROR : ";
-/*N*/ aErr += pError;
-/*N*/
-/*N*/ ByteString aTmp( getenv( "SW_NOBEEP" ) );
-/*N*/ if ( aTmp != "TRUE" )
-/*N*/ Sound::Beep(SOUND_ERROR);
-/*N*/
-/*N*/ #if defined( UNX ) && !defined( DBG_UTIL )
-/*N*/ DBG_ERROR( aErr.GetBuffer() ); // DbgErr ist in UNIX-nicht Produkt-Versionen nicht definiert
-/*N*/ #else
-/*N*/ DbgError( aErr.GetBuffer() );
-/*N*/ #endif
-/*N*/ bAssertFail = FALSE;
-/*N*/ }
-/*N*/ else
-/*N*/ {
-/*N*/ Sound::Beep(SOUND_ERROR);
-/*N*/ Sound::Beep(SOUND_ERROR);
-/*N*/ Sound::Beep(SOUND_ERROR);
-/*N*/ if( !bAssertFail )
-/*N*/ #if defined( MAC )
-/*N*/ if( !bAssertFail )
-/*N*/ *(short *)1 = 4711; // odd address error erzeugen
-/*N*/ #endif
-/*N*/ if( !bAssertFail )
-/*N*/ *(short *)0 = 4711; // UAE ausloesen
-/*N*/ }
-/*N*/ }
-
-/*------------------------------------------------------------------------
- Ausgabe einer Fehlermeldung inkl. Bedingung, Dateiname und Zeilennummer
- wo der Fehler auftrat.
- Die Funktion wird durch das ASSERT Makro gerufen!
- Parameter:
- USHORT nErrorId Id fuer Fehlermeldung
- char *pFileName Filename in dem der Fehler auftrat
- USHORT nLine Zeilennummer in dem der Fehler auftrat
-------------------------------------------------------------------------*/
-
-/*N*/ void AssertFail( USHORT nErrorId, const sal_Char* pFileName, USHORT nLine )
-/*N*/ {
-/*N*/ // Umsetzung der ErrorId in eine Fehlermeldung
-/*N*/ static const sal_Char
-/*N*/ /* Error Fehlermeldungen zugriffe ausserhalb eines Bereiches */
-/*N*/ sERR_VAR_IDX[] = "Op[]",
-/*N*/ sERR_OUTOFSCOPE[] = "Zugriff ausserhalb des Bereiches",
-/*N*/ /* Error Codes fuer Numerierungsregeln */
-/*N*/ sERR_NUMLEVEL[] = "Falscher Num-Level",
-/*N*/ /* Error Codes fuer TxtNode */
-/*N*/ sERR_NOHINTS[] = "Zugriff auf ungueltiges HintsArray",
-/*N*/ sERR_UNKNOWN[] = "???";
-/*N*/
-/*N*/ static const sal_Char* aErrStrTab[ ERR_SWGMSG_END - ERR_SWGMSG_START +1 ] =
-/*N*/ {
-/*N*/ sERR_VAR_IDX, sERR_OUTOFSCOPE, sERR_NUMLEVEL, sERR_NOHINTS
-/*N*/ };
-/*N*/
-/*N*/ const sal_Char* pMsg;
-/*N*/ if( nErrorId >= ERR_SWGMSG_START && nErrorId < ERR_SWGMSG_END )
-/*N*/ pMsg = aErrStrTab[ nErrorId - ERR_SWGMSG_START ];
-/*N*/ else
-/*N*/ pMsg = sERR_UNKNOWN;
-/*N*/
-/*N*/ AssertFail( pMsg, pFileName, nLine );
-/*N*/ }
-
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sw/source/core/makefile.mk b/binfilter/bf_sw/source/core/makefile.mk
index acba096..a755996 100644
--- a/binfilter/bf_sw/source/core/makefile.mk
+++ b/binfilter/bf_sw/source/core/makefile.mk
@@ -72,11 +72,6 @@ SUBLIBS2= \
$(SLB)$/sw_docnode.lib \
$(SLB)$/sw_unocore.lib
-.IF "$(dbgutil)" != ""
-SUBLIBS2+= \
- $(SLB)$/sw_except.lib
-.ENDIF
-
#-------------------------------------------------------------------------
################################################################
diff --git a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
index 345370a..231b353 100644
--- a/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
+++ b/binfilter/bf_sw/source/core/sw3io/sw_sw3npool.cxx
@@ -67,7 +67,6 @@
#include <fmtruby.hxx>
#include <tgrditem.hxx>
-#include <error.h>
#include "bf_so3/staticbaseurl.hxx"
namespace binfilter {
diff --git a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
index 614b820..d30cb17 100644
--- a/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
+++ b/binfilter/bf_sw/source/ui/utlui/sw_uitool.cxx
@@ -53,7 +53,6 @@
#include <paratr.hxx>
#include <fmtcol.hxx>
-#include <error.h>
#include <cmdid.h>
#include <globals.hrc>
#include <utlui.hrc>
diff --git a/binfilter/inc/bf_sw/errhdl.hxx b/binfilter/inc/bf_sw/errhdl.hxx
deleted file mode 100644
index 8a3021d..0000000
--- a/binfilter/inc/bf_sw/errhdl.hxx
+++ /dev/null
@@ -1,98 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _ERRHDL_HXX
-#define _ERRHDL_HXX
-
-#ifdef DBG_UTIL
-
-#include <tools/solar.h>
-#include <sal/types.h>
-
-namespace binfilter {
-// -----------------------------------------------------------------------
-// Ausgabe einer Fehlermeldung inkl. Dateiname und Zeilennummer
-// wo der Fehler auftrat.
-// Die Funktion darf nicht direkt benutzt werden!
-// -----------------------------------------------------------------------
-extern void AssertFail( const sal_Char*, const sal_Char*, USHORT );
-extern void AssertFail( USHORT, const sal_Char*, USHORT );
-
-extern BOOL bAssert; // TRUE, wenn eine ASSERT-Box hochkam
-#ifdef WIN
-//MSC (7.0) machts nur mit static, ZTC in inlines nur ohne...
-#define ASSERT( cond, message ) \
- if( !(cond) ) { \
- static const char _pErrorText[] = #message; \
- static const char _pFileName[] = __FILE__; \
- ::binfilter::AssertFail( _pErrorText, _pFileName, __LINE__ ); \
- }
-#else
-#define ASSERT( cond, message ) \
- if( !(cond) ) { \
- const char *_pErrorText = #message; \
- const char *_pFileName = __FILE__; \
- ::binfilter::AssertFail( _pErrorText, _pFileName, __LINE__ ); \
- }
-#endif
-
-// -----------------------------------------------------------------------
-// Prueft ob die angegebene Bedingung wahr ist, wenn nicht wird eine
-// Fehlermeldung die ueber die ID Identifiziert wird, ausgegeben.
-// -----------------------------------------------------------------------
-#ifdef WIN
-//MSC (7.0) machts nur mit static, ZTC in inlines nur ohne...
-#define ASSERT_ID( cond, id ) \
- if( !(cond) ) { \
- static const char _pFileName[] = __FILE__; \
- ::binfilter::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
- }
-#else
-#define ASSERT_ID( cond, id ) \
- if( !(cond) ) { \
- const char *_pFileName = __FILE__; \
- ::binfilter::AssertFail( (USHORT)id, _pFileName, __LINE__ ); \
- }
-#endif
-} //namespace binfilter
-
-// -----------------------------------------------------------------------
-// Beim Bilden der Produktversion werden alle Debug-Utilities automatisch
-// ignoriert
-// -----------------------------------------------------------------------
-#else // PRODUCT
-
-namespace binfilter {
-#define ASSERT( cond, message ) ;
-#define ASSERT_ID( cond, id ) ;
-} //namespace binfilter
-
-#endif // PRODUCT
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sw/error.h b/binfilter/inc/bf_sw/error.h
deleted file mode 100644
index 7ca8f71..0000000
--- a/binfilter/inc/bf_sw/error.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _SWERROR_H
-#define _SWERROR_H
-
-#define ERR_SWGBASE 25000
-
-/*** Error Codes **********************************************************/
-#define ERR_VAR_IDX (ERR_SWGBASE+ 0)
-#define ERR_OUTOFSCOPE (ERR_SWGBASE+ 1)
-
-/* Error Codes fuer Numerierungsregeln */
-#define ERR_NUMLEVEL (ERR_SWGBASE+ 2)
-
-/* Error Codes fuer TxtNode */
-#define ERR_NOHINTS (ERR_SWGBASE+ 3)
-
-// von _START bis _END sind in der COREDL.DLL entsprechende Strings
-// abgelegt, die erfragt werden koennen.
-#define ERR_SWGMSG_START (ERR_VAR_IDX)
-#define ERR_SWGMSG_END (ERR_NOHINTS)
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/prj/build.lst b/binfilter/prj/build.lst
index 149ec66..265a8b7 100644
--- a/binfilter/prj/build.lst
+++ b/binfilter/prj/build.lst
@@ -139,7 +139,6 @@ bf binfilter\bf_sw\source\core\doc nmake - all bf_sw_doc NULL
bf binfilter\bf_sw\source\core\docnode nmake - all bf_sw_dcnd NULL
bf binfilter\bf_sw\source\core\draw nmake - all bf_sw_draw NULL
bf binfilter\bf_sw\source\core\edit nmake - all bf_sw_edit NULL
-bf binfilter\bf_sw\source\core\except nmake - all bf_sw_excpt NULL
bf binfilter\bf_sw\source\core\fields nmake - all bf_sw_fld NULL
bf binfilter\bf_sw\source\core\frmedt nmake - all bf_sw_frmed NULL
bf binfilter\bf_sw\source\core\graphic nmake - all bf_sw_grph NULL
@@ -162,7 +161,7 @@ bf binfilter\bf_sw\source\filter\excel nmake - all bf_sw_ex
bf binfilter\bf_sw\source\filter\w4w nmake - all bf_sw_w4w NULL
bf binfilter\bf_sw\source\filter\sw6 nmake - all bf_sw_sw6 NULL
bf binfilter\bf_sw\source\ui nmake - all bf_sw_ui bf_sw_app bf_sw_conf bf_sw_dbui bf_sw_dchdl bf_sw_fldui bf_sw_globd bf_sw_index bf_sw_misc bf_sw_shell bf_sw_uiuno bf_sw_utlui bf_sw_web bf_sw_wrtsh NULL
-bf binfilter\bf_sw\source\core nmake - all bf_sw_core bf_sw_attr bf_sw_bast bf_sw_crsr bf_sw_dcnd bf_sw_doc bf_sw_draw bf_sw_edit bf_sw_excpt bf_sw_fld bf_sw_frmed bf_sw_grph bf_sw_layo bf_sw_ole bf_sw_para bf_sw_sw3io bf_sw_swg bf_sw_text bf_sw_tox bf_sw_txtnd bf_sw_uco bf_sw_view NULL
+bf binfilter\bf_sw\source\core nmake - all bf_sw_core bf_sw_attr bf_sw_bast bf_sw_crsr bf_sw_dcnd bf_sw_doc bf_sw_draw bf_sw_edit bf_sw_fld bf_sw_frmed bf_sw_grph bf_sw_layo bf_sw_ole bf_sw_para bf_sw_sw3io bf_sw_swg bf_sw_text bf_sw_tox bf_sw_txtnd bf_sw_uco bf_sw_view NULL
bf binfilter\bf_sw\source\filter nmake - all bf_sw_flt bf_sw_ascii bf_sw_bsflt bf_sw_wrtr bf_sw_xml bf_sw_lotus bf_sw_excel bf_sw_w4w bf_sw_sw6 NULL
bf binfilter\bf_sw\util nmake - all bf_sw_util bf_sw_core bf_sw_flt bf_sw_ui bf_sd_util bf_sb_util bf_so3_util NULL
bf binfilter\filter\source\bf_offwrp nmake - all bf_offwrp bf_sf_detect bf_fm_util bf_sh_util bf_sw_util bf_sb_util bf_so3_util NULL
commit e0428497af07019bbd29bccdf43d9ca458619123
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Feb 24 15:49:05 2011 +0100
Move ASSERT_ID to OSL_ASSERT
diff --git a/binfilter/bf_sw/source/core/attr/sw_hints.cxx b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
index c28c7d3..ad6b999 100644
--- a/binfilter/bf_sw/source/core/attr/sw_hints.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
@@ -182,8 +182,7 @@ namespace binfilter {
/*N*/ const SfxPoolItem* GetDfltAttr( USHORT nWhich )
/*N*/ {
-/*N*/ ASSERT_ID( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN,
-/*N*/ ERR_OUTOFSCOPE );
+/*N*/ OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
/*N*/
/*N*/ SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
/*N*/ OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 79b7f2d..43c1869 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -393,7 +393,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ xub_StrLen SwIndex::operator--(int)
/*N*/ {
-/*N*/ ASSERT_ID( nIndex, ERR_OUTOFSCOPE );
+/*N*/ OSL_ASSERT( nIndex );
/*N*/
/*N*/ xub_StrLen nOldIndex = nIndex;
/*N*/ ChgValue( *this, nIndex-1 );
@@ -413,7 +413,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ xub_StrLen SwIndex::operator+=( xub_StrLen nWert )
/*N*/ {
-/*N*/ ASSERT_ID( nIndex < INVALID_INDEX - nWert, ERR_OUTOFSCOPE);
+/*N*/ OSL_ASSERT( nIndex < INVALID_INDEX - nWert );
/*N*/ return ChgValue( *this, nIndex + nWert ).nIndex;
/*N*/ }
@@ -434,7 +434,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ xub_StrLen SwIndex::operator+=( const SwIndex & rIndex )
/*N*/ {
-/*N*/ ASSERT_ID( nIndex < INVALID_INDEX - rIndex.nIndex, ERR_OUTOFSCOPE );
+/*N*/ OSL_ASSERT( nIndex < INVALID_INDEX - rIndex.nIndex );
/*N*/ return ChgValue( *this, nIndex + rIndex.nIndex ).nIndex;
/*N*/ }
diff --git a/binfilter/inc/bf_sw/ndtxt.hxx b/binfilter/inc/bf_sw/ndtxt.hxx
index f240175..4ae0b55 100644
--- a/binfilter/inc/bf_sw/ndtxt.hxx
+++ b/binfilter/inc/bf_sw/ndtxt.hxx
@@ -291,12 +291,12 @@ public:
inline SwpHints &SwTxtNode::GetSwpHints()
{
- ASSERT_ID( pSwpHints, ERR_NOHINTS);
+ OSL_ASSERT( pSwpHints );
return *pSwpHints;
}
inline const SwpHints &SwTxtNode::GetSwpHints() const
{
- ASSERT_ID( pSwpHints, ERR_NOHINTS);
+ OSL_ASSERT( pSwpHints );
return *pSwpHints;
}
diff --git a/binfilter/inc/bf_sw/numrule.hxx b/binfilter/inc/bf_sw/numrule.hxx
index 80cf48d..f763230 100644
--- a/binfilter/inc/bf_sw/numrule.hxx
+++ b/binfilter/inc/bf_sw/numrule.hxx
@@ -36,8 +36,7 @@
#include <swtypes.hxx>
#include <calbck.hxx>
-#include <osl/diagnose.h> // Fuer die inline-ASSERTs
-#include <error.h> // Fuer die inline-ASSERTs
+#include <osl/diagnose.h>
#include <bf_svx/numitem.hxx>
class Font;
namespace binfilter {
@@ -230,14 +229,14 @@ public:
inline const SwNumFmt& SwNumRule::Get( USHORT i ) const
{
- ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
+ OSL_ASSERT( i < MAXLEVEL && eRuleType < RULE_END );
return aFmts[ i ] ? *aFmts[ i ]
: *aBaseFmts[ eRuleType ][ i ];
}
inline const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
{
- ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
+ OSL_ASSERT( i < MAXLEVEL && eRuleType < RULE_END );
return aFmts[ i ];
}
inline const Font& SwNumRule::GetDefBulletFont()
commit 626ec23961d32aa415d84cdce19c758e94695d02
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Thu Feb 24 15:47:13 2011 +0100
Move ASSERT to OSL_ENSURE
Done with a nifty little perl script. Regex:
$data =~ s/(\s+)ASSERT(\(.*?,.*?".*?"\s*\))\s*\;?\n/$1OSL_ENSURE$2\;\n/gs;
diff --git a/binfilter/bf_sw/source/core/attr/sw_calbck.cxx b/binfilter/bf_sw/source/core/attr/sw_calbck.cxx
index 7d8936a..53b7b20 100644
--- a/binfilter/bf_sw/source/core/attr/sw_calbck.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_calbck.cxx
@@ -101,7 +101,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ if( pRegisteredIn && pRegisteredIn->GetDepends() )
/*N*/ pRegisteredIn->Remove( this );
/*N*/
-/*N*/ ASSERT( !IsModifyLocked(), "Modify destroyed but locked." );
+/*N*/ OSL_ENSURE( !IsModifyLocked(), "Modify destroyed but locked." );
/*N*/ }
@@ -262,7 +262,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ void SwModify::Add(SwClient *pDepend)
/*N*/ {
-/*N*/ ASSERT( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
+/*N*/ OSL_ENSURE( !bInModify, "Client innerhalb des eigenen Modifies einfuegen?" );
/*N*/
/*N*/ // nur wenn das hier noch nicht eingetragen ist einfuegen
/*N*/ if(pDepend->pRegisteredIn != this )
@@ -271,7 +271,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ SwClientIter* pTmp = pClientIters;
/*N*/ while( pTmp )
/*N*/ {
-/*N*/ ASSERT( &pTmp->rRoot != pRoot,
+/*N*/ OSL_ENSURE( &pTmp->rRoot != pRoot,
/*N*/ "Client beim angemeldeten ClientIter einfuegen?" );
/*N*/ pTmp = pTmp->pNxtIter;
/*N*/ }
@@ -311,7 +311,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ SwClient *SwModify::_Remove(SwClient * pDepend)
/*N*/ {
-/*N*/ ASSERT( !bInModify, "Client innerhalb des eigenen Modifies loeschen?" );
+/*N*/ OSL_ENSURE( !bInModify, "Client innerhalb des eigenen Modifies loeschen?" );
/*N*/
/*N*/ // loesche das Object aus der Liste und setze den
/*N*/ // Registrierungs-Pointer zurueck
@@ -340,7 +340,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ pDepend->pRight = 0;
/*N*/ }
/*N*/ else
-/*N*/ ASSERT( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
+/*N*/ OSL_ENSURE( FALSE, "SwModify::Remove(): pDepend nicht gefunden");
/*N*/ pDepend->pRegisteredIn = 0;
/*N*/ return pDepend;
/*N*/ }
@@ -460,7 +460,7 @@ static SwClientIter* pClientIters = 0;
/*N*/ while( pTmp->pNxtIter != this )
/*N*/ if( 0 == ( pTmp = pTmp->pNxtIter ) )
/*N*/ {
-/*N*/ ASSERT( this, "wo ist mein Pointer" );
+/*N*/ OSL_ENSURE( this, "wo ist mein Pointer" );
/*N*/ return ;
/*N*/ }
/*N*/ pTmp->pNxtIter = pNxtIter;
diff --git a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
index 97c8ede..413813a 100644
--- a/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_cellatr.cxx
@@ -63,7 +63,7 @@ namespace binfilter {
/*N*/ int SwTblBoxNumFormat::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
-/*N*/ ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+/*N*/ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
/*N*/ return GetValue() == ((SwTblBoxNumFormat&)rAttr).GetValue() &&
/*N*/ bAuto == ((SwTblBoxNumFormat&)rAttr).bAuto;
/*N*/ }
@@ -91,7 +91,7 @@ namespace binfilter {
/*N*/ int SwTblBoxFormula::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
-/*?*/ ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+/*?*/ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
/*?*/ return GetFormula() == ((SwTblBoxFormula&)rAttr).GetFormula() &&
/*?*/ pDefinedIn == ((SwTblBoxFormula&)rAttr).pDefinedIn;
/*N*/ }
@@ -152,7 +152,7 @@ SwTableBox* SwTblBoxFormula::GetTableBox()
/*N*/ int SwTblBoxValue::operator==( const SfxPoolItem& rAttr ) const
/*N*/ {
-/*N*/ ASSERT( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
+/*N*/ OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "keine gleichen Attribute" );
/*N*/ return nValue == ((SwTblBoxValue&)rAttr).nValue;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/attr/sw_format.cxx b/binfilter/bf_sw/source/core/attr/sw_format.cxx
index ed6bb84..ca5d7f4 100644
--- a/binfilter/bf_sw/source/core/attr/sw_format.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_format.cxx
@@ -180,7 +180,7 @@ namespace binfilter {
/*N*/ void SwFmt::SetName( const String& rNewName, sal_Bool bBroadcast )
/*N*/ {
-/*N*/ ASSERT(!IsDefault(), "SetName: Defaultformat" );
+/*N*/ OSL_ENSURE(!IsDefault(), "SetName: Defaultformat" );
/*N*/ if( bBroadcast )
/*N*/ {
/*N*/ SwStringMsgPoolItem aOld( RES_NAME_CHANGED, aFmtName );
@@ -267,7 +267,7 @@ namespace binfilter {
/*N*/ /* alle Abhaengigen auf DerivedFrom umhaengen */
/*N*/ if( GetDepends() )
/*N*/ {
-/*N*/ ASSERT(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
+/*N*/ OSL_ENSURE(DerivedFrom(), "SwFmt::~SwFmt: Def Abhaengige!" );
/*N*/
/*N*/ bFmtInDTOR = TRUE;
/*N*/
@@ -380,7 +380,7 @@ namespace binfilter {
// aber wer ruft das hier ????
//ASSERT( FALSE, "Modify ohne Absender verschickt" );
//JP 11.06.96: DropCaps koennen hierher kommen
-/*N*/ ASSERT( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
+/*N*/ OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify ohne Absender verschickt" );
/*N*/ bWeiter = FALSE;
/*N*/ }
/*N*/
@@ -420,7 +420,7 @@ namespace binfilter {
/*N*/ if ( (pDerFrom == DerivedFrom()) || (pDerFrom == this) )
/*N*/ return FALSE;
/*N*/
-/*N*/ ASSERT( Which()==pDerFrom->Which()
+/*N*/ OSL_ENSURE( Which()==pDerFrom->Which()
/*N*/ || ( Which()==RES_CONDTXTFMTCOLL && pDerFrom->Which()==RES_TXTFMTCOLL)
/*N*/ || ( Which()==RES_TXTFMTCOLL && pDerFrom->Which()==RES_CONDTXTFMTCOLL)
/*N*/ || ( Which()==RES_FLYFRMFMT && pDerFrom->Which()==RES_FRMFMT ),
diff --git a/binfilter/bf_sw/source/core/attr/sw_hints.cxx b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
index 2658039..c28c7d3 100644
--- a/binfilter/bf_sw/source/core/attr/sw_hints.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_hints.cxx
@@ -107,7 +107,7 @@ namespace binfilter {
/*N*/ {
/*N*/ DATA.pDelTbl = 0;
/*N*/ bModified = bBehindSplitLine = FALSE;
-/*N*/ ASSERT( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
+/*N*/ OSL_ENSURE( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
/*N*/ }
@@ -145,7 +145,7 @@ namespace binfilter {
/*N*/ void SwAttrSetChg::ClearItem( USHORT nWhich )
/*N*/ {
-/*N*/ ASSERT( bDelSet, "der Set darf nicht veraendert werden!" );
+/*N*/ OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" );
/*N*/ pChgSet->ClearItem( nWhich );
/*N*/ }
@@ -160,14 +160,14 @@ namespace binfilter {
// "Overhead" vom SfxPoolItem
/*N*/ int SwMsgPoolItem::operator==( const SfxPoolItem& ) const
/*N*/ {
-/*N*/ ASSERT( FALSE, "SwMsgPoolItem kennt kein ==" );
+/*N*/ OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein ==" );
/*N*/ return 0;
/*N*/ }
/*N*/ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
/*N*/ {
-/*N*/ ASSERT( FALSE, "SwMsgPoolItem kennt kein Clone" );
+/*N*/ OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein Clone" );
/*N*/ return 0;
/*N*/ }
@@ -186,7 +186,7 @@ namespace binfilter {
/*N*/ ERR_OUTOFSCOPE );
/*N*/
/*N*/ SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
-/*N*/ ASSERT( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+/*N*/ OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
/*N*/ return pHt;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx b/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx
index 7581321..bf9a7bc 100644
--- a/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx
+++ b/binfilter/bf_sw/source/core/attr/sw_swatrset.cxx
@@ -119,7 +119,7 @@ namespace binfilter {
/*N*/ USHORT SwAttrSet::ClearItem_BC( USHORT nWhich1, USHORT nWhich2,
/*N*/ SwAttrSet* pOld, SwAttrSet* pNew )
/*N*/ {
-/*N*/ ASSERT( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
+/*N*/ OSL_ENSURE( nWhich1 <= nWhich2, "kein gueltiger Bereich" );
/*N*/ pNewSet = pNew;
/*N*/ pOldSet = pOld;
/*N*/ USHORT nRet = 0;
@@ -268,7 +268,7 @@ namespace binfilter {
/*N*/ }
/*N*/ #ifdef DBG_UTIL
/*N*/ else
-/*N*/ ASSERT( !this, "weder Format noch ContentNode - keine Attribute kopiert");
+/*N*/ OSL_ENSURE( !this, "weder Format noch ContentNode - keine Attribute kopiert");
/*N*/ #endif
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
index cc1038a..5f9e8a8 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_calc.cxx
@@ -574,7 +574,7 @@ static int
/*N*/ VarTable[ ii ] = pNewExp;
/*N*/
/*N*/ String sColumnName( GetColumnName( sTmpName ));
-/*N*/ ASSERT( sColumnName.Len(), "DB-Spaltenname fehlt!" );
+/*N*/ OSL_ENSURE( sColumnName.Len(), "DB-Spaltenname fehlt!" );
/*N*/ if( sColumnName.EqualsIgnoreCaseAscii(
/*N*/ SwFieldType::GetTypeStr( TYP_DBSETNUMBERFLD ) ))
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
index 2790dd7..79b7f2d 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_index.cxx
@@ -315,7 +315,7 @@ int SwIndex::nSerial = 0;
/*N*/ SwIndexReg::~SwIndexReg()
/*N*/ {
-/*N*/ ASSERT( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
+/*N*/ OSL_ENSURE( !pFirst || !pLast, "Es sind noch Indizies angemeldet" );
/*N*/ }
#endif
@@ -457,7 +457,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ BOOL SwIndex::operator<( const SwIndex & rIndex ) const
/*N*/ {
-/*N*/ ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+/*N*/ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
/*N*/ return nIndex < rIndex.nIndex;
/*N*/ }
@@ -470,7 +470,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ BOOL SwIndex::operator<=( const SwIndex & rIndex ) const
/*N*/ {
-/*N*/ ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+/*N*/ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
/*N*/ return nIndex <= rIndex.nIndex;
/*N*/ }
@@ -483,7 +483,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ BOOL SwIndex::operator>( const SwIndex & rIndex ) const
/*N*/ {
-/*N*/ ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+/*N*/ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
/*N*/ return nIndex > rIndex.nIndex;
/*N*/ }
@@ -496,7 +496,7 @@ xub_StrLen SwIndex::operator++() {DBG_BF_ASSERT(0, "STRIP"); return 0;}
/*N*/ BOOL SwIndex::operator>=( const SwIndex & rIndex ) const
/*N*/ {
-/*N*/ ASSERT( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
+/*N*/ OSL_ENSURE( pArray == rIndex.pArray, "Attempt to compare indices into different arrays.");
/*N*/ return nIndex >= rIndex.nIndex;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
index b5637d9..b0c7ab9 100644
--- a/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
+++ b/binfilter/bf_sw/source/core/bastyp/sw_swcache.cxx
@@ -58,8 +58,8 @@ namespace binfilter {
/*N*/ return;
/*N*/
/*N*/ //Konsistenspruefung.
-/*N*/ ASSERT( !pLast->GetNext(), "Last but not last." );
-/*N*/ ASSERT( !pRealFirst->GetPrev(), "First but not first." );
+/*N*/ OSL_ENSURE( !pLast->GetNext(), "Last but not last." );
+/*N*/ OSL_ENSURE( !pRealFirst->GetPrev(), "First but not first." );
/*N*/ USHORT nCnt = 0;
/*N*/ BOOL bFirstFound = FALSE;
/*N*/ SwCacheObj *pObj = pRealFirst;
@@ -70,20 +70,20 @@ namespace binfilter {
/*N*/ SwCacheObj *pTmp = pLast;
/*N*/ while ( pTmp && pTmp != pObj )
/*N*/ pTmp = pTmp->GetPrev();
-/*N*/ ASSERT( pTmp, "Objekt not found." );
+/*N*/ OSL_ENSURE( pTmp, "Objekt not found." );
/*N*/
/*N*/ ++nCnt;
/*N*/ if ( pObj == pFirst )
/*N*/ bFirstFound = TRUE;
/*N*/ if ( !pObj->GetNext() )
-/*N*/ ASSERT( pObj == pLast, "Last not Found." );
+/*N*/ OSL_ENSURE( pObj == pLast, "Last not Found." );
/*N*/ pObj = pObj->GetNext();
-/*N*/ ASSERT( pObj != pRekursive, "Recursion in SwCache." );
+/*N*/ OSL_ENSURE( pObj != pRekursive, "Recursion in SwCache." );
/*N*/ }
-/*N*/ ASSERT( bFirstFound, "First not Found." );
-/*N*/ ASSERT( (nCnt + aFreePositions.Count()) == Count(), "Lost Chain." );
+/*N*/ OSL_ENSURE( bFirstFound, "First not Found." );
+/*N*/ OSL_ENSURE( (nCnt + aFreePositions.Count()) == Count(), "Lost Chain." );
/*N*/ if ( Count() == nCurMax )
-/*N*/ ASSERT( (nCurMax - nCnt) == aFreePositions.Count(), "Lost FreePositions." );
+/*N*/ OSL_ENSURE( (nCurMax - nCnt) == aFreePositions.Count(), "Lost FreePositions." );
/*N*/ }
#endif
@@ -184,7 +184,7 @@ namespace binfilter {
/*N*/ void SwCache::Flush( const BYTE nPercent )
/*N*/ {
-/*N*/ ASSERT( nPercent == 100, "SwCache::Flush() arbeitet nur 100%'ig" );
+/*N*/ OSL_ENSURE( nPercent == 100, "SwCache::Flush() arbeitet nur 100%'ig" );
/*N*/
/*N*/ INCREMENT( nFlushCnt );
/*N*/ SwCacheObj *pObj = pRealFirst;
@@ -195,7 +195,7 @@ namespace binfilter {
/*N*/ #ifdef DBG_UTIL
/*N*/ if ( pObj->IsLocked() )
/*N*/ {
-/*?*/ ASSERT( TRUE, "Flushing locked objects." );
+/*?*/ OSL_ENSURE( TRUE, "Flushing locked objects." );
/*?*/ if ( !pRealFirst )
/*?*/ {
/*?*/ pRealFirst = pFirst = pLast = pObj;
@@ -244,7 +244,7 @@ namespace binfilter {
/*N*/
/*N*/ if ( !pRealFirst )
/*N*/ { //Der erste wird eingetragen.
-/*?*/ ASSERT( !pFirst && !pLast, "First not first." );
+/*?*/ OSL_ENSURE( !pFirst && !pLast, "First not first." );
/*?*/ pRealFirst = pFirst = pLast = pObj;
/*?*/ CHECK;
/*?*/ return;
@@ -253,7 +253,7 @@ namespace binfilter {
/*N*/ //Ausschneiden.
/*N*/ if ( pObj == pLast )
/*N*/ {
-/*N*/ ASSERT( pObj->GetPrev(), "Last but no Prev." );
+/*N*/ OSL_ENSURE( pObj->GetPrev(), "Last but no Prev." );
/*N*/ pLast = pObj->GetPrev();
/*N*/ pLast->SetNext( 0 );
/*N*/ }
@@ -276,7 +276,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ ASSERT( pFirst, "ToTop, First ist not RealFirst an Empty." );
+/*N*/ OSL_ENSURE( pFirst, "ToTop, First ist not RealFirst an Empty." );
/*N*/
/*N*/ if ( pFirst->GetPrev() )
/*N*/ {
@@ -355,7 +355,7 @@ namespace binfilter {
/*N*/ void SwCache::DeleteObj( SwCacheObj *pObj )
/*N*/ {
/*N*/ CHECK;
-/*N*/ ASSERT( !pObj->IsLocked(), "SwCache::Delete: Object ist Locked." );
+/*N*/ OSL_ENSURE( !pObj->IsLocked(), "SwCache::Delete: Object ist Locked." );
/*N*/ if ( pObj->IsLocked() )
/*N*/ return;
/*N*/
@@ -422,7 +422,7 @@ namespace binfilter {
/*N*/ BOOL SwCache::Insert( SwCacheObj *pNew )
/*N*/ {
/*N*/ CHECK;
-/*N*/ ASSERT( !pNew->GetPrev() && !pNew->GetNext(), "New but not new." );
+/*N*/ OSL_ENSURE( !pNew->GetPrev() && !pNew->GetNext(), "New but not new." );
/*N*/
/*N*/ USHORT nPos;//Wird hinter den if's zum setzen am Obj benutzt.
/*N*/ if ( Count() < nCurMax )
@@ -451,13 +451,13 @@ namespace binfilter {
/*N*/ pObj = pObj->GetPrev();
/*N*/ if ( !pObj )
/*N*/ {
-/*N*/ ASSERT( FALSE, "Cache overflow." );
+/*N*/ OSL_ENSURE( FALSE, "Cache overflow." );
/*N*/ return FALSE;
/*N*/ }
/*N*/
/*N*/ nPos = pObj->GetCachePos();
/*N*/ if ( pObj == pLast )
-/*N*/ { ASSERT( pObj->GetPrev(), "Last but no Prev" );
+/*N*/ { OSL_ENSURE( pObj->GetPrev(), "Last but no Prev" );
/*N*/ pLast = pObj->GetPrev();
/*N*/ pLast->SetNext( 0 );
/*N*/ }
@@ -485,7 +485,7 @@ namespace binfilter {
/*N*/ pNew->SetNext( pFirst );
/*N*/ }
/*N*/ else
-/*N*/ { ASSERT( !pLast, "Last but no First." );
+/*N*/ { OSL_ENSURE( !pLast, "Last but no First." );
/*N*/ pLast = pNew;
/*N*/ }
/*N*/ if ( pFirst == pRealFirst )
@@ -554,7 +554,7 @@ namespace binfilter {
/*N*/ void SwCacheObj::Lock()
/*N*/ {
-/*N*/ ASSERT( nLock < UCHAR_MAX, "To many Locks for CacheObject." );
+/*N*/ OSL_ENSURE( nLock < UCHAR_MAX, "To many Locks for CacheObject." );
/*N*/ ++nLock;
/*N*/ }
@@ -562,7 +562,7 @@ namespace binfilter {
/*N*/ void SwCacheObj::Unlock()
/*N*/ {
-/*N*/ ASSERT( nLock, "No more Locks available." );
+/*N*/ OSL_ENSURE( nLock, "No more Locks available." );
/*N*/ --nLock;
/*N*/ }
#endif
@@ -576,7 +576,7 @@ namespace binfilter {
/*N*/ void SwCacheAccess::_Get()
/*N*/ {
-/*N*/ ASSERT( !pObj, "SwCacheAcces Obj already available." );
+/*N*/ OSL_ENSURE( !pObj, "SwCacheAcces Obj already available." );
/*N*/
/*N*/ pObj = NewObj();
/*N*/ if ( !rCache.Insert( pObj ) )
diff --git a/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx b/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx
index 0b2d06b..13e05c3 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_callnk.cxx
@@ -187,7 +187,7 @@ namespace binfilter {
/*M*/ 0 != ( pFlyFrm = pFrm->FindFlyFrm() ) && !rShell.IsTableMode() )
/*M*/ {
/*M*/ const SwNodeIndex* pIndex = pFlyFrm->GetFmt()->GetCntnt().GetCntntIdx();
-/*M*/ ASSERT( pIndex, "Fly ohne Cntnt" );
+/*M*/ OSL_ENSURE( pIndex, "Fly ohne Cntnt" );
/*M*/ const SwNode& rStNd = pIndex->GetNode();
/*M*/
/*M*/ if( rStNd.EndOfSectionNode()->StartOfSectionIndex() > nNode ||
diff --git a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
index 9816ff6..37fe8e2 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_crsrsh.cxx
@@ -231,14 +231,14 @@ using namespace ::com::sun::star::util;
/*?*/
/*?*/ void SwCrsrShell::SttCrsrMove()
/*?*/ {
-/*?*/ ASSERT( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
+/*?*/ OSL_ENSURE( nCrsrMove < USHRT_MAX, "To many nested CrsrMoves." );
/*?*/ ++nCrsrMove;
/*?*/ StartAction();
/*?*/ }
/*?*/
/*?*/ void SwCrsrShell::EndCrsrMove( const BOOL bIdleEnd )
/*?*/ {
-/*?*/ ASSERT( nCrsrMove, "EndCrsrMove() ohne SttCrsrMove()." );
+/*?*/ OSL_ENSURE( nCrsrMove, "EndCrsrMove() ohne SttCrsrMove()." );
/*?*/ EndAction( bIdleEnd );
/*?*/ if( !--nCrsrMove )
/*?*/ bInCMvVisportChgd = FALSE;
@@ -437,7 +437,7 @@ using namespace ::com::sun::star::util;
/*N*/ pFrm->GetCrsrOfst( pCurCrsr->GetPoint(), rPt, &aTmpState );
/*N*/ #ifndef VERTICAL_LAYOUT
/*N*/ if ( !pFrm->GetCharRect(aCharRect, *pCurCrsr->GetPoint(), &aTmpState) )
-/*N*/ ASSERT( !this, "GetCharRect failed." );
+/*N*/ OSL_ENSURE( !this, "GetCharRect failed." );
/*N*/ #endif
/*M*/ }
/*M*/ // ALIGNRECT( aCharRect );
@@ -465,7 +465,7 @@ using namespace ::com::sun::star::util;
/*M*/ // siehe Bug: 29658
/*M*/ if( !--nLoopCnt )
/*M*/ {
-/*M*/ ASSERT( !this, "Endlosschleife? CharRect != OldCharRect ");
+/*M*/ OSL_ENSURE( !this, "Endlosschleife? CharRect != OldCharRect ");
/*M*/ break;
/*M*/ }
/*M*/ aOld = aCharRect;
@@ -704,7 +704,7 @@ using namespace ::com::sun::star::util;
// zeige das akt. selektierte "Object" an
/*N*/ void SwCrsrShell::MakeSelVisible()
/*N*/ {
-/*N*/ ASSERT( bHasFocus, "kein Focus aber Cursor sichtbar machen?" );
+/*N*/ OSL_ENSURE( bHasFocus, "kein Focus aber Cursor sichtbar machen?" );
/*N*/ if( aCrsrHeight.Y() < aCharRect.Height() && aCharRect.Height() > VisArea().Height() )
/*N*/ {
/*N*/ SwRect aTmp( aCharRect );
@@ -910,7 +910,7 @@ using namespace ::com::sun::star::util;
/*?*/ SwNode * pNode = aNodes.GoNext(&aIdx);
/*?*/ bool bFound = (pNode != NULL);
/*?*/
-/*?*/ ASSERT(bFound, "no content node found");
+/*?*/ OSL_ENSURE(bFound, "no content node found");
/*?*/
/*?*/ if (bFound)
/*?*/ {
diff --git a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
index 7086598..c086fdd 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_swcrsr.cxx
@@ -302,7 +302,7 @@ struct _PercentHdl
/*?*/ // gibt es auch eine vorherige Zelle
/*?*/ }
/*?*/
-/*?*/ ASSERT( FALSE, "sollte nie erreicht werden oder??" );
+/*?*/ OSL_ENSURE( FALSE, "sollte nie erreicht werden oder??" );
/*?*/ return FALSE;
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
index cd997e4..9f600cc 100644
--- a/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
+++ b/binfilter/bf_sw/source/core/crsr/sw_unocrsr.cxx
@@ -65,7 +65,7 @@ namespace binfilter {
/*N*/ if( USHRT_MAX != nDelPos )
/*N*/ rTbl.Remove( nDelPos );
/*N*/ else
-/*N*/ ASSERT( !this, "UNO Cursor nicht mehr im Array" );
+/*N*/ OSL_ENSURE( !this, "UNO Cursor nicht mehr im Array" );
/*N*/ }
/*N*/
/*N*/ // den gesamten Ring loeschen!
diff --git a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
index 672734b..fa8dc3d 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docbm.cxx
@@ -131,7 +131,7 @@ namespace binfilter {
/*N*/ USHORT SwDoc::FindBookmark( const String& rName )
/*N*/ {
-/*N*/ ASSERT( rName.Len(), "wo ist der Name?" );
+/*N*/ OSL_ENSURE( rName.Len(), "wo ist der Name?" );
/*N*/ for( USHORT n = pBookmarkTbl->Count(); n ; )
/*N*/ if( rName.Equals( (*pBookmarkTbl)[ --n ]->GetName() ) )
/*N*/ return n;
@@ -556,7 +556,7 @@ namespace binfilter {
/*N*/ aSave.SetType( 0x2000 );
/*N*/ aSave.SetContent( pAPos->nContent.GetIndex() );
/*N*/
-/*N*/ ASSERT( nNode == pAPos->nNode.GetIndex(),
+/*N*/ OSL_ENSURE( nNode == pAPos->nNode.GetIndex(),
/*N*/ "_SaveCntntIdx: Wrong Node-Index" );
/*N*/ if( FLY_AUTO_CNTNT == rAnchor.GetAnchorId() )
/*N*/ {
@@ -573,7 +573,7 @@ namespace binfilter {
/*N*/ pFmt != (*pDoc->GetSpzFrmFmts())[
/*N*/ aSave.DecCount() ] )
/*N*/ ; // nothing
-/*N*/ ASSERT( pFmt == (*pDoc->GetSpzFrmFmts())[
+/*N*/ OSL_ENSURE( pFmt == (*pDoc->GetSpzFrmFmts())[
/*N*/ aSave.GetCount() ],
/*N*/ "_SaveCntntIdx: Lost FrameFormat" );
/*N*/ aSave.Add( rSaveArr );
diff --git a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
index 7c9783f..a327efc 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docchart.cxx
@@ -120,7 +120,7 @@ namespace binfilter {
/*?*/ SchDLL::MemChartRemoveRows( *pData, 0, pData->GetRowCount() - (nLines - nRowStt) );
/*N*/
/*N*/
-/*N*/ ASSERT( pData->GetRowCount() >= (nLines - nRowStt ) &&
+/*N*/ OSL_ENSURE( pData->GetRowCount() >= (nLines - nRowStt ) &&
/*N*/ pData->GetColCount() >= (nBoxes - nColStt ),
/*N*/ "Die Struktur fuers Chart ist zu klein,\n"
/*N*/ "es wird irgendwo in den Speicher geschrieben!" );
@@ -131,7 +131,7 @@ namespace binfilter {
/*?*/ for( n = nColStt; n < nBoxes; ++n )
/*?*/ {
/*?*/ const SwTableBox *pBox = (*aLines[ 0 ])[ n ];
-/*?*/ ASSERT( pBox->GetSttNd(), "Box without SttIdx" );
+/*?*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
/*?*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
/*?*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
/*?*/ if( !pTNd )
@@ -155,7 +155,7 @@ namespace binfilter {
/*N*/ for( n = nRowStt; n < nLines; ++n )
/*N*/ {
/*N*/ const SwTableBox *pBox = (*aLines[ n ])[ 0 ];
-/*N*/ ASSERT( pBox->GetSttNd(), "Box without SttIdx" );
+/*N*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
/*N*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
/*N*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
/*N*/ if( !pTNd )
@@ -185,7 +185,7 @@ namespace binfilter {
/*N*/ for( USHORT i = nColStt; i < nBoxes; ++i )
/*N*/ {
/*N*/ const SwTableBox* pBox = (*aLines[ n ])[ i ];
-/*N*/ ASSERT( pBox->GetSttNd(), "Box without SttIdx" );
+/*N*/ OSL_ENSURE( pBox->GetSttNd(), "Box without SttIdx" );
/*N*/ SwNodeIndex aIdx( *pBox->GetSttNd(), 1 );
/*N*/ const SwTxtNode* pTNd = aIdx.GetNode().GetTxtNode();
/*N*/ if( !pTNd )
@@ -247,7 +247,7 @@ namespace binfilter {
/*?*/ if( '>' == sBox.GetChar( sBox.Len()-1 ) ) sBox.Erase( sBox.Len()-1 );
/*?*/
/*?*/ xub_StrLen nTrenner = sBox.Search( ':' );
-/*?*/ ASSERT( STRING_NOTFOUND != nTrenner, "keine gueltige Selektion" );
+/*?*/ OSL_ENSURE( STRING_NOTFOUND != nTrenner, "keine gueltige Selektion" );
/*?*/
/*?*/ pSttBox = GetTblBox( sBox.Copy( 0, nTrenner ));
/*?*/ pEndBox = GetTblBox( sBox.Copy( nTrenner+1 ));
@@ -320,7 +320,7 @@ namespace binfilter {
/*N*/ SchMemChart *pData = SchDLL::GetChartData( rOObj.GetOleRef() );
/*N*/ bool bDelData = 0 == pData;
/*N*/
-/*N*/ ASSERT( pData, "UpdateChart ohne irgendwelche Daten?" );
+/*N*/ OSL_ENSURE( pData, "UpdateChart ohne irgendwelche Daten?" );
/*N*/ pData = rTbl.UpdateData( pData );
/*N*/
/*N*/ if( pData->GetColCount() && pData->GetRowCount() )
diff --git a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
index 82dfd80..9e194e5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doccorr.cxx
@@ -103,7 +103,7 @@ namespace binfilter {
/*N*/ FOREACHSHELL_START( pShell )
/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // ASSERT( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
+/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
/*N*/ if( _pStkCrsr )
/*?*/ do {
/*?*/ _PaMCorrAbs1( _pStkCrsr )
@@ -216,7 +216,7 @@ namespace binfilter {
/*N*/ FOREACHSHELL_START( pShell )
/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // ASSERT( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
+/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
/*N*/ if( _pStkCrsr )
/*N*/ do {
/*N*/ _PaMCorrAbs2( _pStkCrsr, aNewPos, nSttNode, nEndNode );
@@ -315,7 +315,7 @@ namespace binfilter {
/*N*/ FOREACHSHELL_START( pShell )
/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // ASSERT( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
+/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
/*N*/ if( _pStkCrsr )
/*N*/ do {
/*?*/ _PaMCorrAbs3( _pStkCrsr )
@@ -382,7 +382,7 @@ namespace binfilter {
/*N*/ FOREACHSHELL_START( pShell )
/*N*/ register SwPaM *_pStkCrsr = PCURSH->GetStkCrsr();
/*N*/ // Alle ueberfluessigen Crsr sind vom Stack, oder ??
-/*N*/ // ASSERT( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
+/*N*/ // OSL_ENSURE( !_pStkCrsr, "Es stehen noch Crsr auf dem CrsrStack" );
/*N*/ if( _pStkCrsr )
/*N*/ do {
/*?*/ _PaMCorrRel1( _pStkCrsr )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
index a249a18..7f730cd 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdesc.cxx
@@ -225,7 +225,7 @@ namespace binfilter {
/*N*/ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
/*N*/ {
-/*N*/ ASSERT( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
+/*N*/ OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
/*N*/
/*N*/ SwPageDesc *pDesc = aPageDescs[i];
/*N*/
@@ -452,8 +452,8 @@ void lcl_RemoveFrms( SwFrmFmt& rFmt, bool& rbFtnsRemoved )
void SwDoc::DelPageDesc( USHORT i )
{
- ASSERT( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
- ASSERT( i != 0, "Default Pagedesc loeschen is nicht." );
+ OSL_ENSURE( i < aPageDescs.Count(), "PageDescs ueberindiziert." );
+ OSL_ENSURE( i != 0, "Default Pagedesc loeschen is nicht." );
if ( i == 0 )
return;
@@ -475,7 +475,7 @@ void SwDoc::DelPageDesc( USHORT i )
((SwFmt*)pMod)->SetAttr( aDfltDesc );
else
{
- ASSERT( !this, "was ist das fuer ein Mofify-Obj?" );
+ OSL_ENSURE( !this, "was ist das fuer ein Mofify-Obj?" );
aPageDescs[0]->Add( pLast );
}
}
@@ -778,7 +778,7 @@ extern SvPtrarr *pGlobalOLEExcludeList;
/*N*/ void SwDoc::SetPrt( SfxPrinter *pP, sal_Bool bCallPrtDataChanged )
/*N*/ {
-/*N*/ ASSERT( pP, "Kein Drucker!" );
+/*N*/ OSL_ENSURE( pP, "Kein Drucker!" );
/*N*/
/*N*/ const BOOL bInitPageDesc = pPrt == 0;
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
index e4bdf5a..df84b30 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docdraw.cxx
@@ -141,7 +141,7 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
/*N*/ }
/*N*/ else
{
-/*N*/ ASSERT( !this, "was ist das fuer ein Format?" );
+/*N*/ OSL_ENSURE( !this, "was ist das fuer ein Format?" );
}
/*N*/ }
} //namespace binfilter
@@ -264,7 +264,7 @@ bool SwDoc::IsVisibleLayerId( const SdrLayerID& _nLayerId )
}
else
{
- ASSERT( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
+ OSL_ENSURE( false, "<SwDoc::IsVisibleLayerId(..)> - unknown layer ID." );
bRetVal = false;
}
@@ -297,12 +297,12 @@ SdrLayerID SwDoc::GetVisibleLayerIdByInvisibleOne( const SdrLayerID& _nInvisible
_nInvisibleLayerId == GetHellId() ||
_nInvisibleLayerId == GetControlsId() )
{
- ASSERT( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID already an invisible one." );
nVisibleLayerId = _nInvisibleLayerId;
}
else
{
- ASSERT( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
+ OSL_ENSURE( false, "<SwDoc::GetVisibleLayerIdByInvisibleOne(..)> - given layer ID is unknown." );
nVisibleLayerId = _nInvisibleLayerId;
}
@@ -335,12 +335,12 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
_nVisibleLayerId == GetInvisibleHellId() ||
_nVisibleLayerId == GetInvisibleControlsId() )
{
- ASSERT( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
+ OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID already an invisible one." );
nInvisibleLayerId = _nVisibleLayerId;
}
else
{
- ASSERT( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
+ OSL_ENSURE( false, "<SwDoc::GetInvisibleLayerIdByVisibleOne(..)> - given layer ID is unknown." );
nInvisibleLayerId = _nVisibleLayerId;
}
@@ -359,9 +359,9 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
/*N*/ delete pDrawModel; pDrawModel = 0;
/*N*/ SfxItemPool *pSdrPool = aAttrPool.GetSecondaryPool();
/*N*/
-/*N*/ ASSERT( pSdrPool, "missing Pool" );
+/*N*/ OSL_ENSURE( pSdrPool, "missing Pool" );
/*N*/ SfxItemPool *pEEgPool = pSdrPool->GetSecondaryPool();
-/*N*/ ASSERT( !pEEgPool->GetSecondaryPool(), "i don't accept additional pools");
+/*N*/ OSL_ENSURE( !pEEgPool->GetSecondaryPool(), "i don't accept additional pools");
/*N*/ pSdrPool->Delete(); //Erst die Items vernichten lassen,
/*N*/ //dann erst die Verkettung loesen
/*N*/ aAttrPool.SetSecondaryPool( 0 ); //Der ist ein muss!
@@ -376,7 +376,7 @@ SdrLayerID SwDoc::GetInvisibleLayerIdByVisibleOne( const SdrLayerID& _nVisibleLa
/*N*/ SdrModel* SwDoc::_MakeDrawModel()
/*N*/ {
-/*N*/ ASSERT( !pDrawModel, "_MakeDrawModel: Why?" );
+/*N*/ OSL_ENSURE( !pDrawModel, "_MakeDrawModel: Why?" );
/*N*/ InitDrawModel();
/*N*/ if ( pLayout && pLayout->GetCurrShell() )
/*N*/ {
diff --git a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
index 4d31c85..fed1667 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docedt.cxx
@@ -84,7 +84,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
/*N*/ ? rMkNdIdx < pAPos->nNode && pAPos->nNode <= rPtNdIdx
/*N*/ : rPtNdIdx <= pAPos->nNode && pAPos->nNode < rMkNdIdx ))
/*N*/ {
-/*N*/ ASSERT( rAnch.GetAnchorId() != FLY_AUTO_CNTNT, "FLY-AUTO-Baustelle!" );
+/*N*/ OSL_ENSURE( rAnch.GetAnchorId() != FLY_AUTO_CNTNT, "FLY-AUTO-Baustelle!" );
/*N*/ // nur den Anker verchieben ??
/*N*/ if( rPtNdIdx == pAPos->nNode )
/*N*/ {
@@ -167,7 +167,7 @@ SV_IMPL_PTRARR( SaveBookmarks, SaveBookmark* )
// Der uebergebene Node steht irgendwo in der gewuenschten Section
/*N*/ void SwDoc::DeleteSection( SwNode *pNode )
/*N*/ {
-/*N*/ ASSERT( pNode, "Kein Node uebergeben." );
+/*N*/ OSL_ENSURE( pNode, "Kein Node uebergeben." );
/*N*/ SwStartNode* pSttNd = pNode->IsStartNode() ? (SwStartNode*)pNode
/*N*/ : pNode->StartOfSectionNode();
/*N*/ SwNodeIndex aSttIdx( *pSttNd ), aEndIdx( *pNode->EndOfSectionNode() );
@@ -555,7 +555,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rPam.Exchange();
/*N*/ if( !rPam.Move( fnMoveBackward, fnGoNode ))
/*N*/ {
-/*N*/ ASSERT( sal_False, "kein Node mehr vorhanden" );
+/*N*/ OSL_ENSURE( sal_False, "kein Node mehr vorhanden" );
/*N*/ return sal_False;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
index 62e3bae..89c890c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfld.cxx
@@ -172,7 +172,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ void SwDoc::RemoveFldType(USHORT nFld)
/*N*/ {
-/*N*/ ASSERT( INIT_FLDTYPES <= nFld, "keine InitFields loeschen" );
+/*N*/ OSL_ENSURE( INIT_FLDTYPES <= nFld, "keine InitFields loeschen" );
/*
* Abheangige Felder vorhanden -> ErrRaise
*/
@@ -205,7 +205,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*?*/
/*N*/ if( nWhich )
/*N*/ {
-/*?*/ ASSERT( !pTmp->GetDepends(), "Abhaengige vorh.!" );
+/*?*/ OSL_ENSURE( !pTmp->GetDepends(), "Abhaengige vorh.!" );
/*?*/ // Feldtype loschen
/*?*/ delete pTmp;
/*N*/ }
@@ -289,7 +289,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
/*N*/ {
-/*N*/ ASSERT( !pHt || RES_TABLEFML_UPDATE == pHt->Which(),
+/*N*/ OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE == pHt->Which(),
/*N*/ "Was ist das fuer ein MessageItem?" );
/*N*/
/*N*/ SwFieldType* pFldType;
@@ -810,7 +810,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ SwTxtFld* pTxtFld = (SwTxtFld*)(*ppSortLst)->GetFld();
/*N*/ if( !pTxtFld )
/*N*/ {
-/*N*/ ASSERT( !this, "was ist es denn nun" );
+/*N*/ OSL_ENSURE( !this, "was ist es denn nun" );
/*N*/ continue;
/*N*/ }
/*N*/
@@ -1074,7 +1074,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ pFldTypes->Insert( new SwSetExpFieldType(this,
/*N*/ SW_RESSTR(STR_POOLCOLL_LABEL_DRAWING), GSE_SEQ),nFldType++);
/*N*/
-/*N*/ ASSERT( nFldType == INIT_FLDTYPES, "Bad initsize: SwFldTypes" );
+/*N*/ OSL_ENSURE( nFldType == INIT_FLDTYPES, "Bad initsize: SwFldTypes" );
/*N*/ }
/*N*/ void SwDoc::InsDelFldInFldLst( BOOL bIns, const SwTxtFld& rFld )
@@ -1471,13 +1471,13 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*M*/ for( n = nArrStt; n < aTmpArr.Count(); ++n )
/*M*/ {
/*M*/ pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode();
-/*M*/ ASSERT( pSectNd, "Wo ist mein SectionNode" );
+/*M*/ OSL_ENSURE( pSectNd, "Wo ist mein SectionNode" );
/*M*/ pSectNd->GetSection().SetCondHidden( FALSE );
/*M*/ }
/*M*/ for( n = 0; n < nArrStt; ++n )
/*M*/ {
/*M*/ pSectNd = rDoc.GetNodes()[ aTmpArr[ n ] ]->GetSectionNode();
-/*M*/ ASSERT( pSectNd, "Wo ist mein SectionNode" );
+/*M*/ OSL_ENSURE( pSectNd, "Wo ist mein SectionNode" );
/*M*/ pSectNd->GetSection().SetCondHidden( FALSE );
/*M*/ }
/*M*/
@@ -1642,7 +1642,7 @@ extern BOOL IsFrameBehind( const SwTxtNode& rMyNd, USHORT nMySttPos,
/*N*/ // einen Index fuers bestimmen vom TextNode anlegen
/*N*/ SwPosition aPos( rDoc.GetNodes().GetEndOfPostIts() );
/*N*/ #ifdef DBG_UTIL
-/*N*/ ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
+/*N*/ OSL_ENSURE( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
/*N*/ #else
/*N*/ GetBodyTxtNode( rDoc, aPos, *pFrm );
/*N*/ #endif
@@ -1690,7 +1690,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
break;
#ifdef DBG_UTIL
- ASSERT( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
+ OSL_ENSURE( GetBodyTxtNode( rDoc, aPos, *pFrm ), "wo steht das Feld" );
#else
GetBodyTxtNode( rDoc, aPos, *pFrm );
#endif
@@ -1718,7 +1718,7 @@ void SwDocUpdtFld::GetBodyNode( const SwSectionNode& rSectNd )
/*N*/ sFldName = ((SwSetExpFieldType&)rType).GetName();
/*N*/ break;
/*N*/ default:
-/*N*/ ASSERT( !this, "kein gueltiger FeldTyp" );
+/*N*/ OSL_ENSURE( !this, "kein gueltiger FeldTyp" );
/*N*/ }
/*N*/
/*N*/ if( sFldName.Len() )
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
index 8784c5b..f50a570 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfly.cxx
@@ -244,13 +244,13 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ //Verbindung zwischen Attribut und Format.
/*M*/ const SwPosition *pPos = rOldAnch.GetCntntAnchor();
/*M*/ SwTxtNode *pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-/*M*/ ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+/*M*/ OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
/*M*/ const xub_StrLen nIdx = pPos->nContent.GetIndex();
/*M*/ SwTxtAttr * pHnt = pTxtNode->GetTxtAttr( nIdx, RES_TXTATR_FLYCNT );
/*M*/ #ifdef DBG_UTIL
-/*M*/ ASSERT( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
+/*M*/ OSL_ENSURE( pHnt && pHnt->Which() == RES_TXTATR_FLYCNT,
/*M*/ "Missing FlyInCnt-Hint." );
-/*M*/ ASSERT( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
+/*M*/ OSL_ENSURE( pHnt && pHnt->GetFlyCnt().GetFrmFmt() == &rFmt,
/*M*/ "Wrong TxtFlyCnt-Hint." );
/*M*/ #endif
/*M*/ ((SwFmtFlyCnt&)pHnt->GetFlyCnt()).SetFlyFmt();
@@ -275,7 +275,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*M*/ {
/*M*/ const SwPosition *pPos = aNewAnch.GetCntntAnchor();
/*M*/ SwTxtNode *pNd = pPos->nNode.GetNode().GetTxtNode();
-/*M*/ ASSERT( pNd, "Crsr steht nicht auf TxtNode." );
+/*M*/ OSL_ENSURE( pNd, "Crsr steht nicht auf TxtNode." );
/*M*/
/*M*/ pNd->Insert( SwFmtFlyCnt( (SwFlyFrmFmt*)&rFmt ),
/*M*/ pPos->nContent.GetIndex(), 0 );
@@ -384,7 +384,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*N*/ case RES_PAGEDESC:
/*N*/ case RES_CNTNT:
/*N*/ case RES_FOOTER:
-/*N*/ ASSERT( !this, ":-) Unbekanntes Attribut fuer Fly." );
+/*N*/ OSL_ENSURE( !this, ":-) Unbekanntes Attribut fuer Fly." );
/*N*/ // kein break;
/*N*/ case RES_CHAIN:
/*?*/ rSet.ClearItem( nWhich );
@@ -522,7 +522,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ BOOL SwDoc::ChgAnchor( const SdrMarkList& rMrkList, int eAnchorId,
/*?*/ BOOL bSameOnly, BOOL bPosCorr )
/*?*/ {
-/*?*/ ASSERT( GetRootFrm(), "Ohne Layout geht gar nichts" );
+/*?*/ OSL_ENSURE( GetRootFrm(), "Ohne Layout geht gar nichts" );
/*?*/
/*?*/ if( !rMrkList.GetMarkCount() ||
/*?*/ rMrkList.GetMark( 0 )->GetObj()->GetUpGroup() )
@@ -546,7 +546,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ bool bNoUserCallExcepted =
/*?*/ pObj->ISA(SwDrawVirtObj) &&
/*?*/ !static_cast<SwDrawVirtObj*>(pObj)->IsConnected();
-/*?*/ ASSERT( bNoUserCallExcepted, "SwDoc::ChgAnchor(..) - no contact at selected drawing object" );
+/*?*/ OSL_ENSURE( bNoUserCallExcepted, "SwDoc::ChgAnchor(..) - no contact at selected drawing object" );
/*?*/ #endif
/*?*/ continue;
/*?*/ }
@@ -573,7 +573,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ const SwPosition *pPos =
/*?*/ pContact->GetFmt()->GetAnchor().GetCntntAnchor();
/*?*/ pTxtNode = pPos->nNode.GetNode().GetTxtNode();
-/*?*/ ASSERT( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
+/*?*/ OSL_ENSURE( pTxtNode->HasHints(), "Missing FlyInCnt-Hint." );
/*?*/ nIndx = pPos->nContent.GetIndex();
/*?*/ if( !pOldAnch )
/*?*/ {
@@ -723,14 +723,14 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ aNewAnch.SetAnchor( &aPos );
/*?*/ SetAttr( aNewAnch, *pContact->GetFmt() );
/*?*/ SwTxtNode *pNd = aPos.nNode.GetNode().GetTxtNode();
-/*?*/ ASSERT( pNd, "Crsr steht nicht auf TxtNode." );
+/*?*/ OSL_ENSURE( pNd, "Crsr steht nicht auf TxtNode." );
/*?*/
/*?*/ pNd->Insert( SwFmtFlyCnt( pContact->GetFmt() ),
/*?*/ aPos.nContent.GetIndex(), 0 );
/*?*/ }
/*?*/ break;
/*?*/ default:
-/*?*/ ASSERT( !this, "unexpected AnchorId." );
+/*?*/ OSL_ENSURE( !this, "unexpected AnchorId." );
/*?*/ }
/*?*/
/*?*/ if( bChanges && pNewAnch )
@@ -781,7 +781,7 @@ extern USHORT GetHtmlMode( const SwDocShell* );
/*?*/ #ifdef DBG_UTIL
/*?*/ {
/*?*/ const Point aIstA( pObj->GetAnchorPos() );
-/*?*/ ASSERT( pOldAnch == pNewAnch || aIstA == aProposedAnchorPos,
+/*?*/ OSL_ENSURE( pOldAnch == pNewAnch || aIstA == aProposedAnchorPos,
/*?*/ "SwDoc::ChgAnchor(..): Wrong Anchor-Pos." );
/*?*/ }
/*?*/ #endif
diff --git a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
index 3529afa..2775359 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docfmt.cxx
@@ -834,7 +834,7 @@ void SwDoc::DelCharFmt(USHORT nFmt)
void SwDoc::DelCharFmt( SwCharFmt *pFmt )
{
USHORT nFmt = pCharFmtTbl->GetPos( pFmt );
- ASSERT( USHRT_MAX != nFmt, "Fmt not found," );
+ OSL_ENSURE( USHRT_MAX != nFmt, "Fmt not found," );
DelCharFmt( nFmt );
}
@@ -842,7 +842,7 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ {
/*N*/ if( pFmt->ISA( SwTableBoxFmt ) || pFmt->ISA( SwTableLineFmt ))
/*N*/ {
-/*?*/ ASSERT( !this, "Format steht nicht mehr im DocArray, "
+/*?*/ OSL_ENSURE( !this, "Format steht nicht mehr im DocArray, "
/*?*/ "kann per delete geloescht werden" );
/*?*/ delete pFmt;
/*N*/ }
@@ -856,7 +856,7 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ else
/*N*/ {
/*N*/ nPos = GetSpzFrmFmts()->GetPos( pFmt );
-/*N*/ ASSERT( nPos != USHRT_MAX, "FrmFmt not found." );
+/*N*/ OSL_ENSURE( nPos != USHRT_MAX, "FrmFmt not found." );
/*N*/ if( USHRT_MAX != nPos )
/*N*/ GetSpzFrmFmts()->DeleteAndDestroy( nPos );
/*N*/ }
@@ -866,7 +866,7 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ void SwDoc::DelTblFrmFmt( SwTableFmt *pFmt )
/*N*/ {
/*N*/ USHORT nPos = pTblFrmFmtTbl->GetPos( pFmt );
-/*N*/ ASSERT( USHRT_MAX != nPos, "Fmt not found," );
+/*N*/ OSL_ENSURE( USHRT_MAX != nPos, "Fmt not found," );
/*N*/ pTblFrmFmtTbl->DeleteAndDestroy( nPos );
/*N*/ }
@@ -1222,7 +1222,7 @@ void SwDoc::DelCharFmt( SwCharFmt *pFmt )
/*N*/ {
/*N*/ RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722", "SwDoc::_CreateNumberFormatter" );
/*N*/
-/*N*/ ASSERT( !pNumberFormatter, "ist doch schon vorhanden" );
+/*N*/ OSL_ENSURE( !pNumberFormatter, "ist doch schon vorhanden" );
/*N*/
/*N*/
/*N*/ LanguageType eLang = LANGUAGE_SYSTEM; //System::GetLanguage();
diff --git a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
index 47f3cea..ecc964f 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doclay.cxx
@@ -168,13 +168,13 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*?*/ case FLY_AT_FLY:
/*?*/ case FLY_AT_CNTNT:
/*?*/ case FLY_IN_CNTNT:
-/*?*/ ASSERT( !this,
+/*?*/ OSL_ENSURE( !this,
/*?*/ "neue Schnittstelle benutzen: SwDoc::MakeFlySection!" );
/*?*/ break;
/*?*/ #endif
/*?*/
/*?*/ default:
-/*?*/ ASSERT( !this,
+/*?*/ OSL_ENSURE( !this,
/*?*/ "Layoutformat mit ungueltigem Request angefordert." );
/*?*/
/*N*/ }
@@ -288,7 +288,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ {
/*N*/ const bool bFly = RES_FLYFRMFMT == rSource.Which();
/*N*/ const bool bDraw = RES_DRAWFRMFMT == rSource.Which();
-/*N*/ ASSERT( bFly || bDraw, "this method only works for fly or draw" );
+/*N*/ OSL_ENSURE( bFly || bDraw, "this method only works for fly or draw" );
/*N*/
/*N*/ SwDoc* pSrcDoc = (SwDoc*)rSource.GetDoc();
/*N*/
@@ -390,7 +390,7 @@ static bool lcl_IsItemSet(const SwCntntNode & rNode, USHORT which)
/*N*/ }
/*N*/ else
/*N*/ {
-/*N*/ ASSERT( RES_DRAWFRMFMT == rSource.Which(), "Weder Fly noch Draw." );
+/*N*/ OSL_ENSURE( RES_DRAWFRMFMT == rSource.Which(), "Weder Fly noch Draw." );
/*N*/ SwDrawContact *pContact = (SwDrawContact *)rSource.FindContactObj();
/*N*/
/*N*/ pContact = new SwDrawContact( (SwDrawFrmFmt*)pDest,
@@ -1098,7 +1098,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ if( n >= GetSpzFrmFmts()->Count() )
/*N*/ {
-/*N*/ ASSERT( bInReading, "Fly-Section aber kein Format gefunden" );
+/*N*/ OSL_ENSURE( bInReading, "Fly-Section aber kein Format gefunden" );
/*N*/ return sal_False;
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
index b3b329b..a40a993 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnew.cxx
@@ -411,7 +411,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ pFtnColl = pEndNoteInfo->GetFtnTxtColl();
/*N*/ if ( pFtnColl ) pFtnColl->Remove(pEndNoteInfo);
/*N*/
-/*N*/ ASSERT( pDfltTxtFmtColl == (*pTxtFmtCollTbl)[0],
+/*N*/ OSL_ENSURE( pDfltTxtFmtColl == (*pTxtFmtCollTbl)[0],
/*N*/ "Default-Text-Collection muss immer am Anfang stehen" );
/*N*/
/*N*/ // JP 27.01.98: opt.: ausgehend davon, das Standard als 2. im Array
@@ -422,7 +422,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ pTxtFmtCollTbl->DeleteAndDestroy( 1, pTxtFmtCollTbl->Count()-1 );
/*N*/ delete pTxtFmtCollTbl;
/*N*/
-/*N*/ ASSERT( pDfltGrfFmtColl == (*pGrfFmtCollTbl)[0],
+/*N*/ OSL_ENSURE( pDfltGrfFmtColl == (*pGrfFmtCollTbl)[0],
/*N*/ "Default-Grf-Collection muss immer am Anfang stehen" );
/*N*/
/*N*/ pGrfFmtCollTbl->DeleteAndDestroy( 1, pGrfFmtCollTbl->Count()-1 );
@@ -572,7 +572,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ SfxPrinter& SwDoc::_GetPrt() const
/*N*/ {
-/*N*/ ASSERT( ! pPrt, "Do not call _GetPrt(), call GetPrt() instead" )
+/*N*/ OSL_ENSURE( ! pPrt, "Do not call _GetPrt(), call GetPrt() instead" );
/*N*/
/*N*/ // wir erzeugen einen default SfxPrinter.
/*N*/ // Das ItemSet wird vom Sfx geloescht!
@@ -613,7 +613,7 @@ const sal_Char sGrfCollStr[] = "Graphikformatvorlage";
/*N*/ {
/*N*/ ((SwDrawDocument*)pDrawModel)->SetObjectShell( pDocShell );
/*N*/ pDrawModel->SetPersist( pDocShell );
-/*N*/ ASSERT( pDrawModel->GetPersist() == GetPersist(),
+/*N*/ OSL_ENSURE( pDrawModel->GetPersist() == GetPersist(),
/*N*/ "draw model's persist is out of sync" );
/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
index 8fac74e..c0d044e 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docnum.cxx
@@ -163,7 +163,7 @@ namespace binfilter {
/*N*/ for( n = 0; n < rArr.Count(); ++n )
/*N*/ {
/*N*/ SwTxtNode* pNd = rArr[ n ]->GetTxtNode();
-/*N*/ ASSERT( pNd, "was ist das fuer ein Node?" );
+/*N*/ OSL_ENSURE( pNd, "was ist das fuer ein Node?" );
/*N*/ if( ( 1 << (pNd->GetTxtColl()->GetOutlineLevel() & ~NO_NUMLEVEL )
/*N*/ & nChgFmtLevel ))
/*?*/ pNd->NumRuleChgd();
@@ -248,7 +248,7 @@ namespace binfilter {
/*N*/ SwNumRuleInfo* pRuleInfo = 0 )
/*N*/ {
/*N*/ SwNumRule* pOld = rDoc.FindNumRulePtr( rRule.GetName() );
-/*N*/ ASSERT( pOld, "ohne die alte NumRule geht gar nichts" );
+/*N*/ OSL_ENSURE( pOld, "ohne die alte NumRule geht gar nichts" );
/*N*/
/*N*/ USHORT nChkLevel = 0, nChgFmtLevel = 0, nMask = 1;
/*N*/
@@ -892,7 +892,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*?*/ GetNodes().UpdtOutlineIdx( *pOutlNd );
/*N*/ }
/*N*/
-/*N*/ ASSERT( pRule, "die NumRule sollte schon vorhanden sein!" );
+/*N*/ OSL_ENSURE( pRule, "die NumRule sollte schon vorhanden sein!" );
/*N*/ if( pRule )
/*N*/ pRule->SetInvalidRule( FALSE );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
index 7acb20c..e9a83a5 100644
--- a/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_docredln.cxx
@@ -71,7 +71,7 @@ namespace binfilter {
/*N*/ for( USHORT j = 0; j < rTbl.Count(); ++j )
/*N*/ {
/*N*/ // check for empty redlines
-/*N*/ ASSERT( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
+/*N*/ OSL_ENSURE( ( *(rTbl[j]->GetPoint()) != *(rTbl[j]->GetMark()) ) ||
/*N*/ ( rTbl[j]->GetContentIdx() != NULL ),
/*N*/ "redline table corrupted: empty redline" );
/*N*/ }
@@ -83,11 +83,11 @@ namespace binfilter {
/*?*/ const SwRedline* pCurrent = rTbl[ n ];
/*?*/
/*?*/ // check redline sorting
-/*?*/ ASSERT( *pPrev->Start() <= *pCurrent->Start(),
+/*?*/ OSL_ENSURE( *pPrev->Start() <= *pCurrent->Start(),
/*?*/ "redline table corrupted: not sorted correctly" );
/*?*/
/*?*/ // check for overlapping redlines
-/*?*/ ASSERT( *pPrev->End() <= *pCurrent->Start(),
+/*?*/ OSL_ENSURE( *pPrev->End() <= *pCurrent->Start(),
/*?*/ "redline table corrupted: overlapping redlines" );
/*N*/ }
/*N*/ }
@@ -271,7 +271,7 @@ typedef BOOL (*Fn_AcceptReject)( SwRedlineTbl& rArr, USHORT& rPos,
/*N*/ bRet = InsertWithValidRanges( p );
/*N*/ else
/*N*/ {
-/*N*/ ASSERT( !this, "Redline: falscher Bereich" );
+/*N*/ OSL_ENSURE( !this, "Redline: falscher Bereich" );
/*N*/ }
/*N*/ return bRet;
/*N*/ }
@@ -510,7 +510,7 @@ USHORT SwRedline::GetStackCount() const
SwRedlineData* pCur;
/*?*/ for( pCur = pRedlineData; nPos && pCur->pNext; --nPos )
/*?*/ pCur = pCur->pNext;
-/*?*/ ASSERT( !nPos, "Pos angabe ist zu gross" );
+/*?*/ OSL_ENSURE( !nPos, "Pos angabe ist zu gross" );
/*?*/ return SW_MOD()->GetRedlineAuthor(pCur->nAuthor);
/*?*/}
@@ -518,7 +518,7 @@ const DateTime& SwRedline::GetTimeStamp( USHORT nPos ) const
{
SwRedlineData* pCur; for( pCur = pRedlineData; nPos && pCur->pNext; --nPos )
pCur = pCur->pNext;
- ASSERT( !nPos, "Pos angabe ist zu gross" );
+ OSL_ENSURE( !nPos, "Pos angabe ist zu gross" );
return pCur->aStamp;
}
@@ -526,7 +526,7 @@ SwRedlineType SwRedline::GetRealType( USHORT nPos ) const
{
SwRedlineData* pCur; for( pCur = pRedlineData; nPos && pCur->pNext; --nPos )
pCur = pCur->pNext;
- ASSERT( !nPos, "Pos angabe ist zu gross" );
+ OSL_ENSURE( !nPos, "Pos angabe ist zu gross" );
return pCur->eType;
}
@@ -534,7 +534,7 @@ const String& SwRedline::GetComment( USHORT nPos ) const
{
SwRedlineData* pCur; for( pCur = pRedlineData; nPos && pCur->pNext; --nPos )
pCur = pCur->pNext;
- ASSERT( !nPos, "Pos angabe ist zu gross" );
+ OSL_ENSURE( !nPos, "Pos angabe ist zu gross" );
return pCur->sComment;
}
diff --git a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
index 51e7a51..9d2ff13 100644
--- a/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_doctxm.cxx
@@ -207,7 +207,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ SectionType eT = pSectNd->GetSection().GetType();
/*N*/ if( TOX_CONTENT_SECTION == eT )
/*N*/ {
-/*N*/ ASSERT( pSectNd->GetSection().ISA( SwTOXBaseSection ),
+/*N*/ OSL_ENSURE( pSectNd->GetSection().ISA( SwTOXBaseSection ),
/*N*/ "keine TOXBaseSection!" );
/*N*/ SwTOXBaseSection& rTOXSect = (SwTOXBaseSection&)
/*N*/ pSectNd->GetSection();
@@ -222,10 +222,10 @@ DBG_BF_ASSERT(0, "STRIP");
--------------------------------------------------*/
/*N*/ const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
/*N*/ {
-/*N*/ ASSERT( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
+/*N*/ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
/*N*/ const SwTOXBaseSection& rTOXSect = (const SwTOXBaseSection&)rTOXBase;
/*N*/ SwSectionFmt* pFmt = rTOXSect.GetFmt();
-/*N*/ ASSERT( pFmt, "invalid TOXBaseSection!" );
+/*N*/ OSL_ENSURE( pFmt, "invalid TOXBaseSection!" );
/*N*/ return pFmt->GetAttrSet();
/*N*/ }
/* -----------------02.09.99 07:48-------------------
@@ -345,7 +345,7 @@ DBG_BF_ASSERT(0, "STRIP");
--------------------------------------------------------------------*/
/*N*/ BOOL SwDoc::SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName)
/*N*/ {
-/*N*/ ASSERT( rTOXBase.ISA( SwTOXBaseSection ),
+/*N*/ OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ),
/*N*/ "keine TOXBaseSection!" );
/*N*/ SwTOXBaseSection* pTOX = (SwTOXBaseSection*)&rTOXBase;
/*N*/
@@ -448,7 +448,7 @@ DBG_BF_ASSERT(0, "STRIP");
SwPosition aPos( *pNd );
SwDoc* pDoc = (SwDoc*)pNd->GetDoc();
#ifdef DBG_UTIL
- ASSERT( GetBodyTxtNode( pDoc, aPos, pFrm ),
+ OSL_ENSURE( GetBodyTxtNode( pDoc, aPos, pFrm ),
"wo steht der Absatz" );
#else
GetBodyTxtNode( pDoc, aPos, pFrm );
diff --git a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
index b4d264a..28ca858 100644
--- a/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_gctable.cxx
@@ -425,7 +425,7 @@ struct _GCLinePara
/*N*/ SwTableLines& rLns = *pGCPara->pLns;
/*N*/ const SwTableLine* pTmp = pLn;
/*N*/ USHORT nInsPos = rLns.GetPos( pTmp );
-/*N*/ ASSERT( USHRT_MAX != nInsPos, "Line nicht gefunden!" );
+/*N*/ OSL_ENSURE( USHRT_MAX != nInsPos, "Line nicht gefunden!" );
/*N*/
/*N*/ SwTableBox* pUpper = pLn->GetUpper();
/*N*/
diff --git a/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx b/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
index 864ad40..7b6281a 100644
--- a/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_lineinfo.cxx
@@ -118,7 +118,7 @@ namespace binfilter {
/*N*/ void SwLineNumberInfo::SetCharFmt( SwCharFmt *pChFmt )
/*N*/ {
-/*N*/ ASSERT( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
+/*N*/ OSL_ENSURE( pChFmt, "SetCharFmt, 0 is not a valid pointer" );
/*N*/ pChFmt->Add( this );
/*N*/ }
diff --git a/binfilter/bf_sw/source/core/doc/sw_number.cxx b/binfilter/bf_sw/source/core/doc/sw_number.cxx
index 571170c..0f8e24c 100644
--- a/binfilter/bf_sw/source/core/doc/sw_number.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_number.cxx
@@ -364,7 +364,7 @@ extern const sal_Char sBulletFntName[] = "StarSymbol";
/*N*/ }
/*N*/ }
/*N*/ memset( aFmts, 0, sizeof( aFmts ));
-/*N*/ ASSERT( sName.Len(), "NumRule ohne Namen!" );
+/*N*/ OSL_ENSURE( sName.Len(), "NumRule ohne Namen!" );
/*N*/ }
/*N*/ SwNumRule::SwNumRule( const SwNumRule& rNumRule )
diff --git a/binfilter/bf_sw/source/core/doc/sw_numpara.cxx b/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
index 68c2471..8c37908 100644
--- a/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_numpara.cxx
@@ -106,7 +106,7 @@ void _NumPara::_Init()
rNumSection.aStart.GetIndex() <= aIdx.GetIndex() )
pTxtNd = rNds[ aIdx ]->GetTxtNode();
- ASSERT( pTxtNd, "NumSection ohne Start-TextNode? " );
+ OSL_ENSURE( pTxtNd, "NumSection ohne Start-TextNode? " );
aNum = pTxtNd->GetpSwpHints()->GetNum();
aNum.pRules = rNumSection.pRules;
if( NO_NUM == aNum.nMyLevel || NO_NUMLEVEL & aNum.nMyLevel )
diff --git a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
index 5fdc44e..5136493 100644
--- a/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_poolfmt.cxx
@@ -328,7 +328,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ ( USHORT nId, String* pDesc, SfxItemPresentation ePres,
/*N*/ SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, BOOL bRegardLanguage)
/*N*/ {
-/*N*/ ASSERT(
+/*N*/ OSL_ENSURE(
/*N*/ (RES_POOLCOLL_TEXT_BEGIN <= nId && nId < RES_POOLCOLL_TEXT_END) ||
/*N*/ (RES_POOLCOLL_LISTS_BEGIN <= nId && nId < RES_POOLCOLL_LISTS_END) ||
/*N*/ (RES_POOLCOLL_EXTRA_BEGIN <= nId && nId < RES_POOLCOLL_EXTRA_END) ||
@@ -367,7 +367,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ else if (RES_POOLCOLL_HTML_BEGIN <= nId && nId < RES_POOLCOLL_HTML_END)
/*N*/ nResId = RC_POOLCOLL_HTML_BEGIN - RES_POOLCOLL_HTML_BEGIN;
/*N*/
-/*N*/ ASSERT( nResId, "Ungueltige Pool-ID" );
+/*N*/ OSL_ENSURE( nResId, "Ungueltige Pool-ID" );
/*N*/ if( !nResId )
/*N*/ return GetTxtCollFromPool( RES_POOLCOLL_STANDARD, pDesc, ePres,
/*N*/ eCoreMetric, ePresMetric );
@@ -1125,7 +1125,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ // -> returne das erste
/*M*/ if( RES_POOLCHR_BEGIN > nId || nId >= RES_POOLCHR_END )
/*M*/ {
-/*M*/ ASSERT( !this, "ungueltige Id" );
+/*M*/ OSL_ENSURE( !this, "ungueltige Id" );
/*M*/ nId = RES_POOLCHR_BEGIN;
/*M*/ }
/*M*/ }
@@ -1144,7 +1144,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/ // -> returne das erste
/*M*/ if( RES_POOLFRM_BEGIN > nId || nId >= RES_POOLFRM_END )
/*M*/ {
-/*M*/ ASSERT( !this, "ungueltige Id" );
+/*M*/ OSL_ENSURE( !this, "ungueltige Id" );
/*M*/ nId = RES_POOLFRM_BEGIN;
/*M*/ }
/*M*/ }
@@ -1152,10 +1152,10 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*M*/
/*M*/ default:
/*M*/ // Fehlerfall, unbekanntes Format
-/*M*/ ASSERT( nId, "ungueltige Id" );
+/*M*/ OSL_ENSURE( nId, "ungueltige Id" );
/*M*/ return 0;
/*M*/ }
-/*M*/ ASSERT( nRCId, "ungueltige Id" );
+/*M*/ OSL_ENSURE( nRCId, "ungueltige Id" );
/*M*/
/*M*/ while( nArrCnt-- )
/*M*/ for( USHORT n = 0; n < (*pArray[nArrCnt]).Count(); ++n )
@@ -1410,7 +1410,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ SfxItemPresentation ePres, SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
/*N*/ BOOL bRegardLanguage)
/*N*/ {
-/*N*/ ASSERT( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
+/*N*/ OSL_ENSURE( RES_POOLPAGE_BEGIN <= nId && nId < RES_POOLPAGE_END,
/*N*/ "Falsche AutoFormat-Id" );
/*N*/
/*N*/ SwPageDesc *pNewPgDsc;
@@ -1427,7 +1427,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ // Fehlerfall: unbekannte Poolvorlage
/*N*/ if( RES_POOLPAGE_BEGIN > nId || nId >= RES_POOLPAGE_END )
/*N*/ {
-/*?*/ ASSERT( !this, "ungueltige Id" );
+/*?*/ OSL_ENSURE( !this, "ungueltige Id" );
/*?*/ nId = RES_POOLPAGE_BEGIN;
/*N*/ }
/*N*/
@@ -1579,7 +1579,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
/*N*/ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
/*N*/ SfxItemPresentation /*ePres*/, SfxMapUnit /*eCoreMetric*/, SfxMapUnit /*ePresMetric*/ )
/*N*/ {
-/*N*/ ASSERT( RES_POOLNUMRULE_BEGIN <= nId && nId < RES_POOLNUMRULE_END,
+/*N*/ OSL_ENSURE( RES_POOLNUMRULE_BEGIN <= nId && nId < RES_POOLNUMRULE_END,
/*N*/ "Falsche AutoFormat-Id" );
/*N*/
/*N*/ SwNumRule* pNewRule;
@@ -1595,7 +1595,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
// Fehlerfall: unbekannte Poolvorlage
/*N*/ if( RES_POOLNUMRULE_BEGIN > nId || nId >= RES_POOLNUMRULE_END )
/*N*/ {
-/*?*/ ASSERT( !this, "ungueltige Id" );
+/*?*/ OSL_ENSURE( !this, "ungueltige Id" );
/*?*/ nId = RES_POOLNUMRULE_BEGIN;
/*N*/ }
@@ -2061,7 +2061,7 @@ static const USHORT aHeadlineSizes[ 2 * MAXLEVEL ] = {
// dann fuege neu ein
USHORT SwDoc::SetDocPattern( const String& rPatternName )
{
- ASSERT( rPatternName.Len(), "kein Dokument-Vorlagenname" );
+ OSL_ENSURE( rPatternName.Len(), "kein Dokument-Vorlagenname" );
USHORT nNewPos = aPatternNms.Count();
for( USHORT n = 0; n < aPatternNms.Count(); ++n )
diff --git a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
index 51447c0..11cff40 100644
--- a/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_swtable.cxx
@@ -231,7 +231,7 @@ namespace binfilter {
/*N*/ {
/*N*/ if ( !IsModifyLocked() )
/*N*/ {
-/*N*/ ASSERT( pOldSize && pOldSize->Which() == RES_FRM_SIZE &&
+/*N*/ OSL_ENSURE( pOldSize && pOldSize->Which() == RES_FRM_SIZE &&
/*N*/ pNewSize && pNewSize->Which() == RES_FRM_SIZE,
/*N*/ "Kein Old oder New fuer FmtFrmSize-Modify der SwTable." );
/*N*/
@@ -372,7 +372,7 @@ namespace binfilter {
// Box ist ??
/*N*/ if( pBox && !pBox->GetSttNd() )
/*N*/ {
-/*?*/ ASSERT( FALSE, "Box ohne Inhalt, suche die naechste !!" );
+/*?*/ OSL_ENSURE( FALSE, "Box ohne Inhalt, suche die naechste !!" );
/*?*/ // "herunterfallen lassen" bis zur ersten Box
/*?*/ while( pBox->GetTabLines().Count() )
/*?*/ pBox = pBox->GetTabLines()[0]->GetTabBoxes()[0];
@@ -546,7 +546,7 @@ namespace binfilter {
/*N*/
/*N*/ // an der Table eintragen
/*N*/ const SwTableNode* pTblNd = pSttNd->FindTableNode();
-/*N*/ ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+/*N*/ OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
/*N*/ SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
/*N*/ GetTabSortBoxes();
/*N*/ SwTableBox* p = this; // error: &this
@@ -565,7 +565,7 @@ namespace binfilter {
/*N*/
/*N*/ // an der Table eintragen
/*N*/ const SwTableNode* pTblNd = pSttNd->FindTableNode();
-/*N*/ ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+/*N*/ OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
/*N*/ SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
/*N*/ GetTabSortBoxes();
/*N*/ SwTableBox* p = this; // error: &this
@@ -579,7 +579,7 @@ namespace binfilter {
/*N*/ {
/*N*/ // an der Table austragen
/*?*/ const SwTableNode* pTblNd = pSttNd->FindTableNode();
-/*?*/ ASSERT( pTblNd, "in welcher Tabelle steht denn die Box?" );
+/*?*/ OSL_ENSURE( pTblNd, "in welcher Tabelle steht denn die Box?" );
/*?*/ SwTableSortBoxes& rSrtArr = (SwTableSortBoxes&)pTblNd->GetTable().
/*?*/ GetTabSortBoxes();
/*?*/ SwTableBox *p = this; // error: &this
@@ -881,7 +881,7 @@ namespace binfilter {
/*N*/ SwTableBox* pBox = (SwTableBox*)aIter.First( TYPE( SwTableBox ) );
/*N*/ if( pBox )
/*N*/ {
-/*?*/ ASSERT( !aIter.Next(), "keine Box oder mehrere am Format" );
+/*?*/ OSL_ENSURE( !aIter.Next(), "keine Box oder mehrere am Format" );
/*?*/
/*?*/ ULONG nNewFmt;
/*?*/ if( pNewFmt )
diff --git a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
index 0cdfd72..cffe962 100644
--- a/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
+++ b/binfilter/bf_sw/source/core/doc/sw_tblrwcl.cxx
@@ -110,7 +110,7 @@ void _CheckBoxWidth( const SwTableLine& rLine, SwTwips nSize )
if ( pFrm && \
((SwRowFrm*)pFrm)->GetTabLine() == GetTabLines()[i] ) \
{ \
- ASSERT( pFrm->GetUpper()->IsTabFrm(), \
+ OSL_ENSURE( pFrm->GetUpper()->IsTabFrm(), \
"Table layout does not match table structure" ) \
} \
} while ( 0 != ( pLast = aIter++ ) ); \
@@ -524,10 +524,10 @@ void lcl_CpyLines( USHORT nStt, USHORT nEnd,
{
// Annahme: jede Line in der Box ist gleich gross
SwFrmFmt* pFmt = pBox->ClaimFrmFmt();
- ASSERT( pBox->GetTabLines().Count(), "Box hat keine Lines" );
+ OSL_ENSURE( pBox->GetTabLines().Count(), "Box hat keine Lines" );
SwTableLine* pLine = pBox->GetTabLines()[0];
- ASSERT( pLine, "Box steht in keiner Line" );
+ OSL_ENSURE( pLine, "Box steht in keiner Line" );
long nWidth = 0;
for( USHORT n = 0; n < pLine->GetTabBoxes().Count(); ++n )
@@ -781,7 +781,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
lcl_CalcWidth( pRMBox ); // bereche die Breite der Box
}
else
- ASSERT( FALSE , "Was denn nun" );
+ OSL_ENSURE( FALSE , "Was denn nun" );
}
// Left/Right
else
@@ -814,7 +814,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
BOOL SwTable::Merge( SwDoc* pDoc, const SwSelBoxes& rBoxes,
SwTableBox* pMergeBox )
{
- ASSERT( pDoc && rBoxes.Count() && pMergeBox, "keine gueltigen Werte" );
+ OSL_ENSURE( pDoc && rBoxes.Count() && pMergeBox, "keine gueltigen Werte" );
SwTableNode* pTblNd = (SwTableNode*)rBoxes[0]->GetSttNd()->FindTableNode();
if( !pTblNd )
return FALSE;
@@ -932,7 +932,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
if( GetUpper() )
{
nFndPos = GetUpper()->GetTabLines().GetPos( pLine );
- ASSERT( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
+ OSL_ENSURE( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
// gibts eine weitere Line
if( nFndPos+1 >= GetUpper()->GetTabLines().Count() )
return GetUpper()->GetUpper()->FindNextBox( rTbl, GetUpper(), bOvrTblLns );
@@ -983,7 +983,7 @@ BOOL lcl_Merge_MoveLine( const _FndLine*& rpFndLine, void* pPara )
if( GetUpper() )
{
nFndPos = GetUpper()->GetTabLines().GetPos( pLine );
- ASSERT( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
+ OSL_ENSURE( USHRT_MAX != nFndPos, "Line nicht in der Tabelle" );
// gibts eine weitere Line
if( !nFndPos )
return GetUpper()->GetUpper()->FindPreviousBox( rTbl, GetUpper(), bOvrTblLns );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
index a6d9d0d..882cd03 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndcopy.cxx
@@ -210,7 +210,7 @@ struct _CopyTable
/*N*/ {
/*N*/ SwNodeIndex aNewIdx( *pCT->pTblNd,
/*N*/ rpBox->GetSttIdx() - pCT->nOldTblSttIdx );
-/*N*/ ASSERT( aNewIdx.GetNode().IsStartNode(), "Index nicht auf einem StartNode" );
+/*N*/ OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index nicht auf einem StartNode" );
/*N*/ pNewBox = new SwTableBox( pBoxFmt, aNewIdx, pCT->pInsLine );
/*N*/ }
/*N*/
@@ -412,9 +412,9 @@ struct _CopyTable
/*N*/ !rRg.aStart.GetNode().IsSectionNode() &&
/*N*/ !aTmpI.GetNode().IsEndNode() )
/*N*/ {
-/*N*/ ASSERT( rInsPos.GetIndex() - aSavePos.GetIndex() ==
+/*N*/ OSL_ENSURE( rInsPos.GetIndex() - aSavePos.GetIndex() ==
/*N*/ rRg.aEnd.GetIndex() - rRg.aStart.GetIndex(),
-/*N*/ "Es wurden zu wenig Nodes kopiert!" )
+/*N*/ "Es wurden zu wenig Nodes kopiert!" );
/*N*/ }
/*N*/ }
/*N*/ #endif
@@ -516,7 +516,7 @@ struct _CopyTable
/*N*/
/*N*/ //Alle chains, die im Original vorhanden sind, soweit wie moeglich wieder
/*N*/ //aufbauen.
-/*N*/ ASSERT( aArr.Count() == aNewArr.Count(), "Missing new Flys" );
+/*N*/ OSL_ENSURE( aArr.Count() == aNewArr.Count(), "Missing new Flys" );
/*N*/ if ( aArr.Count() == aNewArr.Count() )
/*N*/ {
/*N*/ for ( n = 0; n < aArr.Count(); ++n )
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
index 4566324..2ea4ec5 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndnotxt.cxx
@@ -74,7 +74,7 @@ namespace binfilter {
// fuer Frame- und Grafik-Attributen
/*N*/ void SwNoTxtNode::NewAttrSet( SwAttrPool& rPool )
/*N*/ {
-/*N*/ ASSERT( !pAttrSet, "AttrSet ist doch gesetzt" );
+/*N*/ OSL_ENSURE( !pAttrSet, "AttrSet ist doch gesetzt" );
/*N*/ pAttrSet = new SwAttrSet( rPool, aNoTxtNodeSetRange );
/*N*/ pAttrSet->SetParent( &GetFmtColl()->GetAttrSet() );
/*N*/ }
@@ -123,7 +123,7 @@ namespace binfilter {
/*?*/ {
/*?*/ const MapMode aGrfMap( GetGraphic().GetPrefMapMode() );
/*?*/ const MapMode aContourMap( MAP_100TH_MM );
- /*?*/ ASSERT( aGrfMap.GetMapUnit() != MAP_PIXEL ||
+ /*?*/ OSL_ENSURE( aGrfMap.GetMapUnit() != MAP_PIXEL ||
/*?*/ aGrfMap == MapMode( MAP_PIXEL ),
/*?*/ "scale factor for pixel unsupported" );
/*?*/ if( aGrfMap.GetMapUnit() != MAP_PIXEL &&
@@ -174,7 +174,7 @@ Graphic SwNoTxtNode::GetGraphic() const
}
else
{
- ASSERT( GetOLENode(), "new type of Node?" );
+ OSL_ENSURE( GetOLENode(), "new type of Node?" );
SvInPlaceObjectRef xObj( ((SwOLENode*)this)->GetOLEObj().GetOleRef() );
GDIMetaFile aMtf;
aRet = xObj->GetGDIMetaFile( aMtf );
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
index 2851ae7..4a40ae0 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndnum.cxx
@@ -74,7 +74,7 @@ namespace binfilter {
/*N*/ if( &(*this)[ n-1 ]->GetNodes() !=
/*N*/ &(*this)[ n ]->GetNodes() )
/*N*/ {
-/*?*/ ASSERT( !this, "Node im falschen Outline-Array" );
+/*?*/ OSL_ENSURE( !this, "Node im falschen Outline-Array" );
/*N*/ }
/*N*/ }
/*N*/ #endif
@@ -266,7 +266,7 @@ namespace binfilter {
/*N*/ {
/*N*/ _OutlinePara* pOutlPara = (_OutlinePara*)pPara;
/*N*/ SwTxtNode* pTxtNd = rpNd->GetTxtNode();
-/*N*/ ASSERT( pTxtNd, "kein TextNode als OutlineNode !" );
+/*N*/ OSL_ENSURE( pTxtNd, "kein TextNode als OutlineNode !" );
/*N*/
/*N*/ return pOutlPara->UpdateOutline( *pTxtNd );
/*N*/ }
@@ -284,7 +284,7 @@ namespace binfilter {
/*N*/ if( NO_NUMBERING == nOldLevel ) // neuen Level einfuegen
/*N*/ {
/*N*/ // nicht vorhanden, also einfuegen
-/*N*/ ASSERT( !bSeekIdx, "Der Node ist schon als OutlineNode vorhanden" );
+/*N*/ OSL_ENSURE( !bSeekIdx, "Der Node ist schon als OutlineNode vorhanden" );
/*N*/
/*N*/ //JP 12.03.99: 63293 - Nodes vom RedlineBereich NIE aufnehmen
/*N*/ ULONG nNd = rNd.GetIndex();
diff --git a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
index f23c2da..6f5e8bb 100644
--- a/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
+++ b/binfilter/bf_sw/source/core/docnode/sw_ndsect.cxx
@@ -91,7 +91,7 @@ namespace binfilter {
/*N*/ if( rRange.HasMark() &&
/*N*/ 0 == ( nRegionRet = IsInsRegionAvailable( rRange, &pPrvNd ) ))
/*N*/ {
-/*?*/ ASSERT( !this, "Selection ueber verschiedene Sections" );
+/*?*/ OSL_ENSURE( !this, "Selection ueber verschiedene Sections" );
/*?*/ return 0;
/*N*/ }
/*N*/
@@ -117,7 +117,7 @@ namespace binfilter {
/*N*/ *pEndPos = (SwPosition*)rRange.End();
/*N*/ if( pPrvNd && 3 == nRegionRet )
/*N*/ {
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list