chart2/qa/extras/xshape/data/reference/tdf90839-1.xml |  116 ++++++++---------
 chart2/qa/extras/xshape/data/reference/tdf90839-2.xml |  120 +++++++++---------
 chart2/qa/extras/xshape/data/reference/tdf90839-3.xml |  120 +++++++++---------
 sc/qa/unit/subsequent_filters_test2.cxx               |   24 +--
 sc/qa/unit/uicalc/uicalc.cxx                          |    4 
 sc/source/filter/excel/xetable.cxx                    |    2 
 sc/source/filter/inc/unitconverter.hxx                |   13 -
 sc/source/filter/oox/drawingbase.cxx                  |    4 
 sc/source/filter/oox/drawingfragment.cxx              |    2 
 sc/source/filter/oox/pagesettings.cxx                 |   13 -
 sc/source/filter/oox/unitconverter.cxx                |   33 +---
 sc/source/filter/oox/worksheethelper.cxx              |   25 +--
 12 files changed, 228 insertions(+), 248 deletions(-)

New commits:
commit 75036ee916046b9d1bfd705b368ffe94cc7cfa79
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Jan 27 09:18:41 2022 +0300
Commit:     Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Jan 27 15:12:48 2022 +0100

    Simplify oox::xls::UnitConverter and its uses
    
    Use o3tl::convert where it was used to convert between two fixed units.
    Simplify cases where several conversions were performed in a row.
    Use EMUs as UnitConverter base unit, to have simplest quotients and
    increase accuracy.
    
    Change-Id: I07c197dba470cfe289cef84e82b78547635cf9af
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129016
    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 eb48c3f7293d..b2dc41548810 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <XShapes>
- <XShape positionX="0" positionY="0" sizeX="26494" sizeY="18368" 
type="com.sun.star.drawing.RectangleShape" name="CID/Page=" 
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="ffffff" 
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="0" positionY="0" sizeX="26468" sizeY="18368" 
type="com.sun.star.drawing.RectangleShape" name="CID/Page=" 
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="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"/>
@@ -9,14 +9,14 @@
   <LineStart/>
   <LineEnd/>
   <Transformation>
-   <Line1 column1="26495.000000" column2="0.000000" column3="0.000000"/>
+   <Line1 column1="26469.000000" column2="0.000000" column3="0.000000"/>
    <Line2 column1="0.000000" column2="18369.000000" column3="0.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
  </XShape>
- <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+ <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9723" 
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="">
+   <XShape positionX="8196" 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"/>
     <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"/>
@@ -25,12 +25,12 @@
     <LineStart/>
     <LineEnd/>
     <Transformation>
-     <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+     <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
      <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
    </XShape>
-   <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" 
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="8196" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.RectangleShape" name="PlotAreaIncludingAxes" 
fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="0" 
textRightDistance="0" textUpperDistance="0" textLowerDistance="0" 
textMaximumFrameHeight="0" textMaximumFrameWidth="0" textMinimumFrameHeight="0" 
textMinimumFrameWidth="0" textAnimationAmount="0" textAnimationCount="0" 
textAnimationDelay="0" textAnimationDirection="LEFT" textAnimationKind="NONE" 
textAnimationStartInside="false" textAnimationStopInside="false" 
textWritingMode="LR_TB" fillStyle="NONE" fillColor="729fcf" 
fillTransparence="0" fillTransparenceGradientName="">
     <FillTransparenceGradient style="LINEAR" startColor="000000" 
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" 
startIntensity="100" endIntensity="100" stepCount="0"/>
     <FillGradient style="LINEAR" startColor="000000" endColor="ffffff" 
angle="0" border="0" xOffset="50" yOffset="50" startIntensity="100" 
endIntensity="100" stepCount="0"/>
     <FillHatch style="SINGLE" color="3465a4" distance="20" angle="0"/>
@@ -39,18 +39,18 @@
     <LineStart/>
     <LineEnd/>
     <Transformation>
-     <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+     <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
      <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
    </XShape>
-   <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape">
+   <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape">
     <XShapes>
-     <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape">
+     <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape">
       <XShapes>
-       <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
+       <XShape positionX="8196" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
         <XShapes>
-         <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.RectangleShape" 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="d9d9d9" 
fillTransparence="0" fillTransparenceGradientName="">
+         <XShape positionX="8196" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.RectangleShape" 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="d9d9d9" 
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"/>
@@ -59,25 +59,25 @@
           <LineStart/>
           <LineEnd/>
           <Transformation>
-           <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+           <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
            <Line2 column1="0.000000" column2="9722.000000" 
column3="3821.000000"/>
            <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
           </Transformation>
          </XShape>
         </XShapes>
         <Transformation>
-         <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+         <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
          <Line2 column1="0.000000" column2="9722.000000" 
column3="3821.000000"/>
          <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
         </Transformation>
        </XShape>
-       <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
+       <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
         <XShapes>
-         <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape">
+         <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape">
           <XShapes>
-           <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
+           <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
             <XShapes>
-             <XShape positionX="13067" positionY="5243" sizeX="4861" 
sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17762,9938,22457,11196/D=0:CS=0:CT=0:Series=0:Point=0"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4f81bd" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="13056" positionY="5243" sizeX="4861" 
sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17751,9938,22446,11196/D=0:CS=0:CT=0:Series=0:Point=0"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4f81bd" 
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"/>
@@ -86,12 +86,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4861.000000" column2="0.000000" 
column3="13067.000000"/>
+               <Line1 column1="4861.000000" column2="0.000000" 
column3="13056.000000"/>
                <Line2 column1="0.000000" column2="8132.000000" 
column3="5243.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8225" positionY="8680" sizeX="6100" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10279,12661,7491,16643/D=0:CS=0:CT=0:Series=0:Point=1"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="c0504d" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8214" positionY="8680" sizeX="6100" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10268,12661,7480,16643/D=0:CS=0:CT=0:Series=0:Point=1"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="c0504d" 
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"/>
@@ -100,12 +100,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="6100.000000" column2="0.000000" 
column3="8225.000000"/>
+               <Line1 column1="6100.000000" column2="0.000000" 
column3="8214.000000"/>
                <Line2 column1="0.000000" column2="4861.000000" 
column3="8680.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8207" positionY="7422" sizeX="4860" 
sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8225,8256,3383,7833/D=0:CS=0:CT=0:Series=0:Point=2"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="9bbb59" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8196" positionY="7422" sizeX="4860" 
sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8214,8256,3372,7833/D=0:CS=0:CT=0:Series=0:Point=2"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="9bbb59" 
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"/>
@@ -114,12 +114,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4860.000000" column2="0.000000" 
column3="8207.000000"/>
+               <Line1 column1="4860.000000" column2="0.000000" 
column3="8196.000000"/>
                <Line2 column1="0.000000" column2="1682.000000" 
column3="7422.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8372" positionY="3838" sizeX="4695" 
sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9943,4957,6818,1233/D=0:CS=0:CT=0:Series=0:Point=3"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="8064a2" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8361" positionY="3838" sizeX="4695" 
sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9932,4957,6807,1233/D=0:CS=0:CT=0:Series=0:Point=3"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="8064a2" 
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"/>
@@ -128,12 +128,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4695.000000" column2="0.000000" 
column3="8372.000000"/>
+               <Line1 column1="4695.000000" column2="0.000000" 
column3="8361.000000"/>
                <Line2 column1="0.000000" column2="4842.000000" 
column3="3838.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="12643" positionY="3819" sizeX="3861" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14729,4113,16392,-454/D=0:CS=0:CT=0:Series=0:Point=4"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4bacc6" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="12632" positionY="3819" sizeX="3861" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14718,4113,16381,-454/D=0:CS=0:CT=0:Series=0:Point=4"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4bacc6" 
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"/>
@@ -142,48 +142,48 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="3861.000000" column2="0.000000" 
column3="12643.000000"/>
+               <Line1 column1="3861.000000" column2="0.000000" 
column3="12632.000000"/>
                <Line2 column1="0.000000" column2="4861.000000" 
column3="3819.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
             </XShapes>
             <Transformation>
-             <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+             <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
              <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
              <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
             </Transformation>
            </XShape>
           </XShapes>
           <Transformation>
-           <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+           <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
            <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
            <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
           </Transformation>
          </XShape>
         </XShapes>
         <Transformation>
-         <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+         <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
          <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
          <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
         </Transformation>
        </XShape>
       </XShapes>
       <Transformation>
-       <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+       <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
        <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/>
        <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
       </Transformation>
      </XShape>
-     <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065" 
type="com.sun.star.drawing.GroupShape">
+     <XShape positionX="8383" positionY="4386" sizeX="9180" sizeY="8065" 
type="com.sun.star.drawing.GroupShape">
       <XShapes>
-       <XShape positionX="8394" positionY="4386" sizeX="9180" sizeY="8065" 
type="com.sun.star.drawing.GroupShape">
+       <XShape positionX="8383" positionY="4386" sizeX="9180" sizeY="8065" 
type="com.sun.star.drawing.GroupShape">
         <XShapes>
-         <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=">
+         <XShape positionX="8383" 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="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">
+           <XShape positionX="16423" 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="16434" positionY="9300" sizeX="1140" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow&#10;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="16423" positionY="9300" sizeX="1140" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow&#10;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="16434.000000"/>
+               <Line1 column1="1141.000000" column2="0.000000" 
column3="16423.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="16434.000000"/>
+             <Line1 column1="1141.000000" column2="0.000000" 
column3="16423.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="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">
+           <XShape positionX="10186" 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="10197" positionY="11602" sizeX="928" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black&#10;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="10186" positionY="11602" sizeX="928" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black&#10;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="10197.000000"/>
+               <Line1 column1="929.000000" column2="0.000000" 
column3="10186.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="10197.000000"/>
+             <Line1 column1="929.000000" column2="0.000000" 
column3="10186.000000"/>
              <Line2 column1="0.000000" column2="850.000000" 
column3="11602.000000"/>
              <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
             </Transformation>
            </XShape>
-           <XShape positionX="8394" positionY="7893" sizeX="1060" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+           <XShape positionX="8383" positionY="7893" sizeX="1060" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
             <XShapes>
-             <XShape positionX="8394" positionY="7893" sizeX="1060" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green&#10;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="8383" positionY="7893" sizeX="1060" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green&#10;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="8394.000000"/>
+               <Line1 column1="1061.000000" column2="0.000000" 
column3="8383.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="8394.000000"/>
+             <Line1 column1="1061.000000" column2="0.000000" 
column3="8383.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="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
+           <XShape positionX="10032" 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="849" type="com.sun.star.drawing.TextShape" text="Red&#10;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="10032" positionY="5033" sizeX="716" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red&#10;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"/>
@@ -261,21 +261,21 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="717.000000" column2="0.000000" 
column3="10043.000000"/>
+               <Line1 column1="717.000000" column2="0.000000" 
column3="10032.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"/>
+             <Line1 column1="717.000000" column2="0.000000" 
column3="10032.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="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">
+           <XShape positionX="14024" 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="14035" positionY="4386" sizeX="1034" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="White&#10;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="14024" positionY="4386" sizeX="1034" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="White&#10;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,49 +284,49 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="1035.000000" column2="0.000000" 
column3="14035.000000"/>
+               <Line1 column1="1035.000000" column2="0.000000" 
column3="14024.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="14035.000000"/>
+             <Line1 column1="1035.000000" column2="0.000000" 
column3="14024.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="9181.000000" column2="0.000000" 
column3="8394.000000"/>
+           <Line1 column1="9181.000000" column2="0.000000" 
column3="8383.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="9181.000000" column2="0.000000" 
column3="8394.000000"/>
+         <Line1 column1="9181.000000" column2="0.000000" 
column3="8383.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="9181.000000" column2="0.000000" column3="8394.000000"/>
+       <Line1 column1="9181.000000" column2="0.000000" column3="8383.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="9722.000000" column2="0.000000" column3="8207.000000"/>
+     <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
      <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
    </XShape>
   </XShapes>
   <Transformation>
-   <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+   <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
    <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
index 639c32d00491..db2f238325cc 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-2.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <XShapes>
- <XShape positionX="0" positionY="0" sizeX="26494" sizeY="18368" 
type="com.sun.star.drawing.RectangleShape" name="CID/Page=" 
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="ffffff" 
fillTransparence="0" fillTransparenceGradientName="">
+ <XShape positionX="0" positionY="0" sizeX="26468" sizeY="18368" 
type="com.sun.star.drawing.RectangleShape" name="CID/Page=" 
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="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"/>
@@ -9,14 +9,14 @@
   <LineStart/>
   <LineEnd/>
   <Transformation>
-   <Line1 column1="26495.000000" column2="0.000000" column3="0.000000"/>
+   <Line1 column1="26469.000000" column2="0.000000" column3="0.000000"/>
    <Line2 column1="0.000000" column2="18369.000000" column3="0.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
  </XShape>
- <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0">
+ <XShape positionX="1899" 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="">
+   <XShape positionX="8196" 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"/>
     <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"/>
@@ -25,12 +25,12 @@
     <LineStart/>
     <LineEnd/>
     <Transformation>
-     <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+     <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
      <Line2 column1="0.000000" column2="9722.000000" column3="3821.000000"/>
      <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
     </Transformation>
    </XShape>
-   <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="">
+   <XShape positionX="1899" 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"/>
@@ -39,18 +39,18 @@
     <LineStart/>
     <LineEnd/>
     <Transformation>
-     <Line1 column1="22112.000000" column2="0.000000" column3="1910.000000"/>
+     <Line1 column1="22112.000000" column2="0.000000" column3="1899.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="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape">
+   <XShape positionX="1899" 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">
+     <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9723" 
type="com.sun.star.drawing.GroupShape">
       <XShapes>
-       <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
+       <XShape positionX="8196" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.GroupShape" name="PlotAreaExcludingAxes">
         <XShapes>
-         <XShape positionX="8207" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.RectangleShape" 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="d9d9d9" 
fillTransparence="0" fillTransparenceGradientName="">
+         <XShape positionX="8196" positionY="3821" sizeX="9721" sizeY="9721" 
type="com.sun.star.drawing.RectangleShape" 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="d9d9d9" 
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"/>
@@ -59,25 +59,25 @@
           <LineStart/>
           <LineEnd/>
           <Transformation>
-           <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+           <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
            <Line2 column1="0.000000" column2="9722.000000" 
column3="3821.000000"/>
            <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
           </Transformation>
          </XShape>
         </XShapes>
         <Transformation>
-         <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+         <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
          <Line2 column1="0.000000" column2="9722.000000" 
column3="3821.000000"/>
          <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
         </Transformation>
        </XShape>
-       <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
+       <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="testonly;CooContainer=XXX_CID">
         <XShapes>
-         <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape">
+         <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape">
           <XShapes>
-           <XShape positionX="8207" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
+           <XShape positionX="8196" positionY="3819" sizeX="9721" sizeY="9722" 
type="com.sun.star.drawing.GroupShape" name="CID/D=0:CS=0:CT=0:Series=0">
             <XShapes>
-             <XShape positionX="13067" positionY="5243" sizeX="4861" 
sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17762,9938,22457,11196/D=0:CS=0:CT=0:Series=0:Point=0"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4f81bd" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="13056" positionY="5243" sizeX="4861" 
sizeY="8132" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,17751,9938,22446,11196/D=0:CS=0:CT=0:Series=0:Point=0"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4f81bd" 
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"/>
@@ -86,12 +86,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4861.000000" column2="0.000000" 
column3="13067.000000"/>
+               <Line1 column1="4861.000000" column2="0.000000" 
column3="13056.000000"/>
                <Line2 column1="0.000000" column2="8132.000000" 
column3="5243.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8225" positionY="8680" sizeX="6100" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10279,12661,7491,16643/D=0:CS=0:CT=0:Series=0:Point=1"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="c0504d" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8214" positionY="8680" sizeX="6100" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,10268,12661,7480,16643/D=0:CS=0:CT=0:Series=0:Point=1"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="c0504d" 
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"/>
@@ -100,12 +100,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="6100.000000" column2="0.000000" 
column3="8225.000000"/>
+               <Line1 column1="6100.000000" column2="0.000000" 
column3="8214.000000"/>
                <Line2 column1="0.000000" column2="4861.000000" 
column3="8680.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8207" positionY="7422" sizeX="4860" 
sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8225,8256,3383,7833/D=0:CS=0:CT=0:Series=0:Point=2"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="9bbb59" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8196" positionY="7422" sizeX="4860" 
sizeY="1682" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,8214,8256,3372,7833/D=0:CS=0:CT=0:Series=0:Point=2"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="9bbb59" 
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"/>
@@ -114,12 +114,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4860.000000" column2="0.000000" 
column3="8207.000000"/>
+               <Line1 column1="4860.000000" column2="0.000000" 
column3="8196.000000"/>
                <Line2 column1="0.000000" column2="1682.000000" 
column3="7422.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="8372" positionY="3838" sizeX="4695" 
sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9943,4957,6818,1233/D=0:CS=0:CT=0:Series=0:Point=3"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="8064a2" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="8361" positionY="3838" sizeX="4695" 
sizeY="4842" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,9932,4957,6807,1233/D=0:CS=0:CT=0:Series=0:Point=3"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="8064a2" 
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"/>
@@ -128,12 +128,12 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="4695.000000" column2="0.000000" 
column3="8372.000000"/>
+               <Line1 column1="4695.000000" column2="0.000000" 
column3="8361.000000"/>
                <Line2 column1="0.000000" column2="4842.000000" 
column3="3838.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
-             <XShape positionX="12643" positionY="3819" sizeX="3861" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14729,4113,16392,-454/D=0:CS=0:CT=0:Series=0:Point=4"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4bacc6" 
fillTransparence="0" fillTransparenceGradientName="">
+             <XShape positionX="12632" positionY="3819" sizeX="3861" 
sizeY="4861" type="com.sun.star.drawing.ClosedBezierShape" 
name="CID/MultiClick:DragMethod=PieSegmentDragging:DragParameter=0,14718,4113,16381,-454/D=0:CS=0:CT=0:Series=0:Point=4"
 fontHeight="12.000000" fontColor="ffffffff" textAutoGrowHeight="true" 
textAutoGrowWidth="false" textContourFrame="false" textFitToSize="NONE" 
textHorizontalAdjust="CENTER" textVerticalAdjust="CENTER" textLeftDistance="26" 
textRightDistance="26" textUpperDistance="26" textLowerDistance="26" 
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="SOLID" fillColor="4bacc6" 
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"/>
@@ -142,48 +142,48 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="3861.000000" column2="0.000000" 
column3="12643.000000"/>
+               <Line1 column1="3861.000000" column2="0.000000" 
column3="12632.000000"/>
                <Line2 column1="0.000000" column2="4861.000000" 
column3="3819.000000"/>
                <Line3 column1="0.000000" column2="0.000000" 
column3="1.000000"/>
               </Transformation>
              </XShape>
             </XShapes>
             <Transformation>
-             <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+             <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
              <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
              <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
             </Transformation>
            </XShape>
           </XShapes>
           <Transformation>
-           <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+           <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
            <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
            <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
           </Transformation>
          </XShape>
         </XShapes>
         <Transformation>
-         <Line1 column1="9722.000000" column2="0.000000" 
column3="8207.000000"/>
+         <Line1 column1="9722.000000" column2="0.000000" 
column3="8196.000000"/>
          <Line2 column1="0.000000" column2="9723.000000" 
column3="3819.000000"/>
          <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
         </Transformation>
        </XShape>
       </XShapes>
       <Transformation>
-       <Line1 column1="9722.000000" column2="0.000000" column3="8207.000000"/>
+       <Line1 column1="9722.000000" column2="0.000000" column3="8196.000000"/>
        <Line2 column1="0.000000" column2="9724.000000" column3="3819.000000"/>
        <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
       </Transformation>
      </XShape>
-     <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape">
+     <XShape positionX="1899" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape">
       <XShapes>
-       <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape">
+       <XShape positionX="1899" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape">
         <XShapes>
-         <XShape positionX="1910" positionY="3124" sizeX="22111" sizeY="10509" 
type="com.sun.star.drawing.GroupShape" 
name="CID/D=0:CS=0:CT=0:Series=0:DataLabels=">
+         <XShape positionX="1899" 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="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=0">
+           <XShape positionX="17896" 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="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of 
sun and honey&#10;33%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="17896" positionY="9977" sizeX="6114" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Yellow - The color of 
sun and honey&#10;33%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="TOP" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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"/>
@@ -192,21 +192,21 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="6115.000000" column2="0.000000" 
column3="17907.000000"/>
+               <Line1 column1="6115.000000" column2="0.000000" 
column3="17896.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"/>
+             <Line1 column1="6115.000000" column2="0.000000" 
column3="17896.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="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
+           <XShape positionX="3963" positionY="12784" sizeX="6220" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=1">
             <XShapes>
-             <XShape positionX="3974" positionY="12784" sizeX="6220" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of 
night and coffee&#10;28%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="3963" positionY="12784" sizeX="6220" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Black - The color of 
night and coffee&#10;28%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="TOP" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7118" 
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="6221.000000" column2="0.000000" 
column3="3974.000000"/>
+               <Line1 column1="6221.000000" column2="0.000000" 
column3="3963.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"/>
+             <Line1 column1="6221.000000" column2="0.000000" 
column3="3963.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="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
+           <XShape positionX="1899" positionY="7819" sizeX="6167" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=2">
             <XShapes>
-             <XShape positionX="1910" positionY="7819" sizeX="6167" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of 
grass and hope&#10;6%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="1899" positionY="7819" sizeX="6167" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Green - The color of 
grass and hope&#10;6%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="CENTER" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7118" 
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="6168.000000" column2="0.000000" 
column3="1910.000000"/>
+               <Line1 column1="6168.000000" column2="0.000000" 
column3="1899.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"/>
+             <Line1 column1="6168.000000" column2="0.000000" 
column3="1899.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="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">
+           <XShape positionX="3802" positionY="3994" sizeX="6035" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=3">
             <XShapes>
-             <XShape positionX="3813" positionY="3994" sizeX="6035" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose 
and passion&#10;19%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="3802" positionY="3994" sizeX="6035" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="Red - The color of rose 
and passion&#10;19%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="RIGHT" textVerticalAdjust="BOTTOM" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="7118" 
textMinimumFrameHeight="1" textMinimumFrameWidth="1" textAnimationAmount="0" 
textAnimationCount="0" textAnimationDelay="0" textAnimationDirection="LEFT" 
textAnimationKind="NONE" textAnimationStartInside="false" 
textAnimationStopInside="false" textWritingMode="LR_TB" fillStyle="NONE" 
fillColor="ffffff" fillTransparence="0" fillTransparenceGradientName="">
               <FillTransparenceGradient style="LINEAR" startColor="000000" 
endColor="000000" angle="0" border="0" xOffset="50" yOffset="50" 
startIntensity="100" endIntensity="100" stepCount="0"/>
               <FillGradient style="LINEAR" startColor="000000" 
endColor="ffffff" angle="0" border="0" xOffset="50" yOffset="50" 
startIntensity="100" endIntensity="100" stepCount="0"/>
               <FillHatch style="SINGLE" color="3465a4" distance="20" 
angle="0"/>
@@ -261,21 +261,21 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="6036.000000" column2="0.000000" 
column3="3813.000000"/>
+               <Line1 column1="6036.000000" column2="0.000000" 
column3="3802.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"/>
+             <Line1 column1="6036.000000" column2="0.000000" 
column3="3802.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="3124" sizeX="6140" sizeY="849" 
type="com.sun.star.drawing.GroupShape" 
name="CID/MultiClick/CID/D=0:CS=0:CT=0:Series=0:DataLabels=:DataLabel=4">
+           <XShape positionX="14769" 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="3124" sizeX="6140" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of 
milk and purity&#10;14%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="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="14769" positionY="3124" sizeX="6140" 
sizeY="849" type="com.sun.star.drawing.TextShape" text="White - The color of 
milk and purity&#10;14%" fontHeight="12.000000" fontColor="595959" 
textAutoGrowHeight="true" textAutoGrowWidth="true" textContourFrame="false" 
textFitToSize="NONE" textHorizontalAdjust="LEFT" textVerticalAdjust="BOTTOM" 
textLeftDistance="0" textRightDistance="0" textUpperDistance="0" 
textLowerDistance="0" textMaximumFrameHeight="0" textMaximumFrameWidth="8823" 
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,51 +284,53 @@
               <LineStart/>
               <LineEnd/>
               <Transformation>
-               <Line1 column1="6141.000000" column2="0.000000" 
column3="14780.000000"/>
+               <Line1 column1="6141.000000" column2="0.000000" 
column3="14769.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"/>
+             <Line1 column1="6141.000000" column2="0.000000" 
column3="14769.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"/>
+           <Line1 column1="22112.000000" column2="0.000000" 
column3="1899.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"/>
+         <Line1 column1="22112.000000" column2="0.000000" 
column3="1899.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"/>
+       <Line1 column1="22112.000000" column2="0.000000" column3="1899.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"/>
+     <Line1 column1="22112.000000" column2="0.000000" column3="1899.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"/>
+   <Line1 column1="22112.000000" column2="0.000000" column3="1899.000000"/>
    <Line2 column1="0.000000" column2="10510.000000" column3="3124.000000"/>
    <Line3 column1="0.000000" column2="0.000000" column3="1.000000"/>
   </Transformation>
  </XShape>
-</XShapes>
\ No newline at end of file
+</XShapes>
+
+
diff --git a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml 
b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
index 77be20e2147f..bce6dc64f675 100644
--- a/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
+++ b/chart2/qa/extras/xshape/data/reference/tdf90839-3.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <XShapes>

... etc. - the rest is truncated

Reply via email to