Remove legacy DBG_PROFSART/STOP calls

...probably better done with callgrind, if still relevant at all.

Change-Id: I15069df4e2f271b0c240231f35af2e664a02c296

3 files changed, 0 insertions, 75 deletions

diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx
index 9954f9ec1a77..037e06c01437 100644
--- a/sfx2/source/control/bindings.cxx
+++ b/sfx2/source/control/bindings.cxx
@@ -71,18 +71,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
-DBG_NAME(SfxBindingsMsgPos)
-DBG_NAME(SfxBindingsUpdateServers)
-DBG_NAME(SfxBindingsCreateSet)
-DBG_NAME(SfxBindingsUpdateCtrl1)
-DBG_NAME(SfxBindingsUpdateCtrl2)
-DBG_NAME(SfxBindingsNextJob_Impl0)
-DBG_NAME(SfxBindingsNextJob_Impl)
-DBG_NAME(SfxBindingsUpdate_Impl)
-DBG_NAME(SfxBindingsInvalidateAll)
-
-
-
 static sal_uInt16 nTimeOut = 300;
 
 #define TIMEOUT_FIRST       nTimeOut
@@ -392,7 +380,6 @@ void SfxBindings::Update_Impl
 
     if ( !pDispatcher )
         return;
-    DBG_PROFSTART(SfxBindingsUpdate_Impl);
 
     // gather together all with the same status method which are dirty
     SfxDispatcher &rDispat = *pDispatcher;
@@ -435,8 +422,6 @@ void SfxBindings::Update_Impl
                             pRealSlot, pCache );
         UpdateControllers_Impl( 0, &aFoundCache, 0, SFX_ITEM_DISABLED);
     }
-
-    DBG_PROFSTOP(SfxBindingsUpdate_Impl);
 }
 
 
@@ -676,7 +661,6 @@ void SfxBindings::InvalidateAll
                        false  Slot Server remains valid */
 )
 {
-    DBG_PROFSTART(SfxBindingsInvalidateAll);
     DBG_ASSERT( !pImp->bInUpdate, "SfxBindings::Invalidate while in update" );
 
     if ( pImp->pSubBindings )
@@ -687,7 +671,6 @@ void SfxBindings::InvalidateAll
          ( pImp->bAllDirty && ( !bWithMsg || pImp->bAllMsgDirty ) ) ||
          SFX_APP()->IsDowning() )
     {
-        DBG_PROFSTOP(SfxBindingsInvalidateAll);
         return;
     }
 
@@ -705,8 +688,6 @@ void SfxBindings::InvalidateAll
         pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
         pImp->aTimer.Start();
     }
-
-    DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
 
@@ -717,8 +698,6 @@ void SfxBindings::Invalidate
                               slot IDs (individual, not as a couple!) */
 )
 {
-    DBG_PROFSTART(SfxBindingsInvalidateAll);
-
     if ( pImp->bInUpdate )
     {
         sal_Int32 i = 0;
@@ -761,8 +740,6 @@ void SfxBindings::Invalidate
         pImp->aTimer.SetTimeout(TIMEOUT_FIRST);
         pImp->aTimer.Start();
     }
-
-    DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
 
@@ -788,8 +765,6 @@ void SfxBindings::InvalidateShell
     if ( !pDispatcher || pImp->bAllDirty || SFX_APP()->IsDowning() )
         return;
 
-    DBG_PROFSTART(SfxBindingsInvalidateAll);
-
     // flush now already, it is done in GetShellLevel (rsh) anyway,
     // important so that is set correctly: pimp-> ball(Msg)Dirty
     pDispatcher->Flush();
@@ -824,8 +799,6 @@ void SfxBindings::InvalidateShell
             pImp->nFirstShell = nLevel;
         }
     }
-
-    DBG_PROFSTOP(SfxBindingsInvalidateAll);
 }
 
 
@@ -913,13 +886,11 @@ bool SfxBindings::IsBound( sal_uInt16 nSlotId, sal_uInt16 nStartSearchAt )
 sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
 {
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
-    DBG_PROFSTART(SfxBindingsMsgPos);
 
     // answer immediately if a function-seek comes repeated
     if ( pImp->nCachedFunc1 < pImp->pCaches->size() &&
          (*pImp->pCaches)[pImp->nCachedFunc1]->GetId() == nId )
     {
-        DBG_PROFSTOP(SfxBindingsMsgPos);
         return pImp->nCachedFunc1;
     }
     if ( pImp->nCachedFunc2 < pImp->pCaches->size() &&
@@ -929,19 +900,16 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
         sal_uInt16 nTemp = pImp->nCachedFunc1;
         pImp->nCachedFunc1 = pImp->nCachedFunc2;
         pImp->nCachedFunc2 = nTemp;
-        DBG_PROFSTOP(SfxBindingsMsgPos);
         return pImp->nCachedFunc1;
     }
 
     // binary search, if not found, seek to target-position
     if ( pImp->pCaches->size() <= nStartSearchAt )
     {
-        DBG_PROFSTOP(SfxBindingsMsgPos);
         return 0;
     }
     if ( (sal_uInt16) pImp->pCaches->size() == (nStartSearchAt+1) )
     {
-        DBG_PROFSTOP(SfxBindingsMsgPos);
         return (*pImp->pCaches)[nStartSearchAt]->GetId() >= nId ? 0 : 1;
     }
     sal_uInt16 nLow = nStartSearchAt;
@@ -977,7 +945,6 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt )
                 nId < (*pImp->pCaches)[nPos+1]->GetId(), "" );
     pImp->nCachedFunc2 = pImp->nCachedFunc1;
     pImp->nCachedFunc1 = nPos;
-    DBG_PROFSTOP(SfxBindingsMsgPos);
     return nPos;
 }
 
@@ -1297,7 +1264,6 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell
 
 void SfxBindings::UpdateSlotServer_Impl()
 {
-    DBG_PROFSTART(SfxBindingsUpdateServers);
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
     // synchronize
@@ -1324,8 +1290,6 @@ void SfxBindings::UpdateSlotServer_Impl()
     pImp->bMsgDirty = pImp->bAllMsgDirty = sal_False;
 
     Broadcast( SfxSimpleHint(SFX_HINT_DOCCHANGED) );
-
-    DBG_PROFSTOP(SfxBindingsUpdateServers);
 }
 
 
@@ -1346,7 +1310,6 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     if(!pMsgSvr || !pDispatcher)
         return 0;
 
-    DBG_PROFSTART(SfxBindingsCreateSet);
     pRealSlot = 0;
     *pMsgServer = pMsgSvr;
 
@@ -1466,7 +1429,6 @@ SfxItemSet* SfxBindings::CreateSet_Impl
     pRanges[j] = 0; // terminating NULL
     SfxItemSet *pSet = new SfxItemSet(rPool, pRanges.get());
     pRanges.reset();
-    DBG_PROFSTOP(SfxBindingsCreateSet);
     return pSet;
 }
 
@@ -1482,7 +1444,6 @@ void SfxBindings::UpdateControllers_Impl
 {
     DBG_ASSERT( !pFound->pSlot || SFX_KIND_ENUM != pFound->pSlot->GetKind(),
                 "direct update of enum slot isn't allowed" );
-    DBG_PROFSTART(SfxBindingsUpdateCtrl1);
 
     SfxStateCache* pCache = pFound->pCache;
     const SfxSlot* pSlot = pFound->pSlot;
@@ -1509,11 +1470,8 @@ void SfxBindings::UpdateControllers_Impl
             pCache->SetState(SFX_ITEM_AVAILABLE, pItem);
     }
 
-    DBG_PROFSTOP(SfxBindingsUpdateCtrl1);
-
     // Update the slots for so far available and bound Controllers for
     // Slave-Slots (Enum-value)
-    DBG_PROFSTART(SfxBindingsUpdateCtrl2);
     DBG_ASSERT( !pSlot || 0 == pSlot->GetLinkedSlot() || !pItem ||
                 pItem->ISA(SfxEnumItemInterface),
                 "master slot with non-enum-type found" );
@@ -1576,8 +1534,6 @@ void SfxBindings::UpdateControllers_Impl
                 break;
         }
     }
-
-    DBG_PROFSTOP(SfxBindingsUpdateCtrl2);
 }
 
 
@@ -1595,8 +1551,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 
     DBG_ASSERT( pImp->pCaches != 0, "SfxBindings not initialized" );
 
-    DBG_PROFSTART(SfxBindingsNextJob_Impl0);
-
     if ( Application::GetLastInputInterval() < MAX_INPUT_DELAY && pTimer )
     {
         pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
@@ -1612,12 +1566,10 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     SfxViewFrame* pFrame = pDispatcher ? pDispatcher->GetFrame() : NULL;
     if ( (pFrame && !pFrame->GetObjectShell()->AcceptStateUpdate()) || pSfxApp->IsDowning() || pImp->pCaches->empty() )
     {
-        DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
         return sal_True;
     }
     if ( !pDispatcher || !pDispatcher->IsFlushed() )
     {
-        DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
         return sal_True;
     }
 
@@ -1625,12 +1577,9 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     if ( pImp->bMsgDirty )
     {
         UpdateSlotServer_Impl();
-        DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
         return sal_False;
     }
 
-    DBG_PROFSTOP(SfxBindingsNextJob_Impl0);
-    DBG_PROFSTART(SfxBindingsNextJob_Impl);
     pImp->bAllDirty = sal_False;
     pImp->aTimer.SetTimeout(TIMEOUT_UPDATING);
 
@@ -1672,7 +1621,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
 
             if ( bWasDirty && !bJobDone && bPreEmptive && (--nLoops == 0) )
             {
-                DBG_PROFSTOP(SfxBindingsNextJob_Impl);
                 pImp->bInNextJob = sal_False;
                 return sal_False;
             }
@@ -1702,7 +1650,6 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer )
     // Update round is finished
     pImp->bInNextJob = sal_False;
     Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE));
-    DBG_PROFSTOP(SfxBindingsNextJob_Impl);
     return sal_True;
 #ifdef DBG_UTIL
     }
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index 1f8da2e8e8a0..691166c65108 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -64,9 +64,6 @@
 #include <slotserv.hxx>
 #include <workwin.hxx>
 
-DBG_NAME(SfxDispatcherFlush)
-DBG_NAME(SfxDispatcherFillState)
-
 typedef std::vector<SfxShell*> SfxShellStack_Impl;
 
 typedef std::vector<SfxRequest*> SfxRequestPtrArray;
@@ -1601,7 +1598,6 @@ void SfxDispatcher::FlushImpl()
 */
 
 {
-    DBG_PROFSTART(SfxDispatcherFlush);
     SFX_STACK(SfxDispatcher::FlushImpl);
 
     OSL_TRACE("Flushing dispatcher!");
@@ -1615,7 +1611,6 @@ void SfxDispatcher::FlushImpl()
     if ( !pImp->bFlushing )
     {
         pImp->bFlushing = true;
-        DBG_PROFSTOP(SfxDispatcherFlush);
         return;
     }
 
@@ -1734,7 +1729,6 @@ void SfxDispatcher::FlushImpl()
 
     if( bAwakeBindings && GetBindings() )
         GetBindings()->DLEAVEREGISTRATIONS();
-    DBG_PROFSTOP(SfxDispatcherFlush);
 
     for (sal_uInt16 n=0; n<SFX_OBJECTBAR_MAX; n++)
         pImp->aFixedObjBars[n].nResId = 0;
@@ -2068,13 +2062,10 @@ bool SfxDispatcher::_FillState
 {
     SFX_STACK(SfxDispatcher::_FillState);
 
-    DBG_PROFSTART(SfxDispatcherFillState);
-
     const SfxSlot *pSlot = rSvr.GetSlot();
     if ( pSlot && IsLocked( pSlot->GetSlotId() ) )
     {
         pImp->bInvalidateOnUnlock = true;
-        DBG_PROFSTOP(SfxDispatcherFillState);
         return false;
     }
 
@@ -2120,11 +2111,9 @@ bool SfxDispatcher::_FillState
         }
 #endif
 
-        DBG_PROFSTOP(SfxDispatcherFillState);
         return true;
     }
 
-    DBG_PROFSTOP(SfxDispatcherFillState);
     return false;
 }
 
diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx
index 82203b286a29..b7efaed04c36 100644
--- a/sfx2/source/control/statcach.cxx
+++ b/sfx2/source/control/statcach.cxx
@@ -53,12 +53,6 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
-
-
-DBG_NAME(SfxStateCache)
-DBG_NAME(SfxStateCacheSetState)
-
-
 BindDispatch_Impl::BindDispatch_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > & rDisp, const ::com::sun::star::util::URL& rURL, SfxStateCache *pStateCache, const SfxSlot* pS )
     : xDisp( rDisp )
     , aURL( rURL )
@@ -412,7 +406,6 @@ void SfxStateCache::SetState_Impl
 
     DBG_ASSERT( bMaybeDirty || !bSlotDirty, "setting state of dirty message" );
     DBG_ASSERT( SfxControllerItem::GetItemState(pState) == eState, "invalid SfxItemState" );
-    DBG_PROFSTART(SfxStateCacheSetState);
 
     // does the controller have to be notified at all?
     bool bNotify = bItemDirty;
@@ -454,7 +447,6 @@ void SfxStateCache::SetState_Impl
     }
 
     bCtrlDirty = sal_False;
-    DBG_PROFSTOP(SfxStateCacheSetState);
 }
 
 
@@ -464,7 +456,6 @@ void SfxStateCache::SetState_Impl
 void SfxStateCache::SetCachedState( sal_Bool bAlways )
 {
     DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache with wrong ControllerItem" );
-    DBG_PROFSTART(SfxStateCacheSetState);
 
     // Only update if cached item exists and also able to process.
     // (If the State is sent, it must be ensured that a SlotServer is present,
@@ -486,8 +477,6 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways )
         // Controller is now ok
         bCtrlDirty = sal_True;
     }
-
-    DBG_PROFSTOP(SfxStateCacheSetState);
 }