Change-Id: I51f25a9b57bf62bcd691894a0eec771baf479702
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92500
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
This commit is contained in:
Andrea Gelmini
2020-04-19 15:10:25 +02:00
committed by Julien Nabet
parent 4a670f4284
commit 1b7edbafe0

View File

@@ -818,7 +818,7 @@ bool VCartesianAxis::createTextShapes(
if( pLastVisibleNeighbourTickInfo && !rAxisLabelProperties.bOverlapAllowed )
{
// Overlapping is not allowed. If the label overlaps with its
// neighbering label, try increasing the tick interval (or rhythm
// neighboring label, try increasing the tick interval (or rhythm
// as it's called) and start over.
if( lcl_doesShapeOverlapWithTickmark( pLastVisibleNeighbourTickInfo->xTextShape
@@ -903,7 +903,7 @@ bool VCartesianAxis::createTextShapes(
//if NO OVERLAP -> remove overlapping shapes
if( pLastVisibleNeighbourTickInfo && !rAxisLabelProperties.bOverlapAllowed )
{
// Check if the label still overlaps with its neighber.
// Check if the label still overlaps with its neighbor.
if( doesOverlap( pLastVisibleNeighbourTickInfo->xTextShape, pTickInfo->xTextShape, rAxisLabelProperties.fRotationAngleDegree ) )
{
// It overlaps. Check if staggering helps.
@@ -1007,7 +1007,7 @@ bool VCartesianAxis::createTextShapesSimple(
if( pLastVisibleNeighbourTickInfo && !rAxisLabelProperties.bOverlapAllowed )
{
// Overlapping is not allowed. If the label overlaps with its
// neighbering label, try increasing the tick interval (or rhythm
// neighboring label, try increasing the tick interval (or rhythm
// as it's called) and start over.
if( lcl_doesShapeOverlapWithTickmark( pLastVisibleNeighbourTickInfo->xTextShape
@@ -1055,7 +1055,7 @@ bool VCartesianAxis::createTextShapesSimple(
//if NO OVERLAP -> remove overlapping shapes
if( pLastVisibleNeighbourTickInfo && !rAxisLabelProperties.bOverlapAllowed )
{
// Check if the label still overlaps with its neighber.
// Check if the label still overlaps with its neighbor.
if( doesOverlap( pLastVisibleNeighbourTickInfo->xTextShape, pTickInfo->xTextShape, rAxisLabelProperties.fRotationAngleDegree ) )
{
// It overlaps.