diff options
Diffstat (limited to 'chart2/source/view/charttypes')
| -rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 19b43ae3d964..75a0ea173aba 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2394,7 +2394,7 @@ bool VSeriesPlotter::shouldSnapRectToUsedArea() std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( const awt::Size& rEntryKeyAspectRatio - , css::chart::ChartLegendExpansion eLegendExpansion + , LegendPosition eLegendPosition , const Reference< beans::XPropertySet >& xTextProperties , const Reference< drawing::XShapes >& xTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory @@ -2450,24 +2450,19 @@ std::vector< ViewLegendEntry > VSeriesPlotter::createLegendEntries( bBreak = true; bFirstSeries = false; - // add entries reverse if chart is stacked in y-direction and the legend is not wide. - // If the legend is wide and we have a stacked bar-chart the normal order + // add entries reverse if chart is stacked in y-direction and the legend position is right or left. + // If the legend is top or bottom and we have a stacked bar-chart the normal order // is the correct one, unless the chart type is horizontal bar-chart. bool bReverse = false; - if( eLegendExpansion != css::chart::ChartLegendExpansion_WIDE ) + if ( bSwapXAndY ) { StackingDirection eStackingDirection( pSeries->getStackingDirection() ); - bReverse = ( eStackingDirection == StackingDirection_Y_STACKING ); - - if( bSwapXAndY ) - { - bReverse = !bReverse; - } + bReverse = ( eStackingDirection != StackingDirection_Y_STACKING ); } - else if( bSwapXAndY ) + else if ( eLegendPosition == LegendPosition_LINE_START || eLegendPosition == LegendPosition_LINE_END ) { StackingDirection eStackingDirection( pSeries->getStackingDirection() ); - bReverse = ( eStackingDirection != StackingDirection_Y_STACKING ); + bReverse = ( eStackingDirection == StackingDirection_Y_STACKING ); } if (bReverse) |