From bd888a331b6eafbdf3225e15e47c1190bd5bd6b7 Mon Sep 17 00:00:00 2001 From: Radu Ioan Date: Wed, 15 May 2013 23:34:01 +0300 Subject: fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO - replaced RTL_CONTEXT_ with SAL_INFO - replace OSL_* with SAL_* Change-Id: I0054bc90fdcaa2fef7e1d98a0528277be4fc341e Reviewed-on: https://gerrit.libreoffice.org/3917 Reviewed-by: Fridrich Strba Tested-by: Fridrich Strba --- canvas/source/directx/dx_bitmapcanvashelper.cxx | 9 ++++----- canvas/source/vcl/canvasbitmaphelper.cxx | 11 +++++------ canvas/source/vcl/impltools.cxx | 5 ++--- 3 files changed, 11 insertions(+), 14 deletions(-) (limited to 'canvas') diff --git a/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx index 9772cc245d87..e9577e1331b6 100644 --- a/canvas/source/directx/dx_bitmapcanvashelper.cxx +++ b/canvas/source/directx/dx_bitmapcanvashelper.cxx @@ -21,7 +21,6 @@ #include #include -#include #include #include @@ -159,7 +158,7 @@ namespace dxcanvas uno::Sequence< sal_Int8 > BitmapCanvasHelper::getData( rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerRectangle2D& rect ) { - RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getData()" ); + SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::getData()" ); ENSURE_OR_THROW( mpTarget, "::dxcanvas::BitmapCanvasHelper::getData(): disposed" ); @@ -175,7 +174,7 @@ namespace dxcanvas const rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerRectangle2D& rect ) { - RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setData()" ); + SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::setData()" ); ENSURE_OR_THROW( mpTarget, "::dxcanvas::BitmapCanvasHelper::setData(): disposed" ); @@ -190,7 +189,7 @@ namespace dxcanvas const rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerPoint2D& pos ) { - RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::setPixel()" ); + SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::setPixel()" ); ENSURE_OR_THROW( mpTarget, "::dxcanvas::BitmapCanvasHelper::setPixel(): disposed" ); @@ -204,7 +203,7 @@ namespace dxcanvas uno::Sequence< sal_Int8 > BitmapCanvasHelper::getPixel( rendering::IntegerBitmapLayout& bitmapLayout, const geometry::IntegerPoint2D& pos ) { - RTL_LOGFILE_CONTEXT( aLog, "::dxcanvas::BitmapCanvasHelper::getPixel()" ); + SAL_INFO( "canvas.directx", "::dxcanvas::BitmapCanvasHelper::getPixel()" ); ENSURE_OR_THROW( mpTarget, "::dxcanvas::BitmapCanvasHelper::getPixel(): disposed" ); diff --git a/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx index 6a9698a3bfcf..9178ff744c69 100644 --- a/canvas/source/vcl/canvasbitmaphelper.cxx +++ b/canvas/source/vcl/canvasbitmaphelper.cxx @@ -23,7 +23,6 @@ #include -#include #include #include @@ -112,7 +111,7 @@ namespace vclcanvas ENSURE_OR_THROW( mpDevice, "disposed CanvasHelper" ); - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getScaledBitmap()" ); if( !mpBackBuffer || mpDevice ) return uno::Reference< rendering::XBitmap >(); // we're disposed @@ -129,7 +128,7 @@ namespace vclcanvas uno::Sequence< sal_Int8 > CanvasBitmapHelper::getData( rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerRectangle2D& rect ) { - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getData()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getData()" ); if( !mpBackBuffer ) return uno::Sequence< sal_Int8 >(); // we're disposed @@ -195,7 +194,7 @@ namespace vclcanvas const rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerRectangle2D& rect ) { - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setData()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::setData()" ); if( !mpBackBuffer ) return; // we're disposed @@ -427,7 +426,7 @@ namespace vclcanvas const rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerPoint2D& pos ) { - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::setPixel()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::setPixel()" ); if( !mpBackBuffer ) return; // we're disposed @@ -491,7 +490,7 @@ namespace vclcanvas uno::Sequence< sal_Int8 > CanvasBitmapHelper::getPixel( rendering::IntegerBitmapLayout& rLayout, const geometry::IntegerPoint2D& pos ) { - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::CanvasBitmapHelper::getPixel()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::CanvasBitmapHelper::getPixel()" ); if( !mpBackBuffer ) return uno::Sequence< sal_Int8 >(); // we're disposed diff --git a/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx index 797fca9775f5..0dce58095324 100644 --- a/canvas/source/vcl/impltools.cxx +++ b/canvas/source/vcl/impltools.cxx @@ -22,7 +22,6 @@ #include #include -#include #include #include @@ -207,8 +206,8 @@ namespace vclcanvas const uno::Sequence< double >& rDeviceColor, ModulationMode eModulationMode ) { - RTL_LOGFILE_CONTEXT( aLog, "::vclcanvas::tools::transformBitmap()" ); - RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::vclcanvas::tools::transformBitmap: 0x%X", &rBitmap ); + SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap()" ); + SAL_INFO( "canvas.vcl", "::vclcanvas::tools::transformBitmap: 0x" << std::hex << &rBitmap ); // calc transformation and size of bitmap to be // generated. Note, that the translational components are -- cgit