From 4ef9ccea6c4aa79cdc57dea52b47775c346696ec Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 9 Dec 2016 15:48:38 +0200 Subject: OSL_TRACE -> SAL in sfx2..svx Change-Id: I78cf8058a5682baa3d7b00a25feeb2d28fb3e66e Reviewed-on: https://gerrit.libreoffice.org/31799 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- svtools/source/brwbox/brwbox1.cxx | 32 +++++++++++++++--------------- svtools/source/brwbox/brwbox2.cxx | 2 +- svtools/source/control/valueacc.cxx | 2 +- svtools/source/control/valueset.cxx | 4 ++-- svtools/source/misc/filechangedchecker.cxx | 4 ++-- 5 files changed, 22 insertions(+), 22 deletions(-) (limited to 'svtools') diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 8a7b1fac54a7..e78e654684ae 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -59,7 +59,7 @@ namespace void BrowseBox::ConstructImpl( BrowserMode nMode ) { - OSL_TRACE( "BrowseBox: %p->ConstructImpl", this ); + SAL_INFO("svtools", "BrowseBox:ConstructImpl " << this ); bMultiSelection = false; pColSel = nullptr; pDataWin = nullptr; @@ -126,7 +126,7 @@ BrowseBox::~BrowseBox() void BrowseBox::dispose() { - OSL_TRACE( "BrowseBox: %p~", this ); + SAL_INFO("svtools", "BrowseBox:dispose " << this ); if ( m_pImpl->m_pAccessible ) { @@ -306,7 +306,7 @@ void BrowseBox::SetToggledSelectedColumn(sal_uInt16 _nSelectedColumnId) { pColSel->Select( GetColumnPos( _nSelectedColumnId ) ); ToggleSelection(); - OSL_TRACE( "BrowseBox: %p->SetToggledSelectedColumn", this ); + SAL_INFO("svtools", "BrowseBox::SetToggledSelectedColumn " << this ); DoShowCursor( "SetToggledSelectedColumn" ); } } @@ -1244,7 +1244,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) if ( bDoPaint ) { // hide cursor and selection - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); ToggleSelection(); DoHideCursor( "RowRemoved" ); } @@ -1323,7 +1323,7 @@ void BrowseBox::RowRemoved( long nRow, long nNumRows, bool bDoPaint ) { // reshow cursor and selection ToggleSelection(); - OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); + SAL_INFO("svtools", "BrowseBox::ShowCursor " << this ); DoShowCursor( "RowRemoved" ); // adjust the vertical scrollbar @@ -1595,7 +1595,7 @@ void BrowseBox::SetNoSelection() // nothing to do return; - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); ToggleSelection(); // unselect all @@ -1611,7 +1611,7 @@ void BrowseBox::SetNoSelection() bSelect = true; // restore screen - OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); + SAL_INFO("svtools", "BrowseBox::ShowCursor " << this ); if ( isAccessibleAlive() ) { @@ -1630,7 +1630,7 @@ void BrowseBox::SelectAll() if ( !bMultiSelection ) return; - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); ToggleSelection(); // select all rows @@ -1663,7 +1663,7 @@ void BrowseBox::SelectAll() bSelect = true; // restore screen - OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); + SAL_INFO("svtools", "BrowseBox::ShowCursor " << this ); if ( isAccessibleAlive() ) { @@ -1700,7 +1700,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) return; } - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); // remove old selection? if ( !bExpand || !bMultiSelection ) @@ -1742,7 +1742,7 @@ void BrowseBox::SelectRow( long nRow, bool _bSelect, bool bExpand ) bSelect = true; // restore screen - OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); + SAL_INFO("svtools", "BrowseBox::ShowCursor " << this ); if ( isAccessibleAlive() ) { @@ -1787,7 +1787,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak return; } - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); ToggleSelection(); if ( bMultiSelection ) uRow.pSel->SelectAll(false); @@ -1829,7 +1829,7 @@ void BrowseBox::SelectColumnPos( sal_uInt16 nNewColPos, bool _bSelect, bool bMak } // restore screen - OSL_TRACE( "BrowseBox: %p->ShowCursor", this ); + SAL_INFO("svtools", "BrowseBox::ShowCursor " << this ); } @@ -2338,11 +2338,11 @@ void BrowseBox::CursorMoved() void BrowseBox::LoseFocus() { - OSL_TRACE( "BrowseBox: %p->LoseFocus", this ); + SAL_INFO("svtools", "BrowseBox::LoseFocus " << this ); if ( bHasFocus ) { - OSL_TRACE( "BrowseBox: %p->HideCursor", this ); + SAL_INFO("svtools", "BrowseBox::HideCursor " << this ); DoHideCursor( "LoseFocus" ); if ( !bKeepHighlight ) @@ -2359,7 +2359,7 @@ void BrowseBox::LoseFocus() void BrowseBox::GetFocus() { - OSL_TRACE( "BrowseBox: %p->GetFocus", this ); + SAL_INFO("svtools", "BrowseBox::GetFocus " << this ); if ( !bHasFocus ) { diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx index 6d2e62e590f9..59c2951f9c8b 100644 --- a/svtools/source/brwbox/brwbox2.cxx +++ b/svtools/source/brwbox/brwbox2.cxx @@ -1379,7 +1379,7 @@ void BrowseBox::MouseButtonDown( const MouseEvent& rEvt ) void BrowseBox::MouseMove( const MouseEvent& rEvt ) { - OSL_TRACE( "BrowseBox::MouseMove( MouseEvent )" ); + SAL_INFO("svtools", "BrowseBox::MouseMove( MouseEvent )" ); Pointer aNewPointer; diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx index a23474cb7447..74b955e3b9d9 100644 --- a/svtools/source/control/valueacc.cxx +++ b/svtools/source/control/valueacc.cxx @@ -693,7 +693,7 @@ void ValueSetAcc::ThrowIfDisposed() { if (rBHelper.bDisposed || rBHelper.bInDispose) { - OSL_TRACE ("Calling disposed object. Throwing exception:"); + SAL_WARN("svx", "Calling disposed object. Throwing exception:"); throw lang::DisposedException ( OUString("object has been already disposed"), static_cast(this)); diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index b2759900a549..a5e76491a3a1 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -1436,7 +1436,7 @@ void ValueSet::Paint(vcl::RenderContext& rRenderContext, const Rectangle&) void ValueSet::GetFocus() { - OSL_TRACE ("value set getting focus"); + SAL_INFO("svtools", "value set getting focus"); Invalidate(); Control::GetFocus(); @@ -1448,7 +1448,7 @@ void ValueSet::GetFocus() void ValueSet::LoseFocus() { - OSL_TRACE ("value set losing focus"); + SAL_INFO("svtools", "value set losing focus"); if ( mbNoSelection && mnSelItemId ) ImplHideSelect( mnSelItemId ); else diff --git a/svtools/source/misc/filechangedchecker.cxx b/svtools/source/misc/filechangedchecker.cxx index c2ac214ebb47..e0ebfd6d10ff 100644 --- a/svtools/source/misc/filechangedchecker.cxx +++ b/svtools/source/misc/filechangedchecker.cxx @@ -79,10 +79,10 @@ bool FileChangedChecker::hasFileChanged() IMPL_LINK_NOARG(FileChangedChecker, TimerHandler, Idle *, void) { // If the file has changed, then update the graphic in the doc - OSL_TRACE("Timeout Called"); + SAL_INFO("svtools", "Timeout Called"); if(hasFileChanged()) { - OSL_TRACE("File modified"); + SAL_INFO("svtools", "File modified"); mpCallback(); } -- cgit