[Libreoffice-commits] core.git: include/sal include/vcl

[Rohan Kumar]

 include/sal/log-areas.dox  |    1 +
 include/vcl/lazydelete.hxx |   17 +++--------------
 2 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit c829898453d75c0f13ff589b7f8adf8fb062a39f
Author: Rohan Kumar <rohankanojia...@gmail.com>
Date:   Thu Apr 7 13:56:53 2016 +0530

    tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals
    
    I disentangled my previous patch and converted fprintf statements to
    SAL_INFOs
    
    Change-Id: I4b993e00f82bdf904586ab5e7c954c4ee3ff1bac
    Reviewed-on: https://gerrit.libreoffice.org/22925
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michael...@canonical.com>

diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e76e948..ec874bc 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -429,6 +429,7 @@ certain functionality.
 @li @c vcl.kde - KDE
 @li @c vcl.kde4 - KDE4
 @li @c vcl.layout - Widget layout
+@li @c vcl.lazydelete
 @li @c vcl.pdfwriter
 @li @c vcl.plugadapt - the Unix/X11 backend plugin mechanism
 @li @c vcl.opengl
diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx
index 1f1235d..0c2840f 100644
--- a/include/vcl/lazydelete.hxx
+++ b/include/vcl/lazydelete.hxx
@@ -28,10 +28,7 @@
 #include <vector>
 #include <algorithm>
 
-#if OSL_DEBUG_LEVEL > 2
 #include <typeinfo>
-#include <stdio.h>
-#endif
 
 #include <com/sun/star/lang/XComponent.hpp>
 
@@ -128,10 +125,7 @@ namespace vcl
         LazyDeletor()  { LazyDelete::addDeletor( this ); }
         virtual ~LazyDeletor()
         {
-            #if OSL_DEBUG_LEVEL > 2
-            fprintf( stderr, "%s %p deleted\n",
-                     typeid(*this).name(), this );
-            #endif
+            SAL_INFO("vcl.lazydelete", typeid(*this).name() << std::hex << 
this << " deleted");
             if( s_pOneInstance == this ) // sanity check
                 s_pOneInstance = nullptr;
 
@@ -151,12 +145,8 @@ namespace vcl
             nCount = aRealDelete.size();
             for( unsigned int n = 0; n < nCount; n++ )
             {
-                #if OSL_DEBUG_LEVEL > 2
-                fprintf( stderr, "%s deletes object %p of type %s\n",
-                         typeid(*this).name(),
-                         aRealDelete[n],
-                         typeid(*aRealDelete[n]).name() );
-                #endif
+                SAL_INFO("vcl.lazydelete", typeid(*this).name() << " deletes 
object " << aRealDelete[n] << " of type "
+                         << typeid(*aRealDelete[n]).name());
                 // check if the object to be deleted is not already destroyed
                 // as a side effect of a previous lazily destroyed object
                 if( ! m_aObjects[ m_aPtrToIndex[ 
reinterpret_cast<sal_IntPtr>(aRealDelete[n].get()) ] ].m_bDeleted )
@@ -296,5 +286,4 @@ namespace vcl
 }
 
 #endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits