chart2/qa/extras/xshape/data/reference/tdf90839-1.xml | 74 ++++++-------
chart2/qa/extras/xshape/data/reference/tdf90839-2.xml | 66 +++++------
chart2/qa/extras/xshape/data/reference/tdf90839-3.xml | 66 +++++------
chart2/qa/extras/xshape/data/reference/tdf90839-4.xml | 64 +++++------
editeng/source/editeng/impedit.cxx | 9 -
editeng/source/editeng/impedit.hxx | 14 +-
editeng/source/editeng/impedit2.cxx | 27 ++--
editeng/source/editeng/impedit3.cxx | 79 +++-----------
include/svx/svdotext.hxx | 3
sc/qa/uitest/chart/chartLegend.py | 4
sc/qa/unit/filters-test.cxx | 2
sd/qa/uitest/impress_tests/tdf91762.py | 8 -
sd/qa/unit/data/odg/tb-rl-textbox.odg |binary
sd/qa/unit/data/xml/n593612_0.xml | 4
sd/qa/unit/data/xml/n758621_1.xml | 4
sd/qa/unit/layout-tests.cxx | 67 +++++++++++
sd/qa/unit/tiledrendering/LOKitSearchTest.cxx | 4
svx/source/sdr/primitive2d/sdrdecompositiontools.cxx | 101 ++++++++++++------
svx/source/svdraw/svdoashp.cxx | 6 -
svx/source/svdraw/svdotext.cxx | 58 ++++++++--
test/source/sheet/xsheetannotationshapesupplier.cxx | 2
21 files changed, 377 insertions(+), 285 deletions(-)
New commits:
commit e09f22aa2626267e01b9e759c152f3a0d70ddc68
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Jul 10 12:35:44 2021 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Sun Jul 11 08:49:31 2021 +0200
editengine-columns: tdf#143258 Fix handling rotated text
This reverts modifications to existing unit tests made in commit
d0a1616ccad0dd5f5a02c1b0204f537b57d0b4b5. My idea that those changes
were required because of more correct calculations was wrong, and in
fact they were caused by off-by-1 error in height calculations.
Change-Id: Ib94878a911238c977c35a8f8e3e5694cedc79a89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118705
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@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 3586969602c1..2af62c344940 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="8395" positionY="4386" sizeX="9178" sizeY="8066"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="8395" positionY="4386" sizeX="9178" sizeY="8066"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="8395" positionY="4386" sizeX="9178" sizeY="8066"
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="16433" positionY="9300" sizeX="1140" sizeY="850"
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="16433" positionY="9300" sizeX="1140"
sizeY="850" 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="">
+ <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="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="1141.000000" column2="0.000000"
column3="16433.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9300.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="1141.000000" column2="0.000000"
column3="16433.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9300.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="10198" positionY="11602" sizeX="928" sizeY="850"
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="10198" positionY="11602" sizeX="928"
sizeY="850" 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="">
+ <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="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="929.000000" column2="0.000000"
column3="10198.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="11602.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="929.000000" column2="0.000000"
column3="10198.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="11602.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="8395" positionY="7893" sizeX="1060" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+ <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="8395" positionY="7893" sizeX="1060"
sizeY="850" 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="">
+ <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="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="1061.000000" column2="0.000000"
column3="8395.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7893.000000"/>
+ <Line1 column1="1061.000000" column2="0.000000"
column3="8394.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7893.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
- <Line1 column1="1061.000000" column2="0.000000"
column3="8395.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7893.000000"/>
+ <Line1 column1="1061.000000" column2="0.000000"
column3="8394.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7893.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="10043" positionY="5033" sizeX="716" sizeY="850"
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="10043" positionY="5033" sizeX="716"
sizeY="850" 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="">
+ <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="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"/>
@@ -262,20 +262,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="717.000000" column2="0.000000"
column3="10043.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="5033.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="717.000000" column2="0.000000"
column3="10043.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="5033.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="14034" positionY="4386" sizeX="1034" sizeY="850"
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="14034" positionY="4386" sizeX="1034"
sizeY="850" 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="">
+ <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="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,36 +284,36 @@
<LineStart/>
<LineEnd/>
<Transformation>
- <Line1 column1="1035.000000" column2="0.000000"
column3="14034.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="4386.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="1035.000000" column2="0.000000"
column3="14034.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="4386.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="9179.000000" column2="0.000000"
column3="8395.000000"/>
- <Line2 column1="0.000000" column2="8067.000000"
column3="4386.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="9179.000000" column2="0.000000"
column3="8395.000000"/>
- <Line2 column1="0.000000" column2="8067.000000"
column3="4386.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="9179.000000" column2="0.000000" column3="8395.000000"/>
- <Line2 column1="0.000000" column2="8067.000000" column3="4386.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 a2719aaf69f5..d7e5c4a364f9 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShapes>
<XShape positionX="8207" 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="1910" positionY="3123" sizeX="22111" sizeY="10511"
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="1910" positionY="3124" sizeX="22111" sizeY="10509"
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"/>
@@ -40,11 +40,11 @@
<LineEnd/>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="8207" 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="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="850" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,20 +193,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9977.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9977.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
+ <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="850" 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="7129"
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="7129"
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"/>
@@ -216,20 +216,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3974.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="12784.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3974.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="12784.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+ <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="850" 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="7129"
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="7129"
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"/>
@@ -239,20 +239,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7819.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7819.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7819.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7819.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3813" positionY="3993" sizeX="6035" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
+ <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="3993" sizeX="6035"
sizeY="850" 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="7129"
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="7129"
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"/>
@@ -262,20 +262,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3813.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3993.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3994.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3813.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3993.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3994.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="14780" positionY="3123" sizeX="6140" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="14780" positionY="3123" sizeX="6140"
sizeY="850" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8832"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14780" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8832"
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"/>
@@ -285,50 +285,50 @@
<LineEnd/>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
-</XShapes>
+</XShapes>
\ No newline at end of file
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index 3c4cc8a5b51d..77a1ac06f80a 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
<XShapes>
<XShape positionX="8207" 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="1910" positionY="3123" sizeX="22111" sizeY="10511"
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="1910" positionY="3124" sizeX="22111" sizeY="10509"
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"/>
@@ -40,11 +40,11 @@
<LineEnd/>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
<XShape positionX="8207" 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="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1910" positionY="3123" sizeX="22111" sizeY="10511"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
+ <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17907" positionY="9977" sizeX="6114" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="850" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="17907" positionY="9977" sizeX="6114"
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7129"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,20 +193,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9977.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17907.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="9977.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="9977.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3974" positionY="12784" sizeX="6220" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
+ <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="850" 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="">
+ <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="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"/>
@@ -216,20 +216,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3974.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="12784.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3974.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="12784.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="12784.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1910" positionY="7819" sizeX="6167" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+ <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="850" 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="">
+ <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="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"/>
@@ -239,20 +239,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7819.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7819.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="7819.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="7819.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3813" positionY="3993" sizeX="6035" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
+ <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="3993" sizeX="6035"
sizeY="850" 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="">
+ <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="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"/>
@@ -262,20 +262,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3813.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3993.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3994.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3813.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3993.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3994.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="14780" positionY="3123" sizeX="6140" sizeY="850"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14780" positionY="3124" sizeX="6140" sizeY="849"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="14780" positionY="3123" sizeX="6140"
sizeY="850" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="14780" positionY="3124" sizeX="6140"
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="0"
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0"
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT"
textAnimationKind="NONE" textAnimationStartInside="false"
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE"
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -285,50 +285,50 @@
<LineEnd/>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14780.000000"/>
- <Line2 column1="0.000000" column2="851.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="850.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000"
column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000"
column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000"
column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
- <Line2 column1="0.000000" column2="10512.000000" column3="3123.000000"/>
+ <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
-</XShapes>
+</XShapes>
\ No newline at end of file
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
index c8327f6e3e95..6b182821f1c9 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-4.xml
@@ -14,7 +14,7 @@
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1737" positionY="2767" sizeX="21967" sizeY="11232"
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+ <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
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="1737" positionY="2767" sizeX="21967" sizeY="11232"
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="1737" positionY="2768" sizeX="21967" sizeY="11230"
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"/>
@@ -40,11 +40,11 @@
<LineEnd/>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000" column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1737" positionY="2767" sizeX="21967" sizeY="11232"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
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="1737" positionY="2767" sizeX="21967" sizeY="11232"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1737" positionY="2767" sizeX="21967" sizeY="11232"
type="com.sun.star.drawing.GroupShape">
+ <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
type="com.sun.star.drawing.GroupShape">
<XShapes>
- <XShape positionX="1737" positionY="2767" sizeX="21967" sizeY="11232"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
+ <XShape positionX="1737" positionY="2768" sizeX="21967" sizeY="11230"
type="com.sun.star.drawing.GroupShape"
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
<XShapes>
- <XShape positionX="17590" positionY="9958" sizeX="6114"
sizeY="1274" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+ <XShape positionX="17590" positionY="9958" sizeX="6114"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
<XShapes>
- <XShape positionX="17590" positionY="9958" sizeX="6114"
sizeY="1274" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 120 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="6114"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="Yellow - The color of
sun and honey 120 33%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="">
<FillTransparenceGradient style="LINEAR" startColor="000000"
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillGradient style="LINEAR" startColor="000000"
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50"
startIntensity="100" endIntensity="100" stepCount="0"/>
<FillHatch style="SINGLE" color="3465a4" distance="20"
angle="0"/>
@@ -193,20 +193,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17590.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="9958.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6115.000000" column2="0.000000"
column3="17590.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="9958.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="9958.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3770" positionY="12725" sizeX="6220"
sizeY="1274" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
+ <XShape positionX="3770" positionY="12725" sizeX="6220"
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="3770" positionY="12725" sizeX="6220"
sizeY="1274" 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="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="3770" positionY="12725" sizeX="6220"
sizeY="1273" 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="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="">
<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"/>
@@ -216,20 +216,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3770.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="12725.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="12725.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6221.000000" column2="0.000000"
column3="3770.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="12725.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="12725.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="1737" positionY="7614" sizeX="6167" sizeY="1274"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+ <XShape positionX="1737" positionY="7614" sizeX="6167" 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="1737" positionY="7614" sizeX="6167"
sizeY="1274" 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="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="1737" positionY="7614" sizeX="6167"
sizeY="1273" 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="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="">
<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"/>
@@ -239,20 +239,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1737.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="7614.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="7614.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6168.000000" column2="0.000000"
column3="1737.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="7614.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="7614.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="3614" positionY="3625" sizeX="6035" sizeY="1274"
type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
+ <XShape positionX="3614" positionY="3626" sizeX="6035" 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="3614" positionY="3625" sizeX="6035"
sizeY="1274" 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="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="3614" positionY="3626" sizeX="6035"
sizeY="1273" 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="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="">
<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"/>
@@ -262,20 +262,20 @@
<LineEnd/>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3614.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="3625.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="3626.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6036.000000" column2="0.000000"
column3="3614.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="3625.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="3626.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
- <XShape positionX="14509" positionY="2767" sizeX="6140"
sizeY="1274" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+ <XShape positionX="14509" positionY="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.GroupShape"
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
<XShapes>
- <XShape positionX="14509" positionY="2767" sizeX="6140"
sizeY="1274" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 50 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="2768" sizeX="6140"
sizeY="1273" type="com.sun.star.drawing.TextShape" text="White - The color of
milk and purity 50 14%" fontHeight="12.000000" fontColor="595959"
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false"
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM"
textLeftDistance="0" textRightDistance="0" textUpperDistance="0"
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="">
<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"/>
@@ -285,49 +285,49 @@
<LineEnd/>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14509.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000"
column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="6141.000000" column2="0.000000"
column3="14509.000000"/>
- <Line2 column1="0.000000" column2="1275.000000"
column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="1274.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000"
column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000"
column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000"
column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000"
column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000"
column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000" column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000" column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
</XShapes>
<Transformation>
<Line1 column1="21968.000000" column2="0.000000" column3="1737.000000"/>
- <Line2 column1="0.000000" column2="11233.000000" column3="2767.000000"/>
+ <Line2 column1="0.000000" column2="11231.000000" column3="2768.000000"/>
<Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
</Transformation>
</XShape>
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 22421c226234..63dd7b78cd44 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -575,7 +575,8 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
tools::Rectangle
aTmpRect(pEditEngine->pImpEditEngine->GetEditCursor(
&rInfo.rPortion, rInfo.pLine, nStartIndex,
GetCursorFlags::NONE));
- aTmpRect.Move(0,
pEditEngine->pImpEditEngine->getTopDirectionAware(rInfo.aArea));
+ const Size aLineOffset =
pEditEngine->pImpEditEngine->getTopLeftDocOffset(rInfo.aArea);
+ aTmpRect.Move(0, aLineOffset.Height());
// Only paint if in the visible range ...
if (aTmpRect.Top() > GetVisDocBottom())
@@ -596,7 +597,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
= pEditEngine->GetLineXPosStartEnd(&rInfo.rPortion,
rInfo.pLine);
aTmpRect.SetLeft(aLineXPosStartEnd.Min());
aTmpRect.SetRight(aLineXPosStartEnd.Max());
-
aTmpRect.Move(pEditEngine->pImpEditEngine->getLeftDirectionAware(rInfo.aArea),
0);
+ aTmpRect.Move(aLineOffset.Width(), 0);
ImplDrawHighlightRect(rTarget, aTmpRect.TopLeft(),
aTmpRect.BottomRight(),
pPolyPoly.get());
}
@@ -604,8 +605,6 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
{
sal_Int32 nTmpStartIndex = nStartIndex;
sal_Int32 nWritingDirStart, nTmpEndIndex;
- const sal_Int32 nLeftOffset
- =
pEditEngine->pImpEditEngine->getLeftDirectionAware(rInfo.aArea);
while (nTmpStartIndex < nEndIndex)
{
@@ -623,7 +622,7 @@ void ImpEditView::DrawSelectionXOR( EditSelection aTmpSel,
vcl::Region* pRegion,
... etc. - the rest is truncated
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
