Merge remote branch 'origin/libreoffice-3-3'

Conflicts:
	sw/inc/SwNumberTree.hxx
	sw/inc/calbck.hxx
	sw/inc/tox.hxx
	sw/inc/viscrs.hxx
	sw/source/core/doc/docnum.cxx
	sw/source/core/docnode/finalthreadmanager.cxx
	sw/source/core/docnode/ndnum.cxx
	sw/source/core/docnode/ndtbl.cxx
	sw/source/core/draw/dcontact.cxx
	sw/source/core/edit/edlingu.cxx
	sw/source/core/edit/ednumber.cxx
	sw/source/core/except/errhdl.cxx
	sw/source/core/fields/chpfld.cxx
	sw/source/core/fields/fldbas.cxx
	sw/source/core/frmedt/fetab.cxx
	sw/source/core/layout/flycnt.cxx
	sw/source/core/layout/makefile.mk
	sw/source/core/layout/pagechg.cxx
	sw/source/core/layout/tabfrm.cxx
	sw/source/core/ole/ndole.cxx
	sw/source/core/text/makefile.mk
	sw/source/core/txtnode/txtedt.cxx
	sw/source/filter/basflt/fltini.cxx
	sw/source/filter/html/swhtml.cxx
	sw/source/filter/ww1/fltshell.cxx
	sw/source/filter/ww1/w1sprm.cxx
	sw/source/filter/ww8/wrtw8nds.cxx
	sw/source/filter/ww8/wrtw8num.cxx
	sw/source/filter/ww8/ww8par3.cxx
	sw/source/filter/ww8/ww8par5.cxx
	sw/source/filter/ww8/ww8par6.cxx
	sw/source/filter/xml/xmltble.cxx
	sw/source/filter/xml/xmltbli.cxx
	sw/source/ui/dbui/dbinsdlg.cxx
	sw/source/ui/dbui/mmoutputpage.cxx
	sw/source/ui/dialog/swdlgfact.cxx
	sw/source/ui/docvw/edtwin.cxx
	sw/source/ui/docvw/srcedtw.cxx

1 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index a0c389977ca8..8753c5d1639c 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -84,7 +84,7 @@ SwRefMarkFldUpdate::SwRefMarkFldUpdate( const OutputDevice* pOutput )
     : SwMsgPoolItem( RES_REFMARKFLD_UPDATE ),
     pOut( pOutput )
 {
-    ASSERT( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
+    OSL_ENSURE( pOut, "es muss ein OutputDevice-Pointer gesetzt werden!" );
 }
 
 
@@ -103,7 +103,7 @@ SwTableFmlUpdate::SwTableFmlUpdate( const SwTable* pNewTbl )
 {
     DATA.pDelTbl = 0;
     bModified = bBehindSplitLine = FALSE;
-    ASSERT( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
+    OSL_ENSURE( pTbl, "es muss ein Table-Pointer gesetzt werden!" );
 }
 
 
@@ -137,11 +137,11 @@ SwAttrSetChg::~SwAttrSetChg()
 }
 
 
-#ifdef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
 
 void SwAttrSetChg::ClearItem( USHORT nWhch )
 {
-    ASSERT( bDelSet, "der Set darf nicht veraendert werden!" );
+    OSL_ENSURE( bDelSet, "der Set darf nicht veraendert werden!" );
     pChgSet->ClearItem( nWhch );
 }
 
@@ -156,14 +156,14 @@ SwMsgPoolItem::SwMsgPoolItem( USHORT nWhch )
 // "Overhead" vom SfxPoolItem
 int SwMsgPoolItem::operator==( const SfxPoolItem& ) const
 {
-    ASSERT( FALSE, "SwMsgPoolItem kennt kein ==" );
+    OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein ==" );
     return 0;
 }
 
 
 SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
 {
-    ASSERT( FALSE, "SwMsgPoolItem kennt kein Clone" );
+    OSL_ENSURE( FALSE, "SwMsgPoolItem kennt kein Clone" );
     return 0;
 }
 
@@ -173,21 +173,21 @@ SfxPoolItem* SwMsgPoolItem::Clone( SfxItemPool* ) const
  * Ist keines vorhanden, returnt ein 0-Pointer !!!
  * Used to be inlined (hintids.hxx) in PRODUCT.
  ******************************************************************************/
-#ifndef DBG_UTIL
-const SfxPoolItem* GetDfltAttr( USHORT nWhich )
-{
-    return aAttrTab[ nWhich - POOLATTR_BEGIN ];
-}
-#else
+#if OSL_DEBUG_LEVEL > 1
 const SfxPoolItem* GetDfltAttr( USHORT nWhich )
 {
     ASSERT_ID( nWhich < POOLATTR_END && nWhich >= POOLATTR_BEGIN,
                ERR_OUTOFSCOPE );
 
     SfxPoolItem *pHt = aAttrTab[ nWhich - POOLATTR_BEGIN ];
-    ASSERT( pHt, "GetDfltFmtAttr(): Dflt == 0" );
+    OSL_ENSURE( pHt, "GetDfltFmtAttr(): Dflt == 0" );
     return pHt;
 }
+#else
+const SfxPoolItem* GetDfltAttr( USHORT nWhich )
+{
+    return aAttrTab[ nWhich - POOLATTR_BEGIN ];
+}
 #endif