Kaydet (Commit) 63d17d01 authored tarafından Tamás Zolnai's avatar Tamás Zolnai

tdf#122765: Legend interferes with pie chart after pptx import, second part

Revert of:

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/73139Reviewed-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
Tested-by: 's avatarTamás Zolnai <tamas.zolnai@collabora.com>
üst d376c09f
......@@ -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);
......@@ -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)
......@@ -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();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment