basegfx/source/tools/bgradient.cxx | 14
dbaccess/source/ui/app/AppController.cxx | 2
include/unotools/historyoptions.hxx | 4
oox/qa/unit/data/tdf155852_MCGR_StepCount4.fodp | 637 ++++++++++++++++++++++++
oox/qa/unit/mcgr.cxx | 25
oox/source/export/drawingml.cxx | 10
sfx2/source/appl/newhelp.cxx | 3
sfx2/source/appl/sfxpicklist.cxx | 3
sw/qa/extras/htmlexport/data/tdf155871.fodt | 21
sw/qa/extras/htmlexport/htmlexport.cxx | 12
sw/source/filter/html/htmlnumwriter.cxx | 2
unotools/source/config/historyoptions.cxx | 68 +-
12 files changed, 764 insertions(+), 37 deletions(-)
New commits:
commit 0e54294046c33cd2bbda6318ee61242dbfd8dcf6
Author: Andreas Heinisch <andreas.heini...@yahoo.de>
AuthorDate: Thu Jun 15 19:48:18 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 20 09:11:25 2023 +0200
tdf#38742 - Start Center: move last opened documents to the top
Change-Id: If395b0784d9bdcdc1200c15fca60647da825ea1e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153150
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch <andreas.heini...@yahoo.de>
(cherry picked from commit 760c7a806ced3861086d5fdfbb7b4b1461948c27)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153227
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/dbaccess/source/ui/app/AppController.cxx
b/dbaccess/source/ui/app/AppController.cxx
index 175f56b39724..ad18bff5892c 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -361,7 +361,7 @@ void SAL_CALL OApplicationController::disposing()
aURL.GetURLNoPass(
INetURLObject::DecodeMechanism::NONE ),
aFilter,
getStrippedDatabaseName(),
- std::nullopt, std::nullopt, std::nullopt);
+ std::nullopt, std::nullopt);
// add to recent document list
if ( aURL.GetProtocol() == INetProtocol::File )
diff --git a/include/unotools/historyoptions.hxx
b/include/unotools/historyoptions.hxx
index 53b9fcdfa805..b2388de2ad4b 100644
--- a/include/unotools/historyoptions.hxx
+++ b/include/unotools/historyoptions.hxx
@@ -73,13 +73,11 @@ namespace SvtHistoryOptions
@param sTitle document title to save in history
@param sThumbnail base64 encoded thumbnail of the item
@param oIsReadOnly item was opened editable or read-only
- @param oIsPinned item is pinned in the user-interface
*/
UNOTOOLS_DLLPUBLIC void AppendItem(EHistoryType eHistory, const OUString&
sURL,
const OUString& sFilter, const
OUString& sTitle,
const std::optional<OUString>&
sThumbnail,
- std::optional<bool> oIsReadOnly,
- std::optional<bool> oIsPinned);
+ std::optional<bool> oIsReadOnly);
/** Delete item from the specified list.
*/
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 5c2d7cf6c0e1..e676bec19d4e 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -1175,8 +1175,7 @@ BookmarksTabPage_Impl::~BookmarksTabPage_Impl()
for (sal_Int32 i = 0; i < nCount; ++i)
{
SvtHistoryOptions::AppendItem(EHistoryType::HelpBookmarks,
m_xBookmarksBox->get_id(i), "",
- m_xBookmarksBox->get_text(i),
std::nullopt, std::nullopt,
- std::nullopt);
+ m_xBookmarksBox->get_text(i),
std::nullopt, std::nullopt);
}
m_xBookmarksBox.reset();
diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx
index 2451a8d0cad8..fb676d981d35 100644
--- a/sfx2/source/appl/sfxpicklist.cxx
+++ b/sfx2/source/appl/sfxpicklist.cxx
@@ -131,8 +131,7 @@ void SfxPickListImpl::AddDocumentToPickList( const
SfxObjectShell* pDocSh )
aFilter,
aTitle,
aThumbnail,
- oIsReadOnly,
- std::nullopt);
+ oIsReadOnly);
if ( aURL.GetProtocol() == INetProtocol::File )
Application::AddToRecentDocumentList( aURL.GetURLNoPass(
INetURLObject::DecodeMechanism::NONE ),
diff --git a/unotools/source/config/historyoptions.cxx
b/unotools/source/config/historyoptions.cxx
index 0b9e4d717b83..2cda950858d2 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.cxx
@@ -134,7 +134,8 @@ std::vector< HistoryItem > GetList( EHistoryType eHistory )
xSet->getPropertyValue(s_sPassword) >>= aItem.sPassword;
xSet->getPropertyValue(s_sThumbnail) >>= aItem.sThumbnail;
xSet->getPropertyValue(s_sReadOnly) >>= aItem.isReadOnly;
- xSet->getPropertyValue(s_sPinned) >>= aItem.isPinned;
+ if (xSet->getPropertySetInfo()->hasPropertyByName(s_sPinned))
+ xSet->getPropertyValue(s_sPinned) >>= aItem.isPinned;
aRet.push_back(aItem);
}
@@ -160,7 +161,7 @@ std::vector< HistoryItem > GetList( EHistoryType eHistory )
void AppendItem(EHistoryType eHistory, const OUString& sURL, const OUString&
sFilter,
const OUString& sTitle, const std::optional<OUString>&
sThumbnail,
- ::std::optional<bool> const oIsReadOnly, ::std::optional<bool>
const oIsPinned)
+ ::std::optional<bool> const oIsReadOnly)
{
try
{
@@ -194,17 +195,15 @@ void AppendItem(EHistoryType eHistory, const OUString&
sURL, const OUString& sFi
{
xSet->setPropertyValue(s_sReadOnly, uno::Any(*oIsReadOnly));
}
- if (oIsPinned)
- {
- xSet->setPropertyValue(s_sPinned, uno::Any(*oIsPinned));
- if (*oIsPinned)
- PrependItem(xCfg, xOrderList, sURL);
- else
- MoveItemToUnpinned(xCfg, xOrderList, xItemList, sURL);
- }
+
+ // tdf#38742 - check the current pinned state of the item and move
it accordingly
+ bool bIsItemPinned = false;
+ if (xSet->getPropertySetInfo()->hasPropertyByName(s_sPinned))
+ xSet->getPropertyValue(s_sPinned) >>= bIsItemPinned;
+ if (bIsItemPinned)
+ PrependItem(xCfg, xOrderList, sURL);
else
MoveItemToUnpinned(xCfg, xOrderList, xItemList, sURL);
-
}
else // The item to be appended does not exist yet
{
@@ -270,14 +269,13 @@ void AppendItem(EHistoryType eHistory, const OUString&
sURL, const OUString& sFi
{
xSet->setPropertyValue(s_sReadOnly, uno::Any(*oIsReadOnly));
}
- if (oIsPinned)
- {
- xSet->setPropertyValue(s_sPinned, uno::Any(*oIsPinned));
- if (*oIsPinned)
- PrependItem(xCfg, xOrderList, sURL);
- else
- MoveItemToUnpinned(xCfg, xOrderList, xItemList, sURL);
- }
+
+ // tdf#38742 - check the current pinned state of the item and move
it accordingly
+ bool bIsItemPinned = false;
+ if (xSet->getPropertySetInfo()->hasPropertyByName(s_sPinned))
+ xSet->getPropertyValue(s_sPinned) >>= bIsItemPinned;
+ if (bIsItemPinned)
+ PrependItem(xCfg, xOrderList, sURL);
else
MoveItemToUnpinned(xCfg, xOrderList, xItemList, sURL);
@@ -506,8 +504,8 @@ static void MoveItemToUnpinned(const
uno::Reference<container::XNameAccess>& xCf
if (aItem == sURL)
{
- // Move item to the unpinned document section
- for (sal_Int32 j = i + 1; j < nLength - 1; j++)
+ // Move item to the unpinned document section to the right if it
was previously pinned
+ for (sal_Int32 j = i + 1; j < nLength; j++)
{
uno::Reference<beans::XPropertySet> xNextSet;
xOrderList->getByName(OUString::number(j)) >>= xNextSet;
@@ -522,12 +520,40 @@ static void MoveItemToUnpinned(const
uno::Reference<container::XNameAccess>& xCf
xNextItemSet->getPropertyValue(s_sPinned) >>=
bIsItemPinned;
if (bIsItemPinned)
{
+ xOrderList->getByName(OUString::number(j - 1)) >>= xSet;
+ xSet->getPropertyValue(s_sHistoryItemRef) >>= aItem;
xSet->setPropertyValue(s_sHistoryItemRef,
uno::Any(aNextItem));
xNextSet->setPropertyValue(s_sHistoryItemRef,
uno::Any(aItem));
}
else
break;
}
+
+ // Move item to the unpinned document section to the left if it
was previously unpinned
+ for (sal_Int32 j = i - 1; j >= 0; --j)
+ {
+ uno::Reference<beans::XPropertySet> xPrevSet;
+ xOrderList->getByName(OUString::number(j)) >>= xPrevSet;
+
+ OUString aPrevItem;
+ xPrevSet->getPropertyValue(s_sHistoryItemRef) >>= aPrevItem;
+
+ uno::Reference<beans::XPropertySet> xPrevItemSet;
+ xItemList->getByName(aPrevItem) >>= xPrevItemSet;
+ bool bIsItemPinned = false;
+ if
(xPrevItemSet->getPropertySetInfo()->hasPropertyByName(s_sPinned))
+ xPrevItemSet->getPropertyValue(s_sPinned) >>=
bIsItemPinned;
+ if (!bIsItemPinned)
+ {
+ xOrderList->getByName(OUString::number(j + 1)) >>= xSet;
+ xSet->getPropertyValue(s_sHistoryItemRef) >>= aItem;
+ xSet->setPropertyValue(s_sHistoryItemRef,
uno::Any(aPrevItem));
+ xPrevSet->setPropertyValue(s_sHistoryItemRef,
uno::Any(aItem));
+ }
+ else
+ break;
+ }
+
::comphelper::ConfigurationHelper::flush(xCfg);
return;
}
commit 2910dad56c85348d11c428ec20dc57d88ba1d946
Author: Regina Henschel <rb.hensc...@t-online.de>
AuthorDate: Thu Jun 15 22:18:34 2023 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 20 09:11:20 2023 +0200
tdf#155852 same method for StepCount in OOXML as in rendering
Rendering of stepped gradients uses a method that doesn't take the
color from a cut point, but before or after respectively. For example,
for StepCount 4, the colors at relative positions 0, 1/3, 2/3 and 1
are used. So sections are 'start color', '1/3 color', '2/3 color' and
'end color'. The output to OOXML now uses the same method. That way
rendering in a produced pptx-file is the same as in the original
odp-file. Since OOXML has nothing similar to StepCount, it is an export
only problem.
A second problem comes from the cuddle with StepCount in Gradient
struct in API and FillStepCount in shape property set. The
draw:gradient-stop-count attribute in ODF belongs to the graphic style
of the shape. The gradient definition itself in the <draw:gradient>
element has nothing about step count. When a file is opened, it can be
that the StepCount component in the Gradient struct still has the
default value 0, but the FillStepCount property has the correct value
of the shape.
The Gradient struct in the API should not have a component StepCount
to be compatible with ODF. But the API is published and changing that
struct is far-reaching in the code. So the fix here is not a general
solution but solves the problem for export to OOXML by reading the
FillStepCount property while exporting.
Change-Id: Ie1cafe6bdda7c4d74b05f279f0d8212ff67ecc92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153154
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.hensc...@t-online.de>
(cherry picked from commit 2b1b2a758cc4666c6cf6b147722223281dfe1f30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153229
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/basegfx/source/tools/bgradient.cxx
b/basegfx/source/tools/bgradient.cxx
index c96cd0b673cb..cd6f5492a595 100644
--- a/basegfx/source/tools/bgradient.cxx
+++ b/basegfx/source/tools/bgradient.cxx
@@ -746,7 +746,6 @@ void BColorStops::doApplySteps(sal_uInt16 nStepCount)
// the same color as the previous one ended
aNewColorStops.push_back(*aColorL);
}
-
if (!basegfx::fTools::equalZero(fDelta))
{
// create in-between steps, always two at the same positon to
@@ -757,20 +756,21 @@ void BColorStops::doApplySteps(sal_uInt16 nStepCount)
if (rStartColor != rEndColor)
{
// get relative single-step width
- const double fSingleStep(1.0 /
static_cast<double>(nStepCount));
+ // tdf155852 Use same method for the color as in rendering.
+ const double fSingleStep(1.0 / static_cast<double>(nStepCount
- 1));
+ const double fOffsetStep(fDelta /
static_cast<double>(nStepCount));
for (sal_uInt16 a(1); a < nStepCount; a++)
{
- // calculate position since being used twice
- const double fPosition(fStart
- + (fDelta * (static_cast<double>(a)
* fSingleStep)));
+ // calculate stop position since being used twice
+ const double fPosition(fStart + fOffsetStep *
static_cast<double>(a));
- // add start color of sub-segment
+ // add end color of previous sub-segment
aNewColorStops.emplace_back(
fPosition, basegfx::interpolate(rStartColor, rEndColor,
static_cast<double>(a
- 1) * fSingleStep));
- // add end color of sub-segment
+ // add start color of current sub-segment
aNewColorStops.emplace_back(
fPosition, basegfx::interpolate(rStartColor, rEndColor,
static_cast<double>(a)
* fSingleStep));
diff --git a/oox/qa/unit/data/tdf155852_MCGR_StepCount4.fodp
b/oox/qa/unit/data/tdf155852_MCGR_StepCount4.fodp
new file mode 100644
index 000000000000..309cb3b0b1b9
--- /dev/null
+++ b/oox/qa/unit/data/tdf155852_MCGR_StepCount4.fodp
@@ -0,0 +1,637 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:ooo="http://openoffice.org/2004/office";
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
xmlns:dc="http://purl.org/dc/elements/1.1/";
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:rpt="http://openoffice.org/2005/report";
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
xmlns:ooow="http://openoffice.org/200
4/writer" xmlns:oooc="http://openoffice.org/2004/calc";
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
xmlns:xforms="http://www.w3.org/2002/xforms";
xmlns:tableooo="http://openoffice.org/2009/table";
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
xmlns:drawooo="http://openoffice.org/2010/draw";
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
xmlns:math="http://www.w3.org/1998/Math/MathML";
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
xmlns:dom="http://www.w3.org/2001/xml-events";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:xhtml="http://www.w3.org/1999/xhtml";
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; xmlns
:css3t="http://www.w3.org/TR/css3-text/";
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
xmlns:officeooo="http://openoffice.org/2009/office"; office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.presentation">
+
<office:meta><meta:creation-date>2023-06-15T14:04:51.506000000</meta:creation-date><meta:editing-duration>PT7M34S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:generator>B2020/24.2.0.0.alpha0$Windows_X86_64
LibreOffice_project/977878814a3573627026e31edb8a51c8f30c8a0c</meta:generator><meta:initial-creator>Regina
Henschel</meta:initial-creator><dc:date>2023-06-15T14:52:02.192000000</dc:date><dc:creator>Regina
Henschel</dc:creator><meta:document-statistic
meta:object-count="8"/></office:meta>
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop"
config:type="int">-231</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft"
config:type="int">-8197</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth"
config:type="int">41102</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight"
config:type="int">16741</config:config-item>
+ <config:config-item-map-indexed config:name="Views">
+ <config:config-item-map-entry>
+ <config:config-item config:name="ViewId"
config:type="string">view1</config:config-item>
+ <config:config-item config:name="GridIsVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="GridIsFront"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsSnapToGrid"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToPageMargins"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToSnapLines"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToObjectFrame"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsSnapToObjectPoints"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPlusHandlesAlwaysVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsFrameDragSingles"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EliminatePolyPointLimitAngle"
config:type="int">1500</config:config-item>
+ <config:config-item config:name="IsEliminatePolyPoints"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="VisibleLayers"
config:type="base64Binary">Hw==</config:config-item>
+ <config:config-item config:name="PrintableLayers"
config:type="base64Binary">Hw==</config:config-item>
+ <config:config-item config:name="LockedLayers"
config:type="base64Binary"/>
+ <config:config-item config:name="NoAttribs"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="NoColors"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="RulerIsVisible"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PageKind"
config:type="short">0</config:config-item>
+ <config:config-item config:name="SelectedPage"
config:type="short">0</config:config-item>
+ <config:config-item config:name="IsLayerMode"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsDoubleClickTextEdit"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsClickChangeRotation"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SlidesPerRow"
config:type="short">4</config:config-item>
+ <config:config-item config:name="EditMode"
config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaTop"
config:type="int">-231</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft"
config:type="int">-8197</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth"
config:type="int">41103</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight"
config:type="int">16742</config:config-item>
+ <config:config-item config:name="GridCoarseWidth"
config:type="int">2000</config:config-item>
+ <config:config-item config:name="GridCoarseHeight"
config:type="int">2000</config:config-item>
+ <config:config-item config:name="GridFineWidth"
config:type="int">500</config:config-item>
+ <config:config-item config:name="GridFineHeight"
config:type="int">500</config:config-item>
+ <config:config-item config:name="GridSnapWidthXNumerator"
config:type="int">2000</config:config-item>
+ <config:config-item config:name="GridSnapWidthXDenominator"
config:type="int">4</config:config-item>
+ <config:config-item config:name="GridSnapWidthYNumerator"
config:type="int">2000</config:config-item>
+ <config:config-item config:name="GridSnapWidthYDenominator"
config:type="int">4</config:config-item>
+ <config:config-item config:name="IsAngleSnapEnabled"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SnapAngle"
config:type="int">1500</config:config-item>
+ <config:config-item config:name="ZoomOnPage"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AnchoredTextOverflowLegacy"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LegacySingleLineFontwork"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ConnectorUseSnapRect"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
+ </config:config-item-map-entry>
+ </config:config-item-map-indexed>
+ </config:config-item-set>
+ <config:config-item-set config:name="ooo:configuration-settings">
+ <config:config-item config:name="IsPrintBookletBack"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="DefaultTabStop"
config:type="int">1250</config:config-item>
+ <config:config-item config:name="PrinterName"
config:type="string">EPSON6FC99C (WP-4025 Series)</config:config-item>
+ <config:config-item-map-indexed config:name="ForbiddenCharacters">
+ <config:config-item-map-entry>
+ <config:config-item config:name="Language"
config:type="string">de</config:config-item>
+ <config:config-item config:name="Country"
config:type="string">DE</config:config-item>
+ <config:config-item config:name="Variant" config:type="string"/>
+ <config:config-item config:name="BeginLine" config:type="string"/>
+ <config:config-item config:name="EndLine" config:type="string"/>
+ </config:config-item-map-entry>
+ </config:config-item-map-indexed>
+ <config:config-item config:name="PrinterSetup"
config:type="base64Binary">iAv+/0VQU09ONkZDOTlDIChXUC00MDI1IFNlcmllcykAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAARVBTT04gV1AtNDAyNSBTZXJpZXMAAAAAAAAAAAAAAAAWAAEAWgoAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAEUAUABTAE8ATgA2AEYAQwA5ADkAQwAgACgAVwBQAC0ANAAwADIANQAgAFMAZQByAGkAZQBzACkAAAAAAAAAAAABBAAB3AB0CQ+bgAcBAAkAmgs0CGQAAQAHAFgCAgABAFgCAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB0CQAAAQEBAQABAAABAAAAAAAAAAAAAAA4AAAAfAgAALQIAABAAAAA9AgAAIAAAAAAAAAAAAAAAAMACQRFAFAAUwBPAE4AIABXAFAALQA0ADAAMgA1ACAAUwBlAHIAaQBlAHMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAABYAgAAAAAAAAAAAAABAAAAAgAAAAAAAQBYAlgCBwAAAAAACQA0CJoLHgAeAB4AHgA0CJoLOwORBAEAAAAOABYAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAYAAAAAAAAAAAACAAAAAAIAAAMAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAABkAGQANAiaCx4AHgAeAB4ACQAAAAAAAAAAAAAA//8AAAAAAAAAAB4AHgABAAAAAwDgAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAQAAgAAAAAAAAAAAAEAMgAyANT+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYACoAAAAgAAEAAAAgAAAAQAAAAAYAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs/wAAAAAAAAAAAABCAAAAAQAAALAAAAAAAAAAAAAAAAAAAAAeAB4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBARIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmYMAFBSSU5URVJfTkFNRRwARVBTT042RkM5OUMgKFdQLTQwMjUgU2VyaWVzKQsARFJJVkVSX05BTUUUAEV
QU09OIFdQLTQwMjUgU2VyaWVz</config:config-item>
+ <config:config-item config:name="PrinterPaperFromSetup"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintPageName"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintDate"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="BitmapTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sob</config:config-item>
+ <config:config-item config:name="IsPrintTime"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ImagePreferredDPI"
config:type="int">0</config:config-item>
+ <config:config-item config:name="CharacterCompressionType"
config:type="short">0</config:config-item>
+ <config:config-item config:name="IsPrintHiddenPages"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintFitPage"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintTilePage"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SaveThumbnail"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintBooklet"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintBookletFront"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintQuality"
config:type="int">0</config:config-item>
+ <config:config-item config:name="ColorTableURL"
config:type="string">$(inst)/share/palette/html.soc</config:config-item>
+ <config:config-item config:name="DashTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sod</config:config-item>
+ <config:config-item config:name="LineEndTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soe</config:config-item>
+ <config:config-item config:name="HatchTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.soh</config:config-item>
+ <config:config-item config:name="GradientTableURL"
config:type="string">$(inst)/share/palette%3B$(user)/config/standard.sog</config:config-item>
+ <config:config-item config:name="ApplyUserData"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PageNumberFormat"
config:type="int">4</config:config-item>
+ <config:config-item config:name="ParagraphSummation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsKernAsianPunctuation"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrinterIndependentLayout"
config:type="string">low-resolution</config:config-item>
+ <config:config-item config:name="LoadReadonly"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedComplexScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedOnlyUsedFonts"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedLatinScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="EmbedAsianScriptFonts"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintDrawing"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsPrintNotes"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintHandout"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsPrintOutline"
config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SlidesPerHandout"
config:type="short">6</config:config-item>
+ <config:config-item config:name="HandoutsHorizontal"
config:type="boolean">true</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+ <office:script script:language="ooo:Basic">
+ <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office";
xmlns:xlink="http://www.w3.org/1999/xlink";>
+ <ooo:library-embedded ooo:name="Standard"/>
+ </ooo:libraries>
+ </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+ <style:font-face style:name="Liberation Sans"
svg:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable"/>
+ <style:font-face style:name="Liberation Serif"
svg:font-family="'Liberation Serif'"
style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Lucida Sans" svg:font-family="'Lucida
Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Microsoft YaHei"
svg:font-family="'Microsoft YaHei'"
style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans" svg:font-family="'Noto
Sans'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Segoe UI" svg:font-family="'Segoe
UI'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Tahoma" svg:font-family="Tahoma"
style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <draw:gradient draw:name="Filled" draw:style="linear"
draw:start-color="#ffffff" draw:end-color="#cccccc" draw:start-intensity="100%"
draw:end-intensity="100%" draw:angle="30deg" draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ffffff"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#cccccc"/></draw:gradient>
+ <draw:gradient draw:name="Filled_20_Blue" draw:display-name="Filled Blue"
draw:style="linear" draw:start-color="#729fcf" draw:end-color="#355269"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#729fcf"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#355269"/></draw:gradient>
+ <draw:gradient draw:name="Filled_20_Green" draw:display-name="Filled Green"
draw:style="linear" draw:start-color="#77bc65" draw:end-color="#127622"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#77bc65"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#127622"/></draw:gradient>
+ <draw:gradient draw:name="Filled_20_Red" draw:display-name="Filled Red"
draw:style="linear" draw:start-color="#ff6d6d" draw:end-color="#c9211e"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ff6d6d"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#c9211e"/></draw:gradient>
+ <draw:gradient draw:name="Filled_20_Yellow" draw:display-name="Filled
Yellow" draw:style="linear" draw:start-color="#ffde59" draw:end-color="#b47804"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="30deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ffde59"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#b47804"/></draw:gradient>
+ <draw:gradient draw:name="Gradient_20_2" draw:display-name="Gradient 2"
draw:style="linear" draw:start-color="#ff0000" draw:end-color="#00ffff"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="90deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#ff0000"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#00ffff"/></draw:gradient>
+ <draw:gradient draw:name="Shapes" draw:style="rectangular" draw:cx="50%"
draw:cy="50%" draw:start-color="#cccccc" draw:end-color="#ffffff"
draw:start-intensity="100%" draw:end-intensity="100%" draw:angle="0deg"
draw:border="0%">
+ <loext:gradient-stop svg:offset="0" loext:color-type="rgb"
loext:color-value="#cccccc"/>
+ <loext:gradient-stop svg:offset="1" loext:color-type="rgb"
loext:color-value="#ffffff"/></draw:gradient>
+ <draw:marker draw:name="Arrow" svg:viewBox="0 0 20 30" svg:d="M10 0l-10
30h20z"/>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4"
draw:fill-color="#729fcf" fo:wrap-option="no-wrap" style:writing-mode="lr-tb"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:punctuation-wrap="simple" style:line-break="strict"
loext:tab-stop-distance="0cm" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true"
loext:opacity="0%" style:font-name="Liberation Serif" fo:font-size="24pt"
fo:language="de" fo:country="DE" style:font-name-asian="Segoe UI"
style:font-size-asian="24pt" style:language-asian="zh" style:country-asian="CN"
style:font-name-complex="Tahoma" style:font-size-complex="24pt"
style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:style style:name="standard" style:family="graphic">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0cm"
svg:stroke-color="#3465a4" draw:marker-start-width="0.2cm"
draw:marker-start-center="false" draw:marker-end-width="0.2cm"
draw:marker-end-center="false" draw:fill="solid" draw:fill-color="#729fcf"
draw:textarea-horizontal-align="justify" fo:padding-top="0.125cm"
fo:padding-bottom="0.125cm" fo:padding-left="0.25cm" fo:padding-right="0.25cm"
fo:wrap-option="wrap" draw:shadow="hidden" draw:shadow-offset-x="0.2cm"
draw:shadow-offset-y="0.2cm" draw:shadow-color="#808080">
+ <text:list-style style:name="standard">
+ <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+ <style:list-level-properties text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </style:graphic-properties>
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0cm" fo:margin-bottom="0cm" fo:line-height="100%"
fo:text-indent="0cm"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'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="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
style:font-family-generic-asian="system" style:font-pitch-asian="variable"
style:font-size-asian="18pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:font-size-complex="18pt" style:font-s
tyle-complex="normal" style:font-weight-complex="normal"
style:text-emphasize="none" style:font-relief="none"
style:text-overline-style="none" style:text-overline-color="font-color"/>
+ </style:style>
+ <style:style style:name="objectwithoutfill" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Object_20_with_20_no_20_fill_20_and_20_no_20_line"
style:display-name="Object with no fill and no line" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Text" style:family="graphic">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-color="#cccccc"
draw:fill="solid" draw:fill-color="#eeeeee"/>
+ <style:text-properties style:font-name="Noto Sans"
fo:font-family="'Noto Sans'" style:font-family-generic="roman"
style:font-pitch="variable"/>
+ </style:style>
+ <style:style style:name="A4" style:family="graphic"
style:parent-style-name="Text">
+ <style:graphic-properties draw:fill="none"/>
+ <style:text-properties fo:font-size="18pt"/>
+ </style:style>
+ <style:style style:name="Title_20_A4" style:display-name="Title A4"
style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="44pt"/>
+ </style:style>
+ <style:style style:name="Heading_20_A4" style:display-name="Heading A4"
style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="24pt"/>
+ </style:style>
+ <style:style style:name="Text_20_A4" style:display-name="Text A4"
style:family="graphic" style:parent-style-name="A4">
+ <style:graphic-properties draw:stroke="none"/>
+ </style:style>
+ <style:style style:name="A0" style:family="graphic"
style:parent-style-name="Text">
+ <style:graphic-properties draw:fill="none"/>
+ <style:text-properties fo:font-size="48pt"/>
+ </style:style>
+ <style:style style:name="Title_20_A0" style:display-name="Title A0"
style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="96pt"/>
+ </style:style>
+ <style:style style:name="Heading_20_A0" style:display-name="Heading A0"
style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ <style:text-properties fo:font-size="71.9000015258789pt"/>
+ </style:style>
+ <style:style style:name="Text_20_A0" style:display-name="Text A0"
style:family="graphic" style:parent-style-name="A0">
+ <style:graphic-properties draw:stroke="none"/>
+ </style:style>
+ <style:style style:name="Graphic" style:family="graphic">
+ <style:graphic-properties draw:fill="solid" draw:fill-color="#ffffff"/>
+ <style:text-properties style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="18pt"/>
+ </style:style>
+ <style:style style:name="Shapes" style:family="graphic"
style:parent-style-name="Graphic">
+ <style:graphic-properties draw:stroke="none" draw:fill="gradient"
draw:fill-gradient-name="Shapes"/>
+ <style:text-properties fo:font-size="14pt" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="Filled" style:family="graphic"
style:parent-style-name="Shapes">
+ <style:graphic-properties draw:fill="gradient"
draw:fill-gradient-name="Filled"/>
+ </style:style>
+ <style:style style:name="Filled_20_Blue" style:display-name="Filled Blue"
style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill-gradient-name="Filled_20_Blue"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Filled_20_Green" style:display-name="Filled Green"
style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill-gradient-name="Filled_20_Green"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"
style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'"
style:font-family-generic="roman" style:font-pitch="variable"/>
+ </style:style>
+ <style:style style:name="Filled_20_Red" style:display-name="Filled Red"
style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill-gradient-name="Filled_20_Red"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Filled_20_Yellow" style:display-name="Filled
Yellow" style:family="graphic" style:parent-style-name="Filled">
+ <style:graphic-properties draw:fill-gradient-name="Filled_20_Yellow"/>
+ <style:text-properties fo:color="#ffffff" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined" style:family="graphic"
style:parent-style-name="Shapes">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-width="0.081cm"
svg:stroke-color="#000000" draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Blue" style:display-name="Outlined
Blue" style:family="graphic" style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#355269"/>
+ <style:text-properties fo:color="#355269" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Green" style:display-name="Outlined
Green" style:family="graphic" style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#127622"/>
+ <style:text-properties fo:color="#127622" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Red" style:display-name="Outlined Red"
style:family="graphic" style:parent-style-name="Outlined">
+ <style:graphic-properties svg:stroke-color="#c9211e"/>
+ <style:text-properties fo:color="#c9211e" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Outlined_20_Yellow" style:display-name="Outlined
Yellow" style:family="graphic" style:parent-style-name="Outlined">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-color="#b47804"/>
+ <style:text-properties fo:color="#b47804" loext:opacity="100%"/>
+ </style:style>
+ <style:style style:name="Lines" style:family="graphic"
style:parent-style-name="Graphic">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-color="#000000"
draw:fill="none"/>
+ </style:style>
+ <style:style style:name="Arrow_20_Line" style:display-name="Arrow Line"
style:family="graphic" style:parent-style-name="Lines">
+ <style:graphic-properties draw:marker-start="Arrow"
draw:marker-start-width="0.2cm" draw:marker-end="Arrow"
draw:marker-end-width="0.2cm" draw:show-unit="true"/>
+ </style:style>
+ <style:style style:name="Arrow_20_Dashed" style:display-name="Arrow Dashed"
style:family="graphic" style:parent-style-name="Lines">
+ <style:graphic-properties draw:stroke="dash"/>
+ </style:style>
+ <style:style style:name="Default-background" style:family="presentation">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+ <style:text-properties style:letter-kerning="true"/>
+ </style:style>
+ <style:style style:name="Default-backgroundobjects"
style:family="presentation">
+ <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"/>
+ <style:text-properties style:letter-kerning="true"/>
+ </style:style>
+ <style:style style:name="Default-notes" style:family="presentation">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"/>
+ <style:paragraph-properties fo:margin-left="0.6cm" fo:margin-right="0cm"
fo:text-indent="-0.6cm"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'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="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
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="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:fon
t-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"/>
+ </style:style>
+ <style:style style:name="Default-outline1" style:family="presentation">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"
draw:auto-grow-height="false" draw:fit-to-size="false"
style:shrink-to-fit="true">
+ <text:list-style style:name="Default-outline1">
+ <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.3cm"
text:min-label-width="0.9cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2" text:bullet-char="–">
+ <style:list-level-properties text:space-before="1.5cm"
text:min-label-width="0.9cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="75%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.8cm"
text:min-label-width="0.8cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4" text:bullet-char="–">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="75%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+ <style:list-level-properties text:space-before="6.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+ <style:list-level-properties text:space-before="7.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+ <style:list-level-properties text:space-before="9cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+ <style:list-level-properties text:space-before="10.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+ <style:list-level-properties text:space-before="11.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </style:graphic-properties>
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.507cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="32.5pt" 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="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
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="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:f
ont-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"/>
+ </style:style>
+ <style:style style:name="Default-outline2" style:family="presentation"
style:parent-style-name="Default-outline1">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.406cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="28.3999996185303pt"
style:font-size-asian="28pt" style:font-size-complex="28pt"/>
+ </style:style>
+ <style:style style:name="Default-outline3" style:family="presentation"
style:parent-style-name="Default-outline2">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.304cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="24.3999996185303pt"
style:font-size-asian="24pt" style:font-size-complex="24pt"/>
+ </style:style>
+ <style:style style:name="Default-outline4" style:family="presentation"
style:parent-style-name="Default-outline3">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.203cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-outline5" style:family="presentation"
style:parent-style-name="Default-outline4">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.101cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-outline6" style:family="presentation"
style:parent-style-name="Default-outline5">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.101cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-outline7" style:family="presentation"
style:parent-style-name="Default-outline6">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.101cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-outline8" style:family="presentation"
style:parent-style-name="Default-outline7">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.101cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-outline9" style:family="presentation"
style:parent-style-name="Default-outline8">
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:margin-top="0.101cm" fo:margin-bottom="0cm" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-size="20.2999992370605pt"
style:font-size-asian="20pt" style:font-size-complex="20pt"/>
+ </style:style>
+ <style:style style:name="Default-subtitle" style:family="presentation">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"
draw:textarea-vertical-align="middle">
+ <text:list-style style:name="Default-subtitle">
+ <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+ <style:list-level-properties text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </style:graphic-properties>
+ <style:paragraph-properties fo:margin-left="0cm" fo:margin-right="0cm"
fo:text-align="center" fo:text-indent="0cm"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'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="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
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="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="variable"
style:fon
t-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"/>
+ </style:style>
+ <style:style style:name="Default-title" style:family="presentation">
+ <style:graphic-properties draw:stroke="none" draw:fill="none"
draw:textarea-vertical-align="middle">
+ <text:list-style style:name="Default-title">
+ <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+ <style:list-level-properties text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </style:graphic-properties>
+ <style:paragraph-properties fo:text-align="center"/>
+ <style:text-properties fo:font-variant="normal" fo:text-transform="none"
style:use-window-font-color="true" loext:opacity="0%"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Liberation Sans"
fo:font-family="'Liberation Sans'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="44.7000007629395pt"
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="Microsoft YaHei"
style:font-family-asian="'Microsoft YaHei'"
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="Lucida Sans"
style:font-family-complex="'Lucida Sans'"
style:font-family-generic-complex="system" style:font-pitch-complex="varia
ble" 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"/>
+ </style:style>
+ <style:presentation-page-layout style:name="AL0T22">
+ <presentation:placeholder presentation:object="handout" svg:x="2.058cm"
svg:y="1.743cm" svg:width="23.912cm" svg:height="3.507cm"/>
+ </style:presentation-page-layout>
+ <style:presentation-page-layout style:name="AL1T0">
+ <presentation:placeholder presentation:object="title" svg:x="2.058cm"
svg:y="1.743cm" svg:width="23.912cm" svg:height="3.507cm"/>
+ <presentation:placeholder presentation:object="subtitle" svg:x="2.058cm"
svg:y="5.838cm" svg:width="23.912cm" svg:height="13.23cm"/>
+ </style:presentation-page-layout>
+ </office:styles>
+ <office:automatic-styles>
+ <style:page-layout style:name="PM0">
+ <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="21cm"
fo:page-height="29.7cm" style:print-orientation="portrait"/>
+ </style:page-layout>
+ <style:page-layout style:name="PM1">
+ <style:page-layout-properties fo:margin-top="0cm" fo:margin-bottom="0cm"
fo:margin-left="0cm" fo:margin-right="0cm" fo:page-width="24cm"
fo:page-height="16cm" style:print-orientation="landscape"/>
+ </style:page-layout>
+ <style:style style:name="dp1" style:family="drawing-page">
+ <style:drawing-page-properties draw:background-size="border"
draw:fill="none"/>
+ </style:style>
+ <style:style style:name="dp2" style:family="drawing-page">
+ <style:drawing-page-properties presentation:display-header="true"
presentation:display-footer="true" presentation:display-page-number="false"
presentation:display-date-time="true"/>
+ </style:style>
+ <style:style style:name="dp3" style:family="drawing-page">
+ <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"/>
+ </style:style>
+ <style:style style:name="gr1" style:family="graphic"
style:parent-style-name="standard">
+ <style:graphic-properties draw:stroke="solid" svg:stroke-color="#0c5201"
draw:fill="gradient" draw:fill-color="#18a303"
draw:fill-gradient-name="Gradient_20_2" draw:gradient-step-count="4"
draw:textarea-horizontal-align="justify" draw:textarea-vertical-align="middle"
draw:auto-grow-height="false" fo:min-height="3.25cm" fo:min-width="23.5cm">
+ <loext:fill-complex-color loext:theme-type="accent1"
loext:color-type="theme"/>
+ </style:graphic-properties>
+ </style:style>
+ <style:style style:name="gr2" style:family="graphic">
+ <style:graphic-properties style:protect="size"/>
+ </style:style>
+ <style:style style:name="pr1" style:family="presentation"
style:parent-style-name="Default-notes">
+ <style:graphic-properties draw:fill-color="#ffffff"
draw:auto-grow-height="true" fo:min-height="13.364cm"/>
+ <style:paragraph-properties style:writing-mode="lr-tb"/>
+ </style:style>
+ <style:style style:name="P1" style:family="paragraph">
+ <loext:graphic-properties draw:fill="gradient" draw:fill-color="#18a303"
draw:fill-gradient-name="Gradient_20_2" draw:gradient-step-count="4"/>
+ <style:paragraph-properties fo:text-align="center"/>
+ </style:style>
+ <style:style style:name="P2" style:family="paragraph">
+ <loext:graphic-properties draw:fill-color="#ffffff"/>
+ </style:style>
+ <text:list-style style:name="L1">
+ <text:list-level-style-bullet text:level="1" text:bullet-char="●">
+ <style:list-level-properties text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="2" text:bullet-char="●">
+ <style:list-level-properties text:space-before="0.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="3" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="4" text:bullet-char="●">
+ <style:list-level-properties text:space-before="1.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="5" text:bullet-char="●">
+ <style:list-level-properties text:space-before="2.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="6" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="7" text:bullet-char="●">
+ <style:list-level-properties text:space-before="3.6cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="8" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.2cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="9" text:bullet-char="●">
+ <style:list-level-properties text:space-before="4.8cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ <text:list-level-style-bullet text:level="10" text:bullet-char="●">
+ <style:list-level-properties text:space-before="5.4cm"
text:min-label-width="0.6cm"/>
+ <style:text-properties fo:font-family="OpenSymbol"
style:use-window-font-color="true" fo:font-size="45%"/>
+ </text:list-level-style-bullet>
+ </text:list-style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <draw:layer-set>
+ <draw:layer draw:name="layout"/>
+ <draw:layer draw:name="background"/>
+ <draw:layer draw:name="backgroundobjects"/>
+ <draw:layer draw:name="controls"/>
+ <draw:layer draw:name="measurelines"/>
+ </draw:layer-set>
+ <style:handout-master presentation:presentation-page-layout-name="AL0T22"
style:page-layout-name="PM0" draw:style-name="dp2">
+ <draw:page-thumbnail draw:layer="backgroundobjects" svg:width="18.999cm"
svg:height="12.665cm" svg:x="1cm" svg:y="8.517cm"/>
+ </style:handout-master>
+ <style:master-page style:name="Default" style:page-layout-name="PM1"
draw:style-name="dp1">
+ <loext:theme loext:name="Office Theme">
+ <loext:theme-colors loext:name="LibreOffice">
+ <loext:color loext:name="dark1" loext:color="#000000"/>
+ <loext:color loext:name="light1" loext:color="#ffffff"/>
+ <loext:color loext:name="dark2" loext:color="#000000"/>
+ <loext:color loext:name="light2" loext:color="#ffffff"/>
+ <loext:color loext:name="accent1" loext:color="#18a303"/>
+ <loext:color loext:name="accent2" loext:color="#0369a3"/>
+ <loext:color loext:name="accent3" loext:color="#a33e03"/>
+ <loext:color loext:name="accent4" loext:color="#8e03a3"/>
+ <loext:color loext:name="accent5" loext:color="#c99c00"/>
+ <loext:color loext:name="accent6" loext:color="#c9211e"/>
+ <loext:color loext:name="hyperlink" loext:color="#0000ee"/>
+ <loext:color loext:name="followed-hyperlink" loext:color="#551a8b"/>
+ </loext:theme-colors>
+ </loext:theme>
+ <draw:frame presentation:style-name="Default-title"
draw:layer="backgroundobjects" svg:width="21.599cm" svg:height="2.671cm"
svg:x="1.2cm" svg:y="0.637cm" presentation:class="title"
presentation:placeholder="true">
+ <draw:text-box/>
+ </draw:frame>
+ <draw:frame presentation:style-name="Default-outline1"
draw:layer="backgroundobjects" svg:width="21.599cm" svg:height="9.279cm"
svg:x="1.2cm" svg:y="3.743cm" presentation:class="outline"
presentation:placeholder="true">
+ <draw:text-box/>
+ </draw:frame>
+ <presentation:notes style:page-layout-name="PM0">
+ <draw:page-thumbnail presentation:style-name="Default-title"
draw:layer="backgroundobjects" svg:width="19.798cm" svg:height="11.136cm"
svg:x="0.6cm" svg:y="2.257cm" presentation:class="page"/>
+ <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">
+ <draw:text-box/>
+ </draw:frame>
+ </presentation:notes>
+ </style:master-page>
+ </office:master-styles>
+ <office:body>
+ <office:presentation>
+ <draw:page draw:name="page1" draw:style-name="dp3"
draw:master-page-name="Default"
presentation:presentation-page-layout-name="AL1T0">
+ <draw:custom-shape draw:style-name="gr1" draw:text-style-name="P1"
draw:layer="layout" svg:width="24cm" svg:height="3.5cm" svg:x="0cm" svg:y="2cm">
+ <text:p/>
+ <draw:enhanced-geometry svg:viewBox="0 0 21600 21600"
draw:type="rectangle" draw:enhanced-path="M 0 0 L 21600 0 21600 21600 0 21600 0
0 Z N"/>
+ </draw:custom-shape>
+ <presentation:notes draw:style-name="dp2">
+ <draw:page-thumbnail draw:style-name="gr2" draw:layer="layout"
svg:width="19.798cm" svg:height="11.136cm" svg:x="0.6cm" svg:y="2.257cm"
draw:page-number="1" presentation:class="page"/>
+ <draw:frame presentation:style-name="pr1" draw:text-style-name="P2"
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">
+ <draw:text-box/>
+ </draw:frame>
+ </presentation:notes>
+ </draw:page>
+ <presentation:settings presentation:mouse-visible="false"/>
+ </office:presentation>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/oox/qa/unit/mcgr.cxx b/oox/qa/unit/mcgr.cxx
index e64c8604b7c5..aa7208a32a62 100644
--- a/oox/qa/unit/mcgr.cxx
+++ b/oox/qa/unit/mcgr.cxx
@@ -76,6 +76,31 @@ CPPUNIT_TEST_FIXTURE(TestMCGR,
testTdf155825_SourcOffsetRangeDifferent)
// assert(false && "oox::WriteGradientFill: non-synchronized gradients
(!)");
save("Impress Office Open XML");
}
+
+CPPUNIT_TEST_FIXTURE(TestMCGR, testStepCount)
+{
+ // Given a document with two-color gradient with StepCount 4.
+ loadFromURL(u"tdf155852_MCGR_StepCount4.fodp");
+ // Save it to PPTX
+ save("Impress Office Open XML");
+ xmlDocUniquePtr pXmlDoc = parseExport("ppt/slides/slide1.xml");
+
+ // Without the fix the colors in the sections were wrong. And when opening
a file with StepCount
+ // and saving it immedialtly to pptx, a continues gradient might be
produced.
+
+ const OString sPath = "//a:gradFill/a:gsLst/";
+ // The default way of load and save would have produced 2 stops, but we
need start stop, end stop
+ // and 3*2 inner stops.
+ assertXPath(pXmlDoc, sPath + "a:gs", 8);
+ // A sharp color changes nees a pair of two stops with same offset.
+ assertXPath(pXmlDoc, sPath + "a:gs[@pos='25000']", 2);
+ assertXPath(pXmlDoc, sPath + "a:gs[@pos='50000']", 2);
+ assertXPath(pXmlDoc, sPath + "a:gs[@pos='75000']", 2);
+ // Without fix the color was 808080.
+ assertXPath(pXmlDoc, sPath + "a:gs[@pos='75000'][1]/a:srgbClr", "val",
"55aaaa");
+ // Without fix the color was 40bfbf, producing a gradient in the last
segment.
+ assertXPath(pXmlDoc, sPath + "a:gs[@pos='75000'][2]/a:srgbClr", "val",
"00ffff");
+}
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index dca260895af8..1cef93c8732d 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -663,6 +663,16 @@ void DrawingML::WriteGradientFill( const Reference<
XPropertySet >& rXPropSet )
fTransparency = nTransparency * 0.01;
}
+ // tdf#155852 The gradient might wrongly have StepCount==0, as the
draw:gradient-step-count
+ // attribute in ODF does not belong to the gradient definition but is
an attribute in
+ // the graphic style of the shape.
+ if (GetProperty(rXPropSet, "FillGradientStepCount"))
+ {
+ sal_Int16 nStepCount = 0;
+ mAny >>= nStepCount;
+ aGradient.SetSteps(nStepCount);
+ }
+
WriteGradientFill(&aGradient, 0, pTransparenceGradient, fTransparency);
mpFS->endElementNS(XML_a, XML_gradFill);
commit 7bf3a3e35273ac9cb9257e396f58be2d8a7ddeab
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Jun 16 16:22:22 2023 +0300
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Jun 20 09:11:13 2023 +0200
tdf#155871: don't forget to close li before starting next
When closing a nested list, the previous condition failed to close
the last li in case when the next item is numbered (i.e., will need
another li). Indeed, if the next item is unnumbered, current last
li should stay open.
Change-Id: Iad7d83d50d2f02d6bd1d046804b7e23b59f9ce8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153179
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
(cherry picked from commit df98b6015cd2ae4f1573e12cee1b1bc947adabf0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153228
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sw/qa/extras/htmlexport/data/tdf155871.fodt
b/sw/qa/extras/htmlexport/data/tdf155871.fodt
new file mode 100644
index 000000000000..97e29fbe69b8
--- /dev/null
+++ b/sw/qa/extras/htmlexport/data/tdf155871.fodt
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
office:version="1.3" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:body>
+ <office:text>
+ <text:list>
+ <text:list-item>
+ <text:p>foo</text:p>
+ <text:list>
+ <text:list-item>
+ <text:p>bar</text:p>
+ </text:list-item>
+ </text:list>
+ </text:list-item>
+ <text:list-item>
+ <text:p>baz</text:p>
+ </text:list-item>
+ </text:list>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 0f8d4497d793..5bbde8166453 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2683,6 +2683,18 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest,
testReqIF_ListsWithNumFormat)
assertXPathNoAttribute(pDoc,
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol[4]", "type");
}
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf155871)
+{
+ createSwDoc("tdf155871.fodt");
+ ExportToReqif();
+
+ SvMemoryStream aStream;
+ WrapReqifFromTempFile(aStream);
+ xmlDocUniquePtr pDoc = parseXmlStream(&aStream);
+ // Without the fix in place, this would fail
+ CPPUNIT_ASSERT(pDoc);
+}
+
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/html/htmlnumwriter.cxx
b/sw/source/filter/html/htmlnumwriter.cxx
index 6f8f52cc3f7c..8fa9b0074c99 100644
--- a/sw/source/filter/html/htmlnumwriter.cxx
+++ b/sw/source/filter/html/htmlnumwriter.cxx
@@ -320,7 +320,7 @@ SwHTMLWriter& OutHTML_NumberBulletListEnd( SwHTMLWriter&
rWrt,
else
aTag = OOO_STRING_SVTOOLS_HTML_orderlist;
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(),
Concat2View(rWrt.GetNamespace() + aTag), false );
- if (rWrt.mbXHTML && i != nNextDepth + 1)
+ if (rWrt.mbXHTML && (i != nNextDepth + 1 || (i != 1 &&
rNextInfo.IsNumbered())))
{
// for all skipped sublevels, close a li
HTMLOutFuncs::Out_AsciiTag(
