[Libreoffice-commits] core.git: 2 commits - sfx2/source

[Michael Stahl]

 sfx2/source/bastyp/fltfnc.cxx |    2 +-
 sfx2/source/inc/sfxtypes.hxx  |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1e1de355713d1035e172f2a3cd299fd3a1154130
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 27 13:53:43 2014 +0100

    sfx2: why is this debug stuff WNT-only?
    
    Change-Id: I8768ebc523b03a469f8b9bb49e015ca7d140fc96

diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index f86c1da..7f810df 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -103,7 +103,7 @@
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <functional>
 
-#if defined(DBG_UTIL) && defined(WNT)
+#if defined(DBG_UTIL)
 unsigned SfxStack::nLevel = 0;
 #endif
 
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index b62167f..22d199b 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -82,7 +82,7 @@ struct _Capper
 
 
 
-#if defined(DBG_UTIL) && defined(WNT)
+#if defined(DBG_UTIL)
 
 class SfxStack
 {
commit 65391bdefa1ec634f6de8a70d07b26b35c14fa65
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Mar 27 13:48:55 2014 +0100

    sfx2: s/SAL_LOG/SAL_INFO/ in WNT-only code
    
    Change-Id: I0e7c241e0ee9c7d2ace75d8a935ee068da80fb6d

diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index bcefe93..b62167f 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -92,11 +92,11 @@ public:
     SfxStack( const char *pName )
     {
         ++nLevel;
-        SAL_LOG("sfx", "STACK: enter " << nLevel << " " << pName);
+        SAL_INFO("sfx.control", "STACK: enter " << nLevel << " " << pName);
     }
     ~SfxStack()
     {
-        SAL_LOG("sfx", "STACK: leave " << nLevel);
+        SAL_INFO("sfx.control", "STACK: leave " << nLevel);
         --nLevel;
     }
 };