From b2b48786b47a19551696aa1beffb7b79ca3d02c3 Mon Sep 17 00:00:00 2001 From: Ivo Hinkelmann Date: Fri, 23 Nov 2007 11:12:21 +0000 Subject: [PATCH] INTEGRATION: CWS chart17 (1.39.2); FILE MERGED 2007/11/05 14:26:15 iha 1.39.2.3: #i63857#, #i4039# more flexible placement of data point labels, best fit for pie labels 2007/10/30 13:53:52 bm 1.39.2.2: RESYNC: (1.39-1.40); FILE MERGED 2007/10/12 12:35:11 bm 1.39.2.1: #i7998# equations for regression curves --- chart2/source/view/main/ChartView.cxx | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 566d814ec848..5217c44f077d 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -4,9 +4,9 @@ * * $RCSfile: ChartView.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: vg $ $Date: 2007-10-22 16:56:56 $ + * last change: $Author: ihi $ $Date: 2007-11-23 12:12:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -97,6 +97,8 @@ #include +#include + #ifndef _COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ #include #endif @@ -1075,6 +1077,7 @@ bool SeriesPlotterContainer::shouldKeep2DAspectRatio() namespace { + bool lcl_resizeAfterCompleteCreation( const uno::Reference< XDiagram >& xDiagram ) { //special treatment for pie charts @@ -1228,6 +1231,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo { //------------ set transformation to plotter / create series VSeriesPlotter* pSeriesPlotter = *aPlotterIter; + pSeriesPlotter->setPageReferenceSize( rPageSize ); rtl::OUString aCID; //III pSeriesPlotter->initPlotter(xCoordinateRegionTarget,xTextTargetShapes,m_xShapeFactory,aCID); pSeriesPlotter->setDiagramReferenceSize( rAvailableSize ); @@ -1300,6 +1304,11 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo xDiagramPlusAxes_KeepRatio->setPosition( aNewPos ); xDiagramPlusAxes_KeepRatio->setSize( aNewSize ); */ + for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ ) + { + VSeriesPlotter* pSeriesPlotter = *aPlotterIter; + pSeriesPlotter->rearrangeLabelToAvoidOverlapIfRequested( rPageSize ); + } } }