chart2/qa/extras/chart2import.cxx | 4 +--
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 16 +++++++-------
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 16 +++++++-------
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 16 +++++++-------
chart2/source/view/main/PolarLabelPositionHelper.cxx | 20 +++++++-----------
sw/qa/extras/layout/data/tdf137154.docx |binary
sw/qa/extras/layout/layout2.cxx | 20 ++++++++++++++++++
7 files changed, 54 insertions(+), 38 deletions(-)
New commits:
commit db49cdcf2f367e27ed8fb5f1619f0b41f2c63fd2
Author: Tünde Tóth <toth.tu...@nisz.hu>
AuthorDate: Wed Sep 30 13:11:26 2020 +0200
Commit: László Németh <nem...@numbertext.org>
CommitDate: Mon Oct 19 08:58:51 2020 +0200
tdf#137154 pie chart: improve Outside position of data labels
Some pie chart data labels were too close to the pie
with Outside placement.
Change-Id: I0eecdfc32601bdfa8bb3115183f9ca723a9f945b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103683
Tested-by: Jenkins
Tested-by: László Németh <nem...@numbertext.org>
Reviewed-by: László Németh <nem...@numbertext.org>
diff --git a/chart2/qa/extras/chart2import.cxx
b/chart2/qa/extras/chart2import.cxx
index d901f879ea18..1318a1ddebfa 100644
--- a/chart2/qa/extras/chart2import.cxx
+++ b/chart2/qa/extras/chart2import.cxx
@@ -2573,8 +2573,8 @@ void Chart2ImportTest::testTdf133376()
CPPUNIT_ASSERT(xDataPointLabel.is());
// Check the position of the 3rd data point label, which is out from the
pie slice
awt::Point aLabelPosition = xDataPointLabel->getPosition();
- CPPUNIT_ASSERT_DOUBLES_EQUAL(349, aLabelPosition.X, 30);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(5480, aLabelPosition.Y, 30);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(458, aLabelPosition.X, 30);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(5114, aLabelPosition.Y, 30);
}
void Chart2ImportTest::testTdf134225()
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index d23c93e558a2..84eb759612ff 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -181,9 +181,9 @@
<XShapes>
<XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17907" positionY="9553" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17907" positionY="9553" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,14 +193,14 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9553.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9553.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
@@ -273,9 +273,9 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="11711" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="11711" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="26494"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14780" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="26494"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -284,14 +284,14 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11711.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
<Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11711.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
<Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index e4e1bd07273b..11dd8ecfe15b 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
@@ -181,9 +181,9 @@
<XShapes>
<XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17907" positionY="9553" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17907" positionY="9553" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8732"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8732"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,14 +193,14 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9553.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9553.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
@@ -273,9 +273,9 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="11711" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="11711" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14780" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -284,14 +284,14 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11711.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
<Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11711.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
<Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
index 9c1ce02d4583..4774a7e3e0b4 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
@@ -181,9 +181,9 @@
<XShapes>
<XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17590" positionY="9322" sizeX="6114"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17590" positionY="9958" sizeX="6114"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17590" positionY="9322" sizeX="6114"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 120 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8546"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="17590" positionY="9958" sizeX="6114"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 120 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8546"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,14 +193,14 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17590.000000"/>
- <Line2 column1="0.000000" column2="1274.000000"
column3="9322.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17590.000000"/>
- <Line2 column1="0.000000" column2="1274.000000"
column3="9322.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
@@ -273,9 +273,9 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="11440" positionY="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14509" positionY="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="11440" positionY="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 50 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="25991"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14509" positionY="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 50 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="25991"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -284,14 +284,14 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11440.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14509.000000"/>
<Line2 column1="0.000000" column2="1274.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="6141.000000" column2="0.000000"
column3="11440.000000"/>
+ <Line1 column1="6141.000000" column2="0.000000"
column3="14509.000000"/>
<Line2 column1="0.000000" column2="1274.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
diff --git a/chart2/source/view/main/PolarLabelPositionHelper.cxx
b/chart2/source/view/main/PolarLabelPositionHelper.cxx
index a3e9a7cd9778..8ebe9ca4c4cc 100644
--- a/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -129,26 +129,22 @@ awt::Point
PolarLabelPositionHelper::getLabelScreenPositionAndAlignmentForUnitCi
bool bOutside = nLabelPlacement ==
css::chart::DataLabelPlacement::OUTSIDE;
- if(fAngleDegree==0.0)
- rAlignment = LABEL_ALIGN_CENTER;
- else if(fAngleDegree<=22.5)
+ if (fAngleDegree <= 5 || fAngleDegree >= 355)
rAlignment = bOutside ? LABEL_ALIGN_RIGHT : LABEL_ALIGN_LEFT;
- else if(fAngleDegree<67.5)
+ else if (fAngleDegree < 85)
rAlignment = bOutside ? LABEL_ALIGN_RIGHT_TOP :
LABEL_ALIGN_LEFT_BOTTOM;
- else if(fAngleDegree<112.5)
+ else if (fAngleDegree <= 95)
rAlignment = bOutside ? LABEL_ALIGN_TOP : LABEL_ALIGN_BOTTOM;
- else if(fAngleDegree<=157.5)
+ else if (fAngleDegree < 175)
rAlignment = bOutside ? LABEL_ALIGN_LEFT_TOP :
LABEL_ALIGN_RIGHT_BOTTOM;
- else if(fAngleDegree<=202.5)
+ else if (fAngleDegree <= 185)
rAlignment = bOutside ? LABEL_ALIGN_LEFT : LABEL_ALIGN_RIGHT;
- else if(fAngleDegree<247.5)
+ else if (fAngleDegree < 265)
rAlignment = bOutside ? LABEL_ALIGN_LEFT_BOTTOM :
LABEL_ALIGN_RIGHT_TOP;
- else if(fAngleDegree<292.5)
+ else if (fAngleDegree <= 275)
rAlignment = bOutside ? LABEL_ALIGN_BOTTOM : LABEL_ALIGN_TOP;
- else if(fAngleDegree<337.5)
- rAlignment = bOutside ? LABEL_ALIGN_RIGHT_BOTTOM :
LABEL_ALIGN_LEFT_TOP;
else
- rAlignment = bOutside ? LABEL_ALIGN_RIGHT : LABEL_ALIGN_LEFT;
+ rAlignment = bOutside ? LABEL_ALIGN_RIGHT_BOTTOM :
LABEL_ALIGN_LEFT_TOP;
}
else
{
diff --git a/sw/qa/extras/layout/data/tdf137154.docx
b/sw/qa/extras/layout/data/tdf137154.docx
new file mode 100644
index 000000000000..0dc8d3220e4e
Binary files /dev/null and b/sw/qa/extras/layout/data/tdf137154.docx differ
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index f0a8e943f1ab..f0bb71e9b9f5 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -812,6 +812,26 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf137116)
CPPUNIT_ASSERT_DOUBLES_EQUAL(694, nX2 - nX4, 100);
}
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf137154)
+{
+ SwDoc* pDoc = createDoc("tdf137154.docx");
+ SwDocShell* pShell = pDoc->GetDocShell();
+
+ // Dump the rendering of the first page as an XML file.
+ std::shared_ptr<GDIMetaFile> xMetaFile = pShell->GetPreviewMetaFile();
+ MetafileXmlDump dumper;
+ xmlDocUniquePtr pXmlDoc = dumpAndParse(dumper, *xMetaFile);
+ CPPUNIT_ASSERT(pXmlDoc);
+ sal_Int32 nX1 = getXPath(pXmlDoc, "//textarray[1]", "x").toInt32(); //
first data label
+ sal_Int32 nX4 = getXPath(pXmlDoc, "//textarray[4]", "x").toInt32(); //
fourth data label
+ // Without the accompanying fix in place, this test would have failed with:
+ // - Expected: 10865
+ // - Actual : 10252
+ // - Delta : 50
+ // i.e. the first data label appeared too close to the pie.
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(nX4, nX1, 50);
+}
+
CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf130031)
{
SwDoc* pDoc = createDoc("tdf130031.docx");
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
