[Libreoffice-commits] core.git: canvas/source connectivity/source include/sal
Radu Ioan
ioan.radu.g at gmail.com
Mon Jun 17 08:55:41 PDT 2013
canvas/source/cairo/cairo_canvascustomsprite.cxx | 7
canvas/source/cairo/cairo_canvashelper.cxx | 51 +-
canvas/source/cairo/cairo_spritehelper.cxx | 5
canvas/source/directx/dx_canvascustomsprite.cxx | 1
canvas/source/directx/dx_canvashelper.cxx | 3
canvas/source/directx/dx_spritehelper.cxx | 1
connectivity/source/commontools/FValue.cxx | 57 +-
connectivity/source/commontools/TSkipDeletedSet.cxx | 18
connectivity/source/drivers/calc/CCatalog.cxx | 5
connectivity/source/drivers/calc/CConnection.cxx | 21
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 21
connectivity/source/drivers/calc/CTable.cxx | 45 -
connectivity/source/drivers/calc/CTables.cxx | 3
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 31 -
connectivity/source/drivers/dbase/DTable.cxx | 99 ++--
connectivity/source/drivers/file/FCatalog.cxx | 13
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 279 +++++-------
connectivity/source/drivers/file/FDriver.cxx | 19
connectivity/source/drivers/file/FNoException.cxx | 5
connectivity/source/drivers/file/FPreparedStatement.cxx | 85 +--
connectivity/source/drivers/file/FResultSet.cxx | 199 ++++----
connectivity/source/drivers/file/FResultSetMetaData.cxx | 48 +-
connectivity/source/drivers/file/FStatement.cxx | 49 +-
connectivity/source/drivers/file/FStringFunctions.cxx | 33 -
connectivity/source/drivers/file/FTable.cxx | 35 -
connectivity/source/drivers/file/fcode.cxx | 61 +-
connectivity/source/drivers/file/quotedstring.cxx | 5
connectivity/source/drivers/flat/EDatabaseMetaData.cxx | 11
connectivity/source/drivers/flat/ETable.cxx | 23
connectivity/source/drivers/hsqldb/StorageFileAccess.cxx | 2
connectivity/source/drivers/jdbc/Clob.cxx | 11
connectivity/source/drivers/jdbc/Object.cxx | 2
connectivity/source/drivers/jdbc/ResultSet.cxx | 171 +++----
connectivity/source/drivers/jdbc/ResultSetMetaData.cxx | 47 --
connectivity/source/drivers/odbcbase/OResultSet.cxx | 73 +--
connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx | 25 -
connectivity/source/drivers/odbcbase/OTools.cxx | 25 -
connectivity/source/parse/sqliterator.cxx | 109 ++--
connectivity/source/parse/sqlnode.cxx | 79 +--
include/sal/log-areas.dox | 2
40 files changed, 872 insertions(+), 907 deletions(-)
New commits:
commit dd3f8fbaff3eb2eee9f6cdf9e6a79cd6dd14115d
Author: Radu Ioan <ioan.radu.g at gmail.com>
Date: Sat Jun 15 01:56:13 2013 +0300
fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO
- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*
Change-Id: If89af70767c3fdc4b1d0cb5e51033ca98583bc5d
Reviewed-on: https://gerrit.libreoffice.org/4286
Reviewed-by: Noel Power <noel.power at suse.com>
Tested-by: Noel Power <noel.power at suse.com>
diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index d7e72c0..e0c59b7 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx
@@ -21,7 +21,6 @@
#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <canvas/canvastools.hxx>
@@ -47,9 +46,7 @@ namespace cairocanvas
ENSURE_OR_THROW( rRefDevice.get(),
"CanvasCustomSprite::CanvasCustomSprite(): Invalid sprite canvas" );
- OSL_TRACE("sprite size: %d, %d",
- ::canvas::tools::roundUp( rSpriteSize.Width ),
- ::canvas::tools::roundUp( rSpriteSize.Height ));
+ SAL_INFO( "canvas.cairo", "sprite size: " << ::canvas::tools::roundUp( rSpriteSize.Width ) << ", " << ::canvas::tools::roundUp( rSpriteSize.Height ));
mpBufferSurface = mpSpriteCanvas->createSurface( maSize );
@@ -125,7 +122,7 @@ namespace cairocanvas
{
if( !bHasAlpha && !bCopyContent )
{
- OSL_TRACE("replacing sprite background surface");
+ SAL_INFO( "canvas.cairo", "replacing sprite background surface");
mpBufferSurface = mpSpriteCanvas->createSurface( maSize, CAIRO_CONTENT_COLOR );
maSpriteHelper.setSurface( mpBufferSurface );
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index ca75d35..ff2d71e 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -20,7 +20,6 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <rtl/instance.hxx>
@@ -147,7 +146,7 @@ namespace cairocanvas
if( viewState.Clip.is() )
{
- OSL_TRACE ("view clip");
+ SAL_INFO( "canvas.cairo", "view clip");
aViewMatrix.x0 = basegfx::fround( aViewMatrix.x0 );
aViewMatrix.y0 = basegfx::fround( aViewMatrix.y0 );
@@ -161,10 +160,10 @@ namespace cairocanvas
if( renderState.Clip.is() )
{
- OSL_TRACE ("render clip BEGIN");
+ SAL_INFO( "canvas.cairo", "render clip BEGIN");
doPolyPolygonPath( renderState.Clip, Clip );
- OSL_TRACE ("render clip END");
+ SAL_INFO( "canvas.cairo", "render clip END");
}
if( bSetColor )
@@ -221,7 +220,7 @@ namespace cairocanvas
void CanvasHelper::clear()
{
- OSL_TRACE ("clear whole area: %d x %d", maSize.getX(), maSize.getY() );
+ SAL_INFO( "canvas.cairo", "clear whole area: " << maSize.getX() << " x " << maSize.getY() );
if( mpCairo )
{
@@ -389,7 +388,7 @@ namespace cairocanvas
}
break;
default:
- OSL_TRACE( "fallback to GetColor for alpha - slow, format: %d", pAlphaReadAcc->GetScanlineFormat() );
+ SAL_INFO( "canvas.cairo", "fallback to GetColor for alpha - slow, format: " << pAlphaReadAcc->GetScanlineFormat() );
for( nX = 0; nX < nWidth; nX++ )
{
nAlpha = data[ nOff ] = 255 - pAlphaReadAcc->GetColor( nY, nX ).GetIndex();
@@ -613,7 +612,7 @@ namespace cairocanvas
}
break;
default:
- OSL_TRACE( "fallback to GetColor - slow, format: %d", pBitmapReadAcc->GetScanlineFormat() );
+ SAL_INFO( "canvas.cairo", "fallback to GetColor - slow, format: " << pBitmapReadAcc->GetScanlineFormat() );
if( pAlphaReadAcc )
if( readAlpha( pAlphaReadAcc, nY, nWidth, data, nOff ) )
@@ -662,7 +661,7 @@ namespace cairocanvas
bHasAlpha = bIsAlpha;
- OSL_TRACE("image: %d x %d alpha: %d alphaRead %p", nWidth, nHeight, bIsAlpha, pAlphaReadAcc);
+ SAL_INFO( "canvas.cairo","image: " << nWidth << " x " << nHeight << " alpha: " << bIsAlpha << " alphaRead " << std::hex << pAlphaReadAcc);
}
}
@@ -830,14 +829,14 @@ namespace cairocanvas
{
uno::Reference< lang::XServiceInfo > xRef( aTexture.Gradient, uno::UNO_QUERY );
- OSL_TRACE( "gradient fill" );
+ SAL_INFO( "canvas.cairo", "gradient fill" );
if( xRef.is() && xRef->getImplementationName() == PARAMETRICPOLYPOLYGON_IMPLEMENTATION_NAME )
{
// TODO(Q1): Maybe use dynamic_cast here
// TODO(E1): Return value
// TODO(F1): FillRule
- OSL_TRACE( "known implementation" );
+ SAL_INFO( "canvas.cairo", "known implementation" );
::canvas::ParametricPolyPolygon* pPolyImpl = static_cast< ::canvas::ParametricPolyPolygon* >( aTexture.Gradient.get() );
::com::sun::star::geometry::AffineMatrix2D aTransform( aTexture.AffineTransform );
@@ -900,7 +899,7 @@ namespace cairocanvas
if( pPattern )
{
- OSL_TRACE( "filling with pattern" );
+ SAL_INFO( "canvas.cairo", "filling with pattern" );
cairo_save( pCairo );
@@ -917,22 +916,22 @@ namespace cairocanvas
}
else
cairo_fill( pCairo );
- OSL_TRACE("fill");
+ SAL_INFO( "canvas.cairo", "fill");
break;
case Stroke:
cairo_stroke( pCairo );
- OSL_TRACE("stroke");
+ SAL_INFO( "canvas.cairo", "stroke");
break;
case Clip:
cairo_clip( pCairo );
- OSL_TRACE("clip");
+ SAL_INFO( "canvas.cairo", "clip");
break;
}
}
static void clipNULL( Cairo *pCairo )
{
- OSL_TRACE("clipNULL");
+ SAL_INFO( "canvas.cairo", "clipNULL");
Matrix aOrigMatrix, aIdentityMatrix;
/* we set identity matrix here to overcome bug in cairo 0.9.2
@@ -1015,7 +1014,7 @@ namespace cairocanvas
if( j==0 )
{
cairo_move_to( pCairo, nX, nY );
- OSL_TRACE( "move to %f,%f", nX, nY );
+ SAL_INFO( "canvas.cairo", "move to " << nX << "," << nY );
}
else
{
@@ -1045,7 +1044,7 @@ namespace cairocanvas
else
{
cairo_line_to( pCairo, nX, nY );
- OSL_TRACE( "line to %f,%f", nX, nY );
+ SAL_INFO( "canvas.cairo", "line to " << nX << "," << nY );
}
bOpToDo = true;
}
@@ -1057,7 +1056,7 @@ namespace cairocanvas
}
else
{
- OSL_TRACE( "empty polygon for op: %d", aOperation );
+ SAL_INFO( "canvas.cairo", "empty polygon for op: " << aOperation );
if( aOperation == Clip )
{
clipNULL( pCairo );
@@ -1160,7 +1159,7 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
else
- OSL_TRACE ("CanvasHelper called after it was disposed");
+ SAL_INFO( "canvas.cairo", "CanvasHelper called after it was disposed");
#ifdef CAIRO_CANVAS_PERF_TRACE
mxDevice->stopPerfTrace( &aTimer, "drawPolyPolygon" );
@@ -1242,7 +1241,7 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
else
- OSL_TRACE ("CanvasHelper called after it was disposed");
+ SAL_INFO( "canvas.cairo", "CanvasHelper called after it was disposed");
#ifdef CAIRO_CANVAS_PERF_TRACE
mxDevice->stopPerfTrace( &aTimer, "strokePolyPolygon" );
@@ -1305,7 +1304,7 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
else
- OSL_TRACE ("CanvasHelper called after it was disposed");
+ SAL_INFO( "canvas.cairo", "CanvasHelper called after it was disposed");
#ifdef CAIRO_CANVAS_PERF_TRACE
mxDevice->stopPerfTrace( &aTimer, "fillPolyPolygon" );
@@ -1419,10 +1418,10 @@ namespace cairocanvas
// in case the bitmap doesn't have alpha and covers whole area
// we try to change surface to plain rgb
- OSL_TRACE ("chance to change surface to rgb, %f, %f, %f x %f (%d x %d)", x, y, width, height, maSize.getX(), maSize.getY() );
+ SAL_INFO( "canvas.cairo","chance to change surface to rgb, " << x << ", " << y << ", " << width << " x " << height << " (" << maSize.getX() << " x " << maSize.getY() << ")" );
if( x <= 0 && y <= 0 && x + width >= maSize.getX() && y + height >= maSize.getY() )
{
- OSL_TRACE ("trying to change surface to rgb");
+ SAL_INFO( "canvas.cairo","trying to change surface to rgb");
if( mpSurfaceProvider ) {
SurfaceSharedPtr pNewSurface = mpSurfaceProvider->changeSurface( false, false );
@@ -1457,7 +1456,7 @@ namespace cairocanvas
cairo_restore( mpCairo.get() );
}
else
- OSL_TRACE ("CanvasHelper called after it was disposed");
+ SAL_INFO( "canvas.cairo", "CanvasHelper called after it was disposed");
return rv; // uno::Reference< rendering::XCachedPrimitive >(NULL);
}
@@ -1568,7 +1567,7 @@ namespace cairocanvas
mpSurfaceProvider, mpDevice, false ) );
}
else
- OSL_TRACE ("CanvasHelper called after it was disposed");
+ SAL_INFO( "canvas.cairo", "CanvasHelper called after it was disposed");
#ifdef CAIRO_CANVAS_PERF_TRACE
mxDevice->stopPerfTrace( &aTimer, "getScaledBitmap" );
@@ -2331,7 +2330,7 @@ namespace cairocanvas
const rendering::ViewState& viewState,
const rendering::RenderState& renderState )
{
- OSL_TRACE("CanvasHelper::repaint");
+ SAL_INFO( "canvas.cairo", "CanvasHelper::repaint");
if( mpCairo )
{
diff --git a/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index 7c86da1..7992deb 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.cxx
@@ -21,7 +21,6 @@
#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <canvas/canvastools.hxx>
@@ -95,7 +94,7 @@ namespace cairocanvas
if( isActive() && !::basegfx::fTools::equalZero( fAlpha ) )
{
- OSL_TRACE ("CanvasCustomSprite::redraw called");
+ SAL_INFO( "canvas.cairo", "CanvasCustomSprite::redraw called");
if( pCairo )
{
basegfx::B2DVector aSize = getSizePixel();
@@ -143,7 +142,7 @@ namespace cairocanvas
rClip->getFillRule() );
}
- OSL_TRACE ("aSize %f x %f position: %f,%f", aSize.getX(), aSize.getY(), fX, fY );
+ SAL_INFO( "canvas.cairo","aSize " << aSize.getX() << " x " << aSize.getY() << " position: " << fX << "," << fY );
cairo_rectangle( pCairo.get(), 0, 0, floor( aSize.getX() ), floor( aSize.getY() ) );
cairo_clip( pCairo.get() );
cairo_set_matrix( pCairo.get(), &aOrigMatrix );
diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index f2f50fe..96a01ca 100644
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.cxx
@@ -23,7 +23,6 @@
#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <canvas/canvastools.hxx>
diff --git a/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 0e6d6d5..193c6f3 100644
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.cxx
@@ -21,7 +21,6 @@
#include <canvas/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <com/sun/star/rendering/TexturingMode.hpp>
@@ -80,7 +79,7 @@ namespace dxcanvas
switch( nJoinType )
{
case rendering::PathJoinType::NONE:
- OSL_FAIL( "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" );
+ SAL_WARN( "canvas.directx", "gdiJoinFromJoin(): Join NONE not possible, mapping to MITER" );
// FALLTHROUGH intended
case rendering::PathJoinType::MITER:
return Gdiplus::LineJoinMiter;
diff --git a/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index 9e14f4c..721e1f2 100644
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.cxx
@@ -23,7 +23,6 @@
#include <canvas/verbosetrace.hxx>
#include <tools/diagnose_ex.h>
-#include <rtl/logfile.hxx>
#include <rtl/math.hxx>
#include <canvas/canvastools.hxx>
diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx
index 770b34e..f3aaeeb 100644
--- a/connectivity/source/commontools/FValue.cxx
+++ b/connectivity/source/commontools/FValue.cxx
@@ -26,7 +26,6 @@
#include <comphelper/extract.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <rtl/ustrbuf.hxx>
-#include <rtl/logfile.hxx>
using namespace ::dbtools;
using namespace ::com::sun::star::sdbc;
@@ -41,12 +40,12 @@ namespace connectivity
namespace {
static bool isStorageCompatible(sal_Int32 _eType1, sal_Int32 _eType2)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::isStorageCompatible" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::isStorageCompatible" );
bool bIsCompatible = sal_True;
if (_eType1 != _eType2)
{
- RTL_LOGFILE_CONTEXT_TRACE( aLogger, "ORowSetValue::isStorageCompatible _eType1 != _eType2" );
+ SAL_INFO( "connectivity.commontools", "ORowSetValue::isStorageCompatible _eType1 != _eType2" );
switch (_eType1)
{
case DataType::CHAR:
@@ -192,7 +191,7 @@ namespace tracing
// -----------------------------------------------------------------------------
void ORowSetValue::setTypeKind(sal_Int32 _eType)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::setTypeKind" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::setTypeKind" );
if ( !m_bNull && !isStorageCompatible(_eType, m_eTypeKind) )
{
switch(_eType)
@@ -250,7 +249,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
break;
default:
(*this) = makeAny();
- OSL_FAIL("ORowSetValue::setTypeKind(): UNSUPPORTED TYPE!");
+ SAL_WARN( "connectivity.commontools","ORowSetValue::setTypeKind(): UNSUPPORTED TYPE!");
}
}
@@ -260,7 +259,7 @@ void ORowSetValue::setTypeKind(sal_Int32 _eType)
// -----------------------------------------------------------------------------
void ORowSetValue::free()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::free" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::free" );
if(!m_bNull)
{
switch(m_eTypeKind)
@@ -861,7 +860,7 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
break;
default:
bRet = false;
- OSL_FAIL("ORowSetValue::operator==(): UNSUPPORTED TYPE!");
+ SAL_WARN( "connectivity.commontools","ORowSetValue::operator==(): UNSUPPORTED TYPE!");
break;
}
return bRet;
@@ -869,7 +868,7 @@ bool ORowSetValue::operator==(const ORowSetValue& _rRH) const
// -------------------------------------------------------------------------
Any ORowSetValue::makeAny() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::makeAny" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::makeAny" );
Any rValue;
if(isBound() && !isNull())
{
@@ -953,7 +952,7 @@ Any ORowSetValue::makeAny() const
rValue <<= m_aValue.m_uInt64;
break;
default:
- OSL_FAIL("ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
+ SAL_WARN( "connectivity.commontools","ORowSetValue::makeAny(): UNSPUPPORTED TYPE!");
rValue = getAny();
break;
}
@@ -963,7 +962,7 @@ Any ORowSetValue::makeAny() const
// -------------------------------------------------------------------------
OUString ORowSetValue::getString( ) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getString" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getString" );
OUString aRet;
if(!m_bNull)
{
@@ -1049,7 +1048,7 @@ OUString ORowSetValue::getString( ) const
// -------------------------------------------------------------------------
bool ORowSetValue::getBool() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getBool" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getBool" );
bool bRet = sal_False;
if(!m_bNull)
{
@@ -1124,7 +1123,7 @@ bool ORowSetValue::getBool() const
sal_Int8 ORowSetValue::getInt8() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getInt8" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getInt8" );
sal_Int8 nRet = 0;
@@ -1270,7 +1269,7 @@ sal_uInt8 ORowSetValue::getUInt8() const
sal_Int16 ORowSetValue::getInt16() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getInt16" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getInt16" );
sal_Int16 nRet = 0;
@@ -1415,7 +1414,7 @@ sal_uInt16 ORowSetValue::getUInt16() const
sal_Int32 ORowSetValue::getInt32() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getInt32" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getInt32" );
sal_Int32 nRet = 0;
if(!m_bNull)
{
@@ -1562,7 +1561,7 @@ sal_uInt32 ORowSetValue::getUInt32() const
sal_Int64 ORowSetValue::getLong() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getLong" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getLong" );
sal_Int64 nRet = 0;
if(!m_bNull)
{
@@ -1709,7 +1708,7 @@ sal_uInt64 ORowSetValue::getULong() const
// -------------------------------------------------------------------------
float ORowSetValue::getFloat() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getFloat" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getFloat" );
float nRet = 0;
if(!m_bNull)
{
@@ -1786,7 +1785,7 @@ float ORowSetValue::getFloat() const
// -------------------------------------------------------------------------
double ORowSetValue::getDouble() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getDouble" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getDouble" );
double nRet = 0;
@@ -1865,7 +1864,7 @@ double ORowSetValue::getDouble() const
// -----------------------------------------------------------------------------
Sequence<sal_Int8> ORowSetValue::getSequence() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getSequence" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getSequence" );
Sequence<sal_Int8> aSeq;
if (!m_bNull)
{
@@ -1938,7 +1937,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
// -----------------------------------------------------------------------------
::com::sun::star::util::Date ORowSetValue::getDate() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getDate" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getDate" );
::com::sun::star::util::Date aValue;
if(!m_bNull)
{
@@ -1997,7 +1996,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
// -----------------------------------------------------------------------------
::com::sun::star::util::Time ORowSetValue::getTime() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getTime" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getTime" );
::com::sun::star::util::Time aValue;
if(!m_bNull)
{
@@ -2042,7 +2041,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
// -----------------------------------------------------------------------------
::com::sun::star::util::DateTime ORowSetValue::getDateTime() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::getDateTime" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::getDateTime" );
::com::sun::star::util::DateTime aValue;
if(!m_bNull)
{
@@ -2095,7 +2094,7 @@ Sequence<sal_Int8> ORowSetValue::getSequence() const
// -----------------------------------------------------------------------------
void ORowSetValue::setSigned(bool _bMod)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::setSigned" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::setSigned" );
if ( m_bSigned != _bMod )
{
m_bSigned = _bMod;
@@ -2260,7 +2259,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
sal_Int32 _nType,
const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow>& _xRow)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::fill (1)" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::fill (1)" );
fill(_nPos,_nType,sal_True,_xRow);
}
@@ -2268,7 +2267,7 @@ void ORowSetValue::fill(sal_Int32 _nPos,
void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const detail::IValueSource& _rValueSource )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::fill (2)" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::fill (2)" );
bool bReadData = sal_True;
switch(_nType)
{
@@ -2345,7 +2344,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
setTypeKind(DataType::OTHER);
break;
default:
- OSL_FAIL( "ORowSetValue::fill: unsupported type!" );
+ SAL_WARN( "connectivity.commontools", "ORowSetValue::fill: unsupported type!" );
(*this) = _rValueSource.getObject();
break;
}
@@ -2356,7 +2355,7 @@ void ORowSetValue::impl_fill( const sal_Int32 _nType, bool _bNullable, const det
// -----------------------------------------------------------------------------
void ORowSetValue::fill(const Any& _rValue)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbtools", "Ocke.Janssen at sun.com", "ORowSetValue::fill (3)" );
+ SAL_INFO( "connectivity.commontools", "dbtools Ocke.Janssen at sun.com ORowSetValue::fill (3)" );
switch (_rValue.getValueType().getTypeClass())
{
case TypeClass_VOID:
@@ -2461,7 +2460,7 @@ void ORowSetValue::fill(const Any& _rValue)
if ( _rValue >>= aDummy )
(*this) = aDummy;
else
- OSL_FAIL( "ORowSetValue::fill: unsupported sequence type!" );
+ SAL_WARN( "connectivity.commontools", "ORowSetValue::fill: unsupported sequence type!" );
break;
}
@@ -2483,7 +2482,7 @@ void ORowSetValue::fill(const Any& _rValue)
(*this) = aDateTime;
}
else
- OSL_FAIL( "ORowSetValue::fill: unsupported structure!" );
+ SAL_WARN( "connectivity.commontools", "ORowSetValue::fill: unsupported structure!" );
break;
}
@@ -2512,7 +2511,7 @@ void ORowSetValue::fill(const Any& _rValue)
break;
default:
- OSL_FAIL("Unknown type");
+ SAL_WARN( "connectivity.commontools","Unknown type");
break;
}
}
diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx
index a0304c5..f7808c6 100644
--- a/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -19,7 +19,7 @@
#include "TSkipDeletedSet.hxx"
#include <osl/diagnose.h>
-#include <rtl/logfile.hxx>
+#include "sal/log.hxx"
using namespace connectivity;
// -----------------------------------------------------------------------------
@@ -27,7 +27,7 @@ OSkipDeletedSet::OSkipDeletedSet(IResultSetHelper* _pHelper)
: m_pHelper(_pHelper)
,m_bDeletedVisible(false)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::OSkipDeletedSet" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::OSkipDeletedSet" );
m_aBookmarksPositions.reserve(256);
}
// -----------------------------------------------------------------------------
@@ -39,7 +39,7 @@ OSkipDeletedSet::~OSkipDeletedSet()
// -----------------------------------------------------------------------------
sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPosition, sal_Int32 _nOffset, sal_Bool _bRetrieveData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::skipDeleted" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::skipDeleted" );
OSL_ENSURE(_eCursorPosition != IResultSetHelper::BOOKMARK,"OSkipDeletedSet::SkipDeleted can't be called for BOOKMARK");
IResultSetHelper::Movement eDelPosition = _eCursorPosition;
@@ -69,7 +69,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
if (_eCursorPosition == IResultSetHelper::LAST)
{
- RTL_LOGFILE_CONTEXT_TRACE( aLogger, "OSkipDeletedSet::skipDeleted: last" );
+ SAL_INFO( "connectivity.commontools", "OSkipDeletedSet::skipDeleted: last" );
sal_Int32 nBookmark = 0;
// first position on the last known row
if ( m_aBookmarksPositions.empty() )
@@ -164,7 +164,7 @@ sal_Bool OSkipDeletedSet::skipDeleted(IResultSetHelper::Movement _eCursorPositio
// -------------------------------------------------------------------------
sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::moveAbsolute" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::moveAbsolute" );
sal_Bool bDataFound = sal_False;
sal_Int32 nNewPos = _nPos;
if(nNewPos > 0)
@@ -227,14 +227,14 @@ sal_Bool OSkipDeletedSet::moveAbsolute(sal_Int32 _nPos,sal_Bool _bRetrieveData)
// -----------------------------------------------------------------------------
void OSkipDeletedSet::clear()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::clear" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::clear" );
::std::vector<sal_Int32>().swap(m_aBookmarksPositions);
//TInt2IntMap().swap(m_aBookmarks);
}
// -----------------------------------------------------------------------------
sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::getMappedPosition" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::getMappedPosition" );
::std::vector<sal_Int32>::const_iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos);
if ( aFind != m_aBookmarksPositions.end() )
return (aFind - m_aBookmarksPositions.begin()) + 1;
@@ -247,7 +247,7 @@ sal_Int32 OSkipDeletedSet::getMappedPosition(sal_Int32 _nPos) const
// -----------------------------------------------------------------------------
void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::insertNewPosition" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::insertNewPosition" );
//OSL_ENSURE(m_aBookmarks.find(_nPos) == m_aBookmarks.end(),"OSkipDeletedSet::insertNewPosition: Invalid position");
//m_aBookmarksPositions.push_back(m_aBookmarks.insert(TInt2IntMap::value_type(_nPos,m_aBookmarksPositions.size()+1)).first);
//OSL_ENSURE(::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nPos) == m_aBookmarksPositions.end(),"Invalid driver pos");
@@ -256,7 +256,7 @@ void OSkipDeletedSet::insertNewPosition(sal_Int32 _nPos)
// -----------------------------------------------------------------------------
void OSkipDeletedSet::deletePosition(sal_Int32 _nBookmark)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "commontools", "Ocke.Janssen at sun.com", "OSkipDeletedSet::deletePosition" );
+ SAL_INFO( "connectivity.commontools", "commontools Ocke.Janssen at sun.com OSkipDeletedSet::deletePosition" );
::std::vector<sal_Int32>::iterator aFind = ::std::find(m_aBookmarksPositions.begin(),m_aBookmarksPositions.end(),_nBookmark);
if ( aFind != m_aBookmarksPositions.end() )
{
diff --git a/connectivity/source/drivers/calc/CCatalog.cxx b/connectivity/source/drivers/calc/CCatalog.cxx
index e7478ab..aa2f18b 100644
--- a/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/connectivity/source/drivers/calc/CCatalog.cxx
@@ -22,7 +22,6 @@
#include "calc/CTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -35,12 +34,12 @@ using namespace connectivity::calc;
// -------------------------------------------------------------------------
OCalcCatalog::OCalcCatalog(OCalcConnection* _pCon) : file::OFileCatalog(_pCon)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcCatalog::OCalcCatalog" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcCatalog::OCalcCatalog" );
}
// -------------------------------------------------------------------------
void OCalcCatalog::refreshTables()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcCatalog::refreshTables" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcCatalog::refreshTables" );
TStringVector aVector;
Sequence< OUString > aTypes;
OCalcConnection::ODocHolder aDocHodler(((OCalcConnection*)m_pConnection));
diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx
index 04e6cd3..7cba8b0 100644
--- a/connectivity/source/drivers/calc/CConnection.cxx
+++ b/connectivity/source/drivers/calc/CConnection.cxx
@@ -34,7 +34,6 @@
#include <connectivity/dbexception.hxx>
#include <cppuhelper/exc_hlp.hxx>
#include <comphelper/processfactory.hxx>
-#include <rtl/logfile.hxx>
using namespace connectivity::calc;
using namespace connectivity::file;
@@ -55,7 +54,7 @@ using namespace ::com::sun::star::sheet;
OCalcConnection::OCalcConnection(ODriver* _pDriver) : OConnection(_pDriver),m_nDocCount(0)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::OCalcConnection" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::OCalcConnection" );
// m_aFilenameExtension is not used
}
@@ -66,7 +65,7 @@ OCalcConnection::~OCalcConnection()
void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info)
throw(SQLException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::construct" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::construct" );
// open file
sal_Int32 nLen = url.indexOf(':');
@@ -107,7 +106,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu
// -----------------------------------------------------------------------------
Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::acquireDoc" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::acquireDoc" );
if ( m_xDoc.is() )
{
osl_atomic_increment(&m_nDocCount);
@@ -174,14 +173,14 @@ Reference< XSpreadsheetDocument> OCalcConnection::acquireDoc()
// -----------------------------------------------------------------------------
void OCalcConnection::releaseDoc()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::releaseDoc" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::releaseDoc" );
if ( osl_atomic_decrement(&m_nDocCount) == 0 )
::comphelper::disposeComponent( m_xDoc );
}
// -----------------------------------------------------------------------------
void OCalcConnection::disposing()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::disposing" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
m_nDocCount = 0;
@@ -199,7 +198,7 @@ IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connecti
Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::getMetaData" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::getMetaData" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -218,7 +217,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S
::com::sun::star::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::createCatalog" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::createCatalog" );
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTab = m_xCatalog;
if(!xTab.is())
@@ -234,7 +233,7 @@ Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(S
Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::createStatement" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::createStatement" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -249,7 +248,7 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE
Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql )
throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::prepareStatement" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::prepareStatement" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
@@ -266,7 +265,7 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons
Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ )
throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcConnection::prepareCall" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcConnection::prepareCall" );
::osl::MutexGuard aGuard( m_aMutex );
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index 2d18d44..71cb3e4 100644
--- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -35,7 +35,6 @@
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/types.hxx>
-#include <rtl/logfile.hxx>
using namespace connectivity::calc;
using namespace connectivity::file;
@@ -51,7 +50,7 @@ using namespace ::com::sun::star::sheet;
OCalcDatabaseMetaData::OCalcDatabaseMetaData(OConnection* _pCon) :ODatabaseMetaData(_pCon)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::OCalcDatabaseMetaData" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::OCalcDatabaseMetaData" );
}
// -------------------------------------------------------------------------
@@ -63,7 +62,7 @@ OCalcDatabaseMetaData::~OCalcDatabaseMetaData()
// -------------------------------------------------------------------------
Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::impl_getTypeInfo_throw" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::impl_getTypeInfo_throw" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -146,7 +145,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getColumns" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -242,7 +241,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns(
OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getURL" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
return OUString("sdbc:calc:") + m_pConnection->getURL();
@@ -252,7 +251,7 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getMaxBinaryLiteralLength" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getMaxBinaryLiteralLength" );
return STRING_MAXLEN;
}
@@ -260,25 +259,25 @@ sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQ
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getMaxCharLiteralLength" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getMaxCharLiteralLength" );
return STRING_MAXLEN;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getMaxColumnNameLength" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getMaxColumnNameLength" );
return STRING_MAXLEN;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getMaxColumnsInIndex" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getMaxColumnsInIndex" );
return 1;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getMaxColumnsInTable" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getMaxColumnsInTable" );
return 256;
}
@@ -361,7 +360,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables(
const OUString& tableNamePattern, const Sequence< OUString >& types )
throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcDatabaseMetaData::getTables" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcDatabaseMetaData::getTables" );
::osl::MutexGuard aGuard( m_aMutex );
ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTables);
diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx
index b509065..2809c85 100644
--- a/connectivity/source/drivers/calc/CTable.cxx
+++ b/connectivity/source/drivers/calc/CTable.cxx
@@ -47,7 +47,6 @@
#include <connectivity/dbexception.hxx>
#include <connectivity/dbconversion.hxx>
#include <comphelper/types.hxx>
-#include <rtl/logfile.hxx>
using namespace connectivity;
using namespace connectivity::calc;
@@ -68,7 +67,7 @@ using namespace ::com::sun::star::util;
static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32& rEndCol, sal_Int32& rEndRow )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_UpdateArea" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_UpdateArea" );
// update rEndCol, rEndRow if any non-empty cell in xUsedRange is right/below
const Reference<XCellRangesQuery> xUsedQuery( xUsedRange, UNO_QUERY );
@@ -92,7 +91,7 @@ static void lcl_UpdateArea( const Reference<XCellRange>& xUsedRange, sal_Int32&
static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& rColumnCount, sal_Int32& rRowCount )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetDataArea" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetDataArea" );
Reference<XSheetCellCursor> xCursor = xSheet->createCursor();
Reference<XCellRangeAddressable> xRange( xCursor, UNO_QUERY );
if ( !xRange.is() )
@@ -142,7 +141,7 @@ static void lcl_GetDataArea( const Reference<XSpreadsheet>& xSheet, sal_Int32& r
static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetContentOrResultType" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetContentOrResultType" );
CellContentType eCellType = xCell->getType();
if ( eCellType == CellContentType_FORMULA )
{
@@ -162,7 +161,7 @@ static CellContentType lcl_GetContentOrResultType( const Reference<XCell>& xCell
static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetUsedCell" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetUsedCell" );
Reference<XCell> xCell = xSheet->getCellByPosition( nDocColumn, nDocRow );
if ( xCell.is() && xCell->getType() == CellContentType_EMPTY )
{
@@ -200,7 +199,7 @@ static Reference<XCell> lcl_GetUsedCell( const Reference<XSpreadsheet>& xSheet,
static bool lcl_HasTextInColumn( const Reference<XSpreadsheet>& xSheet, sal_Int32 nDocColumn, sal_Int32 nDocRow )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_HasTextInColumn" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_HasTextInColumn" );
// look for any text cell or text result in the column
Reference<XCellRangeAddressable> xAddr( xSheet, UNO_QUERY );
@@ -230,7 +229,7 @@ static void lcl_GetColumnInfo( const Reference<XSpreadsheet>& xSheet, const Refe
sal_Int32 nDocColumn, sal_Int32 nStartRow, sal_Bool bHasHeaders,
OUString& rName, sal_Int32& rDataType, sal_Bool& rCurrency )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetColumnInfo" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetColumnInfo" );
//! avoid duplicate field names
// get column name from first row, if range contains headers
@@ -319,7 +318,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
const ::Date& rNullDate,
sal_Int32 nDBRow, sal_Int32 nDBColumn, sal_Int32 nType )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_SetValue" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_SetValue" );
sal_Int32 nDocColumn = nStartCol + nDBColumn - 1; // database counts from 1
sal_Int32 nDocRow = nStartRow + nDBRow - 1;
if (bHasHeaders)
@@ -433,7 +432,7 @@ static void lcl_SetValue( ORowSetValue& rValue, const Reference<XSpreadsheet>& x
static OUString lcl_GetColumnStr( sal_Int32 nColumn )
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::lcl_GetColumnStr" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::lcl_GetColumnStr" );
if ( nColumn < 26 )
return OUString::valueOf( (sal_Unicode) ( 'A' + nColumn ) );
else
@@ -448,7 +447,7 @@ static OUString lcl_GetColumnStr( sal_Int32 nColumn )
void OCalcTable::fillColumns()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::fillColumns" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::fillColumns" );
if ( !m_xSheet.is() )
throw SQLException();
@@ -497,7 +496,7 @@ void OCalcTable::fillColumns()
aTypeName = OUString("TIMESTAMP");
break;
default:
- OSL_FAIL("missing type name");
+ SAL_WARN( "connectivity.drivers","missing type name");
aTypeName = OUString();
}
@@ -544,12 +543,12 @@ OCalcTable::OCalcTable(sdbcx::OCollection* _pTables,OCalcConnection* _pConnectio
,m_bHasHeaders(sal_False)
,m_aNullDate(::Date::EMPTY)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::OCalcTable" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::OCalcTable" );
}
// -----------------------------------------------------------------------------
void OCalcTable::construct()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::construct" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::construct" );
// get sheet object
Reference< XSpreadsheetDocument> xDoc = m_pConnection->acquireDoc();
if (xDoc.is())
@@ -632,7 +631,7 @@ void OCalcTable::construct()
// -------------------------------------------------------------------------
void OCalcTable::refreshColumns()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::refreshColumns" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::refreshColumns" );
::osl::MutexGuard aGuard( m_aMutex );
TStringVector aVector;
@@ -649,14 +648,14 @@ void OCalcTable::refreshColumns()
// -------------------------------------------------------------------------
void OCalcTable::refreshIndexes()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::refreshIndexes" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::refreshIndexes" );
// Calc table has no index
}
// -------------------------------------------------------------------------
void SAL_CALL OCalcTable::disposing(void)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::disposing" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::disposing" );
OFileTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
m_aColumns = NULL;
@@ -668,7 +667,7 @@ void SAL_CALL OCalcTable::disposing(void)
// -------------------------------------------------------------------------
Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException)
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::getTypes" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::getTypes" );
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
@@ -707,7 +706,7 @@ Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeExcep
//--------------------------------------------------------------------------
Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::getUnoTunnelImplementationId" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -725,7 +724,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::getSomething" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: OCalcTable_BASE::getSomething(rId);
@@ -733,13 +732,13 @@ sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru
//------------------------------------------------------------------
sal_Int32 OCalcTable::getCurrentLastPos() const
{
- //RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::getCurrentLastPos" );
+ //SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::getCurrentLastPos" );
return m_nDataRows;
}
//------------------------------------------------------------------
sal_Bool OCalcTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::seekRow" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::seekRow" );
// ----------------------------------------------------------
// prepare positioning:
@@ -813,7 +812,7 @@ End:
sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
sal_Bool _bUseTableDefs, sal_Bool bRetrieveData )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::fetchRow" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::fetchRow" );
// read the bookmark
sal_Bool bIsCurRecordDeleted = sal_False;
@@ -849,7 +848,7 @@ sal_Bool OCalcTable::fetchRow( OValueRefRow& _rRow, const OSQLColumns & _rCols,
// -------------------------------------------------------------------------
void OCalcTable::FileClose()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTable::FileClose" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTable::FileClose" );
::osl::MutexGuard aGuard(m_aMutex);
OCalcTable_BASE::FileClose();
diff --git a/connectivity/source/drivers/calc/CTables.cxx b/connectivity/source/drivers/calc/CTables.cxx
index 9ad1391..407f2b3 100644
--- a/connectivity/source/drivers/calc/CTables.cxx
+++ b/connectivity/source/drivers/calc/CTables.cxx
@@ -23,7 +23,6 @@
#include "file/FConnection.hxx"
#include "calc/CCatalog.hxx"
#include <comphelper/types.hxx>
-#include <rtl/logfile.hxx>
using namespace ::comphelper;
using namespace connectivity;
@@ -38,7 +37,7 @@ using namespace ::com::sun::star::container;
sdbcx::ObjectType OCalcTables::createObject(const OUString& _rName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "calc", "Ocke.Janssen at sun.com", "OCalcTables::createObject" );
+ SAL_INFO( "connectivity.drivers", "calc Ocke.Janssen at sun.com OCalcTables::createObject" );
OCalcTable* pTable = new OCalcTable(this,(OCalcConnection*)static_cast<OFileCatalog&>(m_rParent).getConnection(),
_rName,OUString("TABLE"));
sdbcx::ObjectType xRet = pTable;
diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index c4623c0..15b683e 100644
--- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -33,7 +33,6 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/types.hxx>
#include <ucbhelper/content.hxx>
-#include <rtl/logfile.hxx>
using namespace ::comphelper;
using namespace connectivity::dbase;
@@ -48,7 +47,7 @@ using namespace ::com::sun::star::lang;
ODbaseDatabaseMetaData::ODbaseDatabaseMetaData(::connectivity::file::OConnection* _pCon) :ODatabaseMetaData(_pCon)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::ODbaseDatabaseMetaData" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::ODbaseDatabaseMetaData" );
}
// -------------------------------------------------------------------------
ODbaseDatabaseMetaData::~ODbaseDatabaseMetaData()
@@ -57,7 +56,7 @@ ODbaseDatabaseMetaData::~ODbaseDatabaseMetaData()
// -------------------------------------------------------------------------
Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::impl_getTypeInfo_throw" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::impl_getTypeInfo_throw" );
::osl::MutexGuard aGuard( m_aMutex );
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo);
@@ -159,7 +158,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern,
const OUString& columnNamePattern ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getColumns" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getColumns" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -250,7 +249,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table,
sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getIndexInfo" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getIndexInfo" );
::osl::MutexGuard aGuard( m_aMutex );
Reference< XTablesSupplier > xTables = m_pConnection->createCatalog();
@@ -325,56 +324,56 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo(
// -------------------------------------------------------------------------
OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getURL" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getURL" );
::osl::MutexGuard aGuard( m_aMutex );
return OUString("sdbc:dbase:") + m_pConnection->getURL();
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getMaxBinaryLiteralLength" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getMaxBinaryLiteralLength" );
return STRING_MAXLEN;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getMaxCharLiteralLength" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getMaxCharLiteralLength" );
return 254;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getMaxColumnNameLength" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getMaxColumnNameLength" );
return 10;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getMaxColumnsInIndex" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getMaxColumnsInIndex" );
return 1;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::getMaxColumnsInTable" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::getMaxColumnsInTable" );
return 128;
}
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn" );
return sal_True;
}
// -------------------------------------------------------------------------
sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn" );
return sal_False;
}
// -----------------------------------------------------------------------------
sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::isReadOnly" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::isReadOnly" );
::osl::MutexGuard aGuard( m_aMutex );
sal_Bool bReadOnly = sal_False;
@@ -387,13 +386,13 @@ sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, Run
// -----------------------------------------------------------------------------
sal_Bool ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw" );
return sal_True;
}
// -----------------------------------------------------------------------------
sal_Bool ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw" );
return sal_True;
}
// -----------------------------------------------------------------------------
diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx
index 99819f3..cb767c9 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -51,7 +51,6 @@
#include "connectivity/FValue.hxx"
#include "connectivity/dbconversion.hxx"
#include "resource/dbase_res.hrc"
-#include <rtl/logfile.hxx>
#include <rtl/strbuf.hxx>
#include <algorithm>
@@ -193,7 +192,7 @@ void lcl_CalDate(sal_Int32 _nJulianDate,sal_Int32 _nJulianTime,com::sun::star::u
// -------------------------------------------------------------------------
void ODbaseTable::readHeader()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::readHeader" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::readHeader" );
OSL_ENSURE(m_pFileStream,"No Stream available!");
if(!m_pFileStream)
return;
@@ -296,7 +295,7 @@ void ODbaseTable::readHeader()
// -------------------------------------------------------------------------
void ODbaseTable::fillColumns()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::fillColumns" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::fillColumns" );
m_pFileStream->Seek(STREAM_SEEK_TO_BEGIN);
m_pFileStream->Seek(32L);
@@ -344,7 +343,7 @@ void ODbaseTable::fillColumns()
cType[0] = aDBFColumn.db_typ;
cType[1] = 0;
aTypeName = OUString::createFromAscii(cType);
-OSL_TRACE("column type: %c",aDBFColumn.db_typ);
+ SAL_INFO( "connectivity.drivers","column type: " << aDBFColumn.db_typ);
switch (aDBFColumn.db_typ)
{
@@ -448,7 +447,7 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec
,m_pMemoStream(NULL)
,m_bWriteableMemo(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::ODbaseTable" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::ODbaseTable" );
// initialize the header
m_aHeader.db_typ = dBaseIII;
m_aHeader.db_anz = 0;
@@ -471,14 +470,14 @@ ODbaseTable::ODbaseTable(sdbcx::OCollection* _pTables,ODbaseConnection* _pConnec
,m_pMemoStream(NULL)
,m_bWriteableMemo(sal_False)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::ODbaseTable" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::ODbaseTable" );
m_eEncoding = getConnection()->getTextEncoding();
}
// -----------------------------------------------------------------------------
void ODbaseTable::construct()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::construct" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::construct" );
// initialize the header
m_aHeader.db_typ = dBaseIII;
m_aHeader.db_anz = 0;
@@ -561,7 +560,7 @@ void ODbaseTable::construct()
//------------------------------------------------------------------
sal_Bool ODbaseTable::ReadMemoHeader()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::ReadMemoHeader" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::ReadMemoHeader" );
m_pMemoStream->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
m_pMemoStream->RefreshBuffer(); // make sure that the header information is actually read again
m_pMemoStream->Seek(0L);
@@ -603,7 +602,7 @@ sal_Bool ODbaseTable::ReadMemoHeader()
(*m_pMemoStream) >> m_aMemoHeader.db_size;
break;
default:
- OSL_FAIL( "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
+ SAL_WARN( "connectivity.drivers", "ODbaseTable::ReadMemoHeader: unsupported memo type!" );
break;
}
return sal_True;
@@ -611,7 +610,7 @@ sal_Bool ODbaseTable::ReadMemoHeader()
// -------------------------------------------------------------------------
String ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getEntry" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getEntry" );
OUString sURL;
try
{
@@ -655,7 +654,7 @@ String ODbaseTable::getEntry(OConnection* _pConnection,const OUString& _sName )
// -------------------------------------------------------------------------
void ODbaseTable::refreshColumns()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::refreshColumns" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::refreshColumns" );
::osl::MutexGuard aGuard( m_aMutex );
TStringVector aVector;
@@ -672,7 +671,7 @@ void ODbaseTable::refreshColumns()
// -------------------------------------------------------------------------
void ODbaseTable::refreshIndexes()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::refreshIndexes" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::refreshIndexes" );
TStringVector aVector;
if(m_pFileStream && (!m_pIndexes || m_pIndexes->getCount() == 0))
{
@@ -717,7 +716,7 @@ void ODbaseTable::refreshIndexes()
// -------------------------------------------------------------------------
void SAL_CALL ODbaseTable::disposing(void)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::disposing" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::disposing" );
OFileTable::disposing();
::osl::MutexGuard aGuard(m_aMutex);
m_aColumns = NULL;
@@ -725,7 +724,7 @@ void SAL_CALL ODbaseTable::disposing(void)
// -------------------------------------------------------------------------
Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getTypes" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getTypes" );
Sequence< Type > aTypes = OTable_TYPEDEF::getTypes();
::std::vector<Type> aOwnTypes;
aOwnTypes.reserve(aTypes.getLength());
@@ -748,7 +747,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException)
// -------------------------------------------------------------------------
Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::queryInterface" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::queryInterface" );
if( rType == ::getCppuType((const Reference<XKeysSupplier>*)0) ||
rType == ::getCppuType((const Reference<XDataDescriptorFactory>*)0))
return Any();
@@ -760,7 +759,7 @@ Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeExce
//--------------------------------------------------------------------------
Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getUnoTunnelImplementationId" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getUnoTunnelImplementationId" );
static ::cppu::OImplementationId * pId = 0;
if (! pId)
{
@@ -778,7 +777,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId()
//------------------------------------------------------------------
sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getSomething" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getSomething" );
return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) )
? reinterpret_cast< sal_Int64 >( this )
: ODbaseTable_BASE::getSomething(rId);
@@ -786,7 +785,7 @@ sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R
//------------------------------------------------------------------
sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, sal_Bool _bUseTableDefs,sal_Bool bRetrieveData)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::fetchRow" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::fetchRow" );
// Read the data
bool bIsCurRecordDeleted = (char)m_pBuffer[0] == '*';
@@ -995,7 +994,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
(_rRow->get())[i]->setNull();
} break;
default:
- OSL_FAIL("Falscher Type");
+ SAL_WARN( "connectivity.drivers","Falscher Type");
}
(_rRow->get())[i]->setTypeKind(nType);
}
@@ -1009,7 +1008,7 @@ sal_Bool ODbaseTable::fetchRow(OValueRefRow& _rRow,const OSQLColumns & _rCols, s
// -------------------------------------------------------------------------
void ODbaseTable::FileClose()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::FileClose" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::FileClose" );
::osl::MutexGuard aGuard(m_aMutex);
// if not everything has been written yet
if (m_pMemoStream && m_pMemoStream->IsWritable())
@@ -1023,7 +1022,7 @@ void ODbaseTable::FileClose()
// -------------------------------------------------------------------------
sal_Bool ODbaseTable::CreateImpl()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::CreateImpl" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::CreateImpl" );
OSL_ENSURE(!m_pFileStream, "SequenceError");
if ( m_pConnection->isCheckEnabled() && ::dbtools::convertName2SQLName(m_Name,OUString()) != m_Name )
@@ -1138,7 +1137,7 @@ sal_Bool ODbaseTable::CreateImpl()
// -----------------------------------------------------------------------------
void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUString& _sColumnName)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::throwInvalidColumnType" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::throwInvalidColumnType" );
try
{
// we have to drop the file because it is corrupted now
@@ -1158,7 +1157,7 @@ void ODbaseTable::throwInvalidColumnType(const sal_uInt16 _nErrorId,const OUStri
// creates in principle dBase IV file format
sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMemo)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::CreateFile" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::CreateFile" );
bCreateMemo = sal_False;
Date aDate( Date::SYSTEM ); // current date
@@ -1407,7 +1406,7 @@ sal_Bool ODbaseTable::CreateFile(const INetURLObject& aFile, sal_Bool& bCreateMe
// creates in principle dBase III file format
sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::CreateMemoFile" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::CreateMemoFile" );
// filehandling macro for table creation
m_pMemoStream = createStream_simpleError( aFile.GetMainURL(INetURLObject::NO_DECODE),STREAM_READWRITE | STREAM_SHARE_DENYWRITE);
@@ -1427,7 +1426,7 @@ sal_Bool ODbaseTable::CreateMemoFile(const INetURLObject& aFile)
//------------------------------------------------------------------
sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields,OCollection* _pIndexes )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::Drop_Static" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::Drop_Static" );
INetURLObject aURL;
aURL.SetURL(_sUrl);
@@ -1476,7 +1475,7 @@ sal_Bool ODbaseTable::Drop_Static(const OUString& _sUrl,sal_Bool _bHasMemoFields
// -----------------------------------------------------------------------------
sal_Bool ODbaseTable::DropImpl()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::DropImpl" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::DropImpl" );
FileClose();
if(!m_pIndexes)
@@ -1495,7 +1494,7 @@ sal_Bool ODbaseTable::DropImpl()
//------------------------------------------------------------------
sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Reference<XIndexAccess>& _xCols)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::InsertRow" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::InsertRow" );
// fill buffer with blanks
AllocBuffer();
memset(m_pBuffer, 0, m_aHeader.db_slng);
@@ -1553,7 +1552,7 @@ sal_Bool ODbaseTable::InsertRow(OValueRefVector& rRow, sal_Bool bFlush,const Ref
//------------------------------------------------------------------
sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,const Reference<XIndexAccess>& _xCols)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::UpdateRow" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::UpdateRow" );
// fill buffer with blanks
AllocBuffer();
@@ -1583,7 +1582,7 @@ sal_Bool ODbaseTable::UpdateRow(OValueRefVector& rRow, OValueRefRow& pOrgRow,con
//------------------------------------------------------------------
sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::DeleteRow" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::DeleteRow" );
// Set the Delete-Flag (be it set or not):
// Position on desired record:
long nFilePos = m_aHeader.db_kopf + (long)(m_nFilePos-1) * m_aHeader.db_slng;
@@ -1636,7 +1635,7 @@ sal_Bool ODbaseTable::DeleteRow(const OSQLColumns& _rCols)
// -------------------------------------------------------------------------
Reference<XPropertySet> ODbaseTable::isUniqueByColumnName(sal_Int32 _nColumnPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::isUniqueByColumnName" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::isUniqueByColumnName" );
if(!m_pIndexes)
refreshIndexes();
if(m_pIndexes->hasElements())
@@ -1671,7 +1670,7 @@ static double toDouble(const OString& rString)
//------------------------------------------------------------------
sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow, const Reference<XIndexAccess>& _xCols, const bool bForceAllFields)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::UpdateBuffer" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::UpdateBuffer" );
OSL_ENSURE(m_pBuffer,"Buffer is NULL!");
if ( !m_pBuffer )
return sal_False;
@@ -2008,7 +2007,7 @@ sal_Bool ODbaseTable::UpdateBuffer(OValueRefVector& rRow, OValueRefRow pOrgRow,
// -----------------------------------------------------------------------------
sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlockNr)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::WriteMemo" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::WriteMemo" );
// if the BlockNo 0 is given, the block will be appended at the end
sal_uIntPtr nSize = 0;
OString aStr;
@@ -2144,7 +2143,7 @@ sal_Bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, sal_uIntPtr& rBlo
// XAlterTable
void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::alterColumnByName" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::alterColumnByName" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2157,7 +2156,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref
// -------------------------------------------------------------------------
void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, ::com::sun::star::lang::IndexOutOfBoundsException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::alterColumnByIndex" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::alterColumnByIndex" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
@@ -2173,7 +2172,7 @@ void ODbaseTable::alterColumn(sal_Int32 index,
const Reference< XPropertySet >& descriptor ,
const Reference< XDataDescriptorFactory >& xOldColumn )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::alterColumn" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::alterColumn" );
if(index < 0 || index >= m_pColumns->getCount())
throw IndexOutOfBoundsException(OUString::number(index),*this);
@@ -2272,20 +2271,20 @@ void ODbaseTable::alterColumn(sal_Int32 index,
}
catch(const Exception&)
{
- OSL_FAIL("ODbaseTable::alterColumn: Exception occurred!");
+ SAL_WARN( "connectivity.drivers","ODbaseTable::alterColumn: Exception occurred!");
throw;
}
}
// -----------------------------------------------------------------------------
Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getMetaData" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getMetaData" );
return getConnection()->getMetaData();
}
// -------------------------------------------------------------------------
void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::rename" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::rename" );
::osl::MutexGuard aGuard(m_aMutex);
checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
if(m_pTables && m_pTables->hasByName(newName))
@@ -2344,7 +2343,7 @@ namespace
// -------------------------------------------------------------------------
void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::container::ElementExistException, ::com::sun::star::uno::RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getEntry" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getEntry" );
::osl::MutexGuard aGuard(m_aMutex);
FileClose();
@@ -2360,7 +2359,7 @@ void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(::com::su
// -----------------------------------------------------------------------------
void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::addColumn" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::addColumn" );
String sTempName = createTempFile();
ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
@@ -2433,7 +2432,7 @@ void ODbaseTable::addColumn(const Reference< XPropertySet >& _xNewColumn)
// -----------------------------------------------------------------------------
void ODbaseTable::dropColumn(sal_Int32 _nPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::dropColumn" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::dropColumn" );
String sTempName = createTempFile();
ODbaseTable* pNewTable = new ODbaseTable(m_pTables,static_cast<ODbaseConnection*>(m_pConnection));
@@ -2489,7 +2488,7 @@ void ODbaseTable::dropColumn(sal_Int32 _nPos)
// -----------------------------------------------------------------------------
String ODbaseTable::createTempFile()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::createTempFile" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::createTempFile" );
OUString aIdent = m_pConnection->getContent()->getIdentifier()->getContentIdentifier();
if ( aIdent.lastIndexOf('/') != (aIdent.getLength()-1) )
aIdent += "/";
@@ -2514,7 +2513,7 @@ String ODbaseTable::createTempFile()
// -----------------------------------------------------------------------------
void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::copyData" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::copyData" );
sal_Int32 nPos = _nPos + 1; // +1 because we always have the bookmark clumn as well
OValueRefRow aRow = new OValueRefVector(m_pColumns->getCount());
OValueRefRow aInsertRow;
@@ -2572,7 +2571,7 @@ void ODbaseTable::copyData(ODbaseTable* _pNewTable,sal_Int32 _nPos)
// -----------------------------------------------------------------------------
void ODbaseTable::throwInvalidDbaseFormat()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::throwInvalidDbaseFormat" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::throwInvalidDbaseFormat" );
FileClose();
// no dbase file
@@ -2585,14 +2584,14 @@ void ODbaseTable::throwInvalidDbaseFormat()
// -----------------------------------------------------------------------------
void ODbaseTable::refreshHeader()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::refreshHeader" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::refreshHeader" );
if ( m_aHeader.db_anz == 0 )
readHeader();
}
//------------------------------------------------------------------
sal_Bool ODbaseTable::seekRow(IResultSetHelper::Movement eCursorPosition, sal_Int32 nOffset, sal_Int32& nCurPos)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::seekRow" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::seekRow" );
// ----------------------------------------------------------
// prepare positioning:
OSL_ENSURE(m_pFileStream,"ODbaseTable::seekRow: FileStream is NULL!");
@@ -2676,7 +2675,7 @@ End:
// -----------------------------------------------------------------------------
sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::ReadMemo" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::ReadMemo" );
bool bIsText = true;
m_pMemoStream->Seek(nBlockNo * m_aMemoHeader.db_size);
@@ -2753,7 +2752,7 @@ sal_Bool ODbaseTable::ReadMemo(sal_uIntPtr nBlockNo, ORowSetValue& aVariable)
// -----------------------------------------------------------------------------
void ODbaseTable::AllocBuffer()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::AllocBuffer" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::AllocBuffer" );
sal_uInt16 nSize = m_aHeader.db_slng;
OSL_ENSURE(nSize > 0, "Size too small");
@@ -2773,7 +2772,7 @@ void ODbaseTable::AllocBuffer()
// -----------------------------------------------------------------------------
sal_Bool ODbaseTable::WriteBuffer()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::WriteBuffer" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::WriteBuffer" );
OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige Record-Position");
// postion on desired record:
@@ -2784,7 +2783,7 @@ sal_Bool ODbaseTable::WriteBuffer()
// -----------------------------------------------------------------------------
sal_Int32 ODbaseTable::getCurrentLastPos() const
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dbase", "Ocke.Janssen at sun.com", "ODbaseTable::getCurrentLastPos" );
+ SAL_INFO( "connectivity.drivers", "dbase Ocke.Janssen at sun.com ODbaseTable::getCurrentLastPos" );
return m_aHeader.db_anz;
}
diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx
index 58d122c..fff9d4b 100644
--- a/connectivity/source/drivers/file/FCatalog.cxx
+++ b/connectivity/source/drivers/file/FCatalog.cxx
@@ -22,7 +22,6 @@
#include "file/FTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
-#include <rtl/logfile.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
@@ -36,12 +35,12 @@ using namespace connectivity::file;
OFileCatalog::OFileCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon)
,m_pConnection(_pCon)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::OFileCatalog" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::OFileCatalog" );
}
// -------------------------------------------------------------------------
void SAL_CALL OFileCatalog::disposing()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::disposing" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::disposing" );
::osl::MutexGuard aGuard(m_aMutex);
typedef connectivity::sdbcx::OCatalog OFileCatalog_BASE;
@@ -51,13 +50,13 @@ m_xMetaData.clear();
// -----------------------------------------------------------------------------
OUString OFileCatalog::buildName(const Reference< XRow >& _xRow)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::buildName" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::buildName" );
return _xRow->getString(3);
}
// -------------------------------------------------------------------------
void OFileCatalog::refreshTables()
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::refreshTables" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::refreshTables" );
TStringVector aVector;
Sequence< OUString > aTypes;
Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),
@@ -73,7 +72,7 @@ void OFileCatalog::refreshTables()
// -------------------------------------------------------------------------
Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::queryInterface" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::queryInterface" );
if( rType == ::getCppuType((const Reference<XGroupsSupplier>*)0) ||
rType == ::getCppuType((const Reference<XUsersSupplier>*)0) ||
rType == ::getCppuType((const Reference<XViewsSupplier>*)0))
@@ -86,7 +85,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc
// -----------------------------------------------------------------------------
Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "OFileCatalog::getTypes" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com OFileCatalog::getTypes" );
typedef sdbcx::OCatalog OFileCatalog_BASE;
Sequence< Type > aTypes = OFileCatalog_BASE::getTypes();
diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index a495368..b33f88b 100644
--- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -33,7 +33,6 @@
#include <comphelper/extract.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/debug.hxx>
-#include <rtl/logfile.hxx>
#include <ucbhelper/content.hxx>
using namespace com::sun::star::ucb;
@@ -50,7 +49,7 @@ DBG_NAME( file_ODatabaseMetaData )
ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo())
,m_pConnection(_pCon)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::ODatabaseMetaData" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::ODatabaseMetaData" );
DBG_CTOR( file_ODatabaseMetaData, NULL );
}
// -------------------------------------------------------------------------
@@ -61,13 +60,13 @@ ODatabaseMetaData::~ODatabaseMetaData()
// -------------------------------------------------------------------------
Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::impl_getTypeInfo_throw" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::impl_getTypeInfo_throw" );
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTypeInfo );
}
// -------------------------------------------------------------------------
OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( )
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::impl_getCatalogSeparator_throw" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::impl_getCatalogSeparator_throw" );
return OUString();
}
// -------------------------------------------------------------------------
@@ -75,8 +74,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns(
const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/,
const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getColumns" );
- OSL_FAIL("Should be overloaded!");
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getColumns" );
+ SAL_WARN( "connectivity.drivers","Should be overloaded!");
return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns );
}
@@ -156,7 +155,7 @@ namespace
}
catch( const Exception& )
{
- OSL_FAIL( "isCaseSensitiveParentFolder: caught an unexpected exception!" );
+ SAL_WARN( "connectivity.drivers", "isCaseSensitiveParentFolder: caught an unexpected exception!" );
}
return nIsCS;
@@ -168,7 +167,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
const Any& /*catalog*/, const OUString& /*schemaPattern*/,
const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getTables" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getTables" );
::osl::MutexGuard aGuard( m_aMutex );
@@ -317,80 +316,80 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables(
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getMaxBinaryLiteralLength" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getMaxBinaryLiteralLength" );
return 0;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getMaxRowSize" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getMaxRowSize" );
return 0;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getMaxCatalogNameLength" );
+ SAL_INFO( "connectivity.drivers", "file Ocke.Janssen at sun.com ODatabaseMetaData::getMaxCatalogNameLength" );
return 0;
}
// -------------------------------------------------------------------------
sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException)
{
- RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "file", "Ocke.Janssen at sun.com", "ODatabaseMetaData::getMaxCharLiteralLength" );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list