3 files changed, 6 insertions, 49 deletions

diff --git a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
index 449429ffc0b0..9e4925335306 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Environment.cxx
@@ -27,20 +27,6 @@
 #include "typelib/typedescription.h"
 #include "osl/interlck.h"
 
-#ifdef debug
-# define LOG_LIFECYCLE_cppu_helper_purpenv_Base
-#endif
-
-#ifdef LOG_LIFECYCLE_cppu_helper_purpenv_Base
-#  include <iostream>
-#  define LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(x) x
-
-#else
-#  define LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(x)
-
-#endif
-
-
 extern "C" {
 typedef void SAL_CALL EnvFun_P   (uno_Environment *);
 typedef void SAL_CALL EnvFun_PP_P(uno_Environment ** ppHardEnv, uno_Environment *);
@@ -241,7 +227,7 @@ Base::Base(uno_Environment * pEnv, cppu::Enterable * pEnterable)
      m_env_acquireInterface       (pEnv->pExtEnv->acquireInterface),
      m_env_releaseInterface       (pEnv->pExtEnv->releaseInterface)
 {
-    LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(fprintf(stderr, "LIFE: %s -> %p\n", "cppu::helper::purpenv::Base::Base(uno_Environment * pEnv)", this));
+    SAL_INFO("cppu.purpenv", "LIFE: cppu::helper::purpenv::Base::Base(uno_Environment * pEnv) -> " << this);
     OSL_ENSURE(
         rtl_ustr_ascii_compare_WithLength(pEnv->pTypeName->buffer, rtl_str_getLength(UNO_LB_UNO), UNO_LB_UNO)
             == 0,
@@ -267,7 +253,7 @@ Base::Base(uno_Environment * pEnv, cppu::Enterable * pEnterable)
 
 Base::~Base()
 {
-    LOG_LIFECYCLE_cppu_helper_purpenv_Base_emit(fprintf(stderr, "LIFE: %s -> %p\n", "cppu::helper::purpenv::Base::~Base()", this));
+    SAL_INFO("cppu.purpenv", "LIFE: cppu::helper::purpenv::Base::~Base() -> " << this);
 
     m_pEnv->acquire     = m_env_acquire;
     m_pEnv->release     = m_env_release;
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
index 8f46ce7a875a..23c3510a4c9f 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Mapping.cxx
@@ -27,24 +27,8 @@
 #include "uno/dispatcher.h"
 #include "typelib/typedescription.h"
 
-
-#ifdef debug
-# define LOG_LIFECYCLE_cppu_helper_purpenv_Mapping
-#endif
-
-#ifdef LOG_LIFECYCLE_cppu_helper_purpenv_Mapping
-#  include <iostream>
-#  define LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(x) x
-
-#else
-#  define LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(x)
-
-#endif
-
-
 using namespace com::sun::star;
 
-
 class Mapping : public uno_Mapping
 {
     uno::Environment   m_from;
@@ -128,7 +112,7 @@ Mapping::Mapping(uno_Environment                 * pFrom,
       m_probeFun(probeFun),
       m_pContext(pProbeContext)
 {
-    LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo)", this));
+    SAL_INFO("cppu.purpenv", "LIFE: Mapping::Mapping(uno_Environment * pFrom, uno_Environment * pTo -> " << this);
 
     uno_Mapping::acquire      = s_acquire;
     uno_Mapping::release      = s_release;
@@ -137,7 +121,7 @@ Mapping::Mapping(uno_Environment                 * pFrom,
 
 Mapping::~Mapping()
 {
-    LOG_LIFECYCLE_cppu_helper_purpenv_Mapping_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Mapping::~Mapping()", this));
+    SAL_INFO("cppu.purpenv", "LIFE: Mapping:~Mapping() -> " << this);
 }
 
 
diff --git a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
index 0b81cea8130d..ae46da96dcad 100644
--- a/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
+++ b/cppu/source/helper/purpenv/helper_purpenv_Proxy.cxx
@@ -25,21 +25,8 @@
 #include "typelib/typedescription.hxx"
 #include "cppu/EnvDcp.hxx"
 
-
-//#define LOG_LIFECYCLE_Proxy
-#ifdef LOG_LIFECYCLE_Proxy
-#  include <iostream>
-#  define LOG_LIFECYCLE_Proxy_emit(x) x
-
-#else
-#  define LOG_LIFECYCLE_Proxy_emit(x)
-
-#endif
-
-
 using namespace com::sun::star;
 
-
 static bool relatesToInterface(typelib_TypeDescription * pTypeDescr)
 {
     switch (pTypeDescr->eTypeClass)
@@ -222,7 +209,7 @@ Proxy::Proxy(uno::Mapping                  const & to_from,
           m_probeFun     (probeFun),
           m_pProbeContext(pProbeContext)
 {
-    LOG_LIFECYCLE_Proxy_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Proxy::Proxy(<>)", this));
+    SAL_INFO("cppu.purpenv", "LIFE: Proxy::Proxy(<>) -> " << this);
 
     typelib_typedescription_acquire(&m_pTypeDescr->aBase);
     if (!m_pTypeDescr->aBase.bComplete)
@@ -249,7 +236,7 @@ extern "C" { static void s_releaseAndRevoke_v(va_list * pParam)
 
 Proxy::~Proxy()
 {
-    LOG_LIFECYCLE_Proxy_emit(fprintf(stderr, "LIFE: %s -> %p\n", "Proxy::~Proxy()", this));
+    SAL_INFO("cppu.purpenv", "LIFE: Proxy::~Proxy() -> " << this);
 
     uno_Environment_invoke(m_to.get(), s_releaseAndRevoke_v, m_to.get(), m_pUnoI);