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

[Michael Stahl]

 sfx2/source/control/dispatch.cxx |    4 ----
 sfx2/source/inc/sfxtypes.hxx     |    9 ---------
 sfx2/source/menu/mnuitem.cxx     |    4 +++-
 3 files changed, 3 insertions(+), 14 deletions(-)

New commits:
commit 3108a3dd38f5e5aac3a46e6f5caf3b2e5ab5b202
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jul 24 14:09:53 2014 +0200

    sfx2: remove another DBG macro that arose from the grave
    
    The callers in dispatch.cxx use methods that were removed by commit
    a1ce4fb4f0dbc3c4141f510e5b2b732a24d862c8 - not sure if this warning is
    useful or not.
    
    Change-Id: I8bb654de8e26c054318dd2037055a85d013c8bfa

diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index f7a83c1..115c627 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1249,14 +1249,10 @@ IMPL_LINK( SfxDispatcher, PostMsgHandler, SfxRequest*, pReq )
                 const SfxSlot *pSlot = aSvr.GetSlot();
                 SfxShell *pSh = GetShell(aSvr.GetShellLevel());
 
-                DBG( SfxApplication *pSfxApp = SfxGetpApp() );
-                DBG( pSfxApp->EnterAsynchronCall_Impl() );
-
                 // When the pSlot is a "Pseudoslot" for macros or Verbs, it can
                 // be destroyed in the Call_Impl, thus do not use it anymore!
                 pReq->SetSynchronCall( false );
                 Call_Impl( *pSh, *pSlot, *pReq, pReq->AllowsRecording() ); //! why bRecord?
-                DBG( pSfxApp->LeaveAsynchronCall_Impl() );
             }
         }
         else
diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx
index 680a454..3a7974c 100644
--- a/sfx2/source/inc/sfxtypes.hxx
+++ b/sfx2/source/inc/sfxtypes.hxx
@@ -41,15 +41,6 @@
 #endif
 #endif
 
-#ifndef DBG
-#ifdef DBG_UTIL
-#define DBG(statement) statement
-#else
-#define DBG(statement)
-#endif
-#endif
-
-
 
 #if defined(DBG_UTIL)
 
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index 3ce93a9..ebe6439 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -84,7 +84,9 @@ void SfxMenuControl::Bind(
     else
         SetId( nSlotId );
 
-    DBG( CheckConfigure_Impl(SFX_SLOT_MENUCONFIG) );
+#ifdef DBG_UTIL
+    CheckConfigure_Impl(SFX_SLOT_MENUCONFIG);
+#endif
 }