From 4ef9ccea6c4aa79cdc57dea52b47775c346696ec Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 9 Dec 2016 15:48:38 +0200
Subject: OSL_TRACE -> SAL in sfx2..svx

Change-Id: I78cf8058a5682baa3d7b00a25feeb2d28fb3e66e
Reviewed-on: https://gerrit.libreoffice.org/31799
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 stoc/test/javavm/testjavavm.cxx | 7 ++-----
 stoc/test/testconv.cxx          | 5 +----
 stoc/test/testcorefl.cxx        | 6 +-----
 stoc/test/testiadapter.cxx      | 2 +-
 stoc/test/testintrosp.cxx       | 5 +----
 stoc/test/testproxyfac.cxx      | 4 ++--
 6 files changed, 8 insertions(+), 21 deletions(-)

(limited to 'stoc/test')

diff --git a/stoc/test/javavm/testjavavm.cxx b/stoc/test/javavm/testjavavm.cxx
index 827a93cfb63e..f856f76dc2a8 100644
--- a/stoc/test/javavm/testjavavm.cxx
+++ b/stoc/test/javavm/testjavavm.cxx
@@ -89,7 +89,7 @@ sal_Bool testJavaVM(const Reference< XMultiServiceFactory > & xMgr )
 
     jclass cls = p_env->FindClass( "TestJavaVM");
     if (cls == 0) {
-        OSL_TRACE( "Can't find Prog class");
+        SAL_WARN("stoc", "Can't find Prog class");
         exit(1);
     }
 
@@ -139,10 +139,7 @@ SAL_IMPLEMENT_MAIN()
     catch (const Exception & rExc)
     {
         OSL_FAIL( "### exception occurred!" );
-        OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occurred: " );
-        OSL_TRACE( "%s", aMsg.getStr() );
-        OSL_TRACE( "\n" );
+        SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
     Reference< XComponent > xCompContext( context, UNO_QUERY );
diff --git a/stoc/test/testconv.cxx b/stoc/test/testconv.cxx
index afe682fb8631..2eebdef67d4c 100644
--- a/stoc/test/testconv.cxx
+++ b/stoc/test/testconv.cxx
@@ -672,10 +672,7 @@ SAL_IMPLEMENT_MAIN()
     catch (const Exception & rExc)
     {
         OSL_FAIL( "### exception occurred!" );
-        OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occurred: " );
-        OSL_TRACE( "%s", aMsg.getStr() );
-        OSL_TRACE( "\n" );
+        SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
     Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index 05df96424a28..7aa06a9ca82d 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -368,11 +368,7 @@ SAL_IMPLEMENT_MAIN()
     catch (const Exception & rExc)
     {
         OSL_FAIL( "### exception occurred!" );
-        OString aMsg(
-            OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occurred: " );
-        OSL_TRACE( "%s", aMsg.getStr() );
-        OSL_TRACE( "\n" );
+        SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
     printf( "testcorefl %s !\n", (bSucc ? "succeeded" : "failed") );
diff --git a/stoc/test/testiadapter.cxx b/stoc/test/testiadapter.cxx
index 54c260e4fef4..a335939b9659 100644
--- a/stoc/test/testiadapter.cxx
+++ b/stoc/test/testiadapter.cxx
@@ -159,7 +159,7 @@ class Test_Impl : public WeakImplHelper< XLanguageBindingTest >
 
 public:
     virtual ~Test_Impl()
-        { OSL_TRACE( "> scalar Test_Impl dtor <\n" ); }
+        { SAL_INFO("stoc", "> scalar Test_Impl dtor <" ); }
 
     // XLBTestBase
     virtual void SAL_CALL setValues( sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 22df49ebc509..caff1337a91c 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -1196,10 +1196,7 @@ SAL_IMPLEMENT_MAIN()
     catch (const Exception & rExc)
     {
         OSL_FAIL( "### exception occurred!" );
-        OString aMsg( OUStringToOString( rExc.Message, RTL_TEXTENCODING_ASCII_US ) );
-        OSL_TRACE( "### exception occurred: " );
-        OSL_TRACE( "%s", aMsg.getStr() );
-        OSL_TRACE( "\n" );
+        SAL_WARN("stoc", "### exception occurred: " << rExc.Message );
     }
 
     Reference< XComponent >( xMgr, UNO_QUERY )->dispose();
diff --git a/stoc/test/testproxyfac.cxx b/stoc/test/testproxyfac.cxx
index 83bda7ff321f..ebc878696316 100644
--- a/stoc/test/testproxyfac.cxx
+++ b/stoc/test/testproxyfac.cxx
@@ -55,7 +55,7 @@ public:
 
     virtual ~TargetObject() {
         --s_obj;
-        OSL_TRACE( "~TargetObject()" );
+        SAL_INFO("stoc", "~TargetObject()" );
     }
     TargetObject()
         { ++s_obj; }
@@ -113,7 +113,7 @@ public:
 
     virtual ~TestMaster() {
         --s_obj;
-        OSL_TRACE( "~TestMaster()" );
+        SAL_INFO("stoc", "~TestMaster()" );
     }
 
     virtual Any SAL_CALL queryInterface( const Type & rType )
-- 
cgit