diff options
| -rw-r--r-- | chart2/source/inc/macros.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/main/ChartModel_Persistence.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/ChartTypeManager.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/DataInterpreter.cxx | 11 | ||||
| -rw-r--r-- | chart2/source/tools/InternalData.cxx | 1 |
5 files changed, 8 insertions, 10 deletions
diff --git a/chart2/source/inc/macros.hxx b/chart2/source/inc/macros.hxx index e7554c755fec..1e5bc9ec509a 100644 --- a/chart2/source/inc/macros.hxx +++ b/chart2/source/inc/macros.hxx @@ -36,8 +36,6 @@ #define ASSERT_EXCEPTION(ex) (void)(ex) #endif -#define U2C(ouString) (OUStringToOString(ouString,RTL_TEXTENCODING_ASCII_US).getStr()) - // CHART_MACROS_HXX #endif diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index f2b5e702dacf..2bc5cde61bf1 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -173,7 +173,7 @@ Reference< document::XFilter > ChartModel::impl_createFilter( xFilter.set( m_xContext->getServiceManager()->createInstanceWithContext( aFilterServiceName, m_xContext ), uno::UNO_QUERY_THROW ); - OSL_TRACE( "Filter found for service %s", U2C( aFilterServiceName )); + SAL_WARN("chart2", "Filter found for service " << aFilterServiceName ); } } } diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 25aba04d05c1..c72abbe06993 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -257,7 +257,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // createInstance is called with an unknown service-name, this // function will just return an empty XInterface. ASSERT_EXCEPTION( ex ); - OSL_TRACE( "Couldn't instantiate service \"%s\"", U2C( aServiceSpecifier )); + SAL_WARN("chart2", "Couldn't instantiate service: "<< aServiceSpecifier ); xResult.set( 0 ); } } diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 613570f164b9..696e2a1b1c99 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -410,7 +410,7 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) if( ! xSource.is()) return; - OSL_TRACE( "DataSource in DataInterpreter:" ); + SAL_INFO("chart2", "DataSource in DataInterpreter:" ); Sequence< Reference< data::XLabeledDataSequence > > aSequences( xSource->getDataSequences()); Reference< beans::XPropertySet > xProp; OUString aId; @@ -426,11 +426,11 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) if( xProp.is() && ( xProp->getPropertyValue( "Role") >>= aId )) { - OSL_TRACE( " <data sequence %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); + SAL_INFO("chart2", " <data sequence " << k << "> Role: " << aId << ", Source: "<< aSourceRepr); } else { - OSL_TRACE( " <data sequence %d> unknown Role, Source: %s", k, U2C( aSourceRepr ) ); + SAL_INFO("chart2", " <data sequence " << k << "> unknown Role, Source: " << aSourceRepr ); } aSourceRepr = "<none>"; @@ -440,11 +440,12 @@ void lcl_ShowDataSource( const Reference< data::XDataSource > & xSource ) if( xProp.is() && ( xProp->getPropertyValue( "Role") >>= aId )) { - OSL_TRACE( " <data sequence label %d> Role: %s, Source: %s", k, U2C( aId ), U2C( aSourceRepr )); + SAL_INFO("chart2", " <data sequence label " << k << "> Role: " << aId + << ", Source: " << aSourceRepr ); } else { - OSL_TRACE( " <data sequence label %d> unknown Role, Source: %s", k, U2C( aSourceRepr ) ); + SAL_INFO("chart2", " <data sequence label " << k << "> unknown Role, Source: " << aSourceRepr ); } } } diff --git a/chart2/source/tools/InternalData.cxx b/chart2/source/tools/InternalData.cxx index c7458c75e463..e8d4def8f24d 100644 --- a/chart2/source/tools/InternalData.cxx +++ b/chart2/source/tools/InternalData.cxx @@ -21,7 +21,6 @@ #include "InternalData.hxx" #include "ResId.hxx" #include "Strings.hrc" -#include "macros.hxx" #include <rtl/math.hxx> #include <algorithm> |