Move DBG_ERROR to OSL_FAIL

19 files changed, 82 insertions, 82 deletions

diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index c8173535e821..692f7049a681 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -1044,7 +1044,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
 #ifdef DBG_UTIL
         if (0xFF != *pJpgSearch)
         {
-            DBG_ERROR( "Expected JPEG marker." ); ((void)0);
+            OSL_FAIL( "Expected JPEG marker." ); ((void)0);
         }
 #endif
 
@@ -1114,7 +1114,7 @@ void Writer::Impl_writeJPEG(sal_uInt16 nBitmapId, const sal_uInt8* pJpgData, sal
             break;
 
         default:
-            DBG_ERROR( "JPEG marker I didn't handle!" );
+            OSL_FAIL( "JPEG marker I didn't handle!" );
 
         }
     }
diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx
index 957ee2eafb79..ee5d9c664615 100644
--- a/filter/source/graphicfilter/eos2met/eos2met.cxx
+++ b/filter/source/graphicfilter/eos2met/eos2met.cxx
@@ -1965,7 +1965,7 @@ void METWriter::WriteOrders( const GDIMetaFile* pMTF )
 
             case META_TEXTRECT_ACTION:
             {
-//              DBG_ERROR( "Unsupported MET-Action: META_TEXTRECT_ACTION!" );
+//              OSL_FAIL( "Unsupported MET-Action: META_TEXTRECT_ACTION!" );
             }
             break;
 
diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx
index db4b2d1502ab..14340d3fa34a 100644
--- a/filter/source/graphicfilter/epict/epict.cxx
+++ b/filter/source/graphicfilter/epict/epict.cxx
@@ -1630,7 +1630,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_CHORD_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_CHORD_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_CHORD_ACTION!" );
             }
             break;
 
@@ -1805,7 +1805,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_TEXTRECT_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
             }
             break;
 
@@ -1884,7 +1884,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
             case META_MASKSCALE_ACTION:
             case META_MASKSCALEPART_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_MASK..._ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_MASK..._ACTION!" );
             }
             break;
 
@@ -1914,13 +1914,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_WALLPAPER_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
             }
             break;
 
             case META_CLIPREGION_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
             }
             break;
 
@@ -1933,13 +1933,13 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_ISECTREGIONCLIPREGION_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
             }
             break;
 
             case META_MOVECLIPREGION_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
             }
             break;
 
@@ -1985,7 +1985,7 @@ void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
 
             case META_TEXTALIGN_ACTION:
             {
-//                DBG_ERROR( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
+//                OSL_FAIL( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
             }
             break;
 
diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx
index 2f764a0dda37..628c3f1177f5 100644
--- a/filter/source/graphicfilter/eps/eps.cxx
+++ b/filter/source/graphicfilter/eps/eps.cxx
@@ -787,7 +787,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
 
             case META_TEXTRECT_ACTION:
             {
-                DBG_ERROR( "Unsupported action: TextRect...Action!" );
+                OSL_FAIL( "Unsupported action: TextRect...Action!" );
             }
             break;
 
@@ -892,7 +892,7 @@ void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
             case META_MASKSCALE_ACTION:
             case META_MASKSCALEPART_ACTION:
             {
-                DBG_ERROR( "Unsupported action: MetaMask...Action!" );
+                OSL_FAIL( "Unsupported action: MetaMask...Action!" );
             }
             break;
 
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index a0e07a83067d..51eda7ceb6c0 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -307,7 +307,7 @@ void Impl_OlePres::Write( SvStream & rStm )
     }
     else
     {
-        DBG_ERROR( "unknown format" );
+        OSL_FAIL( "unknown format" );
     }
     ULONG nEndPos = rStm.Tell();
     rStm.Seek( nPos );
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index c4465301865b..8548037c3e7c 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -1171,7 +1171,7 @@ class ContainerRecReader
             }
             else
             {
-                DBG_ERROR("Terminating import, unexpected error");
+                OSL_FAIL("Terminating import, unexpected error");
                 return false;
             }
         }
@@ -3855,7 +3855,7 @@ void OCX_MultiPage::ProcessControl(OCX_Control* pControl, SvStorageStream* /* pS
     else
     {
         OSL_TRACE("!!!! Unsupported Control 0x%x ", rec.nTypeIdent);
-        DBG_ERROR("MultiPage error expected Page control");
+        OSL_FAIL("MultiPage error expected Page control");
     }
 
 }
@@ -6181,7 +6181,7 @@ bool OCX_ParentControl::createFromContainerRecord( const ContainerRecord& record
                 break;
             default:
                 OSL_TRACE( "**** Unknown control 0x%x", record.nTypeIdent );
-                DBG_ERROR( "Unknown control");
+                OSL_FAIL( "Unknown control");
                 return false;
         }
         pControl->sName = record.cName;
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index f3850921d554..b0ec82904cb3 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -233,7 +233,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
         catch( uno::Exception& )
         {
             // TODO/LATER: Error handling
-            DBG_ERROR( "The object could not be exported!" );
+            OSL_FAIL( "The object could not be exported!" );
         }
     }
     else if( aOwnGlobalName != SvGlobalName() )
@@ -323,14 +323,14 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
                     catch( uno::Exception& )
                     {
                         // TODO/LATER: Error handling
-                        DBG_ERROR( "The object could not be exported!" );
+                        OSL_FAIL( "The object could not be exported!" );
                     }
                 }
             }
         }
         else
         {
-            DBG_ERROR("Own binary format inside own container document!");
+            OSL_FAIL("Own binary format inside own container document!");
         }
     }
     else
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index c64716c51a95..344caa55bee5 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1410,7 +1410,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
                                     if ( pPersistPtr[ nOfs ] > nStreamLen )
                                     {
                                         bOk = FALSE;
-                                        DBG_ERROR("SdrPowerPointImport::Ctor(): Ungueltiger Eintrag im Persist-Directory!");
+                                        OSL_FAIL("SdrPowerPointImport::Ctor(): Ungueltiger Eintrag im Persist-Directory!");
                                     }
                                 }
                                 nAnz--;
@@ -1418,7 +1418,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
                             }
                             if ( bOk && nAnz > 0 )
                             {
-                                DBG_ERROR("SdrPowerPointImport::Ctor(): Nicht alle Persist-Directory Entraege gelesen!");
+                                OSL_FAIL("SdrPowerPointImport::Ctor(): Nicht alle Persist-Directory Entraege gelesen!");
                                 bOk = FALSE;
                             }
                         }
@@ -1440,7 +1440,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
         nDocStreamPos = aUserEditAtom.nDocumentRef;
         if ( nDocStreamPos > nPersistPtrAnz )
         {
-            DBG_ERROR("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef ungueltig!");
+            OSL_FAIL("SdrPowerPointImport::Ctor(): aUserEditAtom.nDocumentRef ungueltig!");
             bOk = FALSE;
         }
     }
@@ -1449,7 +1449,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
         nDocStreamPos = pPersistPtr[ nDocStreamPos ];
         if ( nDocStreamPos >= nStreamLen )
         {
-            DBG_ERROR("SdrPowerPointImport::Ctor(): nDocStreamPos >= nStreamLen!");
+            OSL_FAIL("SdrPowerPointImport::Ctor(): nDocStreamPos >= nStreamLen!");
             bOk = FALSE;
         }
     }
@@ -1499,7 +1499,7 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
                     {
                         if (!(rImportParam.nImportFlags & PPT_IMPORTFLAGS_NO_TEXT_ASSERT ))
                         {
-                            DBG_ERROR( "SdrTextSpecInfoAtomInterpreter::Ctor(): parsing error, this document needs to be analysed (SJ)" );
+                            OSL_FAIL( "SdrTextSpecInfoAtomInterpreter::Ctor(): parsing error, this document needs to be analysed (SJ)" );
                         }
                     }
 #endif
@@ -1629,12 +1629,12 @@ SdrPowerPointImport::SdrPowerPointImport( PowerPointImportParam& rParam, const S
                                 rStCtrl >> pE2->aColorScheme;
                             else
                             {
-                                DBG_ERROR( "SdrPowerPointImport::Ctor(): could not get SlideColorScheme! (SJ)" );
+                                OSL_FAIL( "SdrPowerPointImport::Ctor(): could not get SlideColorScheme! (SJ)" );
                             }
                         }
                         else
                         {
-                            DBG_ERROR("SdrPowerPointImport::Ctor(): Persist-Eintrag fehlerhaft! (SJ)");
+                            OSL_FAIL("SdrPowerPointImport::Ctor(): Persist-Eintrag fehlerhaft! (SJ)");
                         }
                     }
                 }
@@ -3300,11 +3300,11 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
                                 aBuGraList.Insert( pBuGra, (UINT32)n );
                             }
 #ifdef DBG_UTIL
-                            else DBG_ERROR( "PPTExParaProv::PPTExParaProv - bullet graphic is not valid (SJ)" );
+                            else OSL_FAIL( "PPTExParaProv::PPTExParaProv - bullet graphic is not valid (SJ)" );
 #endif
                         }
 #ifdef DBG_UTIL
-                        else DBG_ERROR( "PPTExParaProv::PPTExParaProv - unknown atom interpreting the PPT_PST_ExtendedBuGraContainer (SJ)" );
+                        else OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom interpreting the PPT_PST_ExtendedBuGraContainer (SJ)" );
 #endif
                         aBuGraAtomHd.SeekToEndOfRecord( rSt );
                     }
@@ -3318,7 +3318,7 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
                 break;
 #ifdef DBG_UTIL
                 default :
-                    DBG_ERROR( "PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ)" );
+                    OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom reading ppt2000 num rules (SJ)" );
                 case PPT_PST_MasterText :   // first seen in: ms-tt02.ppt
                 case PPT_PST_SrKinsoku :
                 case PPT_PST_NewlyAddedAtom4016 :
@@ -3360,20 +3360,20 @@ PPTExtParaProv::PPTExtParaProv( SdrPowerPointImport& rMan, SvStream& rSt, const
                             }
 #ifdef DBG_UTIL
                             if ( rSt.Tell() != aHd.GetRecEndFilePos() )
-                                DBG_ERROR( "PPTExParaProv::PPTExParaProv - error reading PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
+                                OSL_FAIL( "PPTExParaProv::PPTExParaProv - error reading PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
 #endif
                         }
 #ifdef DBG_UTIL
-                        else DBG_ERROR( "PPTExParaProv::PPTExParaProv - depth is greater than 5 (SJ)" );
+                        else OSL_FAIL( "PPTExParaProv::PPTExParaProv - depth is greater than 5 (SJ)" );
 #endif
                     }
 #ifdef DBG_UTIL
-                    else DBG_ERROR( "PPTExParaProv::PPTExParaProv - instance out of range (SJ)" );
+                    else OSL_FAIL( "PPTExParaProv::PPTExParaProv - instance out of range (SJ)" );
 #endif
                 }
                 break;
                 default :
-                    DBG_ERROR( "PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
+                    OSL_FAIL( "PPTExParaProv::PPTExParaProv - unknown atom, assuming PPT_PST_ExtendedParagraphMasterAtom (SJ)" );
                 case PPT_PST_NewlyAddedAtomByXP11008 :
                 case PPT_PST_NewlyAddedAtomByXP11010 :
                 case PPT_PST_NewlyAddedAtomByXP12010 :
@@ -3809,7 +3809,7 @@ void PPTCharSheet::Read( SvStream& rIn, sal_Bool /*bMasterStyle*/, sal_uInt32 nL
     {
         if ( nCMask & 1 )
         {
-            DBG_ERROR( "PPTCharSheet::Read - unknown attribute, send me this document (SJ)" );
+            OSL_FAIL( "PPTCharSheet::Read - unknown attribute, send me this document (SJ)" );
             rIn >> nVal16;
         }
         nCMask >>= 1;
@@ -3985,7 +3985,7 @@ void PPTParaSheet::Read( SdrPowerPointImport&
 #ifdef DBG_UTIL
             if (!(rManager.rImportParam.nImportFlags & PPT_IMPORTFLAGS_NO_TEXT_ASSERT))
             {
-                DBG_ERROR( "PPTParaSheet::Read - unknown attribute, send me this document (SJ)" );
+                OSL_FAIL( "PPTParaSheet::Read - unknown attribute, send me this document (SJ)" );
             }
 #endif
             rIn >> nVal16;
@@ -4128,7 +4128,7 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd
             rIn >> nLevelAnz;
             if ( nLevelAnz > 5 )
             {
-                DBG_ERROR( "PPTStyleSheet::Ppt-TextStylesheet hat mehr als 5 Ebenen! (SJ)" );
+                OSL_FAIL( "PPTStyleSheet::Ppt-TextStylesheet hat mehr als 5 Ebenen! (SJ)" );
                 nLevelAnz = 5;
             }
             sal_uInt16  nLev = 0;
@@ -4901,7 +4901,7 @@ void PPTStyleTextPropReader::ReadParaProps( SvStream& rIn, SdrPowerPointImport&
             // it should be a const reference
             PPTParaPropSet aTmpPPTParaPropSet;
             aParaPropSet = aTmpPPTParaPropSet;
-            DBG_ERROR( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the paragraph attributes" );
+            OSL_FAIL( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the paragraph attributes" );
         }
         PPTParaPropSet* pPara = new PPTParaPropSet( aParaPropSet );
         pPara->mnOriginalTextPos = nCharAnzRead;
@@ -4948,7 +4948,7 @@ void PPTStyleTextPropReader::ReadCharProps( SvStream& rIn, PPTCharPropSet& aChar
         if ( nCharsToRead < -1 )
         {
             bTextPropAtom = sal_False;
-            DBG_ERROR( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the character attributes" );
+            OSL_FAIL( "SJ:PPTStyleTextPropReader::could not get this PPT_PST_StyleTextPropAtom by reading the character attributes" );
         }
     }
     ImplPPTCharPropSet& aSet = *aCharPropSet.pCharSet;
@@ -5345,7 +5345,7 @@ BOOL PPTPortionObj::GetAttrib( UINT32 nAttr, UINT32& nRetValue, UINT32 nDestinat
                 nRetValue = pCharSet->mnEscapement;
             break;
             default :
-                DBG_ERROR( "SJ:PPTPortionObj::GetAttrib ( hard attribute does not exist )" );
+                OSL_FAIL( "SJ:PPTPortionObj::GetAttrib ( hard attribute does not exist )" );
         }
     }
     else
@@ -5411,7 +5411,7 @@ BOOL PPTPortionObj::GetAttrib( UINT32 nAttr, UINT32& nRetValue, UINT32 nDestinat
             }
             break;
             default :
-                DBG_ERROR( "SJ:PPTPortionObj::GetAttrib ( attribute does not exist )" );
+                OSL_FAIL( "SJ:PPTPortionObj::GetAttrib ( attribute does not exist )" );
         }
     }
     return (BOOL)bIsHardAttribute;
@@ -5690,7 +5690,7 @@ PPTParagraphObj::PPTParagraphObj( PPTStyleTextPropReader& rPropReader, const PPT
             }
             else
             {
-                DBG_ERROR( "SJ:PPTParagraphObj::It seems that there are missing some textportions" );
+                OSL_FAIL( "SJ:PPTParagraphObj::It seems that there are missing some textportions" );
                 mpPortionList[ i ] = NULL;
             }
             pCharPropSet = (PPTCharPropSet*)rPropReader.aCharPropList.Next();
@@ -5741,7 +5741,7 @@ BOOL PPTParagraphObj::GetAttrib( UINT32 nAttr, UINT32& nRetValue, UINT32 nDestin
 
     if ( nAttr > 21 )
     {
-        DBG_ERROR( "SJ:PPTParagraphObj::GetAttrib - attribute does not exist" );
+        OSL_FAIL( "SJ:PPTParagraphObj::GetAttrib - attribute does not exist" );
         return FALSE;
     }
 
@@ -5830,7 +5830,7 @@ BOOL PPTParagraphObj::GetAttrib( UINT32 nAttr, UINT32& nRetValue, UINT32 nDestin
             case PPT_ParaAttr_BuHardFont :
             case PPT_ParaAttr_BuHardColor :
             case PPT_ParaAttr_BuHardHeight :
-                DBG_ERROR( "SJ:PPTParagraphObj::GetAttrib - this attribute does not make sense" );
+                OSL_FAIL( "SJ:PPTParagraphObj::GetAttrib - this attribute does not make sense" );
             break;
             case PPT_ParaAttr_BulletChar :
             {
@@ -6550,7 +6550,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, SdrPowerPointImport& rSdrPowerPointImport
                                 {
                                     if (!(rSdrPowerPointImport.rImportParam.nImportFlags & PPT_IMPORTFLAGS_NO_TEXT_ASSERT))
                                     {
-                                        DBG_ERROR( "SdrTextSpecInfoAtomInterpreter::Ctor(): parsing error, this document needs to be analysed (SJ)" );
+                                        OSL_FAIL( "SdrTextSpecInfoAtomInterpreter::Ctor(): parsing error, this document needs to be analysed (SJ)" );
                                     }
                                 }
 #endif
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e61899c4c4ab..1e6b4b08f55c 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -1517,7 +1517,7 @@ sal_Bool PDFExport::ImplWriteActions( PDFWriter& rWriter, PDFExtOutDevData* pPDF
                 case( META_MASKSCALE_ACTION ):
                 case( META_MASKSCALEPART_ACTION ):
                 {
-                    DBG_ERROR( "MetaMask...Action not supported yet" );
+                    OSL_FAIL( "MetaMask...Action not supported yet" );
                 }
                 break;
 
@@ -1738,7 +1738,7 @@ sal_Bool PDFExport::ImplWriteActions( PDFWriter& rWriter, PDFExtOutDevData* pPDF
                     if( !bAssertionFired )
                     {
                         bAssertionFired = true;
-                        DBG_ERROR( "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered" );
+                        OSL_FAIL( "PDFExport::ImplWriteActions: deprecated and unsupported MetaAction encountered" );
                     }
                 break;
             }
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 974ab41c7a26..3661315d097e 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -221,7 +221,7 @@ sal_Bool SVGFilter::implExport( const Sequence< PropertyValue >& rDescriptor )
                     catch( ... )
                     {
                         delete mpSVGDoc, mpSVGDoc = NULL;
-                        DBG_ERROR( "Exception caught" );
+                        OSL_FAIL( "Exception caught" );
                     }
 
                     if( mpSdrModel )
diff --git a/filter/source/svg/svgwriter.cxx b/filter/source/svg/svgwriter.cxx
index 688f6bb3cdb9..c14a0f5773a8 100644
--- a/filter/source/svg/svgwriter.cxx
+++ b/filter/source/svg/svgwriter.cxx
@@ -562,7 +562,7 @@ void SVGActionWriter::ImplWriteLine( const Point& rPt1, const Point& rPt2, const
     if( pLineColor )
     {
         // !!! mrExport.AddAttribute( XML_NAMESPACE_NONE, ... )
-        DBG_ERROR( "SVGActionWriter::ImplWriteLine: Line color not implemented" );
+        OSL_FAIL( "SVGActionWriter::ImplWriteLine: Line color not implemented" );
     }
 
     {
@@ -1819,7 +1819,7 @@ void SVGActionWriter::ImplWriteActions( const GDIMetaFile& rMtf,
             break;
 
             default:
-                DBG_ERROR( "SVGActionWriter::ImplWriteActions: unsupported MetaAction #" );
+                OSL_FAIL( "SVGActionWriter::ImplWriteActions: unsupported MetaAction #" );
             break;
         }
     }
diff --git a/filter/source/xsltdialog/typedetectionexport.cxx b/filter/source/xsltdialog/typedetectionexport.cxx
index 4cba0fdc18ab..fb925b2c39a8 100644
--- a/filter/source/xsltdialog/typedetectionexport.cxx
+++ b/filter/source/xsltdialog/typedetectionexport.cxx
@@ -229,7 +229,7 @@ void TypeDetectionExporter::doExport( Reference< XOutputStream > xOS,  const XML
     }
     catch( Exception& )
     {
-        DBG_ERROR( "TypeDetectionExporter::doExport exception catched!" );
+        OSL_FAIL( "TypeDetectionExporter::doExport exception catched!" );
     }
 }
 
@@ -259,7 +259,7 @@ void TypeDetectionExporter::addProperty( Reference< XDocumentHandler > xHandler,
     }
     catch( Exception& )
     {
-        DBG_ERROR( "TypeDetectionExporter::addProperty exception catched!" );
+        OSL_FAIL( "TypeDetectionExporter::addProperty exception catched!" );
     }
 }
 
@@ -290,7 +290,7 @@ void TypeDetectionExporter::addLocaleProperty( Reference< XDocumentHandler > xHa
     }
     catch( Exception& )
     {
-        DBG_ERROR( "TypeDetectionExporter::addLocaleProperty exception catched!" );
+        OSL_FAIL( "TypeDetectionExporter::addLocaleProperty exception catched!" );
     }
 }
 
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index 996f72c187d3..9133f9bd495c 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -91,7 +91,7 @@ void TypeDetectionImporter::doImport( Reference< XMultiServiceFactory >& xMSF, R
     }
     catch( Exception& /* e */ )
     {
-        DBG_ERROR( "TypeDetectionImporter::doImport exception catched!" );
+        OSL_FAIL( "TypeDetectionImporter::doImport exception catched!" );
     }
 }
 
diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx
index 1dfaf6295a05..4ee451e3869f 100644
--- a/filter/source/xsltdialog/xmlfileview.cxx
+++ b/filter/source/xsltdialog/xmlfileview.cxx
@@ -768,7 +768,7 @@ void lcl_Highlight(const String& rSource, SwTextPortions& aPortionList)
                     {
                         //was war das denn?
 #ifdef DEBUG
-                        DBG_ERROR("Token nicht erkannt!")
+                        OSL_FAIL("Token nicht erkannt!")
                         DBG_ERROR(ByteString(sToken, gsl_getSystemTextEncoding()).GetBuffer())
 #endif
                     }
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 1b168af6c3e0..dc22a7ddbee8 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -225,7 +225,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
                     {
                     // in case of same named import / export XSLT the latter
                     // is ignored
-                        DBG_ERROR( "XMLFilterJarHelper::same named xslt filter exception!" );
+                        OSL_FAIL( "XMLFilterJarHelper::same named xslt filter exception!" );
                     }
 
                     if( pFilter->maImportTemplate.getLength() )
@@ -262,7 +262,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& rPackageURL, const XMLFilt
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterJarHelper::savePackage exception catched!" );
+        OSL_FAIL( "XMLFilterJarHelper::savePackage exception catched!" );
     }
 
     osl::File::remove( rPackageURL );
@@ -338,7 +338,7 @@ void XMLFilterJarHelper::openPackage( const OUString& rPackageURL, XMLFilterVect
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterJarHelper::savePackage exception catched!" );
+        OSL_FAIL( "XMLFilterJarHelper::savePackage exception catched!" );
     }
 }
 
@@ -400,7 +400,7 @@ bool XMLFilterJarHelper::copyFile( Reference< XHierarchicalNameAccess > xIfc, OU
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterJarHelper::copyFile exception catched" );
+        OSL_FAIL( "XMLFilterJarHelper::copyFile exception catched" );
     }
     return false;
 }
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 3260312e384f..ffd868a2c662 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -116,7 +116,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM
     }
     catch(Exception&)
     {
-        DBG_ERROR( "XMLFilterSettingsDialog::XMLFilterSettingsDialog exception catched!" );
+        OSL_FAIL( "XMLFilterSettingsDialog::XMLFilterSettingsDialog exception catched!" );
     }
 }
 
@@ -434,7 +434,7 @@ OUString XMLFilterSettingsDialog::createUniqueInterfaceName( const OUString& rIn
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterSettingsDialog::createUniqueInterfaceName exception catched!" );
+        OSL_FAIL( "XMLFilterSettingsDialog::createUniqueInterfaceName exception catched!" );
     }
 
     OUString aInterfaceName( rInterfaceName );
@@ -479,7 +479,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
         }
         catch( Exception& )
         {
-            DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+            OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
             bOk = false;
         }
     }
@@ -601,7 +601,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
         }
         catch( Exception& )
         {
-            DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+            OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
             bOk = false;
         }
     }
@@ -664,7 +664,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+                OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
                 bOk = false;
             }
         }
@@ -679,7 +679,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+                OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
                 bOk = false;
             }
         }
@@ -693,7 +693,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+                OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
                 bOk = false;
             }
         }
@@ -709,7 +709,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
                 }
                 catch( Exception& )
                 {
-                    DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+                    OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
                     bOk = false;
                 }
 
@@ -722,7 +722,7 @@ bool XMLFilterSettingsDialog::insertOrEdit( filter_info_impl* pNewInfo, const fi
                     }
                     catch( Exception& )
                     {
-                        DBG_ERROR( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
+                        OSL_FAIL( "XMLFilterSettingsDialog::insertOrEdit exception catched!" );
                     }
                 }
 
@@ -899,7 +899,7 @@ void XMLFilterSettingsDialog::onDelete()
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterSettingsDialog::onDelete exception catched!" );
+                OSL_FAIL( "XMLFilterSettingsDialog::onDelete exception catched!" );
             }
         }
     }
@@ -1240,7 +1240,7 @@ void XMLFilterSettingsDialog::initFilterList()
                     }
                     catch( ::com::sun::star::container::NoSuchElementException& )
                     {
-                        DBG_ERROR( "Type not found, user error?" ); // TODO: error?
+                        OSL_FAIL( "Type not found, user error?" ); // TODO: error?
                     }
                 }
 
@@ -1253,7 +1253,7 @@ void XMLFilterSettingsDialog::initFilterList()
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterSettingsDialog::initFilterList exception catched!" );
+                OSL_FAIL( "XMLFilterSettingsDialog::initFilterList exception catched!" );
             }
 
         }
@@ -1767,7 +1767,7 @@ bool copyStreams( Reference< XInputStream > xIS, Reference< XOutputStream > xOS
     }
     catch(Exception&)
     {
-        DBG_ERROR( "copyStreams() exception catched!" );
+        OSL_FAIL( "copyStreams() exception catched!" );
     }
 
     return false;
diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
index ce3c966c83a4..221ad42904bd 100644
--- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx
@@ -162,7 +162,7 @@ bool XMLFilterTabDialog::onOk()
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterTabDialog::onOk exception catched!" );
+                OSL_FAIL( "XMLFilterTabDialog::onOk exception catched!" );
             }
         }
     }
@@ -220,7 +220,7 @@ bool XMLFilterTabDialog::onOk()
             }
             catch( Exception& )
             {
-                DBG_ERROR( "XMLFilterTabDialog::onOk exception catched!" );
+                OSL_FAIL( "XMLFilterTabDialog::onOk exception catched!" );
             }
         }
     }
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 48da5ae6eee5..c5ebd3b2591f 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -84,7 +84,7 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co
     }
     catch(Exception&)
     {
-        DBG_ERROR( "XMLFilterTabPageXSLT::XMLFilterTabPageXSLT exception catched!" );
+        OSL_FAIL( "XMLFilterTabPageXSLT::XMLFilterTabPageXSLT exception catched!" );
     }
 
     maPBDTDSchemaBrowse.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 5a4ae1133dad..9cdb539c8154 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -136,7 +136,7 @@ static bool checkComponent( Reference< XComponent >& rxComponent, const OUString
     }
     catch( Exception& )
     {
-        DBG_ERROR( "checkComponent exception catched!" );
+        OSL_FAIL( "checkComponent exception catched!" );
     }
 
     return false;
@@ -195,7 +195,7 @@ XMLFilterTestDialog::XMLFilterTestDialog( Window* pParent, ResMgr& rResMgr, cons
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterTestDialog::XMLFilterTestDialog exception catched!" );
+        OSL_FAIL( "XMLFilterTestDialog::XMLFilterTestDialog exception catched!" );
     }
 }
 
@@ -208,7 +208,7 @@ XMLFilterTestDialog::~XMLFilterTestDialog()
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterTestDialog::~XMLFilterTestDialog exception catched!" );
+        OSL_FAIL( "XMLFilterTestDialog::~XMLFilterTestDialog exception catched!" );
     }
 
     delete mpSourceDLG;
@@ -453,7 +453,7 @@ void XMLFilterTestDialog::onExportBrowse()
     }
     catch(Exception&)
     {
-        DBG_ERROR("XMLFilterTestDialog::onExportBrowse exception caught!");
+        OSL_FAIL("XMLFilterTestDialog::onExportBrowse exception caught!");
     }
 
     initDialog();
@@ -560,7 +560,7 @@ void XMLFilterTestDialog::doExport( Reference< XComponent > xComp )
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterTestDialog::doExport exception catched!" );
+        OSL_FAIL( "XMLFilterTestDialog::doExport exception catched!" );
     }
 }
 
@@ -693,7 +693,7 @@ void XMLFilterTestDialog::import( const OUString& rURL )
     }
     catch(Exception&)
     {
-        DBG_ERROR("XMLFilterTestDialog::import catched an exception" );
+        OSL_FAIL("XMLFilterTestDialog::import catched an exception" );
     }
 }
 
@@ -773,7 +773,7 @@ Reference< XComponent > XMLFilterTestDialog::getFrontMostDocument( const OUStrin
     }
     catch( Exception& )
     {
-        DBG_ERROR( "XMLFilterTestDialog::getFrontMostDocument exception catched!" );
+        OSL_FAIL( "XMLFilterTestDialog::getFrontMostDocument exception catched!" );
     }
 
     return xRet;