summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamás Zolnai <tamas.zolnai@collabora.com>2019-05-28 17:32:44 +0200
committerTamás Zolnai <tamas.zolnai@collabora.com>2019-05-29 11:31:19 +0200
commit63d17d01da0f9e3a7554e4327244ee4457b7188d (patch)
tree33aa1fdc293a53140adc9abdf293e763c5ec3cd9
parentd376c09f0100e6545b4804a6698bcc746ea9427c (diff)
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@collabora.com> Tested-by: Tamás Zolnai <tamas.zolnai@collabora.com>
-rw-r--r--chart2/source/view/main/ChartView.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index d165ccb05251..9d3bf0bb46e6 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -1491,7 +1491,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(
@@ -1500,7 +1499,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();
}
@@ -1528,6 +1527,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();