OSL_TRACE->SAL in chart2..oox

Change-Id: I133a6441824bfbefcfcda130119b5c5d706f86b2
Reviewed-on: https://gerrit.libreoffice.org/31907
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>

4 files changed, 3 insertions, 11 deletions

diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 40f854d9ef75..14aed53385df 100644
--- a/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -104,7 +104,6 @@ void DataEditor::dispose()
     SvtMiscOptions aMiscOptions;
     aMiscOptions.RemoveListenerLink( LINK( this, DataEditor, MiscHdl ) );
 
-    OSL_TRACE( "DataEditor: DTOR" );
     m_pTbxData.clear();
     m_xBrwData.disposeAndClear();
     ModalDialog::dispose();
diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index b9f59a9fbe70..9a4dfe2a115c 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -112,8 +112,6 @@ ChartModel::ChartModel(uno::Reference<uno::XComponentContext > const & xContext)
     ,bSet(false)
     , mpOpenGLWindow(nullptr)
 {
-    OSL_TRACE( "ChartModel: CTOR called" );
-
     osl_atomic_increment(&m_refCount);
     {
         m_xOldModelAgg.set(
@@ -158,8 +156,6 @@ ChartModel::ChartModel( const ChartModel & rOther )
     , bSet(false)
     , mpOpenGLWindow(nullptr)
 {
-    OSL_TRACE( "ChartModel: Copy-CTOR called" );
-
     osl_atomic_increment(&m_refCount);
     {
         m_xOldModelAgg.set(
@@ -195,7 +191,6 @@ ChartModel::ChartModel( const ChartModel & rOther )
 
 ChartModel::~ChartModel()
 {
-    OSL_TRACE( "ChartModel: DTOR called" );
     if( m_xOldModelAgg.is())
         m_xOldModelAgg->setDelegator( nullptr );
 }
@@ -455,7 +450,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::
         return; //behave passive if already disposed or closed or throw exception @todo?
     if( m_nControllerLockCount == 0 )
     {
-        OSL_TRACE( "ChartModel: unlockControllers called with m_nControllerLockCount == 0" );
+        SAL_WARN("chart2",  "ChartModel: unlockControllers called with m_nControllerLockCount == 0" );
         return;
     }
     --m_nControllerLockCount;
@@ -579,8 +574,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception)
 
     if( m_xOldModelAgg.is())
         m_xOldModelAgg->setDelegator( nullptr );
-
-    OSL_TRACE( "ChartModel: dispose() called" );
 }
 
 void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener )
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 19e3e7636c53..b2eb99f87453 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -189,7 +189,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter(
     // fall-back: create XML-Filter
     if( ! xFilter.is())
     {
-        OSL_TRACE( "No FilterName passed in MediaDescriptor" );
+        SAL_WARN("chart2", "No FilterName passed in MediaDescriptor" );
         xFilter.set(
             m_xContext->getServiceManager()->createInstanceWithContext(
                 "com.sun.star.comp.chart2.XMLFilter", m_xContext ),
diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx
index 76810ce2cff1..2dbb9ba7ece2 100644
--- a/chart2/source/tools/LifeTime.cxx
+++ b/chart2/source/tools/LifeTime.cxx
@@ -118,7 +118,7 @@ bool LifeTimeManager::dispose()
 
         if( m_bDisposed || m_bInDispose )
         {
-            OSL_TRACE( "This component is already disposed " );
+            SAL_WARN("chart2",  "This component is already disposed " );
             return false; //behave passive if already disposed
         }