summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-04 23:37:06 +0200
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-06-07 04:48:16 +0200
commit439550c9f1c848023b4b95266f9d78671c468ee3 (patch)
tree5f6f7aea44a0aafff08113c27a15373205fcc6cd
parent044be7107a97169e80360c79a9d07bec263ac818 (diff)
remove unnecessary and unused chart debug functionality
Change-Id: Ic8100b2afebe469709723b324394e08b7669d911
-rw-r--r--chart2/Library_chartcore.mk1
-rw-r--r--chart2/source/inc/ChartDebugTrace.hxx63
-rw-r--r--chart2/source/model/main/ChartModel_Persistence.cxx6
-rw-r--r--chart2/source/model/template/ChartTypeTemplate.cxx10
-rw-r--r--chart2/source/tools/ChartDebugTrace.cxx61
5 files changed, 0 insertions, 141 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 97245ca8ef12..094762d33d4a 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -183,7 +183,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/tools/BaseGFXHelper \
chart2/source/tools/CachedDataSequence \
chart2/source/tools/CharacterProperties \
- chart2/source/tools/ChartDebugTrace \
chart2/source/tools/ChartModelHelper \
chart2/source/tools/ChartTypeHelper \
chart2/source/tools/ChartViewHelper \
diff --git a/chart2/source/inc/ChartDebugTrace.hxx b/chart2/source/inc/ChartDebugTrace.hxx
deleted file mode 100644
index f8eb950c3c96..000000000000
--- a/chart2/source/inc/ChartDebugTrace.hxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-#define INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-
-#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <com/sun/star/chart2/XDiagram.hpp>
-#include "charttoolsdllapi.hxx"
-
-#define CHART_TRACE_OSL_DEBUG_LEVEL 2
-
-namespace chart
-{
-namespace debug
-{
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-/** Does several OSL_TRACEs that show information about the given chart document
- (e.g. the chart-type manager, diagrams etc.)
-
- If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this
- function does nothing.
- */
-OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDocument(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XChartDocument > & xDoc,
- int nIndent = 0 );
-
-/** Does several OSL_TRACEs that show information about the given diagram
- (e.g. coordinate systems, data series etc.)
-
- If OSL_DEBUG_LEVEL is less than CHART_TRACE_OSL_DEBUG_LEVEL this
- function does nothing.
- */
-OOO_DLLPUBLIC_CHARTTOOLS void ChartDebugTraceDiagram(
- const ::com::sun::star::uno::Reference<
- ::com::sun::star::chart2::XDiagram > & xDiagram,
- int nIndent = 0 );
-#endif
-
-} // namespace debug
-} // namespace chart
-
-// INCLUDED_CHART2_SOURCE_INC_CHARTDEBUGTRACE_HXX
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx
index 80ddf7ae4fd4..f976a30bbccb 100644
--- a/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -19,7 +19,6 @@
#include "ChartModel.hxx"
#include "MediaDescriptorHelper.hxx"
-#include "ChartDebugTrace.hxx"
#include "macros.hxx"
#include "ChartViewHelper.hxx"
#include "ChartModelHelper.hxx"
@@ -480,11 +479,6 @@ void SAL_CALL ChartModel::initNew()
}
setModified( sal_False );
unlockControllers();
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartModel::initNew: Showing ChartDocument structure" );
- ::chart::debug::ChartDebugTraceDocument( Reference< chart2::XChartDocument >( this ));
-#endif
}
void SAL_CALL ChartModel::load(
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx
index 1940305d5998..8be651a75f7f 100644
--- a/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -30,7 +30,6 @@
#include "AxisHelper.hxx"
#include "LegendHelper.hxx"
#include "DiagramHelper.hxx"
-#include "ChartDebugTrace.hxx"
#include "AxisIndexDefines.hxx"
#include <cppuhelper/component_context.hxx>
#include <com/sun/star/chart/ChartSolidType.hpp>
@@ -304,10 +303,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData(
Reference< XDataSeriesContainer > xDSCnt( aChartTypes[i], uno::UNO_QUERY_THROW );
xDSCnt->setDataSeries( aSeriesSeq[i] );
}
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartTypeTemplate::changeDiagramData: Showing Diagram structure" );
- ::chart::debug::ChartDebugTraceDiagram( xDiagram );
-#endif
}
catch( const uno::Exception & ex )
{
@@ -805,11 +800,6 @@ void ChartTypeTemplate::FillDiagram(
{
ASSERT_EXCEPTION( ex );
}
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
- OSL_TRACE( "ChartTypeTemplate::FillDiagram: Showing Diagram structure" );
- ::chart::debug::ChartDebugTraceDiagram( xDiagram );
-#endif
}
void ChartTypeTemplate::createChartTypes(
diff --git a/chart2/source/tools/ChartDebugTrace.cxx b/chart2/source/tools/ChartDebugTrace.cxx
deleted file mode 100644
index 6c6ddd1f9fb3..000000000000
--- a/chart2/source/tools/ChartDebugTrace.cxx
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "ChartDebugTrace.hxx"
-#include "macros.hxx"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/chart2/AxisType.hpp>
-#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
-#include <com/sun/star/chart2/XChartTypeContainer.hpp>
-#include <com/sun/star/chart2/XDataSeriesContainer.hpp>
-#include <com/sun/star/chart2/StackingDirection.hpp>
-#include <rtl/math.hxx>
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::chart2;
-
-using ::com::sun::star::uno::Reference;
-using ::com::sun::star::uno::Sequence;
-
-namespace chart
-{
-namespace debug
-{
-
-#if OSL_DEBUG_LEVEL >= CHART_TRACE_OSL_DEBUG_LEVEL
-
-void ChartDebugTraceDocument(
- const Reference< XChartDocument > & /*xDoc*/,
- int /*nIndent*/ )
-{
-
-}
-
-void ChartDebugTraceDiagram(
- const Reference< XDiagram > & /*xDiagram*/,
- int /*nIndent*/ )
-{
-
-}
-#endif
-
-} // namespace debug
-} // namespace chart
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */