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@suse.com>
Tested-by: Noel Power <noel.power@suse.com>

6 files changed, 30 insertions, 38 deletions

diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index d7e72c08f73f..e0c59b77a9b8 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 ca75d35c8ad5..ff2d71ed4064 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 7c86da13f505..7992deb38425 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 f2f50fe93e40..96a01ca146d9 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 0e6d6d507dc1..193c6f3b6c58 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 9e14f4c015c7..721e1f2dd8c0 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>