ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#146756 pie chart2 import: use consistent outside-label max text len

Browse Source 
This is a followup to commit 85f4395b6f.

Although there is no pressing need for this patch in my opinion,
it DOES fix a 7.1 regression in importing MSO charts with long labels.
MSO wraps text at 1/5 the width of the chart.

7.1 Regression commit 75a8b367f2
Author: Balazs Varga on Tue Aug 25 12:32:02 2020 +0200
    tdf#136105 tdf#134883 pie chart: improve data label position

Before Balazs' commit, the text width for everything was simply
fTextMaximumFrameWidth = 0.8 * fPieRadius.

I personally think Balazs' no wrapping looks better
(for outside labels, when there is enough space)
but in order to be consistent with how we handle
wrapping for bestFit-that-didn't-fit labels,
and to have our charts be as interoperable with OOXML as possible,
it makes good sense to use the same logic as the previous patch here.

Interestingly, Balazs broke some unit tests that specifically
were testing to make sure that text wrapping existed.

Fixed: // text wrap: wrap all text labels except Yellow one
make CppunitTest_chart2_xshape CPPUNIT_TEST_NAME=testPieChartLabels2

Fixed: // text wrap: wrap no text label except Yellow one
make CppunitTest_chart2_xshape CPPUNIT_TEST_NAME=testPieChartLabels3

Interestingly, I couldn't just copy/paste Ctrl-F12 dump to fix
make CppunitTest_chart2_xshape CPPUNIT_TEST_NAME=testPieChartLabels4
so I instead did a copy/paste of SAL_WARN("DUH",getXShapeDumpString());

Change-Id: I19f2ce2ce9c7653ae92dd596f0aaca1ed83f41bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162764
Tested-by: Justin Luth <jluth@mail.com>
Reviewed-by: Justin Luth <jluth@mail.com>
This commit is contained in:
Justin Luth
2024-01-31 10:46:34 +01:00
committed by Miklos Vajna
parent b39c6082aa
commit 9833ac64c4
5 changed files with 114 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chart2/qa/extras/xshape/chart2xshape.cxx
+2 -2
View File
@@ -196,7 +196,7 @@ void Chart2XShapeTest::testPieChartLabels2()
if (!IsDefaultDPI())
return;
// text wrap: wrap all text labels except one
// text wrap: wrap all text labels except Yellow one
loadFromFile(u"xlsx/tdf90839-2.xlsx");
compareAgainstReference(getXShapeDumpString(), u"tdf90839-2.xml");
}
@@ -208,7 +208,7 @@ void Chart2XShapeTest::testPieChartLabels3()
if (!IsDefaultDPI())
return;
// text wrap: wrap no text label except one
// text wrap: wrap no text label except Yellow one
loadFromFile(u"xlsx/tdf90839-3.xlsx");
compareAgainstReference(getXShapeDumpString(), u"tdf90839-3.xml");
}
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+42 -44
View File
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShapes>
<XShape positionX="9762" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -30,7 +30,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" 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"/>
@@ -39,12 +39,12 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="9762" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape">
<XShapes>
@@ -175,11 +175,11 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="2513" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShape positionX="4524" positionY="2226" sizeX="21978" sizeY="12305" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
<XShape positionX="19462" positionY="9977" sizeX="7040" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
@@ -204,9 +204,9 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="4630" positionY="12784" sizeX="7119" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShape positionX="5979" positionY="12784" sizeX="5770" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
<XShape positionX="4630" positionY="12784" sizeX="7119" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee&#10;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="8467" 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="5979" positionY="12784" sizeX="5770" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee&#10;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="5929" 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"/>
@@ -215,21 +215,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="7120.000000" column2="0.000000" column3="4630.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="12784.000000"/>
<Line1 column1="5771.000000" column2="0.000000" column3="5979.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="7120.000000" column2="0.000000" column3="4630.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="12784.000000"/>
<Line1 column1="5771.000000" column2="0.000000" column3="5979.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2513" positionY="7661" sizeX="7119" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShape positionX="4524" positionY="7370" sizeX="5108" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
<XShape positionX="2513" positionY="7661" sizeX="7119" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope&#10;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="8467" 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="4524" positionY="7370" sizeX="5108" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope&#10;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="5929" 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"/>
@@ -238,21 +238,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="7120.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/>
<Line1 column1="5109.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="7370.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="7120.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="7661.000000"/>
<Line1 column1="5109.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="7370.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="4442" positionY="3678" sizeX="6961" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShape positionX="6083" positionY="3096" sizeX="5320" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
<XShape positionX="4442" positionY="3678" sizeX="6961" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion&#10;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="8467" 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="6083" positionY="3096" sizeX="5320" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion&#10;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="5929" 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"/>
@@ -261,21 +261,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="4442.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="3678.000000"/>
<Line1 column1="5321.000000" column2="0.000000" column3="6083.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="3096.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="4442.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="3678.000000"/>
<Line1 column1="5321.000000" column2="0.000000" column3="6083.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="3096.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="16335" positionY="2808" sizeX="6961" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShape positionX="16335" positionY="2226" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
<XShape positionX="16335" positionY="2808" sizeX="6961" sizeY="1165" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity&#10;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="9881" 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="16335" positionY="2226" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity&#10;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="5929" 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,53 +284,51 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="16335.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="2808.000000"/>
<Line1 column1="5692.000000" column2="0.000000" column3="16335.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="16335.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="2808.000000"/>
<Line1 column1="5692.000000" column2="0.000000" column3="16335.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2513.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line1 column1="21979.000000" column2="0.000000" column3="4524.000000"/>
<Line2 column1="0.000000" column2="12306.000000" column3="2226.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
+18 -20
View File
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShapes>
<XShape positionX="9761" positionY="3821" sizeX="9721" sizeY="9721" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -30,7 +30,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" 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"/>
@@ -39,12 +39,12 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="9761" positionY="3819" sizeX="9721" sizeY="9723" type="com.sun.star.drawing.GroupShape">
<XShapes>
@@ -175,15 +175,15 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="2512" positionY="2808" sizeX="23989" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShape positionX="2512" positionY="2808" sizeX="22640" sizeY="11141" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
<XShape positionX="19461" positionY="9977" sizeX="7040" sizeY="1165" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShape positionX="19461" positionY="9977" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
<XShape positionX="19461" positionY="9977" sizeX="7040" sizeY="1165" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey&#10;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="8466" 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="19461" positionY="9977" sizeX="5691" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey&#10;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="5929" 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"/>
@@ -192,15 +192,15 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="7041.000000" column2="0.000000" column3="19461.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="9977.000000"/>
<Line1 column1="5692.000000" column2="0.000000" column3="19461.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="7041.000000" column2="0.000000" column3="19461.000000"/>
<Line2 column1="0.000000" column2="1166.000000" column3="9977.000000"/>
<Line1 column1="5692.000000" column2="0.000000" column3="19461.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
@@ -298,39 +298,37 @@
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="23990.000000" column2="0.000000" column3="2512.000000"/>
<Line1 column1="22641.000000" column2="0.000000" column3="2512.000000"/>
<Line2 column1="0.000000" column2="11142.000000" column3="2808.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
+42 -44
View File
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShapes>
<XShape positionX="8034" positionY="3894" sizeX="9575" sizeY="9575" type="com.sun.star.drawing.RectangleShape" name="MarkHandles" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000" endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" endIntensity="100" stepCount="0"/>
@@ -30,7 +30,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" fillTransparence="0" fillTransparenceGradientName="">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" textRightDistance="0" textUpperDistance="0" textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" textAnimationStartInside="false" textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" 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"/>
@@ -39,12 +39,12 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="8034" positionY="3892" sizeX="9575" sizeY="9577" type="com.sun.star.drawing.GroupShape">
<XShapes>
@@ -175,15 +175,15 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.GroupShape">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="1922" positionY="2294" sizeX="21359" sizeY="12760" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShape positionX="2796" positionY="1712" sizeX="19611" sizeY="13342" type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
<XShape positionX="17590" positionY="9958" sizeX="5691" sizeY="2329" 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="4817" sizeY="2329" 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="9958" sizeX="5691" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey&#10;120&#10;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="6977" 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="4817" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Yellow - The color of sun and honey&#10;120&#10;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="5199" 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"/>
@@ -192,21 +192,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="5692.000000" column2="0.000000" column3="17590.000000"/>
<Line1 column1="4818.000000" column2="0.000000" column3="17590.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="5692.000000" column2="0.000000" column3="17590.000000"/>
<Line1 column1="4818.000000" column2="0.000000" column3="17590.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="4220" positionY="12725" sizeX="5770" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShape positionX="5093" positionY="12725" sizeX="4897" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
<XShapes>
<XShape positionX="4220" positionY="12725" sizeX="5770" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee&#10;100&#10;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="6977" 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="5093" positionY="12725" sizeX="4897" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Black - The color of night and coffee&#10;100&#10;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="5199" 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"/>
@@ -215,21 +215,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="5771.000000" column2="0.000000" column3="4220.000000"/>
<Line1 column1="4898.000000" column2="0.000000" column3="5093.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="12725.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="5771.000000" column2="0.000000" column3="4220.000000"/>
<Line1 column1="4898.000000" column2="0.000000" column3="5093.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="12725.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="1922" positionY="7086" sizeX="5982" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShape positionX="2796" positionY="7086" sizeX="5108" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
<XShapes>
<XShape positionX="1922" positionY="7086" sizeX="5982" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope&#10;20&#10;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="6977" 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="2796" positionY="7086" sizeX="5108" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Green - The color of grass and hope&#10;20&#10;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="5199" 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"/>
@@ -238,21 +238,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="5983.000000" column2="0.000000" column3="1922.000000"/>
<Line1 column1="5109.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="7086.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="5983.000000" column2="0.000000" column3="1922.000000"/>
<Line1 column1="5109.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="7086.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="2688" positionY="3152" sizeX="6961" sizeY="1747" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShape positionX="5202" positionY="2570" sizeX="4447" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
<XShapes>
<XShape positionX="2688" positionY="3152" sizeX="6961" sizeY="1747" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion&#10;70&#10;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="6977" 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="5202" positionY="2570" sizeX="4447" sizeY="2329" type="com.sun.star.drawing.TextShape" text="Red - The color of rose and passion&#10;70&#10;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="5199" 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"/>
@@ -261,21 +261,21 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="2688.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="3152.000000"/>
<Line1 column1="4448.000000" column2="0.000000" column3="5202.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="2570.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="2688.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="3152.000000"/>
<Line1 column1="4448.000000" column2="0.000000" column3="5202.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="2570.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
<XShape positionX="14509" positionY="2294" sizeX="6961" sizeY="1747" 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="1712" sizeX="4817" sizeY="2329" type="com.sun.star.drawing.GroupShape" name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
<XShape positionX="14509" positionY="2294" sizeX="6961" sizeY="1747" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity&#10;50&#10;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="8664" 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="1712" sizeX="4817" sizeY="2329" type="com.sun.star.drawing.TextShape" text="White - The color of milk and purity&#10;50&#10;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="5199" 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,53 +284,51 @@
<LineStart/>
<LineEnd/>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="14509.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="2294.000000"/>
<Line1 column1="4818.000000" column2="0.000000" column3="14509.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6962.000000" column2="0.000000" column3="14509.000000"/>
<Line2 column1="0.000000" column2="1748.000000" column3="2294.000000"/>
<Line1 column1="4818.000000" column2="0.000000" column3="14509.000000"/>
<Line2 column1="0.000000" column2="2330.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21360.000000" column2="0.000000" column3="1922.000000"/>
<Line2 column1="0.000000" column2="12761.000000" column3="2294.000000"/>
<Line1 column1="19612.000000" column2="0.000000" column3="2796.000000"/>
<Line2 column1="0.000000" column2="13343.000000" column3="1712.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
chart2/source/view/charttypes/PieChart.cxx
+10 -8
View File
@@ -417,12 +417,14 @@ void PieChart::createTextLabelShape(
}
else if (nLabelPlacement == css::chart::DataLabelPlacement::OUTSIDE)
{
if ((fAngleDegree >= 67.5 && fAngleDegree <= 112.5)
|| (fAngleDegree >= 247.5 && fAngleDegree <= 292.5))
fTextMaximumFrameWidth = m_aAvailableOuterRect.getWidth() / 3.0;
else
fTextMaximumFrameWidth = 0.85 * (m_aAvailableOuterRect.getWidth() / 2.0 - fPieRadius);
}
const sal_Int32 nOuterX = aPieLabelInfo.aOuterPosition.getX();
if (fAngleDegree < 90 || fAngleDegree > 270) // label is placed on the right side
fTextMaximumFrameWidth = 0.8 * abs(m_aAvailableOuterRect.getWidth() - nOuterX);
else // label is placed on the left side
fTextMaximumFrameWidth = 0.8 * nOuterX;
fTextMaximumFrameWidth = std::min(fTextMaximumFrameWidth, fCompatMaxTextLen);
}
}
sal_Int32 nTextMaximumFrameWidth = ceil(fTextMaximumFrameWidth);
@@ -473,9 +475,9 @@ void PieChart::createTextLabelShape(
* so in that bizarre case just try the positive value of the result...
*/
const sal_Int32 nOuterX = aPieLabelInfo.aOuterPosition.getX();
if (fAngleDegree < 90 || fAngleDegree > 270) // label is placed on the right half
if (fAngleDegree < 90 || fAngleDegree > 270) // label is placed on the right side
fTextMaximumFrameWidth = 0.8 * abs(m_aAvailableOuterRect.getWidth() - nOuterX);
else // label is placed on the left half
else // label is placed on the left side
fTextMaximumFrameWidth = 0.8 * nOuterX;
nTextMaximumFrameWidth = ceil(std::min(fTextMaximumFrameWidth, fCompatMaxTextLen));