[Libreoffice-commits] .: 2 commits - sw/inc sw/source
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Mon Feb 21 09:04:51 PST 2011
sw/inc/errhdl.hxx | 69 -----------------
sw/inc/format.hxx | 1
sw/inc/ndtxt.hxx | 7 -
sw/inc/newhdl.hxx | 2
sw/inc/numrule.hxx | 2
sw/inc/shellio.hxx | 1
sw/inc/swrect.hxx | 1
sw/inc/tox.hxx | 1
sw/inc/txatbase.hxx | 1
sw/inc/viewsh.hxx | 1
sw/source/core/SwNumberTree/SwNumberTree.cxx | 1
sw/source/core/access/acccontext.cxx | 1
sw/source/core/access/parachangetrackinginfo.cxx | 1
sw/source/core/access/textmarkuphelper.cxx | 1
sw/source/core/attr/hints.cxx | 4 -
sw/source/core/bastyp/index.cxx | 18 ++--
sw/source/core/bastyp/swcache.cxx | 1
sw/source/core/bastyp/tabcol.cxx | 1
sw/source/core/crsr/bookmrk.cxx | 1
sw/source/core/doc/doc.cxx | 1
sw/source/core/doc/docbm.cxx | 1
sw/source/core/doc/doclay.cxx | 1
sw/source/core/doc/fmtcol.cxx | 1
sw/source/core/doc/number.cxx | 4 -
sw/source/core/docnode/finalthreadmanager.cxx | 1
sw/source/core/docnode/ndindex.cxx | 4 -
sw/source/core/docnode/section.cxx | 1
sw/source/core/docnode/threadmanager.cxx | 1
sw/source/core/draw/dobjfac.cxx | 1
sw/source/core/edit/ednumber.cxx | 2
sw/source/core/edit/edtox.cxx | 1
sw/source/core/edit/edws.cxx | 2
sw/source/core/except/errhdl.cxx | 89 -----------------------
sw/source/core/except/makefile.mk | 2
sw/source/core/fields/ddefld.cxx | 1
sw/source/core/inc/drawfont.hxx | 1
sw/source/core/inc/scriptinfo.hxx | 1
sw/source/core/layout/fly.cxx | 1
sw/source/core/layout/flycnt.cxx | 1
sw/source/core/layout/flylay.cxx | 1
sw/source/core/layout/hffrm.cxx | 1
sw/source/core/layout/pagechg.cxx | 1
sw/source/core/layout/unusedf.cxx | 1
sw/source/core/para/paratr.cxx | 1
sw/source/core/swg/SwXMLTextBlocks.cxx | 1
sw/source/core/swg/SwXMLTextBlocks1.cxx | 1
sw/source/core/text/atrstck.cxx | 1
sw/source/core/text/guess.cxx | 1
sw/source/core/text/itrcrsr.cxx | 1
sw/source/core/text/itrpaint.cxx | 1
sw/source/core/text/itrtxt.cxx | 1
sw/source/core/text/porglue.cxx | 1
sw/source/core/text/porlay.cxx | 1
sw/source/core/text/porlin.cxx | 1
sw/source/core/text/portxt.cxx | 1
sw/source/core/text/txtcache.cxx | 1
sw/source/core/text/txthyph.cxx | 1
sw/source/core/text/txtinit.cxx | 1
sw/source/core/text/txtio.cxx | 1
sw/source/core/text/wrong.cxx | 1
sw/source/core/tox/tox.cxx | 1
sw/source/core/txtnode/fntcap.cxx | 1
sw/source/core/txtnode/ndtxt.cxx | 1
sw/source/core/txtnode/thints.cxx | 1
sw/source/core/unocore/swunohelper.cxx | 1
sw/source/core/view/viewimp.cxx | 1
sw/source/filter/basflt/fltini.cxx | 1
sw/source/filter/basflt/iodetect.cxx | 1
sw/source/filter/html/htmlftn.cxx | 1
sw/source/filter/ww1/w1sprm.cxx | 1
sw/source/filter/ww8/fields.cxx | 1
sw/source/filter/ww8/hash_wrap.hxx | 1
sw/source/filter/ww8/sortedarray.hxx | 1
sw/source/filter/ww8/ww8par3.cxx | 1
sw/source/filter/ww8/ww8scan.hxx | 1
sw/source/filter/xml/swxml.cxx | 1
sw/source/filter/xml/wrtxml.cxx | 1
sw/source/ui/app/docstyle.cxx | 1
sw/source/ui/chrdlg/chardlg.cxx | 1
sw/source/ui/dialog/ascfldlg.cxx | 1
sw/source/ui/envelp/envimg.cxx | 1
sw/source/ui/envelp/envlop1.cxx | 1
sw/source/ui/fmtui/tmpdlg.cxx | 1
sw/source/ui/misc/docfnote.cxx | 1
sw/source/ui/misc/glosdoc.cxx | 1
sw/source/ui/misc/outline.cxx | 1
sw/source/ui/ribbar/tbxanchr.cxx | 1
sw/source/ui/shells/textglos.cxx | 1
sw/source/ui/table/tablemgr.cxx | 1
sw/source/ui/uiview/viewcoll.cxx | 1
sw/source/ui/utlui/bookctrl.cxx | 1
sw/source/ui/utlui/content.cxx | 1
sw/source/ui/utlui/glbltree.cxx | 1
sw/source/ui/utlui/navipi.cxx | 1
sw/source/ui/utlui/uitool.cxx | 1
95 files changed, 16 insertions(+), 272 deletions(-)
New commits:
commit 6aa93c291d18c7db6dbee73adc6c4aa1bdc88eda
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Mon Feb 21 18:02:14 2011 +0100
Remove all traces off ASSERT_ID
diff --git a/sw/inc/errhdl.hxx b/sw/inc/errhdl.hxx
deleted file mode 100644
index 53c893a..0000000
--- a/sw/inc/errhdl.hxx
+++ /dev/null
@@ -1,69 +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
-
-#if OSL_DEBUG_LEVEL > 1
-
-#include <tools/solar.h>
-#include <sal/types.h>
-#include "swdllapi.h"
-
-extern BOOL bAssert; // TRUE, if an ASSERT Box popped up.
-
-
-// -----------------------------------------------------------------------
-// Return an error message including file name and line number indicating
-// where the error occured.
-// The function may not be used directly!
-// -----------------------------------------------------------------------
-SW_DLLPUBLIC void AssertFail( USHORT, const sal_Char* );
-
-// -----------------------------------------------------------------------
-// Check if the given condition is true. If not, an error message,
-// identified via the ID, will be returned.
-// -----------------------------------------------------------------------
-#define ASSERT_ID( cond, id ) \
- if( !(cond) ) { \
- const char *_pFileName = __FILE__; \
- ::AssertFail( (USHORT)id, _pFileName ); \
- }
-
-
-// -----------------------------------------------------------------------
-// When building for production all debugging utilities are ignored automatically.
-// -----------------------------------------------------------------------
-#else
-#define ASSERT_ID( cond, id ) ;
-#endif // PRODUCT
-
-
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 0f9ba7e..f4dbdb3 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -30,7 +30,6 @@
#include <tools/solar.h>
#include "swdllapi.h"
-#include <errhdl.hxx> // For ASSERT.
#include <swatrset.hxx> // For SfxItemPool/-Set, Attr forward decl.
#include <calbck.hxx> // For SwModify.
#include <hintids.hxx>
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 70e1d15..42cf6df 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -31,7 +31,6 @@
#include <cppuhelper/weakref.hxx>
#include "swdllapi.h"
-#include <error.h>
#include <node.hxx>
#include <hintids.hxx>
#include <ndhints.hxx>
diff --git a/sw/inc/newhdl.hxx b/sw/inc/newhdl.hxx
index ccf89e1..4609125 100644
--- a/sw/inc/newhdl.hxx
+++ b/sw/inc/newhdl.hxx
@@ -30,8 +30,6 @@
#include <tools/link.hxx>
-#include "errhdl.hxx" // here swtypes comes in (need that).
-
// ----------------------------------------------------------------------------
extern void SW_NEW_HDL();
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 63e37c4..6328790 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -36,8 +36,6 @@
#include "swdllapi.h"
#include <swtypes.hxx>
#include <calbck.hxx>
-#include <errhdl.hxx> // For inline ASSERT.
-#include <error.h> // For inline ASSERT.
#include <hints.hxx>
#include <boost/unordered_map.hpp>
#include <stringhash.hxx>
diff --git a/sw/inc/shellio.hxx b/sw/inc/shellio.hxx
index fc2dfcb..7fdc503 100644
--- a/sw/inc/shellio.hxx
+++ b/sw/inc/shellio.hxx
@@ -47,7 +47,6 @@
#include <swdllapi.h>
#include <swtypes.hxx>
#include <docfac.hxx> // SwDocFac
-#include <errhdl.hxx>
#include <iodetect.hxx>
// einige Forward - Deklarationen
diff --git a/sw/inc/swrect.hxx b/sw/inc/swrect.hxx
index 38882b6..483e1da 100644
--- a/sw/inc/swrect.hxx
+++ b/sw/inc/swrect.hxx
@@ -27,7 +27,6 @@
************************************************************************/
#ifndef _SWRECT_HXX
#define _SWRECT_HXX
-#include "errhdl.hxx"
#include <osl/diagnose.h>
#include <tools/gen.hxx>
class SvStream;
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index c78236e..0546466 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -41,7 +41,6 @@
#include <swtypes.hxx>
#include <toxe.hxx>
#include <calbck.hxx>
-#include <errhdl.hxx>
#ifndef INCLUDED_VECTOR
#include <vector> // #i21237#
diff --git a/sw/inc/txatbase.hxx b/sw/inc/txatbase.hxx
index 062dfaa..847236b 100644
--- a/sw/inc/txatbase.hxx
+++ b/sw/inc/txatbase.hxx
@@ -31,7 +31,6 @@
#include <tools/solar.h>
#include <svl/poolitem.hxx>
#include <hintids.hxx>
-#include <errhdl.hxx>
#include <boost/utility.hpp>
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f4fca2c..965a504 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -35,7 +35,6 @@
#include <swtypes.hxx>
#include <ring.hxx>
#include <swrect.hxx>
-#include <errhdl.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/print.hxx>
diff --git a/sw/source/core/SwNumberTree/SwNumberTree.cxx b/sw/source/core/SwNumberTree/SwNumberTree.cxx
index 1a93916..c19d969 100644
--- a/sw/source/core/SwNumberTree/SwNumberTree.cxx
+++ b/sw/source/core/SwNumberTree/SwNumberTree.cxx
@@ -31,7 +31,6 @@
#include <algorithm>
#include <functional>
-#include <errhdl.hxx>
#include <SwNumberTree.hxx>
using std::vector;
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index a68b4ad..ba9b81b 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -39,7 +39,6 @@
#endif // #if (OSL_DEBUG_LEVEL > 1) && defined TEST_MIB
#include <tools/debug.hxx>
#include <vcl/window.hxx>
-#include <errhdl.hxx>
#include <swtypes.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
diff --git a/sw/source/core/access/parachangetrackinginfo.cxx b/sw/source/core/access/parachangetrackinginfo.cxx
index 8fd138d..3d0b5c4 100644
--- a/sw/source/core/access/parachangetrackinginfo.cxx
+++ b/sw/source/core/access/parachangetrackinginfo.cxx
@@ -30,7 +30,6 @@
#include <parachangetrackinginfo.hxx>
-#include <errhdl.hxx>
#include <wrong.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
diff --git a/sw/source/core/access/textmarkuphelper.cxx b/sw/source/core/access/textmarkuphelper.cxx
index fb28c25..5f66917 100644
--- a/sw/source/core/access/textmarkuphelper.cxx
+++ b/sw/source/core/access/textmarkuphelper.cxx
@@ -35,7 +35,6 @@
#include <algorithm>
#include <comphelper/stlunosequence.hxx>
-#include <errhdl.hxx>
#include <com/sun/star/text/TextMarkupType.hpp>
#include <com/sun/star/accessibility/TextSegment.hpp>
diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx
index c19a0fb..9245b33 100644
--- a/sw/source/core/bastyp/swcache.cxx
+++ b/sw/source/core/bastyp/swcache.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
#include <tools/debug.hxx>
-#include <errhdl.hxx>
#include <swcache.hxx>
SV_IMPL_PTRARR(SwCacheObjArr,SwCacheObj*);
diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx
index b87ad1f..78581f8 100644
--- a/sw/source/core/bastyp/tabcol.cxx
+++ b/sw/source/core/bastyp/tabcol.cxx
@@ -32,7 +32,6 @@
#include "tabcol.hxx"
-#include <errhdl.hxx> // fuer Create-Methoden
SwTabCols::SwTabCols( USHORT nSize ) :
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx
index 2c38982..3e5e39f 100644
--- a/sw/source/core/crsr/bookmrk.cxx
+++ b/sw/source/core/crsr/bookmrk.cxx
@@ -33,7 +33,6 @@
#include <bookmrk.hxx>
#include <IDocumentMarkAccess.hxx>
#include <doc.hxx>
-#include <errhdl.hxx>
#include <ndtxt.hxx>
#include <pam.hxx>
#include <swserv.hxx>
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 9ef471e..4eaed8b 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -74,7 +74,6 @@
#include <txtrfmrk.hxx>
#include <frmatr.hxx>
#include <linkenum.hxx>
-#include <errhdl.hxx>
#include <pagefrm.hxx>
#include <rootfrm.hxx>
#include <swtable.hxx>
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index fe0e8e2..10120c0 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -40,7 +40,6 @@
#include <docary.hxx>
#include <xmloff/odffields.hxx>
#include <editsh.hxx>
-#include <errhdl.hxx>
#include <fmtanchr.hxx>
#include <frmfmt.hxx>
#include <functional>
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index 3282808..caaa2d3 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -56,7 +56,6 @@
#include <rtl/logfile.hxx>
#include <SwStyleNameMapper.hxx>
#include <fchrfmt.hxx>
-#include <errhdl.hxx>
#include <frmatr.hxx>
#include <txatbase.hxx>
#include <fmtfld.hxx>
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index aed0ddc..9a587b4 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -35,7 +35,6 @@
#include <editeng/lrspitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <doc.hxx> // fuer GetAttrPool
-#include <errhdl.hxx>
#include <fmtcol.hxx>
#include <fmtcolfunc.hxx> // #i71574#
#include <hints.hxx>
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 5698f2e..2267857 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -29,7 +29,6 @@
#include <finalthreadmanager.hxx>
#include <osl/thread.hxx>
-#include <errhdl.hxx>
#include <pausethreadstarting.hxx>
#include <swthreadjoiner.hxx>
diff --git a/sw/source/core/docnode/ndindex.cxx b/sw/source/core/docnode/ndindex.cxx
index 3b5e5ec..46e57a9 100644
--- a/sw/source/core/docnode/ndindex.cxx
+++ b/sw/source/core/docnode/ndindex.cxx
@@ -29,10 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_sw.hxx"
-
-
-#include "errhdl.hxx" // fuers ASSERT
-#include "error.h" // fuers ASSERT
#include "ndindex.hxx"
#if OSL_DEBUG_LEVEL > 1
diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index cc567fd..645f99d 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -45,7 +45,6 @@
#include <docary.hxx>
#include <fmtcntnt.hxx>
#include <fmtpdsc.hxx>
-#include <errhdl.hxx>
#include <doc.hxx>
#include <node.hxx>
#include <pam.hxx>
diff --git a/sw/source/core/docnode/threadmanager.cxx b/sw/source/core/docnode/threadmanager.cxx
index 21ad9d6..c991698 100644
--- a/sw/source/core/docnode/threadmanager.cxx
+++ b/sw/source/core/docnode/threadmanager.cxx
@@ -27,7 +27,6 @@
************************************************************************/
#include "precompiled_sw.hxx"
#include <threadmanager.hxx>
-#include <errhdl.hxx>
#include <algorithm>
diff --git a/sw/source/core/draw/dobjfac.cxx b/sw/source/core/draw/dobjfac.cxx
index 3431174..e2aa091 100644
--- a/sw/source/core/draw/dobjfac.cxx
+++ b/sw/source/core/draw/dobjfac.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
-#include <errhdl.hxx>
#include <dpage.hxx>
#include <dobjfac.hxx>
#include <dflyobj.hxx>
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index 33c2685..afc0ba1 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -44,7 +44,6 @@
#include <pam.hxx>
#include <viewopt.hxx>
#include <ndtxt.hxx>
-#include <errhdl.hxx>
#include <swundo.hxx>
#include <undobj.hxx>
#include <txttxmrk.hxx>
diff --git a/sw/source/core/except/errhdl.cxx b/sw/source/core/except/errhdl.cxx
deleted file mode 100644
index 544f52b..0000000
--- a/sw/source/core/except/errhdl.cxx
+++ /dev/null
@@ -1,89 +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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sw.hxx"
-#define _ERRHDL_CXX
-
-#include "stdlib.h"
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/sound.hxx>
-#include <errhdl.hxx>
-#include <error.h> // fuer die defines von ERR_SW6MSG_ ...
-
-// break into CodeView
-#if defined(ZTC) && defined(WIN)
-#define CVBREAK asm( 0xCC );
-#endif
-#if defined(MSC) && defined(WIN)
-#define CVBREAK __asm int 3;
-#endif
-#ifndef CVBREAK
-#define CVBREAK
-#endif
-
-/*------------------------------------------------------------------------
- Ausgabe einer Fehlermeldung inkl. Bedingung, Dateiname und Zeilennummer
- wo der Fehler auftrat.
- Die Funktion wird durch das OSL_ENSURE(Makro gerufen!
- Parameter:
- USHORT nErrorId Id fuer Fehlermeldung
- char *pFileName Filename in dem der Fehler auftrat
- USHORT nLine Zeilennummer in dem der Fehler auftrat
-------------------------------------------------------------------------*/
-
-void AssertFail( USHORT nErrorId, const sal_Char* pFileName )
-{
- // Umsetzung der ErrorId in eine Fehlermeldung
- static const sal_Char
- /* Error Fehlermeldungen zugriffe ausserhalb eines Bereiches */
- sERR_VAR_IDX[] = "Op[]",
- sERR_OUTOFSCOPE[] = "Zugriff ausserhalb des Bereiches",
- /* Error Codes fuer Numerierungsregeln */
- sERR_NUMLEVEL[] = "Falscher Num-Level",
- /* Error Codes fuer TxtNode */
- sERR_NOHINTS[] = "Zugriff auf ungueltiges HintsArray",
- sERR_UNKNOWN[] = "???";
-
- static const sal_Char* aErrStrTab[ ERR_SWGMSG_END - ERR_SWGMSG_START +1 ] =
- {
- sERR_VAR_IDX, sERR_OUTOFSCOPE, sERR_NUMLEVEL, sERR_NOHINTS
- };
-
- const sal_Char* pMsg;
- if( nErrorId >= ERR_SWGMSG_START && nErrorId < ERR_SWGMSG_END )
- pMsg = aErrStrTab[ nErrorId - ERR_SWGMSG_START ];
- else
- pMsg = sERR_UNKNOWN;
-
- OSL_ENSURE( pMsg, pFileName );
-}
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/except/makefile.mk b/sw/source/core/except/makefile.mk
index 022862b..f6ef7f3 100644
--- a/sw/source/core/except/makefile.mk
+++ b/sw/source/core/except/makefile.mk
@@ -47,11 +47,9 @@ CXXFILES =
.IF "$(DBG_LEVEL)">="2"
CXXFILES += \
- errhdl.cxx \
dbgloop.cxx
SLOFILES += \
- $(SLO)$/errhdl.obj \
$(SLO)$/dbgloop.obj
.ENDIF
# --- Tagets -------------------------------------------------------
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index c23a0fa..2b56522 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -33,7 +33,6 @@
#include <sfx2/linkmgr.hxx>
#include <doc.hxx>
#include <editsh.hxx>
-#include <errhdl.hxx>
#include <ndtxt.hxx>
#include <fmtfld.hxx>
#include <txtfld.hxx>
diff --git a/sw/source/core/inc/drawfont.hxx b/sw/source/core/inc/drawfont.hxx
index bcbcf35..5949df0 100644
--- a/sw/source/core/inc/drawfont.hxx
+++ b/sw/source/core/inc/drawfont.hxx
@@ -30,7 +30,6 @@
#include <tools/solar.h>
#include <tools/string.hxx>
-#include <errhdl.hxx>
class SwTxtFrm;
class OutputDevice;
diff --git a/sw/source/core/inc/scriptinfo.hxx b/sw/source/core/inc/scriptinfo.hxx
index 8f09d68..85b6793 100644
--- a/sw/source/core/inc/scriptinfo.hxx
+++ b/sw/source/core/inc/scriptinfo.hxx
@@ -36,7 +36,6 @@
#include <list>
#include <modeltoviewhelper.hxx>
-#include <errhdl.hxx>
class SwTxtNode;
class Point;
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 386b1ad..6dde45b 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -81,7 +81,6 @@
#include "pam.hxx"
#include "frmatr.hxx"
#include "viewimp.hxx"
-#include "errhdl.hxx"
#include "dcontact.hxx"
#include "dflyobj.hxx"
#include "dview.hxx"
diff --git a/sw/source/core/layout/flycnt.cxx b/sw/source/core/layout/flycnt.cxx
index f2ae960..fcea1f6 100644
--- a/sw/source/core/layout/flycnt.cxx
+++ b/sw/source/core/layout/flycnt.cxx
@@ -44,7 +44,6 @@
#include "hints.hxx"
#include "ndtxt.hxx"
#include "swundo.hxx"
-#include "errhdl.hxx"
#include <editeng/ulspitem.hxx>
#include <editeng/lrspitem.hxx>
#include <fmtanchr.hxx>
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index d3bc833..1c9f80e 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -39,7 +39,6 @@
#include "ftnfrm.hxx"
#include "frmtool.hxx"
#include "frmfmt.hxx"
-#include "errhdl.hxx"
#include "hints.hxx"
#include "pam.hxx"
#include "sectfrm.hxx"
diff --git a/sw/source/core/layout/hffrm.cxx b/sw/source/core/layout/hffrm.cxx
index 9e562dc..4361950 100644
--- a/sw/source/core/layout/hffrm.cxx
+++ b/sw/source/core/layout/hffrm.cxx
@@ -32,7 +32,6 @@
#include "pagefrm.hxx"
#include "viewsh.hxx"
#include "doc.hxx"
-#include "errhdl.hxx"
#include <fmtcntnt.hxx>
#include <fmthdft.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index c17f588..eea7e2f 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -59,7 +59,6 @@
#include "frmtool.hxx"
#include "fldbas.hxx"
#include "hints.hxx"
-#include "errhdl.hxx"
#include "swtable.hxx"
#include "ftnidx.hxx"
diff --git a/sw/source/core/layout/unusedf.cxx b/sw/source/core/layout/unusedf.cxx
index db056e5..e4c93b3 100644
--- a/sw/source/core/layout/unusedf.cxx
+++ b/sw/source/core/layout/unusedf.cxx
@@ -34,7 +34,6 @@
#include "rootfrm.hxx"
#include "cntfrm.hxx"
#include "flyfrm.hxx"
-#include "errhdl.hxx"
void SwFrm::Format( const SwBorderAttrs * )
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index 2ee4dd9..5642b77 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -48,7 +48,6 @@
#include <com/sun/star/text/WrapTextMode.hpp>
#include <unostyle.hxx>
#include <SwStyleNameMapper.hxx>
-#include "errhdl.hxx"
#include "paratr.hxx"
#include "charfmt.hxx"
#include "cmdid.h"
diff --git a/sw/source/core/swg/SwXMLTextBlocks.cxx b/sw/source/core/swg/SwXMLTextBlocks.cxx
index 6d72e41..e7c5cb6 100644
--- a/sw/source/core/swg/SwXMLTextBlocks.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks.cxx
@@ -47,7 +47,6 @@
#include <shellio.hxx>
#include <poolfmt.hxx>
#include <SwXMLTextBlocks.hxx>
-#include <errhdl.hxx>
#include <SwXMLBlockImport.hxx>
#include <SwXMLBlockExport.hxx>
#include <swerror.h>
diff --git a/sw/source/core/swg/SwXMLTextBlocks1.cxx b/sw/source/core/swg/SwXMLTextBlocks1.cxx
index 1b50c5a..779afac 100644
--- a/sw/source/core/swg/SwXMLTextBlocks1.cxx
+++ b/sw/source/core/swg/SwXMLTextBlocks1.cxx
@@ -47,7 +47,6 @@
#include <SwXMLBlockExport.hxx>
#include <swevent.hxx>
#include <swerror.h>
-#include <errhdl.hxx>
#define STREAM_STGREAD ( STREAM_READ | STREAM_SHARE_DENYWRITE | STREAM_NOCREATE )
diff --git a/sw/source/core/text/atrstck.cxx b/sw/source/core/text/atrstck.cxx
index d212a53..e33799a 100644
--- a/sw/source/core/text/atrstck.cxx
+++ b/sw/source/core/text/atrstck.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
-#include <errhdl.hxx> // ASSERT
#include <atrhndl.hxx>
#include <svl/itemiter.hxx>
#include <vcl/outdev.hxx>
diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 952d691..057655b 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -33,7 +33,6 @@
#include <ctype.h>
#include <editeng/unolingu.hxx>
#include <tools/shl.hxx> // needed for SW_MOD() macro
-#include <errhdl.hxx> //OSL_ENSURE
#include <dlelstnr.hxx>
#include <swmodule.hxx>
#include <IDocumentSettingAccess.hxx>
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 312578b..06297e4 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
#include "hintids.hxx"
-#include "errhdl.hxx"
#include "ndtxt.hxx"
#include "frmfmt.hxx"
#include "paratr.hxx"
diff --git a/sw/source/core/text/itrpaint.cxx b/sw/source/core/text/itrpaint.cxx
index 2419d66..804a2c0 100644
--- a/sw/source/core/text/itrpaint.cxx
+++ b/sw/source/core/text/itrpaint.cxx
@@ -33,7 +33,6 @@
#include "hintids.hxx"
#include "flyfrm.hxx" // SwFlyInCntFrm
#include "viewopt.hxx" // SwViewOptions
-#include "errhdl.hxx"
#include "txtatr.hxx" // SwINetFmt
#include <tools/multisel.hxx>
#include <editeng/escpitem.hxx>
diff --git a/sw/source/core/text/itrtxt.cxx b/sw/source/core/text/itrtxt.cxx
index d35e4db..79c8532 100644
--- a/sw/source/core/text/itrtxt.cxx
+++ b/sw/source/core/text/itrtxt.cxx
@@ -33,7 +33,6 @@
#include "ndtxt.hxx"
#include "flyfrm.hxx"
#include "paratr.hxx"
-#include "errhdl.hxx"
#include <vcl/outdev.hxx>
#include <editeng/paravertalignitem.hxx>
diff --git a/sw/source/core/text/porglue.cxx b/sw/source/core/text/porglue.cxx
index 6bc3e8c..5cfdb65 100644
--- a/sw/source/core/text/porglue.cxx
+++ b/sw/source/core/text/porglue.cxx
@@ -34,7 +34,6 @@
#include "swrect.hxx"
#include "paratr.hxx" // pTabStop, ADJ*
#include "viewopt.hxx" // SwViewOptions
-#include "errhdl.hxx" // ASSERT
#include <SwPortionHandler.hxx>
#include "txtcfg.hxx"
diff --git a/sw/source/core/text/porlay.cxx b/sw/source/core/text/porlay.cxx
index e443fc6..91620b7 100644
--- a/sw/source/core/text/porlay.cxx
+++ b/sw/source/core/text/porlay.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
-#include "errhdl.hxx" // ASSERT
#include "txtcfg.hxx"
#include "porlay.hxx"
diff --git a/sw/source/core/text/porlin.cxx b/sw/source/core/text/porlin.cxx
index 374147a..a832b49 100644
--- a/sw/source/core/text/porlin.cxx
+++ b/sw/source/core/text/porlin.cxx
@@ -33,7 +33,6 @@
#include <vcl/outdev.hxx>
#include <SwPortionHandler.hxx>
-#include "errhdl.hxx" // ASSERT
#include "txtcfg.hxx"
#include "porlin.hxx"
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 1cca21e..329e9df 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -34,7 +34,6 @@
#include <com/sun/star/i18n/ScriptType.hdl>
#include <hintids.hxx> // CH_TXTATR
-#include <errhdl.hxx> // ASSERT
#include <SwPortionHandler.hxx>
#include <txtcfg.hxx>
#include <porlay.hxx>
diff --git a/sw/source/core/text/txtcache.cxx b/sw/source/core/text/txtcache.cxx
index 286daba..0d42491 100644
--- a/sw/source/core/text/txtcache.cxx
+++ b/sw/source/core/text/txtcache.cxx
@@ -31,7 +31,6 @@
-#include "errhdl.hxx"
#include "txtcache.hxx"
#include "txtfrm.hxx"
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index 7aac7aa..6adb94c 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -36,7 +36,6 @@
#include <EnhancedPDFExportHelper.hxx>
#include <viewopt.hxx> // SwViewOptions
#include <viewsh.hxx>
-#include <errhdl.hxx>
#include <txtcfg.hxx>
#include <SwPortionHandler.hxx>
#include <porhyph.hxx> //
diff --git a/sw/source/core/text/txtinit.cxx b/sw/source/core/text/txtinit.cxx
index 7446883..ab6f18f 100644
--- a/sw/source/core/text/txtinit.cxx
+++ b/sw/source/core/text/txtinit.cxx
@@ -31,7 +31,6 @@
-#include "errhdl.hxx"
#include "txtcfg.hxx"
#include "swcache.hxx"
#include "fntcache.hxx" // pFntCache ( SwFont/ScrFont-PrtFont Cache )
diff --git a/sw/source/core/text/txtio.cxx b/sw/source/core/text/txtio.cxx
index 3bba3be..653cde4 100644
--- a/sw/source/core/text/txtio.cxx
+++ b/sw/source/core/text/txtio.cxx
@@ -37,7 +37,6 @@
#include "viewsh.hxx" // IsDbg()
#include "viewopt.hxx" // IsDbg()
#include "txtatr.hxx"
-#include "errhdl.hxx"
#include "txtcfg.hxx"
#include "txtfrm.hxx" // IsDbg()
#include "flyfrms.hxx"
diff --git a/sw/source/core/text/wrong.cxx b/sw/source/core/text/wrong.cxx
index 14cb3b5..ae23251 100644
--- a/sw/source/core/text/wrong.cxx
+++ b/sw/source/core/text/wrong.cxx
@@ -32,7 +32,6 @@
#include <tools/string.hxx>
#include <tools/debug.hxx>
-#include "errhdl.hxx"
#include "swtypes.hxx"
#include "txttypes.hxx"
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 2dde6c7..f5a6153 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -35,7 +35,6 @@
#include <tools/resid.hxx>
#include <hintids.hxx>
#include <swtypes.hxx>
-#include <errhdl.hxx>
#include <txtatr.hxx>
#include <ndtxt.hxx>
#include <txttxmrk.hxx>
diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx
index 28faae6..cd431ff 100644
--- a/sw/source/core/txtnode/fntcap.cxx
+++ b/sw/source/core/txtnode/fntcap.cxx
@@ -39,7 +39,6 @@
#include <com/sun/star/i18n/WordType.hdl>
#include <vcl/print.hxx>
-#include <errhdl.hxx>
#include <fntcache.hxx>
#include <swfont.hxx>
#include <breakit.hxx>
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index 262e870..e7df488 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -66,7 +66,6 @@
#include <docary.hxx>
#include <pam.hxx> // fuer SwPosition
#include <fldbas.hxx>
-#include <errhdl.hxx>
#include <paratr.hxx>
#include <txtfrm.hxx>
#include <ftnfrm.hxx>
diff --git a/sw/source/core/txtnode/thints.cxx b/sw/source/core/txtnode/thints.cxx
index 0506964..7b22be2 100644
--- a/sw/source/core/txtnode/thints.cxx
+++ b/sw/source/core/txtnode/thints.cxx
@@ -64,7 +64,6 @@
#include <fmtmeta.hxx>
#include <breakit.hxx>
#include <doc.hxx>
-#include <errhdl.hxx>
#include <fldbas.hxx>
#include <pam.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/core/unocore/swunohelper.cxx b/sw/source/core/unocore/swunohelper.cxx
index 8a6904e..9cfcf88 100644
--- a/sw/source/core/unocore/swunohelper.cxx
+++ b/sw/source/core/unocore/swunohelper.cxx
@@ -51,7 +51,6 @@
#include <svl/svstdarr.hxx>
#include <swunohelper.hxx>
#include <swunodef.hxx>
-#include <errhdl.hxx>
namespace SWUnoHelper {
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 55f96d0..eb6b177 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -34,7 +34,6 @@
#include "rootfrm.hxx"
#include "pagefrm.hxx"
#include "viewimp.hxx"
-#include "errhdl.hxx"
#include "viewopt.hxx"
#include "flyfrm.hxx"
#include "frmfmt.hxx"
diff --git a/sw/source/filter/basflt/fltini.cxx b/sw/source/filter/basflt/fltini.cxx
index 1e80097..1af28d5 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -50,7 +50,6 @@
#include <docary.hxx>
#include <pam.hxx>
#include <shellio.hxx>
-#include <errhdl.hxx>
#include <docsh.hxx>
#include <wdocsh.hxx>
#include <fltini.hxx>
diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx
index 9a6eb8b..1b9f27e 100644
--- a/sw/source/filter/basflt/iodetect.cxx
+++ b/sw/source/filter/basflt/iodetect.cxx
@@ -31,7 +31,6 @@
#include <iodetect.hxx>
-#include <errhdl.hxx>
#include <osl/endian.h>
#include <sot/storage.hxx>
#include <svtools/parhtml.hxx>
diff --git a/sw/source/filter/html/htmlftn.cxx b/sw/source/filter/html/htmlftn.cxx
index 916c2f0..27e9aee 100644
--- a/sw/source/filter/html/htmlftn.cxx
+++ b/sw/source/filter/html/htmlftn.cxx
@@ -34,7 +34,6 @@
#include <svtools/htmlout.hxx>
#include <svtools/htmlkywd.hxx>
-#include <errhdl.hxx>
#include <ndindex.hxx>
#include <fmtftn.hxx>
#include <txtftn.hxx>
diff --git a/sw/source/filter/ww1/w1sprm.cxx b/sw/source/filter/ww1/w1sprm.cxx
index 11a66f9..2a07a07 100644
--- a/sw/source/filter/ww1/w1sprm.cxx
+++ b/sw/source/filter/ww1/w1sprm.cxx
@@ -48,7 +48,6 @@
#include <charatr.hxx>
#include <frmatr.hxx>
#include <doc.hxx>
-#include <errhdl.hxx>
#include <fltini.hxx>
#include <docufld.hxx>
#include <pagedesc.hxx>
diff --git a/sw/source/filter/ww8/fields.cxx b/sw/source/filter/ww8/fields.cxx
index 55b3b86..0bdcb10 100644
--- a/sw/source/filter/ww8/fields.cxx
+++ b/sw/source/filter/ww8/fields.cxx
@@ -30,7 +30,6 @@
#include "precompiled_sw.hxx"
#include "fields.hxx"
-#include <errhdl.hxx>
#include <osl/diagnose.h>
#include <sal/macros.h>
#include <stddef.h>
diff --git a/sw/source/filter/ww8/hash_wrap.hxx b/sw/source/filter/ww8/hash_wrap.hxx
index faed16e..fe93a0a 100644
--- a/sw/source/filter/ww8/hash_wrap.hxx
+++ b/sw/source/filter/ww8/hash_wrap.hxx
@@ -33,7 +33,6 @@
#include <boost/unordered_set.hpp>
#include <tools/debug.hxx>
-#include <errhdl.hxx> // OSL_ENSURE()
//simple wrapper around boost::unordered_set to behave like sorted array
namespace ww
diff --git a/sw/source/filter/ww8/sortedarray.hxx b/sw/source/filter/ww8/sortedarray.hxx
index 93e62b9..6cacccd 100644
--- a/sw/source/filter/ww8/sortedarray.hxx
+++ b/sw/source/filter/ww8/sortedarray.hxx
@@ -30,7 +30,6 @@
#define WW_SORTEDARRAY_HXX
#include <algorithm>
-#include <errhdl.hxx> // OSL_ENSURE()
#include <tools/debug.hxx>
//simple template that manages a static [] array by sorting at construction
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index c48ed65..98ca608 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -73,7 +73,6 @@
#include <editeng/udlnitem.hxx>
#include <editeng/postitem.hxx>
#include <filter/msfilter/msocximex.hxx>
-#include <errhdl.hxx>
#include <unotextrange.hxx>
#include <doc.hxx>
#include <docary.hxx>
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index bf5014e..553db4a 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -40,7 +40,6 @@
#include <tools/datetime.hxx>
#include <tools/stream.hxx>
#include <tools/string.hxx>
-#include <errhdl.hxx> // OSL_ENSURE()
#include "hash_wrap.hxx"
#include "sortedarray.hxx"
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 1f05a83..6451815 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -66,7 +66,6 @@
#include <sfx2/frame.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <swerror.h>
-#include <errhdl.hxx>
#include <fltini.hxx>
#include <doc.hxx>
#include <docsh.hxx>
diff --git a/sw/source/filter/xml/wrtxml.cxx b/sw/source/filter/xml/wrtxml.cxx
index 514ce41..060742b 100644
--- a/sw/source/filter/xml/wrtxml.cxx
+++ b/sw/source/filter/xml/wrtxml.cxx
@@ -55,7 +55,6 @@
#include <docsh.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <errhdl.hxx>
#include <swerror.h>
#include <wrtxml.hxx>
#include <statstr.hrc>
diff --git a/sw/source/ui/app/docstyle.cxx b/sw/source/ui/app/docstyle.cxx
index ffa2f54..1496cd0 100644
--- a/sw/source/ui/app/docstyle.cxx
+++ b/sw/source/ui/app/docstyle.cxx
@@ -44,7 +44,6 @@
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
-#include <errhdl.hxx>
#include <frmfmt.hxx>
#include <charfmt.hxx>
#include <poolfmt.hxx>
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 13bcbb9..9328c9d 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -46,7 +46,6 @@
#include <cmdid.h>
#include <helpid.h>
#include <swtypes.hxx>
-#include <errhdl.hxx>
#include <view.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index cd9c8dd..893263d 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -50,7 +50,6 @@
#include <shellio.hxx>
#include <docsh.hxx>
#include <doc.hxx>
-#include <errhdl.hxx>
#include <dialog.hrc>
#include <ascfldlg.hrc>
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx
index a0a0641..cb76592 100644
--- a/sw/source/ui/envelp/envimg.cxx
+++ b/sw/source/ui/envelp/envimg.cxx
@@ -39,7 +39,6 @@
#include <unotools/useroptions.hxx>
#include <tools/shl.hxx>
#include <swmodule.hxx>
-#include <errhdl.hxx>
#include <swtypes.hxx>
#include <envimg.hxx>
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 6c5bac1..9915c9a 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -39,7 +39,6 @@
#include <viewopt.hxx>
#include "wrtsh.hxx"
-#include "errhdl.hxx"
#include "cmdid.h"
#include "helpid.h"
#include "envfmt.hxx"
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 3deeda0..b05fed6 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -51,7 +51,6 @@
#include <fmtclds.hxx>
#include <swtypes.hxx>
#include <swmodule.hxx>
-#include <errhdl.hxx> // fuer Create-Methoden
#include <wrtsh.hxx>
#include <view.hxx>
#include <wdocsh.hxx>
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index e7f566e..9b150d2 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -35,7 +35,6 @@
#include <svl/style.hxx>
-#include <errhdl.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/misc/glosdoc.cxx b/sw/source/ui/misc/glosdoc.cxx
index d6982db..d6cb8a4 100644
--- a/sw/source/ui/misc/glosdoc.cxx
+++ b/sw/source/ui/misc/glosdoc.cxx
@@ -47,7 +47,6 @@
#include <unotools/pathoptions.hxx>
#include <unotools/tempfile.hxx>
#include <swtypes.hxx>
-#include <errhdl.hxx> // ASSERT
#include <uitool.hxx>
#include <glosdoc.hxx>
#include <shellio.hxx>
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 03b2a49..9fd0424 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -47,7 +47,6 @@
#include <view.hxx>
#include <docsh.hxx>
#include <uitool.hxx>
-#include <errhdl.hxx>
#include <wrtsh.hxx>
#include <swmodule.hxx>
#include <fmtcol.hxx>
diff --git a/sw/source/ui/ribbar/tbxanchr.cxx b/sw/source/ui/ribbar/tbxanchr.cxx
index dd2fb50..710110b 100644
--- a/sw/source/ui/ribbar/tbxanchr.cxx
+++ b/sw/source/ui/ribbar/tbxanchr.cxx
@@ -48,7 +48,6 @@
#include "wrtsh.hxx"
#include "view.hxx"
#include "viewopt.hxx"
-#include "errhdl.hxx"
#include "ribbar.hrc"
#include "tbxanchr.hxx"
diff --git a/sw/source/ui/shells/textglos.cxx b/sw/source/ui/shells/textglos.cxx
index f45d452..c21533d 100644
--- a/sw/source/ui/shells/textglos.cxx
+++ b/sw/source/ui/shells/textglos.cxx
@@ -34,7 +34,6 @@
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include "errhdl.hxx"
#include "view.hxx"
#include "cmdid.h"
#include "textsh.hxx"
diff --git a/sw/source/ui/table/tablemgr.cxx b/sw/source/ui/table/tablemgr.cxx
index 1f3998e..adb8d42 100644
--- a/sw/source/ui/table/tablemgr.cxx
+++ b/sw/source/ui/table/tablemgr.cxx
@@ -38,7 +38,6 @@
#include <sot/clsids.hxx>
#include "edtwin.hxx"
-#include "errhdl.hxx"
#include "wrtsh.hxx"
#include "cmdid.h"
#include "frmatr.hxx"
diff --git a/sw/source/ui/uiview/viewcoll.cxx b/sw/source/ui/uiview/viewcoll.cxx
index c2bc368..87c20e4 100644
--- a/sw/source/ui/uiview/viewcoll.cxx
+++ b/sw/source/ui/uiview/viewcoll.cxx
@@ -37,7 +37,6 @@
#include <svl/stritem.hxx>
#include <rsc/rscsfx.hxx>
-#include "errhdl.hxx"
#include "view.hxx"
#include "wrtsh.hxx"
#include "basesh.hxx"
diff --git a/sw/source/ui/utlui/bookctrl.cxx b/sw/source/ui/utlui/bookctrl.cxx
index 481d2d6..75a8468 100644
--- a/sw/source/ui/utlui/bookctrl.cxx
+++ b/sw/source/ui/utlui/bookctrl.cxx
@@ -42,7 +42,6 @@
#include <vcl/status.hxx>
#include <vcl/menu.hxx>
#include "cmdid.h"
-#include "errhdl.hxx"
#include "swmodule.hxx"
#include "wrtsh.hxx"
#include "IMark.hxx"
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index 289659a..855e096 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -47,7 +47,6 @@
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
-#include <errhdl.hxx>
#include <docsh.hxx>
#include <content.hxx>
#include <frmfmt.hxx>
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 143b86e..b711387 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -52,7 +52,6 @@
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
-#include <errhdl.hxx>
#include <docsh.hxx>
#include <content.hxx>
#include <edglbldc.hxx>
diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx
index 607ce77..4908f69 100644
--- a/sw/source/ui/utlui/navipi.cxx
+++ b/sw/source/ui/utlui/navipi.cxx
@@ -44,7 +44,6 @@
#include <sfx2/dockwin.hxx>
#include <vcl/toolbox.hxx>
#include <swtypes.hxx> // fuer Pathfinder
-#include <errhdl.hxx>
#include <swmodule.hxx>
#include <view.hxx>
#include <navicfg.hxx>
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index cc76310..26cc001 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -75,7 +75,6 @@
#include <poolfmt.hxx>
#include "usrpref.hxx"
-#include <error.h>
#include <cmdid.h>
#include <globals.hrc>
#include <utlui.hrc>
commit 69f193e5c59bfd23e9db1234688f688b06d3fa1b
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Sun Feb 20 17:58:46 2011 +0100
Move ASSERT_ID to OSL_ASSERT
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 41bcd89..70e1d15 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -35,10 +35,10 @@
#include <node.hxx>
#include <hintids.hxx>
#include <ndhints.hxx>
-#include <errhdl.hxx>
#include <modeltoviewhelper.hxx>
#include <SwNumberTreeTypes.hxx>
#include <IDocumentContentOperations.hxx>
+#include <osl/diagnose.h>
#include <sfx2/Metadatable.hxx>
@@ -807,12 +807,12 @@ public:
inline SwpHints & SwTxtNode::GetSwpHints()
{
- ASSERT_ID( m_pSwpHints, ERR_NOHINTS);
+ OSL_ASSERT( m_pSwpHints );
return *m_pSwpHints;
}
inline const SwpHints &SwTxtNode::GetSwpHints() const
{
- ASSERT_ID( m_pSwpHints, ERR_NOHINTS);
+ OSL_ASSERT( m_pSwpHints );
return *m_pSwpHints;
}
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index de91cc8..7da9e77 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -35,7 +35,6 @@
#include <hintids.hxx>
#include <swtypes.hxx>
#include <ndtxt.hxx>
-#include <errhdl.hxx>
SwFmtChg::SwFmtChg( SwFmt *pFmt )
: SwMsgPoolItem( RES_FMT_CHG ),
@@ -176,8 +175,7 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
#if OSL_DEBUG_LEVEL > 1
const SfxPoolItem* GetDfltAttr( USHORT nWhich )
{
- ASSERT_ID( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN,
- ERR_OUTOFSCOPE );
+ OSL_ASSERT( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN );
SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index c3d11b6..eaa35f5 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -33,9 +33,7 @@
#include <stdlib.h> // fuer qsort
#include <tools/solar.h>
-#include "errhdl.hxx" // fuers ASSERT
#include "index.hxx"
-#include "error.h" // fuers ASSERT
#if OSL_DEBUG_LEVEL > 1
int SwIndex::nSerial = 0;
@@ -315,7 +313,7 @@ void SwIndexReg::Update( SwIndex const & rIdx, const xub_StrLen nDiff,
*************************************************************************/
xub_StrLen SwIndex::operator++(int)
{
- ASSERT_ID( nIndex < INVALID_INDEX, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex < INVALID_INDEX );
xub_StrLen nOldIndex = nIndex;
ChgValue( *this, nIndex+1 );
@@ -325,7 +323,7 @@ xub_StrLen SwIndex::operator++(int)
xub_StrLen SwIndex::operator++()
{
- ASSERT_ID( nIndex < INVALID_INDEX, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex < INVALID_INDEX );
ChgValue( *this, nIndex+1 );
return nIndex;
@@ -338,7 +336,7 @@ xub_StrLen SwIndex::operator++()
xub_StrLen SwIndex::operator--(int)
{
- ASSERT_ID( nIndex, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex );
xub_StrLen nOldIndex = nIndex;
ChgValue( *this, nIndex-1 );
@@ -348,7 +346,7 @@ xub_StrLen SwIndex::operator--(int)
xub_StrLen SwIndex::operator--()
{
- ASSERT_ID( nIndex, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex );
return ChgValue( *this, nIndex-1 ).nIndex;
}
@@ -358,7 +356,7 @@ xub_StrLen SwIndex::operator--()
xub_StrLen SwIndex::operator+=( xub_StrLen nWert )
{
- ASSERT_ID( nIndex < INVALID_INDEX - nWert, ERR_OUTOFSCOPE);
+ OSL_ASSERT( nIndex < INVALID_INDEX - nWert );
return ChgValue( *this, nIndex + nWert ).nIndex;
}
@@ -368,7 +366,7 @@ xub_StrLen SwIndex::operator+=( xub_StrLen nWert )
xub_StrLen SwIndex::operator-=( xub_StrLen nWert )
{
- ASSERT_ID( nIndex >= nWert, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex >= nWert );
return ChgValue( *this, nIndex - nWert ).nIndex;
}
@@ -378,7 +376,7 @@ xub_StrLen SwIndex::operator-=( xub_StrLen nWert )
xub_StrLen SwIndex::operator+=( const SwIndex & rIndex )
{
- ASSERT_ID( nIndex < INVALID_INDEX - rIndex.nIndex, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex < INVALID_INDEX - rIndex.nIndex );
return ChgValue( *this, nIndex + rIndex.nIndex ).nIndex;
}
@@ -388,7 +386,7 @@ xub_StrLen SwIndex::operator+=( const SwIndex & rIndex )
xub_StrLen SwIndex::operator-=( const SwIndex & rIndex )
{
- ASSERT_ID( nIndex >= rIndex.nIndex, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nIndex >= rIndex.nIndex );
return ChgValue( *this, nIndex - rIndex.nIndex ).nIndex;
}
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index d0f5c62..0fa5f11 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -84,7 +84,7 @@ USHORT SwNumRule::aDefNumIndents[ MAXLEVEL ] = {
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 ]
: ( meDefaultNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION
@@ -96,7 +96,7 @@ const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
{
const SwNumFmt * pResult = NULL;
- ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
+ OSL_ASSERT( i < MAXLEVEL && eRuleType < RULE_END );
if ( i < MAXLEVEL && eRuleType < RULE_END)
{
pResult = aFmts[ i ];
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index f42051c..43cfd18 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -113,7 +113,7 @@ void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
SwPaM& SwPamRanges::SetPam( USHORT nArrPos, SwPaM& rPam )
{
- ASSERT_ID( nArrPos < Count(), ERR_VAR_IDX );
+ OSL_ASSERT( nArrPos < Count() );
const SwPamRange& rTmp = *(GetData() + nArrPos );
rPam.GetPoint()->nNode = rTmp.nStart;
rPam.GetPoint()->nContent.Assign( rPam.GetCntntNode(), 0 );
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 03152c9..9e9010f 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -177,7 +177,7 @@ sal_uInt16 SwEditShell::GetCntType() const
case ND_OLENODE: nRet = CNT_OLE; break;
}
- ASSERT_ID( nRet, ERR_OUTOFSCOPE );
+ OSL_ASSERT( nRet );
return nRet;
}
More information about the Libreoffice-commits
mailing list