Move DBG_ERROR to OSL_FAIL

36 files changed, 120 insertions, 120 deletions

diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index d8de0a7c9..8f57715fe 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -319,7 +319,7 @@ namespace abp
             case AST_EVOLUTION_GROUPWISE:
             case AST_EVOLUTION_LDAP     : pGuess = "Personal"; break;
             default:
-                DBG_ERROR( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
+                OSL_FAIL( "OAddessBookSourcePilot::implDefaultTableName: unhandled case!" );
                 return;
         }
         const ::rtl::OUString sGuess = ::rtl::OUString::createFromAscii( pGuess );
@@ -398,7 +398,7 @@ namespace abp
                 break;
 
             case AST_INVALID:
-                DBG_ERROR( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
+                OSL_FAIL( "OAddessBookSourcePilot::implCreateDataSource: illegal data source type!" );
                 break;
         }
         m_eNewDataSourceType = m_aSettings.eType;
@@ -437,7 +437,7 @@ namespace abp
                 return new FinalPage( this );
 
             default:
-                DBG_ERROR("OAddessBookSourcePilot::createPage: invalid state!");
+                OSL_FAIL("OAddessBookSourcePilot::createPage: invalid state!");
                 return NULL;
         }
     }
diff --git a/extensions/source/abpilot/admininvokationimpl.cxx b/extensions/source/abpilot/admininvokationimpl.cxx
index 909bf528b..61ef82dca 100644
--- a/extensions/source/abpilot/admininvokationimpl.cxx
+++ b/extensions/source/abpilot/admininvokationimpl.cxx
@@ -123,7 +123,7 @@ namespace abp
         }
         catch(const Exception&)
         {
-            DBG_ERROR("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!");
+            OSL_FAIL("OAdminDialogInvokation::invokeAdministration: caught an exception while executing the dialog!");
         }
         return sal_False;
     }
diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx
index 18108bf67..b65635bb6 100644
--- a/extensions/source/abpilot/datasourcehandling.cxx
+++ b/extensions/source/abpilot/datasourcehandling.cxx
@@ -145,7 +145,7 @@ namespace abp
         }
         catch(const Exception&)
         {
-            DBG_ERROR( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" );
+            OSL_FAIL( "lcl_implCreateAndSetURL: caught an exception while creating the data source!" );
         }
 
         return aReturn;
@@ -217,7 +217,7 @@ namespace abp
         }
         catch( const Exception& )
         {
-            DBG_ERROR( "ODataSourceContext::ODataSourceContext: caught an exception!" );
+            OSL_FAIL( "ODataSourceContext::ODataSourceContext: caught an exception!" );
         }
     }
 
@@ -395,7 +395,7 @@ namespace abp
         }
         catch(const Exception&)
         {
-            DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
+            OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
         }
     }
     //---------------------------------------------------------------------
@@ -412,7 +412,7 @@ namespace abp
         }
         catch(const Exception&)
         {
-            DBG_ERROR( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
+            OSL_FAIL( "ODataSource::registerDataSource: caught an exception while creating the data source!" );
         }
     }
 
@@ -444,7 +444,7 @@ namespace abp
         }
         catch(const Exception&)
         {
-            DBG_ERROR( "ODataSource::remove: caught an exception while creating the data source!" );
+            OSL_FAIL( "ODataSource::remove: caught an exception while creating the data source!" );
         }
     }
 
@@ -483,7 +483,7 @@ namespace abp
         m_pImpl->aTables.clear();
         if ( !isConnected() )
         {
-            DBG_ERROR( "ODataSource::getTableNames: not connected!" );
+            OSL_FAIL( "ODataSource::getTableNames: not connected!" );
         }
         else
         {
@@ -564,7 +564,7 @@ namespace abp
         catch( const SQLException& e ) { aError <<= e; }
         catch( const Exception& )
         {
-            DBG_ERROR( "ODataSource::connect: caught a generic exception!" );
+            OSL_FAIL( "ODataSource::connect: caught a generic exception!" );
         }
 
         // ................................................................
@@ -593,7 +593,7 @@ namespace abp
             }
             catch( const Exception& )
             {
-                DBG_ERROR( "ODataSource::connect: caught an exception while trying to display the error!" );
+                OSL_FAIL( "ODataSource::connect: caught an exception while trying to display the error!" );
             }
         }
 
diff --git a/extensions/source/abpilot/fieldmappingimpl.cxx b/extensions/source/abpilot/fieldmappingimpl.cxx
index 2e17fb58c..f5c64323f 100644
--- a/extensions/source/abpilot/fieldmappingimpl.cxx
+++ b/extensions/source/abpilot/fieldmappingimpl.cxx
@@ -148,7 +148,7 @@ namespace abp
             }
             catch(const Exception&)
             {
-                DBG_ERROR("fieldmapping::invokeDialog: caught an exception while executing the dialog!");
+                OSL_FAIL("fieldmapping::invokeDialog: caught an exception while executing the dialog!");
             }
             return sal_False;
         }
@@ -228,20 +228,20 @@ namespace abp
                         aDriverFieldAliasing.getNodeValue( sDriverProgrammatic ) >>= sDriverUI;
                         if ( 0 == sDriverUI.getLength() )
                         {
-                            DBG_ERROR( "fieldmapping::defaultMapping: invalid driver UI column name!");
+                            OSL_FAIL( "fieldmapping::defaultMapping: invalid driver UI column name!");
                         }
                         else
                             _rFieldAssignment[ sAddressProgrammatic ] = sDriverUI;
                     }
                     else
                     {
-                        DBG_ERROR( "fieldmapping::defaultMapping: invalid driver programmatic name!" );
+                        OSL_FAIL( "fieldmapping::defaultMapping: invalid driver programmatic name!" );
                     }
                 }
             }
             catch( const Exception& )
             {
-                DBG_ERROR("fieldmapping::defaultMapping: code is assumed to throw no exceptions!");
+                OSL_FAIL("fieldmapping::defaultMapping: code is assumed to throw no exceptions!");
                     // the config nodes we're using herein should not do this ....
             }
         }
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 1b3ef90e5..d85cbe145 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -121,7 +121,7 @@ Reference< XConnection > getConnection(const ::rtl::OUString& _rURL)
         catch(Exception eEx)
         {
             (void) eEx;	// make compiler happy
-            DBG_ERROR("Exception caught in ODatabaseContext::getRegisteredObject()");
+            OSL_FAIL("Exception caught in ODatabaseContext::getRegisteredObject()");
         }
     }
     // build the connection from the data source
@@ -170,7 +170,7 @@ Reference< XConnection >	getConnection(const Reference< XInterface > & xRowSet)
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("exception in getConnection");
+        OSL_FAIL("exception in getConnection");
     }
 
     return xConn;
@@ -629,7 +629,7 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(Window* pParent, BibDataManager* pMan )
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
+        OSL_FAIL("Exception in BibDataManager::DBChangeDialog_Impl::DBChangeDialog_Impl");
     }
 
 
@@ -861,7 +861,7 @@ void BibDataManager::InsertFields(const Reference< XFormComponent > & _rxGrid)
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("Exception in BibDataManager::InsertFields");
+        OSL_FAIL("Exception in BibDataManager::InsertFields");
     }
 }
 /* --------------------------------------------------
@@ -897,7 +897,7 @@ Reference< awt::XControlModel >	BibDataManager::updateGridModel(const Reference<
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::updateGridModel: something went wrong !");
+        OSL_FAIL("::updateGridModel: something went wrong !");
     }
 
 
@@ -983,7 +983,7 @@ Reference< XForm >	BibDataManager::createDatabaseForm(BibDBDescriptor& rDesc)
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::createDatabaseForm: something went wrong !");
+        OSL_FAIL("::createDatabaseForm: something went wrong !");
     }
 
 
@@ -1006,7 +1006,7 @@ Sequence< ::rtl::OUString > BibDataManager::getDataSources()
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::getDataSources: something went wrong !");
+        OSL_FAIL("::getDataSources: something went wrong !");
     }
 
 
@@ -1248,7 +1248,7 @@ void BibDataManager::setActiveDataTable(const ::rtl::OUString& rTable)
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::setActiveDataTable: something went wrong !");
+        OSL_FAIL("::setActiveDataTable: something went wrong !");
     }
 
 }
@@ -1381,7 +1381,7 @@ Reference< awt::XControlModel >	BibDataManager::createGridModel(const ::rtl::OUS
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::createGridModel: something went wrong !");
+        OSL_FAIL("::createGridModel: something went wrong !");
     }
 
 
@@ -1503,7 +1503,7 @@ Reference< awt::XControlModel >	BibDataManager::loadControlModel(
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::loadControlModel: something went wrong !");
+        OSL_FAIL("::loadControlModel: something went wrong !");
     }
     return xModel;
 }
@@ -1543,7 +1543,7 @@ void BibDataManager::propertyChange(const beans::PropertyChangeEvent& evt) throw
     catch(Exception& e )
     {
         (void) e;	// make compiler happy
-        DBG_ERROR("::propertyChange: something went wrong !");
+        OSL_FAIL("::propertyChange: something went wrong !");
     }
 
 
@@ -1588,7 +1588,7 @@ try
 catch(Exception& e )
 {
     (void) e;	// make compiler happy
-    DBG_ERROR("Exception in BibDataManager::SetMeAsUidListener");
+    OSL_FAIL("Exception in BibDataManager::SetMeAsUidListener");
 }
 
 
@@ -1634,7 +1634,7 @@ try
 catch(Exception& e )
 {
     (void) e;	// make compiler happy
-    DBG_ERROR("Exception in BibDataManager::RemoveMeAsUidListener");
+    OSL_FAIL("Exception in BibDataManager::RemoveMeAsUidListener");
 }
 
 
diff --git a/extensions/source/bibliography/formcontrolcontainer.cxx b/extensions/source/bibliography/formcontrolcontainer.cxx
index 8794a5b19..c41007186 100644
--- a/extensions/source/bibliography/formcontrolcontainer.cxx
+++ b/extensions/source/bibliography/formcontrolcontainer.cxx
@@ -120,7 +120,7 @@ namespace bib
         catch( const Exception& e)
         {
             (void) e;	// make compiler happy
-            DBG_ERROR( "FormControlContainer::implSetDesignMode: caught an exception!" );
+            OSL_FAIL( "FormControlContainer::implSetDesignMode: caught an exception!" );
         }
     }
 
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index b50947915..4008c497a 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -410,7 +410,7 @@ sal_Bool BibFrameController_Impl::SaveModified(const Reference< form::runtime::X
         }
         catch(Exception&)
         {
-            DBG_ERROR("SaveModified: Exception occurred!");
+            OSL_FAIL("SaveModified: Exception occurred!");
         }
     }
     return bResult;
@@ -464,7 +464,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                 }
                 catch(const Exception&)
                 {
-                    DBG_ERROR("Exception catched while changing the data source");
+                    OSL_FAIL("Exception catched while changing the data source");
                 }
             }
         }
@@ -554,7 +554,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
             }
             catch( const uno::Exception& )
             {
-                DBG_ERROR( "BibFrameController_Impl::dispatch: caught an exception!" );
+                OSL_FAIL( "BibFrameController_Impl::dispatch: caught an exception!" );
             }
 
             sal_uInt16 nCount = aStatusListeners.Count();
@@ -598,7 +598,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                 }
                 catch(Exception&)
                 {
-                    DBG_ERROR("Exception in last() or moveToInsertRow()");
+                    OSL_FAIL("Exception in last() or moveToInsertRow()");
                 }
             }
         }
@@ -658,7 +658,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
                         }
                         catch(Exception&)
                         {
-                            DBG_ERROR("DeleteRecord : exception caught !");
+                            OSL_FAIL("DeleteRecord : exception caught !");
                         }
                     }
                 }
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index ed3cca3cc..6edb64c8b 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -183,7 +183,7 @@ void BibPosListener::cursorMoved(const lang::EventObject& /*aEvent*/) throw( uno
     catch(Exception& rEx)
     {
         (void) rEx;	// make compiler happy
-        DBG_ERROR("BibPosListener::positioned: something went wrong !");
+        OSL_FAIL("BibPosListener::positioned: something went wrong !");
     }
 }
 
@@ -569,7 +569,7 @@ uno::Reference< awt::XControlModel >  BibGeneralPage::AddXControl(
     catch(Exception& rEx)
     {
         (void) rEx;	// make compiler happy
-        DBG_ERROR("BibGeneralPage::AddXControl: something went wrong !");
+        OSL_FAIL("BibGeneralPage::AddXControl: something went wrong !");
     }
     return xCtrModel;
 }
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 2c1155e7e..7724d6907 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -156,7 +156,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OTableSelectionPage::initializePage: caught an exception!");
+            OSL_FAIL("OTableSelectionPage::initializePage: caught an exception!");
         }
     }
 
@@ -191,7 +191,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OTableSelectionPage::commitPage: caught an exception!");
+            OSL_FAIL("OTableSelectionPage::commitPage: caught an exception!");
         }
 
         return sal_True;
@@ -306,7 +306,7 @@ namespace dbp
                     }
                     else
                     {
-                        DBG_ERROR("OTableSelectionPage::implFillTables: invalid data source object returned by the context");
+                        OSL_FAIL("OTableSelectionPage::implFillTables: invalid data source object returned by the context");
                     }
                 }
             }
@@ -315,7 +315,7 @@ namespace dbp
             catch(SQLException& e) { aSQLException <<= e; }
             catch (Exception&)
             {
-                DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!");
+                OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!");
             }
         }
 
@@ -347,7 +347,7 @@ namespace dbp
             catch(SQLException& e) { aSQLException <<= e; }
             catch (Exception&)
             {
-                DBG_ERROR("OTableSelectionPage::implFillTables: could not fill the table list!");
+                OSL_FAIL("OTableSelectionPage::implFillTables: could not fill the table list!");
             }
         }
 
@@ -388,7 +388,7 @@ namespace dbp
         }
         catch (Exception&)
         {
-            DBG_ERROR("OTableSelectionPage::implCollectDatasource: could not collect the data source names!");
+            OSL_FAIL("OTableSelectionPage::implCollectDatasource: could not collect the data source names!");
         }
     }
 
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index eee8e586c..0e8eeadb6 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -246,7 +246,7 @@ namespace dbp
             }
             catch(const Exception&)
             {
-                DBG_ERROR("OControlWizardPage::initializePage: caught an exception!");
+                OSL_FAIL("OControlWizardPage::initializePage: caught an exception!");
             }
 
             INetURLObject aURL( sDataSource );
@@ -310,7 +310,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::activate: could not obtain the class id!");
+            OSL_FAIL("OControlWizard::activate: could not obtain the class id!");
         }
         if (!approveControl(nClassId))
         {
@@ -434,7 +434,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::implDeterminePage: caught an exception!");
+            OSL_FAIL("OControlWizard::implDeterminePage: caught an exception!");
         }
     }
 
@@ -456,7 +456,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::implGetDSContext: invalid database context!");
+            OSL_FAIL("OControlWizard::implGetDSContext: invalid database context!");
         }
     }
 
@@ -476,7 +476,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            DBG_ERROR("OControlWizard::getFormConnection: caught an exception!");
+            OSL_FAIL("OControlWizard::getFormConnection: caught an exception!");
         }
         return xConn;
     }
@@ -507,7 +507,7 @@ namespace dbp
         }
         catch(const Exception&)
         {
-            DBG_ERROR("OControlWizard::setFormConnection: caught an exception!");
+            OSL_FAIL("OControlWizard::setFormConnection: caught an exception!");
         }
     }
 
@@ -646,7 +646,7 @@ namespace dbp
                     }
                     catch(Exception&)
                     {
-                        DBG_ERROR("OControlWizard::initContext: unexpected exception while gathering column information!");
+                        OSL_FAIL("OControlWizard::initContext: unexpected exception while gathering column information!");
                     }
                     m_aContext.aTypes.insert(OControlWizardContext::TNameTypeMap::value_type(*pBegin,nFieldType));
                 }
@@ -657,7 +657,7 @@ namespace dbp
         catch(SQLException& e) { aSQLException <<= e; }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::initContext: could not retrieve the control context (caught an exception)!");
+            OSL_FAIL("OControlWizard::initContext: could not retrieve the control context (caught an exception)!");
         }
 
         ::comphelper::disposeComponent(xStatement);
@@ -710,7 +710,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::commitControlSettings: could not commit the basic control settings!");
+            OSL_FAIL("OControlWizard::commitControlSettings: could not commit the basic control settings!");
         }
     }
 
@@ -735,7 +735,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OControlWizard::initControlSettings: could not retrieve the basic control settings!");
+            OSL_FAIL("OControlWizard::initControlSettings: could not retrieve the basic control settings!");
         }
     }
 
diff --git a/extensions/source/dbpilots/dbptools.cxx b/extensions/source/dbpilots/dbptools.cxx
index 05d85f5c8..9bd7dd61e 100644
--- a/extensions/source/dbpilots/dbptools.cxx
+++ b/extensions/source/dbpilots/dbptools.cxx
@@ -61,7 +61,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("::dbp::disambiguateName: something went (strangely) wrong!");
+            OSL_FAIL("::dbp::disambiguateName: something went (strangely) wrong!");
         }
     }
 
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 6387c6280..03fd6de88 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -177,7 +177,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!");
+            OSL_FAIL("OGroupBoxWizard::createRadios: caught an exception while creating the radio shapes!");
         }
     }
 
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index fa254c603..7d27faf1d 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -222,7 +222,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OListComboWizard::implApplySettings: could not set the property values for the listbox!");
+            OSL_FAIL("OListComboWizard::implApplySettings: could not set the property values for the listbox!");
         }
     }
 
@@ -353,7 +353,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OContentTableSelection::initializePage: could not retrieve the table names!");
+            OSL_FAIL("OContentTableSelection::initializePage: could not retrieve the table names!");
         }
 
         m_aSelectTable.SelectEntry(getSettings().sListContentTable);
diff --git a/extensions/source/dbpilots/optiongrouplayouter.cxx b/extensions/source/dbpilots/optiongrouplayouter.cxx
index 17200bbaf..16caae4a2 100644
--- a/extensions/source/dbpilots/optiongrouplayouter.cxx
+++ b/extensions/source/dbpilots/optiongrouplayouter.cxx
@@ -78,14 +78,14 @@ namespace dbp
         Reference< XShapes > xPageShapes(_rContext.xDrawPage, UNO_QUERY);
         if (!xPageShapes.is())
         {
-            DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!");
+            OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: missing the XShapes interface for the page!");
             return;
         }
 
         Reference< XMultiServiceFactory > xDocFactory(_rContext.xDocumentModel, UNO_QUERY);
         if (!xDocFactory.is())
         {
-            DBG_ERROR("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!");
+            OSL_FAIL("OOptionGroupLayouter::OOptionGroupLayouter: no document service factory!");
             return;
         }
 
@@ -196,7 +196,7 @@ namespace dbp
         }
         catch(Exception&)
         {
-            DBG_ERROR("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!");
+            OSL_FAIL("OOptionGroupLayouter::doLayout: caught an exception while grouping the shapes!");
         }
     }
 
diff --git a/extensions/source/plugin/aqua/sysplug.cxx b/extensions/source/plugin/aqua/sysplug.cxx
index 96ef2cf85..98ca8414c 100644
--- a/extensions/source/plugin/aqua/sysplug.cxx
+++ b/extensions/source/plugin/aqua/sysplug.cxx
@@ -684,7 +684,7 @@ NPError MacPluginComm::NPP_SetValue( NPP instance, NPNVariable variable, void *s
 //--------------------------------------------------------------------------------------------------
 void * MacPluginComm::NPP_GetJavaClass()
 {
-    DBG_ERROR( "no java class available!" );
+    OSL_FAIL( "no java class available!" );
     return 0;
 }
 
diff --git a/extensions/source/plugin/base/plctrl.cxx b/extensions/source/plugin/base/plctrl.cxx
index cf8607480..44a473ab0 100644
--- a/extensions/source/plugin/base/plctrl.cxx
+++ b/extensions/source/plugin/base/plctrl.cxx
@@ -162,7 +162,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo
 {
     if (_xPeer.is())
     {
-        DBG_ERROR( "### Peer is already set!" );
+        OSL_FAIL( "### Peer is already set!" );
         return;
     }
 
@@ -190,7 +190,7 @@ void PluginControl_Impl::createPeer( const Reference< ::com::sun::star::awt::XTo
     }
     else
     {
-        DBG_ERROR( "### cannot get implementation of parent peer!" );
+        OSL_FAIL( "### cannot get implementation of parent peer!" );
     }
 
     getMultiplexer()->setPeer( _xPeerWindow );
diff --git a/extensions/source/plugin/win/sysplug.cxx b/extensions/source/plugin/win/sysplug.cxx
index f527645b1..d5b49340e 100644
--- a/extensions/source/plugin/win/sysplug.cxx
+++ b/extensions/source/plugin/win/sysplug.cxx
@@ -423,7 +423,7 @@ NPError PluginComm_Impl::NPP_SetValue( NPP instance, NPNVariable variable, void
 //--------------------------------------------------------------------------------------------------
 void * PluginComm_Impl::NPP_GetJavaClass()
 {
-    DBG_ERROR( "no java class available!" );
+    OSL_FAIL( "no java class available!" );
     return 0;
 }
 
diff --git a/extensions/source/plugin/win/winmgr.cxx b/extensions/source/plugin/win/winmgr.cxx
index e9312e831..108df5b90 100644
--- a/extensions/source/plugin/win/winmgr.cxx
+++ b/extensions/source/plugin/win/winmgr.cxx
@@ -435,7 +435,7 @@ Sequence< PluginDescription > XPluginManager_Impl::impl_getPluginDescriptions(vo
                 }
 #if OSL_DEBUG_LEVEL > 1
                 else
-                    DBG_ERROR( "### cannot get MIME type or extensions!" );
+                    OSL_FAIL( "### cannot get MIME type or extensions!" );
 #endif
             }
             if (pVersionData)
diff --git a/extensions/source/propctrlr/browserlistbox.cxx b/extensions/source/propctrlr/browserlistbox.cxx
index 164990e96..3673ac05a 100644
--- a/extensions/source/propctrlr/browserlistbox.cxx
+++ b/extensions/source/propctrlr/browserlistbox.cxx
@@ -974,7 +974,7 @@ namespace pcr
             )
             if ( (*search)->second.pLine->getControl().get() == _rxControl.get() )
                 return sal_uInt16( search - m_aOrderedLines.begin() );
-        DBG_ERROR( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" );
+        OSL_FAIL( "OBrowserListBox::impl_getControlPos: invalid control - not part of any of our lines!" );
         return (sal_uInt16)-1;
     }
 
diff --git a/extensions/source/propctrlr/buttonnavigationhandler.cxx b/extensions/source/propctrlr/buttonnavigationhandler.cxx
index 5f9f8e941..65c768611 100644
--- a/extensions/source/propctrlr/buttonnavigationhandler.cxx
+++ b/extensions/source/propctrlr/buttonnavigationhandler.cxx
@@ -121,7 +121,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" );
+            OSL_FAIL( "ButtonNavigationHandler::getPropertyState: cannot handle this property!" );
             break;
         }
 
@@ -152,7 +152,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" );
+            OSL_FAIL( "ButtonNavigationHandler::getPropertyValue: cannot handle this property!" );
             break;
         }
 
diff --git a/extensions/source/propctrlr/cellbindinghandler.cxx b/extensions/source/propctrlr/cellbindinghandler.cxx
index 8b758ca23..f120cf473 100644
--- a/extensions/source/propctrlr/cellbindinghandler.cxx
+++ b/extensions/source/propctrlr/cellbindinghandler.cxx
@@ -202,7 +202,7 @@ namespace pcr
         break;  // case PROPERTY_ID_CONTROLSOURCE
 
         default:
-            DBG_ERROR( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
+            OSL_FAIL( "CellBindingPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
         }
 
         for ( ::std::vector< PropertyId >::const_iterator loopAffected = aDependentProperties.begin();
@@ -282,7 +282,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" );
+            OSL_FAIL( "CellBindingPropertyHandler::getPropertyValue: cannot handle this!" );
             break;
         }
         return aReturn;
@@ -342,7 +342,7 @@ namespace pcr
             break;
 
             default:
-                DBG_ERROR( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" );
+                OSL_FAIL( "CellBindingPropertyHandler::setPropertyValue: cannot handle this!" );
                 break;
             }
 
@@ -401,7 +401,7 @@ namespace pcr
                 break;
 
             default:
-                DBG_ERROR( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" );
+                OSL_FAIL( "CellBindingPropertyHandler::convertToPropertyValue: cannot handle this!" );
                 break;
         }
 
@@ -456,7 +456,7 @@ namespace pcr
                 break;
 
             default:
-                DBG_ERROR( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" );
+                OSL_FAIL( "CellBindingPropertyHandler::convertToControlValue: cannot handle this!" );
                 break;
         }
 
diff --git a/extensions/source/propctrlr/editpropertyhandler.cxx b/extensions/source/propctrlr/editpropertyhandler.cxx
index f57b62039..9d589a01b 100644
--- a/extensions/source/propctrlr/editpropertyhandler.cxx
+++ b/extensions/source/propctrlr/editpropertyhandler.cxx
@@ -134,7 +134,7 @@ namespace pcr
 
 
             default:
-                DBG_ERROR( "EditPropertyHandler::getPropertyValue: cannot handle this property!" );
+                OSL_FAIL( "EditPropertyHandler::getPropertyValue: cannot handle this property!" );
                 break;
             }
         }
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx
index 5002606ec..e86477aa7 100644
--- a/extensions/source/propctrlr/eformspropertyhandler.cxx
+++ b/extensions/source/propctrlr/eformspropertyhandler.cxx
@@ -153,7 +153,7 @@ namespace pcr
             break;
 
             default:
-                DBG_ERROR( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" );
+                OSL_FAIL( "EFormsPropertyHandler::getPropertyValue: cannot handle this property!" );
                 break;
             }
         }
@@ -269,7 +269,7 @@ namespace pcr
             break;
 
             default:
-                DBG_ERROR( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" );
+                OSL_FAIL( "EFormsPropertyHandler::setPropertyValue: cannot handle this property!" );
                 break;
             }
 
@@ -463,7 +463,7 @@ namespace pcr
         case PROPERTY_ID_XSD_CALCULATION:   aDescriptor.PrimaryButtonId = UID_PROP_DLG_XSD_CALCULATION; break;
 
         default:
-            DBG_ERROR( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" );
+            OSL_FAIL( "EFormsPropertyHandler::describePropertyLine: cannot handle this property!" );
             break;
         }
 
@@ -606,7 +606,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
+            OSL_FAIL( "EFormsPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
             break;
         }
     }
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 37f5c870f..bc79a5452 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -266,7 +266,7 @@ namespace pcr
                     ||  ( pAssignedEvent->ScriptType.getLength() == 0 )
                     )
                 {
-                    DBG_ERROR( "lcl_getAssignedScriptEvent: me thinks this should not happen!" );
+                    OSL_FAIL( "lcl_getAssignedScriptEvent: me thinks this should not happen!" );
                     continue;
                 }
 
@@ -305,7 +305,7 @@ namespace pcr
             EventDescription aKnownEvent;
             if ( lcl_getEventDescriptionForMethod( _rFormComponentEventDescriptor.EventMethod, aKnownEvent ) )
                 return aKnownEvent.sListenerClassName;
-            DBG_ERROR( "lcl_getQualifiedKnownListenerName: unknown method name!" );
+            OSL_FAIL( "lcl_getQualifiedKnownListenerName: unknown method name!" );
                 // somebody assigned an script to a form component event which we don't know
                 // Speaking strictly, this is not really an error - it is possible to do
                 // this programmatically -, but it should rarely happen, since it's not possible
@@ -972,7 +972,7 @@ namespace pcr
     //--------------------------------------------------------------------
     void SAL_CALL EventHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
-        DBG_ERROR( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
+        OSL_FAIL( "EventHandler::actuatingPropertyChanged: no actuating properties -> no callback (well, this is how it *should* be!)" );
     }
     
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 86ce62ef1..6b34590a0 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -281,7 +281,7 @@ namespace pcr
         }
         catch (Exception&)
         {
-            DBG_ERROR("ControlCharacterDialog::translatePropertiesToItems: caught an exception!");
+            OSL_FAIL("ControlCharacterDialog::translatePropertiesToItems: caught an exception!");
         }
 
         _pSet->DisableItem(SID_ATTR_CHAR_CJK_FONT);
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 276e1922f..b0abab686 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1000,7 +1000,7 @@ namespace pcr
         String sDisplayName = m_pInfoService->getPropertyTranslation( nPropId );
         if ( !sDisplayName.Len() )
         {
-            DBG_ERROR( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" );
+            OSL_FAIL( "FormComponentPropertyHandler::describePropertyLine: did getSupportedProperties not work properly?" );
             throw UnknownPropertyException();
         }
 
@@ -1513,7 +1513,7 @@ namespace pcr
                 eResult = InteractiveSelectionResult_Pending;
             break;
         default:
-            DBG_ERROR( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" );
+            OSL_FAIL( "FormComponentPropertyHandler::onInteractivePropertySelection: request for a property which does not have dedicated UI!" );
             break;
         }
         return eResult;
@@ -1801,7 +1801,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
+            OSL_FAIL( "FormComponentPropertyHandler::actuatingPropertyChanged: did not register for this property!" );
             break;
 
         }   // switch ( nActuatingPropId )
@@ -2389,7 +2389,7 @@ namespace pcr
         }
         catch (Exception&)
         {
-            DBG_ERROR( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
+            OSL_FAIL( "FormComponentPropertyHandler::impl_initFieldList_nothrow: caught an exception!" );
         }
     }
 
@@ -2443,7 +2443,7 @@ namespace pcr
             }
             catch( const Exception& )
             {
-                DBG_ERROR( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
+                OSL_FAIL( "FormComponentPropertyHandler::impl_ensureRowsetConnection_nothrow: caught an exception during error handling!" );
             }
             // additional info about what happended
             String sInfo( PcrRes( RID_STR_UNABLETOCONNECT ) );
@@ -2503,7 +2503,7 @@ namespace pcr
         }
         catch (Exception&)
         {
-            DBG_ERROR("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
+            OSL_FAIL("FormComponentPropertyHandler::impl_describeCursorSource_nothrow: caught an exception !");
         }
     }
 
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 38ad0a59b..b8dcb787e 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -651,7 +651,7 @@ namespace pcr
         }
         else
         {
-            DBG_ERROR( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" );
+            OSL_FAIL( "DefaultEnumRepresentation::getValueFromDescription: could not translate the enum string!" );
             _out_rValue.clear();
         }
     }
@@ -675,7 +675,7 @@ namespace pcr
         }
         else
         {	
-            DBG_ERROR( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" );
+            OSL_FAIL( "DefaultEnumRepresentation::getDescriptionForValue: could not translate an enum value" );
         }
         return sReturn;
     }
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 409635d23..e40df7762 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -172,7 +172,7 @@ namespace pcr
             _out_rValue = ::cppu::int2enum( aValues[ index ], m_aEnumType );
         else
         {
-            DBG_ERROR( "EnumRepresentation::getValueFromDescription: cannot convert!" );
+            OSL_FAIL( "EnumRepresentation::getValueFromDescription: cannot convert!" );
             _out_rValue.clear();
         }
     }
@@ -196,7 +196,7 @@ namespace pcr
             sDescription = aDescriptions[ index ];
         else
         {
-             DBG_ERROR( "EnumRepresentation::getDescriptionForValue: cannot convert!" );
+             OSL_FAIL( "EnumRepresentation::getDescriptionForValue: cannot convert!" );
         }
         return sDescription;
     }
@@ -695,14 +695,14 @@ namespace pcr
     //--------------------------------------------------------------------
     InteractiveSelectionResult SAL_CALL GenericPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
-        DBG_ERROR( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" );
+        OSL_FAIL( "GenericPropertyHandler::onInteractivePropertySelection: I'm too dumb to know anything about property browse buttons!" );
         return InteractiveSelectionResult_Cancelled;
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL GenericPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
-        DBG_ERROR( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" );
+        OSL_FAIL( "GenericPropertyHandler::actuatingPropertyChanged: no no no, I did not register for any actuating properties!" );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx
index 9dcee3265..25cde3a7b 100644
--- a/extensions/source/propctrlr/handlerhelper.cxx
+++ b/extensions/source/propctrlr/handlerhelper.cxx
@@ -113,7 +113,7 @@ namespace pcr
             break;
 
         default:
-            DBG_ERROR( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
+            OSL_FAIL( "PropertyHandlerHelper::describePropertyLine: don't know how to represent this at the UI!" );
             // NO break!
 
         case TypeClass_STRING:
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 06a2ff4c9..f8b2d020c 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -990,7 +990,7 @@ namespace pcr
 
         catch(Exception&)
         {
-            DBG_ERROR("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !");
+            OSL_FAIL("OPropertyBrowserController::impl_rebindToInspectee_nothrow: caught an exception !");
         }
     }
 
@@ -1121,7 +1121,7 @@ namespace pcr
         }
         catch(Exception&)
         {
-            DBG_ERROR("OPropertyBrowserController::doInspection : caught an exception !");
+            OSL_FAIL("OPropertyBrowserController::doInspection : caught an exception !");
         }
     }
 
@@ -1441,7 +1441,7 @@ namespace pcr
         }
         catch(Exception&)
         {
-            DBG_ERROR("OPropertyBrowserController::Commit : caught an exception !");
+            OSL_FAIL("OPropertyBrowserController::Commit : caught an exception !");
         }
 
         m_sCommittingProperty = ::rtl::OUString();
diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx
index 2b4ee7768..0571311a6 100644
--- a/extensions/source/propctrlr/propertyhandler.cxx
+++ b/extensions/source/propctrlr/propertyhandler.cxx
@@ -248,14 +248,14 @@ namespace pcr
     //--------------------------------------------------------------------
     InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
     {
-        DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
+        OSL_FAIL( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
         return InteractiveSelectionResult_Cancelled;
     }
     
     //--------------------------------------------------------------------
     void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
     {
-        DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
+        OSL_FAIL( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/submissionhandler.cxx b/extensions/source/propctrlr/submissionhandler.cxx
index fee3f2a61..2826d9fc1 100644
--- a/extensions/source/propctrlr/submissionhandler.cxx
+++ b/extensions/source/propctrlr/submissionhandler.cxx
@@ -167,7 +167,7 @@ namespace pcr
             break;
 
             default:
-                DBG_ERROR( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" );
+                OSL_FAIL( "SubmissionPropertyHandler::getPropertyValue: cannot handle this property!" );
                 break;
             }
         }
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 0485b0478..33f256dcb 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -171,7 +171,7 @@ namespace pcr
             case FormComponentType::SPINBUTTON:     nImageId = RID_SVXIMG_SPINBUTTON; break;
             case FormComponentType::NAVIGATIONBAR:  nImageId = RID_SVXIMG_NAVIGATIONBAR; break;
             default:
-                DBG_ERROR( "TabOrderDialog::GetImage: unknown control type" );
+                OSL_FAIL( "TabOrderDialog::GetImage: unknown control type" );
             }
         }
 
@@ -215,7 +215,7 @@ namespace pcr
                 else
                 {
                     // no property set -> no tab order
-                    DBG_ERROR( "TabOrderDialog::FillList: invalid control encountered!" );
+                    OSL_FAIL( "TabOrderDialog::FillList: invalid control encountered!" );
                     aLB_Controls.Clear();
                     break;
                 }
@@ -223,7 +223,7 @@ namespace pcr
         }
         catch( const Exception& )
         {
-            DBG_ERROR( "TabOrderDialog::FillList: caught an exception!" );
+            OSL_FAIL( "TabOrderDialog::FillList: caught an exception!" );
         }
 
         // select first entry
diff --git a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
index 7555ecbad..604e7ae27 100644
--- a/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
+++ b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx
@@ -163,7 +163,7 @@ namespace pcr
         ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
         if ( !pType.is() )
         {
-            DBG_ERROR( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::setPropertyValue: you're trying to set a type facet, without a current type!" );
             return;
         }
 
@@ -415,7 +415,7 @@ namespace pcr
             break;
 
         default:
-            DBG_ERROR( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::describePropertyLine: cannot handle this property!" );
             break;
         }
 
@@ -471,7 +471,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::onInteractivePropertySelection: unexpected property to build a dedicated UI!" );
             break;
         }
         return InteractiveSelectionResult_Cancelled;
@@ -503,7 +503,7 @@ namespace pcr
         ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
         if ( !pType.is() )
         {
-            DBG_ERROR( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::implPrepareCloneDataCurrentType: invalid current data type!" );
             return false;
         }
 
@@ -542,7 +542,7 @@ namespace pcr
         ::rtl::Reference< XSDDataType > pType = m_pHelper->getValidatingDataType();
         if ( !pType.is() )
         {
-            DBG_ERROR( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::implPrepareRemoveCurrentDataType: invalid current data type!" );
             return false;
         }
 
@@ -656,7 +656,7 @@ namespace pcr
         break;
 
         default:
-            DBG_ERROR( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
+            OSL_FAIL( "XSDValidationPropertyHandler::actuatingPropertyChanged: cannot handle this property!" );
             return;
         }
 
diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx
index 919ed9fd5..b8518ebaa 100644
--- a/extensions/source/scanner/scanwin.cxx
+++ b/extensions/source/scanner/scanwin.cxx
@@ -598,7 +598,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
                     catch( const beans::UnknownPropertyException& )
                     {
                         // property unknown.
-                        DBG_ERROR("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!");
+                        OSL_FAIL("ImpTwain::ImplGetActiveFrame: ActiveFrame property unknown, cannot determine active frame!");
                         return uno::Reference< frame::XFrame >();
                     }
 
@@ -617,7 +617,7 @@ uno::Reference< frame::XFrame > ImpTwain::ImplGetActiveFrame()
     {
     }
 
-    DBG_ERROR("ImpTwain::ImplGetActiveFrame: Could not determine active frame!");
+    OSL_FAIL("ImpTwain::ImplGetActiveFrame: Could not determine active frame!");
     return uno::Reference< frame::XFrame >();
 }
 
@@ -633,7 +633,7 @@ uno::Reference< util::XCloseBroadcaster > ImpTwain::ImplGetActiveFrameCloseBroad
     {
     }
 
-    DBG_ERROR("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!");
+    OSL_FAIL("ImpTwain::ImplGetActiveFrameCloseBroadcaster: Could determine close broadcaster on active frame!");
     return uno::Reference< util::XCloseBroadcaster >();
 }
 
@@ -653,7 +653,7 @@ void ImpTwain::ImplRegisterCloseListener()
         else
         {
             // interface unknown. don't register, then
-            DBG_ERROR("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!");
+            OSL_FAIL("ImpTwain::ImplRegisterCloseListener: XFrame has no XCloseBroadcaster!");
             return;
         }
     }
@@ -661,7 +661,7 @@ void ImpTwain::ImplRegisterCloseListener()
     {
     }
 
-    DBG_ERROR("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!");
+    OSL_FAIL("ImpTwain::ImplRegisterCloseListener: Could not register as close listener!");
 }
 
 // -----------------------------------------------------------------------------
@@ -681,7 +681,7 @@ void ImpTwain::ImplDeregisterCloseListener()
         else
         {
             // interface unknown. don't deregister, then
-            DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!");
+            OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: XFrame has no XCloseBroadcaster!");
             return;
         }
     }
@@ -689,7 +689,7 @@ void ImpTwain::ImplDeregisterCloseListener()
     {
     }
 
-    DBG_ERROR("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
+    OSL_FAIL("ImpTwain::ImplDeregisterCloseListener: Could not deregister as close listener!");
 }
 
 // -----------------------------------------------------------------------------
@@ -708,7 +708,7 @@ void SAL_CALL ImpTwain::queryClosing( const lang::EventObject& /*Source*/, sal_B
 void SAL_CALL ImpTwain::notifyClosing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException)
 {
     // should not happen
-    DBG_ERROR("ImpTwain::notifyClosing called, but we vetoed the closing before!");
+    OSL_FAIL("ImpTwain::notifyClosing called, but we vetoed the closing before!");
 }
 
 // -----------------------------------------------------------------------------
@@ -733,7 +733,7 @@ void ImpTwain::ImplSendCloseEvent()
     {
     }
 
-    DBG_ERROR("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!");
+    OSL_FAIL("ImpTwain::ImplSendCloseEvent: Could not send required close broadcast!");
 }
 
 
diff --git a/extensions/source/svg/svgaction.cxx b/extensions/source/svg/svgaction.cxx
index b9f65c20f..43967a078 100644
--- a/extensions/source/svg/svgaction.cxx
+++ b/extensions/source/svg/svgaction.cxx
@@ -519,7 +519,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" );
     }
 
     {