[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - 2 commits - chart2/source

[Muthu Subramanian]

 chart2/source/view/charttypes/PieChart.cxx |    2 +-
 chart2/source/view/main/ChartView.cxx      |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit c56f5aca62ccc8a641f3eaa304d9c1ff004c0ea6
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Thu Mar 14 12:54:28 2013 +0530

    n#734735: Decrease pie chart's thickness.

diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx
index e1ecf5b..add404c 100644
--- a/chart2/source/view/charttypes/PieChart.cxx
+++ b/chart2/source/view/charttypes/PieChart.cxx
@@ -167,7 +167,7 @@ void PieChart::setScales( const std::vector< ExplicitScaleData >& rScales, bool
 drawing::Direction3D PieChart::getPreferredDiagramAspectRatio() const
 {
     if( m_nDimension == 3 )
-        return drawing::Direction3D(1,1,0.25);
+        return drawing::Direction3D(1,1,0.10);
     return drawing::Direction3D(1,1,1);
 }
 
commit c775a572fa2071fa7c98819233f1d5b3224e9b74
Author: Muthu Subramanian <sumuthu at suse.com>
Date:   Wed Mar 20 17:39:30 2013 +0530

    n#734735: Use full available size for pie charts.

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 8399d8b..bd4806d 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1406,11 +1406,13 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
     uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis(0);
     uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis(0);
     VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
+    bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
     {//create diagram
         aVDiagram.init(xDiagramPlusAxes_Shapes,xDiagramPlusAxes_Shapes,m_xShapeFactory);
         aVDiagram.createShapes(rAvailablePos,rAvailableSize);
         xSeriesTargetInFrontOfAxis = aVDiagram.getCoordinateRegion();
-        if( !bUseFixedInnerSize )
+        // It is preferrable to use full size than minimum for pie charts
+        if( !bIsPieOrDonut && !bUseFixedInnerSize )
             aVDiagram.reduceToMimimumSize();
     }
 
@@ -1437,7 +1439,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( SeriesPlotterContainer&
 
     //use first coosys only so far; todo: calculate for more than one coosys if we have more in future
     //todo: this is just a workaround at the moment for pie and donut labels
-    bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
     if( !bIsPieOrDonut && (!rVCooSysList.empty()) )
     {
         VCoordinateSystem* pVCooSys = rVCooSysList[0];