[Libreoffice-commits] core.git: cppcanvas/source cppu/source dbaccess/source desktop/source desktop/unx editeng/source forms/source
Radu Ioan
ioan.radu.g at gmail.com
Wed Jul 3 00:59:58 PDT 2013
cppcanvas/source/mtfrenderer/bitmapaction.cxx | 1
cppu/source/LogBridge/LogBridge.cxx | 52 +--
dbaccess/source/core/api/BookmarkSet.cxx | 33 +-
dbaccess/source/core/api/CacheSet.cxx | 103 +++----
dbaccess/source/core/api/FilteredContainer.cxx | 7
dbaccess/source/core/api/KeySet.cxx | 125 ++++----
dbaccess/source/core/api/OptimisticSet.cxx | 11
dbaccess/source/core/api/RowSet.cxx | 11
dbaccess/source/core/api/RowSetBase.cxx | 245 ++++++++---------
dbaccess/source/core/api/RowSetCacheIterator.cxx | 9
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 115 +++----
dbaccess/source/core/api/StaticSet.cxx | 67 ++--
dbaccess/source/core/api/TableDeco.cxx | 53 +--
dbaccess/source/core/api/WrappedResultSet.cxx | 33 +-
dbaccess/source/core/api/callablestatement.cxx | 55 +--
dbaccess/source/core/api/querycomposer.cxx | 45 +--
dbaccess/source/core/api/resultset.cxx | 180 ++++++------
dbaccess/source/core/api/statement.cxx | 72 ++--
dbaccess/source/core/api/table.cxx | 41 +-
dbaccess/source/core/api/tablecontainer.cxx | 25 -
dbaccess/source/core/dataaccess/connection.cxx | 103 +++----
dbaccess/source/core/dataaccess/datasource.cxx | 90 +++---
dbaccess/source/filter/xml/xmlfilter.cxx | 17 -
dbaccess/source/ui/browser/brwctrlr.cxx | 211 +++++++-------
dbaccess/source/ui/browser/genericcontroller.cxx | 17 -
dbaccess/source/ui/browser/unodatbr.cxx | 45 +--
dbaccess/source/ui/misc/DExport.cxx | 31 +-
dbaccess/source/ui/misc/HtmlReader.cxx | 25 -
dbaccess/source/ui/misc/RowSetDrop.cxx | 13
dbaccess/source/ui/misc/RtfReader.cxx | 15 -
dbaccess/source/ui/misc/TableCopyHelper.cxx | 5
dbaccess/source/ui/misc/TokenWriter.cxx | 47 +--
dbaccess/source/ui/misc/WCopyTable.cxx | 75 ++---
dbaccess/source/ui/uno/copytablewizard.cxx | 9
desktop/source/app/sofficemain.cxx | 3
desktop/unx/splash/unxsplash.cxx | 1
editeng/source/misc/svxacorr.cxx | 7
editeng/source/misc/unolingu.cxx | 3
forms/source/component/FormComponent.cxx | 35 +-
forms/source/component/propertybaghelper.cxx | 1
forms/source/misc/InterfaceContainer.cxx | 5
41 files changed, 993 insertions(+), 1048 deletions(-)
New commits:
commit 61db96daa87754af24355d7ac94ee0305f22ff87
Author: Radu Ioan <ioan.radu.g at gmail.com>
Date: Sat Jun 29 17:38:04 2013 +0300
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 at free.fr>
Tested-by: Bosdonnat Cedric <cedric.bosdonnat at free.fr>
diff --git a/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 9c2b8da..d3b61fa 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 a7c768f..ec140d7 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 dce28eb..0230f2e 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 2688547..b712470 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 629bb85..3f405b2 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 at 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 at 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 7df61d7..c008916 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at sun.com", "OKeySet::moveToCurrentRow" );
+ SAL_INFO("dbaccess", "OKeySet::moveToCurrentRow" );
}
Reference<XNameAccess> OKeySet::getKeyColumns() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbaccess", "Ocke.Janssen at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 8fed9a3..564720c 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 at 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 at 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 at 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 at 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 at 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 a58a68a..012f309 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 at 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 at 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 at 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 bfeca61..3d5e20d 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at 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 at sun.com", "ORowSetBase::checkPositioningAllowed" );
+ SAL_INFO("dbaccess", "ORowSetBase::checkPositioningAllowed" );
if(!m_pCache || m_nResultSetType == ResultSetType::FORWARD_ONLY)
throwFunctionSequenceException(*m_pMySelf);
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list