strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS chart17 (1.39.2); FILE MERGED

Browse source 
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
This commit is contained in:
Ivo Hinkelmann 2007-11-23 11:12:21 +00:00
parent 93b7128af2
commit b2b48786b4
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chart2/source/view/main/ChartView.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: ChartView.cxx,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -97,6 +97,8 @@
#include <time.h> #include <time.h>
#include <com/sun/star/chart/DataLabelPlacement.hpp>
#ifndef _COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_ #ifndef _COM_SUN_STAR_CHART2_EXPLICITSUBINCREMENT_HPP_
#include <com/sun/star/chart2/ExplicitSubIncrement.hpp> #include <com/sun/star/chart2/ExplicitSubIncrement.hpp>
#endif #endif
@ -1075,6 +1077,7 @@ bool SeriesPlotterContainer::shouldKeep2DAspectRatio()
namespace namespace
{ {
bool lcl_resizeAfterCompleteCreation( const uno::Reference< XDiagram >& xDiagram ) bool lcl_resizeAfterCompleteCreation( const uno::Reference< XDiagram >& xDiagram )
{ {
//special treatment for pie charts //special treatment for pie charts
@ -1228,6 +1231,7 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
{ {
//------------ set transformation to plotter / create series //------------ set transformation to plotter / create series
VSeriesPlotter* pSeriesPlotter = *aPlotterIter; VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
pSeriesPlotter->setPageReferenceSize( rPageSize );
rtl::OUString aCID; //III rtl::OUString aCID; //III
pSeriesPlotter->initPlotter(xCoordinateRegionTarget,xTextTargetShapes,m_xShapeFactory,aCID); pSeriesPlotter->initPlotter(xCoordinateRegionTarget,xTextTargetShapes,m_xShapeFactory,aCID);
pSeriesPlotter->setDiagramReferenceSize( rAvailableSize ); pSeriesPlotter->setDiagramReferenceSize( rAvailableSize );
@ -1300,6 +1304,11 @@ void ChartView::impl_createDiagramAndContent( SeriesPlotterContainer& rSeriesPlo
xDiagramPlusAxes_KeepRatio->setPosition( aNewPos ); xDiagramPlusAxes_KeepRatio->setPosition( aNewPos );
xDiagramPlusAxes_KeepRatio->setSize( aNewSize ); xDiagramPlusAxes_KeepRatio->setSize( aNewSize );
*/ */
for( aPlotterIter = rSeriesPlotterList.begin(); aPlotterIter != aPlotterEnd; aPlotterIter++ )
{
VSeriesPlotter* pSeriesPlotter = *aPlotterIter;
pSeriesPlotter->rearrangeLabelToAvoidOverlapIfRequested( rPageSize );
}
} }
} }