source

Regina Henschel (via logerrit) Tue, 25 Jun 2024 07:22:10 -0700

 include/sax/tools/converter.hxx                        |    8 
 sax/Library_sax.mk                                     |    1 
 sax/source/tools/converter.cxx                         |   50 ++
 xmloff/qa/unit/data/tdf161483_CircleStartEndAngle.fodg |  397 ++++++++++++++++
 xmloff/qa/unit/data/tdf161483_ShadowSlant.fodg         |  419 +++++++++++++++++
 xmloff/qa/unit/draw.cxx                                |   52 ++
 xmloff/source/draw/ximp3dscene.cxx                     |    6 
 xmloff/source/draw/ximpshap.cxx                        |    8 
 8 files changed, 936 insertions(+), 5 deletions(-)


New commits:
commit 9f62c7a0f2333d1b7d179a43b3b0341dba7554a1
Author:     Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Sun Jun 23 20:24:44 2024 +0200
Commit:     Regina Henschel <rb.hensc...@t-online.de>
CommitDate: Tue Jun 25 16:21:42 2024 +0200

    tdf#161483 enable LO to read ODF angle units
    
    ODF uses in several places data type 'angle' (18.3.1, ODF 1.3). That is
    a double followed by unit identifier 'deg', 'grad' or 'rad' or a unit
    less value in degrees. LO uses in the API angles in degrees, 1/10 of
    degrees and 1/100 of degrees in data types 'double', 'short' and 'long'.
    
    Without the fix LO does not interpret the units, but takes only the
    number part.
    
    Change-Id: Ib3f2a518a25199e3cf7a7a8572e169785f75c427
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169360
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
    Tested-by: Jenkins
    Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>

diff --git a/include/sax/tools/converter.hxx b/include/sax/tools/converter.hxx
index bb97acc595ac..e6568faffbd6 100644
--- a/include/sax/tools/converter.hxx
+++ b/include/sax/tools/converter.hxx
@@ -210,6 +210,14 @@ public:
     static bool convert10thDegAngle(sal_Int16& rAngle, std::string_view 
rString,
                                     bool isWrongOOo10thDegAngle);
 
+    /** convert SVG angle to number, in 1/nFactor of degrees, range 
[0..nFactor*360[ */
+    static bool convertAngle(double& rAngle, std::u16string_view rString,
+                             const sal_uInt16& nFactor = 1);
+
+    /** convert SVG angle to number, in 1/nFactor of degrees, range 
[0..nFactor*360[ */
+    static bool convertAngle(double& rAngle, std::string_view rString,
+                             const sal_uInt16& nFactor = 1);
+
     /** convert double to XMLSchema-2 "duration" string; negative durations 
allowed */
     static void convertDuration(OUStringBuffer& rBuffer,
                                 const double fTime);
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index f65fcf05b669..7188041f1bf4 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_Library_use_externals,sax,\
 ))
 
 $(eval $(call gb_Library_use_libraries,sax,\
+    basegfx \
        comphelper \
        cppu \
        cppuhelper \
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index bc2342d5b508..204033a7e64a 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -802,6 +802,56 @@ bool Converter::convert10thDegAngle(sal_Int16& rAngle, 
std::string_view rString,
     return bRet;
 }
 
+/** convert SVG angle to number, in 1/nFactor of degrees, range 
[0..nFactor*360[ */
+bool Converter::convertAngle(double& rAngle, std::u16string_view rString, 
const sal_uInt16& nFactor)
+{
+    // ODF uses in several places angles in data type 'angle' (18.3.1, ODF 
1.3). That is a double
+    // followed by unit identifier deg, grad or rad or a unitless value in 
degrees. LO uses angles
+    // in degrees, 1/10 of degrees and 1/100 of degrees in various data types.
+    // This method converts ODF 'angle' to double considering nFactor and 
normalizes it to range
+    // [0..nFactor*360[. Further type converting and range restriction are 
done by the caller.
+    bool bRet = ::sax::Converter::convertDouble(rAngle, rString);
+    if (bRet)
+    {
+        //degrees
+        if (std::u16string_view::npos != rString.find(u"grad"))
+            rAngle *= 0.9; // 360deg = 400grad
+        else if (std::u16string_view::npos != rString.find(u"rad"))
+            rAngle = basegfx::rad2deg(rAngle);
+        // 1/nFactor of degrees in range [0..nFactor*360]
+        if (nFactor > 0)
+            rAngle = basegfx::snapToZeroRange(rAngle * nFactor, nFactor * 
360.0);
+        else
+            return false;
+    }
+    return bRet;
+}
+
+/** convert SVG angle to number, in 1/nFactor of degrees, range 
[0..nFactor*360[ */
+bool Converter::convertAngle(double& rAngle, std::string_view rString, const 
sal_uInt16& nFactor)
+{
+    // ODF uses in several places angles in data type 'angle' (18.3.1, ODF 
1.3). That is a double
+    // followed by unit identifier deg, grad or rad or a unitless value in 
degrees. LO uses angles
+    // in degrees, 1/10 of degrees and 1/100 of degrees in various data types.
+    // This method converts ODF 'angle' to double considering nFactor and 
normalizes it to range
+    // [0..nFactor*360[. Further type converting and range restriction are 
done by the caller.
+    bool bRet = ::sax::Converter::convertDouble(rAngle, rString);
+    if (bRet)
+    {
+        // degrees
+        if (std::u16string_view::npos != rString.find("grad"))
+            rAngle *= 0.9; // 360deg = 400grad
+        else if (std::u16string_view::npos != rString.find("rad"))
+            rAngle = basegfx::rad2deg(rAngle);
+        // 1/nFactor of degrees in range [0..nFactor*360]
+        if (nFactor > 0)
+            rAngle = basegfx::snapToZeroRange(rAngle * nFactor, nFactor * 
360.0);
+        else
+            return false;
+    }
+    return bRet;
+}
+
 /** convert double to ISO "duration" string; negative durations allowed */
 void Converter::convertDuration(OUStringBuffer& rBuffer,
                                 const double fTime)
diff --git a/xmloff/qa/unit/data/tdf161483_CircleStartEndAngle.fodg 
b/xmloff/qa/unit/data/tdf161483_CircleStartEndAngle.fodg
new file mode 100644
index 000000000000..66b815322be4
--- /dev/null
+++ b/xmloff/qa/unit/data/tdf161483_CircleStartEndAngle.fodg
@@ -0,0 +1,397 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/200
 4/writer" xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
 :css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.graphics">
+ <office:meta>
+  <meta:generator>LOmyBuild/25.2.0.0.alpha0$Windows_X86_64 
LibreOffice_project/5a7283a0eb880c5273ea48b0d1a6f881c4297b1a
+  </meta:generator>
+  <dc:title>24x16</dc:title>
+  <meta:initial-creator>Regina Henschel</meta:initial-creator>
+  <meta:creation-date>2024-06-23T16:09:12</meta:creation-date>
+  <dc:creator>Regina Henschel</dc:creator>
+  <dc:date>2024-06-23T16:11:32</dc:date>
+  <meta:document-statistic meta:object-count="1"/>
+ </office:meta>
+ <office:settings>
+  <config:config-item-set config:name="ooo:view-settings">
+   <config:config-item config:name="VisibleAreaTop" 
config:type="int">-1494</config:config-item>
+   <config:config-item config:name="VisibleAreaLeft" 
config:type="int">-349</config:config-item>
+   <config:config-item config:name="VisibleAreaWidth" 
config:type="int">24728</config:config-item>
+   <config:config-item config:name="VisibleAreaHeight" 
config:type="int">19000</config:config-item>
+   <config:config-item-map-indexed config:name="Views">
+    <config:config-item-map-entry>
+     <config:config-item config:name="ViewId" 
config:type="string">view1</config:config-item>
+     <config:config-item config:name="GridIsVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="GridIsFront" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToGrid" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToPageMargins" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToSnapLines" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsSnapToObjectFrame" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToObjectPoints" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsPlusHandlesAlwaysVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsFrameDragSingles" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="EliminatePolyPointLimitAngle" 
config:type="int">1500</config:config-item>
+     <config:config-item config:name="IsEliminatePolyPoints" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="VisibleLayers" 
config:type="base64Binary">Hw==</config:config-item>
+     <config:config-item config:name="PrintableLayers" 
config:type="base64Binary">Hw==</config:config-item>
+     <config:config-item config:name="LockedLayers" 
config:type="base64Binary"/>
+     <config:config-item config:name="NoAttribs" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="NoColors" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="RulerIsVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="PageKind" 
config:type="short">0</config:config-item>
+     <config:config-item config:name="SelectedPage" 
config:type="short">0</config:config-item>
+     <config:config-item config:name="IsLayerMode" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsDoubleClickTextEdit" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsClickChangeRotation" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="SlidesPerRow" 
config:type="short">4</config:config-item>
+     <config:config-item config:name="EditMode" 
config:type="int">0</config:config-item>
+     <config:config-item config:name="VisibleAreaTop" 
config:type="int">-244</config:config-item>
+     <config:config-item config:name="VisibleAreaLeft" 
config:type="int">-2551</config:config-item>
+     <config:config-item config:name="VisibleAreaWidth" 
config:type="int">29363</config:config-item>
+     <config:config-item config:name="VisibleAreaHeight" 
config:type="int">16609</config:config-item>
+     <config:config-item config:name="GridCoarseWidth" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridCoarseHeight" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridFineWidth" 
config:type="int">100</config:config-item>
+     <config:config-item config:name="GridFineHeight" 
config:type="int">100</config:config-item>
+     <config:config-item config:name="GridSnapWidthXNumerator" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridSnapWidthXDenominator" 
config:type="int">5</config:config-item>
+     <config:config-item config:name="GridSnapWidthYNumerator" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridSnapWidthYDenominator" 
config:type="int">5</config:config-item>
+     <config:config-item config:name="IsAngleSnapEnabled" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="SnapAngle" 
config:type="int">1500</config:config-item>
+     <config:config-item config:name="ZoomOnPage" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="AnchoredTextOverflowLegacy" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="LegacySingleLineFontwork" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="ConnectorUseSnapRect" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IgnoreBreakAfterMultilineField" 
config:type="boolean">false</config:config-item>
+    </config:config-item-map-entry>
+   </config:config-item-map-indexed>
+  </config:config-item-set>
+  <config:config-item-set config:name="ooo:configuration-settings">
+   <config:config-item config:name="DefaultTabStop" 
config:type="int">1251</config:config-item>
+   <config:config-item config:name="ImagePreferredDPI" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="PrinterPaperFromSetup" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintPageName" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintDate" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintTilePage" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintTime" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintHiddenPages" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintFitPage" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedComplexScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBooklet" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedLatinScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBookletFront" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBookletBack" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintQuality" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="DashTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sod</config:config-item>
+   <config:config-item config:name="ColorTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/html.soc</config:config-item>
+   <config:config-item config:name="ParagraphSummation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="LineEndTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soe</config:config-item>
+   <config:config-item config:name="HatchTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soh</config:config-item>
+   <config:config-item config:name="UpdateFromTemplate" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="GradientTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sog</config:config-item>
+   <config:config-item config:name="BitmapTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sob</config:config-item>
+   <config:config-item config:name="ApplyUserData" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SaveThumbnail" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PageNumberFormat" 
config:type="int">4</config:config-item>
+   <config:config-item config:name="CharacterCompressionType" 
config:type="short">0</config:config-item>
+   <config:config-item config:name="IsKernAsianPunctuation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterIndependentLayout" 
config:type="string">low-resolution</config:config-item>
+   <config:config-item config:name="LoadReadonly" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SaveVersionOnClose" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedOnlyUsedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedAsianScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="MeasureUnit" 
config:type="short">2</config:config-item>
+   <config:config-item config:name="ScaleNumerator" 
config:type="int">1</config:config-item>
+   <config:config-item config:name="ScaleDenominator" 
config:type="int">1</config:config-item>
+  </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+  <office:script script:language="ooo:Basic">
+   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+  <style:font-face style:name="Liberation Sans" 
svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Serif" 
svg:font-family="&apos;Liberation Serif&apos;" 
style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida 
Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Microsoft YaHei" 
svg:font-family="&apos;Microsoft YaHei&apos;" 
style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Noto Sans" svg:font-family="&apos;Noto 
Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Segoe UI" svg:font-family="&apos;Segoe 
UI&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+  <draw:gradient draw:name="Filled" draw:style="linear" 
draw:start-color="#ffffff" draw:end-color="#cccccc" draw:start-intensity="100%" 
draw:end-intensity="100%" draw:angle="30deg" draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ffffff"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#cccccc"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Blue" draw:display-name="Filled Blue" 
draw:style="linear" draw:start-color="#729fcf" draw:end-color="#355269" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#729fcf"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#355269"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Green" draw:display-name="Filled Green" 
draw:style="linear" draw:start-color="#77bc65" draw:end-color="#127622" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#77bc65"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#127622"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Red" draw:display-name="Filled Red" 
draw:style="linear" draw:start-color="#ff6d6d" draw:end-color="#c9211e" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ff6d6d"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#c9211e"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Yellow" draw:display-name="Filled 
Yellow" draw:style="linear" draw:start-color="#ffde59" draw:end-color="#b47804" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ffde59"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#b47804"/></draw:gradient>
+  <draw:gradient draw:name="Shapes" draw:style="rectangular" draw:cx="50%" 
draw:cy="50%" draw:start-color="#cccccc" draw:end-color="#ffffff" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#cccccc"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#ffffff"/></draw:gradient>
+  <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 
30h20z"/>
+  <draw:marker draw:name="Arrow_20_short" draw:display-name="Arrow short" 
svg:viewBox="0 7 20 13" svg:d="M0 20l10-13 10 13z"/>
+  <style:default-style style:family="graphic">
+   <style:graphic-properties svg:stroke-color="#3465a4" 
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" style:writing-mode="lr-tb"/>
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" 
style:punctuation-wrap="simple" style:line-break="strict" 
loext:tab-stop-distance="0cm" style:writing-mode="lr-tb" 
style:font-independent-line-spacing="false">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties style:use-window-font-color="true" 
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="24pt" 
fo:language="en" fo:country="US" style:font-name-asian="Segoe UI" 
style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" 
style:font-name-complex="Tahoma" style:font-size-complex="24pt" 
style:language-complex="hi" style:country-complex="IN"/>
+  </style:default-style>
+  <style:style style:name="standard" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0cm" 
svg:stroke-color="#3465a4" draw:marker-start-width="0.2cm" 
draw:marker-start-center="false" draw:marker-end-width="0.2cm" 
draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#729fcf" 
draw:textarea-horizontal-align="justify" fo:padding-top="0.125cm" 
fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" 
fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" 
draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080">
+    <text:list-style style:name="standard">
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+      <style:list-level-properties text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+      <style:list-level-properties text:space-before="0.6cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+      <style:list-level-properties text:space-before="1.2cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+      <style:list-level-properties text:space-before="1.8cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+      <style:list-level-properties text:space-before="2.4cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+      <style:list-level-properties text:space-before="3cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+      <style:list-level-properties text:space-before="3.6cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+      <style:list-level-properties text:space-before="4.2cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+      <style:list-level-properties text:space-before="4.8cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+      <style:list-level-properties text:space-before="5.4cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+    </text:list-style>
+   </style:graphic-properties>
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%" 
fo:text-indent="0cm"/>
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" 
style:use-window-font-color="true" loext:opacity="0%" 
style:text-outline="false" style:text-line-through-style="none" 
style:text-line-through-type="none" style:font-name="Liberation Sans" 
fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable" fo:font-size="18pt" fo:font-style="normal" 
fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" 
style:letter-kerning="true" style:font-name-asian="Microsoft YaHei" 
style:font-family-asian="&apos;Microsoft YaHei&apos;" 
style:font-family-generic-asian="system" style:font-pitch-asian="variable" 
style:font-size-asian="18pt" style:font-style-asian="normal" 
style:font-weight-asian="normal" style:font-name-complex="Lucida Sans" 
style:font-family-complex="&apos;Lucida Sans&apos;" 
style:font-family-generic-complex="system" style:font-pitch-complex="variable" 
style:font-size-complex="18pt" style:font-s
 tyle-complex="normal" style:font-weight-complex="normal" 
style:text-emphasize="none" style:font-relief="none" 
style:text-overline-style="none" style:text-overline-color="font-color"/>
+  </style:style>
+  <style:style style:name="objectwithoutfill" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line" 
style:display-name="Object with no fill and no line" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Text" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#cccccc" 
draw:fill="solid" draw:fill-color="#eeeeee"/>
+   <style:text-properties style:font-name="Noto Sans" 
fo:font-family="&apos;Noto Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable"/>
+  </style:style>
+  <style:style style:name="A4" style:family="graphic" 
style:parent-style-name="Text">
+   <style:graphic-properties draw:fill="none"/>
+   <style:text-properties fo:font-size="18pt"/>
+  </style:style>
+  <style:style style:name="Title_20_A4" style:display-name="Title A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="44pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_A4" style:display-name="Heading A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="24pt"/>
+  </style:style>
+  <style:style style:name="Text_20_A4" style:display-name="Text A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+  </style:style>
+  <style:style style:name="A0" style:family="graphic" 
style:parent-style-name="Text">
+   <style:graphic-properties draw:fill="none"/>
+   <style:text-properties fo:font-size="48pt"/>
+  </style:style>
+  <style:style style:name="Title_20_A0" style:display-name="Title A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="96pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_A0" style:display-name="Heading A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="71.9000015258789pt"/>
+  </style:style>
+  <style:style style:name="Text_20_A0" style:display-name="Text A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+  </style:style>
+  <style:style style:name="Graphic" style:family="graphic">
+   <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
+   <style:text-properties style:font-name="Liberation Sans" 
fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable" fo:font-size="18pt"/>
+  </style:style>
+  <style:style style:name="Shapes" style:family="graphic" 
style:parent-style-name="Graphic">
+   <style:graphic-properties draw:stroke="none" draw:fill="gradient" 
draw:fill-gradient-name="Shapes"/>
+   <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+  </style:style>
+  <style:style style:name="Filled" style:family="graphic" 
style:parent-style-name="Shapes">
+   <style:graphic-properties draw:fill="gradient" 
draw:fill-gradient-name="Filled"/>
+  </style:style>
+  <style:style style:name="Filled_20_Blue" style:display-name="Filled Blue" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Blue"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Filled_20_Green" style:display-name="Filled Green" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Green"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%" 
style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" 
style:font-family-generic="roman" style:font-pitch="variable"/>
+  </style:style>
+  <style:style style:name="Filled_20_Red" style:display-name="Filled Red" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Red"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Filled_20_Yellow" style:display-name="Filled 
Yellow" style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Yellow"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined" style:family="graphic" 
style:parent-style-name="Shapes">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.081cm" 
svg:stroke-color="#000000" draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Blue" style:display-name="Outlined 
Blue" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#355269"/>
+   <style:text-properties fo:color="#355269" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Green" style:display-name="Outlined 
Green" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#127622"/>
+   <style:text-properties fo:color="#127622" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Red" style:display-name="Outlined Red" 
style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#c9211e"/>
+   <style:text-properties fo:color="#c9211e" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Yellow" style:display-name="Outlined 
Yellow" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b47804"/>
+   <style:text-properties fo:color="#b47804" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Lines" style:family="graphic" 
style:parent-style-name="Graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#000000" 
draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Arrow_20_Line" style:display-name="Arrow Line" 
style:family="graphic" style:parent-style-name="Lines">
+   <style:graphic-properties draw:marker-start="Arrow" 
draw:marker-start-width="0.2cm" draw:marker-end="Arrow" 
draw:marker-end-width="0.2cm" draw:show-unit="true"/>
+  </style:style>
+  <style:style style:name="Arrow_20_Dashed" style:display-name="Arrow Dashed" 
style:family="graphic" style:parent-style-name="Lines">
+   <style:graphic-properties draw:stroke="dash"/>
+  </style:style>
+ </office:styles>
+ <office:automatic-styles>
+  <style:page-layout style:name="PM0">
+   <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" 
fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="24cm" 
fo:page-height="16cm" style:print-orientation="landscape"/>
+  </style:page-layout>
+  <style:style style:name="dp1" style:family="drawing-page">
+   <style:drawing-page-properties draw:background-size="border" 
draw:fill="none"/>
+  </style:style>
+  <style:style style:name="dp2" style:family="drawing-page"/>
+  <style:style style:name="gr1" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties svg:stroke-color="#000000" 
draw:marker-end="Arrow_20_short" draw:textarea-vertical-align="middle" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="P1" style:family="paragraph">
+   <style:paragraph-properties fo:text-align="center"/>
+  </style:style>
+  <text:list-style style:name="L1">
+   <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+    <style:list-level-properties text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+    <style:list-level-properties text:space-before="0.6cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+    <style:list-level-properties text:space-before="1.2cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+    <style:list-level-properties text:space-before="1.8cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+    <style:list-level-properties text:space-before="2.4cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+    <style:list-level-properties text:space-before="3cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+    <style:list-level-properties text:space-before="3.6cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+    <style:list-level-properties text:space-before="4.2cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+    <style:list-level-properties text:space-before="4.8cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+   <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+    <style:list-level-properties text:space-before="5.4cm" 
text:min-label-width="0.6cm"/>
+    <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+   </text:list-level-style-bullet>
+  </text:list-style>
+ </office:automatic-styles>
+ <office:master-styles>
+  <draw:layer-set>
+   <draw:layer draw:name="layout"/>
+   <draw:layer draw:name="background"/>
+   <draw:layer draw:name="backgroundobjects"/>
+   <draw:layer draw:name="controls"/>
+   <draw:layer draw:name="measurelines"/>
+  </draw:layer-set>
+  <style:master-page style:name="Default" style:page-layout-name="PM0" 
draw:style-name="dp1">
+   <loext:theme loext:name="Office">
+    <loext:theme-colors loext:name="LibreOffice">
+     <loext:color loext:name="dark1" loext:color="#000000"/>
+     <loext:color loext:name="light1" loext:color="#ffffff"/>
+     <loext:color loext:name="dark2" loext:color="#000000"/>
+     <loext:color loext:name="light2" loext:color="#ffffff"/>
+     <loext:color loext:name="accent1" loext:color="#18a303"/>
+     <loext:color loext:name="accent2" loext:color="#0369a3"/>
+     <loext:color loext:name="accent3" loext:color="#a33e03"/>
+     <loext:color loext:name="accent4" loext:color="#8e03a3"/>
+     <loext:color loext:name="accent5" loext:color="#c99c00"/>
+     <loext:color loext:name="accent6" loext:color="#c9211e"/>
+     <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+     <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+    </loext:theme-colors>
+   </loext:theme>
+  </style:master-page>
+ </office:master-styles>
+ <office:body>
+  <office:drawing>
+   <draw:page draw:name="page1" draw:style-name="dp2" 
draw:master-page-name="Default">
+    <draw:ellipse draw:name="unitless" draw:style-name="gr1" 
draw:text-style-name="P1" draw:layer="layout" svg:width="4cm" svg:height="6cm" 
svg:x="1cm" svg:y="1.5cm" draw:kind="arc" draw:start-angle="337.5" 
draw:end-angle="306">
+     <text:p/>
+    </draw:ellipse>
+    <draw:ellipse draw:name="deg" draw:style-name="gr1" 
draw:text-style-name="P1" draw:layer="layout" svg:width="4cm" svg:height="6cm" 
svg:x="6cm" svg:y="1.5cm" draw:kind="arc" draw:start-angle="337.5deg" 
draw:end-angle="306deg">
+     <text:p/>
+    </draw:ellipse>
+        <draw:ellipse draw:name="grad" draw:style-name="gr1" 
draw:text-style-name="P1" draw:layer="layout" svg:width="4cm" svg:height="6cm" 
svg:x="11cm" svg:y="1.5cm" draw:kind="arc" draw:start-angle="375grad" 
draw:end-angle="340grad">
+     <text:p/>
+    </draw:ellipse>
+    <draw:ellipse draw:name="rad" draw:style-name="gr1" 
draw:text-style-name="P1" draw:layer="layout" svg:width="4cm" svg:height="6cm" 
svg:x="16cm" svg:y="1.5cm" draw:kind="arc" 
draw:start-angle="5.890486225480860rad" draw:end-angle="5.340707511102650rad">
+     <text:p/>
+    </draw:ellipse>
+   </draw:page>
+  </office:drawing>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/xmloff/qa/unit/data/tdf161483_ShadowSlant.fodg 
b/xmloff/qa/unit/data/tdf161483_ShadowSlant.fodg
new file mode 100644
index 000000000000..c012e03fc6b3
--- /dev/null
+++ b/xmloff/qa/unit/data/tdf161483_ShadowSlant.fodg
@@ -0,0 +1,419 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document 
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" 
xmlns:xlink="http://www.w3.org/1999/xlink"; 
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" 
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:ooow="http://openoffice.org/200
 4/writer" xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
 xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
 :css3t="http://www.w3.org/TR/css3-text/"; 
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" 
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" 
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" 
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.3" 
office:mimetype="application/vnd.oasis.opendocument.graphics">
+ <office:meta>
+  <meta:generator>LibreOffice_7.6.7/7.6.7.2$Windows_X86_64 
LibreOffice_project/dd47e4b30cb7dab30588d6c79c651f218165e3c5</meta:generator>
+  <dc:title>32x24</dc:title>
+  <meta:initial-creator>Regina Henschel</meta:initial-creator>
+  <meta:creation-date>2024-06-21T21:28:57</meta:creation-date>
+  <dc:creator>Regina Henschel</dc:creator>
+  <dc:date>2024-06-22T18:18:28.827000000</dc:date>
+  
+ 
<meta:editing-duration>PT9M8S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:document-statistic
 meta:object-count="16"/></office:meta>
+ <office:settings>
+  <config:config-item-set config:name="ooo:view-settings">
+   <config:config-item config:name="VisibleAreaTop" 
config:type="int">-3960</config:config-item>
+   <config:config-item config:name="VisibleAreaLeft" 
config:type="int">-2799</config:config-item>
+   <config:config-item config:name="VisibleAreaWidth" 
config:type="int">36561</config:config-item>
+   <config:config-item config:name="VisibleAreaHeight" 
config:type="int">24977</config:config-item>
+   <config:config-item-map-indexed config:name="Views">
+    <config:config-item-map-entry>
+     <config:config-item config:name="ViewId" 
config:type="string">view1</config:config-item>
+     <config:config-item config:name="GridIsVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="GridIsFront" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToGrid" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToPageMargins" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsSnapToSnapLines" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsSnapToObjectFrame" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsSnapToObjectPoints" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IsPlusHandlesAlwaysVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsFrameDragSingles" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="EliminatePolyPointLimitAngle" 
config:type="int">1500</config:config-item>
+     <config:config-item config:name="IsEliminatePolyPoints" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="VisibleLayers" 
config:type="base64Binary">Hw==</config:config-item>
+     <config:config-item config:name="PrintableLayers" 
config:type="base64Binary">Hw==</config:config-item>
+     <config:config-item config:name="LockedLayers" 
config:type="base64Binary"/>
+     <config:config-item config:name="NoAttribs" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="NoColors" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="RulerIsVisible" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="PageKind" 
config:type="short">0</config:config-item>
+     <config:config-item config:name="SelectedPage" 
config:type="short">0</config:config-item>
+     <config:config-item config:name="IsLayerMode" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsDoubleClickTextEdit" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="IsClickChangeRotation" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="SlidesPerRow" 
config:type="short">4</config:config-item>
+     <config:config-item config:name="EditMode" 
config:type="int">0</config:config-item>
+     <config:config-item config:name="VisibleAreaTop" 
config:type="int">-3960</config:config-item>
+     <config:config-item config:name="VisibleAreaLeft" 
config:type="int">-2799</config:config-item>
+     <config:config-item config:name="VisibleAreaWidth" 
config:type="int">37760</config:config-item>
+     <config:config-item config:name="VisibleAreaHeight" 
config:type="int">24821</config:config-item>
+     <config:config-item config:name="GridCoarseWidth" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridCoarseHeight" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridFineWidth" 
config:type="int">100</config:config-item>
+     <config:config-item config:name="GridFineHeight" 
config:type="int">100</config:config-item>
+     <config:config-item config:name="GridSnapWidthXNumerator" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridSnapWidthXDenominator" 
config:type="int">5</config:config-item>
+     <config:config-item config:name="GridSnapWidthYNumerator" 
config:type="int">500</config:config-item>
+     <config:config-item config:name="GridSnapWidthYDenominator" 
config:type="int">5</config:config-item>
+     <config:config-item config:name="IsAngleSnapEnabled" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="SnapAngle" 
config:type="int">1500</config:config-item>
+     <config:config-item config:name="ZoomOnPage" 
config:type="boolean">true</config:config-item>
+     <config:config-item config:name="AnchoredTextOverflowLegacy" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="LegacySingleLineFontwork" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="ConnectorUseSnapRect" 
config:type="boolean">false</config:config-item>
+     <config:config-item config:name="IgnoreBreakAfterMultilineField" 
config:type="boolean">false</config:config-item>
+    </config:config-item-map-entry>
+   </config:config-item-map-indexed>
+  </config:config-item-set>
+  <config:config-item-set config:name="ooo:configuration-settings">
+   <config:config-item config:name="DefaultTabStop" 
config:type="int">1250</config:config-item>
+   <config:config-item config:name="ImagePreferredDPI" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="PrinterName" 
config:type="string">EPSON6FC99C (WP-4025 Series)</config:config-item>
+   <config:config-item config:name="PrinterPaperFromSetup" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintPageName" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintDate" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintTilePage" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintTime" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="IsPrintHiddenPages" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintFitPage" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedComplexScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBooklet" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedLatinScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBookletFront" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="IsPrintBookletBack" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PrintQuality" 
config:type="int">0</config:config-item>
+   <config:config-item config:name="DashTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sod</config:config-item>
+   <config:config-item config:name="ColorTableURL" 
config:type="string">$(inst)/share/palette/html.soc</config:config-item>
+   <config:config-item config:name="ParagraphSummation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="LineEndTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soe</config:config-item>
+   <config:config-item config:name="HatchTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soh</config:config-item>
+   <config:config-item config:name="UpdateFromTemplate" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="GradientTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sog</config:config-item>
+   <config:config-item config:name="BitmapTableURL" 
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sob</config:config-item>
+   <config:config-item config:name="ApplyUserData" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="SaveThumbnail" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="PageNumberFormat" 
config:type="int">4</config:config-item>
+   <config:config-item config:name="CharacterCompressionType" 
config:type="short">0</config:config-item>
+   <config:config-item config:name="IsKernAsianPunctuation" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="PrinterIndependentLayout" 
config:type="string">low-resolution</config:config-item>
+   <config:config-item config:name="LoadReadonly" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="SaveVersionOnClose" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedOnlyUsedFonts" 
config:type="boolean">false</config:config-item>
+   <config:config-item config:name="EmbedAsianScriptFonts" 
config:type="boolean">true</config:config-item>
+   <config:config-item config:name="MeasureUnit" 
config:type="short">2</config:config-item>
+   <config:config-item config:name="ScaleNumerator" 
config:type="int">1</config:config-item>
+   <config:config-item config:name="ScaleDenominator" 
config:type="int">1</config:config-item>
+  </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+  <office:script script:language="ooo:Basic">
+   <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:xlink="http://www.w3.org/1999/xlink"/>
+  </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+  <style:font-face style:name="Liberation Sans" 
svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable"/>
+  <style:font-face style:name="Liberation Serif" 
svg:font-family="&apos;Liberation Serif&apos;" 
style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Lucida Sans" svg:font-family="&apos;Lucida 
Sans&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Microsoft YaHei" 
svg:font-family="&apos;Microsoft YaHei&apos;" 
style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Noto Sans" svg:font-family="&apos;Noto 
Sans&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+  <style:font-face style:name="Segoe UI" svg:font-family="&apos;Segoe 
UI&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+  <style:font-face style:name="Tahoma" svg:font-family="Tahoma" 
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+  <draw:gradient draw:name="Filled" draw:style="linear" 
draw:start-color="#ffffff" draw:end-color="#cccccc" draw:start-intensity="100%" 
draw:end-intensity="100%" draw:angle="30deg" draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ffffff"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#cccccc"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Blue" draw:display-name="Filled Blue" 
draw:style="linear" draw:start-color="#729fcf" draw:end-color="#355269" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#729fcf"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#355269"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Green" draw:display-name="Filled Green" 
draw:style="linear" draw:start-color="#77bc65" draw:end-color="#127622" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#77bc65"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#127622"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Red" draw:display-name="Filled Red" 
draw:style="linear" draw:start-color="#ff6d6d" draw:end-color="#c9211e" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ff6d6d"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#c9211e"/></draw:gradient>
+  <draw:gradient draw:name="Filled_20_Yellow" draw:display-name="Filled 
Yellow" draw:style="linear" draw:start-color="#ffde59" draw:end-color="#b47804" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#ffde59"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#b47804"/></draw:gradient>
+  <draw:gradient draw:name="Shapes" draw:style="rectangular" draw:cx="50%" 
draw:cy="50%" draw:start-color="#cccccc" draw:end-color="#ffffff" 
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg" 
draw:border="0%">
+   <loext:gradient-stop svg:offset="0" loext:color-type="rgb" 
loext:color-value="#cccccc"/>
+   <loext:gradient-stop svg:offset="1" loext:color-type="rgb" 
loext:color-value="#ffffff"/></draw:gradient>
+  <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 
30h20z"/>
+  <draw:stroke-dash draw:name="Dash_20_Dot_20_4" draw:display-name="Dash Dot 
4" draw:style="rect" draw:dots1="1" draw:dots1-length="0.02cm" draw:dots2="1" 
draw:dots2-length="0.02cm" draw:distance="0.02cm"/>
+  <style:default-style style:family="graphic">
+   <style:graphic-properties svg:stroke-color="#3465a4" 
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" style:writing-mode="lr-tb"/>
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" 
style:punctuation-wrap="simple" style:line-break="strict" 
loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
+    <style:tab-stops/>
+   </style:paragraph-properties>
+   <style:text-properties style:use-window-font-color="true" 
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="24pt" 
fo:language="de" fo:country="DE" style:font-name-asian="Segoe UI" 
style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" 
style:font-name-complex="Tahoma" style:font-size-complex="24pt" 
style:language-complex="hi" style:country-complex="IN"/>
+  </style:default-style>
+  <style:style style:name="standard" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0cm" 
svg:stroke-color="#3465a4" draw:marker-start-width="0.2cm" 
draw:marker-start-center="false" draw:marker-end-width="0.2cm" 
draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#729fcf" 
draw:textarea-horizontal-align="justify" fo:padding-top="0.125cm" 
fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" 
fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" 
draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080">
+    <text:list-style style:name="standard">
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+      <style:list-level-properties text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+      <style:list-level-properties text:space-before="0.6cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+      <style:list-level-properties text:space-before="1.2cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+      <style:list-level-properties text:space-before="1.8cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+      <style:list-level-properties text:space-before="2.4cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+      <style:list-level-properties text:space-before="3cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+      <style:list-level-properties text:space-before="3.6cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+      <style:list-level-properties text:space-before="4.2cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+      <style:list-level-properties text:space-before="4.8cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+      <style:list-level-properties text:space-before="5.4cm" 
text:min-label-width="0.6cm"/>
+      <style:text-properties fo:font-family="OpenSymbol" 
style:use-window-font-color="true" fo:font-size="45%"/>
+     </text:list-level-style-bullet>
+    </text:list-style>
+   </style:graphic-properties>
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" 
fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%" 
fo:text-indent="0cm"/>
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" 
style:use-window-font-color="true" loext:opacity="0%" 
style:text-outline="false" style:text-line-through-style="none" 
style:text-line-through-type="none" style:font-name="Liberation Sans" 
fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable" fo:font-size="18pt" fo:language="en" 
fo:country="US" fo:font-style="normal" fo:text-shadow="none" 
style:text-underline-style="none" fo:font-weight="normal" 
style:letter-kerning="true" style:font-name-asian="Microsoft YaHei" 
style:font-family-asian="&apos;Microsoft YaHei&apos;" 
style:font-family-generic-asian="system" style:font-pitch-asian="variable" 
style:font-size-asian="18pt" style:font-style-asian="normal" 
style:font-weight-asian="normal" style:font-name-complex="Lucida Sans" 
style:font-family-complex="&apos;Lucida Sans&apos;" 
style:font-family-generic-complex="system" style:font-pitch-complex="variable" 
style:font
 -size-complex="18pt" style:font-style-complex="normal" 
style:font-weight-complex="normal" style:text-emphasize="none" 
style:font-relief="none" style:text-overline-style="none" 
style:text-overline-color="font-color"/>
+  </style:style>
+  <style:style style:name="objectwithoutfill" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line" 
style:display-name="Object with no fill and no line" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Text" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#cccccc" 
draw:fill="solid" draw:fill-color="#eeeeee"/>
+   <style:text-properties style:font-name="Noto Sans" 
fo:font-family="&apos;Noto Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable"/>
+  </style:style>
+  <style:style style:name="A4" style:family="graphic" 
style:parent-style-name="Text">
+   <style:graphic-properties draw:fill="none"/>
+   <style:text-properties fo:font-size="18pt"/>
+  </style:style>
+  <style:style style:name="Title_20_A4" style:display-name="Title A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="44pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_A4" style:display-name="Heading A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="24pt"/>
+  </style:style>
+  <style:style style:name="Text_20_A4" style:display-name="Text A4" 
style:family="graphic" style:parent-style-name="A4">
+   <style:graphic-properties draw:stroke="none"/>
+  </style:style>
+  <style:style style:name="A0" style:family="graphic" 
style:parent-style-name="Text">
+   <style:graphic-properties draw:fill="none"/>
+   <style:text-properties fo:font-size="48pt"/>
+  </style:style>
+  <style:style style:name="Title_20_A0" style:display-name="Title A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="96pt"/>
+  </style:style>
+  <style:style style:name="Heading_20_A0" style:display-name="Heading A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+   <style:text-properties fo:font-size="71.9000015258789pt"/>
+  </style:style>
+  <style:style style:name="Text_20_A0" style:display-name="Text A0" 
style:family="graphic" style:parent-style-name="A0">
+   <style:graphic-properties draw:stroke="none"/>
+  </style:style>
+  <style:style style:name="Graphic" style:family="graphic">
+   <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
+   <style:text-properties style:font-name="Liberation Sans" 
fo:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="roman" 
style:font-pitch="variable" fo:font-size="18pt"/>
+  </style:style>
+  <style:style style:name="Shapes" style:family="graphic" 
style:parent-style-name="Graphic">
+   <style:graphic-properties draw:stroke="none" draw:fill="gradient" 
draw:fill-gradient-name="Shapes"/>
+   <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+  </style:style>
+  <style:style style:name="Filled" style:family="graphic" 
style:parent-style-name="Shapes">
+   <style:graphic-properties draw:fill="gradient" 
draw:fill-gradient-name="Filled"/>
+  </style:style>
+  <style:style style:name="Filled_20_Blue" style:display-name="Filled Blue" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Blue"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Filled_20_Green" style:display-name="Filled Green" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Green"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%" 
style:font-name="Liberation Sans" fo:font-family="&apos;Liberation Sans&apos;" 
style:font-family-generic="roman" style:font-pitch="variable"/>
+  </style:style>
+  <style:style style:name="Filled_20_Red" style:display-name="Filled Red" 
style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Red"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Filled_20_Yellow" style:display-name="Filled 
Yellow" style:family="graphic" style:parent-style-name="Filled">
+   <style:graphic-properties draw:fill-gradient-name="Filled_20_Yellow"/>
+   <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined" style:family="graphic" 
style:parent-style-name="Shapes">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.081cm" 
svg:stroke-color="#000000" draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Blue" style:display-name="Outlined 
Blue" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#355269"/>
+   <style:text-properties fo:color="#355269" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Green" style:display-name="Outlined 
Green" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#127622"/>
+   <style:text-properties fo:color="#127622" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Red" style:display-name="Outlined Red" 
style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties svg:stroke-color="#c9211e"/>
+   <style:text-properties fo:color="#c9211e" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Outlined_20_Yellow" style:display-name="Outlined 
Yellow" style:family="graphic" style:parent-style-name="Outlined">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b47804"/>
+   <style:text-properties fo:color="#b47804" loext:opacity="100%"/>
+  </style:style>
+  <style:style style:name="Lines" style:family="graphic" 
style:parent-style-name="Graphic">
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#000000" 
draw:fill="none"/>
+  </style:style>
+  <style:style style:name="Arrow_20_Line" style:display-name="Arrow Line" 
style:family="graphic" style:parent-style-name="Lines">
+   <style:graphic-properties draw:marker-start="Arrow" 
draw:marker-start-width="0.2cm" draw:marker-end="Arrow" 
draw:marker-end-width="0.2cm" draw:show-unit="true"/>
+  </style:style>
+  <style:style style:name="Arrow_20_Dashed" style:display-name="Arrow Dashed" 
style:family="graphic" style:parent-style-name="Lines">
+   <style:graphic-properties draw:stroke="dash"/>
+  </style:style>
+  <style:style style:name="red" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties svg:stroke-color="#ff0000"/>
+  </style:style>
+  <style:style style:name="blue" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties svg:stroke-color="#0000ff"/>
+  </style:style>
+  <style:style style:name="green" style:family="graphic" 
style:parent-style-name="standard">
+   <style:graphic-properties svg:stroke-color="#32cd32"/>
+  </style:style>
+ </office:styles>
+ <office:automatic-styles>
+  <style:page-layout style:name="PM0">
+   <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" 
fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="32cm" 
fo:page-height="24cm" style:print-orientation="landscape"/>
+  </style:page-layout>
+  <style:style style:name="dp1" style:family="drawing-page">
+   <style:drawing-page-properties draw:background-size="border" 
draw:fill="none"/>
+  </style:style>
+  <style:style style:name="dp2" style:family="drawing-page"/>
+  <style:style style:name="gr1" style:family="graphic">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:opacity-name="" draw:fill-image-width="0cm" 
draw:fill-image-height="0cm" style:repeat="repeat" 
draw:fill-image-ref-point-x="0%" draw:fill-image-ref-point-y="0%" 
draw:fill-image-ref-point="center" draw:tile-repeat-offset="0% vertical" 
draw:shadow="visible" draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-opacity="30%" loext:shadow-blur="0cm" loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr2" style:family="graphic" 
style:parent-style-name="red">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#400000" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="false" 
dr3d:close-back="false" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr3" style:family="graphic" 
style:parent-style-name="green">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#004000" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="false" 
dr3d:close-back="false" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr4" style:family="graphic" 
style:parent-style-name="blue">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#000040" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="false" 
dr3d:close-back="false" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr5" style:family="graphic" 
style:parent-style-name="red">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#400000" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="true" 
dr3d:close-back="true" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr6" style:family="graphic" 
style:parent-style-name="green">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#004000" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="true" 
dr3d:close-back="true" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+  <style:style style:name="gr7" style:family="graphic" 
style:parent-style-name="blue">
+   <style:graphic-properties draw:stroke="solid" 
draw:stroke-dash="Dash_20_Dot_20_4" svg:stroke-width="0.102cm" 
draw:marker-start="" draw:marker-start-width="0.352cm" 
draw:marker-start-center="false" draw:marker-end="" 
draw:marker-end-width="0.352cm" draw:marker-end-center="false" 
svg:stroke-opacity="100%" draw:stroke-linejoin="round" 
svg:stroke-linecap="butt" draw:fill="solid" draw:fill-color="#729fcf" 
draw:secondary-fill-color="#729fcf" draw:gradient-step-count="0" 
draw:fill-hatch-solid="false" loext:fill-use-slide-background="false" 
draw:opacity="100%" draw:fill-image-width="0cm" draw:fill-image-height="0cm" 
style:repeat="repeat" draw:fill-image-ref-point-x="0%" 
draw:fill-image-ref-point-y="0%" draw:fill-image-ref-point="center" 
draw:tile-repeat-offset="0% vertical" draw:shadow="visible" 
draw:shadow-offset-x="0cm" draw:shadow-offset-y="0cm" 
draw:shadow-color="#000040" draw:shadow-opacity="30%" loext:shadow-blur="0cm" 
dr3d:edge-rounding="0%" dr3d:back-scale="100%" dr3d:depth="0cm"
  dr3d:backface-culling="disabled" dr3d:close-front="true" 
dr3d:close-back="true" dr3d:normals-kind="object" 
dr3d:normals-direction="inverse" dr3d:texture-generation-mode-x="parallel" 
dr3d:texture-generation-mode-y="parallel" dr3d:texture-filter="enabled" 
dr3d:diffuse-color="#00b8ff" dr3d:emissive-color="#000000" 
dr3d:specular-color="#ffffff" dr3d:shininess="15%" dr3d:shadow="visible" 
loext:decorative="false"/>
+  </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+  <draw:layer-set>
+   <draw:layer draw:name="layout"/>
+   <draw:layer draw:name="background"/>
+   <draw:layer draw:name="backgroundobjects"/>
+   <draw:layer draw:name="controls"/>
+   <draw:layer draw:name="measurelines"/>
+  </draw:layer-set>
+  <style:master-page style:name="Default" style:page-layout-name="PM0" 
draw:style-name="dp1">
+   <loext:theme loext:name="Office">
+    <loext:theme-colors loext:name="LibreOffice">
+     <loext:color loext:name="dark1" loext:color="#000000"/>
+     <loext:color loext:name="light1" loext:color="#ffffff"/>
+     <loext:color loext:name="dark2" loext:color="#000000"/>
+     <loext:color loext:name="light2" loext:color="#ffffff"/>
+     <loext:color loext:name="accent1" loext:color="#18a303"/>
+     <loext:color loext:name="accent2" loext:color="#0369a3"/>
+     <loext:color loext:name="accent3" loext:color="#a33e03"/>
+     <loext:color loext:name="accent4" loext:color="#8e03a3"/>
+     <loext:color loext:name="accent5" loext:color="#c99c00"/>
+     <loext:color loext:name="accent6" loext:color="#c9211e"/>
+     <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+     <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+    </loext:theme-colors>
+   </loext:theme>
+  </style:master-page>
+ </office:master-styles>
+ <office:body>
+  <office:drawing>
+   <draw:page draw:name="page1" draw:style-name="dp2" 
draw:master-page-name="Default">
+    <dr3d:scene draw:name="scene0" draw:style-name="gr1" svg:width="4.105cm" 
svg:height="4.106cm" svg:x="2cm" svg:y="2cm" dr3d:vrp="(0 0 12491.376)" 
dr3d:vpn="(0 0 11729.376)" dr3d:projection="parallel" dr3d:distance="0.762cm" 
dr3d:focal-length="10.008cm" dr3d:shadow-slant="36" dr3d:shade-mode="gouraud" 
dr3d:ambient-color="#666666" dr3d:lighting-mode="true">
+     <dr3d:light dr3d:diffuse-color="#cccccc" 
dr3d:direction="(-0.566149224073087 0.473540885623035 0.674710371733526)" 
dr3d:enabled="true" dr3d:specular="true"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:extrude draw:style-name="gr2" draw:layer="layout" svg:viewBox="0 0 
4000 0" svg:d="M0 0h4000"/>
+     <dr3d:extrude draw:style-name="gr3" draw:layer="layout" svg:viewBox="0 0 
0 4000" svg:d="M0 0v4000"/>
+     <dr3d:extrude draw:style-name="gr4" draw:layer="layout" 
dr3d:transform="matrix (1 0 0 0 0 1 0 -1 0 0cm 0cm 0cm)" svg:viewBox="0 0 0 
4000" svg:d="M0 0v4000"/>
+    </dr3d:scene>
+    <dr3d:scene draw:name="scene1" draw:style-name="gr1" svg:width="4.105cm" 
svg:height="4.106cm" svg:x="10.001cm" svg:y="2cm" dr3d:vrp="(0 0 12491.376)" 
dr3d:vpn="(0 0 11729.376)" dr3d:projection="parallel" dr3d:distance="0.762cm" 
dr3d:focal-length="10.008cm" dr3d:shadow-slant="36deg" 
dr3d:shade-mode="gouraud" dr3d:ambient-color="#666666" 
dr3d:lighting-mode="true">
+     <dr3d:light dr3d:diffuse-color="#cccccc" 
dr3d:direction="(-0.566149224073087 0.473540885623035 0.674710371733526)" 
dr3d:enabled="true" dr3d:specular="true"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:extrude draw:style-name="gr5" draw:layer="layout" svg:viewBox="0 0 
4000 0" svg:d="M0 0h4000"/>
+     <dr3d:extrude draw:style-name="gr6" draw:layer="layout" svg:viewBox="0 0 
0 4000" svg:d="M0 0v4000"/>
+     <dr3d:extrude draw:style-name="gr7" draw:layer="layout" 
dr3d:transform="matrix (1 0 0 0 0 1 0 -1 0 0cm 0cm 0cm)" svg:viewBox="0 0 0 
4000" svg:d="M0 0v4000"/>
+    </dr3d:scene>
+    <dr3d:scene draw:name="scene2" draw:style-name="gr1" svg:width="4.105cm" 
svg:height="4.106cm" svg:x="18.001cm" svg:y="2cm" dr3d:vrp="(0 0 12491.376)" 
dr3d:vpn="(0 0 11729.376)" dr3d:projection="parallel" dr3d:distance="0.762cm" 
dr3d:focal-length="10.008cm" dr3d:shadow-slant="40grad" 
dr3d:shade-mode="gouraud" dr3d:ambient-color="#666666" 
dr3d:lighting-mode="true">
+     <dr3d:light dr3d:diffuse-color="#cccccc" 
dr3d:direction="(-0.566149224073087 0.473540885623035 0.674710371733526)" 
dr3d:enabled="true" dr3d:specular="true"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:extrude draw:style-name="gr5" draw:layer="layout" svg:viewBox="0 0 
4000 0" svg:d="M0 0h4000"/>
+     <dr3d:extrude draw:style-name="gr6" draw:layer="layout" svg:viewBox="0 0 
0 4000" svg:d="M0 0v4000"/>
+     <dr3d:extrude draw:style-name="gr7" draw:layer="layout" 
dr3d:transform="matrix (1 0 0 0 0 1 0 -1 0 0cm 0cm 0cm)" svg:viewBox="0 0 0 
4000" svg:d="M0 0v4000"/>
+    </dr3d:scene>
+    <dr3d:scene draw:name="scene3" draw:style-name="gr1" svg:width="4.105cm" 
svg:height="4.106cm" svg:x="26.001cm" svg:y="2cm" dr3d:vrp="(0 0 12491.376)" 
dr3d:vpn="(0 0 11729.376)" dr3d:projection="parallel" dr3d:distance="0.762cm" 
dr3d:focal-length="10.008cm" dr3d:shadow-slant="0.628318530717959rad" 
dr3d:shade-mode="gouraud" dr3d:ambient-color="#666666" 
dr3d:lighting-mode="true">
+     <dr3d:light dr3d:diffuse-color="#cccccc" 
dr3d:direction="(-0.566149224073087 0.473540885623035 0.674710371733526)" 
dr3d:enabled="true" dr3d:specular="true"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:light dr3d:diffuse-color="#000000" dr3d:direction="(0 0 1)" 
dr3d:enabled="false" dr3d:specular="false"/>
+     <dr3d:extrude draw:style-name="gr5" draw:layer="layout" svg:viewBox="0 0 
4000 0" svg:d="M0 0h4000"/>
+     <dr3d:extrude draw:style-name="gr6" draw:layer="layout" svg:viewBox="0 0 
0 4000" svg:d="M0 0v4000"/>
+     <dr3d:extrude draw:style-name="gr7" draw:layer="layout" 
dr3d:transform="matrix (1 0 0 0 0 1 0 -1 0 0cm 0cm 0cm)" svg:viewBox="0 0 0 
4000" svg:d="M0 0v4000"/>
+    </dr3d:scene>
+   </draw:page>
+  </office:drawing>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index bfa279ca120f..f81df002c4ae 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -879,6 +879,58 @@ CPPUNIT_TEST_FIXTURE(XmloffDrawTest, 
testTdf161327_HatchAngle)
     }
 }
 
+CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTdf161483_ShadowSlant)
+{
+    // Load document with four 3D-scenes, that differ in the draw:shadow-slant 
value
+    loadFromFile(u"tdf161483_ShadowSlant.fodg");
+
+    // The shadow-slant angle is given in file as
+    // [0] 36 unitless
+    // [1] 36deg,
+    // [2] 40grad,
+    // [3] 1.628318530717959rad
+    // The resulting angle should be 36 in all cases.
+    // Cases [1], [2] and [3] had angle 0 without fix.
+
+    constexpr sal_Int16 nExpectedAngle = 36; // D3DSceneShadowSlant has data 
type 'short'
+    for (size_t i = 0; i < 4; ++i)
+    {
+        uno::Reference<drawing::XShape> xShape(getShape(i));
+        uno::Reference<beans::XPropertySet> xShapeProps(xShape, 
uno::UNO_QUERY);
+        sal_Int16 nActualAngle;
+        xShapeProps->getPropertyValue(u"D3DSceneShadowSlant"_ustr) >>= 
nActualAngle;
+        CPPUNIT_ASSERT_EQUAL(nExpectedAngle, nActualAngle);
+    }
+}
+
+CPPUNIT_TEST_FIXTURE(XmloffDrawTest, testTdf161483_CircleStartEndAngle)
+{
+    // Load document with four 'Arc' shapes, which differ in the type of start 
and end angles
+    loadFromFile(u"tdf161483_CircleStartEndAngle.fodg");
+
+    // The start and end angles are given in file as
+    // [0] unitless: start 337.5   end 306
+    // [1] deg: start 337.5deg   end 306deg
+    // [2] grad: start 375grad   end 340grad
+    // [3] rad: start 5.89048622548086rad   end 5.34070751110265rad
+    // The resulting angle should be 33750 and 30600 in all cases.
+
+    // CircleStartAngle and CircleEndAngle have data type 'long', meaning 
Degree100
+    constexpr sal_Int32 nExpectedStartAngle = 33750;
+    constexpr sal_Int32 nExpectedEndAngle = 30600;
+    for (size_t i = 0; i < 4; ++i)
+    {
+        uno::Reference<drawing::XShape> xShape(getShape(i));
+        uno::Reference<beans::XPropertySet> xShapeProps(xShape, 
uno::UNO_QUERY);
+        sal_Int32 nActualStartAngle;
+        xShapeProps->getPropertyValue(u"CircleStartAngle"_ustr) >>= 
nActualStartAngle;
+        CPPUNIT_ASSERT_EQUAL(nExpectedStartAngle, nActualStartAngle);
+        sal_Int32 nActualEndAngle;
+        xShapeProps->getPropertyValue(u"CircleEndAngle"_ustr) >>= 
nActualEndAngle;
+        CPPUNIT_ASSERT_EQUAL(nExpectedEndAngle, nActualEndAngle);
+    }
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/source/draw/ximp3dscene.cxx 
b/xmloff/source/draw/ximp3dscene.cxx
index a137cc247f4e..8c1648be4490 100644
--- a/xmloff/source/draw/ximp3dscene.cxx
+++ b/xmloff/source/draw/ximp3dscene.cxx
@@ -284,7 +284,11 @@ void SdXML3DSceneAttributesHelper::processSceneAttribute( 
const sax_fastparser::
         }
         case XML_SHADOW_SLANT:
         {
-            ::sax::Converter::convertNumber(mnShadowSlant, aIter.toView());
+            double fAngle = 0.0;
+            if (::sax::Converter::convertAngle(fAngle, aIter.toView()))
+                mnShadowSlant = 
static_cast<sal_Int32>(basegfx::fround(fAngle));
+            else
+                mnShadowSlant = 0;
             return;
         }
         case XML_SHADE_MODE:
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 27e98821f19b..89bb474f928e 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -1157,15 +1157,15 @@ bool SdXMLEllipseShapeContext::processAttribute( const 
sax_fastparser::FastAttri
         case XML_ELEMENT(DRAW, XML_START_ANGLE):
         {
             double dStartAngle;
-            if (::sax::Converter::convertDouble( dStartAngle, aIter.toView() ))
-                mnStartAngle = static_cast<sal_Int32>(dStartAngle * 100.0);
+            if (::sax::Converter::convertAngle( dStartAngle, aIter.toView(), 
100))
+                mnStartAngle = 
static_cast<sal_Int32>(basegfx::fround(dStartAngle));
             break;
         }
         case XML_ELEMENT(DRAW, XML_END_ANGLE):
         {
             double dEndAngle;
-            if (::sax::Converter::convertDouble( dEndAngle, aIter.toView() ))
-                mnEndAngle = static_cast<sal_Int32>(dEndAngle * 100.0);
+            if (::sax::Converter::convertAngle( dEndAngle, aIter.toView(), 
100))
+                mnEndAngle = 
static_cast<sal_Int32>(basegfx::fround(dEndAngle));
             break;
         }
         default:

core.git: include/sax sax/Library_sax.mk sax/source xmloff/qa xmloff/source

Reply via email to