tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

Change-Id: If329cf8257684e7bd2936641b8f14ec3e9b9f733
Reviewed-on: https://gerrit.libreoffice.org/22647
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>

2 files changed, 16 insertions, 23 deletions

diff --git a/sal/qa/osl/process/osl_process.cxx b/sal/qa/osl/process/osl_process.cxx
index 280e87302ac0..036be4bb593b 100644
--- a/sal/qa/osl/process/osl_process.cxx
+++ b/sal/qa/osl/process/osl_process.cxx
@@ -276,9 +276,9 @@ public:
         string_container_t parent_env;
         read_parent_environment(&parent_env);
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
-            std::cerr << "initially parent env: " << *iter << std::endl;
+            SAL_INFO("sal.process", "initially parent env: " << *iter);
 #endif
 
         //remove the environment variables that we have changed
@@ -287,9 +287,9 @@ public:
             std::remove_if(parent_env.begin(), parent_env.end(), exclude(different_env_vars)),
             parent_env.end());
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = parent_env.begin(), end = parent_env.end(); iter != end; ++iter)
-            std::cerr << "stripped parent env: " << *iter << std::endl;
+            SAL_INFO("sal.process", "stripped parent env: " << *iter);
 #endif
 
         //read the child environment and exclude the variables that
@@ -297,9 +297,9 @@ public:
         string_container_t child_env;
         read_child_environment(&child_env);
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
-            std::cerr << "initial child env: " << *iter << std::endl;
+            SAL_INFO("sal.process", "initial child env: " << *iter);
 #endif
         //partition the child environment into the variables that
         //are different to the parent environment (they come first)
@@ -311,22 +311,22 @@ public:
         string_container_t different_child_env_vars(child_env.begin(), iter_logical_end);
         child_env.erase(child_env.begin(), iter_logical_end);
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = child_env.begin(), end = child_env.end(); iter != end; ++iter)
-            std::cerr << "stripped child env: " << *iter << std::endl;
+            SAL_INFO("sal.process", "stripped child env: " << *iter);
 #endif
 
         bool common_env_size_equals    = (parent_env.size() == child_env.size());
         bool common_env_content_equals = std::equal(child_env.begin(), child_env.end(), parent_env.begin());
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = different_env_vars.begin(), end = different_env_vars.end(); iter != end; ++iter)
-            std::cerr << "different should be: " << *iter << std::endl;
+            SAL_INFO("sal.process", "different should be: " << *iter);
 #endif
 
-#if OSL_DEBUG_LEVEL > 1
+#if OSL_DEBUG_LEVEL > 0
         for (string_container_t::const_iterator iter = different_child_env_vars.begin(), end = different_child_env_vars.end(); iter != end; ++iter)
-            std::cerr << "different are: " << *iter << std::endl;
+            SAL_INFO("sal.process", "different are: " << *iter);
 #endif
 
         bool different_env_size_equals    = (different_child_env_vars.size() == different_env_vars.size());
diff --git a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
index faf2ebe3a71e..8678ee069620 100644
--- a/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
+++ b/sal/qa/rtl/doublelock/rtl_doublelocking.cxx
@@ -190,23 +190,16 @@ namespace rtl_DoubleLocking
                 sal_Int32 nValueOK2 = 0;
                 nValueOK2 = p2Thread->getOK();
 
-#if OSL_DEBUG_LEVEL > 2
-                printf("Value in Thread #1 is %" SAL_PRIdINT32 "\n", nValueOK);
-                printf("Value in Thread #2 is %" SAL_PRIdINT32 "\n", nValueOK2);
-#else
-                (void)nValueOK2;
-#endif
-
+                SAL_INFO("sal.doublelock", "Value in Thread #1 is " << nValueOK);
+                SAL_INFO("sal.doublelock", "Value in Thread #2 is " << nValueOK2);
                 sal_Int32 nValueFails = 0;
                 nValueFails = pThread->getFails();
 
                 sal_Int32 nValueFails2 = 0;
                 nValueFails2 = p2Thread->getFails();
 
-#if OSL_DEBUG_LEVEL > 2
-                printf("Fails in Thread #1 is %" SAL_PRIdINT32 "\n", nValueFails);
-                printf("Fails in Thread #2 is %" SAL_PRIdINT32 "\n", nValueFails2);
-#endif
+                SAL_INFO("sal.doublelock", "Fails in Thread #1 is " << nValueFails);
+                SAL_INFO("sal.doublelock", "Fails in Thead #2 is " << nValueFails2);
 
                 delete pThread;
                 delete p2Thread;