chart2/qa/extras/xshape/data/reference/tdf90839-1.xml | 68 +++++++++---------
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 10 +-
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 10 +-
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 10 +-
chart2/source/tools/DiagramHelper.cxx | 6 +
5 files changed, 54 insertions(+), 50 deletions(-)
New commits:
commit 7d17e8e1798b7120b9e8559d042de2afc0a078e3
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Tue Oct 16 12:03:24 2018 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Wed Oct 17 00:48:33 2018 +0200
Resolves: tdf#115182 default Chart percentage format is integer
Regression from
commit 0f4b3cb7d3d68906de316a64dcec281da2a641bd
CommitDate: Mon Aug 10 17:12:45 2015 +0200
The chart2/qa/extras/xshape/data/reference/tdf90839-?.xml
reference files were created with the then wrong default of two
decimals so need to be adapted.
For chart2/qa/extras/xshape/data/reference/tdf90839-1.xml this
meant to regenerate because of the changed positions and sizes of
labels.
Change-Id: Ib0c2c862af9399ab2af5178d01510aa5e4fff97c
Reviewed-on: https://gerrit.libreoffice.org/61826
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
(cherry picked from commit 9672d034b9e760f24ac9a6652ab45dee15ee260a)
Reviewed-on: https://gerrit.libreoffice.org/61855
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
index 7dcbab785af3..3a5070283565 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -175,15 +175,15 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="8394" positionY="4449" sizeX="9188" sizeY="7857"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="8394" positionY="4449" sizeX="9188" sizeY="7857"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="8394" positionY="4449" sizeX="9188" sizeY="7857"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
+ <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="16336" positionY="9274" sizeX="1246" 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="16434" positionY="9300" sizeX="1140" 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="16336" positionY="9274" sizeX="1246"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow 33.33%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="16434" positionY="9300" sizeX="1140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow 33%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -192,21 +192,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="16336.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9274.000000"/>
+ <Line1 column1="1141.000000" column2="0.000000"
column3="16434.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9300.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="16336.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="9274.000000"/>
+ <Line1 column1="1141.000000" column2="0.000000"
column3="16434.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9300.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="10016" positionY="11457" sizeX="1246"
sizeY="849" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
+ <XShape positionX="10197" positionY="11602" sizeX="928" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
- <XShape positionX="10016" positionY="11457" sizeX="1246"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black 27.78%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="10197" positionY="11602" sizeX="928"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black 28%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -215,21 +215,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="10016.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="11457.000000"/>
+ <Line1 column1="929.000000" column2="0.000000"
column3="10197.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="11602.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="10016.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="11457.000000"/>
+ <Line1 column1="929.000000" column2="0.000000"
column3="10197.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="11602.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="8394" positionY="7893" sizeX="1060" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
- <XShape positionX="8394" positionY="7893" sizeX="1060"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green 5.56%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="8394" positionY="7893" sizeX="1060"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green 6%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -250,9 +250,9 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="9758" positionY="5290" sizeX="1246" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
+ <XShape positionX="10043" positionY="5033" sizeX="716" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
- <XShape positionX="9758" positionY="5290" sizeX="1246"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red 19.44%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="10043" positionY="5033" sizeX="716"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red 19%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -261,21 +261,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="9758.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="5290.000000"/>
+ <Line1 column1="717.000000" column2="0.000000"
column3="10043.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="5033.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="9758.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="5290.000000"/>
+ <Line1 column1="717.000000" column2="0.000000"
column3="10043.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="5033.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="13953" positionY="4449" sizeX="1246" 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="14035" positionY="4386" sizeX="1034" 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="13953" positionY="4449" sizeX="1246"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White 13.89%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="14035" positionY="4386" sizeX="1034"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White 14%"
fontHeight="12.000000" fontColor="595959" textAutoGrowHeight="true"
textAutoGrowWidth="true" textContourFrame="false" textFitToSize="NONE"
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0"
textRightDistance="0" textUpperDistance="0" textLowerDistance="0"
textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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,36 +284,36 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="13953.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="4449.000000"/>
+ <Line1 column1="1035.000000" column2="0.000000"
column3="14035.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="4386.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="1247.000000" column2="0.000000"
column3="13953.000000"/>
- <Line2 column1="0.000000" column2="850.000000"
column3="4449.000000"/>
+ <Line1 column1="1035.000000" column2="0.000000"
column3="14035.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="4386.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="9189.000000" column2="0.000000"
column3="8394.000000"/>
- <Line2 column1="0.000000" column2="7858.000000"
column3="4449.000000"/>
+ <Line1 column1="9181.000000" column2="0.000000"
column3="8394.000000"/>
+ <Line2 column1="0.000000" column2="8066.000000"
column3="4386.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="9189.000000" column2="0.000000"
column3="8394.000000"/>
- <Line2 column1="0.000000" column2="7858.000000"
column3="4449.000000"/>
+ <Line1 column1="9181.000000" column2="0.000000"
column3="8394.000000"/>
+ <Line2 column1="0.000000" column2="8066.000000"
column3="4386.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="9189.000000" column2="0.000000" column3="8394.000000"/>
- <Line2 column1="0.000000" column2="7858.000000" column3="4449.000000"/>
+ <Line1 column1="9181.000000" column2="0.000000" column3="8394.000000"/>
+ <Line2 column1="0.000000" column2="8066.000000" column3="4386.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 489b346d4170..b90bf060b694 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -183,7 +183,7 @@
<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">
<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.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="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="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="ffffff" 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"/>
@@ -206,7 +206,7 @@
</XShape>
<XShape positionX="6858" positionY="12784" sizeX="3336"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
- <XShape positionX="6858" positionY="12784" sizeX="3336"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 27.78%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="6858" positionY="12784" sizeX="3336"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 28%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -229,7 +229,7 @@
</XShape>
<XShape positionX="4609" positionY="7607" sizeX="3468" sizeY="1273"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
- <XShape positionX="4609" positionY="7607" sizeX="3468"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 5.56%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="4609" positionY="7607" sizeX="3468"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 6%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -252,7 +252,7 @@
</XShape>
<XShape positionX="6777" positionY="3570" sizeX="3071" sizeY="1273"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
- <XShape positionX="6777" positionY="3570" sizeX="3071"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Red - The color of
rose and passion 19.44%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="6777" positionY="3570" sizeX="3071"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Red - The color of
rose and passion 19%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3889"
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="ffffff" 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"/>
@@ -275,7 +275,7 @@
</XShape>
<XShape positionX="13060" positionY="2700" sizeX="3442"
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="13060" positionY="2700" sizeX="3442"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 13.89%" 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="3889"
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="13060" positionY="2700" sizeX="3442"
sizeY="1273" 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="3889"
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="ffffff" 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"/>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index 5355dae222e9..1f4ad369b8d0 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
@@ -183,7 +183,7 @@
<XShapes>
<XShape positionX="17907" positionY="9341" sizeX="3547"
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="17907" positionY="9341" sizeX="3547"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33.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="3889"
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="9341" sizeX="3547"
sizeY="1273" 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="3889"
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="ffffff" 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"/>
@@ -206,7 +206,7 @@
</XShape>
<XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
- <XShape positionX="3974" positionY="12784" sizeX="6220"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 27.78%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="">
+ <XShape positionX="3974" positionY="12784" sizeX="6220"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 28%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="ffffff" 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"/>
@@ -229,7 +229,7 @@
</XShape>
<XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
- <XShape positionX="1910" positionY="7819" sizeX="6167"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 5.56%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="1910" positionY="7819" sizeX="6167"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 6%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="ffffff" 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"/>
@@ -252,7 +252,7 @@
</XShape>
<XShape positionX="3813" positionY="3994" sizeX="6035" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
- <XShape positionX="3813" positionY="3994" sizeX="6035"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose
and passion 19.44%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="3813" positionY="3994" sizeX="6035"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose
and passion 19%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" 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="ffffff" 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"/>
@@ -275,7 +275,7 @@
</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">
<XShapes>
- <XShape positionX="11711" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 13.89%" 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="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="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="ffffff" 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"/>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
index a60a7afb5d48..22ba48ae1420 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
@@ -183,7 +183,7 @@
<XShapes>
<XShape positionX="17590" positionY="9110" sizeX="3547"
sizeY="1697" 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="9110" sizeX="3547"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 120 33.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="3831"
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="9110" sizeX="3547"
sizeY="1697" 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="3831"
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="ffffff" 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"/>
@@ -206,7 +206,7 @@
</XShape>
<XShape positionX="6654" positionY="12725" sizeX="3336"
sizeY="1697" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
- <XShape positionX="6654" positionY="12725" sizeX="3336"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 100 27.78%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="6654" positionY="12725" sizeX="3336"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Black - The color of
night and coffee 100 28%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="ffffff" 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"/>
@@ -229,7 +229,7 @@
</XShape>
<XShape positionX="4436" positionY="7402" sizeX="3468" sizeY="1697"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
- <XShape positionX="4436" positionY="7402" sizeX="3468"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 20 5.56%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="4436" positionY="7402" sizeX="3468"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Green - The color of
grass and hope 20 6%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="ffffff" 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"/>
@@ -252,7 +252,7 @@
</XShape>
<XShape positionX="6578" positionY="3202" sizeX="3071" sizeY="1697"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
- <XShape positionX="6578" positionY="3202" sizeX="3071"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Red - The color of
rose and passion 70 19.44%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="6578" positionY="3202" sizeX="3071"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="Red - The color of
rose and passion 70 19%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="3831"
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="ffffff" 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"/>
@@ -275,7 +275,7 @@
</XShape>
<XShape positionX="12789" positionY="2344" sizeX="3442"
sizeY="1697" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="12789" positionY="2344" sizeX="3442"
sizeY="1697" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 50 13.89%" 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="3831"
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="12789" positionY="2344" sizeX="3442"
sizeY="1697" 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="3831"
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="ffffff" 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"/>
diff --git a/chart2/source/tools/DiagramHelper.cxx
b/chart2/source/tools/DiagramHelper.cxx
index 801c40e2ce52..b9c8e58eda14 100644
--- a/chart2/source/tools/DiagramHelper.cxx
+++ b/chart2/source/tools/DiagramHelper.cxx
@@ -1186,7 +1186,7 @@ sal_Int32 DiagramHelper::getPercentNumberFormat( const
Reference< util::XNumberF
SvNumberFormatter* pNumFormatter =
aNumberFormatterWrapper.getSvNumberFormatter();
if( pNumFormatter )
{
- nRet = pNumFormatter->GetStandardFormat( SvNumFormatType::PERCENT,
rLanguageTag.getLanguageType() );
+ nRet = pNumFormatter->GetFormatIndex( NF_PERCENT_INT,
rLanguageTag.getLanguageType() );
}
else
{
@@ -1197,6 +1197,10 @@ sal_Int32 DiagramHelper::getPercentNumberFormat( const
Reference< util::XNumberF
rLanguageTag.getLocale(), true/*bCreate*/ );
if( aKeySeq.getLength() )
{
+ // This *assumes* the sequence is sorted as in
+ // NfIndexTableOffset and the first format is the integer 0%
+ // format by chance.. which usually is the case, but.. anyway,
+ // we usually also have a number formatter so don't reach here.
nRet = aKeySeq[0];
}
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
