Move DBG_ERROR to OSL_FAIL

32 files changed, 72 insertions, 72 deletions

diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index e7c3c2b1b0bf..03fc750bbe82 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.cxx
@@ -952,7 +952,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
         // prepare row
         ULONG nRow = nTopRow+nRelRow;
         if ( !SeekRow( nRow) ) {
-            DBG_ERROR("BrowseBox::ImplPaintData: SeekRow gescheitert");
+            OSL_FAIL("BrowseBox::ImplPaintData: SeekRow gescheitert");
         }
         _rOut.SetClipRegion();
         aPos.X() = aOverallAreaPos.X();
@@ -994,7 +994,7 @@ void BrowseBox::ImplPaintData(OutputDevice& _rOut, const Rectangle& _rRect, BOOL
                 if (!pCol)
                 {   // FS - 21.05.99 - 66325
                     // ist zwar eigentlich woanders (an der richtigen Stelle) gefixt, aber sicher ist sicher ...
-                    DBG_ERROR("BrowseBox::PaintData : nFirstCol is probably invalid !");
+                    OSL_FAIL("BrowseBox::PaintData : nFirstCol is probably invalid !");
                     break;
                 }
             }
@@ -1267,7 +1267,7 @@ void BrowseBox::UpdateScrollbars()
     if ( nTopRow > nRowCount )
     {
         nTopRow = nRowCount - 1;
-        DBG_ERROR("BrowseBox: nTopRow > nRowCount");
+        OSL_FAIL("BrowseBox: nTopRow > nRowCount");
     }
 
     if ( pVScroll->GetThumbPos() != nTopRow )
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 9561fc533f76..cad6edab0ba4 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.cxx
@@ -550,12 +550,12 @@ void SvtAccessibilityOptions::Commit()
 
 sal_Bool SvtAccessibilityOptions::GetIsForDrawings() const
 {
-    DBG_ERROR( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
+    OSL_FAIL( "SvtAccessibilityOptions::GetIsForDrawings: is obsolete!" );
     return sal_False;
 }
 sal_Bool SvtAccessibilityOptions::GetIsForBorders() const
 {
-    DBG_ERROR( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
+    OSL_FAIL( "SvtAccessibilityOptions::GetIsForBorders: is obsolete!" );
     return sal_False;
 }
 sal_Bool SvtAccessibilityOptions::GetAutoDetectSystemHC() const
diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 2032d0a49afd..fb3f11060adf 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.cxx
@@ -2221,7 +2221,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcBmpRect( SvxIconChoiceCtrlEntry* pEntry, c
             return Rectangle( aPos, aImageSize );
 
         default:
-            DBG_ERROR("IconView: Viewmode not set");
+            OSL_FAIL("IconView: Viewmode not set");
             return aBound;
     }
 }
@@ -3784,7 +3784,7 @@ SvxIconChoiceCtrlEntry* SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry( ULONG& rP
             pEntry = pEntry->pflink;
             if( nCount && pEntry == pHead )
             {
-                DBG_ERROR("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!");
+                OSL_FAIL("SvxIconChoiceCtrl_Impl::GetFirstSelectedEntry > Endlosschleife!");
                 return 0;
             }
         }
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 793128ffe59e..3ad775fd071f 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.cxx
@@ -1310,7 +1310,7 @@ void SvImpIconView::PaintResizeRect( const Rectangle& rRect )
 
 void SvImpIconView::RepaintSelectionItems()
 {
-    DBG_ERROR("RepaintSelectionItems");
+    OSL_FAIL("RepaintSelectionItems");
     pView->Invalidate(); // vorlaeufig
 }
 
diff --git a/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index c2d552b27b7d..67b20b3108c5 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.cxx
@@ -1172,7 +1172,7 @@ SvLBox* SvLBox::GetTargetView() const
 void SvLBox::RequestingChilds( SvLBoxEntry*  )
 {
     DBG_CHKTHIS(SvLBox,0);
-    DBG_ERROR("Child-Request-Hdl not implemented!");
+    OSL_FAIL("Child-Request-Hdl not implemented!");
 }
 
 void SvLBox::RecalcViewData()
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index fb4510467c14..7bb25e9c065e 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -810,7 +810,7 @@ ULONG SvTreeList::GetVisibleCount( const SvListView* pView ) const
 #ifdef DBG_UTIL
     if( nPos > 10000000 )
     {
-        DBG_ERROR("nVisibleCount bad");
+        OSL_FAIL("nVisibleCount bad");
     }
 #endif
     ((SvListView*)pView)->nVisibleCount = nPos;
@@ -1310,7 +1310,7 @@ BOOL SvTreeList::Remove( SvListEntry* pEntry )
 
     if( !pEntry->pParent )
     {
-        DBG_ERROR("Removing entry not in model!");
+        OSL_FAIL("Removing entry not in model!");
         // unter gewissen Umstaenden (welche?) loescht der
         // Explorer aus der View Eintraege, die er nicht in die View
         // eingefuegt hat. Da sich der Kunde fuer ein platzendes
@@ -1800,7 +1800,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry )
 #ifdef DBG_UTIL
         if( nVisibleCount < nVisibleRemoved )
         {
-            DBG_ERROR("nVisibleRemoved bad");
+            OSL_FAIL("nVisibleRemoved bad");
         }
 #endif
         nVisibleCount -= nVisibleRemoved;
@@ -1878,7 +1878,7 @@ void SvListView::ModelNotification( USHORT nActionId, SvListEntry* pEntry1,
         case LISTACTION_RESORTING:
             break;
         default:
-            DBG_ERROR("unknown ActionId");
+            OSL_FAIL("unknown ActionId");
     }
 }
 
diff --git a/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 83fc04030ea6..8cfe2c97f5ac 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.cxx
@@ -89,7 +89,7 @@ void FileControl::ImplBrowseFile( )
     }
     catch( const Exception& )
     {
-        DBG_ERROR( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" );
+        OSL_FAIL( "FileControl::ImplBrowseFile: caught an exception while executing the file picker!" );
     }
 }
 
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index f2076a38e842..9900bfe52f09 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -1293,7 +1293,7 @@ void DoubleCurrencyField::FormatChanged(FORMAT_CHANGE_TYPE nWhat)
             UpdateCurrencyFormat();
             break;
         case FCT_KEYONLY:
-            DBG_ERROR("DoubleCurrencyField::FormatChanged : somebody modified my key !");
+            OSL_FAIL("DoubleCurrencyField::FormatChanged : somebody modified my key !");
             // We always build our own format from the settings we get via special methods (setCurrencySymbol etc.).
             // Nobody but ourself should modifiy the format key directly !
             break;
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 4a298ac9ed36..a427f6bcf4b3 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -264,13 +264,13 @@ public:
     // -------------------------------------------------------------------
     void AssigmentTransientData::setDatasourceName(const ::rtl::OUString&)
     {
-        DBG_ERROR( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" );
+        OSL_FAIL( "AssigmentTransientData::setDatasourceName: cannot be implemented for transient data!" );
     }
 
     // -------------------------------------------------------------------
     void AssigmentTransientData::setCommand(const ::rtl::OUString&)
     {
-        DBG_ERROR( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" );
+        OSL_FAIL( "AssigmentTransientData::setCommand: cannot be implemented for transient data!" );
     }
 
     // ===================================================================
@@ -818,7 +818,7 @@ void AssignmentPersistentData::Commit()
         }
         catch(Exception&)
         {
-            DBG_ERROR("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!");
+            OSL_FAIL("AddressBookSourceDialog::initializeDatasources: caught an exception while asking for the data source names!");
         }
         const ::rtl::OUString* pDatasourceNames = aDatasourceNames.getConstArray();
         const ::rtl::OUString* pEnd = pDatasourceNames + aDatasourceNames.getLength();
@@ -904,7 +904,7 @@ void AssignmentPersistentData::Commit()
         catch(SQLException& e) { aException <<= e; }
         catch(Exception&)
         {
-            DBG_ERROR("AddressBookSourceDialog::resetTables: could not retrieve the table!");
+            OSL_FAIL("AddressBookSourceDialog::resetTables: could not retrieve the table!");
         }
 
         if (aException.hasValue())
@@ -964,7 +964,7 @@ void AssignmentPersistentData::Commit()
         }
         catch(Exception&)
         {
-            DBG_ERROR("AddressBookSourceDialog::resetFields: could not retrieve the table columns!");
+            OSL_FAIL("AddressBookSourceDialog::resetFields: could not retrieve the table columns!");
         }
 
 
@@ -1263,7 +1263,7 @@ void AssignmentPersistentData::Commit()
         }
         catch(Exception&)
         {
-            DBG_ERROR("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!");
+            OSL_FAIL("AddressBookSourceDialog::OnAdministrateDatasources: an error occurred while executing the administration dialog!");
         }
 
         // re-fill the data source list
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
index 3d0df16fe056..d24e7226d2bf 100644
--- a/svtools/source/dialogs/propctrl.cxx
+++ b/svtools/source/dialogs/propctrl.cxx
@@ -196,7 +196,7 @@ void PropertyEditorControler_Impl::setObject( XPropertyEditorRef xEditor_, const
         XIdlClassRef xPropClass = rProp.Type;
         if( !xPropClass.is() )
         {
-            DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+            OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
             return;
         }
         TypeClass eType = xPropClass->getTypeClass();
@@ -293,7 +293,7 @@ void PropertyEditorControler_Impl::Clicked
     XIdlClassRef xPropClass = rProp.Type;
     if( !xPropClass.is() )
     {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+        OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
         return;
     }
     TypeClass eType = xPropClass->getTypeClass();
@@ -315,7 +315,7 @@ void PropertyEditorControler_Impl::Commit
     XIdlClassRef xPropClass = rProp.Type;
     if( !xPropClass.is() )
     {
-        DBG_ERROR( "PropertyEditorControler_Impl::Commit(), Property without type" )
+        OSL_FAIL( "PropertyEditorControler_Impl::Commit(), Property without type" )
         return;
     }
     TypeClass eType = xPropClass->getTypeClass();
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 9068b493df9d..d652a1a8a294 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -522,7 +522,7 @@ namespace svt
             WizardState nNextState = determineNextState( nCurrentState );
             if ( WZS_INVALID_STATE == nNextState )
             {
-                DBG_ERROR( "OWizardMachine::skipUntil: the given target state does not exist!" );
+                OSL_FAIL( "OWizardMachine::skipUntil: the given target state does not exist!" );
                 return sal_False;
             }
 
@@ -538,7 +538,7 @@ namespace svt
         {
             // argh! prepareLeaveCurrentPage succeeded, determineNextState succeeded,
             // but ShowPage doesn't? Somebody behaves very strange here ....
-            DBG_ERROR( "OWizardMachine::skipUntil: very unpolite ...." );
+            OSL_FAIL( "OWizardMachine::skipUntil: very unpolite ...." );
             m_pImpl->aStateHistory = aOldStateHistory;
             return sal_False;
         }
@@ -574,7 +574,7 @@ namespace svt
         {
             // TODO: this leaves us in a state where we have no current page and an inconsistent state history.
             // Perhaps we should rollback the skipping here ....
-            DBG_ERROR("OWizardMachine::skip: very unpolite ....");
+            OSL_FAIL("OWizardMachine::skip: very unpolite ....");
                 // if somebody does a skip and then does not allow to leave ...
                 // (can't be a commit error, as we've already committed the current page. So if ShowPage fails here,
                 // somebody behaves really strange ...)
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 6197ccb81949..de1e30d8f647 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -590,7 +590,7 @@ void WizardDialog::RemovePage( TabPage* pPage )
         pPageData = pPageData->mpNext;
     }
 
-    DBG_ERROR( "WizardDialog::RemovePage() - Page not in list" );
+    OSL_FAIL( "WizardDialog::RemovePage() - Page not in list" );
 }
 
 // -----------------------------------------------------------------------
@@ -676,7 +676,7 @@ void WizardDialog::RemoveButton( Button* pButton )
         pBtnData = pBtnData->mpNext;
     }
 
-    DBG_ERROR( "WizardDialog::RemoveButton() - Button not in list" );
+    OSL_FAIL( "WizardDialog::RemoveButton() - Button not in list" );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index f98e8c7cdc80..18301a181fae 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.cxx
@@ -112,7 +112,7 @@ USHORT TETextPortionList::FindPortion( USHORT nCharPos, USHORT& nPortionStart, B
             }
         }
     }
-    DBG_ERROR( "FindPortion: Nicht gefunden!" );
+    OSL_FAIL( "FindPortion: Nicht gefunden!" );
     return ( Count() - 1 );
 }
 
diff --git a/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index b437943a96bb..59072e2e1d9f 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.cxx
@@ -241,7 +241,7 @@ BOOL TextCharAttribList::DbgCheckAttribs()
         if ( pAttr->GetStart() > pAttr->GetEnd() )
         {
             bOK = FALSE;
-            DBG_ERROR( "Attr verdreht" );
+            OSL_FAIL( "Attr verdreht" );
         }
     }
     return bOK;
@@ -553,7 +553,7 @@ String TextDoc::GetText( const sal_Unicode* pSep ) const
 
     if ( nLen > STRING_MAXLEN )
     {
-        DBG_ERROR( "Text zu gross fuer String" );
+        OSL_FAIL( "Text zu gross fuer String" );
         return String();
     }
 
@@ -679,13 +679,13 @@ BOOL TextDoc::IsValidPaM( const TextPaM& rPaM )
 {
     if ( rPaM.GetPara() >= maTextNodes.Count() )
     {
-        DBG_ERROR( "PaM: Para out of range" );
+        OSL_FAIL( "PaM: Para out of range" );
         return FALSE;
     }
     TextNode * pNode = maTextNodes.GetObject( rPaM.GetPara() );
     if ( rPaM.GetIndex() > pNode->GetText().Len() )
     {
-        DBG_ERROR( "PaM: Index out of range" );
+        OSL_FAIL( "PaM: Index out of range" );
         return FALSE;
     }
     return TRUE;
diff --git a/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 1e9a6b996bc4..45d23bcdbee9 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.cxx
@@ -2251,7 +2251,7 @@ void TextEngine::ImpPaint( OutputDevice* pOutDev, const Point& rStartPos, Rectan
 #endif
                                 }
                                 break;
-                                default:    DBG_ERROR( "ImpPaint: Unknown Portion-Type !" );
+                                default:    OSL_FAIL( "ImpPaint: Unknown Portion-Type !" );
                             }
                         }
 
diff --git a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index ee788458e609..8ad858a1d877 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
@@ -161,7 +161,7 @@ void FilterConfigItem::ImpInitTree( const String& rSubTree )
             }
             catch ( ::com::sun::star::uno::Exception& )
             {
-                DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" );
+                OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not access configuration Key" );
             }
         }
     }
@@ -202,7 +202,7 @@ FilterConfigItem::~FilterConfigItem()
                 }
                 catch ( ::com::sun::star::uno::Exception& )
                 {
-                    DBG_ERROR( "FilterConfigItem::FilterConfigItem - Could not update configuration data" );
+                    OSL_FAIL( "FilterConfigItem::FilterConfigItem - Could not update configuration data" );
                 }
             }
         }
@@ -365,7 +365,7 @@ Size FilterConfigItem::ReadSize( const OUString& rKey, const Size& rDefault )
     }
     catch ( ::com::sun::star::uno::Exception& )
     {
-        DBG_ERROR( "FilterConfigItem::ReadSize - could not read PropertyValue" );
+        OSL_FAIL( "FilterConfigItem::ReadSize - could not read PropertyValue" );
     }
     PropertyValue aWidth;
     aWidth.Name = sWidth;
@@ -442,7 +442,7 @@ void FilterConfigItem::WriteBool( const OUString& rKey, sal_Bool bNewValue )
                     }
                     catch ( ::com::sun::star::uno::Exception& )
                     {
-                        DBG_ERROR( "FilterConfigItem::WriteBool - could not set PropertyValue" );
+                        OSL_FAIL( "FilterConfigItem::WriteBool - could not set PropertyValue" );
                     }
                 }
             }
@@ -476,7 +476,7 @@ void FilterConfigItem::WriteInt32( const OUString& rKey, sal_Int32 nNewValue )
                     }
                     catch ( ::com::sun::star::uno::Exception& )
                     {
-                        DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
+                        OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
                     }
                 }
             }
@@ -528,7 +528,7 @@ void FilterConfigItem::WriteSize( const OUString& rKey, const Size& rNewValue )
             }
             catch ( ::com::sun::star::uno::Exception& )
             {
-                DBG_ERROR( "FilterConfigItem::WriteSize - could not read PropertyValue" );
+                OSL_FAIL( "FilterConfigItem::WriteSize - could not read PropertyValue" );
             }
         }
     }
@@ -560,7 +560,7 @@ void FilterConfigItem::WriteString( const OUString& rKey, const OUString& rNewVa
                     }
                     catch ( ::com::sun::star::uno::Exception& )
                     {
-                        DBG_ERROR( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
+                        OSL_FAIL( "FilterConfigItem::WriteInt32 - could not set PropertyValue" );
                     }
                 }
             }
@@ -588,7 +588,7 @@ void FilterConfigItem::WriteAny( const OUString& rKey, const Any& rNewAny )
                 }
                 catch ( com::sun::star::uno::Exception& )
                 {
-                    DBG_ERROR( "FilterConfigItem::WriteAny - could not set PropertyValue" );
+                    OSL_FAIL( "FilterConfigItem::WriteAny - could not set PropertyValue" );
 
                 }
             }
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index 430a232724c7..259f518fbf95 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.cxx
@@ -179,7 +179,7 @@ SvStream& operator>>( SvStream& rIn, XForm& rXForm )
 {
     if ( sizeof( float ) != 4 )
     {
-        DBG_ERROR( "EnhWMFReader::sizeof( float ) != 4" );
+        OSL_FAIL( "EnhWMFReader::sizeof( float ) != 4" );
         rXForm = XForm();
     }
     else
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index f86dfe30361b..4e52fb4d548c 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.cxx
@@ -816,7 +816,7 @@ void WinMtfOutput::CreateObject( INT32 nIndex, GDIObjectType eType, void* pStyle
             break;
 
             default:
-                DBG_ERROR( "unsupported style not deleted" );
+                OSL_FAIL( "unsupported style not deleted" );
                 break;
         }
     }
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index b842987e899b..a068ad3eb3da 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.hxx
@@ -527,7 +527,7 @@ struct GDIObj
                 break;
 
                 default:
-                    DBG_ERROR( "unsupported style deleted" );
+                    OSL_FAIL( "unsupported style deleted" );
                     break;
             }
             pStyle = NULL;
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 7e1d67d7c2df..5214918b9870 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.cxx
@@ -1743,7 +1743,7 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
                 case META_MASKSCALE_ACTION:
                 case META_MASKSCALEPART_ACTION:
                 {
-                    DBG_ERROR( "Unsupported action: MetaMask...Action!" );
+                    OSL_FAIL( "Unsupported action: MetaMask...Action!" );
                 }
                 break;
 
@@ -1752,13 +1752,13 @@ void WMFWriter::WriteRecords( const GDIMetaFile & rMTF )
 
                 case META_ISECTREGIONCLIPREGION_ACTION:
                 {
-                    DBG_ERROR( "Unsupported action: MetaISectRegionClipRegionAction!" );
+                    OSL_FAIL( "Unsupported action: MetaISectRegionClipRegionAction!" );
                 }
                 break;
 
                 case META_MOVECLIPREGION_ACTION:
                 {
-                    DBG_ERROR( "Unsupported action: MetaMoveClipRegionAction!" );
+                    OSL_FAIL( "Unsupported action: MetaMoveClipRegionAction!" );
                 }
                 break;
           }
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index 9414b19a5d92..129ea5b5721e 100644
--- a/svtools/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.cxx
@@ -512,7 +512,7 @@ ULONG GraphicDisplayCacheEntry::GetNeededSize( OutputDevice* pOut, const Point&
         }
         else
         {
-             DBG_ERROR( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" );
+             OSL_FAIL( "GraphicDisplayCacheEntry::GetNeededSize(): pOut->GetBitCount() == 0" );
             nNeededSize = 256000;
         }
     }
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 629d3202d962..51aada3e5cc5 100644
--- a/svtools/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.cxx
@@ -1806,7 +1806,7 @@ void GraphicManager::ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, UL
 
     if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() )
     {
-        DBG_ERROR( "Missing implementation: Mtf-Transparency" );
+        OSL_FAIL( "Missing implementation: Mtf-Transparency" );
     }
 }
 
@@ -1854,12 +1854,12 @@ void GraphicManager::ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr
 
     if( ( nAdjustmentFlags & ADJUSTMENT_ROTATE ) && aAttr.IsRotated() )
     {
-        DBG_ERROR( "Missing implementation: Animation-Rotation" );
+        OSL_FAIL( "Missing implementation: Animation-Rotation" );
     }
 
     if( ( nAdjustmentFlags & ADJUSTMENT_TRANSPARENCY ) && aAttr.IsTransparent() )
     {
-        DBG_ERROR( "Missing implementation: Animation-Transparency" );
+        OSL_FAIL( "Missing implementation: Animation-Transparency" );
     }
 }
 
diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx
index 4d73588ec51c..ab51d32bd64e 100644
--- a/svtools/source/misc/chartprettypainter.cxx
+++ b/svtools/source/misc/chartprettypainter.cxx
@@ -134,7 +134,7 @@ bool ChartPrettyPainter::DoPrettyPaintChart( uno::Reference< frame::XModel > xCh
     catch( uno::Exception& e )
     {
         (void)e;
-        DBG_ERROR( "Chart cannot be painted pretty!" );
+        OSL_FAIL( "Chart cannot be painted pretty!" );
     }
     return false;
 }
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 34886a78915f..1ae633cad254 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -428,7 +428,7 @@ void EmbeddedObjectRef::GetReplacement( BOOL bUpdate )
     }
     else
     {
-        DBG_ERROR("No update, but replacement exists already!");
+        OSL_FAIL("No update, but replacement exists already!");
         return;
     }
 
diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 20da20142c6f..1543d2b5e076 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.cxx
@@ -263,7 +263,7 @@ namespace svt
         {
             if ( !_rLHS.is() || !_rRHS.is() )
             {
-                DBG_ERROR( "TemplateContentEqual::operator(): invalid contents!" );
+                OSL_FAIL( "TemplateContentEqual::operator(): invalid contents!" );
                 return true;
                     // this is not strictly true, in case only one is invalid - but this is a heavy error anyway
             }
@@ -691,7 +691,7 @@ namespace svt
         }
         catch( const Exception& )
         {
-            DBG_ERROR( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" );
+            OSL_FAIL( "TemplateFolderCacheImpl::implReadFolder: caught an exception!" );
             return sal_False;
         }
         return sal_True;
@@ -788,7 +788,7 @@ namespace svt
         INetURLObject aStorageURL( sStorageURL );
         if ( INET_PROT_NOT_VALID == aStorageURL.GetProtocol() )
         {
-            DBG_ERROR( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" );
+            OSL_FAIL( "TemplateFolderCacheImpl::openCacheStream: invalid storage path!" );
             return sal_False;
         }
 
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 5dbc443708b2..8743058f39cf 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -634,7 +634,7 @@ void TransferableHelper::ImplFlush()
         }
         catch( const ::com::sun::star::uno::Exception& )
         {
-            DBG_ERROR( "Could not flush clipboard" );
+            OSL_FAIL( "Could not flush clipboard" );
         }
 
         Application::AcquireSolarMutex( nRef );
@@ -1038,7 +1038,7 @@ sal_Bool TransferableHelper::SetInterface( const ::com::sun::star::uno::Referenc
 
 sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& )
 {
-    DBG_ERROR( "TransferableHelper::WriteObject( ... ) not implemented" );
+    OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" );
     return sal_False;
 }
 
diff --git a/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index 3e3ba5f64d52..07dcb095535a 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.cxx
@@ -133,7 +133,7 @@ namespace svt
 #ifdef DBG_UTIL
             else
             {
-                DBG_ERROR( "RegistrationDialog::Execute: invalid dialog state!" );
+                OSL_FAIL( "RegistrationDialog::Execute: invalid dialog state!" );
             }
 #endif
         }
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 8714d2c96f3d..a02dd9a2a50d 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -137,13 +137,13 @@ namespace svt { namespace table
         }
         virtual PColumnModel        getColumnModel( ColPos column )
         {
-            DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" );
+            OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" );
             (void)column;
             return PColumnModel();
         }
         virtual PColumnModel        getColumnModelByID( ColumnID id )
         {
-            DBG_ERROR( "EmptyTableModel::getColumnModel: invalid call!" );
+            OSL_FAIL( "EmptyTableModel::getColumnModel: invalid call!" );
             (void)id;
             return PColumnModel();
         }
@@ -1517,7 +1517,7 @@ namespace svt { namespace table
     }
         break;
         default:
-            DBG_ERROR( "TableControl_Impl::dispatchAction: unsupported action!" );
+            OSL_FAIL( "TableControl_Impl::dispatchAction: unsupported action!" );
         }
         return bSuccess;
     }
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index 6be5a1962d96..26084690c137 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -290,7 +290,7 @@ using namespace ::com::sun::star::uno;
     {
         (void) listener;
         // TODO
-        DBG_ERROR( "DefaultTableModel::addTableModelListener: not yet implemented!" );
+        OSL_FAIL( "DefaultTableModel::addTableModelListener: not yet implemented!" );
     }
 
     //--------------------------------------------------------------------
@@ -298,7 +298,7 @@ using namespace ::com::sun::star::uno;
     {
         (void)listener;
         // TODO
-        DBG_ERROR( "DefaultTableModel::removeTableModelListener: not yet implemented!" );
+        OSL_FAIL( "DefaultTableModel::removeTableModelListener: not yet implemented!" );
     }
 
     //--------------------------------------------------------------------
@@ -319,7 +319,7 @@ using namespace ::com::sun::star::uno;
     {
         (void)id;
         // TODO
-        DBG_ERROR( "DefaultTableModel::getColumnModelByID: not yet implemented!" );
+        OSL_FAIL( "DefaultTableModel::getColumnModelByID: not yet implemented!" );
         return PColumnModel();
     }
 
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index a990acf11fbd..7ae5fab30b7c 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -282,7 +282,7 @@ void SvBaseEventDescriptor::getAnyFromMacro(Any& rAny,
                         }
             case JAVASCRIPT:
             default:
-                DBG_ERROR("not implemented");
+                OSL_FAIL("not implemented");
         }
     }
     // else: bRetValueOK not set
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 33a0d671aae7..dc74dc3ea8ff 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -440,7 +440,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
                 case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN:           meLineEndType = LINEEND_CR; break;
                 case ::com::sun::star::awt::LineEndFormat::LINE_FEED:                 meLineEndType = LINEEND_LF; break;
                 case ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED: meLineEndType = LINEEND_CRLF; break;
-                default: DBG_ERROR( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break;
+                default: OSL_FAIL( "VCLXMultiLineEdit::setProperty: invalid line end value!" ); break;
                 }
             }
             break;
@@ -496,7 +496,7 @@ void VCLXMultiLineEdit::setProperty( const ::rtl::OUString& PropertyName, const
                 case LINEEND_CR:   nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN; break;
                 case LINEEND_LF:   nLineEndType = ::com::sun::star::awt::LineEndFormat::LINE_FEED; break;
                 case LINEEND_CRLF: nLineEndType = ::com::sun::star::awt::LineEndFormat::CARRIAGE_RETURN_LINE_FEED; break;
-                default: DBG_ERROR( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break;
+                default: OSL_FAIL( "VCLXMultiLineEdit::getProperty: invalid line end value!" ); break;
                 }
                 aProp <<= nLineEndType;
             }
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 3d10bb97167c..37fcc45f20f9 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -492,7 +492,7 @@ void SvUnoImageMapObject::_setPropertyValues( const PropertyMapEntry** ppEntries
             bOk = *pValues >>= maPolygon;
             break;
         default:
-            DBG_ERROR( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" );
+            OSL_FAIL( "SvUnoImageMapObject::_setPropertyValues: unexpected property handle" );
             break;
         }
 
@@ -542,7 +542,7 @@ void SvUnoImageMapObject::_getPropertyValues( const PropertyMapEntry** ppEntries
             *pValues <<= maPolygon;
             break;
         default:
-            DBG_ERROR( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" );
+            OSL_FAIL( "SvUnoImageMapObject::_getPropertyValues: unexpected property handle" );
             break;
         }