Blame SOURCES/0001-tdf-97630-xmloff-ODF-extended-draw-fit-to-size-mess.patch

69cc7b
From e2aea006ba385dfbbfde27997372c4d941561b2c Mon Sep 17 00:00:00 2001
69cc7b
From: Michael Stahl <mstahl@redhat.com>
69cc7b
Date: Tue, 17 Oct 2017 17:24:03 +0200
69cc7b
Subject: [PATCH] tdf#97630 xmloff: ODF extended draw:fit-to-size mess
69cc7b
69cc7b
The plan:
69cc7b
69cc7b
1. As Regina points out, there is already (in ODF 1.2, but not ODF 1.1)
69cc7b
   a style:shrink-to-fit attribute for shapes, so use this to represent
69cc7b
   the AUTOFIT value.
69cc7b
69cc7b
   The fallback from AUTOFIT to draw:fit-to-size="true" was a stupid
69cc7b
   idea anyway, probably "false" is less annoying in practice.
69cc7b
69cc7b
   There are 2 different shapes that implement TextFitToSize property:
69cc7b
69cc7b
   a) text shapes already interpret ALLLINES and PROPORTIONAL exactly
69cc7b
      the same
69cc7b
   b) fontwork custom shapes interpret ALLLINES but do nothing for
69cc7b
      PROPORTIONAL
69cc7b
69cc7b
   As Regina points out, there is no shape that needs to distinguish
69cc7b
   between ALLLINES and PROPORTIONAL, so we do a minor behavioral
69cc7b
   API CHANGE and from now on interpret PROPORTIONAL as ALLLINES
69cc7b
   on fontwork custom shapes.  This obviates the need to distinguish
69cc7b
   the values in ODF and so we don't need a new attribute,
69cc7b
   just use draw:fit-to-size="true" for both.
69cc7b
69cc7b
   On import, use MID_FLAG_MERGE_PROPERTY to combine the 2 attributes
69cc7b
   into one value.
69cc7b
69cc7b
2. Restrict the export of draw:fit-to-size to only the standard
69cc7b
   values "true"/"false".
69cc7b
69cc7b
This implements step 1, the step 2 will be done in the future when
69cc7b
most users have the import of the style:shrink-to-fit.
69cc7b
69cc7b
Change-Id: I4a378aa110fdb82db7a99a839d7ff207248a73e7
69cc7b
Reviewed-on: https://gerrit.libreoffice.org/43521
69cc7b
Tested-by: Jenkins <ci@libreoffice.org>
69cc7b
Reviewed-by: Michael Stahl <mstahl@redhat.com>
69cc7b
(cherry picked from commit 33eb9fdb61033b3fd35d923900b1f5791f4b71c8)
69cc7b
---
69cc7b
 filter/source/msfilter/escherex.cxx                |   3 +-
69cc7b
 sd/qa/unit/data/fit-to-size.fodp                   | 724 +++++++++++++++++++++
69cc7b
 sd/qa/unit/export-tests.cxx                        | 101 +++
69cc7b
 .../customshapes/EnhancedCustomShapeFontWork.cxx   |   5 +-
69cc7b
 svx/source/toolbars/fontworkbar.cxx                |  10 +-
69cc7b
 xmloff/inc/xmlsdtypes.hxx                          |   1 +
69cc7b
 xmloff/source/draw/sdpropls.cxx                    |  71 +-
69cc7b
 7 files changed, 902 insertions(+), 13 deletions(-)
69cc7b
 create mode 100644 sd/qa/unit/data/fit-to-size.fodp
69cc7b
69cc7b
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
69cc7b
index b8b5b831bd99..4285bcd04c14 100644
69cc7b
--- a/filter/source/msfilter/escherex.cxx
69cc7b
+++ b/filter/source/msfilter/escherex.cxx
69cc7b
@@ -3470,7 +3470,8 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
69cc7b
                                 case drawing::TextHorizontalAdjust_BLOCK:
69cc7b
                                     {
69cc7b
                                         SdrFitToSizeType  eFTS( static_cast<const SdrTextFitToSizeTypeItem&>(pCustoShape->GetMergedItem( SDRATTR_TEXT_FITTOSIZE )).GetValue() );
69cc7b
-                                        if ( eFTS == SdrFitToSizeType::AllLines)
69cc7b
+                                        if (eFTS == SdrFitToSizeType::AllLines ||
69cc7b
+                                            eFTS == SdrFitToSizeType::Proportional)
69cc7b
                                         {
69cc7b
                                             gTextAlign = mso_alignTextStretch;
69cc7b
                                         }
69cc7b
diff --git a/sd/qa/unit/data/fit-to-size.fodp b/sd/qa/unit/data/fit-to-size.fodp
69cc7b
new file mode 100644
69cc7b
index 000000000000..734cf8a3a6c6
69cc7b
--- /dev/null
69cc7b
+++ b/sd/qa/unit/data/fit-to-size.fodp
69cc7b
@@ -0,0 +1,724 @@
69cc7b
+
69cc7b
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office: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:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation: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:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d: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:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0" xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" 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:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.presentation">
69cc7b
+ <office:meta><meta:creation-date>2017-10-18T22:06:17.203271648</meta:creation-date><dc:date>2017-10-19T22:51:45.845520353</dc:date><meta:editing-duration>PT31M43S</meta:editing-duration><meta:editing-cycles>4</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.8.0.0$Linux_X86_64 LibreOffice_project/a0fae00a2d52960eebbb14f08d2de251e0a8ff3f</meta:generator><meta:document-statistic meta:object-count="31"/></office:meta>
69cc7b
+ <office:font-face-decls>
69cc7b
+  <style:font-face style:name="Arial Black" svg:font-family="'Arial Black'" style:font-family-generic="roman"/>
69cc7b
+  <style:font-face style:name="MS Gothic" svg:font-family="'MS Gothic'" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="Liberation Serif" svg:font-family="'Liberation Serif'" style:font-family-generic="roman" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
69cc7b
+  <style:font-face style:name="Source Han Sans CN Regular" svg:font-family="'Source Han Sans CN Regular'" style:font-family-generic="system" style:font-pitch="variable"/>
69cc7b
+ </office:font-face-decls>
69cc7b
+ <office:styles>
69cc7b
+  <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/>
69cc7b
+  <style:default-style style:family="graphic">
69cc7b
+   <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap"/>
69cc7b
+   <style:paragraph-properties style:text-autospace="ideograph-alpha" style:punctuation-wrap="simple" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
69cc7b
+    <style:tab-stops/>
69cc7b
+   </style:paragraph-properties>
69cc7b
+   <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Serif" fo:font-size="24pt" fo:language="de" fo:country="DE" style:font-name-asian="DejaVu Sans" style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans" style:font-size-complex="24pt" style:language-complex="hi" style:country-complex="IN"/>
69cc7b
+  </style:default-style>
69cc7b
+  <style:style style:name="standard" style:family="graphic">
69cc7b
+   <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" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080">
69cc7b
+    <text:list-style style:name="standard">
69cc7b
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="2" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="4" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+    </text:list-style>
69cc7b
+   </style:graphic-properties>
69cc7b
+   <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"/>
69cc7b
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" 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="Source Han Sans CN Regular" style:font-family-asian="'Source Han Sans CN Regular'" 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="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="objectwitharrow" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.15cm" svg:stroke-color="#000000" draw:marker-start="Arrow" draw:marker-start-width="0.7cm" draw:marker-start-center="true" draw:marker-end-width="0.3cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="objectwithshadow" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:shadow="visible" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="objectwithoutfill" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties svg:stroke-color="#000000" draw:fill="none"/>
69cc7b
+  </style:style>
69cc7b
+  <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">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="text" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="textbody" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:text-properties fo:font-size="16pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="textbodyjustfied" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:text-align="justify"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="textbodyindent" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-indent="0.6cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="title" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:text-properties fo:font-size="44pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="title1" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="solid" draw:fill-color="#008080" draw:shadow="visible" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/>
69cc7b
+   <style:paragraph-properties fo:text-align="center"/>
69cc7b
+   <style:text-properties fo:font-size="24pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="title2" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties svg:stroke-width="0.05cm" draw:fill-color="#ffcc99" draw:shadow="visible" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/>
69cc7b
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0.2cm" fo:margin-top="0.1cm" fo:margin-bottom="0.1cm" fo:text-align="center" fo:text-indent="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="36pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="headline" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:margin-top="0.42cm" fo:margin-bottom="0.21cm"/>
69cc7b
+   <style:text-properties fo:font-size="24pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="headline1" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:margin-top="0.42cm" fo:margin-bottom="0.21cm"/>
69cc7b
+   <style:text-properties fo:font-size="18pt" fo:font-weight="bold"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="headline2" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:margin-top="0.42cm" fo:margin-bottom="0.21cm"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" fo:font-style="italic" fo:font-weight="bold"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="measure" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="solid" svg:stroke-color="#000000" draw:marker-start="Arrow" draw:marker-start-width="0.2cm" draw:marker-end="Arrow" draw:marker-end-width="0.2cm" draw:fill="none" draw:show-unit="true"/>
69cc7b
+   <style:text-properties fo:font-size="12pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-background" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:text-properties style:letter-kerning="true"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-backgroundobjects" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:textarea-horizontal-align="justify" draw:shadow="hidden" draw:shadow-offset-x="0.2cm" draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080"/>
69cc7b
+   <style:text-properties style:letter-kerning="true"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-notes" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none"/>
69cc7b
+   <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm" fo:text-indent="-0.6cm"/>
69cc7b
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="20pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Source Han Sans CN Regular" style:font-family-asian="'Source Han Sans CN Regular'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="20pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="20pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline1" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:auto-grow-height="false" draw:fit-to-size="shrink-to-fit">
69cc7b
+    <text:list-style style:name="Default-outline1">
69cc7b
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="0.3cm" text:min-label-width="0.9cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="2" text:bullet-char="–">
69cc7b
+      <style:list-level-properties text:space-before="1.5cm" text:min-label-width="0.9cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="75%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="2.8cm" text:min-label-width="0.8cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="4" text:bullet-char="–">
69cc7b
+      <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="75%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="6.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="7.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="9cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="10.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="11.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+    </text:list-style>
69cc7b
+   </style:graphic-properties>
69cc7b
+   <style:paragraph-properties fo:margin-top="0.5cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="32pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Source Han Sans CN Regular" style:font-family-asian="'Source Han Sans CN Regular'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="32pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline2" style:family="presentation" style:parent-style-name="Default-outline1">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.4cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="28pt" style:font-size-asian="28pt" style:font-size-complex="28pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline3" style:family="presentation" style:parent-style-name="Default-outline2">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.3cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="24pt" style:font-size-asian="24pt" style:font-size-complex="24pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline4" style:family="presentation" style:parent-style-name="Default-outline3">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.2cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline5" style:family="presentation" style:parent-style-name="Default-outline4">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline6" style:family="presentation" style:parent-style-name="Default-outline5">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline7" style:family="presentation" style:parent-style-name="Default-outline6">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline8" style:family="presentation" style:parent-style-name="Default-outline7">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-outline9" style:family="presentation" style:parent-style-name="Default-outline8">
69cc7b
+   <style:paragraph-properties fo:margin-top="0.1cm" fo:margin-bottom="0cm"/>
69cc7b
+   <style:text-properties fo:font-size="20pt" style:font-size-asian="20pt" style:font-size-complex="20pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-subtitle" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
69cc7b
+    <text:list-style style:name="Default-subtitle">
69cc7b
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="2" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="4" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+    </text:list-style>
69cc7b
+   </style:graphic-properties>
69cc7b
+   <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm" fo:text-align="center" fo:text-indent="0cm"/>
69cc7b
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="32pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Source Han Sans CN Regular" style:font-family-asian="'Source Han Sans CN Regular'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="32pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="32pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="Default-title" style:family="presentation">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-vertical-align="middle">
69cc7b
+    <text:list-style style:name="Default-title">
69cc7b
+     <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="2" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="4" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+     <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+      <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+      <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+     </text:list-level-style-bullet>
69cc7b
+    </text:list-style>
69cc7b
+   </style:graphic-properties>
69cc7b
+   <style:paragraph-properties fo:text-align="center"/>
69cc7b
+   <style:text-properties fo:font-variant="normal" fo:text-transform="none" style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="roman" style:font-pitch="variable" fo:font-size="44pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:letter-kerning="true" fo:background-color="transparent" style:font-name-asian="Source Han Sans CN Regular" style:font-family-asian="'Source Han Sans CN Regular'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="44pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="44pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:presentation-page-layout style:name="AL0T26">
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="1.743cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="15.414cm" svg:y="1.743cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="3.612cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="15.414cm" svg:y="3.612cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="2.058cm" svg:y="5.481cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+   <presentation:placeholder presentation:object="handout" svg:x="15.414cm" svg:y="5.481cm" svg:width="10.556cm" svg:height="-0.233cm"/>
69cc7b
+  </style:presentation-page-layout>
69cc7b
+  <style:presentation-page-layout style:name="AL1T0">
69cc7b
+   <presentation:placeholder presentation:object="title" svg:x="2.058cm" svg:y="1.743cm" svg:width="23.912cm" svg:height="3.507cm"/>
69cc7b
+   <presentation:placeholder presentation:object="subtitle" svg:x="2.058cm" svg:y="5.838cm" svg:width="23.912cm" svg:height="13.23cm"/>
69cc7b
+  </style:presentation-page-layout>
69cc7b
+ </office:styles>
69cc7b
+ <office:automatic-styles>
69cc7b
+  <style:page-layout style:name="PM0">
69cc7b
+   <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="21cm" fo:page-height="29.7cm" style:print-orientation="portrait"/>
69cc7b
+  </style:page-layout>
69cc7b
+  <style:page-layout style:name="PM1">
69cc7b
+   <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="28cm" fo:page-height="21cm" style:print-orientation="landscape"/>
69cc7b
+  </style:page-layout>
69cc7b
+  <style:style style:name="dp1" style:family="drawing-page">
69cc7b
+   <style:drawing-page-properties draw:background-size="border" draw:fill="none"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="dp2" style:family="drawing-page">
69cc7b
+   <style:drawing-page-properties presentation:display-header="true" presentation:display-footer="true" presentation:display-page-number="false" presentation:display-date-time="true"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="dp3" style:family="drawing-page">
69cc7b
+   <style:drawing-page-properties presentation:background-visible="true" presentation:background-objects-visible="true" presentation:display-footer="true" presentation:display-page-number="false" presentation:display-date-time="true"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="gr1" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="gr2" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="gr3" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.026cm" svg:stroke-color="#000000" draw:marker-start="" draw:marker-start-width="0.3cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.3cm" draw:marker-end-center="false" draw:stroke-linejoin="miter" draw:fill="solid" draw:fill-color="#000000" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="false" fo:min-height="1.14cm" fo:min-width="9.501cm" fo:padding-top="0.13cm" fo:padding-bottom="0.13cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:shadow-color="#808080"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="gr4" style:family="graphic" style:parent-style-name="standard">
69cc7b
+   <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.026cm" svg:stroke-color="#000000" draw:marker-start="" draw:marker-start-width="0.3cm" draw:marker-start-center="false" draw:marker-end="" draw:marker-end-width="0.3cm" draw:marker-end-center="false" draw:stroke-linejoin="miter" draw:fill="solid" draw:fill-color="#000000" draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle" draw:auto-grow-height="false" draw:fit-to-size="all" fo:min-height="1.14cm" fo:min-width="9.501cm" fo:padding-top="0.13cm" fo:padding-bottom="0.13cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm" fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:shadow-color="#808080"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="gr5" style:family="graphic">
69cc7b
+   <style:graphic-properties style:protect="size"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr1" style:family="presentation" style:parent-style-name="Default-backgroundobjects">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.449cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr2" style:family="presentation" style:parent-style-name="Default-backgroundobjects">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr3" style:family="presentation" style:parent-style-name="Default-backgroundobjects">
69cc7b
+   <style:graphic-properties draw:stroke="none" draw:fill="none" draw:fill-color="#ffffff" draw:textarea-vertical-align="bottom" draw:auto-grow-height="false" fo:min-height="1.485cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr4" style:family="presentation" style:parent-style-name="Default-subtitle">
69cc7b
+   <style:graphic-properties draw:fill-color="#ffffff" draw:fit-to-size="false" fo:min-height="4.686cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr5" style:family="presentation" style:parent-style-name="Default-subtitle">
69cc7b
+   <style:graphic-properties draw:fill-color="#ffffff" draw:fit-to-size="true" fo:min-height="5.085cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr6" style:family="presentation" style:parent-style-name="Default-subtitle">
69cc7b
+   <style:graphic-properties draw:fill-color="#ffffff" draw:fit-to-size="all" fo:min-height="4.485cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr7" style:family="presentation" style:parent-style-name="Default-subtitle">
69cc7b
+   <style:graphic-properties draw:fill-color="#ffffff" draw:fit-to-size="shrink-to-fit" fo:min-height="3.885cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="pr8" style:family="presentation" style:parent-style-name="Default-notes">
69cc7b
+   <style:graphic-properties draw:fill-color="#ffffff" fo:min-height="13.364cm"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P1" style:family="paragraph">
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P2" style:family="paragraph">
69cc7b
+   <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P3" style:family="paragraph">
69cc7b
+   <style:paragraph-properties fo:text-align="end"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P4" style:family="paragraph">
69cc7b
+   <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
69cc7b
+   <style:paragraph-properties fo:text-align="end"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P5" style:family="paragraph">
69cc7b
+   <style:paragraph-properties fo:text-align="center"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P6" style:family="paragraph">
69cc7b
+   <loext:graphic-properties draw:fill="none" draw:fill-color="#ffffff"/>
69cc7b
+   <style:paragraph-properties fo:text-align="center"/>
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P7" style:family="paragraph">
69cc7b
+   <loext:graphic-properties draw:fill-color="#ffffff"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P8" style:family="paragraph">
69cc7b
+   <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-align="start" fo:text-indent="0cm" style:punctuation-wrap="simple" style:line-break="normal" style:writing-mode="lr-tb">
69cc7b
+    <style:tab-stops/>
69cc7b
+   </style:paragraph-properties>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="P9" style:family="paragraph">
69cc7b
+   <loext:graphic-properties draw:fill="solid" draw:fill-color="#000000"/>
69cc7b
+   <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-align="start" fo:text-indent="0cm" style:punctuation-wrap="simple" style:line-break="normal" style:writing-mode="lr-tb">
69cc7b
+    <style:tab-stops/>
69cc7b
+   </style:paragraph-properties>
69cc7b
+   <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="24pt" 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="MS Gothic" style:font-size-asian="24pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Tahoma" style:font-size-complex="24pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="T1" style:family="text">
69cc7b
+   <style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
69cc7b
+  </style:style>
69cc7b
+  <style:style style:name="T2" style:family="text">
69cc7b
+   <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:text-position="0% 100%" style:font-name="Arial Black" fo:font-size="24pt" 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="MS Gothic" style:font-size-asian="24pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Tahoma" style:font-size-complex="24pt" 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"/>
69cc7b
+  </style:style>
69cc7b
+  <text:list-style style:name="L1">
69cc7b
+   <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="2" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="4" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+  </text:list-style>
69cc7b
+  <text:list-style style:name="L2">
69cc7b
+   <text:list-level-style-bullet text:level="1" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="2" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="0.6cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="3" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="1.2cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="4" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="1.8cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="5" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="2.4cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="6" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="3cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="7" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="3.6cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="8" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="4.2cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="9" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="4.8cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+   <text:list-level-style-bullet text:level="10" text:bullet-char="●">
69cc7b
+    <style:list-level-properties text:space-before="5.4cm" text:min-label-width="0.6cm"/>
69cc7b
+    <style:text-properties fo:font-family="StarSymbol" style:use-window-font-color="true" fo:font-size="45%"/>
69cc7b
+   </text:list-level-style-bullet>
69cc7b
+  </text:list-style>
69cc7b
+ </office:automatic-styles>
69cc7b
+ <office:master-styles>
69cc7b
+  <draw:layer-set>
69cc7b
+   <draw:layer draw:name="layout"/>
69cc7b
+   <draw:layer draw:name="background"/>
69cc7b
+   <draw:layer draw:name="backgroundobjects"/>
69cc7b
+   <draw:layer draw:name="controls"/>
69cc7b
+   <draw:layer draw:name="measurelines"/>
69cc7b
+  </draw:layer-set>
69cc7b
+  <style:handout-master presentation:presentation-page-layout-name="AL0T26" style:page-layout-name="PM0" draw:style-name="dp2">
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="1cm" svg:y="2.898cm"/>
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="1cm" svg:y="11.474cm"/>
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="1cm" svg:y="20.05cm"/>
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="11cm" svg:y="2.898cm"/>
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="11cm" svg:y="11.474cm"/>
69cc7b
+   <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="8.999cm" svg:height="6.749cm" svg:x="11cm" svg:y="20.05cm"/>
69cc7b
+   <draw:frame draw:style-name="gr1" draw:text-style-name="P2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P1"><text:span text:style-name="T1"><presentation:header/></text:span><presentation:header/></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame draw:style-name="gr1" draw:text-style-name="P4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm" presentation:class="date-time">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P3"><text:span text:style-name="T1"><presentation:date-time/></text:span><presentation:date-time/></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame draw:style-name="gr2" draw:text-style-name="P2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P1"><text:span text:style-name="T1"><presentation:footer/></text:span><presentation:footer/></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame draw:style-name="gr2" draw:text-style-name="P4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P3"><text:span text:style-name="T1"><text:page-number><number></text:page-number></text:span><text:page-number><number></text:page-number></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+  </style:handout-master>
69cc7b
+  <style:master-page style:name="Default" style:page-layout-name="PM1" draw:style-name="dp1">
69cc7b
+   <draw:frame presentation:style-name="Default-title" draw:layer="backgroundobjects" svg:width="25.199cm" svg:height="3.506cm" svg:x="1.4cm" svg:y="0.837cm" presentation:class="title" presentation:placeholder="true">
69cc7b
+    <draw:text-box/>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame presentation:style-name="Default-outline1" draw:layer="backgroundobjects" svg:width="25.199cm" svg:height="12.179cm" svg:x="1.4cm" svg:y="4.914cm" presentation:class="outline" presentation:placeholder="true">
69cc7b
+    <draw:text-box/>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame presentation:style-name="Default-outline1" draw:layer="backgroundobjects" svg:width="25.199cm" svg:height="12.179cm" svg:x="1.4cm" svg:y="4.914cm" presentation:class="outline" presentation:placeholder="true">
69cc7b
+    <draw:text-box/>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame presentation:style-name="pr1" draw:text-style-name="P2" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="1.448cm" svg:x="1.4cm" svg:y="19.131cm" presentation:class="date-time">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P1"><text:span text:style-name="T1"><presentation:date-time/></text:span><presentation:date-time/></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame presentation:style-name="pr1" draw:text-style-name="P6" draw:layer="backgroundobjects" svg:width="8.875cm" svg:height="1.448cm" svg:x="9.576cm" svg:y="19.131cm" presentation:class="footer">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P5"><text:span text:style-name="T1"><presentation:footer/></text:span><presentation:footer/></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <draw:frame presentation:style-name="pr1" draw:text-style-name="P4" draw:layer="backgroundobjects" svg:width="6.523cm" svg:height="1.448cm" svg:x="20.076cm" svg:y="19.131cm" presentation:class="page-number">
69cc7b
+    <draw:text-box>
69cc7b
+     <text:p text:style-name="P3"><text:span text:style-name="T1"><text:page-number><number></text:page-number></text:span><text:page-number><number></text:page-number></text:p>
69cc7b
+    </draw:text-box>
69cc7b
+   </draw:frame>
69cc7b
+   <presentation:notes style:page-layout-name="PM0">
69cc7b
+    <draw:page-thumbnail presentation:style-name="Default-title" draw:layer="backgroundobjects" svg:width="14.848cm" svg:height="11.136cm" svg:x="3.075cm" svg:y="2.257cm" presentation:class="page"/>
69cc7b
+    <draw:frame presentation:style-name="Default-notes" draw:layer="backgroundobjects" svg:width="16.799cm" svg:height="13.364cm" svg:x="2.1cm" svg:y="14.107cm" presentation:class="notes" presentation:placeholder="true">
69cc7b
+     <draw:text-box/>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="Default-notes" draw:layer="backgroundobjects" svg:width="16.799cm" svg:height="13.364cm" svg:x="2.1cm" svg:y="14.107cm" presentation:class="notes" presentation:placeholder="true">
69cc7b
+     <draw:text-box/>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr2" draw:text-style-name="P2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="0cm" presentation:class="header">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p text:style-name="P1"><text:span text:style-name="T1"><presentation:header/></text:span><presentation:header/></text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr2" draw:text-style-name="P4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="0cm" presentation:class="date-time">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p text:style-name="P3"><text:span text:style-name="T1"><presentation:date-time/></text:span><presentation:date-time/></text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr3" draw:text-style-name="P2" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="0cm" svg:y="28.215cm" presentation:class="footer">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p text:style-name="P1"><text:span text:style-name="T1"><presentation:footer/></text:span><presentation:footer/></text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr3" draw:text-style-name="P4" draw:layer="backgroundobjects" svg:width="9.113cm" svg:height="1.484cm" svg:x="11.886cm" svg:y="28.215cm" presentation:class="page-number">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p text:style-name="P3"><text:span text:style-name="T1"><text:page-number><number></text:page-number></text:span><text:page-number><number></text:page-number></text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+   </presentation:notes>
69cc7b
+  </style:master-page>
69cc7b
+ </office:master-styles>
69cc7b
+ <office:body>
69cc7b
+  <office:presentation>
69cc7b
+   <draw:page draw:name="page1" draw:style-name="dp3" draw:master-page-name="Default" presentation:presentation-page-layout-name="AL1T0">
69cc7b
+    <draw:frame presentation:style-name="pr4" draw:text-style-name="P7" draw:layer="layout" svg:width="12.4cm" svg:height="4.686cm" svg:x="1.4cm" svg:y="2cm" presentation:class="subtitle" presentation:user-transformed="true">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p>1</text:p>
69cc7b
+      <text:p>foo</text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr5" draw:text-style-name="P7" draw:layer="layout" svg:width="12.599cm" svg:height="5.085cm" svg:x="14cm" svg:y="2.4cm">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p>2</text:p>
69cc7b
+      <text:p>foo</text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr6" draw:text-style-name="P7" draw:layer="layout" svg:width="12.599cm" svg:height="4.485cm" svg:x="1.201cm" svg:y="10.115cm">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p>3</text:p>
69cc7b
+      <text:p>foo</text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:frame presentation:style-name="pr7" draw:text-style-name="P7" draw:layer="layout" svg:width="12.399cm" svg:height="3.885cm" svg:x="14.2cm" svg:y="10.2cm">
69cc7b
+     <draw:text-box>
69cc7b
+      <text:p>4</text:p>
69cc7b
+      <text:p>foo</text:p>
69cc7b
+     </draw:text-box>
69cc7b
+    </draw:frame>
69cc7b
+    <draw:custom-shape draw:style-name="gr3" draw:text-style-name="P9" draw:layer="layout" svg:width="10cm" svg:height="1.4cm" svg:x="2.6cm" svg:y="18cm">
69cc7b
+     <text:p text:style-name="P8"><text:span text:style-name="T2">5</text:span></text:p>
69cc7b
+     <text:p text:style-name="P8"><text:span text:style-name="T2">Fontwork</text:span></text:p>
69cc7b
+     <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="?f18 ?f0 ?f20 10800 ?f19 ?f1 ?f21 10800" draw:text-areas="0 0 21600 21600" draw:text-path="true" draw:text-path-mode="shape" draw:text-path-scale="path" draw:text-path-same-letter-heights="false" draw:type="fontwork-wave" draw:modifiers="4460 10800" draw:enhanced-path="M ?f7 ?f0 C ?f15 ?f9 ?f16 ?f10 ?f12 ?f0 N M ?f29 ?f1 C ?f27 ?f28 ?f25 ?f26 ?f24 ?f1 N">
69cc7b
+      <draw:equation draw:name="f0" draw:formula="$0 "/>
69cc7b
+      <draw:equation draw:name="f1" draw:formula="21600-?f0 "/>
69cc7b
+      <draw:equation draw:name="f2" draw:formula="$1 "/>
69cc7b
+      <draw:equation draw:name="f3" draw:formula="?f2 -10800"/>
69cc7b
+      <draw:equation draw:name="f4" draw:formula="?f3 *2"/>
69cc7b
+      <draw:equation draw:name="f5" draw:formula="abs(?f4 )"/>
69cc7b
+      <draw:equation draw:name="f6" draw:formula="4320-?f5 "/>
69cc7b
+      <draw:equation draw:name="f7" draw:formula="if(?f3 ,0,?f5 )"/>
69cc7b
+      <draw:equation draw:name="f8" draw:formula="15800*?f0 /4460"/>
69cc7b
+      <draw:equation draw:name="f9" draw:formula="?f0 -?f8 "/>
69cc7b
+      <draw:equation draw:name="f10" draw:formula="?f0 +?f8 "/>
69cc7b
+      <draw:equation draw:name="f11" draw:formula="21600-?f4 "/>
69cc7b
+      <draw:equation draw:name="f12" draw:formula="if(?f3 ,?f11 ,21600)"/>
69cc7b
+      <draw:equation draw:name="f13" draw:formula="?f12 -?f7 "/>
69cc7b
+      <draw:equation draw:name="f14" draw:formula="?f5 /2"/>
69cc7b
+      <draw:equation draw:name="f15" draw:formula="?f7 +7200-?f14 "/>
69cc7b
+      <draw:equation draw:name="f16" draw:formula="?f12 +?f14 -7200"/>
69cc7b
+      <draw:equation draw:name="f17" draw:formula="?f13 /2"/>
69cc7b
+      <draw:equation draw:name="f18" draw:formula="?f7 +?f17 "/>
69cc7b
+      <draw:equation draw:name="f19" draw:formula="21600-?f18 "/>
69cc7b
+      <draw:equation draw:name="f20" draw:formula="?f5 /2"/>
69cc7b
+      <draw:equation draw:name="f21" draw:formula="21600-?f20 "/>
69cc7b
+      <draw:equation draw:name="f22" draw:formula="?f0 *2"/>
69cc7b
+      <draw:equation draw:name="f23" draw:formula="21600-?f22 "/>
69cc7b
+      <draw:equation draw:name="f24" draw:formula="21600-?f7 "/>
69cc7b
+      <draw:equation draw:name="f25" draw:formula="21600-?f15 "/>
69cc7b
+      <draw:equation draw:name="f26" draw:formula="?f1 +?f8 "/>
69cc7b
+      <draw:equation draw:name="f27" draw:formula="21600-?f16 "/>
69cc7b
+      <draw:equation draw:name="f28" draw:formula="?f1 -?f8 "/>
69cc7b
+      <draw:equation draw:name="f29" draw:formula="21600-?f12 "/>
69cc7b
+      <draw:handle draw:handle-position="left $0" draw:handle-range-y-minimum="0" draw:handle-range-y-maximum="4460"/>
69cc7b
+      <draw:handle draw:handle-position="$1 21600" draw:handle-range-x-minimum="8640" draw:handle-range-x-maximum="12960"/>
69cc7b
+     </draw:enhanced-geometry>
69cc7b
+    </draw:custom-shape>
69cc7b
+    <draw:custom-shape draw:style-name="gr4" draw:text-style-name="P9" draw:layer="layout" svg:width="10cm" svg:height="1.4cm" svg:x="15cm" svg:y="18cm">
69cc7b
+     <text:p text:style-name="P8"><text:span text:style-name="T2">6</text:span></text:p>
69cc7b
+     <text:p text:style-name="P8"><text:span text:style-name="T2">Fontwork</text:span></text:p>
69cc7b
+     <draw:enhanced-geometry svg:viewBox="0 0 21600 21600" draw:glue-points="?f18 ?f0 ?f20 10800 ?f19 ?f1 ?f21 10800" draw:text-areas="0 0 21600 21600" draw:text-path="true" draw:text-path-mode="shape" draw:text-path-scale="path" draw:text-path-same-letter-heights="false" draw:type="fontwork-wave" draw:modifiers="4460 10800" draw:enhanced-path="M ?f7 ?f0 C ?f15 ?f9 ?f16 ?f10 ?f12 ?f0 N M ?f29 ?f1 C ?f27 ?f28 ?f25 ?f26 ?f24 ?f1 N">
69cc7b
+      <draw:equation draw:name="f0" draw:formula="$0 "/>
69cc7b
+      <draw:equation draw:name="f1" draw:formula="21600-?f0 "/>
69cc7b
+      <draw:equation draw:name="f2" draw:formula="$1 "/>
69cc7b
+      <draw:equation draw:name="f3" draw:formula="?f2 -10800"/>
69cc7b
+      <draw:equation draw:name="f4" draw:formula="?f3 *2"/>
69cc7b
+      <draw:equation draw:name="f5" draw:formula="abs(?f4 )"/>
69cc7b
+      <draw:equation draw:name="f6" draw:formula="4320-?f5 "/>
69cc7b
+      <draw:equation draw:name="f7" draw:formula="if(?f3 ,0,?f5 )"/>
69cc7b
+      <draw:equation draw:name="f8" draw:formula="15800*?f0 /4460"/>
69cc7b
+      <draw:equation draw:name="f9" draw:formula="?f0 -?f8 "/>
69cc7b
+      <draw:equation draw:name="f10" draw:formula="?f0 +?f8 "/>
69cc7b
+      <draw:equation draw:name="f11" draw:formula="21600-?f4 "/>
69cc7b
+      <draw:equation draw:name="f12" draw:formula="if(?f3 ,?f11 ,21600)"/>
69cc7b
+      <draw:equation draw:name="f13" draw:formula="?f12 -?f7 "/>
69cc7b
+      <draw:equation draw:name="f14" draw:formula="?f5 /2"/>
69cc7b
+      <draw:equation draw:name="f15" draw:formula="?f7 +7200-?f14 "/>
69cc7b
+      <draw:equation draw:name="f16" draw:formula="?f12 +?f14 -7200"/>
69cc7b
+      <draw:equation draw:name="f17" draw:formula="?f13 /2"/>
69cc7b
+      <draw:equation draw:name="f18" draw:formula="?f7 +?f17 "/>
69cc7b
+      <draw:equation draw:name="f19" draw:formula="21600-?f18 "/>
69cc7b
+      <draw:equation draw:name="f20" draw:formula="?f5 /2"/>
69cc7b
+      <draw:equation draw:name="f21" draw:formula="21600-?f20 "/>
69cc7b
+      <draw:equation draw:name="f22" draw:formula="?f0 *2"/>
69cc7b
+      <draw:equation draw:name="f23" draw:formula="21600-?f22 "/>
69cc7b
+      <draw:equation draw:name="f24" draw:formula="21600-?f7 "/>
69cc7b
+      <draw:equation draw:name="f25" draw:formula="21600-?f15 "/>
69cc7b
+      <draw:equation draw:name="f26" draw:formula="?f1 +?f8 "/>
69cc7b
+      <draw:equation draw:name="f27" draw:formula="21600-?f16 "/>
69cc7b
+      <draw:equation draw:name="f28" draw:formula="?f1 -?f8 "/>
69cc7b
+      <draw:equation draw:name="f29" draw:formula="21600-?f12 "/>
69cc7b
+      <draw:handle draw:handle-position="left $0" draw:handle-range-y-minimum="0" draw:handle-range-y-maximum="4460"/>
69cc7b
+      <draw:handle draw:handle-position="$1 21600" draw:handle-range-x-minimum="8640" draw:handle-range-x-maximum="12960"/>
69cc7b
+     </draw:enhanced-geometry>
69cc7b
+    </draw:custom-shape>
69cc7b
+    <presentation:notes draw:style-name="dp2">
69cc7b
+     <draw:page-thumbnail draw:style-name="gr5" draw:layer="layout" svg:width="14.848cm" svg:height="11.136cm" svg:x="3.075cm" svg:y="2.257cm" draw:page-number="1" presentation:class="page"/>
69cc7b
+     <draw:frame presentation:style-name="pr8" draw:text-style-name="P7" draw:layer="layout" svg:width="16.799cm" svg:height="13.364cm" svg:x="2.1cm" svg:y="14.107cm" presentation:class="notes" presentation:placeholder="true" presentation:user-transformed="true">
69cc7b
+      <draw:text-box/>
69cc7b
+     </draw:frame>
69cc7b
+    </presentation:notes>
69cc7b
+   </draw:page>
69cc7b
+   <presentation:settings presentation:mouse-visible="false"/>
69cc7b
+  </office:presentation>
69cc7b
+ </office:body>
69cc7b
+</office:document>
69cc7b
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
69cc7b
index 3f2882384031..6bbb2a53648b 100644
69cc7b
--- a/sd/qa/unit/export-tests.cxx
69cc7b
+++ b/sd/qa/unit/export-tests.cxx
69cc7b
@@ -84,6 +84,7 @@ public:
69cc7b
     void testN821567();
69cc7b
     void testMediaEmbedding();
69cc7b
     void testFdo84043();
69cc7b
+    void testTdf97630();
69cc7b
     void testSwappedOutImageExport();
69cc7b
     void testOOoXMLAnimations();
69cc7b
     void testTdf80020();
69cc7b
@@ -98,6 +99,7 @@ public:
69cc7b
     CPPUNIT_TEST(testN821567);
69cc7b
     CPPUNIT_TEST(testMediaEmbedding);
69cc7b
     CPPUNIT_TEST(testFdo84043);
69cc7b
+    CPPUNIT_TEST(testTdf97630);
69cc7b
     CPPUNIT_TEST(testSwappedOutImageExport);
69cc7b
     CPPUNIT_TEST(testOOoXMLAnimations);
69cc7b
     CPPUNIT_TEST(testTdf80020);
69cc7b
@@ -125,6 +127,7 @@ public:
69cc7b
             { "table", "urn:oasis:names:tc:opendocument:xmlns:table:1.0" },
69cc7b
             { "text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0" },
69cc7b
             { "xlink", "http://www.w3c.org/1999/xlink" },
69cc7b
+            { "loext", "urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" },
69cc7b
         };
69cc7b
         for (size_t i = 0; i < SAL_N_ELEMENTS(namespaces); ++i)
69cc7b
         {
69cc7b
@@ -246,6 +249,104 @@ void SdExportTest::testFdo84043()
69cc7b
     xDocShRef->DoClose();
69cc7b
 }
69cc7b
 
69cc7b
+void SdExportTest::testTdf97630()
69cc7b
+{
69cc7b
+    ::sd::DrawDocShellRef xDocShRef = loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/fit-to-size.fodp"), FODP);
69cc7b
+
69cc7b
+    {
69cc7b
+        uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDocShRef->GetModel(), uno::UNO_QUERY);
69cc7b
+        uno::Reference<drawing::XDrawPage> xDP(xDPS->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
69cc7b
+
69cc7b
+        drawing::TextFitToSizeType tmp;
69cc7b
+        // text shapes
69cc7b
+        uno::Reference<beans::XPropertySet> xShape0(xDP->getByIndex(0), uno::UNO_QUERY);
69cc7b
+        xShape0->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape1(xDP->getByIndex(1), uno::UNO_QUERY);
69cc7b
+        xShape1->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_PROPORTIONAL, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape2(xDP->getByIndex(2), uno::UNO_QUERY);
69cc7b
+        xShape2->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_ALLLINES, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape3(xDP->getByIndex(3), uno::UNO_QUERY);
69cc7b
+        xShape3->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_AUTOFIT, tmp);
69cc7b
+
69cc7b
+        // fontworks
69cc7b
+        uno::Reference<beans::XPropertySet> xShape4(xDP->getByIndex(4), uno::UNO_QUERY);
69cc7b
+        xShape4->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape5(xDP->getByIndex(5), uno::UNO_QUERY);
69cc7b
+        xShape5->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_ALLLINES, tmp);
69cc7b
+
69cc7b
+    }
69cc7b
+
69cc7b
+    utl::TempFile aTempFile;
69cc7b
+    xDocShRef = saveAndReload(xDocShRef.get(), ODP, &aTempFile);
69cc7b
+
69cc7b
+    {
69cc7b
+        uno::Reference<drawing::XDrawPagesSupplier> xDPS(xDocShRef->GetModel(), uno::UNO_QUERY);
69cc7b
+        uno::Reference<drawing::XDrawPage> xDP(xDPS->getDrawPages()->getByIndex(0), uno::UNO_QUERY);
69cc7b
+
69cc7b
+        drawing::TextFitToSizeType tmp;
69cc7b
+        // text shapes
69cc7b
+        uno::Reference<beans::XPropertySet> xShape0(xDP->getByIndex(0), uno::UNO_QUERY);
69cc7b
+        xShape0->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape1(xDP->getByIndex(1), uno::UNO_QUERY);
69cc7b
+        xShape1->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_PROPORTIONAL, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape2(xDP->getByIndex(2), uno::UNO_QUERY);
69cc7b
+        xShape2->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+#if 1
69cc7b
+// TODO see TODO in sdpropls.cxx
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_ALLLINES, tmp);
69cc7b
+#else
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_PROPORTIONAL, tmp);
69cc7b
+#endif
69cc7b
+        uno::Reference<beans::XPropertySet> xShape3(xDP->getByIndex(3), uno::UNO_QUERY);
69cc7b
+        xShape3->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_AUTOFIT, tmp);
69cc7b
+
69cc7b
+        // fontworks
69cc7b
+        uno::Reference<beans::XPropertySet> xShape4(xDP->getByIndex(4), uno::UNO_QUERY);
69cc7b
+        xShape4->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_NONE, tmp);
69cc7b
+        uno::Reference<beans::XPropertySet> xShape5(xDP->getByIndex(5), uno::UNO_QUERY);
69cc7b
+        xShape5->getPropertyValue("TextFitToSize") >>= tmp;
69cc7b
+#if 1
69cc7b
+// TODO see TODO in sdpropls.cxx
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_ALLLINES, tmp);
69cc7b
+#else
69cc7b
+        CPPUNIT_ASSERT_EQUAL(drawing::TextFitToSizeType_PROPORTIONAL, tmp);
69cc7b
+#endif
69cc7b
+    }
69cc7b
+
69cc7b
+    xmlDocPtr pXmlDoc = parseExport(aTempFile, "content.xml");
69cc7b
+    // text shapes
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='false' and @style:shrink-to-fit='false']", 1);
69cc7b
+#if 1
69cc7b
+// TODO see TODO in sdpropls.cxx
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='true' and @style:shrink-to-fit='false']", 1);
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='all' and @style:shrink-to-fit='false']", 1);
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='shrink-to-fit' and @style:shrink-to-fit='true']", 1);
69cc7b
+#else
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='true' and @style:shrink-to-fit='false']", 2);
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='presentation']/style:graphic-properties[@draw:fit-to-size='false' and @style:shrink-to-fit='true']", 1);
69cc7b
+#endif
69cc7b
+    // fontworks
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='graphic']/style:graphic-properties[@draw:fit-to-size='false' and @style:shrink-to-fit='false']", 1);
69cc7b
+#if 1
69cc7b
+// TODO see TODO in sdpropls.cxx
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='graphic']/style:graphic-properties[@draw:fit-to-size='all' and @style:shrink-to-fit='false']", 1);
69cc7b
+#else
69cc7b
+    assertXPath(pXmlDoc, "//style:style[@style:family='graphic']/style:graphic-properties[@draw:fit-to-size='true' and @style:shrink-to-fit='false']", 1);
69cc7b
+#endif
69cc7b
+
69cc7b
+    xDocShRef->DoClose();
69cc7b
+}
69cc7b
+
69cc7b
 void SdExportTest::testSwappedOutImageExport()
69cc7b
 {
69cc7b
     // Problem was with the swapped out images, which were not swapped in during export.
69cc7b
diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
69cc7b
index a999791a5c5a..26f227e8b9a4 100644
69cc7b
--- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
69cc7b
+++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx
69cc7b
@@ -433,7 +433,10 @@ void GetFontWorkOutline( FWData& rFWData, const SdrObject* pCustomShape )
69cc7b
     while ( aTextAreaIter != aTextAreaIEnd )
69cc7b
     {
69cc7b
         GetTextAreaOutline( rFWData, pCustomShape, *aTextAreaIter, bSameLetterHeights );
69cc7b
-        if ( eFTS == SdrFitToSizeType::AllLines )
69cc7b
+        if (eFTS == SdrFitToSizeType::AllLines ||
69cc7b
+            // tdf#97630 interpret PROPORTIONAL same as ALLLINES so we don't
69cc7b
+            // need another ODF attribute!
69cc7b
+            eFTS == SdrFitToSizeType::Proportional)
69cc7b
         {
69cc7b
             std::vector< FWParagraphData >::iterator aParagraphIter( aTextAreaIter->vParagraphs.begin() );
69cc7b
             std::vector< FWParagraphData >::const_iterator aParagraphIEnd( aTextAreaIter->vParagraphs.end() );
69cc7b
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
69cc7b
index a148de31cf13..329cd2bcb006 100644
69cc7b
--- a/svx/source/toolbars/fontworkbar.cxx
69cc7b
+++ b/svx/source/toolbars/fontworkbar.cxx
69cc7b
@@ -73,10 +73,16 @@ void SetAlignmentState( SdrView* pSdrView, SfxItemSet& rSet )
69cc7b
                 case SDRTEXTHORZADJUST_RIGHT  : nAlignment = 2; break;
69cc7b
                 case SDRTEXTHORZADJUST_BLOCK  :
69cc7b
                 {
69cc7b
-                    if ( rTextFitToSizeTypeItem.GetValue() == SdrFitToSizeType::NONE )
69cc7b
+                    auto const fit(rTextFitToSizeTypeItem.GetValue());
69cc7b
+                    if (fit == SdrFitToSizeType::NONE)
69cc7b
+                    {
69cc7b
                         nAlignment = 3;
69cc7b
-                    else if ( rTextFitToSizeTypeItem.GetValue() == SdrFitToSizeType::AllLines )
69cc7b
+                    }
69cc7b
+                    else if (fit == SdrFitToSizeType::AllLines ||
69cc7b
+                             fit == SdrFitToSizeType::Proportional)
69cc7b
+                    {
69cc7b
                         nAlignment = 4;
69cc7b
+                    }
69cc7b
                 }
69cc7b
             }
69cc7b
             if ( ( nOldAlignment != -1 ) && ( nOldAlignment != nAlignment ) )
69cc7b
diff --git a/xmloff/inc/xmlsdtypes.hxx b/xmloff/inc/xmlsdtypes.hxx
69cc7b
index 8e388cf032c7..675b16fc1377 100644
69cc7b
--- a/xmloff/inc/xmlsdtypes.hxx
69cc7b
+++ b/xmloff/inc/xmlsdtypes.hxx
69cc7b
@@ -67,6 +67,7 @@
69cc7b
 #define XML_SD_TYPE_CONTROL_BORDER_COLOR            (XML_SD_TYPES_START + 33 )
69cc7b
 #define XML_SD_TYPE_IMAGE_SCALE_MODE                (XML_SD_TYPES_START + 34 )
69cc7b
 #define XML_SD_TYPE_LINECAP                         (XML_SD_TYPES_START + 35 )
69cc7b
+#define XML_SD_TYPE_FITTOSIZE_AUTOFIT               (XML_SD_TYPES_START + 36 )
69cc7b
 
69cc7b
 //////////////////////////////////////////////////////////////////////////////
69cc7b
 // 3D property types
69cc7b
diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx
69cc7b
index 72d6315fa088..12c900eb50cc 100644
69cc7b
--- a/xmloff/source/draw/sdpropls.cxx
69cc7b
+++ b/xmloff/source/draw/sdpropls.cxx
69cc7b
@@ -131,7 +131,8 @@ const XMLPropertyMapEntry aXMLSDProperties[] =
69cc7b
     GMAP( "TextVerticalAdjust",             XML_NAMESPACE_DRAW, XML_TEXTAREA_VERTICAL_ALIGN,    XML_SD_TYPE_VERTICAL_ALIGN, 0 ),
69cc7b
     GMAP( "TextAutoGrowHeight",             XML_NAMESPACE_DRAW, XML_AUTO_GROW_HEIGHT,       XML_TYPE_BOOL, 0 ),
69cc7b
     GMAP( "TextAutoGrowWidth",              XML_NAMESPACE_DRAW, XML_AUTO_GROW_WIDTH,        XML_TYPE_BOOL, 0 ),
69cc7b
-    GMAP( "TextFitToSize",                  XML_NAMESPACE_DRAW, XML_FIT_TO_SIZE,            XML_SD_TYPE_FITTOSIZE, 0 ),
69cc7b
+    GMAP( "TextFitToSize",                  XML_NAMESPACE_DRAW, XML_FIT_TO_SIZE,            XML_SD_TYPE_FITTOSIZE|MID_FLAG_MERGE_PROPERTY, 0),
69cc7b
+    GMAPV( "TextFitToSize",                 XML_NAMESPACE_STYLE, XML_SHRINK_TO_FIT,         XML_SD_TYPE_FITTOSIZE_AUTOFIT|MID_FLAG_MERGE_PROPERTY, 0, SvtSaveOptions::ODFVER_012 ),
69cc7b
     GMAP( "TextContourFrame",               XML_NAMESPACE_DRAW, XML_FIT_TO_CONTOUR,         XML_TYPE_BOOL, 0 ),
69cc7b
     GMAP( "TextMaximumFrameHeight",         XML_NAMESPACE_FO,   XML_MAX_HEIGHT,             XML_TYPE_MEASURE, 0 ),
69cc7b
     GMAP( "TextMaximumFrameWidth",          XML_NAMESPACE_FO,   XML_MAX_WIDTH,              XML_TYPE_MEASURE, 0 ),
69cc7b
@@ -615,12 +616,13 @@ static SvXMLEnumMapEntry const pXML_VerticalAlign_Enum[] =
69cc7b
     { XML_TOKEN_INVALID, 0 }
69cc7b
 };
69cc7b
 
69cc7b
+// note: PROPORTIONAL and ALLLINES are the same thing now!
69cc7b
 static SvXMLEnumMapEntry const pXML_FitToSize_Enum_Odf12[] =
69cc7b
 {
69cc7b
     { XML_FALSE,        drawing::TextFitToSizeType_NONE },
69cc7b
     { XML_TRUE,         drawing::TextFitToSizeType_PROPORTIONAL },
69cc7b
     { XML_TRUE,         drawing::TextFitToSizeType_ALLLINES },
69cc7b
-    { XML_TRUE,         drawing::TextFitToSizeType_AUTOFIT },
69cc7b
+    { XML_FALSE,        drawing::TextFitToSizeType_AUTOFIT },
69cc7b
     { XML_TOKEN_INVALID, 0 }
69cc7b
 };
69cc7b
 
69cc7b
@@ -633,6 +635,15 @@ static SvXMLEnumMapEntry const pXML_FitToSize_Enum[] =
69cc7b
     { XML_TOKEN_INVALID, 0 }
69cc7b
 };
69cc7b
 
69cc7b
+static SvXMLEnumMapEntry const pXML_ShrinkToFit_Enum[] =
69cc7b
+{
69cc7b
+    { XML_FALSE,        drawing::TextFitToSizeType_NONE },
69cc7b
+    { XML_FALSE,        drawing::TextFitToSizeType_PROPORTIONAL },
69cc7b
+    { XML_FALSE,        drawing::TextFitToSizeType_ALLLINES },
69cc7b
+    { XML_TRUE,         drawing::TextFitToSizeType_AUTOFIT },
69cc7b
+    { XML_TOKEN_INVALID, (drawing::TextFitToSizeType)0 }
69cc7b
+};
69cc7b
+
69cc7b
 static SvXMLEnumMapEntry const pXML_MeasureUnit_Enum[] =
69cc7b
 {
69cc7b
     { XML_AUTOMATIC,    0 },
69cc7b
@@ -853,6 +864,40 @@ bool XMLSdHeaderFooterVisibilityTypeHdl::exportXML(
69cc7b
     return bRet;
69cc7b
 }
69cc7b
 
69cc7b
+class XMLFitToSizeEnumPropertyHdl : public XMLEnumPropertyHdl
69cc7b
+{
69cc7b
+public:
69cc7b
+    XMLFitToSizeEnumPropertyHdl(
69cc7b
+            const SvXMLEnumMapEntry *const pMap)
69cc7b
+        : XMLEnumPropertyHdl(pMap, cppu::UnoType<css::drawing::TextFitToSizeType>::get())
69cc7b
+    {
69cc7b
+    }
69cc7b
+
69cc7b
+    virtual bool importXML(const OUString& rStrImpValue, uno::Any& rValue,
69cc7b
+                           const SvXMLUnitConverter& rUC) const override
69cc7b
+    {
69cc7b
+        // we don't know here what the actual attribute name is -
69cc7b
+        // but we can combine the 2 attributes by just taking the
69cc7b
+        // "largest" result value; this can never result in ALLLINES
69cc7b
+        // so the implementation has to interpret PROPORTIONAL as ALLLINES;
69cc7b
+        // both "true" is invalid anyway.
69cc7b
+        Any any;
69cc7b
+        auto const bRet = XMLEnumPropertyHdl::importXML(rStrImpValue, any, rUC);
69cc7b
+        if (!bRet)
69cc7b
+        {
69cc7b
+            return false;
69cc7b
+        }
69cc7b
+        assert(any.hasValue());
69cc7b
+        if (!rValue.hasValue() ||
69cc7b
+            rValue.get<drawing::TextFitToSizeType>() < any.get<drawing::TextFitToSizeType>())
69cc7b
+        {
69cc7b
+            rValue = any;
69cc7b
+        }
69cc7b
+        return true;
69cc7b
+    }
69cc7b
+};
69cc7b
+
69cc7b
+
69cc7b
 XMLSdPropHdlFactory::XMLSdPropHdlFactory( uno::Reference< frame::XModel > const & xModel, SvXMLImport& rImport )
69cc7b
 : mxModel( xModel ), mpExport(nullptr), mpImport( &rImport )
69cc7b
 {
69cc7b
@@ -1047,19 +1092,27 @@ const XMLPropertyHandler* XMLSdPropHdlFactory::GetPropertyHandler( sal_Int32 nTy
69cc7b
                 break;
69cc7b
             case XML_SD_TYPE_FITTOSIZE:
69cc7b
                 {
69cc7b
-                    if (mpExport && (mpExport->getDefaultVersion()
69cc7b
-                                        <= SvtSaveOptions::ODFVER_012))
69cc7b
+                    if (mpExport
69cc7b
+#if 1
69cc7b
+// TODO: remove in a couple releases, when users have the import of style:shrink-to-fit
69cc7b
+                            && (mpExport->getDefaultVersion()
69cc7b
+                                        <= SvtSaveOptions::ODFVER_012)
69cc7b
+#endif
69cc7b
+                        )
69cc7b
                     {
69cc7b
-                        pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum_Odf12,
69cc7b
-                            cppu::UnoType<css::drawing::TextFitToSizeType>::get());
69cc7b
+                        pHdl = new XMLFitToSizeEnumPropertyHdl(pXML_FitToSize_Enum_Odf12);
69cc7b
                     }
69cc7b
                     else
69cc7b
-                    {
69cc7b
-                        pHdl = new XMLEnumPropertyHdl(pXML_FitToSize_Enum,
69cc7b
-                            cppu::UnoType<css::drawing::TextFitToSizeType>::get());
69cc7b
+                    {   // import all values written by old LO
69cc7b
+                        pHdl = new XMLFitToSizeEnumPropertyHdl(pXML_FitToSize_Enum);
69cc7b
                     }
69cc7b
                 }
69cc7b
                 break;
69cc7b
+            case XML_SD_TYPE_FITTOSIZE_AUTOFIT:
69cc7b
+                {
69cc7b
+                    pHdl = new XMLFitToSizeEnumPropertyHdl(pXML_ShrinkToFit_Enum);
69cc7b
+                }
69cc7b
+                break;
69cc7b
             case XML_SD_TYPE_MEASURE_UNIT:
69cc7b
                 pHdl = new XMLEnumPropertyHdl( pXML_MeasureUnit_Enum, ::cppu::UnoType<sal_Int32>::get() );
69cc7b
                 break;
69cc7b
-- 
69cc7b
2.14.1
69cc7b