fdo#63690 - replace RTL_CONTEXT_ macros with SAL_INFO

- replaced RTL_CONTEXT_ with SAL_INFO
- replace OSL_* with SAL_*

Change-Id: I9a7cce0d3abef42c9d9d0ad56609d94d504854cb
Reviewed-on: https://gerrit.libreoffice.org/4128
Reviewed-by: Miklos Vajna <vmiklos@suse.cz>
Tested-by: Miklos Vajna <vmiklos@suse.cz>

4 files changed, 13 insertions, 20 deletions

diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx
index 1fe56fc68625..b1c8395220ec 100644
--- a/slideshow/source/engine/shapes/backgroundshape.cxx
+++ b/slideshow/source/engine/shapes/backgroundshape.cxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
-#include <rtl/logfile.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
@@ -270,8 +269,8 @@ namespace slideshow
 
         bool BackgroundShape::render() const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::BackgroundShape::render()" );
-            RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::presentation::internal::BackgroundShape: 0x%X", this );
+            SAL_INFO( "slideshow", "::presentation::internal::BackgroundShape::render()" );
+            SAL_INFO( "slideshow", "::presentation::internal::BackgroundShape: 0x" << std::hex << this );
 
             // gcc again...
             const ::basegfx::B2DRectangle& rCurrBounds( BackgroundShape::getBounds() );
diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx
index ace22211aefd..75435695ec23 100644
--- a/slideshow/source/engine/shapes/drawshape.cxx
+++ b/slideshow/source/engine/shapes/drawshape.cxx
@@ -22,7 +22,6 @@
 #include <tools/diagnose_ex.h>
 #include <canvas/verbosetrace.hxx>
 
-#include <rtl/logfile.hxx>
 #include <osl/diagnose.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -150,8 +149,8 @@ namespace slideshow
 
         bool DrawShape::implRender( int nUpdateFlags ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::DrawShape::implRender()" );
-            RTL_LOGFILE_CONTEXT_TRACE1( aLog, "::presentation::internal::DrawShape: 0x%X", this );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShape::implRender()" );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShape: 0x" << std::hex << this );
 
             // will perform the update now, clear update-enforcing
             // flags
@@ -621,10 +620,7 @@ namespace slideshow
             }
             catch (uno::Exception &)
             {
-                OSL_FAIL( OUStringToOString(
-                                comphelper::anyToString(
-                                    cppu::getCaughtException() ),
-                                RTL_TEXTENCODING_UTF8 ).getStr() );
+                SAL_WARN( "slideshow", "" << comphelper::anyToString(cppu::getCaughtException() ) );
             }
         }
 
@@ -930,7 +926,7 @@ namespace slideshow
                     {
                         if (!maHyperlinkIndices.empty() &&
                             maHyperlinkIndices.back().second == -1) {
-                            OSL_FAIL( "### pending FIELD_SEQ_END!" );
+                            SAL_WARN( "slideshow", "### pending FIELD_SEQ_END!" );
                             maHyperlinkIndices.pop_back();
                             maHyperlinkRegions.pop_back();
                         }
@@ -961,7 +957,7 @@ namespace slideshow
             }
             if (!maHyperlinkIndices.empty() &&
                 maHyperlinkIndices.back().second == -1) {
-                OSL_FAIL( "### pending FIELD_SEQ_END!" );
+                SAL_WARN( "slideshow", "### pending FIELD_SEQ_END!" );
                 maHyperlinkIndices.pop_back();
                 maHyperlinkRegions.pop_back();
             }
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index ddb5ee46397d..a05305575606 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -24,7 +24,6 @@
 #include <canvas/verbosetrace.hxx>
 
 #include <rtl/math.hxx>
-#include <rtl/logfile.hxx>
 
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
@@ -300,7 +299,7 @@ namespace slideshow
 
         AttributableShapeSharedPtr DrawShapeSubsetting::getSubsetShape( const DocTreeNode& rTreeNode ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::DrawShapeSubsetting::getSubsetShape()" );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShapeSubsetting::getSubsetShape()" );
 
             // subset shape already created for this DocTreeNode?
             SubsetEntry aEntry;
@@ -320,7 +319,7 @@ namespace slideshow
 
         void DrawShapeSubsetting::addSubsetShape( const AttributableShapeSharedPtr& rShape )
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::DrawShapeSubsetting::addSubsetShape()" );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShapeSubsetting::addSubsetShape()" );
 
             // subset shape already created for this DocTreeNode?
             SubsetEntry aEntry;
@@ -354,7 +353,7 @@ namespace slideshow
 
         bool DrawShapeSubsetting::revokeSubsetShape( const AttributableShapeSharedPtr& rShape )
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::DrawShapeSubsetting::revokeSubsetShape()" );
+            SAL_INFO( "slideshow", "::presentation::internal::DrawShapeSubsetting::revokeSubsetShape()" );
 
             // lookup subset shape
             SubsetEntry aEntry;
@@ -610,7 +609,7 @@ namespace slideshow
                     case DocTreeNode::NODETYPE_INVALID:
                         // FALLTHROUGH intended
                     default:
-                        OSL_FAIL("DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
+                        SAL_WARN( "slideshow", "DrawShapeSubsetting::mapDocTreeNode(): unexpected node type");
                         return DrawShapeSubsetting::CLASS_NOOP;
 
                     case DocTreeNode::NODETYPE_LOGICAL_SHAPE:
diff --git a/slideshow/source/engine/shapes/viewbackgroundshape.cxx b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
index 51e3fc3373d6..05f255b28604 100644
--- a/slideshow/source/engine/shapes/viewbackgroundshape.cxx
+++ b/slideshow/source/engine/shapes/viewbackgroundshape.cxx
@@ -25,7 +25,6 @@
 #include "viewbackgroundshape.hxx"
 #include "tools.hxx"
 
-#include <rtl/logfile.hxx>
 #include <rtl/math.hxx>
 
 #include <comphelper/anytostring.hxx>
@@ -57,7 +56,7 @@ namespace slideshow
         bool ViewBackgroundShape::prefetch( const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas,
                                             const GDIMetaFileSharedPtr&         rMtf ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::prefetch()" );
+            SAL_INFO( "slideshow", "::presentation::internal::ViewBackgroundShape::prefetch()" );
             ENSURE_OR_RETURN_FALSE( rMtf,
                                "ViewBackgroundShape::prefetch(): no valid metafile!" );
 
@@ -152,7 +151,7 @@ namespace slideshow
 
         bool ViewBackgroundShape::render( const GDIMetaFileSharedPtr& rMtf ) const
         {
-            RTL_LOGFILE_CONTEXT( aLog, "::presentation::internal::ViewBackgroundShape::draw()" );
+            SAL_INFO( "slideshow", "::presentation::internal::ViewBackgroundShape::draw()" );
 
             const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas( mpViewLayer->getCanvas() );