fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

- replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: I26761cf1d4c1cfe21dec7d8ede6df6f177bf2c3e Reviewed-on: https://gerrit.libreoffice.org/4620 Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
author: Radu Ioan <ioan.radu.g@gmail.com> 2013-06-29 17:38:04 +0300
committer: Bosdonnat Cedric <cedric.bosdonnat@free.fr> 2013-07-03 07:59:33 +0000
commit: 61db96daa87754af24355d7ac94ee0305f22ff87 (patch)
tree: 6c15e7b896c62f42a1dfb02695418f9770fc3b46
parent: 54aac00e51652deec3d71524eec97f171c5cd40e (diff)
41 files changed, 993 insertions, 1048 deletions
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 9c2b8da2124c..d3b61fa1d4a4 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
@@ -18,7 +18,6 @@
  */
 
 
-#include <rtl/logfile.hxx>
 #include <com/sun/star/rendering/XBitmap.hpp>
 #include <com/sun/star/rendering/RepaintResult.hpp>
 #include <com/sun/star/rendering/XCachedPrimitive.hpp>
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index a7c768fd42ea..ec140d7d5c16 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -25,7 +25,6 @@
 #include "cppu/helper/purpenv/Environment.hxx"
 #include "cppu/helper/purpenv/Mapping.hxx"
 #include "cppu/EnvDcp.hxx"
-#include "rtl/logfile.hxx"
 #include "uno/environment.hxx"
 #include <com/sun/star/uno/Type.hxx>
 #include <boost/unordered_map.hpp>
@@ -135,63 +134,63 @@ int LogBridge::v_isValid(rtl::OUString * pReason)
             case typelib_TypeClass_STRING:
                 {
                     const ::rtl::OString sValue( ::rtl::OUStringToOString(*static_cast< ::rtl::OUString*>(pArg),osl_getThreadTextEncoding()));
-                    rtl_logfile_trace( "%s", sValue.getStr());
+                    SAL_INFO("cppu", "" << sValue.getStr());
                 }
                 break;
             case typelib_TypeClass_BOOLEAN:
-                rtl_logfile_trace( "%d", *static_cast<sal_Bool*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Bool*>(pArg));
                 break;
             case typelib_TypeClass_BYTE:
-                rtl_logfile_trace( "%d", *static_cast<sal_Int8*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Int8*>(pArg));
                 break;
             case typelib_TypeClass_CHAR:
-                rtl_logfile_trace( "%c", *static_cast<sal_Char*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Char*>(pArg));
                 break;
             case typelib_TypeClass_SHORT:
             case typelib_TypeClass_UNSIGNED_SHORT:
-                rtl_logfile_trace( "%d", *static_cast<sal_Int16*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Int16*>(pArg));
                 break;
             case typelib_TypeClass_LONG:
             case typelib_TypeClass_UNSIGNED_LONG:
             case typelib_TypeClass_ENUM:
-                rtl_logfile_trace( "%d", *static_cast<sal_Int32*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Int32*>(pArg));
                 break;
             case typelib_TypeClass_HYPER:
             case typelib_TypeClass_UNSIGNED_HYPER:
-                rtl_logfile_trace( "%d", *static_cast<sal_Int64*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<sal_Int64*>(pArg));
                 break;
             case typelib_TypeClass_FLOAT:
-                rtl_logfile_trace( "%f", *static_cast<float*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<float*>(pArg));
                 break;
             case typelib_TypeClass_DOUBLE:
-                rtl_logfile_trace( "%f", *static_cast<double*>(pArg));
+               SAL_INFO("cppu", "" << *static_cast<double*>(pArg));
                 break;
             case typelib_TypeClass_TYPE:
                 {
                     const ::rtl::OString sValue( ::rtl::OUStringToOString(((com::sun::star::uno::Type*)pArg)->getTypeName(),osl_getThreadTextEncoding()));
-                    rtl_logfile_trace( "%s", sValue.getStr());
+                   SAL_INFO("cppu", "" << sValue.getStr());
                 }
                 break;
             case typelib_TypeClass_ANY:
                 if ( static_cast<uno_Any*>(pArg)->pData )
                     traceValue(static_cast<uno_Any*>(pArg)->pType,static_cast<uno_Any*>(pArg)->pData);
                 else
-                    rtl_logfile_trace( "void");
+                   SAL_INFO("cppu", "void");
                 break;
             case typelib_TypeClass_EXCEPTION:
-                rtl_logfile_trace( "exception");
+               SAL_INFO("cppu", "exception");
                 break;
             case typelib_TypeClass_INTERFACE:
                 {
                     const ::rtl::OString sValue( ::rtl::OUStringToOString(_pTypeRef->pTypeName,osl_getThreadTextEncoding()));
-                    rtl_logfile_trace( "%s 0x%p", sValue.getStr(),pArg);
+                   SAL_INFO("cppu", "" << sValue.getStr() << "0x" << std::hex << pArg);
                 }
                 break;
             case typelib_TypeClass_VOID:
-                rtl_logfile_trace( "void");
+               SAL_INFO("cppu", "void");
                 break;
             default:
-                rtl_logfile_trace( "0x%p", pArg);
+               SAL_INFO("cppu", "0x" << std::hex << pArg);
                 break;
         } // switch(pParams[i].pTypeRef->eTypeClass)
     }
@@ -209,46 +208,45 @@ void LogProbe(
     void                              * pArgs[],
     uno_Any                          ** ppException )
 {
-    static ::std::auto_ptr< ::rtl::Logfile> pLogger;
     ::rtl::OString sTemp;
     if ( pMemberType && pMemberType->pTypeName )
         sTemp = ::rtl::OUStringToOString(pMemberType->pTypeName,RTL_TEXTENCODING_ASCII_US);
     if ( pre  )
     {
-        rtl_logfile_longTrace( "{ LogBridge () %s", sTemp.getStr() );
+        SAL_INFO("cppu", "{ LogBridge () " << sTemp.getStr() );
         if ( nParams )
         {
-            rtl_logfile_trace( "\n| : ( LogBridge ");
+           SAL_INFO("cppu", "\n| : ( LogBridge ");
             for(sal_Int32 i = 0;i < nParams;++i)
             {
                 if ( i > 0 )
-                    rtl_logfile_trace( ",");
+                   SAL_INFO("cppu", ",");
                 traceValue(pParams[i].pTypeRef,pArgs[i]);
 
             }
-            rtl_logfile_trace( ")");
+           SAL_INFO("cppu", ")");
         } // if ( nParams )
-        rtl_logfile_trace( "\n");
+       SAL_INFO("cppu", "\n");
     }
     else if ( !pre )
     {
-        rtl_logfile_longTrace( "} LogBridge () %s",sTemp.getStr());
+        SAL_INFO("cppu", "} LogBridge () " << sTemp.getStr());
         if ( ppException && *ppException )
         {
-            rtl_logfile_trace( " excption occurred : ");
+           SAL_INFO("cppu", " exception occurred : ");
             typelib_TypeDescription * pElementTypeDescr = 0;
             TYPELIB_DANGER_GET( &pElementTypeDescr, (*ppException)->pType );
             const ::rtl::OString sValue( ::rtl::OUStringToOString(pElementTypeDescr->pTypeName,osl_getThreadTextEncoding()));
-            rtl_logfile_trace( "%s", sValue.getStr());
+           SAL_INFO("cppu", "" << sValue.getStr());
             TYPELIB_DANGER_RELEASE( pElementTypeDescr );
         }
         else if ( pReturnTypeRef )
         {
-            rtl_logfile_trace( " return : ");
+           SAL_INFO("cppu", " return : ");
             traceValue(pReturnTypeRef,pReturn);
         } // if ( pReturn && pReturnTypeRef )
 
-        rtl_logfile_trace( "\n");
+       SAL_INFO("cppu", "\n");
     }
 }
 
diff --git a/dbaccess/source/core/api/BookmarkSet.cxx b/dbaccess/source/core/api/BookmarkSet.cxx
index dce28eba521a..0230f2e836c9 100644
--- a/dbaccess/source/core/api/BookmarkSet.cxx
+++ b/dbaccess/source/core/api/BookmarkSet.cxx
@@ -22,7 +22,6 @@
 #include "core_resource.hrc"
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <connectivity/dbexception.hxx>
-#include <rtl/logfile.hxx>
 
 #include <limits>
 
@@ -39,51 +38,51 @@ using namespace ::osl;
 
 void OBookmarkSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::construct" );
+   SAL_INFO("dbaccess", "OBookmarkSet::construct" );
     OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
     m_xRowLocate.set(_xDriverSet,UNO_QUERY);
 }
 
 Any SAL_CALL OBookmarkSet::getBookmark() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::getBookmark" );
+   SAL_INFO("dbaccess", "OBookmarkSet::getBookmark" );
     return m_xRowLocate->getBookmark();
 }
 
 sal_Bool SAL_CALL OBookmarkSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToBookmark" );
+   SAL_INFO("dbaccess", "OBookmarkSet::moveToBookmark" );
     return m_xRowLocate->moveToBookmark(bookmark);
 }
 
 sal_Bool SAL_CALL OBookmarkSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveRelativeToBookmark" );
+   SAL_INFO("dbaccess", "OBookmarkSet::moveRelativeToBookmark" );
     return m_xRowLocate->moveRelativeToBookmark(bookmark,rows);
 }
 
 sal_Int32 SAL_CALL OBookmarkSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::compareBookmarks" );
+   SAL_INFO("dbaccess", "OBookmarkSet::compareBookmarks" );
     return m_xRowLocate->compareBookmarks(_first,_second);
 }
 
 sal_Bool SAL_CALL OBookmarkSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::hasOrderedBookmarks" );
+   SAL_INFO("dbaccess", "OBookmarkSet::hasOrderedBookmarks" );
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
 sal_Int32 SAL_CALL OBookmarkSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::hashBookmark" );
+   SAL_INFO("dbaccess", "OBookmarkSet::hashBookmark" );
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
 // ::com::sun::star::sdbcx::XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OBookmarkSet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::deleteRows" );
+   SAL_INFO("dbaccess", "OBookmarkSet::deleteRows" );
     Reference< ::com::sun::star::sdbcx::XDeleteRows> xDeleteRow(m_xRowLocate,UNO_QUERY);
     if(xDeleteRow.is())
     {
@@ -94,7 +93,7 @@ Sequence< sal_Int32 > SAL_CALL OBookmarkSet::deleteRows( const Sequence< Any >&
 
 void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::insertRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::insertRow" );
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
@@ -119,7 +118,7 @@ void SAL_CALL OBookmarkSet::insertRow( const ORowSetRow& _rInsertRow,const conne
 
 void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::updateRow" );
     Reference<XRowUpdate> xUpdRow(m_xRowLocate,UNO_QUERY);
     if(!xUpdRow.is())
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_NO_XROWUPDATE ), SQL_GENERAL_ERROR, *this );
@@ -143,7 +142,7 @@ void SAL_CALL OBookmarkSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowS
 
 void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::deleteRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::deleteRow" );
     Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
 
     xUpd->deleteRow();
@@ -151,12 +150,12 @@ void SAL_CALL OBookmarkSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const c
 
 void SAL_CALL OBookmarkSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::cancelRowUpdates" );
+   SAL_INFO("dbaccess", "OBookmarkSet::cancelRowUpdates" );
 }
 
 void SAL_CALL OBookmarkSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToInsertRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::moveToInsertRow" );
     Reference<XResultSetUpdate> xUpd(m_xRowLocate,UNO_QUERY);
     if(xUpd.is())
         xUpd->moveToInsertRow();
@@ -164,18 +163,18 @@ void SAL_CALL OBookmarkSet::moveToInsertRow(  ) throw(SQLException, RuntimeExcep
 
 void SAL_CALL OBookmarkSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::moveToCurrentRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::moveToCurrentRow" );
 }
 
 void OBookmarkSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::fillValueRow" );
+   SAL_INFO("dbaccess", "OBookmarkSet::fillValueRow" );
     OCacheSet::fillValueRow(_rRow,_nPosition);
 }
 
 void OBookmarkSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OBookmarkSet::updateColumn" );
+   SAL_INFO("dbaccess", "OBookmarkSet::updateColumn" );
     if(_rValue.isBound() && _rValue.isModified())
     {
         if(_rValue.isNull())
diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx
index 268854781269..b712470d9aea 100644
--- a/dbaccess/source/core/api/CacheSet.cxx
+++ b/dbaccess/source/core/api/CacheSet.cxx
@@ -40,7 +40,6 @@
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace comphelper;
 
@@ -64,14 +63,14 @@ OCacheSet::OCacheSet(sal_Int32 i_nMaxRows)
             ,m_bUpdated(sal_False)
             ,m_bDeleted(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::OCacheSet" );
+    SAL_INFO("dbaccess", "OCacheSet::OCacheSet" );
     DBG_CTOR(OCacheSet,NULL);
 
 }
 
 OUString OCacheSet::getIdentifierQuoteString() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getIdentifierQuoteString" );
+    SAL_INFO("dbaccess", "OCacheSet::getIdentifierQuoteString" );
     OUString sQuote;
     Reference<XDatabaseMetaData> xMeta;
     if ( m_xConnection.is() && (xMeta = m_xConnection->getMetaData()).is() )
@@ -81,7 +80,7 @@ OUString OCacheSet::getIdentifierQuoteString() const
 
 void OCacheSet::construct(  const Reference< XResultSet>& _xDriverSet,const OUString& /*i_sRowSetFilter*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::construct" );
+    SAL_INFO("dbaccess", "OCacheSet::construct" );
     OSL_ENSURE(_xDriverSet.is(),"Invalid resultSet");
     if(_xDriverSet.is())
     {
@@ -127,11 +126,11 @@ OCacheSet::~OCacheSet()
     }
     catch(Exception&)
     {
-        OSL_FAIL("Exception occurred");
+        SAL_WARN("dbaccess", "Exception occurred");
     }
     catch(...)
     {
-        OSL_FAIL("Unknown Exception occurred");
+        SAL_WARN("dbaccess", "Unknown Exception occurred");
     }
 
     DBG_DTOR(OCacheSet,NULL);
@@ -139,7 +138,7 @@ OCacheSet::~OCacheSet()
 
 void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillTableName" );
+    SAL_INFO("dbaccess", "OCacheSet::fillTableName" );
     OSL_ENSURE(_xTable.is(),"OCacheSet::fillTableName: PropertySet is empty!");
     if(m_aComposedTableName.isEmpty() && _xTable.is() )
     {
@@ -155,7 +154,7 @@ void OCacheSet::fillTableName(const Reference<XPropertySet>& _xTable)  throw(SQL
 
 void SAL_CALL OCacheSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::insertRow" );
+    SAL_INFO("dbaccess", "OCacheSet::insertRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -204,7 +203,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
                                         ,OUStringBuffer& _sParameter
                                         ,::std::list< sal_Int32>& _rOrgValues)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillParameters" );
+    SAL_INFO("dbaccess", "OCacheSet::fillParameters" );
     // use keys and indexes for exact positioning
     // first the keys
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
@@ -285,7 +284,7 @@ void OCacheSet::fillParameters( const ORowSetRow& _rRow
 
 void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::updateRow" );
+    SAL_INFO("dbaccess", "OCacheSet::updateRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -330,7 +329,7 @@ void SAL_CALL OCacheSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetR
 
 void SAL_CALL OCacheSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::deleteRow" );
+    SAL_INFO("dbaccess", "OCacheSet::deleteRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -387,14 +386,14 @@ void OCacheSet::setParameter(sal_Int32 nPos
                              ,sal_Int32 _nType
                              ,sal_Int32 _nScale) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::setParameter" );
+    SAL_INFO("dbaccess", "OCacheSet::setParameter" );
     sal_Int32 nType = ( _nType != DataType::OTHER ) ? _nType : _rValue.getTypeKind();
     ::dbtools::setObjectWithInfo(_xParameter,nPos,_rValue,nType,_nScale);
 }
 
 void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::fillValueRow" );
+    SAL_INFO("dbaccess", "OCacheSet::fillValueRow" );
     Any aBookmark = getBookmark();
     if(!aBookmark.hasValue())
         aBookmark = makeAny(_nPosition);
@@ -412,207 +411,207 @@ void OCacheSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
 
 sal_Bool SAL_CALL OCacheSet::wasNull(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::wasNull" );
+    SAL_INFO("dbaccess", "OCacheSet::wasNull" );
     return m_xDriverRow->wasNull();
 }
 
 OUString SAL_CALL OCacheSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getString" );
+    SAL_INFO("dbaccess", "OCacheSet::getString" );
     return m_xDriverRow->getString(columnIndex);
 }
 
 sal_Bool SAL_CALL OCacheSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBoolean" );
+    SAL_INFO("dbaccess", "OCacheSet::getBoolean" );
     return m_xDriverRow->getBoolean(columnIndex);
 }
 
 sal_Int8 SAL_CALL OCacheSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getByte" );
+    SAL_INFO("dbaccess", "OCacheSet::getByte" );
     return m_xDriverRow->getByte(columnIndex);
 }
 
 sal_Int16 SAL_CALL OCacheSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getShort" );
+    SAL_INFO("dbaccess", "OCacheSet::getShort" );
     return m_xDriverRow->getShort(columnIndex);
 }
 
 sal_Int32 SAL_CALL OCacheSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getInt" );
+    SAL_INFO("dbaccess", "OCacheSet::getInt" );
     return m_xDriverRow->getInt(columnIndex);
 }
 
 sal_Int64 SAL_CALL OCacheSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getLong" );
+    SAL_INFO("dbaccess", "OCacheSet::getLong" );
     return m_xDriverRow->getLong(columnIndex);
 }
 
 float SAL_CALL OCacheSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getFloat" );
+    SAL_INFO("dbaccess", "OCacheSet::getFloat" );
     return m_xDriverRow->getFloat(columnIndex);
 }
 
 double SAL_CALL OCacheSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getDouble" );
+    SAL_INFO("dbaccess", "OCacheSet::getDouble" );
     return m_xDriverRow->getDouble(columnIndex);
 }
 
 Sequence< sal_Int8 > SAL_CALL OCacheSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBytes" );
+    SAL_INFO("dbaccess", "OCacheSet::getBytes" );
     return m_xDriverRow->getBytes(columnIndex);
 }
 
 ::com::sun::star::util::Date SAL_CALL OCacheSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getDate" );
+    SAL_INFO("dbaccess", "OCacheSet::getDate" );
     return m_xDriverRow->getDate(columnIndex);
 }
 
 ::com::sun::star::util::Time SAL_CALL OCacheSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getTime" );
+    SAL_INFO("dbaccess", "OCacheSet::getTime" );
     return m_xDriverRow->getTime(columnIndex);
 }
 
 ::com::sun::star::util::DateTime SAL_CALL OCacheSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getTimestamp" );
+    SAL_INFO("dbaccess", "OCacheSet::getTimestamp" );
     return m_xDriverRow->getTimestamp(columnIndex);
 }
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBinaryStream" );
+    SAL_INFO("dbaccess", "OCacheSet::getBinaryStream" );
     return m_xDriverRow->getBinaryStream(columnIndex);
 }
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCacheSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getCharacterStream" );
+    SAL_INFO("dbaccess", "OCacheSet::getCharacterStream" );
     return m_xDriverRow->getCharacterStream(columnIndex);
 }
 
 Any SAL_CALL OCacheSet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getObject" );
+    SAL_INFO("dbaccess", "OCacheSet::getObject" );
     return m_xDriverRow->getObject(columnIndex,typeMap);
 }
 
 Reference< XRef > SAL_CALL OCacheSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getRef" );
+    SAL_INFO("dbaccess", "OCacheSet::getRef" );
     return m_xDriverRow->getRef(columnIndex);
 }
 
 Reference< XBlob > SAL_CALL OCacheSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getBlob" );
+    SAL_INFO("dbaccess", "OCacheSet::getBlob" );
     return m_xDriverRow->getBlob(columnIndex);
 }
 
 Reference< XClob > SAL_CALL OCacheSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getClob" );
+    SAL_INFO("dbaccess", "OCacheSet::getClob" );
     return m_xDriverRow->getClob(columnIndex);
 }
 
 Reference< XArray > SAL_CALL OCacheSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getArray" );
+    SAL_INFO("dbaccess", "OCacheSet::getArray" );
     return m_xDriverRow->getArray(columnIndex);
 }
 
 // XResultSet
 sal_Bool SAL_CALL OCacheSet::next(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::next" );
+    SAL_INFO("dbaccess", "OCacheSet::next" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->next();
 }
 
 sal_Bool SAL_CALL OCacheSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isBeforeFirst" );
+    SAL_INFO("dbaccess", "OCacheSet::isBeforeFirst" );
     return m_xDriverSet->isBeforeFirst();
 }
 
 sal_Bool SAL_CALL OCacheSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isAfterLast" );
+    SAL_INFO("dbaccess", "OCacheSet::isAfterLast" );
     return m_xDriverSet->isAfterLast();
 }
 
 sal_Bool SAL_CALL OCacheSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isFirst" );
+    SAL_INFO("dbaccess", "OCacheSet::isFirst" );
     return m_xDriverSet->isFirst();
 }
 
 sal_Bool SAL_CALL OCacheSet::isLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::isLast" );
+    SAL_INFO("dbaccess", "OCacheSet::isLast" );
     return m_xDriverSet->isLast();
 }
 
 void SAL_CALL OCacheSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::beforeFirst" );
+    SAL_INFO("dbaccess", "OCacheSet::beforeFirst" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_xDriverSet->beforeFirst();
 }
 
 void SAL_CALL OCacheSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::afterLast" );
+    SAL_INFO("dbaccess", "OCacheSet::afterLast" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_xDriverSet->afterLast();
 }
 
 sal_Bool SAL_CALL OCacheSet::first(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::first" );
+    SAL_INFO("dbaccess", "OCacheSet::first" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->first();
 }
 
 sal_Bool SAL_CALL OCacheSet::last(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::last" );
+    SAL_INFO("dbaccess", "OCacheSet::last" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->last();
 }
 
 sal_Int32 SAL_CALL OCacheSet::getRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getRow" );
+    SAL_INFO("dbaccess", "OCacheSet::getRow" );
     return m_xDriverSet->getRow();
 }
 
 sal_Bool SAL_CALL OCacheSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::absolute" );
+    SAL_INFO("dbaccess", "OCacheSet::absolute" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->absolute(row);
 }
 
 sal_Bool SAL_CALL OCacheSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::relative" );
+    SAL_INFO("dbaccess", "OCacheSet::relative" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->relative(rows);
 }
 
 sal_Bool SAL_CALL OCacheSet::previous(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::previous" );
+    SAL_INFO("dbaccess", "OCacheSet::previous" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return m_xDriverSet->previous();
 }
@@ -634,31 +633,31 @@ sal_Bool OCacheSet::absolute_checked( sal_Int32 row,sal_Bool /*i_bFetchRow*/ )
 
 void SAL_CALL OCacheSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::refreshRow" );
+    SAL_INFO("dbaccess", "OCacheSet::refreshRow" );
     m_xDriverSet->refreshRow();
 }
 
 sal_Bool SAL_CALL OCacheSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowUpdated" );
+    SAL_INFO("dbaccess", "OCacheSet::rowUpdated" );
     return m_xDriverSet->rowUpdated();
 }
 
 sal_Bool SAL_CALL OCacheSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowInserted" );
+    SAL_INFO("dbaccess", "OCacheSet::rowInserted" );
     return m_xDriverSet->rowInserted();
 }
 
 sal_Bool SAL_CALL OCacheSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::rowDeleted" );
+    SAL_INFO("dbaccess", "OCacheSet::rowDeleted" );
     return m_xDriverSet->rowDeleted();
 }
 
 Reference< XInterface > SAL_CALL OCacheSet::getStatement(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCacheSet::getStatement" );
+    SAL_INFO("dbaccess", "OCacheSet::getStatement" );
     return m_xDriverSet->getStatement();
 }
 
@@ -669,7 +668,7 @@ bool OCacheSet::isResultSetChanged() const
 
 void OCacheSet::reset(const Reference< XResultSet>& /*_xDriverSet*/)
 {
-    OSL_FAIL("Illegal call!");
+    SAL_WARN("dbaccess", "Illegal call!");
 }
 
 void OCacheSet::mergeColumnValues(sal_Int32 i_nColumnIndex,ORowSetValueVector::Vector& /*io_aInsertRow*/,ORowSetValueVector::Vector& /*io_aRow*/,::std::vector<sal_Int32>& o_aChangedColumns)
diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx
index 629bb8576652..3f405b27114f 100644
--- a/dbaccess/source/core/api/FilteredContainer.cxx
+++ b/dbaccess/source/core/api/FilteredContainer.cxx
@@ -25,7 +25,6 @@
 #include <connectivity/dbtools.hxx>
 #include <tools/wldcrd.hxx>
 #include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
 #include <boost/optional.hpp>
 
 namespace dbaccess
@@ -48,7 +47,7 @@ namespace dbaccess
 */
 sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vector< WildCard >& _rOut)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::createWildCardVector" );
+    SAL_INFO("dbaccess", "api OFilteredContainer::createWildCardVector" );
     // for wildcard search : remove all table filters which are a wildcard expression and build a WilCard
     // for them
     OUString* pTableFilters = _rTableFilter.getArray();
@@ -396,7 +395,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
 
     void OFilteredContainer::impl_refresh() throw(RuntimeException)
     {
-        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OFilteredContainer::impl_refresh" );
+        SAL_INFO("dbaccess", "api OFilteredContainer::impl_refresh" );
         if ( m_pRefreshListener )
         {
             m_bConstructed = sal_False;
@@ -446,7 +445,7 @@ sal_Int32 createWildCardVector(Sequence< OUString >& _rTableFilter, ::std::vecto
         switch ( nFilterMode )
         {
         default:
-            OSL_FAIL( "OTableContainer::getAllTableTypeFilter: unknown TableTypeFilterMode!" );
+            SAL_WARN("dbaccess",  "OTableContainer::getAllTableTypeFilter: unknown TableTypeFilterMode!" );
         case FILTER_MODE_MIX_ALL:
             _rFilter.realloc( 3 );
             _rFilter[0] = sView;
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index 7df61d796494..c008916525fa 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -46,7 +46,6 @@
 #include "querycomposer.hxx"
 #include "composertools.hxx"
 #include <tools/debug.hxx>
-#include <rtl/logfile.hxx>
 #include "PrivateRow.hxx"
 
 using namespace dbaccess;
@@ -98,7 +97,7 @@ namespace
         }
         catch(...)
         {
-            OSL_FAIL("Unknown Exception occurred");
+            SAL_WARN("dbaccess", "Unknown Exception occurred");
         }
     }
 }
@@ -124,7 +123,7 @@ OKeySet::OKeySet(const connectivity::OSQLTable& _xTable,
             ,m_rRowCount(o_nRowCount)
             ,m_bRowCountFinal(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::OKeySet" );
+   SAL_INFO("dbaccess", "OKeySet::OKeySet" );
     DBG_CTOR(OKeySet,NULL);
 
 }
@@ -184,7 +183,7 @@ void OKeySet::findTableColumnsMatching_throw(   const Any& i_aTable,
     OUString sUpdateTableName( i_rUpdateTableName );
     if ( sUpdateTableName.isEmpty() )
     {
-        OSL_FAIL( "OKeySet::findTableColumnsMatching_throw: This is a fallback only - it won't work when the table has an alias name." );
+        SAL_WARN("dbaccess", "OKeySet::findTableColumnsMatching_throw: This is a fallback only - it won't work when the table has an alias name." );
         // If i_aTable originates from a query composer, and is a table which appears with an alias in the SELECT statement,
         // then the below code will not produce correct results.
         // For instance, imagine a "SELECT alias.col FROM table AS alias". Now i_aTable would be the table named
@@ -295,7 +294,7 @@ OUStringBuffer OKeySet::createKeyFilter()
 
 void OKeySet::construct(const Reference< XResultSet>& _xDriverSet, const OUString& i_sRowSetFilter)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::construct" );
+   SAL_INFO("dbaccess", "OKeySet::construct" );
 
     OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
 
@@ -419,7 +418,7 @@ void OKeySet::invalidateRow()
 
 Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBookmark" );
+   SAL_INFO("dbaccess", "OKeySet::getBookmark" );
     OSL_ENSURE(m_aKeyIter != m_aKeyMap.end() && m_aKeyIter != m_aKeyMap.begin(),
         "getBookmark is only possible when we stand on a valid row!");
     return makeAny(m_aKeyIter->first);
@@ -427,7 +426,7 @@ Any SAL_CALL OKeySet::getBookmark() throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToBookmark" );
+   SAL_INFO("dbaccess", "OKeySet::moveToBookmark" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
     invalidateRow();
@@ -436,7 +435,7 @@ sal_Bool SAL_CALL OKeySet::moveToBookmark( const Any& bookmark ) throw(SQLExcept
 
 sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveRelativeToBookmark" );
+   SAL_INFO("dbaccess", "OKeySet::moveRelativeToBookmark" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aKeyIter = m_aKeyMap.find(::comphelper::getINT32(bookmark));
     if(m_aKeyIter != m_aKeyMap.end())
@@ -450,7 +449,7 @@ sal_Bool SAL_CALL OKeySet::moveRelativeToBookmark( const Any& bookmark, sal_Int3
 
 sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::compareBookmarks" );
+   SAL_INFO("dbaccess", "OKeySet::compareBookmarks" );
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
     _second >>= nSecond;
@@ -460,20 +459,20 @@ sal_Int32 SAL_CALL OKeySet::compareBookmarks( const Any& _first, const Any& _sec
 
 sal_Bool SAL_CALL OKeySet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::hasOrderedBookmarks" );
+   SAL_INFO("dbaccess", "OKeySet::hasOrderedBookmarks" );
     return sal_True;
 }
 
 sal_Int32 SAL_CALL OKeySet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::hashBookmark" );
+   SAL_INFO("dbaccess", "OKeySet::hashBookmark" );
     return ::comphelper::getINT32(bookmark);
 }
 
 // ::com::sun::star::sdbcx::XDeleteRows
 Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& _xTable) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::deleteRows" );
+   SAL_INFO("dbaccess", "OKeySet::deleteRows" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -556,7 +555,7 @@ Sequence< sal_Int32 > SAL_CALL OKeySet::deleteRows( const Sequence< Any >& rows
 
 void SAL_CALL OKeySet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::updateRow" );
+   SAL_INFO("dbaccess", "OKeySet::updateRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -728,7 +727,7 @@ void OKeySet::executeUpdate(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rO
 
 void SAL_CALL OKeySet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::insertRow" );
+   SAL_INFO("dbaccess", "OKeySet::insertRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -836,7 +835,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
         }
         catch(const Exception&)
         {
-            OSL_FAIL("Could not execute GeneratedKeys() stmt");
+            SAL_WARN("dbaccess", "Could not execute GeneratedKeys() stmt");
         }
     }
 
@@ -893,7 +892,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
             }
             catch(SQLException&)
             {
-                OSL_FAIL("Could not fetch with MAX() ");
+                SAL_WARN("dbaccess", "Could not fetch with MAX() ");
             }
         }
     }
@@ -931,7 +930,7 @@ void OKeySet::tryRefetch(const ORowSetRow& _rInsertRow,bool bRefetch)
 
 void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sal_Int32 i_nBookmark)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::copyRowValue" );
+    SAL_INFO("dbaccess", "OKeySet::copyRowValue" );
     connectivity::ORowVector< ORowSetValue >::Vector::iterator aIter = _rKeyRow->get().begin();
 
     // check the if the parameter values have been changed
@@ -971,7 +970,7 @@ void OKeySet::copyRowValue(const ORowSetRow& _rInsertRow,ORowSetRow& _rKeyRow,sa
 
 void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivity::OSQLTable& _xTable   ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::deleteRow" );
+   SAL_INFO("dbaccess", "OKeySet::deleteRow" );
     Reference<XPropertySet> xSet(_xTable,UNO_QUERY);
     fillTableName(xSet);
 
@@ -1006,7 +1005,7 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
             aSql.append(::dbtools::quoteName( aQuote,aIter->second.sRealName));
             if((_rDeleteRow->get())[aIter->second.nPosition].isNull())
             {
-                OSL_FAIL("can a primary key be null");
+                SAL_WARN("dbaccess", "can a primary key be null");
                 aSql.append(" IS NULL");
             }
             else
@@ -1074,23 +1073,23 @@ void SAL_CALL OKeySet::deleteRow(const ORowSetRow& _rDeleteRow,const connectivit
 
 void SAL_CALL OKeySet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::cancelRowUpdates" );
+   SAL_INFO("dbaccess", "OKeySet::cancelRowUpdates" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 }
 
 void SAL_CALL OKeySet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToInsertRow" );
+   SAL_INFO("dbaccess", "OKeySet::moveToInsertRow" );
 }
 
 void SAL_CALL OKeySet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::moveToCurrentRow" );
+   SAL_INFO("dbaccess", "OKeySet::moveToCurrentRow" );
 }
 
 Reference<XNameAccess> OKeySet::getKeyColumns() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getKeyColumns" );
+   SAL_INFO("dbaccess", "OKeySet::getKeyColumns" );
     // use keys and indexes for exact postioning
     // first the keys
 
@@ -1131,7 +1130,7 @@ Reference<XNameAccess> OKeySet::getKeyColumns() const
 
 sal_Bool SAL_CALL OKeySet::next(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::next" );
+   SAL_INFO("dbaccess", "OKeySet::next" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 
     if(isAfterLast())
@@ -1160,19 +1159,19 @@ sal_Bool SAL_CALL OKeySet::next(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OKeySet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isBeforeFirst" );
+   SAL_INFO("dbaccess", "OKeySet::isBeforeFirst" );
     return m_aKeyIter == m_aKeyMap.begin();
 }
 
 sal_Bool SAL_CALL OKeySet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isAfterLast" );
+   SAL_INFO("dbaccess", "OKeySet::isAfterLast" );
     return  m_bRowCountFinal && m_aKeyIter == m_aKeyMap.end();
 }
 
 sal_Bool SAL_CALL OKeySet::isFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isFirst" );
+   SAL_INFO("dbaccess", "OKeySet::isFirst" );
     OKeySetMatrix::iterator aTemp = m_aKeyMap.begin();
     ++aTemp;
     return m_aKeyIter == aTemp && m_aKeyIter != m_aKeyMap.end();
@@ -1180,7 +1179,7 @@ sal_Bool SAL_CALL OKeySet::isFirst(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OKeySet::isLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::isLast" );
+   SAL_INFO("dbaccess", "OKeySet::isLast" );
     if(!m_bRowCountFinal)
         return sal_False;
 
@@ -1191,7 +1190,7 @@ sal_Bool SAL_CALL OKeySet::isLast(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL OKeySet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::beforeFirst" );
+   SAL_INFO("dbaccess", "OKeySet::beforeFirst" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aKeyIter = m_aKeyMap.begin();
     invalidateRow();
@@ -1199,7 +1198,7 @@ void SAL_CALL OKeySet::beforeFirst(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::afterLast" );
+   SAL_INFO("dbaccess", "OKeySet::afterLast" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     fillAllRows();
     m_aKeyIter = m_aKeyMap.end();
@@ -1208,7 +1207,7 @@ void SAL_CALL OKeySet::afterLast(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OKeySet::first(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::first" );
+   SAL_INFO("dbaccess", "OKeySet::first" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aKeyIter = m_aKeyMap.begin();
     ++m_aKeyIter;
@@ -1232,7 +1231,7 @@ sal_Bool SAL_CALL OKeySet::last(  ) throw(SQLException, RuntimeException)
 
 sal_Bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::last_checked" );
+   SAL_INFO("dbaccess", "OKeySet::last_checked" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     bool fetchedRow = fillAllRows();
 
@@ -1247,7 +1246,7 @@ sal_Bool OKeySet::last_checked( sal_Bool /* i_bFetchRow */ )
 
 sal_Int32 SAL_CALL OKeySet::getRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getRow" );
+   SAL_INFO("dbaccess", "OKeySet::getRow" );
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
 
@@ -1260,7 +1259,7 @@ sal_Bool SAL_CALL OKeySet::absolute( sal_Int32 row ) throw(SQLException, Runtime
 }
 sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::absolute" );
+   SAL_INFO("dbaccess", "OKeySet::absolute" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     OSL_ENSURE(row,"absolute(0) isn't allowed!");
     bool fetchedRow = false;
@@ -1320,7 +1319,7 @@ sal_Bool OKeySet::absolute_checked( sal_Int32 row, sal_Bool /* i_bFetchRow */ )
 
 sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::relative" );
+   SAL_INFO("dbaccess", "OKeySet::relative" );
     if(!rows)
     {
         invalidateRow();
@@ -1331,7 +1330,7 @@ sal_Bool SAL_CALL OKeySet::relative( sal_Int32 rows ) throw(SQLException, Runtim
 
 sal_Bool OKeySet::previous_checked( sal_Bool /* i_bFetchRow */ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::previous" );
+   SAL_INFO("dbaccess", "OKeySet::previous" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     if(m_aKeyIter != m_aKeyMap.begin())
     {
@@ -1392,7 +1391,7 @@ bool OKeySet::doTryRefetch_throw()  throw(SQLException, RuntimeException)
 // -----------------------------------------------------------------------------
 void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::refreshRow" );
+   SAL_INFO("dbaccess", "OKeySet::refreshRow" );
 
     invalidateRow();
 
@@ -1418,7 +1417,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
         if (m_rRowCount > 0)
             --m_rRowCount;
         else
-            OSL_FAIL("m_rRowCount got out of sync: non-empty m_aKeyMap, but m_rRowCount <= 0");
+            SAL_WARN("dbaccess", "m_rRowCount got out of sync: non-empty m_aKeyMap, but m_rRowCount <= 0");
 
         if (m_aKeyIter == m_aKeyMap.end())
         {
@@ -1450,7 +1449,7 @@ void SAL_CALL OKeySet::refreshRow() throw(SQLException, RuntimeException)
 
 sal_Bool OKeySet::fetchRow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::fetchRow" );
+   SAL_INFO("dbaccess", "OKeySet::fetchRow" );
     // fetch the next row and append on the keyset
     sal_Bool bRet = sal_False;
     if ( !m_bRowCountFinal && (!m_nMaxRows || sal_Int32(m_aKeyMap.size()) < m_nMaxRows) )
@@ -1488,7 +1487,7 @@ sal_Bool OKeySet::fetchRow()
 
 bool OKeySet::fillAllRows()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::fillAllRows" );
+   SAL_INFO("dbaccess", "OKeySet::fillAllRows" );
     if(m_bRowCountFinal)
     {
         return false;
@@ -1503,7 +1502,7 @@ bool OKeySet::fillAllRows()
 // XRow
 sal_Bool SAL_CALL OKeySet::wasNull(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::wasNull" );
+   SAL_INFO("dbaccess", "OKeySet::wasNull" );
     if ( ! m_xRow.is() )
         throwGenericSQLException("Must call getFOO() for some FOO before wasNull()", *this);
 
@@ -1523,152 +1522,152 @@ inline void OKeySet::ensureRowForData( ) throw(SQLException, RuntimeException)
 
 OUString SAL_CALL OKeySet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getString" );
+   SAL_INFO("dbaccess", "OKeySet::getString" );
     ensureRowForData();
     return m_xRow->getString(columnIndex);
 }
 
 sal_Bool SAL_CALL OKeySet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBoolean" );
+   SAL_INFO("dbaccess", "OKeySet::getBoolean" );
     ensureRowForData();
     return m_xRow->getBoolean(columnIndex);
 }
 
 sal_Int8 SAL_CALL OKeySet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getByte" );
+   SAL_INFO("dbaccess", "OKeySet::getByte" );
     ensureRowForData();
     return m_xRow->getByte(columnIndex);
 }
 
 sal_Int16 SAL_CALL OKeySet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getShort" );
+   SAL_INFO("dbaccess", "OKeySet::getShort" );
     ensureRowForData();
     return m_xRow->getShort(columnIndex);
 }
 
 sal_Int32 SAL_CALL OKeySet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getInt" );
+   SAL_INFO("dbaccess", "OKeySet::getInt" );
     ensureRowForData();
     return m_xRow->getInt(columnIndex);
 }
 
 sal_Int64 SAL_CALL OKeySet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getLong" );
+   SAL_INFO("dbaccess", "OKeySet::getLong" );
     ensureRowForData();
     return m_xRow->getLong(columnIndex);
 }
 
 float SAL_CALL OKeySet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getFloat" );
+   SAL_INFO("dbaccess", "OKeySet::getFloat" );
     ensureRowForData();
     return m_xRow->getFloat(columnIndex);
 }
 
 double SAL_CALL OKeySet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getDouble" );
+   SAL_INFO("dbaccess", "OKeySet::getDouble" );
     ensureRowForData();
     return m_xRow->getDouble(columnIndex);
 }
 
 Sequence< sal_Int8 > SAL_CALL OKeySet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBytes" );
+   SAL_INFO("dbaccess", "OKeySet::getBytes" );
     ensureRowForData();
     return m_xRow->getBytes(columnIndex);
 }
 
 ::com::sun::star::util::Date SAL_CALL OKeySet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getDate" );
+   SAL_INFO("dbaccess", "OKeySet::getDate" );
     ensureRowForData();
     return m_xRow->getDate(columnIndex);
 }
 
 ::com::sun::star::util::Time SAL_CALL OKeySet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getTime" );
+   SAL_INFO("dbaccess", "OKeySet::getTime" );
     ensureRowForData();
     return m_xRow->getTime(columnIndex);
 }
 
 ::com::sun::star::util::DateTime SAL_CALL OKeySet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getTimestamp" );
+   SAL_INFO("dbaccess", "OKeySet::getTimestamp" );
     ensureRowForData();
     return m_xRow->getTimestamp(columnIndex);
 }
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBinaryStream" );
+   SAL_INFO("dbaccess", "OKeySet::getBinaryStream" );
     ensureRowForData();
     return m_xRow->getBinaryStream(columnIndex);
 }
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OKeySet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getCharacterStream" );
+   SAL_INFO("dbaccess", "OKeySet::getCharacterStream" );
     ensureRowForData();
     return m_xRow->getCharacterStream(columnIndex);
 }
 
 Any SAL_CALL OKeySet::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getObject" );
+   SAL_INFO("dbaccess", "OKeySet::getObject" );
     ensureRowForData();
     return m_xRow->getObject(columnIndex,typeMap);
 }
 
 Reference< XRef > SAL_CALL OKeySet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getRef" );
+   SAL_INFO("dbaccess", "OKeySet::getRef" );
     ensureRowForData();
     return m_xRow->getRef(columnIndex);
 }
 
 Reference< XBlob > SAL_CALL OKeySet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getBlob" );
+   SAL_INFO("dbaccess", "OKeySet::getBlob" );
     ensureRowForData();
     return m_xRow->getBlob(columnIndex);
 }
 
 Reference< XClob > SAL_CALL OKeySet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getClob" );
+   SAL_INFO("dbaccess", "OKeySet::getClob" );
     ensureRowForData();
     return m_xRow->getClob(columnIndex);
 }
 
 Reference< XArray > SAL_CALL OKeySet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::getArray" );
+   SAL_INFO("dbaccess", "OKeySet::getArray" );
     ensureRowForData();
     return m_xRow->getArray(columnIndex);
 }
 
 sal_Bool SAL_CALL OKeySet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowUpdated" );
+   SAL_INFO("dbaccess", "OKeySet::rowUpdated" );
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 2;
 }
 
 sal_Bool SAL_CALL OKeySet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowInserted" );
+   SAL_INFO("dbaccess", "OKeySet::rowInserted" );
     return m_aKeyIter != m_aKeyMap.begin() && m_aKeyIter != m_aKeyMap.end() && m_aKeyIter->second.second.first == 1;
 }
 
 sal_Bool SAL_CALL OKeySet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OKeySet::rowDeleted" );
+   SAL_INFO("dbaccess", "OKeySet::rowDeleted" );
     sal_Bool bDeleted = m_bDeleted;
     m_bDeleted = sal_False;
     return bDeleted;
diff --git a/dbaccess/source/core/api/OptimisticSet.cxx b/dbaccess/source/core/api/OptimisticSet.cxx
index 8fed9a30945a..564720cbd57e 100644
--- a/dbaccess/source/core/api/OptimisticSet.cxx
+++ b/dbaccess/source/core/api/OptimisticSet.cxx
@@ -48,7 +48,6 @@
 #include "querycomposer.hxx"
 #include "composertools.hxx"
 #include <tools/debug.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace ::connectivity;
@@ -95,7 +94,7 @@ OptimisticSet::OptimisticSet(const Reference<XComponentContext>& _rContext,
             ,m_aSqlIterator( i_xConnection, Reference<XTablesSupplier>(_xComposer,UNO_QUERY)->getTables(), m_aSqlParser, NULL )
             ,m_bResultSetChanged(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::OptimisticSet" );
+    SAL_INFO("dbaccess", "OptimisticSet::OptimisticSet" );
     DBG_CTOR(OptimisticSet,NULL);
 }
 
@@ -106,7 +105,7 @@ OptimisticSet::~OptimisticSet()
 
 void OptimisticSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::construct" );
+    SAL_INFO("dbaccess", "OptimisticSet::construct" );
 
     OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
 
@@ -186,7 +185,7 @@ Sequence< sal_Int32 > SAL_CALL OptimisticSet::deleteRows( const Sequence< Any >&
 
 void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::updateRow" );
+    SAL_INFO("dbaccess", "OptimisticSet::updateRow" );
     if ( m_aJoinedKeyColumns.empty() )
         throw SQLException();
     // list all cloumns that should be set
@@ -261,7 +260,7 @@ void SAL_CALL OptimisticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORow
 
 void SAL_CALL OptimisticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::insertRow" );
+    SAL_INFO("dbaccess", "OptimisticSet::insertRow" );
     TSQLStatements aSql;
     TSQLStatements aParameter;
     TSQLStatements aKeyConditions;
@@ -395,7 +394,7 @@ void SAL_CALL OptimisticSet::deleteRow(const ORowSetRow& _rDeleteRow,const conne
 
 void OptimisticSet::executeDelete(const ORowSetRow& _rDeleteRow,const OUString& i_sSQL,const OUString& i_sTableName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OptimisticSet::executeDelete" );
+    SAL_INFO("dbaccess", "OptimisticSet::executeDelete" );
 
     // now create and execute the prepared statement
     Reference< XPreparedStatement > xPrep(m_xConnection->prepareStatement(i_sSQL));
diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index a58a68a4fd88..012f309902ad 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -71,7 +71,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/interfacecontainer.h>
 #include <cppuhelper/typeprovider.hxx>
-#include <rtl/logfile.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -221,7 +220,7 @@ ORowSet::~ORowSet()
 {
     if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
     {
-        OSL_FAIL("Please check who doesn't dispose this component!");
+        SAL_WARN("dbaccess", "Please check who doesn't dispose this component!");
         osl_atomic_increment( &m_refCount );
         dispose();
     }
@@ -1484,7 +1483,7 @@ void SAL_CALL ORowSet::executeWithCompletion( const Reference< XInteractionHandl
     }
     catch(Exception&)
     {
-        OSL_FAIL("ORowSet::executeWithCompletion: caught an unexpected exception type while filling in the parameters!");
+        SAL_WARN("dbaccess", "ORowSet::executeWithCompletion: caught an unexpected exception type while filling in the parameters!");
     }
 
     // we're done with the parameters, now for the real execution
@@ -1773,7 +1772,7 @@ void ORowSet::impl_initializeColumnSettings_nothrow( const Reference< XPropertyS
 
 void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotification)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "ORowSet::execute_NoApprove_NoNewConn" );
+    SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn" );
 
     // now we can dispose our old connection
     ::comphelper::disposeComponent(m_xOldConnection);
@@ -1799,7 +1798,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
             aComposedUpdateTableName = composeTableName( m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, m_aUpdateTableName, sal_False, ::dbtools::eInDataManipulation );
 
         {
-            RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "ORowSet::execute_NoApprove_NoNewConn: creating cache" );
+            SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn: creating cache" );
             m_pCache = new ORowSetCache( xResultSet, m_xComposer.get(), m_aContext, aComposedUpdateTableName, m_bModified, m_bNew,m_aParameterValueForCache,m_aFilter,m_nMaxRows );
             if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
             {
@@ -1829,7 +1828,7 @@ void ORowSet::execute_NoApprove_NoNewConn(ResettableMutexGuard& _rClearForNotifi
         const ::std::map<sal_Int32,sal_Int32>& rKeyColumns = m_pCache->getKeyColumns();
         if(!m_xColumns.is())
         {
-            RTL_LOGFILE_CONTEXT_AUTHOR( aColumnCreateLog, "dbaccess", "frank.schoenheit@sun.com", "ORowSet::execute_NoApprove_NoNewConn::creating columns" );
+            SAL_INFO("dbaccess", "ORowSet::execute_NoApprove_NoNewConn::creating columns" );
             // use the meta data
             Reference<XResultSetMetaDataSupplier> xMetaSup(m_xStatement,UNO_QUERY);
             try
diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx
index bfeca61b4e68..3d5e20dc4ce1 100644
--- a/dbaccess/source/core/api/RowSetBase.cxx
+++ b/dbaccess/source/core/api/RowSetBase.cxx
@@ -36,7 +36,6 @@
 #include <connectivity/dbexception.hxx>
 #include <osl/thread.h>
 #include <tools/debug.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace connectivity;
@@ -102,7 +101,7 @@ ORowSetBase::ORowSetBase( const Reference<XComponentContext>& _rContext, ::cppu:
     ,m_bAfterLast(sal_False)
     ,m_bIsInsertRow(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::ORowSetBase" );
+    SAL_INFO("dbaccess", "ORowSetBase::ORowSetBase" );
     DBG_CTOR(ORowSetBase,NULL);
 
     sal_Int32 nRBT  = PropertyAttribute::READONLY   | PropertyAttribute::BOUND      | PropertyAttribute::TRANSIENT;
@@ -133,14 +132,12 @@ ORowSetBase::~ORowSetBase()
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > ORowSetBase::getTypes() throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTypes" );
     return ::comphelper::concatSequences(ORowSetBase_BASE::getTypes(),OPropertyStateContainer::getTypes());
 }
 
 // com::sun::star::uno::XInterface
 Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::queryInterface" );
     Any aRet = ORowSetBase_BASE::queryInterface(rType);
     if(!aRet.hasValue())
         aRet = OPropertyStateContainer::queryInterface(rType);
@@ -149,7 +146,7 @@ Any ORowSetBase::queryInterface( const Type & rType ) throw (RuntimeException)
 
 void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getFastPropertyValue" );
+    //SAL_INFO("dbaccess", "ORowSetBase::getFastPropertyValue" );
     if(m_pCache)
     {
         switch(nHandle)
@@ -171,7 +168,7 @@ void SAL_CALL ORowSetBase::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) c
 // OComponentHelper
 void SAL_CALL ORowSetBase::disposing(void)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::disposing" );
+    SAL_INFO("dbaccess", "ORowSetBase::disposing" );
     MutexGuard aGuard(*m_pMutex);
 
     if ( m_pColumns )
@@ -190,7 +187,7 @@ void SAL_CALL ORowSetBase::disposing(void)
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* ORowSetBase::createArrayHelper( ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::createArrayHelper" );
+    SAL_INFO("dbaccess", "ORowSetBase::createArrayHelper" );
     Sequence< Property > aProps;
     describeProperties(aProps);
     return new ::cppu::OPropertyArrayHelper(aProps);
@@ -199,14 +196,14 @@ void SAL_CALL ORowSetBase::disposing(void)
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& SAL_CALL ORowSetBase::getInfoHelper()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getInfoHelper" );
+    SAL_INFO("dbaccess", "ORowSetBase::getInfoHelper" );
     return *const_cast<ORowSetBase*>(this)->getArrayHelper();
 }
 
 // XRow
 sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::wasNull" );
+    SAL_INFO("dbaccess", "ORowSetBase::wasNull" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return impl_wasNull();
@@ -214,23 +211,23 @@ sal_Bool SAL_CALL ORowSetBase::wasNull(  ) throw(SQLException, RuntimeException)
 
 sal_Bool ORowSetBase::impl_wasNull()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_wasNull" );
+    SAL_INFO("dbaccess", "ORowSetBase::impl_wasNull" );
     return ((m_nLastColumnIndex != -1) && !m_aCurrentRow.isNull() && m_aCurrentRow != m_pCache->getEnd() && m_aCurrentRow->is()) ? ((*m_aCurrentRow)->get())[m_nLastColumnIndex].isNull() : sal_True;
 }
 
 const ORowSetValue& ORowSetBase::getValue(sal_Int32 columnIndex)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getValue" );
+    SAL_INFO("dbaccess", "ORowSetBase::getValue" );
     checkCache();
     return impl_getValue(columnIndex);
 }
 
 const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getValue" );
+    SAL_INFO("dbaccess", "ORowSetBase::impl_getValue" );
     if ( m_bBeforeFirst || m_bAfterLast )
     {
-        OSL_FAIL("ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
+        SAL_WARN("dbaccess", "ORowSetBase::getValue: Illegal call here (we're before first or after last)!");
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
     }
 
@@ -281,97 +278,97 @@ const ORowSetValue& ORowSetBase::impl_getValue(sal_Int32 columnIndex)
 
 OUString SAL_CALL ORowSetBase::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getString" );
+    SAL_INFO("dbaccess", "ORowSetBase::getString" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 sal_Bool SAL_CALL ORowSetBase::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBoolean" );
+    SAL_INFO("dbaccess", "ORowSetBase::getBoolean" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 sal_Int8 SAL_CALL ORowSetBase::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getByte" );
+    SAL_INFO("dbaccess", "ORowSetBase::getByte" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 sal_Int16 SAL_CALL ORowSetBase::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getShort" );
+    SAL_INFO("dbaccess", "ORowSetBase::getShort" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 sal_Int32 SAL_CALL ORowSetBase::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getInt" );
+    SAL_INFO("dbaccess", "ORowSetBase::getInt" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 sal_Int64 SAL_CALL ORowSetBase::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getLong" );
+    SAL_INFO("dbaccess", "ORowSetBase::getLong" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 float SAL_CALL ORowSetBase::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getFloat" );
+    SAL_INFO("dbaccess", "ORowSetBase::getFloat" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 double SAL_CALL ORowSetBase::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getDouble" );
+    SAL_INFO("dbaccess", "ORowSetBase::getDouble" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 Sequence< sal_Int8 > SAL_CALL ORowSetBase::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBytes" );
+    SAL_INFO("dbaccess", "ORowSetBase::getBytes" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 ::com::sun::star::util::Date SAL_CALL ORowSetBase::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getDate" );
+    SAL_INFO("dbaccess", "ORowSetBase::getDate" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 ::com::sun::star::util::Time SAL_CALL ORowSetBase::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTime" );
+    SAL_INFO("dbaccess", "ORowSetBase::getTime" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 ::com::sun::star::util::DateTime SAL_CALL ORowSetBase::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getTimestamp" );
+    SAL_INFO("dbaccess", "ORowSetBase::getTimestamp" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     return getValue(columnIndex);
 }
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBinaryStream" );
+    SAL_INFO("dbaccess", "ORowSetBase::getBinaryStream" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
 
     if ( m_bBeforeFirst || m_bAfterLast )
     {
-        OSL_FAIL("ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
+        SAL_WARN("dbaccess", "ORowSetBase::getBinaryStream: Illegal call here (we're before first or after last)!");
         ::dbtools::throwSQLException( DBACORE_RESSTRING( RID_STR_CURSOR_BEFORE_OR_AFTER ), SQL_INVALID_CURSOR_POSITION, *m_pMySelf );
     }
 
@@ -400,13 +397,13 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getBinaryS
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL ORowSetBase::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getCharacterStream" );
+    SAL_INFO("dbaccess", "ORowSetBase::getCharacterStream" );
     return getBinaryStream(columnIndex);
 }
 
 Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getObject" );
+    SAL_INFO("dbaccess", "ORowSetBase::getObject" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
 
@@ -415,26 +412,26 @@ Any SAL_CALL ORowSetBase::getObject( sal_Int32 columnIndex, const Reference< XNa
 
 Reference< XRef > SAL_CALL ORowSetBase::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRef" );
+    SAL_INFO("dbaccess", "ORowSetBase::getRef" );
     ::dbtools::throwFeatureNotImplementedException( "XRow::getRef", *m_pMySelf );
     return NULL;
 }
 
 Reference< XBlob > SAL_CALL ORowSetBase::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBlob" );
+    SAL_INFO("dbaccess", "ORowSetBase::getBlob" );
     return Reference< XBlob >(getValue(columnIndex).makeAny(),UNO_QUERY);
 }
 
 Reference< XClob > SAL_CALL ORowSetBase::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getClob" );
+    SAL_INFO("dbaccess", "ORowSetBase::getClob" );
     return Reference< XClob >(getValue(columnIndex).makeAny(),UNO_QUERY);
 }
 
 Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getArray" );
+    SAL_INFO("dbaccess", "ORowSetBase::getArray" );
     ::dbtools::throwFeatureNotImplementedException( "XRow::getArray", *m_pMySelf );
     return NULL;
 }
@@ -442,8 +439,8 @@ Reference< XArray > SAL_CALL ORowSetBase::getArray( sal_Int32 /*columnIndex*/ )
 // ::com::sun::star::sdbcx::XRowLocate
 Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getBookmark" );
-    OSL_TRACE("DBACCESS ORowSetBase::getBookmark() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::getBookmark" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::getBookmark() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -460,17 +457,17 @@ Any SAL_CALL ORowSetBase::getBookmark(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::moveToBookmark" );
-    OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::moveToBookmark" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveToBookmark(Any) Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     OSL_ENSURE(bookmark.hasValue(),"ORowSetBase::moveToBookmark bookmark has no value!");
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
 
     if(!bookmark.hasValue() || m_nResultSetType == ResultSetType::FORWARD_ONLY)
     {
         if(bookmark.hasValue())
-            OSL_FAIL("MoveToBookmark is not possible when we are only forward");
+            SAL_WARN("dbaccess", "MoveToBookmark is not possible when we are only forward");
         else
-            OSL_FAIL("Bookmark is not valid");
+            SAL_WARN("dbaccess", "Bookmark is not valid");
         throwFunctionSequenceException(*m_pMySelf);
     }
 
@@ -506,14 +503,14 @@ sal_Bool SAL_CALL ORowSetBase::moveToBookmark( const Any& bookmark ) throw(SQLEx
         // - IsNew
         aNotifier.fire( );
     }
-    OSL_TRACE("DBACCESS ORowSetBase::moveToBookmark(Any) = %i Clone = %i",bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveToBookmark(Any) = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::moveRelativeToBookmark" );
-    OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) Clone = %i",rows,m_bClone);
+    SAL_INFO("dbaccess", "ORowSetBase::moveRelativeToBookmark" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveRelativeToBookmark(Any," << rows << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -550,13 +547,13 @@ sal_Bool SAL_CALL ORowSetBase::moveRelativeToBookmark( const Any& bookmark, sal_
         // RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::moveRelativeToBookmark(Any,%i) = %i Clone = %i",rows,bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::moveRelativeToBookmark(Any," << rows << ") = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::compareBookmarks" );
+    SAL_INFO("dbaccess", "ORowSetBase::compareBookmarks" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return m_pCache->compareBookmarks(_first,_second);
@@ -564,7 +561,7 @@ sal_Int32 SAL_CALL ORowSetBase::compareBookmarks( const Any& _first, const Any&
 
 sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::hasOrderedBookmarks" );
+    SAL_INFO("dbaccess", "ORowSetBase::hasOrderedBookmarks" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return m_pCache->hasOrderedBookmarks();
@@ -572,7 +569,7 @@ sal_Bool SAL_CALL ORowSetBase::hasOrderedBookmarks(  ) throw(SQLException, Runti
 
 sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::hashBookmark" );
+    SAL_INFO("dbaccess", "ORowSetBase::hashBookmark" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return m_pCache->hashBookmark(bookmark);
@@ -581,7 +578,7 @@ sal_Int32 SAL_CALL ORowSetBase::hashBookmark( const Any& bookmark ) throw(SQLExc
 // XResultSetMetaDataSupplier
 Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getMetaData" );
+    SAL_INFO("dbaccess", "ORowSetBase::getMetaData" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     Reference< XResultSetMetaData > xMeta;
@@ -594,7 +591,7 @@ Reference< XResultSetMetaData > SAL_CALL ORowSetBase::getMetaData(  ) throw(SQLE
 // XColumnLocate
 sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::findColumn" );
+    SAL_INFO("dbaccess", "ORowSetBase::findColumn" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
@@ -605,7 +602,7 @@ sal_Int32 SAL_CALL ORowSetBase::findColumn( const OUString& columnName ) throw(S
 // ::com::sun::star::sdbcx::XColumnsSupplier
 Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getColumns" );
+    SAL_INFO("dbaccess", "ORowSetBase::getColumns" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aColumnsMutex );
@@ -622,8 +619,8 @@ Reference< XNameAccess > SAL_CALL ORowSetBase::getColumns(  ) throw(RuntimeExcep
 // XResultSet
 sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::next" );
-    OSL_TRACE("DBACCESS ORowSetBase::next() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::next" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::next() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
     checkCache();
 
@@ -665,43 +662,43 @@ sal_Bool SAL_CALL ORowSetBase::next(  ) throw(SQLException, RuntimeException)
         // - RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::next() = %i Clone = %i ID = %i",bRet,m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::next() = " << bRet << " Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     return bRet;
 }
 
 sal_Bool SAL_CALL ORowSetBase::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isBeforeFirst" );
+    SAL_INFO("dbaccess", "ORowSetBase::isBeforeFirst" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
 
-    OSL_TRACE("DBACCESS ORowSetBase::isBeforeFirst() = %i Clone = %i",m_bBeforeFirst,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isBeforeFirst() = " << m_bBeforeFirst << " Clone = " << m_bClone);
 
     return m_bBeforeFirst;
 }
 
 sal_Bool SAL_CALL ORowSetBase::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isAfterLast" );
+    SAL_INFO("dbaccess", "ORowSetBase::isAfterLast" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
-    OSL_TRACE("DBACCESS ORowSetBase::isAfterLast() = %i Clone = %i",m_bAfterLast,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isAfterLast() = " << m_bAfterLast << " Clone = " << m_bClone);
 
     return m_bAfterLast;
 }
 
 sal_Bool ORowSetBase::isOnFirst()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isOnFirst" );
+    SAL_INFO("dbaccess", "ORowSetBase::isOnFirst" );
     return isFirst();
 }
 
 sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isFirst" );
-    OSL_TRACE("DBACCESS ORowSetBase::isFirst() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::isFirst" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isFirst() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
@@ -715,20 +712,20 @@ sal_Bool SAL_CALL ORowSetBase::isFirst(  ) throw(SQLException, RuntimeException)
 
     sal_Bool bIsFirst = m_pCache->isFirst();
 
-    OSL_TRACE("DBACCESS ORowSetBase::isFirst() = %i Clone = %i",bIsFirst,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isFirst() = " << bIsFirst << " Clone = " << m_bClone);
     return bIsFirst;
 }
 
 sal_Bool ORowSetBase::isOnLast()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isOnLast" );
+    SAL_INFO("dbaccess", "ORowSetBase::isOnLast" );
     return isLast();
 }
 
 sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::isLast" );
-    OSL_TRACE("DBACCESS ORowSetBase::isLast() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::isLast" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isLast() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -746,14 +743,14 @@ sal_Bool SAL_CALL ORowSetBase::isLast(  ) throw(SQLException, RuntimeException)
 
     sal_Bool bIsLast = m_pCache->isLast();
 
-    OSL_TRACE("DBACCESS ORowSetBase::isLast() = %i Clone = %i",bIsLast,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::isLast() = " << bIsLast << " Clone = " << m_bClone);
     return bIsLast;
 }
 
 void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::beforeFirst" );
-    OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::beforeFirst" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::beforeFirst() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
 
@@ -789,13 +786,13 @@ void SAL_CALL ORowSetBase::beforeFirst(  ) throw(SQLException, RuntimeException)
         // to be done _after_ the notifications!
         m_aOldRow->clearRow();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::beforeFirst() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::beforeFirst() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::afterLast" );
-    OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::afterLast" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::afterLast() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -829,14 +826,14 @@ void SAL_CALL ORowSetBase::afterLast(  ) throw(SQLException, RuntimeException)
             fireRowcount();
         }
     }
-    OSL_TRACE("DBACCESS ORowSetBase::afterLast() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::afterLast() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 sal_Bool SAL_CALL ORowSetBase::move(    ::std::mem_fun_t<sal_Bool,ORowSetBase>& _aCheckFunctor,
                                         ::std::mem_fun_t<sal_Bool,ORowSetCache>& _aMovementFunctor)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::move" );
-    OSL_TRACE("DBACCESS ORowSetBase::move() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::move" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::move() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
     checkPositioningAllowed();
@@ -876,14 +873,14 @@ sal_Bool SAL_CALL ORowSetBase::move(    ::std::mem_fun_t<sal_Bool,ORowSetBase>&
         // - RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::move() = %i Clone = %i",bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::move() = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::first" );
-    OSL_TRACE("DBACCESS ORowSetBase::first() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::first" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::first() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::std::mem_fun_t<sal_Bool,ORowSetBase> ioF_tmp(&ORowSetBase::isOnFirst);
     ::std::mem_fun_t<sal_Bool,ORowSetCache> F_tmp(&ORowSetCache::first);
     return move(ioF_tmp,F_tmp);
@@ -891,8 +888,8 @@ sal_Bool SAL_CALL ORowSetBase::first(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::last" );
-    OSL_TRACE("DBACCESS ORowSetBase::last() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::last" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::last() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::std::mem_fun_t<sal_Bool,ORowSetBase> ioL_tmp(&ORowSetBase::isOnLast);
     ::std::mem_fun_t<sal_Bool,ORowSetCache> L_tmp(&ORowSetCache::last);
     return move(ioL_tmp,L_tmp);
@@ -900,8 +897,8 @@ sal_Bool SAL_CALL ORowSetBase::last(  ) throw(SQLException, RuntimeException)
 
 sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getRow" );
-    OSL_TRACE("DBACCESS ORowSetBase::getRow() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::getRow" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::getRow() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::osl::MutexGuard aGuard( *m_pMutex );
 
     checkCache();
@@ -910,7 +907,7 @@ sal_Int32 SAL_CALL ORowSetBase::getRow(  ) throw(SQLException, RuntimeException)
 
 sal_Int32 ORowSetBase::impl_getRow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getRow" );
+    SAL_INFO("dbaccess", "ORowSetBase::impl_getRow" );
     sal_Int32  nPos = 0;
     if ( m_bBeforeFirst )
         nPos = 0;
@@ -931,14 +928,14 @@ sal_Int32 ORowSetBase::impl_getRow()
         }
         nPos = m_pCache->getRow();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::impl_getRow() = %i Clone = %i ID = %i",nPos,m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::impl_getRow() = " << nPos << " Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     return nPos;
 }
 
 sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::absolute" );
-    OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) Clone = %i",row,m_bClone);
+    SAL_INFO("dbaccess", "ORowSetBase::absolute" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::absolute(" << row << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
     checkPositioningAllowed();
@@ -977,14 +974,14 @@ sal_Bool SAL_CALL ORowSetBase::absolute( sal_Int32 row ) throw(SQLException, Run
         // - RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::absolute(%i) = %i Clone = %i",row,bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::absolute(" << row << ") = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::relative" );
-    OSL_TRACE("DBACCESS ORowSetBase::relative(%i) Clone = %i",rows,m_bClone);
+    SAL_INFO("dbaccess", "ORowSetBase::relative" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::relative(" << rows << ") Clone = " << m_bClone);
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
 
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
@@ -1033,14 +1030,14 @@ sal_Bool SAL_CALL ORowSetBase::relative( sal_Int32 rows ) throw(SQLException, Ru
         // - RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::relative(%i) = %i Clone = %i",rows,bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::relative(" << rows << ") = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::previous" );
-    OSL_TRACE("DBACCESS ORowSetBase::previous() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::previous" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::previous() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::ResettableMutexGuard aGuard( *m_pMutex );
 
@@ -1073,7 +1070,7 @@ sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException
         }
         else
         {
-            OSL_FAIL( "ORowSetBase::previous: inconsistency!" );
+            SAL_WARN("dbaccess", "ORowSetBase::previous: inconsistency!" );
                 // we should never reach this place, as we should not get into this whole branch if m_bBeforeFirst
                 // was |true| from the beginning
             movementFailed();
@@ -1086,14 +1083,14 @@ sal_Bool SAL_CALL ORowSetBase::previous(  ) throw(SQLException, RuntimeException
         // - RowCount/IsRowCountFinal
         fireRowcount();
     }
-    OSL_TRACE("DBACCESS ORowSetBase::previous() = %i Clone = %i",bRet,m_bClone);
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::previous() = " << bRet << " Clone = " << m_bClone);
     return bRet;
 }
 
 void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const ORowSetRow& _rOldValues, ::osl::ResettableMutexGuard& _rGuard )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::setCurrentRow" );
-    OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::setCurrentRow" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::setCurrentRow() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     m_bBeforeFirst  = m_pCache->isBeforeFirst();
     m_bAfterLast    = m_pCache->isAfterLast();
 
@@ -1146,25 +1143,25 @@ void ORowSetBase::setCurrentRow( sal_Bool _bMoved, sal_Bool _bDoNotify, const OR
         // - cursorMoved
         notifyAllListenersCursorMoved( _rGuard );
 
-    OSL_TRACE("DBACCESS ORowSetBase::setCurrentRow() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::setCurrentRow() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 void ORowSetBase::checkPositioningAllowed() throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::checkPositioningAllowed" );
+    SAL_INFO("dbaccess", "ORowSetBase::checkPositioningAllowed" );
     if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
         throwFunctionSequenceException(*m_pMySelf);
 }
 
 Reference< XInterface >  ORowSetBase::getStatement(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getStatement" );
+    SAL_INFO("dbaccess", "ORowSetBase::getStatement" );
     return NULL;
 }
 
 void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::refreshRow" );
+    SAL_INFO("dbaccess", "ORowSetBase::refreshRow" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
@@ -1183,7 +1180,7 @@ void SAL_CALL ORowSetBase::refreshRow(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowUpdated" );
+    SAL_INFO("dbaccess", "ORowSetBase::rowUpdated" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
 
@@ -1195,7 +1192,7 @@ sal_Bool SAL_CALL ORowSetBase::rowUpdated(  ) throw(SQLException, RuntimeExcepti
 
 sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowInserted" );
+    SAL_INFO("dbaccess", "ORowSetBase::rowInserted" );
     ::osl::MutexGuard aGuard( *m_pMutex );
 
     checkCache();
@@ -1208,7 +1205,7 @@ sal_Bool SAL_CALL ORowSetBase::rowInserted(  ) throw(SQLException, RuntimeExcept
 
 sal_Bool SAL_CALL ORowSetBase::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::rowDeleted" );
+    SAL_INFO("dbaccess", "ORowSetBase::rowDeleted" );
     ::osl::MutexGuard aGuard( *m_pMutex );
     checkCache();
     return impl_rowDeleted();
@@ -1222,7 +1219,7 @@ sal_Bool ORowSetBase::impl_rowDeleted(  )
 // XWarningsSupplier
 Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getWarnings" );
+    SAL_INFO("dbaccess", "ORowSetBase::getWarnings" );
     ::osl::MutexGuard aGuard( *m_pMutex );
 
     if ( m_pCache )
@@ -1237,7 +1234,7 @@ Any SAL_CALL ORowSetBase::getWarnings(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL ORowSetBase::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::clearWarnings" );
+    SAL_INFO("dbaccess", "ORowSetBase::clearWarnings" );
     ::osl::MutexGuard aGuard( *m_pMutex );
 
     if ( m_pCache )
@@ -1253,8 +1250,8 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
     if (!isPropertyChangeNotificationEnabled())
         return;
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::firePropertyChange" );
-    OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::firePropertyChange" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::firePropertyChange() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     OSL_ENSURE(m_pColumns,"Columns can not be NULL here!");
     sal_Int32 i=0;
     try
@@ -1265,9 +1262,9 @@ void ORowSetBase::firePropertyChange(const ORowSetRow& _rOldRow)
     }
     catch (const Exception&)
     {
-        OSL_FAIL("firePropertyChange: Exception");
+        SAL_WARN("dbaccess", "firePropertyChange: Exception");
     }
-    OSL_TRACE("DBACCESS ORowSetBase::firePropertyChange() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::firePropertyChange() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowSetValue& _rOldValue)
@@ -1278,23 +1275,23 @@ void ORowSetBase::firePropertyChange(sal_Int32 _nPos,const ::connectivity::ORowS
 
 void ORowSetBase::fireRowcount()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::fireRowcount" );
+    SAL_INFO("dbaccess", "ORowSetBase::fireRowcount" );
 }
 
 sal_Bool ORowSetBase::notifyAllListenersCursorBeforeMove(::osl::ResettableMutexGuard& /*_rGuard*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListenersCursorBeforeMove" );
+    SAL_INFO("dbaccess", "ORowSetBase::notifyAllListenersCursorBeforeMove" );
     return sal_True;
 }
 
 void ORowSetBase::notifyAllListenersCursorMoved(::osl::ResettableMutexGuard& /*_rGuard*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListenersCursorMoved" );
+    SAL_INFO("dbaccess", "ORowSetBase::notifyAllListenersCursorMoved" );
 }
 
 void ORowSetBase::notifyAllListeners(::osl::ResettableMutexGuard& /*_rGuard*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::notifyAllListeners" );
+    SAL_INFO("dbaccess", "ORowSetBase::notifyAllListeners" );
 }
 
 sal_Bool ORowSetBase::isPropertyChangeNotificationEnabled() const
@@ -1304,7 +1301,7 @@ sal_Bool ORowSetBase::isPropertyChangeNotificationEnabled() const
 
 void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _bOld )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::fireProperty" );
+    SAL_INFO("dbaccess", "ORowSetBase::fireProperty" );
     Any aNew = bool2any( _bNew );
     Any aOld = bool2any( _bOld );
     fire( &_nProperty, &aNew, &aOld, 1, sal_False );
@@ -1312,8 +1309,8 @@ void ORowSetBase::fireProperty( sal_Int32 _nProperty, sal_Bool _bNew, sal_Bool _
 
 void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::positionCache" );
-    OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::positionCache" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::positionCache() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 
     sal_Bool bSuccess = sal_False;
     if ( m_aBookmark.hasValue() )
@@ -1368,12 +1365,12 @@ void ORowSetBase::positionCache( CursorMoveDirection _ePrepareForDirection )
     OSL_ENSURE( bSuccess, "ORowSetBase::positionCache: failed!" );
     (void)bSuccess;
 
-    OSL_TRACE("DBACCESS ORowSetBase::positionCache() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::positionCache() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 void ORowSetBase::checkCache()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::checkCache" );
+    SAL_INFO("dbaccess", "ORowSetBase::checkCache" );
     ::connectivity::checkDisposed(m_rBHelper.bDisposed);
     if(!m_pCache)
         throwFunctionSequenceException(*m_pMySelf);
@@ -1381,8 +1378,8 @@ void ORowSetBase::checkCache()
 
 void ORowSetBase::movementFailed()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::movementFailed" );
-    OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "ORowSetBase::movementFailed" );
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::movementFailed() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
     m_aOldRow->clearRow();
     m_aCurrentRow   = m_pCache->getEnd();
     m_bBeforeFirst  = m_pCache->isBeforeFirst();
@@ -1390,12 +1387,12 @@ void ORowSetBase::movementFailed()
     m_aBookmark     = Any();
     m_aCurrentRow.setBookmark(m_aBookmark);
     OSL_ENSURE(m_bBeforeFirst || m_bAfterLast,"BeforeFirst or AfterLast is wrong!");
-    OSL_TRACE("DBACCESS ORowSetBase::movementFailed() Clone = %i ID = %i",m_bClone,osl_getThreadIdentifier(NULL));
+    SAL_INFO("dbaccess", "DBACCESS ORowSetBase::movementFailed() Clone = " << m_bClone << " ID = " << osl_getThreadIdentifier(NULL));
 }
 
 ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getOldRow" );
+    SAL_INFO("dbaccess", "ORowSetBase::getOldRow" );
     OSL_ENSURE(m_aOldRow.is(),"RowSetRowHElper isn't valid!");
     ORowSetRow aOldValues;
     if ( !_bWasNew && m_aOldRow->getRow().is() )
@@ -1405,13 +1402,13 @@ ORowSetRow ORowSetBase::getOldRow(sal_Bool _bWasNew)
 
 void ORowSetBase::getPropertyDefaultByHandle( sal_Int32 /*_nHandle*/, Any& _rDefault ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::getPropertyDefaultByHandle" );
+    SAL_INFO("dbaccess", "ORowSetBase::getPropertyDefaultByHandle" );
     _rDefault.clear();
 }
 
 void ORowSetBase::onDeleteRow( const Any& _rBookmark )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::onDeleteRow" );
+    SAL_INFO("dbaccess", "ORowSetBase::onDeleteRow" );
     if ( rowDeleted() )
         // not interested in
         return;
@@ -1427,7 +1424,7 @@ void ORowSetBase::onDeleteRow( const Any& _rBookmark )
 
 void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::onDeletedRow" );
+    SAL_INFO("dbaccess", "ORowSetBase::onDeletedRow" );
     if ( rowDeleted() )
     {
         // if we're a clone, and on a deleted row, and the main RowSet deleted another
@@ -1450,7 +1447,7 @@ void ORowSetBase::onDeletedRow( const Any& _rBookmark, sal_Int32 _nPos )
 
 sal_Int32 ORowSetBase::impl_getRowCount() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetBase::impl_getRowCount" );
+    SAL_INFO("dbaccess", "ORowSetBase::impl_getRowCount" );
     sal_Int32 nRowCount( m_pCache->m_nRowCount );
     if ( const_cast< ORowSetBase* >( this )->rowDeleted() && !m_pCache->m_bNew )
         ++nRowCount;
@@ -1504,7 +1501,7 @@ ORowSetNotifier::ORowSetNotifier( ORowSetBase* _pRowSet,const ORowSetValueVector
 
 ORowSetNotifier::~ORowSetNotifier( )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetNotifier::~ORowSetNotifier" );
+    SAL_INFO("dbaccess", "ORowSetNotifier::~ORowSetNotifier" );
     DBG_DTOR(ORowSetNotifier,NULL);
 }
 
diff --git a/dbaccess/source/core/api/RowSetCacheIterator.cxx b/dbaccess/source/core/api/RowSetCacheIterator.cxx
index 4d0e2320f5fc..020c19f93072 100644
--- a/dbaccess/source/core/api/RowSetCacheIterator.cxx
+++ b/dbaccess/source/core/api/RowSetCacheIterator.cxx
@@ -20,7 +20,6 @@
 #include "RowSetCacheIterator.hxx"
 #include "RowSetCache.hxx"
 #include "RowSetBase.hxx"
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH)
@@ -28,7 +27,7 @@ ORowSetCacheIterator::ORowSetCacheIterator(const ORowSetCacheIterator& _rRH)
 , m_pCache(_rRH.m_pCache)
 ,m_pRowSet(_rRH.m_pRowSet)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::ORowSetCacheIterator" );
+    SAL_INFO("dbaccess", "ORowSetCacheIterator::ORowSetCacheIterator" );
 }
 
 ORowSetCacheIterator::operator ORowSetMatrix::iterator()
@@ -108,13 +107,13 @@ bool ORowSetCacheIterator::operator ==(const ORowSetMatrix::iterator& _rRH) cons
 
 void ORowSetCacheIterator::setBookmark(const ::com::sun::star::uno::Any&    _rBookmark)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::setBookmark" );
+    SAL_INFO("dbaccess", "ORowSetCacheIterator::setBookmark" );
     m_aIter->second.aBookmark = _rBookmark;
 }
 
 sal_Bool ORowSetCacheIterator::isNull() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::isNull" );
+    SAL_INFO("dbaccess", "ORowSetCacheIterator::isNull" );
     sal_Bool bRet = !m_pCache || !m_pRowSet || m_aIter == m_pCache->m_aCacheIterators.end();
     if ( !bRet )
     {
@@ -130,7 +129,7 @@ sal_Bool ORowSetCacheIterator::isNull() const
 
 ::osl::Mutex* ORowSetCacheIterator::getMutex() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ORowSetCacheIterator::getMutex" );
+    SAL_INFO("dbaccess", "ORowSetCacheIterator::getMutex" );
     return m_pRowSet ? m_pRowSet->getMutex() : NULL;
 }
 
diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
index 52926c764b96..c7c5776209b2 100644
--- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
+++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
@@ -48,7 +48,6 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <connectivity/predicateinput.hxx>
-#include <rtl/logfile.hxx>
 #include <unotools/syslocale.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -102,7 +101,7 @@ namespace
     */
     const OSQLParseNode* parseStatement_throwError( OSQLParser& _rParser, const OUString& _rStatement, const Reference< XInterface >& _rxContext )
     {
-        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "SingleSelectQueryComposer.cxx::parseStatement_throwError" );
+        SAL_INFO("dbaccess", "SingleSelectQueryComposer.cxx::parseStatement_throwError" );
         OUString aErrorMsg;
         const OSQLParseNode* pNewSqlParseNode = _rParser.parseTree( aErrorMsg, _rStatement );
         if ( !pNewSqlParseNode )
@@ -149,7 +148,7 @@ namespace
     void parseAndCheck_throwError( OSQLParser& _rParser, const OUString& _rStatement,
         OSQLParseTreeIterator& _rIterator, const Reference< XInterface >& _rxContext )
     {
-        RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "SingleSelectQueryComposer.cxx::parseAndCheck_throwError" );
+        SAL_INFO("dbaccess", "SingleSelectQueryComposer.cxx::parseAndCheck_throwError" );
         const OSQLParseNode* pNode = parseStatement_throwError( _rParser, _rStatement, _rxContext );
         checkForSingleSelect_throwError( pNode, _rIterator, _rxContext, _rStatement );
     }
@@ -238,7 +237,7 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAcc
     ,m_nBoolCompareMode( BooleanComparisonMode::EQUAL_INTEGER )
     ,m_nCommandType(CommandType::COMMAND)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::OSingleSelectQueryComposer" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::OSingleSelectQueryComposer" );
     DBG_CTOR(OSingleSelectQueryComposer,NULL);
 
     if ( !m_aContext.is() || !m_xConnection.is() || !m_xConnectionTables.is() )
@@ -288,7 +287,7 @@ OSingleSelectQueryComposer::~OSingleSelectQueryComposer()
 // OComponentHelper
 void SAL_CALL OSingleSelectQueryComposer::disposing(void)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::disposing" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::disposing" );
     OSubComponent::disposing();
 
     MutexGuard aGuard(m_aMutex);
@@ -309,7 +308,7 @@ IMPLEMENT_PROPERTYCONTAINER_DEFAULTS(OSingleSelectQueryComposer)
 // com::sun::star::lang::XUnoTunnel
 sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getSomething" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getSomething" );
     if (rId.getLength() == 16 && 0 == memcmp(getImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
 
@@ -319,7 +318,7 @@ sal_Int64 SAL_CALL OSingleSelectQueryComposer::getSomething( const Sequence< sal
 // XSingleSelectQueryAnalyzer
 OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getQuery" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -329,7 +328,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQuery(  ) throw(RuntimeExceptio
 
 void SAL_CALL OSingleSelectQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setQuery" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -418,7 +417,7 @@ void SAL_CALL OSingleSelectQueryComposer::setCommand( const OUString& Command,sa
 
 void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setQuery_Impl" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setQuery_Impl" );
     // parse this
     parseAndCheck_throwError( m_aSqlParser, command, m_aSqlIterator, *this );
 
@@ -431,28 +430,28 @@ void OSingleSelectQueryComposer::setQuery_Impl( const OUString& command )
 
 Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredHavingClause(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredHavingClause" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStructuredHavingClause" );
     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleHavingTree);
     return getStructuredCondition(F_tmp);
 }
 
 Sequence< Sequence< PropertyValue > > SAL_CALL OSingleSelectQueryComposer::getStructuredFilter(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredFilter" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStructuredFilter" );
     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree);
     return getStructuredCondition(F_tmp);
 }
 
 void SAL_CALL OSingleSelectQueryComposer::appendHavingClauseByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw (SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendHavingClauseByColumn" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendHavingClauseByColumn" );
     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString> F_tmp(&OSingleSelectQueryComposer::implSetHavingClause);
     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
 }
 
 void SAL_CALL OSingleSelectQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria,sal_Int32 filterOperator ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendFilterByColumn" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendFilterByColumn" );
     ::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString> F_tmp(&OSingleSelectQueryComposer::implSetFilter);
     setConditionByColumn(column,andCriteria,F_tmp,filterOperator);
 }
@@ -525,7 +524,7 @@ OUString OSingleSelectQueryComposer::impl_getColumnName_throw(const Reference< X
 
 void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendOrderByColumn" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendOrderByColumn" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OUString sColumnName( impl_getColumnName_throw(column) );
     OUString sOrder = getOrder();
@@ -540,7 +539,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendOrderByColumn( const Reference<
 
 void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference< XPropertySet >& column) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::appendGroupByColumn" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::appendGroupByColumn" );
     ::osl::MutexGuard aGuard( m_aMutex );
     OUString sColumnName( impl_getColumnName_throw(column) );
     OrderCreator aComposer;
@@ -551,7 +550,7 @@ void SAL_CALL OSingleSelectQueryComposer::appendGroupByColumn( const Reference<
 
 OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vector< OUString >& _rParts )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::composeStatementFromParts" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::composeStatementFromParts" );
     OSL_ENSURE( _rParts.size() == (size_t)SQLPartCount, "OSingleSelectQueryComposer::composeStatementFromParts: invalid parts array!" );
 
     OUStringBuffer aSql( m_aPureSelectSQL );
@@ -567,13 +566,13 @@ OUString OSingleSelectQueryComposer::composeStatementFromParts( const ::std::vec
 
 OUString SAL_CALL OSingleSelectQueryComposer::getElementaryQuery() throw (::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getElementaryQuery" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getElementaryQuery" );
     return composeStatementFromParts( m_aElementaryParts );
 }
 
 void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _rElementary ) throw (::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", "OSingleSelectQueryComposer::setElementaryQuery" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setElementaryQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -599,7 +598,7 @@ void SAL_CALL OSingleSelectQueryComposer::setElementaryQuery( const OUString& _r
     catch( const Exception& e )
     {
         (void)e;
-        OSL_FAIL( "OSingleSelectQueryComposer::setElementaryQuery: there should be no error anymore for the additive statement!" );
+        SAL_WARN("dbaccess", "OSingleSelectQueryComposer::setElementaryQuery: there should be no error anymore for the additive statement!" );
         DBG_UNHANDLED_EXCEPTION();
         // every part of the additive statement should have passed other tests already, and should not
         // be able to cause any errors ... me thinks
@@ -623,7 +622,7 @@ namespace
 
 void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const OUString& _rClause )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setSingleAdditiveClause" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setSingleAdditiveClause" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -680,7 +679,7 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
     catch( const Exception& e )
     {
         (void)e;
-        OSL_FAIL( "OSingleSelectQueryComposer::setSingleAdditiveClause: there should be no error anymore for the additive statement!" );
+        SAL_WARN("dbaccess", "OSingleSelectQueryComposer::setSingleAdditiveClause: there should be no error anymore for the additive statement!" );
         // every part of the additive statement should have passed other tests already, and should not
         // be able to cause any errors ... me thinks
     }
@@ -688,32 +687,32 @@ void OSingleSelectQueryComposer::setSingleAdditiveClause( SQLPart _ePart, const
 
 void SAL_CALL OSingleSelectQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setFilter" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setFilter" );
     setSingleAdditiveClause( Where, filter );
 }
 
 void SAL_CALL OSingleSelectQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setOrder" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setOrder" );
     setSingleAdditiveClause( Order, order );
 }
 
 void SAL_CALL OSingleSelectQueryComposer::setGroup( const OUString& group ) throw (SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setGroup" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setGroup" );
     setSingleAdditiveClause( Group, group );
 }
 
 void SAL_CALL OSingleSelectQueryComposer::setHavingClause( const OUString& filter ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setHavingClause" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setHavingClause" );
     setSingleAdditiveClause( Having, filter );
 }
 
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getTables" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getTables" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -734,7 +733,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getTables(  ) thro
 // XColumnsSupplier
 Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getColumns" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getColumns" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     if ( !!m_aCurrentColumns[SelectColumns] )
@@ -956,7 +955,7 @@ Reference< XNameAccess > SAL_CALL OSingleSelectQueryComposer::getColumns(  ) thr
 sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OSQLParseTreeIterator& _rIterator,
                                     ::std::vector< ::std::vector < PropertyValue > >& rFilters, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setORCriteria" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setORCriteria" );
     // Round brackets around the expression
     if (pCondition->count() == 3 &&
         SQL_ISPUNCTUATION(pCondition->getChild(0),"(") &&
@@ -993,12 +992,12 @@ sal_Bool OSingleSelectQueryComposer::setORCriteria(OSQLParseNode* pCondition, OS
 sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
     OSQLParseTreeIterator& _rIterator, ::std::vector < PropertyValue >& rFilter, const Reference< XNumberFormatter > & xFormatter) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setANDCriteria" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setANDCriteria" );
     // Round brackets
     if (SQL_ISRULE(pCondition,boolean_primary))
     {
         // this should not occur
-        OSL_FAIL("boolean_primary in And-Criteria");
+        SAL_WARN("dbaccess","boolean_primary in And-Criteria");
         return sal_False;
     }
     // The first element is an AND logical expression again
@@ -1050,15 +1049,15 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
             }
             else if (SQL_ISRULE(pCondition,in_predicate))
             {
-                OSL_FAIL( "OSingleSelectQueryComposer::setANDCriteria: in_predicate not implemented!" );
+                SAL_WARN("dbaccess", "OSingleSelectQueryComposer::setANDCriteria: in_predicate not implemented!" );
             }
             else if (SQL_ISRULE(pCondition,all_or_any_predicate))
             {
-                OSL_FAIL( "OSingleSelectQueryComposer::setANDCriteria: all_or_any_predicate not implemented!" );
+                SAL_WARN("dbaccess", "OSingleSelectQueryComposer::setANDCriteria: all_or_any_predicate not implemented!" );
             }
             else if (SQL_ISRULE(pCondition,between_predicate))
             {
-                OSL_FAIL( "OSingleSelectQueryComposer::setANDCriteria: between_predicate not implemented!" );
+                SAL_WARN("dbaccess", "OSingleSelectQueryComposer::setANDCriteria: between_predicate not implemented!" );
             }
 
             rFilter.push_back(aItem);
@@ -1081,7 +1080,7 @@ sal_Bool OSingleSelectQueryComposer::setANDCriteria( OSQLParseNode * pCondition,
 
 sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredicate) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getPredicateType" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getPredicateType" );
     sal_Int32 nPredicate = SQLFilterOperator::EQUAL;
     switch (_pPredicate->getNodeType())
     {
@@ -1104,7 +1103,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
             nPredicate = SQLFilterOperator::GREATER_EQUAL;
             break;
         default:
-            OSL_FAIL("Wrong NodeType!");
+            SAL_WARN("dbaccess","Wrong NodeType!");
     }
     return nPredicate;
 }
@@ -1112,7 +1111,7 @@ sal_Int32 OSingleSelectQueryComposer::getPredicateType(OSQLParseNode * _pPredica
 sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCondition, OSQLParseTreeIterator& _rIterator,
                                             ::std::vector < PropertyValue >& rFilter, const Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setComparsionPredicate" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setComparsionPredicate" );
     OSL_ENSURE(SQL_ISRULE(pCondition, comparison_predicate),"setComparsionPredicate: pCondition ist kein ComparsionPredicate");
     if (SQL_ISRULE(pCondition->getChild(0), column_ref) ||
         SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref))
@@ -1235,7 +1234,7 @@ sal_Bool OSingleSelectQueryComposer::setComparsionPredicate(OSQLParseNode * pCon
 // Functions for analysing SQL
 OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNode* pColumnRef, OSQLParseTreeIterator& _rIterator ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getColumnName" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getColumnName" );
     OUString aTableRange, aColumnName;
     _rIterator.getColumnRange(pColumnRef,aColumnName,aTableRange);
     return aColumnName;
@@ -1243,7 +1242,7 @@ OUString OSingleSelectQueryComposer::getColumnName( ::connectivity::OSQLParseNod
 
 OUString SAL_CALL OSingleSelectQueryComposer::getFilter(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getFilter" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getFilter" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Where,m_aAdditiveIterator,sal_False);
@@ -1251,7 +1250,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getFilter(  ) throw(RuntimeExcepti
 
 OUString SAL_CALL OSingleSelectQueryComposer::getOrder(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getOrder" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getOrder" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Order,m_aAdditiveIterator,sal_False);
@@ -1259,7 +1258,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getOrder(  ) throw(RuntimeExceptio
 
 OUString SAL_CALL OSingleSelectQueryComposer::getGroup(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getGroup" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getGroup" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Group,m_aAdditiveIterator,sal_False);
@@ -1267,7 +1266,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getGroup(  ) throw (RuntimeExcepti
 
 OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getHavingClause" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getHavingClause" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
     return getSQLPart(Having,m_aAdditiveIterator,sal_False);
@@ -1275,7 +1274,7 @@ OUString OSingleSelectQueryComposer::getHavingClause() throw (RuntimeException)
 
 OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet >& column) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getTableAlias" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getTableAlias" );
     OUString sReturn;
     if(m_pTables && m_pTables->getCount() > 1)
     {
@@ -1348,7 +1347,7 @@ OUString OSingleSelectQueryComposer::getTableAlias(const Reference< XPropertySet
 
 Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getParameters" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getParameters" );
     // now set the Parameters
     if ( !m_aCurrentColumns[ParameterColumns] )
     {
@@ -1365,7 +1364,7 @@ Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getParameters(  )
 
 void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearColumns" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::clearColumns" );
     OPrivateColumns* pColumns = m_aCurrentColumns[ _eType ];
     if ( pColumns != NULL )
     {
@@ -1377,7 +1376,7 @@ void OSingleSelectQueryComposer::clearColumns( const EColumnType _eType )
 
 void OSingleSelectQueryComposer::clearCurrentCollections()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::clearCurrentCollections" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::clearCurrentCollections" );
     ::std::vector<OPrivateColumns*>::iterator aIter = m_aCurrentColumns.begin();
     ::std::vector<OPrivateColumns*>::iterator aEnd = m_aCurrentColumns.end();
     for (;aIter != aEnd;++aIter)
@@ -1401,7 +1400,7 @@ void OSingleSelectQueryComposer::clearCurrentCollections()
 Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumnType _eType,
     const ::rtl::Reference< OSQLColumns >& _rCols )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setCurrentColumns" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setCurrentColumns" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -1420,19 +1419,19 @@ Reference< XIndexAccess > OSingleSelectQueryComposer::setCurrentColumns( EColumn
 
 Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getGroupColumns(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getGroupColumns" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getGroupColumns" );
     return setCurrentColumns( GroupByColumns, m_aAdditiveIterator.getGroupColumns() );
 }
 
 Reference< XIndexAccess > SAL_CALL OSingleSelectQueryComposer::getOrderColumns(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getOrderColumns" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getOrderColumns" );
     return setCurrentColumns( OrderColumns, m_aAdditiveIterator.getOrderColumns() );
 }
 
 OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution(  ) throw (SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getQueryWithSubstitution" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getQueryWithSubstitution" );
     ::osl::MutexGuard aGuard( m_aMutex );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
@@ -1451,7 +1450,7 @@ OUString SAL_CALL OSingleSelectQueryComposer::getQueryWithSubstitution(  ) throw
 
 OUString OSingleSelectQueryComposer::getStatementPart( TGetParseNode& _aGetFunctor, OSQLParseTreeIterator& _rIterator )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStatementPart" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStatementPart" );
     OUString sResult;
 
     const OSQLParseNode* pNode = _aGetFunctor( &_rIterator );
@@ -1506,21 +1505,21 @@ namespace
 
 void SAL_CALL OSingleSelectQueryComposer::setStructuredFilter( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, ::com::sun::star::lang::IllegalArgumentException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setStructuredFilter" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setStructuredFilter" );
     OPredicateInputController aPredicateInput(m_aContext, m_xConnection, &m_aParseContext);
     setFilter(lcl_getCondition(filter,aPredicateInput,getColumns()));
 }
 
 void SAL_CALL OSingleSelectQueryComposer::setStructuredHavingClause( const Sequence< Sequence< PropertyValue > >& filter ) throw (SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setStructuredHavingClause" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setStructuredHavingClause" );
     OPredicateInputController aPredicateInput(m_aContext, m_xConnection);
     setHavingClause(lcl_getCondition(filter,aPredicateInput,getColumns()));
 }
 
 void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropertySet >& column, sal_Bool andCriteria ,::std::mem_fun1_t<bool,OSingleSelectQueryComposer,OUString>& _aSetFunctor,sal_Int32 filterOperator)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::setConditionByColumn" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::setConditionByColumn" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     if ( !column.is()
@@ -1683,7 +1682,7 @@ void OSingleSelectQueryComposer::setConditionByColumn( const Reference< XPropert
 
 Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredCondition( TGetParseNode& _aGetFunctor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getStructuredCondition" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getStructuredCondition" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     MutexGuard aGuard(m_aMutex);
@@ -1770,12 +1769,12 @@ Sequence< Sequence< PropertyValue > > OSingleSelectQueryComposer::getStructuredC
 
 OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getKeyword" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getKeyword" );
     OUString sKeyword;
     switch(_ePart)
     {
         default:
-            OSL_FAIL( "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" );
+            SAL_WARN("dbaccess", "OSingleSelectQueryComposer::getKeyWord: Invalid enum value!" );
             // no break, fallback to WHERE
         case Where:
             sKeyword = STR_WHERE;
@@ -1795,7 +1794,7 @@ OUString OSingleSelectQueryComposer::getKeyword( SQLPart _ePart ) const
 
 OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIterator& _rIterator, sal_Bool _bWithKeyword )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OSingleSelectQueryComposer::getSQLPart" );
+    SAL_INFO("dbaccess", "OSingleSelectQueryComposer::getSQLPart" );
     TGetParseNode F_tmp(&OSQLParseTreeIterator::getSimpleWhereTree);
     OUString sKeyword( getKeyword( _ePart ) );
     switch(_ePart)
@@ -1813,7 +1812,7 @@ OUString OSingleSelectQueryComposer::getSQLPart( SQLPart _ePart, OSQLParseTreeIt
             F_tmp = TGetParseNode(&OSQLParseTreeIterator::getSimpleOrderTree);
             break;
         default:
-            OSL_FAIL("Invalid enum value!");
+            SAL_WARN("dbaccess","Invalid enum value!");
     }
 
     OUString sRet = getStatementPart( F_tmp, _rIterator );
diff --git a/dbaccess/source/core/api/StaticSet.cxx b/dbaccess/source/core/api/StaticSet.cxx
index cbac456d9d74..433450e712e1 100644
--- a/dbaccess/source/core/api/StaticSet.cxx
+++ b/dbaccess/source/core/api/StaticSet.cxx
@@ -27,7 +27,6 @@
 #include "apitools.hxx"
 #include <connectivity/CommonTools.hxx>
 #include <comphelper/types.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace connectivity;
@@ -41,34 +40,34 @@ using namespace ::osl;
 
 void OStaticSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 /*_nPosition*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fillValueRow" );
+    SAL_INFO("dbaccess", "OStaticSet::fillValueRow" );
     _rRow = *m_aSetIter;
 }
 
 // ::com::sun::star::sdbcx::XRowLocate
 Any SAL_CALL OStaticSet::getBookmark() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::getBookmark" );
+    SAL_INFO("dbaccess", "OStaticSet::getBookmark" );
     return makeAny(getRow());
 }
 
 sal_Bool SAL_CALL OStaticSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToBookmark" );
+    SAL_INFO("dbaccess", "OStaticSet::moveToBookmark" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return absolute(::comphelper::getINT32(bookmark));
 }
 
 sal_Bool SAL_CALL OStaticSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveRelativeToBookmark" );
+    SAL_INFO("dbaccess", "OStaticSet::moveRelativeToBookmark" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     return absolute(::comphelper::getINT32(bookmark)+rows);
 }
 
 sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::compareBookmarks" );
+    SAL_INFO("dbaccess", "OStaticSet::compareBookmarks" );
     sal_Int32 nFirst = 0, nSecond = 0;
     _first >>= nFirst;
     _second >>= nSecond;
@@ -77,19 +76,19 @@ sal_Int32 SAL_CALL OStaticSet::compareBookmarks( const Any& _first, const Any& _
 
 sal_Bool SAL_CALL OStaticSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::hasOrderedBookmarks" );
+    SAL_INFO("dbaccess", "OStaticSet::hasOrderedBookmarks" );
     return sal_True;
 }
 
 sal_Int32 SAL_CALL OStaticSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::hashBookmark" );
+    SAL_INFO("dbaccess", "OStaticSet::hashBookmark" );
     return ::comphelper::getINT32(bookmark);
 }
 
 sal_Bool OStaticSet::fetchRow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fetchRow" );
+    SAL_INFO("dbaccess", "OStaticSet::fetchRow" );
     sal_Bool bRet = sal_False;
     if ( !m_bEnd && (!m_nMaxRows || sal_Int32(m_aSet.size()) < m_nMaxRows) )
         bRet = m_xDriverSet->next();
@@ -107,7 +106,7 @@ sal_Bool OStaticSet::fetchRow()
 
 void OStaticSet::fillAllRows()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::fillAllRows" );
+    SAL_INFO("dbaccess", "OStaticSet::fillAllRows" );
     if(!m_bEnd)
     {
         sal_Int32 nColumnCount = m_xSetMetaData->getColumnCount();
@@ -126,7 +125,7 @@ void OStaticSet::fillAllRows()
 // XResultSet
 sal_Bool SAL_CALL OStaticSet::next(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::next" );
+    SAL_INFO("dbaccess", "OStaticSet::next" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 
     if(isAfterLast())
@@ -144,38 +143,38 @@ sal_Bool SAL_CALL OStaticSet::next(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OStaticSet::isBeforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isBeforeFirst" );
+    SAL_INFO("dbaccess", "OStaticSet::isBeforeFirst" );
     return m_aSetIter == m_aSet.begin();
 }
 
 sal_Bool SAL_CALL OStaticSet::isAfterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isAfterLast" );
+    SAL_INFO("dbaccess", "OStaticSet::isAfterLast" );
     return m_aSetIter == m_aSet.end() && m_bEnd;
 }
 
 sal_Bool SAL_CALL OStaticSet::isFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isFirst" );
+    SAL_INFO("dbaccess", "OStaticSet::isFirst" );
     return m_aSetIter == m_aSet.begin()+1;
 }
 
 sal_Bool SAL_CALL OStaticSet::isLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::isLast" );
+    SAL_INFO("dbaccess", "OStaticSet::isLast" );
     return m_aSetIter == m_aSet.end()-1 && m_bEnd;
 }
 
 void SAL_CALL OStaticSet::beforeFirst(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::beforeFirst" );
+    SAL_INFO("dbaccess", "OStaticSet::beforeFirst" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aSetIter = m_aSet.begin();
 }
 
 void SAL_CALL OStaticSet::afterLast(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::afterLast" );
+    SAL_INFO("dbaccess", "OStaticSet::afterLast" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     fillAllRows();
     m_aSetIter = m_aSet.end();
@@ -183,7 +182,7 @@ void SAL_CALL OStaticSet::afterLast(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OStaticSet::first(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::first" );
+    SAL_INFO("dbaccess", "OStaticSet::first" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     m_aSetIter = m_aSet.begin()+1;
     if(m_aSetIter == m_aSet.end() && !fetchRow())
@@ -194,7 +193,7 @@ sal_Bool SAL_CALL OStaticSet::first(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OStaticSet::last(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::last" );
+    SAL_INFO("dbaccess", "OStaticSet::last" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     fillAllRows();
     m_aSetIter = m_aSet.end()-1;
@@ -204,7 +203,7 @@ sal_Bool SAL_CALL OStaticSet::last(  ) throw(SQLException, RuntimeException)
 
 sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::getRow" );
+    SAL_INFO("dbaccess", "OStaticSet::getRow" );
     OSL_ENSURE(!isAfterLast(),"getRow is not allowed when afterlast record!");
     OSL_ENSURE(!isBeforeFirst(),"getRow is not allowed when beforefirst record!");
 
@@ -215,7 +214,7 @@ sal_Int32 SAL_CALL OStaticSet::getRow(  ) throw(SQLException, RuntimeException)
 
 sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::absolute" );
+    SAL_INFO("dbaccess", "OStaticSet::absolute" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
     OSL_ENSURE(row,"OStaticSet::absolute: INVALID row number!");
     // if row greater 0 than count from end - row means last
@@ -256,7 +255,7 @@ sal_Bool SAL_CALL OStaticSet::absolute( sal_Int32 row ) throw(SQLException, Runt
 
 sal_Bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::relative" );
+    SAL_INFO("dbaccess", "OStaticSet::relative" );
     if(!rows)
         return sal_True;
 
@@ -266,7 +265,7 @@ sal_Bool SAL_CALL OStaticSet::relative( sal_Int32 rows ) throw(SQLException, Run
 
 sal_Bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::previous" );
+    SAL_INFO("dbaccess", "OStaticSet::previous" );
     m_bInserted = m_bUpdated = m_bDeleted = sal_False;
 
     if(m_aSetIter != m_aSet.begin())
@@ -277,30 +276,30 @@ sal_Bool SAL_CALL OStaticSet::previous(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL OStaticSet::refreshRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::refreshRow" );
+    SAL_INFO("dbaccess", "OStaticSet::refreshRow" );
 }
 
 sal_Bool SAL_CALL OStaticSet::rowUpdated(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowUpdated" );
+    SAL_INFO("dbaccess", "OStaticSet::rowUpdated" );
     return m_bUpdated;
 }
 
 sal_Bool SAL_CALL OStaticSet::rowInserted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowInserted" );
+    SAL_INFO("dbaccess", "OStaticSet::rowInserted" );
     return m_bInserted;
 }
 
 sal_Bool SAL_CALL OStaticSet::rowDeleted(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::rowDeleted" );
+    SAL_INFO("dbaccess", "OStaticSet::rowDeleted" );
     return m_bDeleted;
 }
 
 Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& rows,const connectivity::OSQLTable& _xTable ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRows" );
+    SAL_INFO("dbaccess", "OStaticSet::deleteRows" );
     Sequence< sal_Int32 > aRet(rows.getLength());
     const Any* pBegin   = rows.getConstArray();
     const Any* pEnd     = pBegin + rows.getLength();
@@ -314,7 +313,7 @@ Sequence< sal_Int32 > SAL_CALL OStaticSet::deleteRows( const Sequence< Any >& ro
 
 void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& _xTable ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::insertRow" );
+    SAL_INFO("dbaccess", "OStaticSet::insertRow" );
     OCacheSet::insertRow( _rInsertRow,_xTable);
     if(m_bInserted)
     {
@@ -327,13 +326,13 @@ void SAL_CALL OStaticSet::insertRow( const ORowSetRow& _rInsertRow,const connect
 
 void SAL_CALL OStaticSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::updateRow" );
+    SAL_INFO("dbaccess", "OStaticSet::updateRow" );
     OCacheSet::updateRow( _rInsertRow,_rOrginalRow,_xTable);
 }
 
 void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connectivity::OSQLTable& _xTable  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::deleteRow" );
+    SAL_INFO("dbaccess", "OStaticSet::deleteRow" );
     OCacheSet::deleteRow(_rDeleteRow,_xTable);
     if(m_bDeleted)
     {
@@ -346,16 +345,16 @@ void SAL_CALL OStaticSet::deleteRow(const ORowSetRow& _rDeleteRow ,const connect
 
 void SAL_CALL OStaticSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::cancelRowUpdates" );
+    SAL_INFO("dbaccess", "OStaticSet::cancelRowUpdates" );
 }
 
 void SAL_CALL OStaticSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToInsertRow" );
+    SAL_INFO("dbaccess", "OStaticSet::moveToInsertRow" );
 }
 
 void SAL_CALL OStaticSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStaticSet::moveToCurrentRow" );
+    SAL_INFO("dbaccess", "OStaticSet::moveToCurrentRow" );
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx
index 1994facb573a..2707b124de1b 100644
--- a/dbaccess/source/core/api/TableDeco.cxx
+++ b/dbaccess/source/core/api/TableDeco.cxx
@@ -42,7 +42,6 @@
 #include <connectivity/dbexception.hxx>
 #include <comphelper/extract.hxx>
 #include "ContainerMediator.hxx"
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace ::com::sun::star::uno;
@@ -74,7 +73,7 @@ ODBTableDecorator::ODBTableDecorator( const Reference< XConnection >& _rxConnect
     ,m_nPrivileges(-1)
     ,m_pColumns(NULL)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::ODBTableDecorator" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::ODBTableDecorator" );
     DBG_CTOR(ODBTableDecorator, NULL);
     ODataSettings::registerPropertiesFor(this);
 }
@@ -88,7 +87,7 @@ ODBTableDecorator::~ODBTableDecorator()
 
 Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getImplementationId" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -105,7 +104,7 @@ Sequence< sal_Int8 > ODBTableDecorator::getImplementationId() throw (RuntimeExce
 // OComponentHelper
 void SAL_CALL ODBTableDecorator::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::disposing" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::disposing" );
     OPropertySetHelper::disposing();
     OTableDescriptor_BASE::disposing();
 
@@ -172,11 +171,11 @@ sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue(
 
 void ODBTableDecorator::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) throw (Exception)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setFastPropertyValue_NoBroadcast" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::setFastPropertyValue_NoBroadcast" );
     switch(_nHandle)
     {
         case PROPERTY_ID_PRIVILEGES:
-            OSL_FAIL("Property is readonly!");
+            SAL_WARN("dbaccess", "Property is readonly!");
         case PROPERTY_ID_FILTER:
         case PROPERTY_ID_ORDER:
         case PROPERTY_ID_APPLYFILTER:
@@ -315,13 +314,13 @@ void ODBTableDecorator::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) c
             }
             break;
         default:
-            OSL_FAIL("Invalid Handle for table");
+            SAL_WARN("dbaccess", "Invalid Handle for table");
     }
 }
 
 void ODBTableDecorator::construct()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::construct" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::construct" );
     sal_Bool bNotFound = sal_True;
     Reference<XPropertySet> xProp(m_xTable,UNO_QUERY);
     if ( xProp.is() )
@@ -411,7 +410,7 @@ Sequence< Type > SAL_CALL ODBTableDecorator::getTypes(  ) throw(RuntimeException
 // XRename,
 void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::rename" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::rename" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     Reference<XRename> xRename(m_xTable,UNO_QUERY);
@@ -426,7 +425,7 @@ void SAL_CALL ODBTableDecorator::rename( const OUString& _rNewName ) throw(SQLEx
 // XAlterTable,
 void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByName" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::alterColumnByName" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY);
@@ -442,7 +441,7 @@ void SAL_CALL ODBTableDecorator::alterColumnByName( const OUString& _rName, cons
 
 void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, IndexOutOfBoundsException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::alterColumnByIndex" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::alterColumnByIndex" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     Reference<XAlterTable> xAlter(m_xTable,UNO_QUERY);
@@ -458,7 +457,7 @@ void SAL_CALL ODBTableDecorator::alterColumnByIndex( sal_Int32 _nIndex, const Re
 
 Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getIndexes" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getIndexes" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     return Reference< XIndexesSupplier>(m_xTable,UNO_QUERY)->getIndexes();
@@ -466,7 +465,7 @@ Reference< XNameAccess> ODBTableDecorator::getIndexes() throw (RuntimeException)
 
 Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getKeys" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getKeys" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     return Reference< XKeysSupplier>(m_xTable,UNO_QUERY)->getKeys();
@@ -474,7 +473,7 @@ Reference< XIndexAccess> ODBTableDecorator::getKeys() throw (RuntimeException)
 
 Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getColumns" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getColumns" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
 
@@ -486,7 +485,7 @@ Reference< XNameAccess> ODBTableDecorator::getColumns() throw (RuntimeException)
 
 OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getName" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getName" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
     Reference<XNamed> xName(m_xTable,UNO_QUERY);
@@ -496,7 +495,7 @@ OUString SAL_CALL ODBTableDecorator::getName() throw(RuntimeException)
 
 sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getSomething" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getSomething" );
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
 
@@ -509,7 +508,7 @@ sal_Int64 SAL_CALL ODBTableDecorator::getSomething( const Sequence< sal_Int8 >&
 
 Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getUnoTunnelImplementationId" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getUnoTunnelImplementationId" );
     static ::cppu::OImplementationId * pId = 0;
     if (! pId)
     {
@@ -525,7 +524,7 @@ Sequence< sal_Int8 > ODBTableDecorator::getUnoTunnelImplementationId()
 
 void ODBTableDecorator::fillPrivileges() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::fillPrivileges" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::fillPrivileges" );
     // somebody is asking for the privileges and we do not know them, yet
     m_nPrivileges = 0;
     try
@@ -550,13 +549,13 @@ void ODBTableDecorator::fillPrivileges() const
     catch(const SQLException& e)
     {
         (void)e;
-        OSL_FAIL("ODBTableDecorator::ODBTableDecorator : could not collect the privileges !");
+        SAL_WARN("dbaccess", "ODBTableDecorator::ODBTableDecorator : could not collect the privileges !");
     }
 }
 
 Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createDataDescriptor" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::createDataDescriptor" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
 
@@ -576,13 +575,13 @@ Reference< XPropertySet > SAL_CALL ODBTableDecorator::createDataDescriptor(  ) t
 
 Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL ODBTableDecorator::getPropertySetInfo(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::getPropertySetInfo" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::getPropertySetInfo" );
     return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper());
 }
 
 void ODBTableDecorator::refreshColumns()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::refreshColumns" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::refreshColumns" );
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
 
@@ -620,7 +619,7 @@ void ODBTableDecorator::refreshColumns()
 
 OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumn" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::createColumn" );
     OColumn* pReturn = NULL;
 
     Reference<XNameAccess> xNames;
@@ -644,13 +643,13 @@ OColumn* ODBTableDecorator::createColumn(const OUString& _rName) const
 
 void ODBTableDecorator::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnAppended" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::columnAppended" );
     // not interested in
 }
 
 void ODBTableDecorator::columnDropped(const OUString& _sName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::columnDropped" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::columnDropped" );
     Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY);
     if ( xDrop.is() && m_xColumnDefinitions->hasByName(_sName) )
         xDrop->dropByName(_sName);
@@ -658,7 +657,7 @@ void ODBTableDecorator::columnDropped(const OUString& _sName)
 
 Reference< XPropertySet > ODBTableDecorator::createColumnDescriptor()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::createColumnDescriptor" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::createColumnDescriptor" );
     Reference<XDataDescriptorFactory> xNames;
     if(m_xTable.is())
         xNames.set(m_xTable->getColumns(),UNO_QUERY);
@@ -680,7 +679,7 @@ void SAL_CALL ODBTableDecorator::release() throw()
 
 void SAL_CALL ODBTableDecorator::setName( const OUString& /*aName*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTableDecorator::setName" );
+    SAL_INFO("dbaccess", "ODBTableDecorator::setName" );
     throwFunctionNotSupportedException( "XNamed::setName", *this );
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/WrappedResultSet.cxx b/dbaccess/source/core/api/WrappedResultSet.cxx
index 6fa18a837ad5..a7c312316988 100644
--- a/dbaccess/source/core/api/WrappedResultSet.cxx
+++ b/dbaccess/source/core/api/WrappedResultSet.cxx
@@ -22,7 +22,6 @@
 #include "core_resource.hrc"
 #include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <connectivity/dbexception.hxx>
-#include <rtl/logfile.hxx>
 
 #include <limits>
 
@@ -39,7 +38,7 @@ using namespace ::osl;
 
 void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const OUString& i_sRowSetFilter)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::construct" );
+    SAL_INFO("dbaccess", "WrappedResultSet::construct" );
     OCacheSet::construct(_xDriverSet,i_sRowSetFilter);
     m_xUpd.set(_xDriverSet,UNO_QUERY_THROW);
     m_xRowLocate.set(_xDriverSet,UNO_QUERY_THROW);
@@ -48,7 +47,7 @@ void WrappedResultSet::construct(const Reference< XResultSet>& _xDriverSet,const
 
 Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::getBookmark" );
+    SAL_INFO("dbaccess", "WrappedResultSet::getBookmark" );
     if ( m_xRowLocate.is() )
     {
         return m_xRowLocate->getBookmark( );
@@ -58,38 +57,38 @@ Any SAL_CALL WrappedResultSet::getBookmark() throw(SQLException, RuntimeExceptio
 
 sal_Bool SAL_CALL WrappedResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToBookmark" );
+    SAL_INFO("dbaccess", "WrappedResultSet::moveToBookmark" );
     return m_xRowLocate->moveToBookmark( bookmark );
 }
 
 sal_Bool SAL_CALL WrappedResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveRelativeToBookmark" );
+    SAL_INFO("dbaccess", "WrappedResultSet::moveRelativeToBookmark" );
     return m_xRowLocate->moveRelativeToBookmark( bookmark,rows );
 }
 
 sal_Int32 SAL_CALL WrappedResultSet::compareBookmarks( const Any& _first, const Any& _second ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::compareBookmarks" );
+    SAL_INFO("dbaccess", "WrappedResultSet::compareBookmarks" );
     return m_xRowLocate->compareBookmarks( _first,_second );
 }
 
 sal_Bool SAL_CALL WrappedResultSet::hasOrderedBookmarks(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hasOrderedBookmarks" );
+    SAL_INFO("dbaccess", "WrappedResultSet::hasOrderedBookmarks" );
     return m_xRowLocate->hasOrderedBookmarks();
 }
 
 sal_Int32 SAL_CALL WrappedResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::hashBookmark" );
+    SAL_INFO("dbaccess", "WrappedResultSet::hashBookmark" );
     return m_xRowLocate->hashBookmark(bookmark);
 }
 
 // ::com::sun::star::sdbcx::XDeleteRows
 Sequence< sal_Int32 > SAL_CALL WrappedResultSet::deleteRows( const Sequence< Any >& rows ,const connectivity::OSQLTable& /*_xTable*/) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::deleteRows" );
+    SAL_INFO("dbaccess", "WrappedResultSet::deleteRows" );
     Reference< ::com::sun::star::sdbcx::XDeleteRows> xDeleteRow(m_xRowLocate,UNO_QUERY);
     if(xDeleteRow.is())
     {
@@ -100,7 +99,7 @@ Sequence< sal_Int32 > SAL_CALL WrappedResultSet::deleteRows( const Sequence< Any
 
 void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const connectivity::OSQLTable& /*_xTable*/ ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::insertRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::insertRow" );
 
     m_xUpd->moveToInsertRow();
     sal_Int32 i = 1;
@@ -116,7 +115,7 @@ void SAL_CALL WrappedResultSet::insertRow( const ORowSetRow& _rInsertRow,const c
 
 void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const ORowSetRow& _rOrginalRow,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::updateRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::updateRow" );
     sal_Int32 i = 1;
     connectivity::ORowVector< ORowSetValue > ::Vector::const_iterator aOrgIter = _rOrginalRow->get().begin()+1;
     connectivity::ORowVector< ORowSetValue > ::Vector::iterator aEnd = _rInsertRow->get().end();
@@ -130,37 +129,37 @@ void SAL_CALL WrappedResultSet::updateRow(const ORowSetRow& _rInsertRow ,const O
 
 void SAL_CALL WrappedResultSet::deleteRow(const ORowSetRow& /*_rDeleteRow*/ ,const connectivity::OSQLTable& /*_xTable*/  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::deleteRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::deleteRow" );
     m_xUpd->deleteRow();
 }
 
 void SAL_CALL WrappedResultSet::cancelRowUpdates(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::cancelRowUpdates" );
+    SAL_INFO("dbaccess", "WrappedResultSet::cancelRowUpdates" );
     m_xUpd->cancelRowUpdates();
 }
 
 void SAL_CALL WrappedResultSet::moveToInsertRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToInsertRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::moveToInsertRow" );
     m_xUpd->moveToInsertRow();
 }
 
 void SAL_CALL WrappedResultSet::moveToCurrentRow(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::moveToCurrentRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::moveToCurrentRow" );
     m_xUpd->moveToCurrentRow();
 }
 
 void WrappedResultSet::fillValueRow(ORowSetRow& _rRow,sal_Int32 _nPosition)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::fillValueRow" );
+    SAL_INFO("dbaccess", "WrappedResultSet::fillValueRow" );
     OCacheSet::fillValueRow(_rRow,_nPosition);
 }
 
 void WrappedResultSet::updateColumn(sal_Int32 nPos,Reference< XRowUpdate > _xParameter,const ORowSetValue& _rValue)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "WrappedResultSet::updateColumn" );
+    SAL_INFO("dbaccess", "WrappedResultSet::updateColumn" );
     if(_rValue.isBound() && _rValue.isModified())
     {
         if(_rValue.isNull())
diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx
index 355bb0bb066a..e595520cbb0b 100644
--- a/dbaccess/source/core/api/callablestatement.cxx
+++ b/dbaccess/source/core/api/callablestatement.cxx
@@ -22,7 +22,6 @@
 #include <cppuhelper/typeprovider.hxx>
 #include <comphelper/property.hxx>
 #include "dbastrings.hrc"
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace ::com::sun::star::sdbc;
@@ -36,7 +35,7 @@ using namespace ::osl;
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTypes" );
+    SAL_INFO("dbaccess", "OCallableStatement::getTypes" );
     OTypeCollection aTypes(::getCppuType( (const Reference< XRow > *)0 ),
                            ::getCppuType( (const Reference< XOutParameters > *)0 ),
                             OPreparedStatement::getTypes() );
@@ -46,7 +45,7 @@ Sequence< Type > OCallableStatement::getTypes() throw (RuntimeException)
 
 Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationId" );
+    SAL_INFO("dbaccess", "OCallableStatement::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -63,7 +62,7 @@ Sequence< sal_Int8 > OCallableStatement::getImplementationId() throw (RuntimeExc
 // com::sun::star::uno::XInterface
 Any OCallableStatement::queryInterface( const Type & rType ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::queryInterface" );
+    //SAL_INFO("dbaccess", "OCallableStatement::queryInterface" );
     Any aIface = OPreparedStatement::queryInterface( rType );
     if (!aIface.hasValue())
         aIface = ::cppu::queryInterface(
@@ -86,13 +85,13 @@ void OCallableStatement::release() throw ()
 // XServiceInfo
 OUString OCallableStatement::getImplementationName(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getImplementationName" );
+    SAL_INFO("dbaccess", "OCallableStatement::getImplementationName" );
     return OUString("com.sun.star.sdb.OCallableStatement");
 }
 
 Sequence< OUString > OCallableStatement::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getSupportedServiceNames" );
+    SAL_INFO("dbaccess", "OCallableStatement::getSupportedServiceNames" );
     Sequence< OUString > aSNS( 2 );
     aSNS.getArray()[0] = SERVICE_SDBC_CALLABLESTATEMENT;
     aSNS.getArray()[1] = SERVICE_SDB_CALLABLESTATEMENT;
@@ -102,7 +101,7 @@ Sequence< OUString > OCallableStatement::getSupportedServiceNames(  ) throw (Run
 // XOutParameters
 void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerOutParameter" );
+    SAL_INFO("dbaccess", "OCallableStatement::registerOutParameter" );
     MutexGuard aGuard(m_aMutex);
 
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -112,7 +111,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex
 
 void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::registerNumericOutParameter" );
+    SAL_INFO("dbaccess", "OCallableStatement::registerNumericOutParameter" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -122,7 +121,7 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet
 // XRow
 sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::wasNull" );
+    SAL_INFO("dbaccess", "OCallableStatement::wasNull" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -131,7 +130,7 @@ sal_Bool SAL_CALL OCallableStatement::wasNull(  ) throw(SQLException, RuntimeExc
 
 OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getString" );
+    SAL_INFO("dbaccess", "OCallableStatement::getString" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -140,7 +139,7 @@ OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(S
 
 sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBoolean" );
+    SAL_INFO("dbaccess", "OCallableStatement::getBoolean" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -149,7 +148,7 @@ sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(
 
 sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getByte" );
+    SAL_INFO("dbaccess", "OCallableStatement::getByte" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -158,7 +157,7 @@ sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQL
 
 sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getShort" );
+    SAL_INFO("dbaccess", "OCallableStatement::getShort" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getShort( columnIndex );
@@ -166,7 +165,7 @@ sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(S
 
 sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getInt" );
+    SAL_INFO("dbaccess", "OCallableStatement::getInt" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getInt( columnIndex );
@@ -174,7 +173,7 @@ sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQL
 
 sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getLong" );
+    SAL_INFO("dbaccess", "OCallableStatement::getLong" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getLong( columnIndex );
@@ -182,7 +181,7 @@ sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQ
 
 float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getFloat" );
+    SAL_INFO("dbaccess", "OCallableStatement::getFloat" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getFloat( columnIndex );
@@ -190,7 +189,7 @@ float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLEx
 
 double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getDouble" );
+    SAL_INFO("dbaccess", "OCallableStatement::getDouble" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDouble( columnIndex );
@@ -198,7 +197,7 @@ double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQL
 
 Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBytes" );
+    SAL_INFO("dbaccess", "OCallableStatement::getBytes" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBytes( columnIndex );
@@ -206,7 +205,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
 
 ::com::sun::star::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getDate" );
+    SAL_INFO("dbaccess", "OCallableStatement::getDate" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getDate( columnIndex );
@@ -214,7 +213,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
 
 ::com::sun::star::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTime" );
+    SAL_INFO("dbaccess", "OCallableStatement::getTime" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getTime( columnIndex );
@@ -222,7 +221,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
 
 ::com::sun::star::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getTimestamp" );
+    SAL_INFO("dbaccess", "OCallableStatement::getTimestamp" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -231,7 +230,7 @@ Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnInde
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBinaryStream" );
+    SAL_INFO("dbaccess", "OCallableStatement::getBinaryStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -240,7 +239,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get
 
 Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getCharacterStream" );
+    SAL_INFO("dbaccess", "OCallableStatement::getCharacterStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -249,7 +248,7 @@ Reference< ::com::sun::star::io::XInputStream > SAL_CALL OCallableStatement::get
 
 Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getObject" );
+    SAL_INFO("dbaccess", "OCallableStatement::getObject" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -258,7 +257,7 @@ Any SAL_CALL OCallableStatement::getObject( sal_Int32 columnIndex, const Referen
 
 Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getRef" );
+    SAL_INFO("dbaccess", "OCallableStatement::getRef" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getRef( columnIndex );
@@ -266,7 +265,7 @@ Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 columnIndex ) t
 
 Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getBlob" );
+    SAL_INFO("dbaccess", "OCallableStatement::getBlob" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getBlob( columnIndex );
@@ -274,7 +273,7 @@ Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 columnIndex )
 
 Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getClob" );
+    SAL_INFO("dbaccess", "OCallableStatement::getClob" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getClob( columnIndex );
@@ -282,7 +281,7 @@ Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 columnIndex )
 
 Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OCallableStatement::getArray" );
+    SAL_INFO("dbaccess", "OCallableStatement::getArray" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     return Reference< XRow >(m_xAggregateAsSet, UNO_QUERY)->getArray( columnIndex );
diff --git a/dbaccess/source/core/api/querycomposer.cxx b/dbaccess/source/core/api/querycomposer.cxx
index 98d6bc94bed8..70cc6cee2829 100644
--- a/dbaccess/source/core/api/querycomposer.cxx
+++ b/dbaccess/source/core/api/querycomposer.cxx
@@ -42,7 +42,6 @@
 #include "HelperCollections.hxx"
 #include "composertools.hxx"
 #include <algorithm>
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace dbtools;
@@ -67,7 +66,7 @@ DBG_NAME(OQueryComposer)
 OQueryComposer::OQueryComposer(const Reference< XConnection>& _xConnection)
  : OSubComponent(m_aMutex,_xConnection)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::OQueryComposer" );
+    SAL_INFO("dbaccess", "OQueryComposer::OQueryComposer" );
     DBG_CTOR(OQueryComposer,NULL);
     OSL_ENSURE(_xConnection.is()," Connection cant be null!");
 
@@ -83,7 +82,7 @@ OQueryComposer::~OQueryComposer()
 
 void SAL_CALL OQueryComposer::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::disposing" );
+    SAL_INFO("dbaccess", "OQueryComposer::disposing" );
     ::comphelper::disposeComponent(m_xComposerHelper);
     ::comphelper::disposeComponent(m_xComposer);
 }
@@ -91,13 +90,13 @@ void SAL_CALL OQueryComposer::disposing()
 // ::com::sun::star::lang::XTypeProvider
 Sequence< Type > SAL_CALL OQueryComposer::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getTypes" );
+    SAL_INFO("dbaccess", "OQueryComposer::getTypes" );
     return ::comphelper::concatSequences(OSubComponent::getTypes(),OQueryComposer_BASE::getTypes());
 }
 
 Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getImplementationId" );
+    SAL_INFO("dbaccess", "OQueryComposer::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -114,7 +113,7 @@ Sequence< sal_Int8 > SAL_CALL OQueryComposer::getImplementationId() throw (Runti
 // com::sun::star::lang::XUnoTunnel
 sal_Int64 SAL_CALL OQueryComposer::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSomething" );
+    SAL_INFO("dbaccess", "OQueryComposer::getSomething" );
     if (rId.getLength() == 16 && 0 == memcmp(getImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         return reinterpret_cast<sal_Int64>(this);
 
@@ -123,7 +122,7 @@ sal_Int64 SAL_CALL OQueryComposer::getSomething( const Sequence< sal_Int8 >& rId
 
 Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::queryInterface" );
+    //SAL_INFO("dbaccess", "OQueryComposer::queryInterface" );
     Any aRet = OSubComponent::queryInterface(rType);
     if(!aRet.hasValue())
         aRet = OQueryComposer_BASE::queryInterface(rType);
@@ -133,19 +132,19 @@ Any SAL_CALL OQueryComposer::queryInterface( const Type & rType ) throw(RuntimeE
 // XServiceInfo
 OUString OQueryComposer::getImplementationName(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getImplementationName" );
+    SAL_INFO("dbaccess", "OQueryComposer::getImplementationName" );
     return OUString("com.sun.star.sdb.dbaccess.OQueryComposer");
 }
 
 sal_Bool OQueryComposer::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::supportsService" );
+    SAL_INFO("dbaccess", "OQueryComposer::supportsService" );
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
 Sequence< OUString > OQueryComposer::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getSupportedServiceNames" );
+    SAL_INFO("dbaccess", "OQueryComposer::getSupportedServiceNames" );
     Sequence< OUString > aSNS( 1 );
     aSNS[0] = SERVICE_SDB_SQLQUERYCOMPOSER;
     return aSNS;
@@ -154,7 +153,7 @@ Sequence< OUString > OQueryComposer::getSupportedServiceNames(  ) throw (Runtime
 // XSQLQueryComposer
 OUString SAL_CALL OQueryComposer::getQuery(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getQuery" );
+    SAL_INFO("dbaccess", "OQueryComposer::getQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -167,7 +166,7 @@ OUString SAL_CALL OQueryComposer::getQuery(  ) throw(RuntimeException)
 
 void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setQuery" );
+    SAL_INFO("dbaccess", "OQueryComposer::setQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -179,7 +178,7 @@ void SAL_CALL OQueryComposer::setQuery( const OUString& command ) throw(SQLExcep
 
 OUString SAL_CALL OQueryComposer::getComposedQuery(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getComposedQuery" );
+    SAL_INFO("dbaccess", "OQueryComposer::getComposedQuery" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     MutexGuard aGuard(m_aMutex);
@@ -189,7 +188,7 @@ OUString SAL_CALL OQueryComposer::getComposedQuery(  ) throw(RuntimeException)
 
 OUString SAL_CALL OQueryComposer::getFilter(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getFilter" );
+    SAL_INFO("dbaccess", "OQueryComposer::getFilter" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     MutexGuard aGuard(m_aMutex);
     FilterCreator aFilterCreator;
@@ -199,7 +198,7 @@ OUString SAL_CALL OQueryComposer::getFilter(  ) throw(RuntimeException)
 
 Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilter(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getStructuredFilter" );
+    SAL_INFO("dbaccess", "OQueryComposer::getStructuredFilter" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     MutexGuard aGuard(m_aMutex);
@@ -208,7 +207,7 @@ Sequence< Sequence< PropertyValue > > SAL_CALL OQueryComposer::getStructuredFilt
 
 OUString SAL_CALL OQueryComposer::getOrder(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getOrder" );
+    SAL_INFO("dbaccess", "OQueryComposer::getOrder" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -219,7 +218,7 @@ OUString SAL_CALL OQueryComposer::getOrder(  ) throw(RuntimeException)
 
 void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySet >& column ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::appendFilterByColumn" );
+    SAL_INFO("dbaccess", "OQueryComposer::appendFilterByColumn" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -236,7 +235,7 @@ void SAL_CALL OQueryComposer::appendFilterByColumn( const Reference< XPropertySe
 
 void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet >& column, sal_Bool ascending ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::appendOrderByColumn" );
+    SAL_INFO("dbaccess", "OQueryComposer::appendOrderByColumn" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
     ::osl::MutexGuard aGuard( m_aMutex );
 
@@ -253,7 +252,7 @@ void SAL_CALL OQueryComposer::appendOrderByColumn( const Reference< XPropertySet
 
 void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setFilter" );
+    SAL_INFO("dbaccess", "OQueryComposer::setFilter" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -270,7 +269,7 @@ void SAL_CALL OQueryComposer::setFilter( const OUString& filter ) throw(SQLExcep
 
 void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::setOrder" );
+    SAL_INFO("dbaccess", "OQueryComposer::setOrder" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -289,7 +288,7 @@ void SAL_CALL OQueryComposer::setOrder( const OUString& order ) throw(SQLExcepti
 // XTablesSupplier
 Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getTables" );
+    SAL_INFO("dbaccess", "OQueryComposer::getTables" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -299,7 +298,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getTables(  ) throw(RuntimeExc
 // XColumnsSupplier
 Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getColumns" );
+    SAL_INFO("dbaccess", "OQueryComposer::getColumns" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
@@ -308,7 +307,7 @@ Reference< XNameAccess > SAL_CALL OQueryComposer::getColumns(  ) throw(RuntimeEx
 
 Reference< XIndexAccess > SAL_CALL OQueryComposer::getParameters(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OQueryComposer::getParameters" );
+    SAL_INFO("dbaccess", "OQueryComposer::getParameters" );
     ::connectivity::checkDisposed(OSubComponent::rBHelper.bDisposed);
 
     ::osl::MutexGuard aGuard( m_aMutex );
diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx
index 6c6257de7760..3476b654a3f6 100644
--- a/dbaccess/source/core/api/resultset.cxx
+++ b/dbaccess/source/core/api/resultset.cxx
@@ -34,7 +34,6 @@
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <osl/thread.h>
-#include <rtl/logfile.hxx>
 
 
 using namespace ::com::sun::star::sdbc;
@@ -59,7 +58,7 @@ OResultSet::OResultSet(const ::com::sun::star::uno::Reference< ::com::sun::star:
            ,m_aWarnings( Reference< XWarningsSupplier >( _xResultSet, UNO_QUERY ) )
            ,m_bIsBookmarkable(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::OResultSet" );
+    SAL_INFO("dbaccess", "OResultSet::OResultSet" );
     DBG_CTOR(OResultSet, NULL);
 
     m_pColumns = new OColumns(*this, m_aMutex, _bCaseSensitive, ::std::vector< OUString>(), NULL,NULL);
@@ -105,7 +104,7 @@ OResultSet::~OResultSet()
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > OResultSet::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTypes" );
+    SAL_INFO("dbaccess", "OResultSet::getTypes" );
     OTypeCollection aTypes(::getCppuType( (const Reference< XPropertySet > *)0 ),
                            OResultSetBase::getTypes());
 
@@ -114,7 +113,7 @@ Sequence< Type > OResultSet::getTypes() throw (RuntimeException)
 
 Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationId" );
+    SAL_INFO("dbaccess", "OResultSet::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -131,7 +130,6 @@ Sequence< sal_Int8 > OResultSet::getImplementationId() throw (RuntimeException)
 // com::sun::star::uno::XInterface
 Any OResultSet::queryInterface( const Type & rType ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::queryInterface" );
     Any aIface = OResultSetBase::queryInterface( rType );
     if (!aIface.hasValue())
         aIface = ::cppu::queryInterface(
@@ -155,7 +153,7 @@ void OResultSet::release() throw ()
 // OResultSetBase
 void OResultSet::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::disposing" );
+    SAL_INFO("dbaccess", "OResultSet::disposing" );
     OPropertySetHelper::disposing();
 
     MutexGuard aGuard(m_aMutex);
@@ -176,7 +174,7 @@ void OResultSet::disposing()
 // XCloseable
 void OResultSet::close(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::close" );
+    SAL_INFO("dbaccess", "OResultSet::close" );
     {
         MutexGuard aGuard( m_aMutex );
         ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
@@ -187,19 +185,19 @@ void OResultSet::close(void) throw( SQLException, RuntimeException )
 // XServiceInfo
 OUString OResultSet::getImplementationName(  ) throw(RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getImplementationName" );
+    //SAL_INFO("dbaccess", "OResultSet::getImplementationName" );
     return OUString("com.sun.star.sdb.OResultSet");
 }
 
 sal_Bool OResultSet::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::supportsService" );
+    //SAL_INFO("dbaccess", "OResultSet::supportsService" );
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
 Sequence< OUString > OResultSet::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getSupportedServiceNames" );
+    //SAL_INFO("dbaccess", "OResultSet::getSupportedServiceNames" );
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDBC_RESULTSET;
     aSNS[1] = SERVICE_SDB_RESULTSET;
@@ -209,14 +207,14 @@ Sequence< OUString > OResultSet::getSupportedServiceNames(  ) throw (RuntimeExce
 // com::sun::star::beans::XPropertySet
 Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getPropertySetInfo" );
+    //SAL_INFO("dbaccess", "OResultSet::getPropertySetInfo" );
     return createPropertySetInfo( getInfoHelper() ) ;
 }
 
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* OResultSet::createArrayHelper( ) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::createArrayHelper" );
+    //SAL_INFO("dbaccess", "OResultSet::createArrayHelper" );
     BEGIN_PROPERTY_HELPER(6)
         DECL_PROP1(CURSORNAME,              OUString,    READONLY);
         DECL_PROP0(FETCHDIRECTION,          sal_Int32);
@@ -230,13 +228,13 @@ Reference< XPropertySetInfo > OResultSet::getPropertySetInfo() throw (RuntimeExc
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& OResultSet::getInfoHelper()
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getInfoHelper" );
+    //SAL_INFO("dbaccess", "OResultSet::getInfoHelper" );
     return *getArrayHelper();
 }
 
 sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::convertFastPropertyValue" );
+    //SAL_INFO("dbaccess", "OResultSet::convertFastPropertyValue" );
     // be lazy ...
     rConvertedValue = rValue;
     getFastPropertyValue( rOldValue, nHandle );
@@ -245,7 +243,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & rConvertedValue, Any & rOldV
 
 void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::setFastPropertyValue_NoBroadcast" );
+    //SAL_INFO("dbaccess", "OResultSet::setFastPropertyValue_NoBroadcast" );
     // set it for the driver result set
     Reference< XPropertySet > xSet(m_xDelegatorResultSet, UNO_QUERY);
     switch (nHandle)
@@ -257,13 +255,13 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any&
             xSet->setPropertyValue(PROPERTY_FETCHSIZE, rValue);
             break;
         default:
-            OSL_FAIL("unknown Property");
+            SAL_WARN("dbaccess", "unknown Property");
     }
 }
 
 void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getFastPropertyValue" );
+    //SAL_INFO("dbaccess", "OResultSet::getFastPropertyValue" );
     switch (nHandle)
     {
         case PROPERTY_ID_ISBOOKMARKABLE:
@@ -289,7 +287,7 @@ void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 // XWarningsSupplier
 Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getWarnings" );
+    SAL_INFO("dbaccess", "OResultSet::getWarnings" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
     return m_aWarnings.getWarnings();
@@ -297,7 +295,7 @@ Any OResultSet::getWarnings(void) throw( SQLException, RuntimeException )
 
 void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::clearWarnings" );
+    SAL_INFO("dbaccess", "OResultSet::clearWarnings" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
     m_aWarnings.clearWarnings();
@@ -306,7 +304,7 @@ void OResultSet::clearWarnings(void) throw( SQLException, RuntimeException )
 // ::com::sun::star::sdbc::XResultSetMetaDataSupplier
 Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getMetaData" );
+    SAL_INFO("dbaccess", "OResultSet::getMetaData" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -316,7 +314,7 @@ Reference< XResultSetMetaData > OResultSet::getMetaData(void) throw( SQLExceptio
 // ::com::sun::star::sdbc::XColumnLocate
 sal_Int32 OResultSet::findColumn(const OUString& columnName) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::findColumn" );
+    SAL_INFO("dbaccess", "OResultSet::findColumn" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -351,7 +349,7 @@ namespace
 // ::com::sun::star::sdbcx::XColumnsSupplier
 Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getColumns" );
+    SAL_INFO("dbaccess", "OResultSet::getColumns" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -422,7 +420,7 @@ Reference< ::com::sun::star::container::XNameAccess > OResultSet::getColumns(voi
 // ::com::sun::star::sdbc::XRow
 sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::wasNull" );
+    SAL_INFO("dbaccess", "OResultSet::wasNull" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -431,7 +429,7 @@ sal_Bool OResultSet::wasNull(void) throw( SQLException, RuntimeException )
 
 OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getString" );
+    //SAL_INFO("dbaccess", "OResultSet::getString" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -440,7 +438,7 @@ OUString OResultSet::getString(sal_Int32 columnIndex) throw( SQLException, Runti
 
 sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBoolean" );
+    //SAL_INFO("dbaccess", "OResultSet::getBoolean" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -449,7 +447,7 @@ sal_Bool OResultSet::getBoolean(sal_Int32 columnIndex) throw( SQLException, Runt
 
 sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getByte" );
+    SAL_INFO("dbaccess", "OResultSet::getByte" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -458,7 +456,7 @@ sal_Int8 OResultSet::getByte(sal_Int32 columnIndex) throw( SQLException, Runtime
 
 sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getShort" );
+    SAL_INFO("dbaccess", "OResultSet::getShort" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -467,7 +465,7 @@ sal_Int16 OResultSet::getShort(sal_Int32 columnIndex) throw( SQLException, Runti
 
 sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getInt" );
+    SAL_INFO("dbaccess", "OResultSet::getInt" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -476,7 +474,7 @@ sal_Int32 OResultSet::getInt(sal_Int32 columnIndex) throw( SQLException, Runtime
 
 sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getLong" );
+    SAL_INFO("dbaccess", "OResultSet::getLong" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -485,7 +483,7 @@ sal_Int64 OResultSet::getLong(sal_Int32 columnIndex) throw( SQLException, Runtim
 
 float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getFloat" );
+    SAL_INFO("dbaccess", "OResultSet::getFloat" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -494,7 +492,7 @@ float OResultSet::getFloat(sal_Int32 columnIndex) throw( SQLException, RuntimeEx
 
 double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getDouble" );
+    SAL_INFO("dbaccess", "OResultSet::getDouble" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -503,7 +501,7 @@ double OResultSet::getDouble(sal_Int32 columnIndex) throw( SQLException, Runtime
 
 Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBytes" );
+    SAL_INFO("dbaccess", "OResultSet::getBytes" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -512,7 +510,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
 
 ::com::sun::star::util::Date OResultSet::getDate(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getDate" );
+    SAL_INFO("dbaccess", "OResultSet::getDate" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -521,7 +519,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
 
 ::com::sun::star::util::Time OResultSet::getTime(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTime" );
+    SAL_INFO("dbaccess", "OResultSet::getTime" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -530,7 +528,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
 
 ::com::sun::star::util::DateTime OResultSet::getTimestamp(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getTimestamp" );
+    SAL_INFO("dbaccess", "OResultSet::getTimestamp" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -539,7 +537,7 @@ Sequence< sal_Int8 > OResultSet::getBytes(sal_Int32 columnIndex) throw( SQLExcep
 
 Reference< ::com::sun::star::io::XInputStream >  OResultSet::getBinaryStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBinaryStream" );
+    SAL_INFO("dbaccess", "OResultSet::getBinaryStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -548,7 +546,7 @@ Reference< ::com::sun::star::io::XInputStream >  OResultSet::getBinaryStream(sal
 
 Reference< ::com::sun::star::io::XInputStream >  OResultSet::getCharacterStream(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getCharacterStream" );
+    SAL_INFO("dbaccess", "OResultSet::getCharacterStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -557,7 +555,7 @@ Reference< ::com::sun::star::io::XInputStream >  OResultSet::getCharacterStream(
 
 Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::star::container::XNameAccess > & typeMap) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getObject" );
+    SAL_INFO("dbaccess", "OResultSet::getObject" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -566,7 +564,7 @@ Any OResultSet::getObject(sal_Int32 columnIndex, const Reference< ::com::sun::st
 
 Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getRef" );
+    SAL_INFO("dbaccess", "OResultSet::getRef" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -575,7 +573,7 @@ Reference< XRef >  OResultSet::getRef(sal_Int32 columnIndex) throw( SQLException
 
 Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBlob" );
+    SAL_INFO("dbaccess", "OResultSet::getBlob" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -584,7 +582,7 @@ Reference< XBlob >  OResultSet::getBlob(sal_Int32 columnIndex) throw( SQLExcepti
 
 Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getClob" );
+    SAL_INFO("dbaccess", "OResultSet::getClob" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -593,7 +591,7 @@ Reference< XClob >  OResultSet::getClob(sal_Int32 columnIndex) throw( SQLExcepti
 
 Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getArray" );
+    SAL_INFO("dbaccess", "OResultSet::getArray" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -603,7 +601,7 @@ Reference< XArray >  OResultSet::getArray(sal_Int32 columnIndex) throw( SQLExcep
 // ::com::sun::star::sdbc::XRowUpdate
 void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateNull" );
+    SAL_INFO("dbaccess", "OResultSet::updateNull" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -614,7 +612,7 @@ void OResultSet::updateNull(sal_Int32 columnIndex) throw( SQLException, RuntimeE
 
 void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBoolean" );
+    SAL_INFO("dbaccess", "OResultSet::updateBoolean" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -625,7 +623,7 @@ void OResultSet::updateBoolean(sal_Int32 columnIndex, sal_Bool x) throw( SQLExce
 
 void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateByte" );
+    SAL_INFO("dbaccess", "OResultSet::updateByte" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -636,7 +634,7 @@ void OResultSet::updateByte(sal_Int32 columnIndex, sal_Int8 x) throw( SQLExcepti
 
 void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateShort" );
+    SAL_INFO("dbaccess", "OResultSet::updateShort" );
         MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -647,7 +645,7 @@ void OResultSet::updateShort(sal_Int32 columnIndex, sal_Int16 x) throw( SQLExcep
 
 void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateInt" );
+    SAL_INFO("dbaccess", "OResultSet::updateInt" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -658,7 +656,7 @@ void OResultSet::updateInt(sal_Int32 columnIndex, sal_Int32 x) throw( SQLExcepti
 
 void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateLong" );
+    SAL_INFO("dbaccess", "OResultSet::updateLong" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -669,7 +667,7 @@ void OResultSet::updateLong(sal_Int32 columnIndex, sal_Int64 x) throw( SQLExcept
 
 void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateFloat" );
+    SAL_INFO("dbaccess", "OResultSet::updateFloat" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -680,7 +678,7 @@ void OResultSet::updateFloat(sal_Int32 columnIndex, float x) throw( SQLException
 
 void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateDouble" );
+    SAL_INFO("dbaccess", "OResultSet::updateDouble" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -691,7 +689,7 @@ void OResultSet::updateDouble(sal_Int32 columnIndex, double x) throw( SQLExcepti
 
 void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateString" );
+    SAL_INFO("dbaccess", "OResultSet::updateString" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -702,7 +700,7 @@ void OResultSet::updateString(sal_Int32 columnIndex, const OUString& x) throw( S
 
 void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBytes" );
+    SAL_INFO("dbaccess", "OResultSet::updateBytes" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -713,7 +711,7 @@ void OResultSet::updateBytes(sal_Int32 columnIndex, const Sequence< sal_Int8 >&
 
 void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util::Date& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateDate" );
+    SAL_INFO("dbaccess", "OResultSet::updateDate" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -724,7 +722,7 @@ void OResultSet::updateDate(sal_Int32 columnIndex, const ::com::sun::star::util:
 
 void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util::Time& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateTime" );
+    SAL_INFO("dbaccess", "OResultSet::updateTime" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -735,7 +733,7 @@ void OResultSet::updateTime(sal_Int32 columnIndex, const ::com::sun::star::util:
 
 void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateTimestamp" );
+    SAL_INFO("dbaccess", "OResultSet::updateTimestamp" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -746,7 +744,7 @@ void OResultSet::updateTimestamp(sal_Int32 columnIndex, const ::com::sun::star::
 
 void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateBinaryStream" );
+    SAL_INFO("dbaccess", "OResultSet::updateBinaryStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -757,7 +755,7 @@ void OResultSet::updateBinaryStream(sal_Int32 columnIndex, const Reference< ::co
 
 void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream > & x, sal_Int32 length) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateCharacterStream" );
+    SAL_INFO("dbaccess", "OResultSet::updateCharacterStream" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -768,7 +766,7 @@ void OResultSet::updateCharacterStream(sal_Int32 columnIndex, const Reference< :
 
 void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_Int32 scale) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateNumericObject" );
+    SAL_INFO("dbaccess", "OResultSet::updateNumericObject" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -779,7 +777,7 @@ void OResultSet::updateNumericObject(sal_Int32 columnIndex, const Any& x, sal_In
 
 void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateObject" );
+    SAL_INFO("dbaccess", "OResultSet::updateObject" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -791,7 +789,7 @@ void OResultSet::updateObject(sal_Int32 columnIndex, const Any& x) throw( SQLExc
 // ::com::sun::star::sdbc::XResultSet
 sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::next" );
+    SAL_INFO("dbaccess", "OResultSet::next" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -800,7 +798,7 @@ sal_Bool OResultSet::next(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isBeforeFirst" );
+    SAL_INFO("dbaccess", "OResultSet::isBeforeFirst" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -809,7 +807,7 @@ sal_Bool OResultSet::isBeforeFirst(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isAfterLast" );
+    SAL_INFO("dbaccess", "OResultSet::isAfterLast" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -818,7 +816,7 @@ sal_Bool OResultSet::isAfterLast(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isFirst" );
+    SAL_INFO("dbaccess", "OResultSet::isFirst" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -827,7 +825,7 @@ sal_Bool OResultSet::isFirst(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::isLast" );
+    SAL_INFO("dbaccess", "OResultSet::isLast" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -836,7 +834,7 @@ sal_Bool OResultSet::isLast(void) throw( SQLException, RuntimeException )
 
 void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::beforeFirst" );
+    SAL_INFO("dbaccess", "OResultSet::beforeFirst" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -845,7 +843,7 @@ void OResultSet::beforeFirst(void) throw( SQLException, RuntimeException )
 
 void OResultSet::afterLast(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::afterLast" );
+    SAL_INFO("dbaccess", "OResultSet::afterLast" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -854,7 +852,7 @@ void OResultSet::afterLast(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::first" );
+    SAL_INFO("dbaccess", "OResultSet::first" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -863,7 +861,7 @@ sal_Bool OResultSet::first(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::last" );
+    SAL_INFO("dbaccess", "OResultSet::last" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -872,7 +870,7 @@ sal_Bool OResultSet::last(void) throw( SQLException, RuntimeException )
 
 sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getRow" );
+    SAL_INFO("dbaccess", "OResultSet::getRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -881,7 +879,7 @@ sal_Int32 OResultSet::getRow(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::absolute" );
+    SAL_INFO("dbaccess", "OResultSet::absolute" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -890,7 +888,7 @@ sal_Bool OResultSet::absolute(sal_Int32 row) throw( SQLException, RuntimeExcepti
 
 sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::relative" );
+    SAL_INFO("dbaccess", "OResultSet::relative" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -899,7 +897,7 @@ sal_Bool OResultSet::relative(sal_Int32 rows) throw( SQLException, RuntimeExcept
 
 sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::previous" );
+    SAL_INFO("dbaccess", "OResultSet::previous" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -908,7 +906,7 @@ sal_Bool OResultSet::previous(void) throw( SQLException, RuntimeException )
 
 void OResultSet::refreshRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::refreshRow" );
+    SAL_INFO("dbaccess", "OResultSet::refreshRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -917,7 +915,7 @@ void OResultSet::refreshRow(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowUpdated" );
+    SAL_INFO("dbaccess", "OResultSet::rowUpdated" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -926,7 +924,7 @@ sal_Bool OResultSet::rowUpdated(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowInserted" );
+    SAL_INFO("dbaccess", "OResultSet::rowInserted" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -935,7 +933,7 @@ sal_Bool OResultSet::rowInserted(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::rowDeleted" );
+    SAL_INFO("dbaccess", "OResultSet::rowDeleted" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -944,7 +942,7 @@ sal_Bool OResultSet::rowDeleted(void) throw( SQLException, RuntimeException )
 
 Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getStatement" );
+    SAL_INFO("dbaccess", "OResultSet::getStatement" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -954,7 +952,7 @@ Reference< XInterface > OResultSet::getStatement(void) throw( SQLException, Runt
 // ::com::sun::star::sdbcx::XRowLocate
 Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::getBookmark" );
+    SAL_INFO("dbaccess", "OResultSet::getBookmark" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -965,7 +963,7 @@ Any OResultSet::getBookmark(void) throw( SQLException, RuntimeException )
 
 sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToBookmark" );
+    SAL_INFO("dbaccess", "OResultSet::moveToBookmark" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -976,7 +974,7 @@ sal_Bool OResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, Ru
 
 sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveRelativeToBookmark" );
+    SAL_INFO("dbaccess", "OResultSet::moveRelativeToBookmark" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -987,7 +985,7 @@ sal_Bool OResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows)
 
 sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::compareBookmarks" );
+    SAL_INFO("dbaccess", "OResultSet::compareBookmarks" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -998,7 +996,7 @@ sal_Int32 OResultSet::compareBookmarks(const Any& _first, const Any& _second) th
 
 sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::hasOrderedBookmarks" );
+    SAL_INFO("dbaccess", "OResultSet::hasOrderedBookmarks" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1009,7 +1007,7 @@ sal_Bool OResultSet::hasOrderedBookmarks(void) throw( SQLException, RuntimeExcep
 
 sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::hashBookmark" );
+    SAL_INFO("dbaccess", "OResultSet::hashBookmark" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1021,7 +1019,7 @@ sal_Int32 OResultSet::hashBookmark(const Any& bookmark) throw( SQLException, Run
 // ::com::sun::star::sdbc::XResultSetUpdate
 void OResultSet::insertRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::insertRow" );
+    SAL_INFO("dbaccess", "OResultSet::insertRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1032,7 +1030,7 @@ void OResultSet::insertRow(void) throw( SQLException, RuntimeException )
 
 void OResultSet::updateRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::updateRow" );
+    SAL_INFO("dbaccess", "OResultSet::updateRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1043,7 +1041,7 @@ void OResultSet::updateRow(void) throw( SQLException, RuntimeException )
 
 void OResultSet::deleteRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::deleteRow" );
+    SAL_INFO("dbaccess", "OResultSet::deleteRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1054,7 +1052,7 @@ void OResultSet::deleteRow(void) throw( SQLException, RuntimeException )
 
 void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::cancelRowUpdates" );
+    SAL_INFO("dbaccess", "OResultSet::cancelRowUpdates" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1065,7 +1063,7 @@ void OResultSet::cancelRowUpdates(void) throw( SQLException, RuntimeException )
 
 void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToInsertRow" );
+    SAL_INFO("dbaccess", "OResultSet::moveToInsertRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1076,7 +1074,7 @@ void OResultSet::moveToInsertRow(void) throw( SQLException, RuntimeException )
 
 void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::moveToCurrentRow" );
+    SAL_INFO("dbaccess", "OResultSet::moveToCurrentRow" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OResultSetBase::rBHelper.bDisposed);
 
@@ -1087,7 +1085,7 @@ void OResultSet::moveToCurrentRow(void) throw( SQLException, RuntimeException )
 
 void OResultSet::checkReadOnly() const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::checkReadOnly" );
+    //SAL_INFO("dbaccess", "OResultSet::checkReadOnly" );
     if  (   ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
         ||  !m_xDelegatorResultSetUpdate.is()
         )
@@ -1096,7 +1094,7 @@ void OResultSet::checkReadOnly() const
 
 void OResultSet::checkBookmarkable() const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OResultSet::checkBookmarkable" );
+    //SAL_INFO("dbaccess", "OResultSet::checkBookmarkable" );
     if ( !m_bIsBookmarkable )
         throwSQLException( "The result set does not have bookmark support.", SQL_GENERAL_ERROR, *const_cast< OResultSet* >( this ) );
 }
diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx
index 14a37fda575a..eb98b17def2c 100644
--- a/dbaccess/source/core/api/statement.cxx
+++ b/dbaccess/source/core/api/statement.cxx
@@ -29,7 +29,6 @@
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/dbexception.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star::sdb;
 using namespace ::com::sun::star::sdbc;
@@ -51,7 +50,7 @@ OStatementBase::OStatementBase(const Reference< XConnection > & _xConn,
     ,m_bEscapeProcessing( sal_True )
 
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::OStatementBase" );
+    SAL_INFO("dbaccess", "OStatementBase::OStatementBase" );
     DBG_CTOR(OStatementBase, NULL);
     OSL_ENSURE(_xStatement.is() ,"Statement is NULL!");
     m_xAggregateAsSet.set(_xStatement,UNO_QUERY);
@@ -66,7 +65,7 @@ OStatementBase::~OStatementBase()
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > OStatementBase::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getTypes" );
+    SAL_INFO("dbaccess", "OStatementBase::getTypes" );
     OTypeCollection aTypes(::getCppuType( (const Reference< XPropertySet > *)0 ),
                            ::getCppuType( (const Reference< XWarningsSupplier > *)0 ),
                            ::getCppuType( (const Reference< XCloseable > *)0 ),
@@ -86,7 +85,6 @@ Sequence< Type > OStatementBase::getTypes() throw (RuntimeException)
 // com::sun::star::uno::XInterface
 Any OStatementBase::queryInterface( const Type & rType ) throw (RuntimeException)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::queryInterface" );
     Any aIface = OSubComponent::queryInterface( rType );
     if (!aIface.hasValue())
     {
@@ -125,7 +123,7 @@ void OStatementBase::release() throw ()
 
 void OStatementBase::disposeResultSet()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::disposeResultSet" );
+    SAL_INFO("dbaccess", "OStatementBase::disposeResultSet" );
     // free the cursor if alive
     Reference< XComponent > xComp(m_aResultSet.get(), UNO_QUERY);
     if (xComp.is())
@@ -136,7 +134,7 @@ void OStatementBase::disposeResultSet()
 // OComponentHelper
 void OStatementBase::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::disposing" );
+    SAL_INFO("dbaccess", "OStatementBase::disposing" );
     OPropertySetHelper::disposing();
 
     MutexGuard aGuard(m_aMutex);
@@ -169,7 +167,7 @@ void OStatementBase::disposing()
 // XCloseable
 void OStatementBase::close(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::close" );
+    SAL_INFO("dbaccess", "OStatementBase::close" );
     {
         MutexGuard aGuard( m_aMutex );
         ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
@@ -180,14 +178,14 @@ void OStatementBase::close(void) throw( SQLException, RuntimeException )
 // OPropertySetHelper
 Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getPropertySetInfo" );
+    SAL_INFO("dbaccess", "OStatementBase::getPropertySetInfo" );
     return createPropertySetInfo( getInfoHelper() ) ;
 }
 
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* OStatementBase::createArrayHelper( ) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::createArrayHelper" );
+    //SAL_INFO("dbaccess", "OStatementBase::createArrayHelper" );
     BEGIN_PROPERTY_HELPER(10)
         DECL_PROP0(CURSORNAME,              OUString);
         DECL_PROP0_BOOL(ESCAPE_PROCESSING);
@@ -205,13 +203,13 @@ Reference< XPropertySetInfo > OStatementBase::getPropertySetInfo() throw (Runtim
 // cppu::OPropertySetHelper
 ::cppu::IPropertyArrayHelper& OStatementBase::getInfoHelper()
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getInfoHelper" );
+    //SAL_INFO("dbaccess", "OStatementBase::getInfoHelper" );
     return *getArrayHelper();
 }
 
 sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) throw( IllegalArgumentException  )
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::convertFastPropertyValue" );
+    //SAL_INFO("dbaccess", "OStatementBase::convertFastPropertyValue" );
     sal_Bool bModified(sal_False);
     switch (nHandle)
     {
@@ -246,7 +244,7 @@ sal_Bool OStatementBase::convertFastPropertyValue( Any & rConvertedValue, Any &
 
 void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::setFastPropertyValue_NoBroadcast" );
+    //SAL_INFO("dbaccess", "OStatementBase::setFastPropertyValue_NoBroadcast" );
     switch ( nHandle )
     {
         case PROPERTY_ID_USEBOOKMARKS:
@@ -276,7 +274,7 @@ void OStatementBase::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
 
 void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getFastPropertyValue" );
+    //SAL_INFO("dbaccess", "OStatementBase::getFastPropertyValue" );
     switch (nHandle)
     {
         case PROPERTY_ID_USEBOOKMARKS:
@@ -303,7 +301,7 @@ void OStatementBase::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
 // XWarningsSupplier
 Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getWarnings" );
+    SAL_INFO("dbaccess", "OStatementBase::getWarnings" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -312,7 +310,7 @@ Any OStatementBase::getWarnings(void) throw( SQLException, RuntimeException )
 
 void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::clearWarnings" );
+    SAL_INFO("dbaccess", "OStatementBase::clearWarnings" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -322,7 +320,7 @@ void OStatementBase::clearWarnings(void) throw( SQLException, RuntimeException )
 // ::com::sun::star::util::XCancellable
 void OStatementBase::cancel(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::cancel" );
+    SAL_INFO("dbaccess", "OStatementBase::cancel" );
     // no blocking as cancel is typically called from a different thread
     ClearableMutexGuard aCancelGuard(m_aCancelMutex);
     if (m_xAggregateAsCancellable.is())
@@ -333,7 +331,7 @@ void OStatementBase::cancel(void) throw( RuntimeException )
 // XMultipleResults
 Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getResultSet" );
+    SAL_INFO("dbaccess", "OStatementBase::getResultSet" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -347,7 +345,7 @@ Reference< XResultSet > SAL_CALL OStatementBase::getResultSet(  ) throw(SQLExcep
 
 sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getUpdateCount" );
+    SAL_INFO("dbaccess", "OStatementBase::getUpdateCount" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -361,7 +359,7 @@ sal_Int32 SAL_CALL OStatementBase::getUpdateCount(  ) throw(SQLException, Runtim
 
 sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getMoreResults" );
+    SAL_INFO("dbaccess", "OStatementBase::getMoreResults" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -379,7 +377,7 @@ sal_Bool SAL_CALL OStatementBase::getMoreResults(  ) throw(SQLException, Runtime
 // XPreparedBatchExecution
 void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::addBatch" );
+    SAL_INFO("dbaccess", "OStatementBase::addBatch" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -393,7 +391,7 @@ void SAL_CALL OStatementBase::addBatch(  ) throw(SQLException, RuntimeException)
 
 void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::clearBatch" );
+    SAL_INFO("dbaccess", "OStatementBase::clearBatch" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -407,7 +405,7 @@ void SAL_CALL OStatementBase::clearBatch(  ) throw(SQLException, RuntimeExceptio
 
 Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::executeBatch" );
+    SAL_INFO("dbaccess", "OStatementBase::executeBatch" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -424,7 +422,7 @@ Sequence< sal_Int32 > SAL_CALL OStatementBase::executeBatch(  ) throw(SQLExcepti
 
 Reference< XResultSet > SAL_CALL OStatementBase::getGeneratedValues(  ) throw (SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatementBase::getGeneratedValues" );
+    SAL_INFO("dbaccess", "OStatementBase::getGeneratedValues" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     Reference< XGeneratedResultSet > xGRes(m_xAggregateAsSet, UNO_QUERY);
@@ -441,7 +439,7 @@ OStatement::OStatement( const Reference< XConnection >& _xConn, const Reference<
     :OStatementBase( _xConn, _xStatement )
     ,m_bAttemptedComposerCreation( false )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::OStatement" );
+    SAL_INFO("dbaccess", "OStatement::OStatement" );
     m_xAggregateStatement.set( _xStatement, UNO_QUERY_THROW );
 }
 
@@ -451,19 +449,19 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OStatementBase, OStatement_IFACE )
 // XServiceInfo
 OUString OStatement::getImplementationName(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getImplementationName" );
+    SAL_INFO("dbaccess", "OStatement::getImplementationName" );
     return OUString("com.sun.star.sdb.OStatement");
 }
 
 sal_Bool OStatement::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::supportsService" );
+    SAL_INFO("dbaccess", "OStatement::supportsService" );
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
 Sequence< OUString > OStatement::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getSupportedServiceNames" );
+    SAL_INFO("dbaccess", "OStatement::getSupportedServiceNames" );
     Sequence< OUString > aSNS( 1 );
     aSNS.getArray()[0] = SERVICE_SDBC_STATEMENT;
     return aSNS;
@@ -472,7 +470,7 @@ Sequence< OUString > OStatement::getSupportedServiceNames(  ) throw (RuntimeExce
 // XStatement
 Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeQuery" );
+    SAL_INFO("dbaccess", "OStatement::executeQuery" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -499,7 +497,7 @@ Reference< XResultSet > OStatement::executeQuery( const OUString& _rSQL ) throw(
 
 sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::executeUpdate" );
+    SAL_INFO("dbaccess", "OStatement::executeUpdate" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -511,7 +509,7 @@ sal_Int32 OStatement::executeUpdate( const OUString& _rSQL ) throw( SQLException
 
 sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
+    SAL_INFO("dbaccess", "OStatement::execute" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -523,7 +521,7 @@ sal_Bool OStatement::execute( const OUString& _rSQL ) throw( SQLException, Runti
 
 void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
+    SAL_INFO("dbaccess", "OStatement::execute" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
 
@@ -538,7 +536,7 @@ void OStatement::addBatch( const OUString& _rSQL ) throw( SQLException, RuntimeE
 
 void OStatement::clearBatch( ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
+    SAL_INFO("dbaccess", "OStatement::execute" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     // first check the meta data
@@ -551,7 +549,7 @@ void OStatement::clearBatch( ) throw( SQLException, RuntimeException )
 
 Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::execute" );
+    SAL_INFO("dbaccess", "OStatement::execute" );
     MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed(OComponentHelper::rBHelper.bDisposed);
     // first check the meta data
@@ -564,13 +562,13 @@ Sequence< sal_Int32 > OStatement::executeBatch( ) throw( SQLException, RuntimeEx
 
 Reference< XConnection > OStatement::getConnection(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::getConnection" );
+    SAL_INFO("dbaccess", "OStatement::getConnection" );
     return Reference< XConnection >( m_xParent, UNO_QUERY );
 }
 
 void SAL_CALL OStatement::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::disposing" );
+    SAL_INFO("dbaccess", "OStatement::disposing" );
     OStatementBase::disposing();
     m_xComposer.clear();
     m_xAggregateStatement.clear();
@@ -578,7 +576,7 @@ void SAL_CALL OStatement::disposing()
 
 OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_doEscapeProcessing_nothrow" );
+    SAL_INFO("dbaccess", "OStatement::impl_doEscapeProcessing_nothrow" );
     if ( !m_bEscapeProcessing )
         return _rSQL;
     try
@@ -607,7 +605,7 @@ OUString OStatement::impl_doEscapeProcessing_nothrow( const OUString& _rSQL ) co
 
 bool OStatement::impl_ensureComposer_nothrow() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "OStatement::impl_ensureComposer_nothrow" );
+    SAL_INFO("dbaccess", "OStatement::impl_ensureComposer_nothrow" );
     if ( m_bAttemptedComposerCreation )
         return m_xComposer.is();
 
diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx
index 3fdb456761c5..2cd8ef522813 100644
--- a/dbaccess/source/core/api/table.cxx
+++ b/dbaccess/source/core/api/table.cxx
@@ -47,7 +47,6 @@
 
 #include "sdbcoretools.hxx"
 #include "ContainerMediator.hxx"
-#include <rtl/logfile.hxx>
 
 using namespace dbaccess;
 using namespace connectivity;
@@ -79,7 +78,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
     ,m_xColumnDefinitions(_xColumnDefinitions)
     ,m_nPrivileges(0)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::ODBTable" );
+    SAL_INFO("dbaccess", "ODBTable::ODBTable" );
     DBG_CTOR(ODBTable, NULL);
     OSL_ENSURE(getMetaData().is(), "ODBTable::ODBTable : invalid conn !");
     OSL_ENSURE(!_rName.isEmpty(), "ODBTable::ODBTable : name !");
@@ -96,7 +95,7 @@ ODBTable::ODBTable(connectivity::sdbcx::OCollection* _pTables
     ,m_nPrivileges(-1)
 {
     DBG_CTOR(ODBTable, NULL);
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::ODBTable" );
+    SAL_INFO("dbaccess", "ODBTable::ODBTable" );
 }
 
 ODBTable::~ODBTable()
@@ -108,7 +107,7 @@ IMPLEMENT_FORWARD_REFCOUNT(ODBTable,OTable_Base)
 
 OColumn* ODBTable::createColumn(const OUString& _rName) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumn" );
+    SAL_INFO("dbaccess", "ODBTable::createColumn" );
     OColumn* pReturn = NULL;
 
     Reference<XPropertySet> xProp;
@@ -132,13 +131,13 @@ OColumn* ODBTable::createColumn(const OUString& _rName) const
 
 void ODBTable::columnAppended( const Reference< XPropertySet >& /*_rxSourceDescriptor*/ )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnAppended" );
+    SAL_INFO("dbaccess", "ODBTable::columnAppended" );
     // not interested in
 }
 
 void ODBTable::columnDropped(const OUString& _sName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::columnDropped" );
+    SAL_INFO("dbaccess", "ODBTable::columnDropped" );
     Reference<XDrop> xDrop(m_xColumnDefinitions,UNO_QUERY);
     if ( xDrop.is() && m_xColumnDefinitions->hasByName(_sName) )
     {
@@ -148,7 +147,7 @@ void ODBTable::columnDropped(const OUString& _sName)
 
 Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getImplementationId" );
+    SAL_INFO("dbaccess", "ODBTable::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -165,7 +164,7 @@ Sequence< sal_Int8 > ODBTable::getImplementationId() throw (RuntimeException)
 // OComponentHelper
 void SAL_CALL ODBTable::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::disposing" );
+    SAL_INFO("dbaccess", "ODBTable::disposing" );
     OPropertySetHelper::disposing();
     OTable_Base::disposing();
     m_xColumnDefinitions = NULL;
@@ -175,7 +174,7 @@ void SAL_CALL ODBTable::disposing()
 
 void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getFastPropertyValue" );
+    SAL_INFO("dbaccess", "ODBTable::getFastPropertyValue" );
     if ((PROPERTY_ID_PRIVILEGES == _nHandle) && (-1 == m_nPrivileges))
     {   // somebody is asking for the privileges an we do not know them, yet
         const_cast<ODBTable*>(this)->m_nPrivileges = ::dbtools::getTablePrivileges(getMetaData(),m_CatalogName,m_SchemaName, m_Name);
@@ -186,7 +185,7 @@ void ODBTable::getFastPropertyValue(Any& _rValue, sal_Int32 _nHandle) const
 
 void ODBTable::construct()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::construct" );
+    SAL_INFO("dbaccess", "ODBTable::construct" );
     ::osl::MutexGuard aGuard(m_aMutex);
 
     // we don't collect the privileges here, this is potentially expensive. Instead we determine them on request.
@@ -247,7 +246,7 @@ void ODBTable::construct()
 
 ::cppu::IPropertyArrayHelper* ODBTable::createArrayHelper( sal_Int32 _nId) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createArrayHelper" );
+    SAL_INFO("dbaccess", "ODBTable::createArrayHelper" );
     Sequence< Property > aProps;
     describeProperties(aProps);
     if(!_nId)
@@ -280,7 +279,7 @@ IMPLEMENT_SERVICE_INFO1(ODBTable, "com.sun.star.sdb.dbaccess.ODBTable", SERVICE_
 
 Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getInfoHelper" );
+    SAL_INFO("dbaccess", "ODBTable::getInfoHelper" );
     if(rType == getCppuType( (Reference<XRename>*)0) && !getRenameService().is() )
         return Any();
     if(rType == getCppuType( (Reference<XAlterTable>*)0) && !getAlterService().is() )
@@ -290,7 +289,7 @@ Any SAL_CALL ODBTable::queryInterface( const Type & rType ) throw(RuntimeExcepti
 
 Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getTypes" );
+    SAL_INFO("dbaccess", "ODBTable::getTypes" );
     Type aRenameType = getCppuType( (Reference<XRename>*)0);
     Type aAlterType = getCppuType( (Reference<XAlterTable>*)0);
 
@@ -313,7 +312,7 @@ Sequence< Type > SAL_CALL ODBTable::getTypes(  ) throw(RuntimeException)
 // XRename,
 void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException, ElementExistException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::rename" );
+    SAL_INFO("dbaccess", "ODBTable::rename" );
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
     if ( !getRenameService().is() )
@@ -327,7 +326,7 @@ void SAL_CALL ODBTable::rename( const OUString& _rNewName ) throw(SQLException,
 // XAlterTable,
 void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Reference< XPropertySet >& _rxDescriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::alterColumnByName" );
+    SAL_INFO("dbaccess", "ODBTable::alterColumnByName" );
     ::osl::MutexGuard aGuard(m_aMutex);
     checkDisposed(connectivity::sdbcx::OTableDescriptor_BASE::rBHelper.bDisposed);
     if ( !getAlterService().is() )
@@ -343,7 +342,7 @@ void SAL_CALL ODBTable::alterColumnByName( const OUString& _rName, const Referen
 
 sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getSomething" );
+    SAL_INFO("dbaccess", "ODBTable::getSomething" );
     sal_Int64 nRet(0);
     if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(),  rId.getConstArray(), 16 ) )
         nRet = reinterpret_cast<sal_Int64>(this);
@@ -355,7 +354,7 @@ sal_Int64 SAL_CALL ODBTable::getSomething( const Sequence< sal_Int8 >& rId ) thr
 
 Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::getUnoTunnelImplementationId" );
+    SAL_INFO("dbaccess", "ODBTable::getUnoTunnelImplementationId" );
     static ::cppu::OImplementationId * pId = 0;
     if (! pId)
     {
@@ -371,13 +370,13 @@ Sequence< sal_Int8 > ODBTable::getUnoTunnelImplementationId()
 
 Reference< XPropertySet > ODBTable::createColumnDescriptor()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumnDescriptor" );
+    SAL_INFO("dbaccess", "ODBTable::createColumnDescriptor" );
     return new OTableColumnDescriptor( true );
 }
 
 sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createColumns" );
+    SAL_INFO("dbaccess", "ODBTable::createColumns" );
     Reference<XDatabaseMetaData> xMeta = getMetaData();
     OColumns* pCol = new OColumns(*this, m_aMutex, NULL, isCaseSensitive(), _rNames, this,this,
                                     getAlterService().is() || (xMeta.is() && xMeta->supportsAlterTableWithAddColumn()),
@@ -391,13 +390,13 @@ sdbcx::OCollection* ODBTable::createColumns(const TStringVector& _rNames)
 
 sdbcx::OCollection* ODBTable::createKeys(const TStringVector& _rNames)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createKeys" );
+    SAL_INFO("dbaccess", "ODBTable::createKeys" );
     return new connectivity::OKeysHelper(this,m_aMutex,_rNames);
 }
 
 sdbcx::OCollection* ODBTable::createIndexes(const TStringVector& _rNames)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen@sun.com", "ODBTable::createIndexes" );
+    SAL_INFO("dbaccess", "ODBTable::createIndexes" );
     return new OIndexes(this,m_aMutex,_rNames,NULL);
 }
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 0d227ce60b41..34da7b91ef98 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -50,7 +50,6 @@
 #include "definitioncolumn.hxx"
 #include "objectnameapproval.hxx"
 #include <tools/string.hxx>
-#include <rtl/logfile.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace dbaccess;
@@ -87,7 +86,7 @@ namespace
                 }
                 catch(const Exception&)
                 {
-                    OSL_FAIL( "lcl_isPropertySetDefaulted: Exception caught!" );
+                    SAL_WARN("dbaccess", "lcl_isPropertySetDefaulted: Exception caught!" );
                 }
             }
             return ( pIter == pEnd );
@@ -118,13 +117,13 @@ OTableContainer::OTableContainer(::cppu::OWeakObject& _rParent,
 
 OTableContainer::~OTableContainer()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::OTableContainer" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::OTableContainer" );
     DBG_DTOR(OTableContainer, NULL);
 }
 
 void OTableContainer::removeMasterContainerListener()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::removeMasterContainerListener" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::removeMasterContainerListener" );
     try
     {
         Reference<XContainer> xCont( m_xMasterContainer, UNO_QUERY_THROW );
@@ -174,7 +173,7 @@ void lcl_createDefintionObject(const OUString& _rName
 
 connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _rName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createObject" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::createObject" );
     Reference<XColumnsSupplier > xSup;
     if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(_rName))
         xSup.set(m_xMasterContainer->getByName(_rName),UNO_QUERY);
@@ -246,7 +245,7 @@ connectivity::sdbcx::ObjectType OTableContainer::createObject(const OUString& _r
 
 Reference< XPropertySet > OTableContainer::createDescriptor()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::createDescriptor" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::createDescriptor" );
     Reference< XPropertySet > xRet;
 
     // first we have to look if the master tables support this
@@ -272,7 +271,7 @@ Reference< XPropertySet > OTableContainer::createDescriptor()
 // XAppend
 ObjectType OTableContainer::appendObject( const OUString& _rForName, const Reference< XPropertySet >& descriptor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::appendObject" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::appendObject" );
     // append the new table with a create stmt
     OUString aName = getString(descriptor->getPropertyValue(PROPERTY_NAME));
     if(m_xMasterContainer.is() && m_xMasterContainer->hasByName(aName))
@@ -359,7 +358,7 @@ ObjectType OTableContainer::appendObject( const OUString& _rForName, const Refer
 // XDrop
 void OTableContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::dropObject" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::dropObject" );
     m_bInDrop = sal_True;
     try
     {
@@ -423,7 +422,7 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName)
 
 void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementInserted" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementInserted" );
     ::osl::MutexGuard aGuard(m_rMutex);
     OUString sName;
     Event.Accessor >>= sName;
@@ -442,12 +441,12 @@ void SAL_CALL OTableContainer::elementInserted( const ContainerEvent& Event ) th
 
 void SAL_CALL OTableContainer::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementRemoved" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementRemoved" );
 }
 
 void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::elementReplaced" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::elementReplaced" );
     // create a new config entry
     {
         OUString sOldComposedName,sNewComposedName;
@@ -460,7 +459,7 @@ void SAL_CALL OTableContainer::elementReplaced( const ContainerEvent& Event ) th
 
 void SAL_CALL OTableContainer::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::disposing" );
     OFilteredContainer::disposing();
     // say goodbye to our listeners
     m_xTableDefinitions = NULL;
@@ -469,7 +468,7 @@ void SAL_CALL OTableContainer::disposing()
 
 void SAL_CALL OTableContainer::disposing( const ::com::sun::star::lang::EventObject& /*Source*/ ) throw (::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "api", "Ocke.Janssen@sun.com", "OTableContainer::disposing" );
+   SAL_INFO("dbaccess", "dbaccess Ocke.Janssen@sun.com OTableContainer::disposing" );
 }
 
 void OTableContainer::addMasterContainerListener()
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 3f70b12d9706..5ab0029ca918 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -47,7 +47,6 @@
 #include <comphelper/uno3.hxx>
 #include <comphelper/sequence.hxx>
 #include <cppuhelper/typeprovider.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
@@ -76,19 +75,19 @@ namespace dbaccess
 // XServiceInfo
 OUString OConnection::getImplementationName(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationName" );
+    SAL_INFO("dbaccess", "OConnection::getImplementationName" );
     return OUString("com.sun.star.comp.dbaccess.Connection");
 }
 
 sal_Bool OConnection::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::supportsService" );
+    SAL_INFO("dbaccess", "OConnection::supportsService" );
     return findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
 Sequence< OUString > OConnection::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getSupportedServiceNames" );
+    SAL_INFO("dbaccess", "OConnection::getSupportedServiceNames" );
     Sequence< OUString > aSupported = OConnectionWrapper::getSupportedServiceNames();
 
     if ( 0 == findValue( aSupported, SERVICE_SDB_CONNECTION, sal_True ).getLength() )
@@ -104,14 +103,14 @@ Sequence< OUString > OConnection::getSupportedServiceNames(  ) throw (RuntimeExc
 // XCloseable
 void OConnection::close(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::close" );
+    SAL_INFO("dbaccess", "OConnection::close" );
     // being closed is the same as being disposed
     dispose();
 }
 
 sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::isClosed" );
+    SAL_INFO("dbaccess", "OConnection::isClosed" );
     MutexGuard aGuard(m_aMutex);
     return !m_xMasterConnection.is();
 }
@@ -119,7 +118,7 @@ sal_Bool OConnection::isClosed(void) throw( SQLException, RuntimeException )
 // XConnection
 Reference< XStatement >  OConnection::createStatement(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createStatement" );
+    SAL_INFO("dbaccess", "OConnection::createStatement" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -134,7 +133,7 @@ Reference< XStatement >  OConnection::createStatement(void) throw( SQLException,
 }
 Reference< XPreparedStatement >  OConnection::prepareStatement(const OUString& sql) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareStatement" );
+    SAL_INFO("dbaccess", "OConnection::prepareStatement" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -151,7 +150,7 @@ Reference< XPreparedStatement >  OConnection::prepareStatement(const OUString& s
 
 Reference< XPreparedStatement >  OConnection::prepareCall(const OUString& sql) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareCall" );
+    SAL_INFO("dbaccess", "OConnection::prepareCall" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -167,7 +166,7 @@ Reference< XPreparedStatement >  OConnection::prepareCall(const OUString& sql) t
 
 OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::nativeSQL" );
+    SAL_INFO("dbaccess", "OConnection::nativeSQL" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->nativeSQL(sql);
@@ -175,7 +174,7 @@ OUString OConnection::nativeSQL(const OUString& sql) throw( SQLException, Runtim
 
 void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setAutoCommit" );
+    SAL_INFO("dbaccess", "OConnection::setAutoCommit" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setAutoCommit(autoCommit);
@@ -183,7 +182,7 @@ void OConnection::setAutoCommit(sal_Bool autoCommit) throw( SQLException, Runtim
 
 sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getAutoCommit" );
+    SAL_INFO("dbaccess", "OConnection::getAutoCommit" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getAutoCommit();
@@ -191,7 +190,7 @@ sal_Bool OConnection::getAutoCommit(void) throw( SQLException, RuntimeException
 
 void OConnection::commit(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::commit" );
+    SAL_INFO("dbaccess", "OConnection::commit" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->commit();
@@ -199,7 +198,7 @@ void OConnection::commit(void) throw( SQLException, RuntimeException )
 
 void OConnection::rollback(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::rollback" );
+    SAL_INFO("dbaccess", "OConnection::rollback" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->rollback();
@@ -207,7 +206,7 @@ void OConnection::rollback(void) throw( SQLException, RuntimeException )
 
 Reference< XDatabaseMetaData >  OConnection::getMetaData(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getMetaData" );
+    SAL_INFO("dbaccess", "OConnection::getMetaData" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getMetaData();
@@ -215,7 +214,7 @@ Reference< XDatabaseMetaData >  OConnection::getMetaData(void) throw( SQLExcepti
 
 void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setReadOnly" );
+    SAL_INFO("dbaccess", "OConnection::setReadOnly" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setReadOnly(readOnly);
@@ -223,7 +222,7 @@ void OConnection::setReadOnly(sal_Bool readOnly) throw( SQLException, RuntimeExc
 
 sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::isReadOnly" );
+    SAL_INFO("dbaccess", "OConnection::isReadOnly" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->isReadOnly();
@@ -231,7 +230,7 @@ sal_Bool OConnection::isReadOnly(void) throw( SQLException, RuntimeException )
 
 void OConnection::setCatalog(const OUString& catalog) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setCatalog" );
+    SAL_INFO("dbaccess", "OConnection::setCatalog" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setCatalog(catalog);
@@ -239,7 +238,7 @@ void OConnection::setCatalog(const OUString& catalog) throw( SQLException, Runti
 
 OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getCatalog" );
+    SAL_INFO("dbaccess", "OConnection::getCatalog" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getCatalog();
@@ -247,7 +246,7 @@ OUString OConnection::getCatalog(void) throw( SQLException, RuntimeException )
 
 void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setTransactionIsolation" );
+    SAL_INFO("dbaccess", "OConnection::setTransactionIsolation" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setTransactionIsolation(level);
@@ -255,7 +254,7 @@ void OConnection::setTransactionIsolation(sal_Int32 level) throw( SQLException,
 
 sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTransactionIsolation" );
+    SAL_INFO("dbaccess", "OConnection::getTransactionIsolation" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getTransactionIsolation();
@@ -263,7 +262,7 @@ sal_Int32 OConnection::getTransactionIsolation(void) throw( SQLException, Runtim
 
 Reference< XNameAccess >  OConnection::getTypeMap(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTypeMap" );
+    SAL_INFO("dbaccess", "OConnection::getTypeMap" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xMasterConnection->getTypeMap();
@@ -271,7 +270,7 @@ Reference< XNameAccess >  OConnection::getTypeMap(void) throw( SQLException, Run
 
 void OConnection::setTypeMap(const Reference< XNameAccess > & typeMap) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setTypeMap" );
+    SAL_INFO("dbaccess", "OConnection::setTypeMap" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_xMasterConnection->setTypeMap(typeMap);
@@ -300,7 +299,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
             ,m_bSupportsUsers(sal_False)
             ,m_bSupportsGroups(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::OConnection" );
+    SAL_INFO("dbaccess", "OConnection::OConnection" );
     DBG_CTOR(OConnection,NULL);
     osl_atomic_increment(&m_refCount);
 
@@ -390,7 +389,7 @@ OConnection::~OConnection()
 // XWarningsSupplier
 Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getWarnings" );
+    SAL_INFO("dbaccess", "OConnection::getWarnings" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_aWarnings.getWarnings();
@@ -398,7 +397,7 @@ Any SAL_CALL OConnection::getWarnings() throw(SQLException, RuntimeException)
 
 void SAL_CALL OConnection::clearWarnings(  ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::clearWarnings" );
+    SAL_INFO("dbaccess", "OConnection::clearWarnings" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     m_aWarnings.clearWarnings();
@@ -425,7 +424,7 @@ namespace
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > OConnection::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTypes" );
+    SAL_INFO("dbaccess", "OConnection::getTypes" );
     TypeBag aNormalizedTypes;
 
     lcl_copyTypes( aNormalizedTypes, OSubComponent::getTypes() );
@@ -446,7 +445,7 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException)
 
 Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getImplementationId" );
+    SAL_INFO("dbaccess", "OConnection::getImplementationId" );
     return getUnoTunnelImplementationId();
 }
 
@@ -484,7 +483,7 @@ void OConnection::release() throw ()
 // OSubComponent
 void OConnection::disposing()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::disposing" );
+    SAL_INFO("dbaccess", "OConnection::disposing" );
     MutexGuard aGuard(m_aMutex);
 
     OSubComponent::disposing();
@@ -529,7 +528,7 @@ void OConnection::disposing()
 // XChild
 Reference< XInterface >  OConnection::getParent(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getParent" );
+    SAL_INFO("dbaccess", "OConnection::getParent" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     return m_xParent;
@@ -537,14 +536,14 @@ Reference< XInterface >  OConnection::getParent(void) throw( RuntimeException )
 
 void OConnection::setParent(const Reference< XInterface > & /*Parent*/) throw( NoSupportException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::setParent" );
+    SAL_INFO("dbaccess", "OConnection::setParent" );
     throw NoSupportException();
 }
 
 // XSQLQueryComposerFactory
 Reference< XSQLQueryComposer >  OConnection::createQueryComposer(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createQueryComposer" );
+    SAL_INFO("dbaccess", "OConnection::createQueryComposer" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -566,7 +565,7 @@ void OConnection::impl_fillTableFilter()
 
 void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::refresh" );
+    SAL_INFO("dbaccess", "OConnection::refresh" );
     if ( _rToBeRefreshed == Reference< XNameAccess >(m_pTables) )
     {
         if (m_pTables && !m_pTables->isInitialized())
@@ -604,7 +603,7 @@ void OConnection::refresh(const Reference< XNameAccess >& _rToBeRefreshed)
 // XTablesSupplier
 Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTables" );
+    SAL_INFO("dbaccess", "OConnection::getTables" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -615,7 +614,7 @@ Reference< XNameAccess >  OConnection::getTables() throw( RuntimeException )
 
 Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getViews" );
+    SAL_INFO("dbaccess", "OConnection::getViews" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -626,7 +625,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getViews(  ) throw(RuntimeExcepti
 // XQueriesSupplier
 Reference< XNameAccess >  OConnection::getQueries(void) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getQueries" );
+    SAL_INFO("dbaccess", "OConnection::getQueries" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -636,7 +635,7 @@ Reference< XNameAccess >  OConnection::getQueries(void) throw( RuntimeException
 // ::com::sun::star::sdb::XCommandPreparation
 Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const OUString& command, sal_Int32 commandType ) throw(::com::sun::star::sdbc::SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::prepareCommand" );
+    SAL_INFO("dbaccess", "OConnection::prepareCommand" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -668,7 +667,7 @@ Reference< XPreparedStatement >  SAL_CALL OConnection::prepareCommand( const OUS
 
 Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _sServiceSpecifier ) throw (Exception, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstance" );
+    SAL_INFO("dbaccess", "OConnection::createInstance" );
     Reference< XServiceInfo > xRet;
     if ( SERVICE_NAME_SINGLESELECTQUERYCOMPOSER == _sServiceSpecifier || _sServiceSpecifier == "com.sun.star.sdb.SingleSelectQueryAnalyzer" )
     {
@@ -699,13 +698,13 @@ Reference< XInterface > SAL_CALL OConnection::createInstance( const OUString& _s
 
 Reference< XInterface > SAL_CALL OConnection::createInstanceWithArguments( const OUString& _sServiceSpecifier, const Sequence< Any >& /*Arguments*/ ) throw (Exception, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createInstanceWithArguments" );
+    SAL_INFO("dbaccess", "OConnection::createInstanceWithArguments" );
     return createInstance(_sServiceSpecifier);
 }
 
 Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getAvailableServiceNames" );
+    SAL_INFO("dbaccess", "OConnection::getAvailableServiceNames" );
     Sequence< OUString > aRet(1);
     aRet[0] = SERVICE_NAME_SINGLESELECTQUERYCOMPOSER;
     return aRet;
@@ -713,7 +712,7 @@ Sequence< OUString > SAL_CALL OConnection::getAvailableServiceNames(  ) throw (R
 
 Reference< XTablesSupplier > OConnection::getMasterTables()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getMasterTables" );
+    SAL_INFO("dbaccess", "OConnection::getMasterTables" );
 // check if out "master connection" can supply tables
     if(!m_xMasterTables.is())
     {
@@ -733,7 +732,7 @@ Reference< XTablesSupplier > OConnection::getMasterTables()
 // XUsersSupplier
 Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getUsers" );
+    SAL_INFO("dbaccess", "OConnection::getUsers" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
 
@@ -744,7 +743,7 @@ Reference< XNameAccess > SAL_CALL OConnection::getUsers(  ) throw(RuntimeExcepti
 // XGroupsSupplier
 Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getGroups" );
+    SAL_INFO("dbaccess", "OConnection::getGroups" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     Reference<XGroupsSupplier> xGrp(getMasterTables(),UNO_QUERY);
@@ -753,14 +752,14 @@ Reference< XNameAccess > SAL_CALL OConnection::getGroups(  ) throw(RuntimeExcept
 
 void OConnection::impl_loadConnectionTools_throw()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::impl_loadConnectionTools_throw" );
+    SAL_INFO("dbaccess", "OConnection::impl_loadConnectionTools_throw" );
 
     m_xConnectionTools = css::sdb::tools::ConnectionTools::createWithConnection( m_aContext, this );
 }
 
 Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::createTableName" );
+    SAL_INFO("dbaccess", "OConnection::createTableName" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     impl_loadConnectionTools_throw();
@@ -770,7 +769,7 @@ Reference< XTableName > SAL_CALL OConnection::createTableName(  ) throw (Runtime
 
 Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getObjectNames" );
+    SAL_INFO("dbaccess", "OConnection::getObjectNames" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     impl_loadConnectionTools_throw();
@@ -780,7 +779,7 @@ Reference< XObjectNames > SAL_CALL OConnection::getObjectNames(  ) throw (Runtim
 
 Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getDataSourceMetaData" );
+    SAL_INFO("dbaccess", "OConnection::getDataSourceMetaData" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     impl_loadConnectionTools_throw();
@@ -790,7 +789,7 @@ Reference< XDataSourceMetaData > SAL_CALL OConnection::getDataSourceMetaData(  )
 
 Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getFieldsByCommandDescriptor( ::sal_Int32 commandType, const OUString& command, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& keepFieldsAlive ) throw (::com::sun::star::sdbc::SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getFieldsByCommandDescriptor" );
+    SAL_INFO("dbaccess", "OConnection::getFieldsByCommandDescriptor" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     impl_loadConnectionTools_throw();
@@ -800,7 +799,7 @@ Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getF
 
 Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal_Int32 commandType, const OUString& command ) throw (::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getComposer" );
+    SAL_INFO("dbaccess", "OConnection::getComposer" );
     MutexGuard aGuard(m_aMutex);
     checkDisposed();
     impl_loadConnectionTools_throw();
@@ -810,7 +809,7 @@ Reference< XSingleSelectQueryComposer > SAL_CALL OConnection::getComposer( ::sal
 
 void OConnection::impl_checkTableQueryNames_nothrow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::impl_checkTableQueryNames_nothrow" );
+    SAL_INFO("dbaccess", "OConnection::impl_checkTableQueryNames_nothrow" );
     DatabaseMetaData aMeta( static_cast< XConnection* >( this ) );
     if ( !aMeta.supportsSubqueriesInFrom() )
         // nothing to do
@@ -845,7 +844,7 @@ void OConnection::impl_checkTableQueryNames_nothrow()
 
 Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _TableName, ::sal_Int32 _ColorMode ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTableIcon" );
+    SAL_INFO("dbaccess", "OConnection::getTableIcon" );
     Reference< XGraphic > xReturn;
 
     // ask our aggregate
@@ -862,7 +861,7 @@ Reference< XGraphic > SAL_CALL OConnection::getTableIcon( const OUString& _Table
 
 Reference< XInterface > SAL_CALL OConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& _DocumentUI, const OUString& _TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::getTableEditor" );
+    SAL_INFO("dbaccess", "OConnection::getTableEditor" );
     Reference< XInterface > xReturn;
 
     // ask our aggregate
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index 9a6d92e49d0b..79053b706b3a 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -68,7 +68,6 @@
 #include <typelib/typedescription.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/sharedunocomponent.hxx>
-#include <rtl/logfile.hxx>
 #include <rtl/digest.h>
 #include <algorithm>
 #include <iterator>
@@ -205,7 +204,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetRealm(  ) throw(RuntimeExce
 
 void SAL_CALL OAuthenticationContinuation::setRealm( const OUString& /*Realm*/ ) throw(RuntimeException)
 {
-    OSL_FAIL("OAuthenticationContinuation::setRealm: not supported!");
+    SAL_WARN("dbaccess","OAuthenticationContinuation::setRealm: not supported!");
 }
 
 sal_Bool SAL_CALL OAuthenticationContinuation::canSetUserName(  ) throw(RuntimeException)
@@ -249,7 +248,7 @@ sal_Bool SAL_CALL OAuthenticationContinuation::canSetAccount(  ) throw(RuntimeEx
 
 void SAL_CALL OAuthenticationContinuation::setAccount( const OUString& ) throw(RuntimeException)
 {
-    OSL_FAIL("OAuthenticationContinuation::setAccount: not supported!");
+    SAL_WARN("dbaccess","OAuthenticationContinuation::setAccount: not supported!");
 }
 
 Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getRememberAccountModes( RememberAuthentication& _reDefault ) throw(RuntimeException)
@@ -262,7 +261,7 @@ Sequence< RememberAuthentication > SAL_CALL OAuthenticationContinuation::getReme
 
 void SAL_CALL OAuthenticationContinuation::setRememberAccount( RememberAuthentication /*Remember*/ ) throw(RuntimeException)
 {
-    OSL_FAIL("OAuthenticationContinuation::setRememberAccount: not supported!");
+    SAL_WARN("dbaccess","OAuthenticationContinuation::setRememberAccount: not supported!");
 }
 
 /** The class OSharedConnectionManager implements a structure to share connections.
@@ -503,12 +502,12 @@ ODatabaseSource::ODatabaseSource(const ::rtl::Reference<ODatabaseModelImpl>& _pI
 {
     // some kind of default
     DBG_CTOR(ODatabaseSource,NULL);
-    OSL_TRACE( "DS: ctor: %p: %p", this, m_pImpl.get() );
+    SAL_INFO("dbaccess", "DS: ctor: " << std::hex << this << ": " << std::hex << m_pImpl.get() );
 }
 
 ODatabaseSource::~ODatabaseSource()
 {
-    OSL_TRACE( "DS: dtor: %p: %p", this, m_pImpl.get() );
+    SAL_INFO("dbaccess", "DS: dtor: " << std::hex << this << ": " << std::hex << m_pImpl.get() );
     DBG_DTOR(ODatabaseSource,NULL);
     if ( !ODatabaseSource_Base::rBHelper.bInDispose && !ODatabaseSource_Base::rBHelper.bDisposed )
     {
@@ -519,7 +518,7 @@ ODatabaseSource::~ODatabaseSource()
 
 void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocument, const OUString& _rNewName, DBContextAccess )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setName" );
+    SAL_INFO("dbaccess", "ODatabaseSource::setName" );
     ODatabaseSource& rModelImpl = dynamic_cast< ODatabaseSource& >( *_rxDocument.get() );
 
     ::osl::MutexGuard aGuard( rModelImpl.m_aMutex );
@@ -530,7 +529,7 @@ void ODatabaseSource::setName( const Reference< XDocumentDataSource >& _rxDocume
 // com::sun::star::lang::XTypeProvider
 Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTypes" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getTypes" );
     OTypeCollection aPropertyHelperTypes(   ::getCppuType( (const Reference< XFastPropertySet > *)0 ),
                                             ::getCppuType( (const Reference< XPropertySet > *)0 ),
                                             ::getCppuType( (const Reference< XMultiPropertySet > *)0 ));
@@ -543,7 +542,7 @@ Sequence< Type > ODatabaseSource::getTypes() throw (RuntimeException)
 
 Sequence< sal_Int8 > ODatabaseSource::getImplementationId() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationId" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getImplementationId" );
     static OImplementationId * pId = 0;
     if (! pId)
     {
@@ -584,32 +583,32 @@ void SAL_CALL ODatabaseSource::disposing( const ::com::sun::star::lang::EventObj
 // XServiceInfo
 OUString ODatabaseSource::getImplementationName(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getImplementationName" );
     return getImplementationName_static();
 }
 
 OUString ODatabaseSource::getImplementationName_static(  ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getImplementationName_static" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getImplementationName_static" );
     return OUString("com.sun.star.comp.dba.ODatabaseSource");
 }
 
 Sequence< OUString > ODatabaseSource::getSupportedServiceNames(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getSupportedServiceNames" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getSupportedServiceNames" );
     return getSupportedServiceNames_static();
 }
 
 Reference< XInterface > ODatabaseSource::Create( const Reference< XComponentContext >& _rxContext )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::Create" );
+    SAL_INFO("dbaccess", "ODatabaseSource::Create" );
     Reference< XDatabaseContext > xDBContext( DatabaseContext::create(_rxContext) );
     return xDBContext->createInstance();
 }
 
 Sequence< OUString > ODatabaseSource::getSupportedServiceNames_static(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getSupportedServiceNames_static" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getSupportedServiceNames_static" );
     Sequence< OUString > aSNS( 2 );
     aSNS[0] = SERVICE_SDB_DATASOURCE;
     aSNS[1] = "com.sun.star.sdb.DocumentDataSource";
@@ -618,14 +617,14 @@ Sequence< OUString > ODatabaseSource::getSupportedServiceNames_static(  ) throw
 
 sal_Bool ODatabaseSource::supportsService( const OUString& _rServiceName ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::supportsService" );
+    SAL_INFO("dbaccess", "ODatabaseSource::supportsService" );
     return ::comphelper::findValue(getSupportedServiceNames(), _rServiceName, sal_True).getLength() != 0;
 }
 
 // OComponentHelper
 void ODatabaseSource::disposing()
 {
-    OSL_TRACE( "DS: disp: %p, %p", this, m_pImpl.get() );
+    SAL_INFO("dbaccess", "DS: disp: " << std::hex << this << ", " << std::hex << m_pImpl.get() );
     ODatabaseSource_Base::WeakComponentImplHelperBase::disposing();
     OPropertySetHelper::disposing();
 
@@ -639,7 +638,7 @@ void ODatabaseSource::disposing()
 
 Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString& _rUid, const OUString& _rPwd)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::buildLowLevelConnection" );
+    SAL_INFO("dbaccess", "ODatabaseSource::buildLowLevelConnection" );
     Reference< XConnection > xReturn;
 
     Reference< XDriverManager > xManager;
@@ -689,7 +688,7 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "ODatabaseSource::buildLowLevelConnection: got a strange exception while analyzing the error!" );
+            SAL_WARN("dbaccess",  "ODatabaseSource::buildLowLevelConnection: got a strange exception while analyzing the error!" );
         }
         if ( !xDriver.is() || !xDriver->acceptsURL( m_pImpl->m_sConnectURL ) )
         {
@@ -752,14 +751,14 @@ Reference< XConnection > ODatabaseSource::buildLowLevelConnection(const OUString
 // OPropertySetHelper
 Reference< XPropertySetInfo >  ODatabaseSource::getPropertySetInfo() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getPropertySetInfo" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getPropertySetInfo" );
     return createPropertySetInfo( getInfoHelper() ) ;
 }
 
 // comphelper::OPropertyArrayUsageHelper
 ::cppu::IPropertyArrayHelper* ODatabaseSource::createArrayHelper( ) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::createArrayHelper" );
+    SAL_INFO("dbaccess", "ODatabaseSource::createArrayHelper" );
     BEGIN_PROPERTY_HELPER(13)
         DECL_PROP1(INFO,                        Sequence< PropertyValue >,  BOUND);
         DECL_PROP1_BOOL(ISPASSWORDREQUIRED,                                 BOUND);
@@ -850,7 +849,7 @@ sal_Bool ODatabaseSource::convertFastPropertyValue(Any & rConvertedValue, Any &
             }
             break;
             default:
-                OSL_FAIL( "ODatabaseSource::convertFastPropertyValue: unknown or readonly Property!" );
+                SAL_WARN("dbaccess", "ODatabaseSource::convertFastPropertyValue: unknown or readonly Property!" );
         }
     }
     return bModified;
@@ -928,7 +927,7 @@ namespace
 
 void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setFastPropertyValue_NoBroadcast" );
+    SAL_INFO("dbaccess", "ODatabaseSource::setFastPropertyValue_NoBroadcast" );
     if ( m_pImpl.is() )
     {
         switch(nHandle)
@@ -973,7 +972,6 @@ void ODatabaseSource::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const
 
 void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) const
 {
-    //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getFastPropertyValue" );
     if ( m_pImpl.is() )
     {
         switch (nHandle)
@@ -1053,7 +1051,7 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
                 rValue <<= m_pImpl->m_aLayoutInformation;
                 break;
             default:
-                OSL_FAIL("unknown Property");
+                SAL_WARN("dbaccess","unknown Property");
         }
     }
 }
@@ -1061,14 +1059,14 @@ void ODatabaseSource::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) con
 // XDataSource
 void ODatabaseSource::setLoginTimeout(sal_Int32 seconds) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::setLoginTimeout" );
+    SAL_INFO("dbaccess", "ODatabaseSource::setLoginTimeout" );
     ModelMethodGuard aGuard( *this );
     m_pImpl->m_nLoginTimeout = seconds;
 }
 
 sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getLoginTimeout" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getLoginTimeout" );
     ModelMethodGuard aGuard( *this );
     return m_pImpl->m_nLoginTimeout;
 }
@@ -1076,36 +1074,36 @@ sal_Int32 ODatabaseSource::getLoginTimeout(void) throw( SQLException, RuntimeExc
 // XCompletedConnection
 Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::connectWithCompletion" );
+    SAL_INFO("dbaccess", "ODatabaseSource::connectWithCompletion" );
     return connectWithCompletion(_rxHandler,sal_False);
 }
 
 Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getConnection" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getConnection" );
     return getConnection(user,password,sal_False);
 }
 
 Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnection( const OUString& user, const OUString& password ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getIsolatedConnection" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getIsolatedConnection" );
     return getConnection(user,password,sal_True);
 }
 
 Reference< XConnection > SAL_CALL ODatabaseSource::getIsolatedConnectionWithCompletion( const Reference< XInteractionHandler >& _rxHandler ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getIsolatedConnectionWithCompletion" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getIsolatedConnectionWithCompletion" );
     return connectWithCompletion(_rxHandler,sal_True);
 }
 
 Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const Reference< XInteractionHandler >& _rxHandler,sal_Bool _bIsolated ) throw(SQLException, RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::connectWithCompletion" );
+    SAL_INFO("dbaccess", "ODatabaseSource::connectWithCompletion" );
     ModelMethodGuard aGuard( *this );
 
     if (!_rxHandler.is())
     {
-        OSL_FAIL("ODatabaseSource::connectWithCompletion: invalid interaction handler!");
+        SAL_WARN("dbaccess","ODatabaseSource::connectWithCompletion: invalid interaction handler!");
         return getConnection(m_pImpl->m_sUser, m_pImpl->m_aPassword,_bIsolated);
     }
 
@@ -1187,7 +1185,7 @@ Reference< XConnection > SAL_CALL ODatabaseSource::connectWithCompletion( const
 
 Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString& user, const OUString& password)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::buildIsolatedConnection" );
+    SAL_INFO("dbaccess", "ODatabaseSource::buildIsolatedConnection" );
     Reference< XConnection > xConn;
     Reference< XConnection > xSdbcConn = buildLowLevelConnection(user, password);
     OSL_ENSURE( xSdbcConn.is(), "ODatabaseSource::buildIsolatedConnection: invalid return value of buildLowLevelConnection!" );
@@ -1202,7 +1200,7 @@ Reference< XConnection > ODatabaseSource::buildIsolatedConnection(const OUString
 
 Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, const OUString& password,sal_Bool _bIsolated) throw( SQLException, RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getConnection" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getConnection" );
     ModelMethodGuard aGuard( *this );
 
     Reference< XConnection > xConn;
@@ -1234,14 +1232,14 @@ Reference< XConnection > ODatabaseSource::getConnection(const OUString& user, co
 
 Reference< XNameAccess > SAL_CALL ODatabaseSource::getBookmarks(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getBookmarks" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getBookmarks" );
     ModelMethodGuard aGuard( *this );
     return static_cast< XNameContainer* >(&m_aBookmarks);
 }
 
 Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getQueryDefinitions" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getQueryDefinitions" );
     ModelMethodGuard aGuard( *this );
 
     Reference< XNameAccess > xContainer = m_pImpl->m_xCommandDefinitions;
@@ -1273,7 +1271,7 @@ Reference< XNameAccess > SAL_CALL ODatabaseSource::getQueryDefinitions( ) throw(
 // XTablesSupplier
 Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getTables" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getTables" );
     ModelMethodGuard aGuard( *this );
 
     Reference< XNameAccess > xContainer = m_pImpl->m_xTableDefinitions;
@@ -1288,7 +1286,7 @@ Reference< XNameAccess >  ODatabaseSource::getTables() throw( RuntimeException )
 
 void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::flush" );
+    SAL_INFO("dbaccess", "ODatabaseSource::flush" );
     try
     {
         // SYNCHRONIZED ->
@@ -1317,7 +1315,7 @@ void SAL_CALL ODatabaseSource::flush(  ) throw (RuntimeException)
 
 void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::flushed" );
+    SAL_INFO("dbaccess", "ODatabaseSource::flushed" );
     ModelMethodGuard aGuard( *this );
 
     // Okay, this is some hack.
@@ -1350,19 +1348,19 @@ void SAL_CALL ODatabaseSource::flushed( const EventObject& /*rEvent*/ ) throw (R
 
 void SAL_CALL ODatabaseSource::addFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::addFlushListener" );
+    SAL_INFO("dbaccess", "ODatabaseSource::addFlushListener" );
     m_aFlushListeners.addInterface(_xListener);
 }
 
 void SAL_CALL ODatabaseSource::removeFlushListener( const Reference< ::com::sun::star::util::XFlushListener >& _xListener ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::removeFlushListener" );
+    SAL_INFO("dbaccess", "ODatabaseSource::removeFlushListener" );
     m_aFlushListeners.removeInterface(_xListener);
 }
 
 void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementInserted" );
+    SAL_INFO("dbaccess", "ODatabaseSource::elementInserted" );
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
         m_pImpl->setModified(sal_True);
@@ -1370,7 +1368,7 @@ void SAL_CALL ODatabaseSource::elementInserted( const ContainerEvent& /*Event*/
 
 void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementRemoved" );
+    SAL_INFO("dbaccess", "ODatabaseSource::elementRemoved" );
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
         m_pImpl->setModified(sal_True);
@@ -1378,7 +1376,7 @@ void SAL_CALL ODatabaseSource::elementRemoved( const ContainerEvent& /*Event*/ )
 
 void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/ ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::elementReplaced" );
+    SAL_INFO("dbaccess", "ODatabaseSource::elementReplaced" );
     ModelMethodGuard aGuard( *this );
     if ( m_pImpl.is() )
         m_pImpl->setModified(sal_True);
@@ -1387,7 +1385,7 @@ void SAL_CALL ODatabaseSource::elementReplaced( const ContainerEvent& /*Event*/
 // XDocumentDataSource
 Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocument() throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getDatabaseDocument" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getDatabaseDocument" );
     ModelMethodGuard aGuard( *this );
 
     Reference< XModel > xModel( m_pImpl->getModel_noCreate() );
@@ -1399,7 +1397,7 @@ Reference< XOfficeDatabaseDocument > SAL_CALL ODatabaseSource::getDatabaseDocume
 
 Reference< XInterface > ODatabaseSource::getThis() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "ODatabaseSource::getThis" );
+    SAL_INFO("dbaccess", "ODatabaseSource::getThis" );
     return *const_cast< ODatabaseSource* >( this );
 }
 
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx
index f5d8603cd321..24b6888c6da3 100644
--- a/dbaccess/source/filter/xml/xmlfilter.cxx
+++ b/dbaccess/source/filter/xml/xmlfilter.cxx
@@ -34,7 +34,6 @@
 #include <xmloff/xmltoken.hxx>
 #include <xmloff/txtimp.hxx>
 #include <xmloff/nmspmap.hxx>
-#include <rtl/logfile.hxx>
 #include <com/sun/star/xml/sax/InputSource.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <xmloff/ProgressBarHelper.hxx>
@@ -227,7 +226,7 @@ sal_Int32 ReadThroughComponent(
     OSL_ENSURE(xModelComponent.is(), "document missing");
     OSL_ENSURE(rxContext.is(), "factory missing");
 
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "dbaxml", "oj", "ReadThroughComponent" );
+   SAL_INFO("dbaccess", "dbaxml ReadThroughComponent" );
 
     // prepare ParserInputSrouce
     InputSource aParserInput;
@@ -235,7 +234,7 @@ sal_Int32 ReadThroughComponent(
 
     // get parser
     uno::Reference< XParser > xParser = Parser::create(rxContext);
-    RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" );
+    SAL_INFO("dbaccess", "parser created" );
 
     // get filter
     OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." );
@@ -259,14 +258,7 @@ sal_Int32 ReadThroughComponent(
     catch (const SAXParseException& r)
     {
 #if OSL_DEBUG_LEVEL > 1
-        OStringBuffer aError(
-            "SAX parse exception catched while importing:\n");
-        aError.append(OUStringToOString(r.Message,
-            RTL_TEXTENCODING_ASCII_US));
-        aError.append(r.LineNumber);
-        aError.append(',');
-        aError.append(r.ColumnNumber);
-        OSL_FAIL(aError.getStr());
+        SAL_WARN("dbaccess", "SAX parse exception catched while importing:\n" << r.Message << r.LineNumber << "," << r.ColumnNumber);
 #else
         (void)r;
 #endif
@@ -343,8 +335,7 @@ sal_Int32 ReadThroughComponent(
 
 #ifdef TIMELOG
         // if we do profiling, we want to know the stream
-        RTL_LOGFILE_TRACE_AUTHOR1( "dbaxml", "oj",
-                               "ReadThroughComponent : parsing \"%s\"", pStreamName );
+       SAL_INFO("dbaccess", "dbaxml ReadThroughComponent : parsing \"" << pStreamName << "\"" );
 #endif
 
         uno::Reference< XInputStream > xInputStream = xDocStream->getInputStream();
diff --git a/dbaccess/source/ui/browser/brwctrlr.cxx b/dbaccess/source/ui/browser/brwctrlr.cxx
index ea4c339b2763..e208d3e9b3bc 100644
--- a/dbaccess/source/ui/browser/brwctrlr.cxx
+++ b/dbaccess/source/ui/browser/brwctrlr.cxx
@@ -75,7 +75,6 @@
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/typeprovider.hxx>
 #include <osl/mutex.hxx>
-#include <rtl/logfile.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/sfx.hrc>
 #include <svx/fmsearch.hxx>
@@ -121,7 +120,7 @@ using namespace ::svt;
         DBG_UNHANDLED_EXCEPTION();                                          \
     }                                                                       \
 
-#define DO_SAFE( action, message ) try { action; } catch(Exception&) { OSL_FAIL(message); } ;
+#define DO_SAFE( action, message ) try { action; } catch(Exception&) { SAL_WARN("dbaccess.ui",message); } ;
 
 //..................................................................
 namespace dbaui
@@ -270,7 +269,7 @@ SbaXDataBrowserController::FormControllerImpl::~FormControllerImpl()
 //------------------------------------------------------------------
 Reference< runtime::XFormOperations > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getFormOperations() throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getFormOperations: not supported!" );
     return NULL;
 }
 
@@ -302,27 +301,27 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addChildController(
 //------------------------------------------------------------------
 Reference< runtime::XFormControllerContext > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getContext() throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getContext: no support!!" );
     return NULL;
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContext( const Reference< runtime::XFormControllerContext >& /*_context*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setContext: no support!!" );
 }
 
 //------------------------------------------------------------------
 Reference< XInteractionHandler > SAL_CALL SbaXDataBrowserController::FormControllerImpl::getInteractionHandler() throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::getInteractionHandler: no support!!" );
     return NULL;
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setInteractionHandler( const Reference< XInteractionHandler >& /*_interactionHandler*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::setInteractionHandler: no support!!" );
 }
 
 //------------------------------------------------------------------
@@ -341,19 +340,19 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setParent( const Re
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::dispose(  ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::dispose: no, you do *not* want to do this!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addEventListener( const Reference< XEventListener >& /*xListener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addEventListener: no support!!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeEventListener( const Reference< XEventListener >& /*aListener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeEventListener: no support!!" );
 }
 
 //------------------------------------------------------------------
@@ -392,73 +391,73 @@ Reference< XEnumeration > SAL_CALL SbaXDataBrowserController::FormControllerImpl
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addModifyListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeModifyListener( const Reference< XModifyListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeModifyListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addConfirmDeleteListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener( const Reference< XConfirmDeleteListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeConfirmDeleteListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addSQLErrorListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener( const Reference< XSQLErrorListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeSQLErrorListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addRowSetApproveListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener( const Reference< XRowSetApproveListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeRowSetApproveListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addDatabaseParameterListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeDatabaseParameterListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::addParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::addParameterListener: no support!" );
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::removeParameterListener( const Reference< XDatabaseParameterListener >& /*_Listener*/ ) throw (RuntimeException)
 {
-    OSL_FAIL( "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
+    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::FormControllerImpl::removeParameterListener: no support!" );
 }
 
 //------------------------------------------------------------------
@@ -491,7 +490,7 @@ Sequence< OUString > SAL_CALL SbaXDataBrowserController::FormControllerImpl::get
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setModel(const Reference< ::com::sun::star::awt::XTabControllerModel > & /*Model*/) throw( RuntimeException )
 {
-    OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
+    SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setModel : invalid call, can't change my model !");
 }
 
 //------------------------------------------------------------------
@@ -503,7 +502,7 @@ Reference< ::com::sun::star::awt::XTabControllerModel >  SAL_CALL SbaXDataBrowse
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::setContainer(const Reference< ::com::sun::star::awt::XControlContainer > & /*_Container*/) throw( RuntimeException )
 {
-    OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
+    SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::setContainer : invalid call, can't change my container !");
 }
 
 //------------------------------------------------------------------
@@ -528,13 +527,13 @@ Sequence< Reference< ::com::sun::star::awt::XControl > > SAL_CALL SbaXDataBrowse
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::autoTabOrder(void) throw( RuntimeException )
 {
-    OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
+    SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::autoTabOrder : nothing to do (always have only one control) !");
 }
 
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::FormControllerImpl::activateTabOrder(void) throw( RuntimeException )
 {
-    OSL_FAIL("SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
+    SAL_WARN("dbaccess.ui","SbaXDataBrowserController::FormControllerImpl::activateTabOrder : nothing to do (always have only one control) !");
 }
 
 //------------------------------------------------------------------
@@ -569,7 +568,7 @@ void SAL_CALL SbaXDataBrowserController::FormControllerImpl::disposing(const ::c
 //------------------------------------------------------------------
 Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getTypes" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getTypes" );
     return ::comphelper::concatSequences(
         SbaXDataBrowserController_Base::getTypes(),
         m_pFormControllerImpl->getTypes()
@@ -579,7 +578,7 @@ Sequence< Type > SAL_CALL SbaXDataBrowserController::getTypes(  ) throw (Runtime
 //------------------------------------------------------------------
 Sequence< sal_Int8 > SAL_CALL SbaXDataBrowserController::getImplementationId(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getImplementationId" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getImplementationId" );
     static ::cppu::OImplementationId * pId = 0;
     if (! pId)
     {
@@ -623,7 +622,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
     ,m_bLoadCanceled( sal_False )
     ,m_bCannotSelectUnfiltered( true )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SbaXDataBrowserController" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SbaXDataBrowserController" );
     DBG_CTOR(SbaXDataBrowserController,NULL);
 
     // create the form controller aggregate
@@ -642,7 +641,7 @@ SbaXDataBrowserController::SbaXDataBrowserController(const Reference< ::com::sun
 //------------------------------------------------------------------------------
 SbaXDataBrowserController::~SbaXDataBrowserController()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::~SbaXDataBrowserController" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::~SbaXDataBrowserController" );
     //  deleteView();
     // release the aggregated form controller
     if (m_xFormControllerImpl.is())
@@ -657,7 +656,7 @@ SbaXDataBrowserController::~SbaXDataBrowserController()
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >& _rxFrame )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::startFrameListening" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::startFrameListening" );
     SbaXDataBrowserController_Base::startFrameListening( _rxFrame );
 
     Reference< XFrameActionListener >   xAggListener;
@@ -671,7 +670,7 @@ void SbaXDataBrowserController::startFrameListening( const Reference< XFrame >&
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::stopFrameListening( const Reference< XFrame >& _rxFrame )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::stopFrameListening" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::stopFrameListening" );
     SbaXDataBrowserController_Base::stopFrameListening( _rxFrame );
 
     Reference< XFrameActionListener >   xAggListener;
@@ -708,7 +707,7 @@ void SbaXDataBrowserController::impl_checkForCannotSelectUnfiltered( const SQLEx
 // -----------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _rxLoadable )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloadForm" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloadForm" );
     WaitObject aWO(getBrowserView());
 
     onStartLoading( _rxLoadable );
@@ -769,7 +768,7 @@ sal_Bool SbaXDataBrowserController::reloadForm( const Reference< XLoadable >& _r
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::initFormatter()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::initFormatter" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initFormatter" );
     // ---------------------------------------------------------------
     // create a formatter working with the connections format supplier
     Reference< ::com::sun::star::util::XNumberFormatsSupplier >  xSupplier(::dbtools::getNumberFormats(::dbtools::getConnection(m_xRowSet), sal_True, getORB()));
@@ -787,7 +786,7 @@ void SbaXDataBrowserController::initFormatter()
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::describeSupportedFeatures()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::describeSupportedFeatures" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::describeSupportedFeatures" );
     SbaXDataBrowserController_Base::describeSupportedFeatures();
     implDescribeSupportedFeature( ".uno:FormSlots/undoRecord",      ID_BROWSER_UNDORECORD,  CommandGroup::CONTROLS );
     implDescribeSupportedFeature( ".uno:FormController/undoRecord", ID_BROWSER_UNDORECORD,  CommandGroup::CONTROLS );
@@ -811,7 +810,7 @@ void SbaXDataBrowserController::describeSupportedFeatures()
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::Construct" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Construct" );
     // ---------------------------------------------
     // create/initialize the form and the grid model
     m_xRowSet = CreateForm();
@@ -864,7 +863,7 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
     }
     catch(Exception&)
     {
-        OSL_FAIL("SbaXDataBrowserController::Construct : the construction of UnoDataBrowserView failed !");
+        SAL_WARN("dbaccess.ui","SbaXDataBrowserController::Construct : the construction of UnoDataBrowserView failed !");
     }
 
     if (!bSuccess)
@@ -929,26 +928,26 @@ sal_Bool SbaXDataBrowserController::Construct(Window* pParent)
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::LoadForm()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::LoadForm" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadForm" );
     reloadForm( m_xLoadable );
     return sal_True;
 }
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::AddColumnListener(const Reference< XPropertySet > & /*xCol*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::AddColumnListener" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AddColumnListener" );
     // we're not interested in any column properties ...
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::RemoveColumnListener(const Reference< XPropertySet > & /*xCol*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::RemoveColumnListener" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RemoveColumnListener" );
 }
 //------------------------------------------------------------------------------
 Reference< XRowSet >  SbaXDataBrowserController::CreateForm()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateForm" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateForm" );
     return Reference< XRowSet > (
       getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.Form", getORB()),
       UNO_QUERY);
@@ -957,7 +956,7 @@ Reference< XRowSet >  SbaXDataBrowserController::CreateForm()
 //------------------------------------------------------------------------------
 Reference< ::com::sun::star::form::XFormComponent >  SbaXDataBrowserController::CreateGridModel()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CreateGridModel" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CreateGridModel" );
     return Reference< ::com::sun::star::form::XFormComponent > (
       getORB()->getServiceManager()->createInstanceWithContext("com.sun.star.form.component.GridControl", getORB()),
       UNO_QUERY);
@@ -966,7 +965,7 @@ Reference< ::com::sun::star::form::XFormComponent >  SbaXDataBrowserController::
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addModelListeners" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addModelListeners" );
     // ... all the grid columns
     addColumnListeners(_xGridControlModel);
 
@@ -983,7 +982,7 @@ void SbaXDataBrowserController::addModelListeners(const Reference< ::com::sun::s
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::removeModelListeners(const Reference< XControlModel > & _xGridControlModel)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::removeModelListeners" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeModelListeners" );
     // every single column model
     Reference< XIndexContainer >  xColumns(_xGridControlModel, UNO_QUERY);
     if (xColumns.is())
@@ -1008,7 +1007,7 @@ void SbaXDataBrowserController::removeModelListeners(const Reference< XControlMo
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addControlListeners" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addControlListeners" );
     // to ge the 'modified' for the current cell
     Reference< XModifyBroadcaster >  xBroadcaster(getBrowserView()->getGridControl(), UNO_QUERY);
     if (xBroadcaster.is())
@@ -1028,7 +1027,7 @@ void SbaXDataBrowserController::addControlListeners(const Reference< ::com::sun:
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::sun::star::awt::XControl > & _xGridControl)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::removeControlListeners" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::removeControlListeners" );
     Reference< XModifyBroadcaster >  xBroadcaster(_xGridControl, UNO_QUERY);
     if (xBroadcaster.is())
         xBroadcaster->removeModifyListener(static_cast<XModifyListener*>(this));
@@ -1045,7 +1044,7 @@ void SbaXDataBrowserController::removeControlListeners(const Reference< ::com::s
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::focusGained" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusGained" );
     // notify our activate listeners (registered on the form controller aggregate)
     EventObject aEvt(*this);
     ::cppu::OInterfaceIteratorHelper aIter(m_pFormControllerImpl->m_aActivateListeners);
@@ -1056,7 +1055,7 @@ void SAL_CALL SbaXDataBrowserController::focusGained(const FocusEvent& /*e*/) th
 //------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::focusLost" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::focusLost" );
     // some general checks
     if (!getBrowserView() || !getBrowserView()->getGridControl().is())
         return;
@@ -1085,27 +1084,27 @@ void SAL_CALL SbaXDataBrowserController::focusLost(const FocusEvent& e) throw( R
     if (xCommitable.is())
         xCommitable->commit();
     else
-        OSL_FAIL("SbaXDataBrowserController::focusLost : why is my control not commitable ?");
+        SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::focusLost : why is my control not commitable ?");
 }
 
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::disposingGridControl(const ::com::sun::star::lang::EventObject& /*Source*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingGridControl" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridControl" );
     removeControlListeners(getBrowserView()->getGridControl());
 }
 
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::disposingGridModel(const ::com::sun::star::lang::EventObject& /*Source*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingGridModel" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingGridModel" );
     removeModelListeners(getControlModel());
 }
 
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang::EventObject& Source)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingFormModel" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingFormModel" );
     Reference< XPropertySet >  xSourceSet(Source.Source, UNO_QUERY);
     if (xSourceSet.is())
     {
@@ -1134,14 +1133,14 @@ void SbaXDataBrowserController::disposingFormModel(const ::com::sun::star::lang:
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::disposingColumnModel(const ::com::sun::star::lang::EventObject& Source)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposingColumnModel" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposingColumnModel" );
     RemoveColumnListener(Reference< XPropertySet > (Source.Source, UNO_QUERY));
 }
 
 // -------------------------------------------------------------------------
 void SbaXDataBrowserController::disposing(const EventObject& Source) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::disposing" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::disposing" );
     // if it's a component other than our aggregate, forward it to the aggregate
     if ( m_xFormControllerImpl != Source.Source )
     {
@@ -1182,7 +1181,7 @@ void SbaXDataBrowserController::disposing(const EventObject& Source) throw( Runt
 // -----------------------------------------------------------------------
 void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identifier ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setIdentifier" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setIdentifier" );
     ::osl::MutexGuard aGuard( getMutex() );
     m_sModuleIdentifier = _Identifier;
 }
@@ -1190,7 +1189,7 @@ void SAL_CALL SbaXDataBrowserController::setIdentifier( const OUString& _Identif
 // -----------------------------------------------------------------------
 OUString SAL_CALL SbaXDataBrowserController::getIdentifier(  ) throw (RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getIdentifier" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getIdentifier" );
     ::osl::MutexGuard aGuard( getMutex() );
     return m_sModuleIdentifier;
 }
@@ -1198,7 +1197,7 @@ OUString SAL_CALL SbaXDataBrowserController::getIdentifier(  ) throw (RuntimeExc
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) throw ( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::propertyChange" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::propertyChange" );
     Reference< XPropertySet >  xSource(evt.Source, UNO_QUERY);
     if (!xSource.is())
         return;
@@ -1251,14 +1250,14 @@ void SbaXDataBrowserController::propertyChange(const PropertyChangeEvent& evt) t
 //------------------------------------------------------------------------
 void SbaXDataBrowserController::modified(const ::com::sun::star::lang::EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::modified" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::modified" );
     setCurrentModified( sal_True );
 }
 
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::elementInserted(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementInserted" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementInserted" );
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementInserted: where did this come from (not from the grid model)?!");
     Reference< XPropertySet >  xNewColumn(evt.Element,UNO_QUERY);
@@ -1269,7 +1268,7 @@ void SbaXDataBrowserController::elementInserted(const ::com::sun::star::containe
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementRemoved" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementRemoved" );
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementRemoved: where did this come from (not from the grid model)?!");
     Reference< XPropertySet >  xOldColumn(evt.Element,UNO_QUERY);
@@ -1280,7 +1279,7 @@ void SbaXDataBrowserController::elementRemoved(const ::com::sun::star::container
 // -----------------------------------------------------------------------
 void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::container::ContainerEvent& evt) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::elementReplaced" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::elementReplaced" );
     OSL_ENSURE(Reference< XInterface >(evt.Source, UNO_QUERY).get() == Reference< XInterface >(getControlModel(), UNO_QUERY).get(),
         "SbaXDataBrowserController::elementReplaced: where did this come from (not from the grid model)?!");
     Reference< XPropertySet >  xOldColumn(evt.ReplacedElement,UNO_QUERY);
@@ -1295,7 +1294,7 @@ void SbaXDataBrowserController::elementReplaced(const ::com::sun::star::containe
 // -----------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::suspend(sal_Bool /*bSuspend*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::suspend" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::suspend" );
 
     m_aAsyncGetCellFocus.CancelCall();
     m_aAsyncDisplayError.CancelCall();
@@ -1374,7 +1373,7 @@ void SbaXDataBrowserController::disposing()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::frameAction(const ::com::sun::star::frame::FrameActionEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::frameAction" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::frameAction" );
     ::osl::MutexGuard aGuard( getMutex() );
 
     SbaXDataBrowserController_Base::frameAction( aEvent );
@@ -1423,7 +1422,7 @@ IMPL_LINK( SbaXDataBrowserController, OnAsyncDisplayError, void*, /* _pNotIntere
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErrorEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::errorOccurred" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::errorOccurred" );
     ::osl::MutexGuard aGuard( getMutex() );
 
     SQLExceptionInfo aInfo( aEvent.Reason );
@@ -1445,11 +1444,11 @@ void SbaXDataBrowserController::errorOccured(const ::com::sun::star::sdb::SQLErr
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::form::DatabaseParameterEvent& aEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::approveParameter" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveParameter" );
     if (aEvent.Source != getRowSet())
     {
         // not my data source -> allow anything
-        OSL_FAIL("SbaXDataBrowserController::approveParameter : invalid event source !");
+        SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter : invalid event source !");
         return sal_True;
     }
 
@@ -1486,7 +1485,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
         Sequence< PropertyValue > aFinalValues = pParamValues->getValues();
         if (aFinalValues.getLength() != aRequest.Parameters->getCount())
         {
-            OSL_FAIL("SbaXDataBrowserController::approveParameter: the InteractionHandler returned nonsense!");
+            SAL_WARN("dbaccess.ui","SbaXDataBrowserController::approveParameter: the InteractionHandler returned nonsense!");
             setLoadingCancelled();
             return sal_False;
         }
@@ -1506,7 +1505,7 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
                 try { xParam->setPropertyValue(PROPERTY_VALUE, pFinalValues->Value); }
                 catch(Exception&)
                 {
-                    OSL_FAIL("SbaXDataBrowserController::approveParameter: setting one of the properties failed!");
+                    SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::approveParameter: setting one of the properties failed!");
                 }
             }
         }
@@ -1523,14 +1522,14 @@ sal_Bool SbaXDataBrowserController::approveParameter(const ::com::sun::star::for
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::approveReset(const ::com::sun::star::lang::EventObject& /*rEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::approveReset" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::approveReset" );
     return sal_True;
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObject& rEvent) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::resetted" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::resetted" );
     OSL_ENSURE(rEvent.Source == getControlModel(), "SbaXDataBrowserController::resetted : where did this come from ?");
     (void)rEvent;
     setCurrentModified( sal_False );
@@ -1539,7 +1538,7 @@ void SbaXDataBrowserController::resetted(const ::com::sun::star::lang::EventObje
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::RowChangeEvent& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::confirmDelete" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::confirmDelete" );
     if (QueryBox(getBrowserView(), ModuleRes(QUERY_BRW_DELETE_ROWS)).Execute() != RET_YES)
         return sal_False;
 
@@ -1548,7 +1547,7 @@ sal_Bool SbaXDataBrowserController::confirmDelete(const ::com::sun::star::sdb::R
 //------------------------------------------------------------------------------
 FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::GetState" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::GetState" );
     FeatureState aReturn;
         // (disabled automatically)
 
@@ -1775,11 +1774,11 @@ FeatureState SbaXDataBrowserController::GetState(sal_uInt16 nId) const
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,const Reference< XSingleSelectQueryComposer >& _xParser)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::applyParserOrder" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserOrder" );
     Reference< XPropertySet > xFormSet(getRowSet(), UNO_QUERY);
     if (!m_xLoadable.is())
     {
-        OSL_FAIL("SbaXDataBrowserController::applyParserOrder: invalid row set!");
+        SAL_WARN("dbaccess.ui","SbaXDataBrowserController::applyParserOrder: invalid row set!");
         return;
     }
 
@@ -1817,11 +1816,11 @@ void SbaXDataBrowserController::applyParserOrder(const OUString& _rOldOrder,cons
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::applyParserFilter(const OUString& _rOldFilter, sal_Bool _bOldFilterApplied,const ::OUString& _sOldHaving,const Reference< XSingleSelectQueryComposer >& _xParser)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::applyParserFilter" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter" );
     Reference< XPropertySet >  xFormSet(getRowSet(), UNO_QUERY);
     if (!m_xLoadable.is())
     {
-        OSL_FAIL("SbaXDataBrowserController::applyParserFilter: invalid row set!");
+        SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::applyParserFilter: invalid row set!");
         return;
     }
 
@@ -1910,7 +1909,7 @@ Reference< XSingleSelectQueryComposer > SbaXDataBrowserController::createParser_
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteFilterSortCrit" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteFilterSortCrit" );
     if (!SaveModified())
         return;
 
@@ -1974,7 +1973,7 @@ void SbaXDataBrowserController::ExecuteFilterSortCrit(sal_Bool bFilter)
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::ExecuteSearch()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ExecuteSearch" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ExecuteSearch" );
     // calculate the control source of the active field
     Reference< ::com::sun::star::form::XGrid >  xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
     OSL_ENSURE(xGrid.is(), "SbaXDataBrowserController::ExecuteSearch : the control should have an ::com::sun::star::form::XGrid interface !");
@@ -2033,7 +2032,7 @@ void SbaXDataBrowserController::ExecuteSearch()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< PropertyValue >& _rArgs)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::Execute" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::Execute" );
     sal_Bool bSortUp = sal_True;
 
     switch (nId)
@@ -2055,7 +2054,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
             }
             catch(Exception&)
             {
-                OSL_FAIL("Exception caught!");
+                SAL_WARN("dbaccess.ui", "Exception caught!");
             }
             break;
         case SID_FM_DELETEROWS:
@@ -2334,7 +2333,7 @@ void SbaXDataBrowserController::Execute(sal_uInt16 nId, const Sequence< Property
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SaveModified" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveModified" );
     if ( bAskFor && GetState(ID_BROWSER_SAVERECORD).bEnabled )
     {
         getBrowserView()->getVclControl()->GrabFocus();
@@ -2373,7 +2372,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
     }
     catch(Exception&)
     {
-        OSL_FAIL("SbaXDataBrowserController::SaveModified : could not save the current record !");
+        SAL_WARN("dbaccess.ui", "SbaXDataBrowserController::SaveModified : could not save the current record !");
         bResult = sal_False;
     }
 
@@ -2385,7 +2384,7 @@ sal_Bool SbaXDataBrowserController::SaveModified(sal_Bool bAskFor)
 //------------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::CommitCurrent()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CommitCurrent" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CommitCurrent" );
     if (!getBrowserView())
         return sal_True;
 
@@ -2407,7 +2406,7 @@ sal_Bool SbaXDataBrowserController::CommitCurrent()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentModified" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentModified" );
     m_bCurrentlyModified = _bSet;
     InvalidateFeature( ID_BROWSER_SAVERECORD );
     InvalidateFeature( ID_BROWSER_UNDORECORD );
@@ -2416,14 +2415,14 @@ void SbaXDataBrowserController::setCurrentModified( sal_Bool _bSet )
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::RowChanged()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::RowChanged" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::RowChanged" );
     setCurrentModified( sal_False );
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::ColumnChanged()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::ColumnChanged" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::ColumnChanged" );
     InvalidateFeature(ID_BROWSER_SORTUP);
     InvalidateFeature(ID_BROWSER_SORTDOWN);
     InvalidateFeature(ID_BROWSER_ORDERCRIT);
@@ -2437,14 +2436,14 @@ void SbaXDataBrowserController::ColumnChanged()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::SelectionChanged()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SelectionChanged" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SelectionChanged" );
     // not interested in
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::CellActivated()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CellActivated" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellActivated" );
     m_aInvalidateClipboard.Start();
     OnInvalidateClipboard( NULL );
 }
@@ -2452,7 +2451,7 @@ void SbaXDataBrowserController::CellActivated()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::CellDeactivated()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::CellDeactivated" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::CellDeactivated" );
     m_aInvalidateClipboard.Stop();
     OnInvalidateClipboard( NULL );
 }
@@ -2484,7 +2483,7 @@ IMPL_LINK(SbaXDataBrowserController, OnInvalidateClipboard, AutoTimer*, _pTimer)
 // -------------------------------------------------------------------------
 Reference< XPropertySet >  SbaXDataBrowserController::getBoundField(sal_uInt16 nViewPos) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::SaveData" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::SaveData" );
     Reference< XPropertySet >  xEmptyReturn;
 
     // get the current column from the grid
@@ -2647,7 +2646,7 @@ IMPL_LINK_NOARG(SbaXDataBrowserController, OnAsyncGetCellFocus)
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::criticalFail()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::criticalFail" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::criticalFail" );
     InvalidateAll();
     m_nRowSetPrivileges = 0;
 }
@@ -2655,7 +2654,7 @@ void SbaXDataBrowserController::criticalFail()
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::LoadFinished" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::LoadFinished" );
     m_nRowSetPrivileges = 0;
 
     if (isValid() && !loadingCancelled())
@@ -2687,7 +2686,7 @@ void SbaXDataBrowserController::LoadFinished(sal_Bool /*bWasSynch*/)
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::initializeParser() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::initializeParser" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::initializeParser" );
     if ( !m_xParser.is() )
     {
         // ----------------------------------------------
@@ -2712,7 +2711,7 @@ void SbaXDataBrowserController::initializeParser() const
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::loaded" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::loaded" );
     // not interested in
     // we're loading within an separate thread and have a handling  for it's "finished event"
 }
@@ -2720,14 +2719,14 @@ void SbaXDataBrowserController::loaded(const EventObject& /*aEvent*/) throw( Run
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::unloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloading" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloading" );
     // not interested in
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::unloaded" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::unloaded" );
     m_xParser.clear();
     InvalidateAll();
         // do this asynchronously, there are other listeners reacting on this message ...
@@ -2740,14 +2739,14 @@ void SbaXDataBrowserController::unloaded(const EventObject& /*aEvent*/) throw( R
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::reloading(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloading" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloading" );
     // not interested in
 }
 
 //------------------------------------------------------------------------------
 void SbaXDataBrowserController::reloaded(const EventObject& /*aEvent*/) throw( RuntimeException )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::reloaded" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::reloaded" );
     InvalidateAll();
         // do this asynchronously, there are other listeners reacting on this message ...
         // (it's a little hack : the grid columns are listening to this event, too, and their bound field may
@@ -2781,14 +2780,14 @@ void SbaXDataBrowserController::leaveFormAction()
 // -------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::isLoaded() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::isLoaded" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isLoaded" );
     return m_xLoadable.is() && m_xLoadable->isLoaded();
 }
 
 // -------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::isValidCursor() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::isValidCursor" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::isValidCursor" );
     if (!m_xColumnsSupplier.is())
         return sal_False;
     Reference< ::com::sun::star::container::XNameAccess >  xCols = m_xColumnsSupplier->getColumns();
@@ -2811,7 +2810,7 @@ sal_Bool SbaXDataBrowserController::isValidCursor() const
 // -----------------------------------------------------------------------------
 sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::getCurrentColumnPosition" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::getCurrentColumnPosition" );
     Reference< ::com::sun::star::form::XGrid >  xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
     sal_Int16 nViewPos = -1;
     try
@@ -2825,7 +2824,7 @@ sal_Int16 SbaXDataBrowserController::getCurrentColumnPosition()
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::setCurrentColumnPosition" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::setCurrentColumnPosition" );
     Reference< ::com::sun::star::form::XGrid >  xGrid(getBrowserView()->getGridControl(), UNO_QUERY);
     try
     {
@@ -2837,7 +2836,7 @@ void SbaXDataBrowserController::setCurrentColumnPosition( sal_Int16 _nPos )
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::BeforeDrop()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::BeforeDrop" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::BeforeDrop" );
     Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster >  xFormError(getRowSet(), UNO_QUERY);
     if (xFormError.is())
         xFormError->removeSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
@@ -2845,7 +2844,7 @@ void SbaXDataBrowserController::BeforeDrop()
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::AfterDrop()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::AfterDrop" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::AfterDrop" );
     Reference< ::com::sun::star::sdb::XSQLErrorBroadcaster >  xFormError(getRowSet(), UNO_QUERY);
     if (xFormError.is())
         xFormError->addSQLErrorListener((::com::sun::star::sdb::XSQLErrorListener*)this);
@@ -2853,7 +2852,7 @@ void SbaXDataBrowserController::AfterDrop()
 // -----------------------------------------------------------------------------
 void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::star::awt::XControlModel > & _xGridControlModel)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::addColumnListeners" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::addColumnListeners" );
 // ... all the grid columns
     Reference< ::com::sun::star::container::XIndexContainer >  xColumns(_xGridControlModel, UNO_QUERY);
     if (xColumns.is())
@@ -2869,7 +2868,7 @@ void SbaXDataBrowserController::addColumnListeners(const Reference< ::com::sun::
 // -----------------------------------------------------------------------------
 sal_Bool SbaXDataBrowserController::InitializeGridModel(const Reference< ::com::sun::star::form::XFormComponent > & /*xGrid*/)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaui", "Ocke.Janssen@sun.com", "SbaXDataBrowserController::InitializeGridModel" );
+    SAL_INFO("dbaccess.ui", "SbaXDataBrowserController::InitializeGridModel" );
     return sal_True;
 }
 //..................................................................
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index d1f507d77d27..67bd3736b2e7 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -52,7 +52,6 @@
 #include <com/sun/star/frame/status/Visibility.hpp>
 #include <com/sun/star/util/XModifiable.hpp>
 #include <rtl/ustring.hxx>
-#include <rtl/logfile.hxx>
 #include <algorithm>
 #include <o3tl/compat_functional.hxx>
 #include <boost/unordered_map.hpp>
@@ -141,7 +140,7 @@ void UserDefinedFeatures::execute( const URL& _rFeatureURL, const Sequence< Prop
 
         if ( xDispatch == xController )
         {
-            OSL_FAIL( "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" );
+            SAL_WARN("dbaccess.ui", "UserDefinedFeatures::execute: the controller shouldn't be the dispatcher here!" );
             xDispatch.clear();
         }
 
@@ -225,7 +224,7 @@ OGenericUnoController::OGenericUnoController()
     ,m_bReadOnly(sal_False)
     ,m_bCurrentlyModified(sal_False)
 {
-    OSL_FAIL( "OGenericUnoController::OGenericUnoController: illegal call!" );
+    SAL_WARN("dbaccess.ui", "OGenericUnoController::OGenericUnoController: illegal call!" );
     // This ctor only exists because the MSVC compiler complained about an unresolved external
     // symbol. It should not be used at all. Since using it yields strange runtime problems,
     // we simply abort here.
@@ -265,7 +264,7 @@ sal_Bool OGenericUnoController::Construct(Window* /*pParent*/)
     }
     catch(const Exception&)
     {
-        OSL_FAIL("OGenericUnoController::Construct: could not create (or start listening at) the database context!");
+        SAL_WARN("dbaccess.ui","OGenericUnoController::Construct: could not create (or start listening at) the database context!");
         // at least notify the user. Though the whole component does not make any sense without the database context ...
         ShowServiceNotAvailableError(getView(), OUString("com.sun.star.sdb.DatabaseContext"), sal_True);
     }
@@ -605,7 +604,7 @@ void OGenericUnoController::InvalidateFeature_Impl()
                 OString sMessage( "OGenericUnoController::InvalidateFeature_Impl: feature id " );
                 sMessage += OString::valueOf( aNextFeature.nId );
                 sMessage += OString( " has been invalidated, but is not supported!" );
-                OSL_FAIL( sMessage.getStr() );
+                SAL_WARN("dbaccess.ui", sMessage.getStr() );
             }
 #endif
             if ( m_aSupportedFeatures.end() != aFeaturePos )
@@ -777,7 +776,7 @@ void OGenericUnoController::dispatch(const URL& _aURL, const Sequence< PropertyV
     OString sLog( "OGenericUnoController::dispatch( '" );
     sLog += OString( _aURL.Main.getStr(), _aURL.Main.getLength(), osl_getThreadTextEncoding() );
     sLog += OString( "' )" );
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "frank.schoenheit@sun.com", sLog.getStr() );
+    SAL_INFO("dbaccess.ui", "dbaccess frank.schoenheit@sun.com" << sLog.getStr() );
 #endif
 
     executeChecked(_aURL,aArgs);
@@ -1162,7 +1161,7 @@ Reference< XFrame > SAL_CALL OGenericUnoController::getFrame(void) throw( Runtim
 // -----------------------------------------------------------------------------
 sal_Bool SAL_CALL OGenericUnoController::attachModel(const Reference< XModel > & /*xModel*/) throw( RuntimeException )
 {
-    OSL_FAIL( "OGenericUnoController::attachModel: not supported!" );
+    SAL_WARN("dbaccess.ui", "OGenericUnoController::attachModel: not supported!" );
     return sal_False;
 }
 
@@ -1293,7 +1292,7 @@ namespace
                     pReturn = "sbasic";
                 else
                 {
-                    OSL_FAIL( "lcl_getModuleHelpModuleName: no installed module found" );
+                    SAL_WARN("dbaccess.ui", "lcl_getModuleHelpModuleName: no installed module found" );
                 }
             }
         }
@@ -1494,7 +1493,7 @@ sal_uInt16 OGenericUnoController::registerCommandURL( const OUString& _rComplete
         ++nFeatureId;
     if ( nFeatureId == LAST_USER_DEFINED_FEATURE )
     {
-        OSL_FAIL( "OGenericUnoController::registerCommandURL: no more space for user defined features!" );
+        SAL_WARN("dbaccess.ui", "OGenericUnoController::registerCommandURL: no more space for user defined features!" );
         return 0L;
     }
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index fa33bcb7f03f..57634c90e89e 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -126,7 +126,6 @@
 #include <vcl/toolbox.hxx>
 #include <vcl/waitobj.hxx>
 #include <vcl/wrkwin.hxx>
-#include <rtl/logfile.hxx>
 
 #include <memory>
 
@@ -241,7 +240,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
     DBG_DTOR(SbaTableQueryBrowser,NULL);
     if ( !rBHelper.bDisposed && !rBHelper.bInDispose )
     {
-        OSL_FAIL("Please check who doesn't dispose this component!");
+        SAL_WARN("dbaccess.ui", "Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
         osl_atomic_increment( &m_refCount );
         dispose();
@@ -367,7 +366,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
     }
     catch(const Exception&)
     {
-        OSL_FAIL("SbaTableQueryBrowser::Construct: could not create (or start listening at) the database context!");
+        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::Construct: could not create (or start listening at) the database context!");
     }
     // some help ids
     if (getBrowserView() && getBrowserView()->getVclControl())
@@ -1288,7 +1287,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getObjectEntry(const OUString& _rDataSour
                             }
                             catch(const Exception&)
                             {
-                                OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
+                                SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::populateTree: could not fill the tree");
                             }
                         }
                     }
@@ -1358,7 +1357,7 @@ void SbaTableQueryBrowser::connectExternalDispatches()
 
             if ( feature->second.xDispatcher.get() == static_cast< XDispatch* >( this ) )
             {
-                OSL_FAIL( "SbaTableQueryBrowser::connectExternalDispatches: this should not happen anymore!" );
+                SAL_WARN("dbaccess.ui",  "SbaTableQueryBrowser::connectExternalDispatches: this should not happen anymore!" );
                     // (nowadays, the URLs aren't in our SupportedFeatures list anymore, so we should
                     // not supply a dispatcher for this)
                 feature->second.xDispatcher.clear();
@@ -1480,7 +1479,7 @@ void SbaTableQueryBrowser::implRemoveStatusListeners()
             }
             catch (Exception&)
             {
-                OSL_FAIL("SbaTableQueryBrowser::implRemoveStatusListeners: could not remove a status listener!");
+                SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implRemoveStatusListeners: could not remove a status listener!");
             }
         }
     }
@@ -1505,7 +1504,7 @@ sal_Bool SAL_CALL SbaTableQueryBrowser::select( const Any& _rSelection ) throw (
     }
     catch(const Exception&)
     {
-        OSL_FAIL("SbaTableQueryBrowser::select: could not extract the descriptor!");
+        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::select: could not extract the descriptor!");
     }
 
     // check the precense of the props we need
@@ -1838,7 +1837,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
                 }
                 catch(DisposedException&)
                 {
-                    OSL_FAIL("SbaTableQueryBrowser::GetState: object already disposed!");
+                    SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: object already disposed!");
                 }
                 catch( const Exception& )
                 {
@@ -1861,7 +1860,7 @@ FeatureState SbaTableQueryBrowser::GetState(sal_uInt16 nId) const
                         case CommandType::COMMAND:
                             sTitle = OUString(ModuleRes(STR_QRY_TITLE)); break;
                         default:
-                            OSL_FAIL("SbaTableQueryBrowser::GetState: unknown command type!");
+                            SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::GetState: unknown command type!");
                     }
                     OUString aName;
                     xProp->getPropertyValue(PROPERTY_COMMAND) >>= aName;
@@ -2036,11 +2035,11 @@ void SbaTableQueryBrowser::Execute(sal_uInt16 nId, const Sequence< PropertyValue
                     }
                     catch(DisposedException&)
                     {
-                        OSL_FAIL("Object already disposed!");
+                        SAL_WARN("dbaccess.ui", "Object already disposed!");
                     }
                     catch(const Exception&)
                     {
-                        OSL_FAIL("SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not clone the cursor!");
+                        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::Execute(ID_BROWSER_?): could not clone the cursor!");
                     }
 
                     Reference<XPropertySet> xProp(getRowSet(),UNO_QUERY);
@@ -2207,7 +2206,7 @@ void SbaTableQueryBrowser::populateTree(const Reference<XNameAccess>& _xNameAcce
     }
     catch(const Exception&)
     {
-        OSL_FAIL("SbaTableQueryBrowser::populateTree: could not fill the tree");
+        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::populateTree: could not fill the tree");
     }
 }
 
@@ -2313,7 +2312,7 @@ IMPL_LINK(SbaTableQueryBrowser, OnExpandEntry, SvTreeListEntry*, _pParent)
                 if(e.TargetException >>= aSql)
                     aInfo = aSql;
                 else
-                    OSL_FAIL("SbaTableQueryBrowser::OnExpandEntry: something strange happended!");
+                    SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::OnExpandEntry: something strange happended!");
             }
             catch( const Exception& )
             {
@@ -2403,7 +2402,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
                             bSuccess = pEntryData->xContainer.is();
                         }
                         else {
-                            OSL_FAIL("SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
+                            SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::ensureEntryObject: no XQueryDefinitionsSupplier interface!");
                         }
                     }
                     catch( const Exception& )
@@ -2415,7 +2414,7 @@ sal_Bool SbaTableQueryBrowser::ensureEntryObject( SvTreeListEntry* _pEntry )
             break;
 
         default:
-            OSL_FAIL("SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
+            SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::ensureEntryObject: ooops ... missing some implementation here!");
             // TODO ...
             break;
     }
@@ -2786,7 +2785,7 @@ bool SbaTableQueryBrowser::implSelect( SvTreeListEntry* _pEntry )
             if(e.TargetException >>= aSql)
                 showError(SQLExceptionInfo(aSql));
             else
-                OSL_FAIL("SbaTableQueryBrowser::implSelect: something strange happended!");
+                SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::implSelect: something strange happended!");
             // reset the values
             xRowSetProps->setPropertyValue(PROPERTY_DATASOURCENAME,Any());
             xRowSetProps->setPropertyValue(PROPERTY_ACTIVE_CONNECTION,Any());
@@ -2987,7 +2986,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve
     }
     else if (xNames.get() == m_xDatabaseContext.get())
     {   // a datasource has been replaced in the context
-        OSL_FAIL("SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!");
+        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::elementReplaced: no support for replaced data sources!");
             // very suspicious: the database context should not allow to replace data source, only to register
             // and revoke them
     }
@@ -3125,11 +3124,11 @@ void SbaTableQueryBrowser::unloadAndCleanup( sal_Bool _bDisposeConnection )
         if(e.TargetException >>= aSql)
             showError(SQLExceptionInfo(aSql));
         else
-            OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: something strange happended!");
+            SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: something strange happended!");
     }
     catch(const Exception&)
     {
-        OSL_FAIL("SbaTableQueryBrowser::unloadAndCleanup: could not reset the form");
+        SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::unloadAndCleanup: could not reset the form");
     }
 }
 
@@ -3290,7 +3289,7 @@ void SbaTableQueryBrowser::impl_initialize()
                     }
                     catch( const Exception& )
                     {
-                        OSL_FAIL( "SbaTableQueryBrowser::impl_initialize: a connection parent which does not have a 'Name'!??" );
+                        SAL_WARN("dbaccess.ui",  "SbaTableQueryBrowser::impl_initialize: a connection parent which does not have a 'Name'!??" );
                     }
                 }
             }
@@ -3327,7 +3326,7 @@ void SbaTableQueryBrowser::impl_initialize()
         }
         catch(const Exception&)
         {
-            OSL_FAIL("SbaTableQueryBrowser::impl_initialize: could not set the update related names!");
+            SAL_WARN("dbaccess.ui", "SbaTableQueryBrowser::impl_initialize: could not set the update related names!");
         }
     }
 
@@ -3488,7 +3487,7 @@ IMPL_LINK( SbaTableQueryBrowser, OnTreeEntryCompare, const SvSortData*, _pSortDa
         if ( ( eLeft == etQueryContainer ) && ( eRight == etTableContainer ) )
             return COMPARE_LESS;
 
-        OSL_FAIL( "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" );
+        SAL_WARN("dbaccess.ui",  "SbaTableQueryBrowser::OnTreeEntryCompare: unexpected case!" );
         return COMPARE_EQUAL;
     }
 
@@ -3638,7 +3637,7 @@ Any SbaTableQueryBrowser::getCurrentSelection( Control& _rControl ) const
         break;
 
     default:
-        OSL_FAIL( "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" );
+        SAL_WARN("dbaccess.ui",  "SbaTableQueryBrowser::getCurrentSelection: invalid (unexpected) object type!" );
         break;
     }
 
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 12b1dde86309..8d2cd7defcc6 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -65,7 +65,6 @@
 #include "UpdateHelperImpl.hxx"
 #include <vcl/msgbox.hxx>
 #include <cppuhelper/exc_hlp.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaui;
 using namespace utl;
@@ -115,7 +114,7 @@ ODatabaseExport::ODatabaseExport(sal_Int32 nRows,
     ,m_bCheckOnly(sal_False)
     ,m_bAppendFirstLine(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
     DBG_CTOR(ODatabaseExport,NULL);
 
     m_nRows += nRows;
@@ -172,7 +171,7 @@ ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection,
     ,m_bCheckOnly(sal_False)
     ,m_bAppendFirstLine(false)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ODatabaseExport" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::ODatabaseExport" );
     DBG_CTOR(ODatabaseExport,NULL);
     try
     {
@@ -302,7 +301,7 @@ ODatabaseExport::~ODatabaseExport()
 // -----------------------------------------------------------------------------
 void ODatabaseExport::insertValueIntoColumn()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::insertValueIntoColumn" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::insertValueIntoColumn" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
     if(m_nColumnPos < sal_Int32(m_vDestVector.size()))
     {
@@ -324,7 +323,7 @@ void ODatabaseExport::insertValueIntoColumn()
                         OSL_ENSURE((nNewPos) < static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector");
                         if (m_vColumnTypes[nNewPos] != DataType::VARCHAR && m_vColumnTypes[nNewPos] != DataType::CHAR && m_vColumnTypes[nNewPos] != DataType::LONGVARCHAR )
                         {
-                            RTL_LOGFILE_CONTEXT_TRACE( aLogger, "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
+                            SAL_INFO("dbaccess", "ODatabaseExport::insertValueIntoColumn != DataType::VARCHAR" );
                             ensureFormatter();
                             sal_Int32 nNumberFormat = 0;
                             double fOutNumber = 0.0;
@@ -417,7 +416,7 @@ void ODatabaseExport::insertValueIntoColumn()
 // -----------------------------------------------------------------------------
 sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOldNumberFormat)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CheckString" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::CheckString" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
     double fOutNumber = 0.0;
     sal_Int16 nNumberFormat = 0;
@@ -551,7 +550,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
                     }
                     break;
                 default:
-                    OSL_FAIL("ODatabaseExport: Unbekanntes Format");
+                    SAL_WARN("dbaccess.ui", "ODatabaseExport: Unbekanntes Format");
             }
         }
     }
@@ -565,7 +564,7 @@ sal_Int16 ODatabaseExport::CheckString(const String& aCheckToken, sal_Int16 _nOl
 // -----------------------------------------------------------------------------
 void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfoMap* _pInfoMap)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::SetColumnTypes" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::SetColumnTypes" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
     if(_pList && _pInfoMap)
     {
@@ -638,7 +637,7 @@ void ODatabaseExport::SetColumnTypes(const TColumnVector* _pList,const OTypeInfo
 // -----------------------------------------------------------------------------
 void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::CreateDefaultColumn" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::CreateDefaultColumn" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
     Reference< XDatabaseMetaData>  xDestMetaData(m_xConnection->getMetaData());
     sal_Int32 nMaxNameLen(xDestMetaData->getMaxColumnNameLength());
@@ -691,7 +690,7 @@ void ODatabaseExport::CreateDefaultColumn(const OUString& _rColumnName)
 // -----------------------------------------------------------------------------
 sal_Bool ODatabaseExport::createRowSet()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createRowSet" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::createRowSet" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
     m_pUpdateHelper.reset(new OParameterUpdateHelper(createPreparedStatment(m_xConnection->getMetaData(),m_xTable,m_vColumns)));
 
@@ -700,7 +699,7 @@ sal_Bool ODatabaseExport::createRowSet()
 // -----------------------------------------------------------------------------
 sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _aTextColor,const FontDescriptor& _rFont)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::executeWizard" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::executeWizard" );
     DBG_CHKTHIS(ODatabaseExport,NULL);
 
     bool bHaveDefaultTable =  !m_sDefaultTableName.isEmpty();
@@ -767,7 +766,7 @@ sal_Bool ODatabaseExport::executeWizard(const OUString& _rTableName,const Any& _
 //---------------------------------------------------------------------------------
 void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException& e)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::showErrorDialog" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::showErrorDialog" );
     if(!m_bDontAskAgain)
     {
         String aMsg(e.Message);
@@ -784,7 +783,7 @@ void ODatabaseExport::showErrorDialog(const ::com::sun::star::sdbc::SQLException
 // -----------------------------------------------------------------------------
 void ODatabaseExport::adjustFormat()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::adjustFormat" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::adjustFormat" );
     if ( m_sTextToken.Len() )
     {
         sal_Int32 nNewPos = m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos;
@@ -807,7 +806,7 @@ void ODatabaseExport::adjustFormat()
 // -----------------------------------------------------------------------------
 void ODatabaseExport::eraseTokens()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::eraseTokens" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::eraseTokens" );
     m_sTextToken.Erase();
     m_sNumToken.Erase();
     m_sValToken.Erase();
@@ -815,7 +814,7 @@ void ODatabaseExport::eraseTokens()
 // -----------------------------------------------------------------------------
 void ODatabaseExport::ensureFormatter()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::ensureFormatter" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::ensureFormatter" );
     if ( !m_pFormatter )
     {
         Reference< XNumberFormatsSupplier >  xSupplier = m_xFormatter->getNumberFormatsSupplier();
@@ -831,7 +830,7 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
                                                        ,const Reference<XPropertySet>& _xDestTable
                                                        ,const TPositions& _rvColumns)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseExport::createPreparedStatment" );
+    SAL_INFO("dbaccess.ui", "ODatabaseExport::createPreparedStatment" );
     OUString aSql(OUString("INSERT INTO "));
     OUString sComposedTableName = ::dbtools::composeTableName( _xMetaData, _xDestTable, ::dbtools::eInDataManipulation, false, false, true );
 
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx
index 8ab0ed0a19b3..2938000d2063 100644
--- a/dbaccess/source/ui/misc/HtmlReader.cxx
+++ b/dbaccess/source/ui/misc/HtmlReader.cxx
@@ -55,7 +55,6 @@
 #include <rtl/tencinfo.h>
 #include "UITools.hxx"
 #include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
@@ -84,7 +83,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,const SharedConnection& _rxConnection,
     ,m_bMetaOptions(sal_False)
     ,m_bSDNum(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::OHTMLReader" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
     DBG_CTOR(OHTMLReader,NULL);
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
     // If the file starts with a BOM, switch to UCS2.
@@ -106,7 +105,7 @@ OHTMLReader::OHTMLReader(SvStream& rIn,
     ,m_bMetaOptions(sal_False)
     ,m_bSDNum(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::OHTMLReader" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::OHTMLReader" );
     DBG_CTOR(OHTMLReader,NULL);
     SetSrcEncoding( GetExtendedCompatibilityTextEncoding(  RTL_TEXTENCODING_ISO_8859_1 ) );
     // If the file starts with a BOM, switch to UCS2.
@@ -120,7 +119,7 @@ OHTMLReader::~OHTMLReader()
 // ---------------------------------------------------------------------------
 SvParserState OHTMLReader::CallParser()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::CallParser" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::CallParser" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     rInput.Seek(STREAM_SEEK_TO_BEGIN);
     rInput.ResetError();
@@ -131,7 +130,7 @@ SvParserState OHTMLReader::CallParser()
 // -----------------------------------------------------------------------------
 void OHTMLReader::NextToken( int nToken )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::NextToken" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::NextToken" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
         return;
@@ -301,7 +300,7 @@ void OHTMLReader::NextToken( int nToken )
 // -----------------------------------------------------------------------------
 void OHTMLReader::fetchOptions()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::fetchOptions" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::fetchOptions" );
     m_bInTbl = sal_True;
     const HTMLOptions& options = GetOptions();
     for (size_t i = 0, n = options.size(); i < n; ++i)
@@ -324,7 +323,7 @@ void OHTMLReader::fetchOptions()
 //---------------------------------------------------------------------------------
 void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::TableDataOn" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::TableDataOn" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     const HTMLOptions& rHtmlOptions = GetOptions();
     for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
@@ -355,7 +354,7 @@ void OHTMLReader::TableDataOn(SvxCellHorJustify& eVal)
 //---------------------------------------------------------------------------------
 void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::TableFontOn" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::TableFontOn" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     const HTMLOptions& rHtmlOptions = GetOptions();
     for (size_t i = 0, n = rHtmlOptions.size(); i < n; ++i)
@@ -405,7 +404,7 @@ void OHTMLReader::TableFontOn(FontDescriptor& _rFont,sal_Int32 &_rTextColor)
 // ---------------------------------------------------------------------------
 sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::GetWidthPixel" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::GetWidthPixel" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     const String& rOptVal = rOption.GetString();
     if ( rOptVal.Search('%') != STRING_NOTFOUND )
@@ -427,7 +426,7 @@ sal_Int16 OHTMLReader::GetWidthPixel( const HTMLOption& rOption )
 // ---------------------------------------------------------------------------
 sal_Bool OHTMLReader::CreateTable(int nToken)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::CreateTable" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::CreateTable" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     String aTempName(ModuleRes(STR_TBL_TITLE));
     aTempName = aTempName.GetToken(0,' ');
@@ -538,7 +537,7 @@ sal_Bool OHTMLReader::CreateTable(int nToken)
 // -----------------------------------------------------------------------------
 void OHTMLReader::setTextEncoding()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::setTextEncoding" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::setTextEncoding" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     m_bMetaOptions = sal_True;
     ParseMetaOptions(NULL, NULL);
@@ -547,14 +546,14 @@ void OHTMLReader::setTextEncoding()
 // -----------------------------------------------------------------------------
 void OHTMLReader::release()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::release" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::release" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     ReleaseRef();
 }
 // -----------------------------------------------------------------------------
 TypeSelectionPageFactory OHTMLReader::getTypeSelectionPageFactory()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLReader::getTypeSelectionPageFactory" );
+    SAL_INFO("dbaccess.ui", "OHTMLReader::getTypeSelectionPageFactory" );
     DBG_CHKTHIS(OHTMLReader,NULL);
     return &OWizHTMLExtend::Create;
 }
diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index e5ba2b86d499..4ae0b4561fc0 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -28,7 +28,6 @@
 #include "dbustrings.hrc"
 #include <com/sun/star/sdbc/XRowUpdate.hpp>
 #include <functional>
-#include <rtl/logfile.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
@@ -52,13 +51,13 @@ ORowSetImportExport::ORowSetImportExport(   Window* _pParent,
                                             ,m_pParent(_pParent)
                                             ,m_bAlreadyAsked(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::ORowSetImportExport" );
+    SAL_INFO("dbaccess.ui", "ORowSetImportExport::ORowSetImportExport" );
     OSL_ENSURE(_pParent,"Window can't be null!");
 }
 // -----------------------------------------------------------------------------
 void ORowSetImportExport::initialize()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::initialize" );
+    SAL_INFO("dbaccess.ui", "ORowSetImportExport::initialize" );
     ODatabaseImportExport::initialize();
     // do namemapping
     Reference<XColumnLocate> xColumnLocate(m_xResultSet,UNO_QUERY);
@@ -98,13 +97,13 @@ void ORowSetImportExport::initialize()
 // -----------------------------------------------------------------------------
 sal_Bool ORowSetImportExport::Write()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Write" );
+    SAL_INFO("dbaccess.ui", "ORowSetImportExport::Write" );
     return sal_True;
 }
 // -----------------------------------------------------------------------------
 sal_Bool ORowSetImportExport::Read()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::Read" );
+    SAL_INFO("dbaccess.ui", "ORowSetImportExport::Read" );
     // check if there is any column to copy
     if(::std::find_if(m_aColumnMapping.begin(),m_aColumnMapping.end(),
                         ::std::bind2nd(::std::greater<sal_Int32>(),0)) == m_aColumnMapping.end())
@@ -159,7 +158,7 @@ sal_Bool ORowSetImportExport::Read()
 // -----------------------------------------------------------------------------
 sal_Bool ORowSetImportExport::insertNewRow()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORowSetImportExport::insertNewRow" );
+    SAL_INFO("dbaccess.ui", "ORowSetImportExport::insertNewRow" );
     try
     {
         m_xTargetResultSetUpdate->moveToInsertRow();
@@ -231,7 +230,7 @@ sal_Bool ORowSetImportExport::insertNewRow()
                         aValue <<= m_xRow->getClob(*aIter);
                         break;
                     default:
-                        OSL_FAIL("Unknown type");
+                        SAL_WARN("dbaccess.ui", "Unknown type");
                 }
                 if(m_xRow->wasNull())
                     m_xTargetRowUpdate->updateNull(i);
diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx
index 8e85fbe993ba..bd3690aed679 100644
--- a/dbaccess/source/ui/misc/RtfReader.cxx
+++ b/dbaccess/source/ui/misc/RtfReader.cxx
@@ -46,7 +46,6 @@
 #include "QEnumTypes.hxx"
 #include "UITools.hxx"
 #include <vcl/svapp.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaui;
 using namespace ::com::sun::star::uno;
@@ -69,7 +68,7 @@ ORTFReader::ORTFReader( SvStream& rIn,
     :SvRTFParser(rIn)
     ,ODatabaseExport( _rxConnection, _rxNumberF, _rxContext, pList, _pInfoMap, rIn )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
     DBG_CTOR(ORTFReader,NULL);
     m_bAppendFirstLine = false;
 }
@@ -85,7 +84,7 @@ ORTFReader::ORTFReader(SvStream& rIn,
    :SvRTFParser(rIn)
    ,ODatabaseExport( nRows, _rColumnPositions, _rxNumberF, _rxContext, pList, _pInfoMap, _bAutoIncrementEnabled, rIn )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::ORTFReader" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::ORTFReader" );
     DBG_CTOR(ORTFReader,NULL);
     m_bAppendFirstLine = false;
 }
@@ -97,7 +96,7 @@ ORTFReader::~ORTFReader()
 // ---------------------------------------------------------------------------
 SvParserState ORTFReader::CallParser()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::CallParser" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::CallParser" );
     DBG_CHKTHIS(ORTFReader,NULL);
     rInput.Seek(STREAM_SEEK_TO_BEGIN);
     rInput.ResetError();
@@ -108,7 +107,7 @@ SvParserState ORTFReader::CallParser()
 // ---------------------------------------------------------------------------
 void ORTFReader::NextToken( int nToken )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::NextToken" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::NextToken" );
     DBG_CHKTHIS(ORTFReader,NULL);
     if(m_bError || !m_nRows) // if there is an error or no more rows to check, return immediatelly
         return;
@@ -262,7 +261,7 @@ void ORTFReader::NextToken( int nToken )
 // ---------------------------------------------------------------------------
 sal_Bool ORTFReader::CreateTable(int nToken)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::CreateTable" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::CreateTable" );
     DBG_CHKTHIS(ORTFReader,NULL);
     String aTableName(ModuleRes(STR_TBL_TITLE));
     aTableName = aTableName.GetToken(0,' ');
@@ -346,7 +345,7 @@ sal_Bool ORTFReader::CreateTable(int nToken)
 // -----------------------------------------------------------------------------
 void ORTFReader::release()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::release" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::release" );
     DBG_CHKTHIS(ORTFReader,NULL);
     ReleaseRef();
 }
@@ -354,7 +353,7 @@ void ORTFReader::release()
 // -----------------------------------------------------------------------------
 TypeSelectionPageFactory ORTFReader::getTypeSelectionPageFactory()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFReader::getTypeSelectionPageFactory" );
+    SAL_INFO("dbaccess.ui", "ORTFReader::getTypeSelectionPageFactory" );
     DBG_CHKTHIS(ORTFReader,NULL);
     return &OWizRTFExtend::Create;
 }
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index 1d950a83519d..df5ccdd49c62 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -55,7 +55,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 
 #include "dbexchange.hxx"
-#include <rtl/logfile.hxx>
 //........................................................................
 namespace dbaui
 {
@@ -88,7 +87,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R
 {
     if ( CommandType::QUERY != i_nCommandType && CommandType::TABLE != i_nCommandType )
     {
-        OSL_FAIL( "OTableCopyHelper::insertTable: invalid call (no supported format found)!" );
+        SAL_WARN("dbaccess.ui", "OTableCopyHelper::insertTable: invalid call (no supported format found)!" );
         return;
     }
 
@@ -100,7 +99,7 @@ void OTableCopyHelper::insertTable( const OUString& i_rSourceDataSource, const R
 
         if ( !xSrcConnection.is() || !i_rDestConnection.is() )
         {
-            OSL_FAIL( "OTableCopyHelper::insertTable: no connection/s!" );
+            SAL_WARN("dbaccess.ui", "OTableCopyHelper::insertTable: no connection/s!" );
             return;
         }
 
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 1fe8ebdf3073..b3d88ae23915 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -55,7 +55,6 @@
 #include <svtools/htmlcfg.hxx>
 #include <connectivity/formattedcolumnvalue.hxx>
 #include <unotools/syslocale.hxx>
-#include <rtl/logfile.hxx>
 
 using namespace dbaui;
 using namespace dbtools;
@@ -103,7 +102,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
     ,m_bInInitialize(sal_False)
     ,m_bCheckOnly(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::ODatabaseImportExport" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
     DBG_CTOR(ODatabaseImportExport,NULL);
 
     m_eDestEnc = osl_getThreadTextEncoding();
@@ -135,7 +134,7 @@ ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection&
     ,m_bInInitialize(sal_False)
     ,m_bCheckOnly(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::ODatabaseImportExport" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::ODatabaseImportExport" );
     DBG_CTOR(ODatabaseImportExport,NULL);
     m_eDestEnc = osl_getThreadTextEncoding();
     try
@@ -162,7 +161,7 @@ ODatabaseImportExport::~ODatabaseImportExport()
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::dispose()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::disposing" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
     DBG_CHKTHIS(ODatabaseImportExport,NULL);
     // remove me as listener
     Reference< XComponent >  xComponent(m_xConnection, UNO_QUERY);
@@ -185,7 +184,7 @@ void ODatabaseImportExport::dispose()
 // -----------------------------------------------------------------------------
 void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) throw(::com::sun::star::uno::RuntimeException)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::disposing" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::disposing" );
     DBG_CHKTHIS(ODatabaseImportExport,NULL);
     Reference<XConnection> xCon(Source.Source,UNO_QUERY);
     if(m_xConnection.is() && m_xConnection == xCon)
@@ -198,14 +197,14 @@ void SAL_CALL ODatabaseImportExport::disposing( const EventObject& Source ) thro
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::initialize( const ODataAccessDescriptor& _aDataDescriptor )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::initialize" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
     impl_initFromDescriptor( _aDataDescriptor, true );
 }
 
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor& _aDataDescriptor, bool _bPlusDefaultInit)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::impl_initFromDescriptor" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor" );
     DBG_CHKTHIS(ODatabaseImportExport,NULL);
     if ( !_bPlusDefaultInit )
     {
@@ -239,7 +238,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
         {
             if ( !m_xResultSet.is() )
             {
-                OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" );
+                SAL_WARN("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor: selection without result set is nonsense!" );
                 m_aSelection.realloc( 0 );
             }
         }
@@ -248,7 +247,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
         {
             if ( m_bBookmarkSelection && !m_xRowLocate.is() )
             {
-                OSL_FAIL( "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" );
+                SAL_WARN("dbaccess.ui", "ODatabaseImportExport::impl_initFromDescriptor: no XRowLocate -> no bookmars!" );
                 m_aSelection.realloc( 0 );
             }
         }
@@ -268,7 +267,7 @@ void ODatabaseImportExport::impl_initFromDescriptor( const ODataAccessDescriptor
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::initialize()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::initialize" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::initialize" );
     DBG_CHKTHIS(ODatabaseImportExport,NULL);
     m_bInInitialize = sal_True;
     m_bNeedToReInitialize = false;
@@ -375,7 +374,7 @@ sal_Bool ODatabaseImportExport::Read()
 // -----------------------------------------------------------------------------
 void ODatabaseImportExport::impl_initializeRowMember_throw()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ODatabaseImportExport::impl_initializeRowMember_throw" );
+    SAL_INFO("dbaccess.ui", "ODatabaseImportExport::impl_initializeRowMember_throw" );
     if ( !m_xRow.is() && m_xResultSet.is() )
     {
         m_xRow.set( m_xResultSet, UNO_QUERY );
@@ -388,7 +387,7 @@ void ODatabaseImportExport::impl_initializeRowMember_throw()
 //======================================================================
 sal_Bool ORTFImportExport::Write()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Write" );
+    SAL_INFO("dbaccess.ui", "ORTFImportExport::Write" );
     ODatabaseImportExport::Write();
     (*m_pStream) << '{'     << OOO_STRING_SVTOOLS_RTF_RTF;
     (*m_pStream) << OOO_STRING_SVTOOLS_RTF_ANSI << ODatabaseImportExport::sNewLine;
@@ -612,7 +611,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
             }
             catch (Exception&)
             {
-                OSL_FAIL("RTF WRITE!");
+                SAL_WARN("dbaccess.ui","RTF WRITE!");
             }
 
             (*m_pStream) << OOO_STRING_SVTOOLS_RTF_CELL;
@@ -628,7 +627,7 @@ void ORTFImportExport::appendRow(OString* pHorzChar,sal_Int32 _nColumnCount,sal_
 //-------------------------------------------------------------------
 sal_Bool ORTFImportExport::Read()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "ORTFImportExport::Read" );
+    SAL_INFO("dbaccess.ui", "ORTFImportExport::Read" );
     ODatabaseImportExport::Read();
     SvParserState eState = SVPAR_ERROR;
     if ( m_pStream )
@@ -677,7 +676,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
     ,m_bCheckFont(sal_False)
 #endif
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::OHTMLImportExport" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::OHTMLImportExport" );
     // set HTML configuration
     SvxHtmlOptions& rHtmlOptions = SvxHtmlOptions::Get();
     m_eDestEnc = rHtmlOptions.GetTextEncoding();
@@ -687,7 +686,7 @@ OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataD
 //-------------------------------------------------------------------
 sal_Bool OHTMLImportExport::Write()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Write" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::Write" );
     ODatabaseImportExport::Write();
     if(m_xObject.is())
     {
@@ -706,7 +705,7 @@ sal_Bool OHTMLImportExport::Write()
 //-------------------------------------------------------------------
 sal_Bool OHTMLImportExport::Read()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::Read" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::Read" );
     ODatabaseImportExport::Read();
     SvParserState eState = SVPAR_ERROR;
     if ( m_pStream )
@@ -726,7 +725,7 @@ sal_Bool OHTMLImportExport::Read()
 //-------------------------------------------------------------------
 void OHTMLImportExport::WriteHeader()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteHeader" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteHeader" );
     uno::Reference<document::XDocumentProperties> xDocProps(
         document::DocumentProperties::create( m_xContext ) );
     if (xDocProps.is()) {
@@ -743,7 +742,7 @@ void OHTMLImportExport::WriteHeader()
 //-----------------------------------------------------------------------
 void OHTMLImportExport::WriteBody()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteBody" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteBody" );
 
     IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_style );
 
@@ -779,7 +778,7 @@ void OHTMLImportExport::WriteBody()
 //-----------------------------------------------------------------------
 void OHTMLImportExport::WriteTables()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteTables" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteTables" );
     OString aStrOut  = OOO_STRING_SVTOOLS_HTML_table;
     aStrOut = aStrOut + " ";
     aStrOut = aStrOut + OOO_STRING_SVTOOLS_HTML_frame;
@@ -953,7 +952,7 @@ void OHTMLImportExport::WriteTables()
 void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_Int32 nHeightPixel,const char* pChar,
                                    const String& rValue,const char* pHtmlTag)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteCell" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::WriteCell" );
     OString aStrTD = pHtmlTag;
 
     nWidthPixel  = nWidthPixel  ? nWidthPixel   : 86;
@@ -1027,7 +1026,7 @@ void OHTMLImportExport::WriteCell( sal_Int32 nFormat,sal_Int32 nWidthPixel,sal_I
 //-----------------------------------------------------------------------
 void OHTMLImportExport::FontOn()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::FontOn" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOn" );
 #if OSL_DEBUG_LEVEL > 0
         m_bCheckFont = sal_True;
 #endif
@@ -1058,7 +1057,7 @@ void OHTMLImportExport::FontOn()
 //-----------------------------------------------------------------------
 inline void OHTMLImportExport::FontOff()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::FontOff" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::FontOff" );
     OSL_ENSURE(m_bCheckFont,"Kein FontOn() gerufen");
     TAG_OFF( OOO_STRING_SVTOOLS_HTML_font );
 #if OSL_DEBUG_LEVEL > 0
@@ -1068,7 +1067,7 @@ inline void OHTMLImportExport::FontOff()
 //-----------------------------------------------------------------------
 void OHTMLImportExport::IncIndent( sal_Int16 nVal )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::IncIndent" );
+    SAL_INFO("dbaccess.ui", "OHTMLImportExport::IncIndent" );
     sIndent[m_nIndent] = '\t';
     m_nIndent = m_nIndent + nVal;
     if ( m_nIndent < 0 )
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 63473f238ea3..f8e86dd470ec 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -55,7 +55,6 @@
 #include <connectivity/dbmetadata.hxx>
 #include <connectivity/dbexception.hxx>
 
-#include <rtl/logfile.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -469,14 +468,14 @@ const DummyCopySource& DummyCopySource::Instance()
 //------------------------------------------------------------------------
 OUString DummyCopySource::getQualifiedObjectName() const
 {
-    OSL_FAIL( "DummyCopySource::getQualifiedObjectName: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::getQualifiedObjectName: not to be called!" );
     return OUString();
 }
 
 //------------------------------------------------------------------------
 bool DummyCopySource::isView() const
 {
-    OSL_FAIL( "DummyCopySource::isView: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::isView: not to be called!" );
     return false;
 }
 
@@ -498,27 +497,27 @@ Sequence< OUString > DummyCopySource::getColumnNames() const
 //------------------------------------------------------------------------
 Sequence< OUString > DummyCopySource::getPrimaryKeyColumnNames() const
 {
-    OSL_FAIL( "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::getPrimaryKeyColumnNames: not to be called!" );
     return Sequence< OUString >();
 }
 
 //------------------------------------------------------------------------
 OFieldDescription* DummyCopySource::createFieldDescription( const OUString& /*_rColumnName*/ ) const
 {
-    OSL_FAIL( "DummyCopySource::createFieldDescription: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::createFieldDescription: not to be called!" );
     return NULL;
 }
 //------------------------------------------------------------------------
 OUString DummyCopySource::getSelectStatement() const
 {
-    OSL_FAIL( "DummyCopySource::getSelectStatement: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::getSelectStatement: not to be called!" );
     return OUString();
 }
 
 //------------------------------------------------------------------------
 ::utl::SharedUNOComponent< XPreparedStatement > DummyCopySource::getPreparedSelectStatement() const
 {
-    OSL_FAIL( "DummyCopySource::getPreparedSelectStatement: not to be called!" );
+    SAL_WARN("dbaccess.ui",  "DummyCopySource::getPreparedSelectStatement: not to be called!" );
     return ::utl::SharedUNOComponent< XPreparedStatement >();
 }
 
@@ -571,7 +570,7 @@ OCopyTableWizard::OCopyTableWizard( Window * pParent, const OUString& _rDefaultN
     ,m_ePressed( WIZARD_NONE )
     ,m_bCreatePrimaryKeyColumn(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::OCopyTableWizard" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
     DBG_CTOR(OCopyTableWizard,NULL);
     construct();
 
@@ -671,7 +670,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
     ,m_ePressed( WIZARD_NONE )
     ,m_bCreatePrimaryKeyColumn(sal_False)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::OCopyTableWizard" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::OCopyTableWizard" );
     DBG_CTOR(OCopyTableWizard,NULL);
     construct();
     ODatabaseExport::TColumnVector::const_iterator aIter = _rSourceColVec.begin();
@@ -701,7 +700,7 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::construct()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::construct" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::construct" );
     AddButton( &m_pbHelp, WIZARDDIALOG_BUTTON_STDOFFSET_X );
     AddButton( &m_pbCancel, WIZARDDIALOG_BUTTON_STDOFFSET_X );
     AddButton( &m_pbPrev );
@@ -797,7 +796,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplNextHdl)
 // -----------------------------------------------------------------------
 sal_Bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckColumns" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckColumns" );
     sal_Bool bRet = sal_True;
     m_vColumnPos.clear();
     m_vColumnTypes.clear();
@@ -962,7 +961,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
                 break;
             default:
             {
-                OSL_FAIL("OCopyTableWizard::ImplOKHdl: invalid creation style!");
+                SAL_WARN("dbaccess.ui", "OCopyTableWizard::ImplOKHdl: invalid creation style!");
             }
         }
 
@@ -973,14 +972,14 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplOKHdl)
 //------------------------------------------------------------------------
 sal_Bool OCopyTableWizard::shouldCreatePrimaryKey() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::shouldCreatePrimaryKey" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::shouldCreatePrimaryKey" );
     return m_bCreatePrimaryKeyColumn;
 }
 
 // -----------------------------------------------------------------------
 void OCopyTableWizard::setCreatePrimaryKey( bool _bDoCreate, const OUString& _rSuggestedName )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setCreatePrimaryKey" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::setCreatePrimaryKey" );
     m_bCreatePrimaryKeyColumn = _bDoCreate;
     if ( !_rSuggestedName.isEmpty() )
         m_aKeyName = _rSuggestedName;
@@ -1012,7 +1011,7 @@ IMPL_LINK_NOARG(OCopyTableWizard, ImplActivateHdl)
 // -----------------------------------------------------------------------
 void OCopyTableWizard::CheckButtons()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::CheckButtons" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::CheckButtons" );
     if(GetCurLevel() == 0) // the first page has no back button
     {
         if(m_nPageCount > 1)
@@ -1036,7 +1035,7 @@ void OCopyTableWizard::CheckButtons()
 // -----------------------------------------------------------------------
 void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::EnableButton" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::EnableButton" );
     Button* pButton;
     if(eStyle == WIZARD_NEXT)
         pButton = &m_pbNext;
@@ -1050,21 +1049,21 @@ void OCopyTableWizard::EnableButton(Wizard_Button_Style eStyle,sal_Bool bEnable)
 // -----------------------------------------------------------------------
 long OCopyTableWizard::DeactivatePage()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::DeactivatePage" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::DeactivatePage" );
     OWizardPage* pPage = (OWizardPage*)GetPage(GetCurLevel());
     return pPage ? pPage->LeavePage() : sal_False;
 }
 // -----------------------------------------------------------------------
 void OCopyTableWizard::AddWizardPage(OWizardPage* pPage)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::AddWizardPage" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::AddWizardPage" );
     AddPage(pPage);
     ++m_nPageCount;
 }
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::insertColumn" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::insertColumn" );
     OSL_ENSURE(_pField,"FieldDescrioption is null!");
     if ( _pField )
     {
@@ -1083,7 +1082,7 @@ void OCopyTableWizard::insertColumn(sal_Int32 _nPos,OFieldDescription* _pField)
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,const OUString& _sOldName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::replaceColumn" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::replaceColumn" );
     OSL_ENSURE(_pField,"FieldDescrioption is null!");
     if ( _pField )
     {
@@ -1097,14 +1096,14 @@ void OCopyTableWizard::replaceColumn(sal_Int32 _nPos,OFieldDescription* _pField,
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::impl_loadSourceData()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::impl_loadSourceData" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::impl_loadSourceData" );
     loadData( m_rSourceObject, m_vSourceColumns, m_vSourceVec );
 }
 
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::loadData(  const ICopyTableSourceObject& _rSourceObject, ODatabaseExport::TColumns& _rColumns, ODatabaseExport::TColumnVector& _rColVector )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::loadData" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::loadData" );
     ODatabaseExport::TColumns::iterator colEnd = _rColumns.end();
     for ( ODatabaseExport::TColumns::iterator col = _rColumns.begin(); col != colEnd; ++col )
         delete col->second;
@@ -1165,7 +1164,7 @@ void OCopyTableWizard::loadData(  const ICopyTableSourceObject& _rSourceObject,
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::clearDestColumns()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::clearDestColumns" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::clearDestColumns" );
     clearColumns(m_vDestColumns,m_aDestVec);
     m_bAddPKFirstTime = sal_True;
     m_mNameMapping.clear();
@@ -1174,7 +1173,7 @@ void OCopyTableWizard::clearDestColumns()
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, const ODatabaseExport::TColumnVector* _pVec, sal_Bool _bKeyColumns) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::appendColumns" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendColumns" );
     // now append the columns
     OSL_ENSURE(_rxColSup.is(),"No columns supplier");
     if(!_rxColSup.is())
@@ -1216,7 +1215,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
             }
             else
             {
-                OSL_FAIL("OCopyTableWizard::appendColumns: invalid field name!");
+                SAL_WARN("dbaccess.ui", "OCopyTableWizard::appendColumns: invalid field name!");
             }
 
         }
@@ -1225,7 +1224,7 @@ void OCopyTableWizard::appendColumns( Reference<XColumnsSupplier>& _rxColSup, co
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatabaseExport::TColumnVector* _pVec) const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::appendKey" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::appendKey" );
     if(!_rxSup.is())
         return; // the database doesn't support keys
     OSL_ENSURE(_rxSup.is(),"No XKeysSupplier!");
@@ -1253,7 +1252,7 @@ void OCopyTableWizard::appendKey( Reference<XKeysSupplier>& _rxSup, const ODatab
 // -----------------------------------------------------------------------------
 Reference< XPropertySet > OCopyTableWizard::createView() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createView" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::createView" );
     OUString sCommand( m_rSourceObject.getSelectStatement() );
     OSL_ENSURE( !sCommand.isEmpty(), "OCopyTableWizard::createView: no statement in the source object!" );
         // there are legitimate cases in which getSelectStatement does not provide a statement,
@@ -1263,7 +1262,7 @@ Reference< XPropertySet > OCopyTableWizard::createView() const
 // -----------------------------------------------------------------------------
 Reference< XPropertySet > OCopyTableWizard::createTable()
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createTable" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::createTable" );
     Reference< XPropertySet > xTable;
 
     Reference<XTablesSupplier> xSup( m_xDestConnection, UNO_QUERY );
@@ -1397,7 +1396,7 @@ bool OCopyTableWizard::supportsPrimaryKey( const Reference< XConnection >& _rxCo
 // -----------------------------------------------------------------------------
 bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnection )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::supportsViews" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsViews" );
     OSL_PRECOND( _rxConnection.is(), "OCopyTableWizard::supportsViews: invalid connection!" );
     if ( !_rxConnection.is() )
         return false;
@@ -1440,7 +1439,7 @@ bool OCopyTableWizard::supportsViews( const Reference< XConnection >& _rxConnect
 // -----------------------------------------------------------------------------
 sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::getMaxColumnNameLength" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::getMaxColumnNameLength" );
     sal_Int32 nLen = 0;
     if ( m_xDestConnection.is() )
     {
@@ -1459,13 +1458,13 @@ sal_Int32 OCopyTableWizard::getMaxColumnNameLength() const
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::setOperation( const sal_Int16 _nOperation )
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::setOperation" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::setOperation" );
     m_nOperation = _nOperation;
 }
 // -----------------------------------------------------------------------------
 sal_Int16 OCopyTableWizard::getOperation() const
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::getOperation" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::getOperation" );
     return m_nOperation;
 }
 // -----------------------------------------------------------------------------
@@ -1474,7 +1473,7 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor&   _rCmpFu
                                                     const OUString&  _sExtraChars,
                                                     sal_Int32               _nMaxNameLen)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertColumnName" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertColumnName" );
     OUString sAlias = _sColumnName;
     if ( isSQL92CheckEnabled( m_xDestConnection ) )
         sAlias = ::dbtools::convertName2SQLName(_sColumnName,_sExtraChars);
@@ -1509,14 +1508,14 @@ OUString OCopyTableWizard::convertColumnName(const TColumnFindFunctor&   _rCmpFu
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::removeColumnNameFromNameMap(const OUString& _sName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::removeColumnNameFromNameMap" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::removeColumnNameFromNameMap" );
     m_mNameMapping.erase(_sName);
 }
 
 // -----------------------------------------------------------------------------
 sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDataType)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::supportsType" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::supportsType" );
     sal_Bool bRet = m_aDestTypeInfo.find(_nDataType) != m_aDestTypeInfo.end();
     if ( bRet )
         _rNewDataType = _nDataType;
@@ -1526,7 +1525,7 @@ sal_Bool OCopyTableWizard::supportsType(sal_Int32 _nDataType,sal_Int32& _rNewDat
 // -----------------------------------------------------------------------------
 TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool& _bNotConvert)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::convertType" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::convertType" );
     if ( !m_bInterConnectionCopy )
         // no need to convert if the source and destination connection are the same
         return _pType;
@@ -1625,7 +1624,7 @@ TOTypeInfoSP OCopyTableWizard::convertType(const TOTypeInfoSP& _pType,sal_Bool&
 // -----------------------------------------------------------------------------
 OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::createUniqueName" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::createUniqueName" );
     OUString sName = _sName;
     Sequence< OUString > aColumnNames( m_rSourceObject.getColumnNames() );
     if ( aColumnNames.getLength() )
@@ -1647,7 +1646,7 @@ OUString OCopyTableWizard::createUniqueName(const OUString& _sName)
 // -----------------------------------------------------------------------------
 void OCopyTableWizard::showColumnTypeNotSupported(const OUString& _rColumnName)
 {
-    RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OCopyTableWizard::showColumnTypeNotSupported" );
+    SAL_INFO("dbaccess.ui", "OCopyTableWizard::showColumnTypeNotSupported" );
     String sMessage( ModuleRes( STR_UNKNOWN_TYPE_FOUND ) );
     sMessage.SearchAndReplaceAscii("#1",_rColumnName);
     showError(sMessage);
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx b/dbaccess/source/ui/uno/copytablewizard.cxx
index 9bb4591f68f8..cf71cbd28647 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -64,7 +64,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
 #include <svtools/genericunodialog.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/sharedunocomponent.hxx>
@@ -1092,7 +1091,7 @@ bool CopyTableWizard::impl_processCopyError_nothrow( const CopyTableRowEvent& _r
             case CopyTableContinuation::AskUser:            break;          // stop asking the listeners, ask the user
 
             default:
-                OSL_FAIL( "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" );
+                SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_processCopyError_nothrow: invalid listener response!" );
                 // ask next listener
                 continue;
             }
@@ -1391,7 +1390,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
 
                 if( !xTable.is() )
                 {
-                    OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
+                    SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
                     break;
                 }
 
@@ -1408,7 +1407,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
                     xTable = rWizard.createTable();
                     if ( !xTable.is() )
                     {
-                        OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
+                        SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: createTable should throw here, shouldn't it?" );
                         break;
                     }
                 }
@@ -1456,7 +1455,7 @@ void CopyTableWizard::impl_doCopy_nothrow()
                 break;
 
             default:
-                OSL_FAIL( "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" );
+                SAL_WARN("dbaccess.ui", "CopyTableWizard::impl_doCopy_nothrow: What operation, please?" );
                 break;
         }
     }
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx
index 44de16e3816e..03d2eab718af 100644
--- a/desktop/source/app/sofficemain.cxx
+++ b/desktop/source/app/sofficemain.cxx
@@ -26,7 +26,6 @@
 #include "cmdlineargs.hxx"
 #include "cmdlinehelp.hxx"
 
-#include <rtl/logfile.hxx>
 #include <rtl/bootstrap.hxx>
 #include <tools/extendapplicationenvironment.hxx>
 
@@ -50,7 +49,7 @@ extern "C" int DESKTOP_DLLPUBLIC soffice_main()
 #endif
     tools::extendApplicationEnvironment();
 
-    RTL_LOGFILE_PRODUCT_TRACE( "PERFORMANCE - enter Main()" );
+    SAL_INFO("desktop.app", "PERFORMANCE - enter Main()" );
 
     desktop::Desktop aDesktop;
     // This string is used during initialization of the Gtk+ VCL module
diff --git a/desktop/unx/splash/unxsplash.cxx b/desktop/unx/splash/unxsplash.cxx
index 35c20b1a8c55..6e9dd6b5afa2 100644
--- a/desktop/unx/splash/unxsplash.cxx
+++ b/desktop/unx/splash/unxsplash.cxx
@@ -22,7 +22,6 @@
 #include <osl/process.h>
 #include <com/sun/star/registry/XRegistryKey.hpp>
 #include <cppuhelper/implementationentry.hxx>
-#include <rtl/logfile.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 883c1f13f9c7..b06e69ad85c4 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -60,7 +60,6 @@
 #include <com/sun/star/ucb/NameClash.hpp>
 #include <xmloff/xmltoken.hxx>
 #include <vcl/help.hxx>
-#include <rtl/logfile.hxx>
 
 #define CHAR_HARDBLANK      ((sal_Unicode)0x00A0)
 
@@ -1435,7 +1434,7 @@ void SvxAutoCorrect::SaveCplSttExceptList( LanguageType eLang )
 #ifdef DBG_UTIL
     else
     {
-        OSL_FAIL("Save an empty list? ");
+        SAL_WARN("editeng", "Save an empty list? ");
     }
 #endif
 }
@@ -1448,7 +1447,7 @@ void SvxAutoCorrect::SaveWrdSttExceptList(LanguageType eLang)
 #ifdef DBG_UTIL
     else
     {
-        OSL_FAIL("Save an empty list? ");
+        SAL_WARN("editeng", "Save an empty list? ");
     }
 #endif
 }
@@ -2070,7 +2069,7 @@ SvxAutocorrWordList* SvxAutoCorrectLanguageLists::LoadAutocorrWordList()
 
         // get parser
         uno::Reference< xml::sax::XParser > xParser = xml::sax::Parser::create(xContext);
-        RTL_LOGFILE_PRODUCT_CONTEXT( aLog, "AutoCorrect Import" );
+        SAL_INFO("editeng", "AutoCorrect Import" );
         uno::Reference< xml::sax::XDocumentHandler > xFilter = new SvXMLAutoCorrectImport( xContext, pAutocorr_List, rAutoCorrect, xStg );
 
         // connect parser and filter
diff --git a/editeng/source/misc/unolingu.cxx b/editeng/source/misc/unolingu.cxx
index d4a72d68609f..a8554d187273 100644
--- a/editeng/source/misc/unolingu.cxx
+++ b/editeng/source/misc/unolingu.cxx
@@ -23,7 +23,6 @@
 #include <list>
 #include <memory>
 #include <editeng/unolingu.hxx>
-#include <rtl/logfile.hxx>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/frame/Desktop.hpp>
 #include <com/sun/star/frame/XModel.hpp>
@@ -849,7 +848,7 @@ short SvxDicError( Window *pParent, sal_Int16 nError )
             case DIC_ERR_READONLY : nRid = RID_SVXSTR_DIC_ERR_READONLY;  break;
             default:
                 nRid = RID_SVXSTR_DIC_ERR_UNKNOWN;
-                OSL_FAIL("unexpected case");
+                SAL_WARN("editeng", "unexpected case");
         }
         nRes = InfoBox( pParent, EE_RESSTR( nRid ) ).Execute();
     }
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 7f70fc8219df..79e92da13d8f 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -44,7 +44,6 @@
 #include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <rtl/logfile.hxx>
 #include <toolkit/helper/emptyfontdescriptor.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
@@ -551,7 +550,7 @@ void OControlModel::readHelpTextCompatibly(const staruno::Reference< stario::XOb
     }
     catch(const Exception&)
     {
-        OSL_FAIL("OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
+        SAL_WARN("forms.component", "OControlModel::readHelpTextCompatibly: could not forward the property value to the aggregate!");
     }
 }
 
@@ -566,7 +565,7 @@ void OControlModel::writeHelpTextCompatibly(const staruno::Reference< stario::XO
     }
     catch(const Exception&)
     {
-        OSL_FAIL("OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
+        SAL_WARN("forms.component", "OControlModel::writeHelpTextCompatibly: could not retrieve the property value from the aggregate!");
     }
     ::comphelper::operator<<( _rxOutStream, sHelpText);
 }
@@ -609,7 +608,7 @@ OControlModel::OControlModel(
                 }
                 catch( const Exception& )
                 {
-                    OSL_FAIL( "OControlModel::OControlModel: caught an exception!" );
+                    SAL_WARN("forms.component",  "OControlModel::OControlModel: caught an exception!" );
                 }
             }
         }
@@ -997,7 +996,7 @@ Any OControlModel::getPropertyDefaultByHandle( sal_Int32 _nHandle ) const
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 m_aPropertyBagHelper.getDynamicPropertyDefaultByHandle( _nHandle, aReturn );
             else
-                OSL_FAIL( "OControlModel::convertFastPropertyValue: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle!" );
     }
     return aReturn;
 }
@@ -1074,7 +1073,7 @@ sal_Bool OControlModel::convertFastPropertyValue(
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 bModified = m_aPropertyBagHelper.convertDynamicFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue );
             else
-                OSL_FAIL( "OControlModel::convertFastPropertyValue: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::convertFastPropertyValue: unknown handle!" );
             break;
     }
     return bModified;
@@ -1118,7 +1117,7 @@ void OControlModel::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const A
             if ( m_aPropertyBagHelper.hasDynamicPropertyByHandle( _nHandle ) )
                 m_aPropertyBagHelper.setDynamicFastPropertyValue( _nHandle, _rValue );
             else
-                OSL_FAIL( "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle!" );
+                SAL_WARN("forms.component",  "OControlModel::setFastPropertyValue_NoBroadcast: unknown handle!" );
             break;
     }
 }
@@ -1841,7 +1840,7 @@ sal_Bool OBoundControlModel::convertFastPropertyValue(
             bModified = tryPropertyValue(_rConvertedValue, _rOldValue, _rValue, m_aControlSource);
             break;
         case PROPERTY_ID_BOUNDFIELD:
-            OSL_FAIL( "OBoundControlModel::convertFastPropertyValue: BoundField should be a read-only property !" );
+            SAL_WARN("forms.component",  "OBoundControlModel::convertFastPropertyValue: BoundField should be a read-only property !" );
             throw com::sun::star::lang::IllegalArgumentException();
         case PROPERTY_ID_CONTROLLABEL:
             if (!_rValue.hasValue())
@@ -1897,7 +1896,7 @@ void OBoundControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, co
             OSL_VERIFY( rValue >>= m_aControlSource );
             break;
         case PROPERTY_ID_BOUNDFIELD:
-            OSL_FAIL("OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !");
+            SAL_WARN("forms.component", "OBoundControlModel::setFastPropertyValue_NoBroadcast : BoundField should be a read-only property !");
             throw com::sun::star::lang::IllegalArgumentException();
         case PROPERTY_ID_CONTROLLABEL:
         {
@@ -2003,7 +2002,7 @@ void SAL_CALL OBoundControlModel::propertyChange( const PropertyChangeEvent& evt
         }
         catch( const Exception& )
         {
-            OSL_FAIL( "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!" );
+            SAL_WARN("forms.component",  "OBoundControlModel::propertyChange: could not adjust my binding-controlled property!" );
         }
     }
 }
@@ -2169,7 +2168,7 @@ sal_Bool OBoundControlModel::connectToField(const Reference<XRowSet>& rForm)
                 }
                 else
                 {
-                    OSL_FAIL("OBoundControlModel::connectToField: property NAME not supported!");
+                    SAL_WARN("forms.component", "OBoundControlModel::connectToField: property NAME not supported!");
                     impl_setField_noNotify( NULL );
                 }
             }
@@ -2378,7 +2377,7 @@ void OBoundControlModel::doSetControlValue( const Any& _rValue )
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OBoundControlModel::doSetControlValue: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::doSetControlValue: caught an exception!" );
     }
 }
 
@@ -2398,7 +2397,7 @@ void OBoundControlModel::onConnectedValidator( )
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OBoundControlModel::onConnectedValidator: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::onConnectedValidator: caught an exception!" );
     }
     recheckValidity( false );
 }
@@ -2416,7 +2415,7 @@ void OBoundControlModel::onDisconnectedValidator( )
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OBoundControlModel::onDisconnectedValidator: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::onDisconnectedValidator: caught an exception!" );
     }
     recheckValidity( false );
 }
@@ -2504,7 +2503,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
     }
     catch( const SQLException& )
     {
-        OSL_FAIL( "OBoundControlModel::reset: caught an SQL exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::reset: caught an SQL exception!" );
     }
     // #i24495# - don't count the insert row as "invalid"
 
@@ -2550,7 +2549,7 @@ void OBoundControlModel::reset() throw (RuntimeException)
         }
         catch(const Exception&)
         {
-            OSL_FAIL("OBoundControlModel::reset: this should have succeeded in all cases!");
+            SAL_WARN("forms.component", "OBoundControlModel::reset: this should have succeeded in all cases!");
         }
 
         sal_Bool bNeedValueTransfer = sal_True;
@@ -2713,7 +2712,7 @@ void OBoundControlModel::disconnectExternalValueBinding( )
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OBoundControlModel::disconnectExternalValueBinding: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::disconnectExternalValueBinding: caught an exception!" );
     }
 
     // if the binding also acts as our validator, disconnect the validator, too
@@ -3082,7 +3081,7 @@ void OBoundControlModel::recheckValidity( bool _bForceNotification )
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OBoundControlModel::recheckValidity: caught an exception!" );
+        SAL_WARN("forms.component",  "OBoundControlModel::recheckValidity: caught an exception!" );
     }
 }
 
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index fb4c0d99cc8d..5dd528f62ca0 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -30,7 +30,6 @@
 #include <tools/diagnose_ex.h>
 
 #include <comphelper/sequence.hxx>
-#include <rtl/logfile.hxx>
 #include "rtl/instance.hxx"
 
 
diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx
index 53ba7655d1aa..c8c3cf6096ff 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -41,7 +41,6 @@
 #include <comphelper/types.hxx>
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/queryinterface.hxx>
-#include <rtl/logfile.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
@@ -594,7 +593,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >&
                 }
                 catch( const Exception& )
                 {
-                    OSL_FAIL( "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" );
+                    SAL_WARN("forms", "OInterfaceContainerHelper::read: reading succeeded, but not inserting!" );
                     // create a placeholder
                     xElement = xElement.query( lcl_createPlaceHolder( m_xContext ) );
                     if ( !xElement.is() )
@@ -1137,7 +1136,7 @@ void SAL_CALL OInterfaceContainer::insertByName(const OUString& _rName, const An
     }
     catch( const Exception& )
     {
-        OSL_FAIL( "OInterfaceContainer::insertByName: caught an exception!" );
+        SAL_WARN("forms", "OInterfaceContainer::insertByName: caught an exception!" );
     }
     implInsert( m_aItems.size(), xElementProps, sal_True, aElementMetaData.get(), sal_True );
 }
author	Radu Ioan <ioan.radu.g@gmail.com>	2013-06-29 17:38:04 +0300
committer	Bosdonnat Cedric <cedric.bosdonnat@free.fr>	2013-07-03 07:59:33 +0000
commit	61db96daa87754af24355d7ac94ee0305f22ff87 (patch)
tree	6c15e7b896c62f42a1dfb02695418f9770fc3b46
parent	54aac00e51652deec3d71524eec97f171c5cd40e (diff)