diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-03-08 13:48:14 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-03-13 16:50:41 +0100 |
commit | 9a96bb8660de63530fee8cb0c5dace2e1fc28395 (patch) | |
tree | 91daac76eaa3b6c52f1a77847971e9ea49ed1540 | |
parent | 361cfb99621ea60d688b79106340f8c665dbd72b (diff) |
Move DBG_TRACE to OSL_TRACE
-rw-r--r-- | basic/source/runtime/runtime.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/DNoException.cxx | 4 | ||||
-rw-r--r-- | connectivity/source/drivers/dbase/dindexnode.cxx | 4 | ||||
-rw-r--r-- | editeng/source/accessibility/AccessibleEditableTextPara.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appbas.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/appl/appquit.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/control/dispatch.cxx | 10 | ||||
-rw-r--r-- | sfx2/source/dialog/splitwin.cxx | 26 | ||||
-rw-r--r-- | sfx2/source/view/frame2.cxx | 2 | ||||
-rw-r--r-- | svx/source/accessibility/AccessibleTextHelper.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/fmtextcontrolshell.cxx | 8 |
11 files changed, 34 insertions, 34 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index d0babeee3d96..e41059f08d54 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -981,7 +981,7 @@ SbxVariableRef SbiRuntime::PopVar() SbxVariableRef xVar = refExprStk->Get( --nExprLvl ); #ifdef DBG_UTIL if ( xVar->GetName().EqualsAscii( "Cells" ) ) - DBG_TRACE( "" ); + OSL_TRACE( "" ); #endif // Methods halten im 0.Parameter sich selbst, also weghauen if( xVar->IsA( TYPE(SbxMethod) ) ) diff --git a/connectivity/source/drivers/dbase/DNoException.cxx b/connectivity/source/drivers/dbase/DNoException.cxx index aaaa2c508dee..7a0c7af5228f 100644 --- a/connectivity/source/drivers/dbase/DNoException.cxx +++ b/connectivity/source/drivers/dbase/DNoException.cxx @@ -521,7 +521,7 @@ void ONDXPage::PrintPage() OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(rKey.getValue().getString().getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos()); } } - DBG_TRACE("SDB: -----------------------------------------------\n"); + OSL_TRACE("SDB: -----------------------------------------------\n"); if (!IsLeaf()) { #if OSL_DEBUG_LEVEL > 1 @@ -533,7 +533,7 @@ void ONDXPage::PrintPage() } #endif } - DBG_TRACE("SDB: ===============================================\n"); + OSL_TRACE("SDB: ===============================================\n"); } #endif // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index f250e02d6a95..1240253e5f7d 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -918,7 +918,7 @@ void ONDXPage::PrintPage() OSL_TRACE("SDB: [%d,%s,%d]",rKey.GetRecord(), (const char* )ByteString(rKey.getValue().getString().getStr(), rIndex.m_pTable->getConnection()->getTextEncoding()).GetBuffer(),rNode.GetChild().GetPagePos()); } } - DBG_TRACE("SDB: -----------------------------------------------\n"); + OSL_TRACE("SDB: -----------------------------------------------\n"); if (!IsLeaf()) { #if OSL_DEBUG_LEVEL > 1 @@ -930,7 +930,7 @@ void ONDXPage::PrintPage() } #endif } - DBG_TRACE("SDB: ===============================================\n"); + OSL_TRACE("SDB: ===============================================\n"); } #endif // ----------------------------------------------------------------------------- diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx index e7289ffcabf1..6d38fee1e729 100644 --- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx +++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx @@ -897,7 +897,7 @@ namespace accessibility #ifdef DBG_UTIL if( !mxParent.is() ) - DBG_TRACE( "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?"); + OSL_TRACE( "AccessibleEditableTextPara::getAccessibleParent: no frontend set, did somebody forgot to call AccessibleTextHelper::SetEventSource()?"); #endif return mxParent; diff --git a/sfx2/source/appl/appbas.cxx b/sfx2/source/appl/appbas.cxx index 698514444ec7..5ff2f321d371 100644 --- a/sfx2/source/appl/appbas.cxx +++ b/sfx2/source/appl/appbas.cxx @@ -192,7 +192,7 @@ void SfxApplication::EnterBasicCall() { if ( 1 == ++pAppData_Impl->nBasicCallLevel ) { - DBG_TRACE( "SfxShellObject: BASIC-on-demand" ); + OSL_TRACE( "SfxShellObject: BASIC-on-demand" ); // First load the BASIC GetBasic(); diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 4635c8260054..06d1359ea074 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -81,7 +81,7 @@ BOOL SfxApplication::QueryExit_Impl() // Not really exit, only minimize InfoBox aInfoBox( NULL, SfxResId(MSG_CANT_QUIT) ); aInfoBox.Execute(); - DBG_TRACE( "QueryExit => FALSE (in use)" ); + OSL_TRACE( "QueryExit => FALSE (in use)" ); return FALSE; } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 292dc39b4562..f55559f6bf4c 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -507,7 +507,7 @@ void SfxDispatcher::Pop pImp->aToDoStack.Push( SfxToDo_Impl(bPush, bDelete, bUntil, rShell) ); if ( bFlushed ) { - DBG_TRACE("Unflushed dispatcher!"); + OSL_TRACE("Unflushed dispatcher!"); bFlushed = sal_False; pImp->bUpdated = sal_False; @@ -1881,7 +1881,7 @@ void SfxDispatcher::FlushImpl() DBG_MEMTEST(); SFX_STACK(SfxDispatcher::FlushImpl); - DBG_TRACE("Flushing dispatcher!"); + OSL_TRACE("Flushing dispatcher!"); #ifdef DBG_UTIL ByteString aMsg( "SfxDispatcher(" ); @@ -1962,7 +1962,7 @@ void SfxDispatcher::FlushImpl() pImp->bFlushing = sal_False; pImp->bUpdated = sal_False; // not only when bModify, if Doc/Template-Config bFlushed = sal_True; - DBG_TRACE("Successfully flushed dispatcher!"); + OSL_TRACE("Successfully flushed dispatcher!"); // Activate the Shells and possible delete them in the 2nd round for ( nToDo = aToDoCopy.Count()-1; nToDo >= 0; --nToDo ) @@ -2689,9 +2689,9 @@ void SfxDispatcher::DebugOutput_Impl() const DbgGetData()->nTraceOut = DBG_OUT_FILE; if (bFlushed) - DBG_TRACE("Flushed"); + OSL_TRACE("Flushed"); if (pImp->bUpdated) - DBG_TRACE("updated"); + OSL_TRACE("updated"); for ( sal_uInt16 nShell = pImp->aStack.Count(); nShell > 0; --nShell ) { diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index fe1f854d8638..b2c4d3d07346 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -723,7 +723,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, pEmptyWin->bFadeIn = FALSE; SetPinned_Impl( FALSE ); pEmptyWin->Actualize(); - DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChilds_Impl(); if ( bFadeIn ) @@ -737,11 +737,11 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, #ifdef DBG_UTIL if ( !bPinned || !pEmptyWin->bFadeIn ) { - DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); } else { - DBG_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" ); } #endif pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, TRUE )->nVisible = CHILD_VISIBLE; @@ -783,11 +783,11 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, BOOL bHide ) #ifdef DBG_UTIL if ( !bPinned || !pEmptyWin->bFadeIn ) { - DBG_TRACE( "SfxSplitWindow::RemoveWindow - releasing empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::RemoveWindow - releasing empty Splitwindow" ); } else { - DBG_TRACE( "SfxSplitWindow::RemoveWindow - releasing real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::RemoveWindow - releasing real Splitwindow" ); } #endif pWorkWin->ReleaseChild_Impl( *GetSplitWindow() ); @@ -1074,11 +1074,11 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn ) if ( pEmptyWin->bFadeIn ) { // Unregister replacement windows - DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing real Splitwindow" ); pWorkWin->ReleaseChild_Impl( *this ); Hide(); pEmptyWin->Actualize(); - DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" ); pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE; } @@ -1100,10 +1100,10 @@ void SfxSplitWindow::SetPinned_Impl( BOOL bOn ) if ( pEmptyWin->bFadeIn ) { // Unregister replacement windows - DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - releasing empty Splitwindow" ); pWorkWin->ReleaseChild_Impl( *pEmptyWin ); pEmptyWin->Hide(); - DBG_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" ); pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE; } } @@ -1134,10 +1134,10 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn ) } else { - DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing empty Splitwindow" ); pWorkWin->ReleaseChild_Impl( *pEmptyWin ); pEmptyWin->Hide(); - DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" ); pWorkWin->RegisterChild_Impl( *this, eAlign, TRUE )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChilds_Impl(); pWorkWin->ShowChilds_Impl(); @@ -1150,11 +1150,11 @@ void SfxSplitWindow::SetFadeIn_Impl( BOOL bOn ) if ( !IsFloatingMode() ) { // The window is not "floating", should be hidden - DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing real Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - releasing real Splitwindow" ); pWorkWin->ReleaseChild_Impl( *this ); Hide(); pEmptyWin->Actualize(); - DBG_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" ); + OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" ); pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, TRUE )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChilds_Impl(); pWorkWin->ShowChilds_Impl(); diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index e4c3c692d695..f263da6758a4 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -122,7 +122,7 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) { if ( pView->GetViewShell() && !pView->GetViewShell()->GetUIActiveIPClient_Impl() && !pFrame->IsInPlace() ) { - DBG_TRACE("SfxFrame: GotFocus"); + OSL_TRACE("SfxFrame: GotFocus"); pView->MakeActive_Impl( FALSE ); } diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx index b92935e5d0ec..a6638cd33909 100644 --- a/svx/source/accessibility/AccessibleTextHelper.cxx +++ b/svx/source/accessibility/AccessibleTextHelper.cxx @@ -490,12 +490,12 @@ namespace accessibility if( bHaveFocus ) { GotPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED ); - DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" ); + OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object received focus" ); } else { LostPropertyEvent( uno::makeAny(AccessibleStateType::FOCUSED), AccessibleEventId::STATE_CHANGED ); - DBG_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object lost focus" ); + OSL_TRACE("AccessibleTextHelper_Impl::SetShapeFocus(): Parent object lost focus" ); } } } @@ -574,7 +574,7 @@ namespace accessibility // #103998# Not that important, changed from assertion to trace if( mbThisHasFocus ) { - DBG_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); + OSL_TRACE("AccessibleTextHelper_Impl::UpdateSelection(): Parent has focus!"); } USHORT nMaxValidParaIndex( static_cast< USHORT >( GetTextForwarder().GetParagraphCount() ) - 1 ); diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 4f315a4dc714..7111371ce3ea 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -584,7 +584,7 @@ namespace svx { if ( m_bNeedClipboardInvalidation ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: invalidating clipboard slots" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: invalidating clipboard slots" ); m_rBindings.Invalidate( SID_CUT ); m_rBindings.Invalidate( SID_COPY ); m_rBindings.Invalidate( SID_PASTE ); @@ -993,7 +993,7 @@ namespace svx bNeedSelection = true; bNeedTextComponent = true; bNeedWriteableControl = true; - DBG_TRACE( "FmTextControlShell::ClipBoard: need to invalidate again" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: need to invalidate again" ); m_bNeedClipboardInvalidation = true; break; @@ -1193,7 +1193,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: stopping timer for clipboard invalidation" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: stopping timer for clipboard invalidation" ); m_aClipboardInvalidation.Stop(); } // no more active control @@ -1258,7 +1258,7 @@ namespace svx if ( m_xActiveTextComponent.is() ) { - DBG_TRACE( "FmTextControlShell::ClipBoard: starting timer for clipboard invalidation" ); + OSL_TRACE( "FmTextControlShell::ClipBoard: starting timer for clipboard invalidation" ); m_aClipboardInvalidation.Start(); } |