[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - chart2/source

[Tamás Zolnai (via logerrit)]

 chart2/source/view/main/ChartView.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 42d27ed5c07f829dab1d5b663fc14cf1b61061b4
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Tue May 28 17:32:44 2019 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri May 31 07:33:15 2019 +0200

    tdf#122765: Legend interferes with pie chart after pptx import, second part
    
    Revert of:
    2903c5f59d257b6ab94f32df64513f2edf94fb0b
    
    Reverting this commit does not lead to the original bug
    to come back, so we can revert it without a problem.
    
    Change-Id: I244a6b9451c47e1094db8a77c71b6696e0c464cc
    Reviewed-on: https://gerrit.libreoffice.org/73139
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 63d17d01da0f9e3a7554e4327244ee4457b7188d)
    Reviewed-on: https://gerrit.libreoffice.org/73159
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index 02ad8a90720c..37f4811c658f 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1499,7 +1499,6 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D
     uno::Reference< drawing::XShapes > xSeriesTargetInFrontOfAxis;
     uno::Reference< drawing::XShapes > xSeriesTargetBehindAxis;
     VDiagram aVDiagram(xDiagram, aPreferredAspectRatio, nDimensionCount);
-    bool bIsPieOrDonut = lcl_IsPieOrDonut(xDiagram);
     {//create diagram
         aVDiagram.init(rParam.mxDiagramWithAxesShapes, m_xShapeFactory);
         aVDiagram.createShapes(
@@ -1508,7 +1507,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D
 
         xSeriesTargetInFrontOfAxis = aVDiagram.getCoordinateRegion();
         // It is preferable to use full size than minimum for pie charts
-        if (!bIsPieOrDonut && !rParam.mbUseFixedInnerSize)
+        if (!rParam.mbUseFixedInnerSize)
             aVDiagram.reduceToMimimumSize();
     }
 
@@ -1536,6 +1535,7 @@ awt::Rectangle ChartView::impl_createDiagramAndContent( const CreateShapeParam2D
 
     //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].get();