[Libreoffice-commits] core.git: cui/uiconfig include/xmloff schema/libreoffice sw/qa xmloff/Library_xo.mk xmloff/source
Shubham Goyal (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 22 11:46:13 UTC 2019
cui/uiconfig/ui/qrcodegen.ui | 3
include/xmloff/shapeexport.hxx | 1
include/xmloff/xmltoken.hxx | 3
schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng | 22
sw/qa/extras/odfexport/data/qrcode-properties.odt | 386 ++++++++++++
sw/qa/extras/odfexport/odfexport.cxx | 17
xmloff/Library_xo.mk | 1
xmloff/source/core/xmltoken.cxx | 3
xmloff/source/draw/QRCodeContext.cxx | 95 ++
xmloff/source/draw/QRCodeContext.hxx | 26
xmloff/source/draw/shapeexport.cxx | 43 +
xmloff/source/draw/ximpshap.cxx | 18
xmloff/source/text/XMLTextFrameContext.cxx | 9
xmloff/source/token/tokens.txt | 3
14 files changed, 626 insertions(+), 4 deletions(-)
New commits:
commit 437fe778a81f3c39b8b259acd2d960c285d4f244
Author: Shubham Goyal <22shubh22 at gmail.com>
AuthorDate: Thu Jul 25 07:56:59 2019 +0530
Commit: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
CommitDate: Thu Aug 22 13:45:28 2019 +0200
QR Code : ODF import/export
Change-Id: I6c1ae63a89d5ed34d2fa245279d4552949bb64a7
Reviewed-on: https://gerrit.libreoffice.org/74853
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
diff --git a/cui/uiconfig/ui/qrcodegen.ui b/cui/uiconfig/ui/qrcodegen.ui
index 091e5e5351ab..a7523405ae10 100644
--- a/cui/uiconfig/ui/qrcodegen.ui
+++ b/cui/uiconfig/ui/qrcodegen.ui
@@ -292,8 +292,5 @@
<action-widget response="-5">ok</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
</object>
</interface>
diff --git a/include/xmloff/shapeexport.hxx b/include/xmloff/shapeexport.hxx
index 13e7bda71318..67a57899f30c 100644
--- a/include/xmloff/shapeexport.hxx
+++ b/include/xmloff/shapeexport.hxx
@@ -191,6 +191,7 @@ private:
SAL_DLLPRIVATE void ImpExportDescription( const css::uno::Reference< css::drawing::XShape >& xShape ); // #i68101#
SAL_DLLPRIVATE void ImpExportGluePoints( const css::uno::Reference< css::drawing::XShape >& xShape );
SAL_DLLPRIVATE void ImpExportSignatureLine(const css::uno::Reference<css::drawing::XShape>& xShape);
+ SAL_DLLPRIVATE void ImpExportQRCode(const css::uno::Reference<css::drawing::XShape>& xShape);
// single shape exporters
SAL_DLLPRIVATE void ImpExportGroupShape( const css::uno::Reference< css::drawing::XShape >& xShape, XMLShapeExportFlags nFeatures = SEF_DEFAULT, css::awt::Point* pRefPoint = nullptr );
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index 83ebc3395ebb..098dc30fecad 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -1501,6 +1501,9 @@ namespace xmloff { namespace token {
XML_PUNCTUATION_WRAP,
XML_PURPLE,
XML_PYRAMID,
+ XML_QRCODE,
+ XML_QRCODE_BORDER,
+ XML_QRCODE_ERROR_CORRECTION,
XML_QUARTER,
XML_QUERY_NAME,
XML_QUO_VADIS,
diff --git a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
index 8e78fa6211f9..a8b2b55ef20f 100644
--- a/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
+++ b/schema/libreoffice/OpenDocument-schema-v1.3+libreoffice.rng
@@ -1212,6 +1212,9 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
<rng:optional>
<rng:ref name="loext-signatureline"/>
</rng:optional>
+ <rng:optional>
+ <rng:ref name="loext-qrcode"/>
+ </rng:optional>
</rng:element>
</rng:define>
@@ -1680,6 +1683,25 @@ xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.
</rng:element>
</rng:define>
+ <rng:define name="loext-qrcode">
+ <rng:element name="loext:qrcode">
+ <rng:attribute name="office:string-value">
+ <rng:ref name="string"/>
+ </rng:attribute>
+ <rng:attribute name="loext:qrcode-errorcorrection">
+ <rng:choice>
+ <rng:value>low</rng:value>
+ <rng:value>medium</rng:value>
+ <rng:value>quartile</rng:value>
+ <rng:value>high</rng:value>
+ </rng:choice>
+ </rng:attribute>
+ <rng:attribute name="loext:qrcode-border">
+ <rng:ref name="nonNegativeInteger"/>
+ </rng:attribute>
+ </rng:element>
+ </rng:define>
+
<!-- https://issues.oasis-open.org/browse/OFFICE-3761 -->
<rng:define name="loext-table">
<rng:element name="loext:table">
diff --git a/sw/qa/extras/odfexport/data/qrcode-properties.odt b/sw/qa/extras/odfexport/data/qrcode-properties.odt
new file mode 100644
index 000000000000..6aa3ed252b50
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/qrcode-properties.odt
@@ -0,0 +1,386 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<office:document xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:css3t="http://www.w3.org/TR/css3-text/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.
0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ooo="http://openoffice.org/2004/office" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:officeooo="http://openoffice.org/2009/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:drawooo="http://openoffice.org/2010/draw" 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:rpt="http://op
enoffice.org/2005/report" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text">
+ <office:meta><dc:date>2019-08-08T13:36:57.760952360</dc:date><meta:editing-duration>PT1M46S</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:document-statistic meta:table-count="0" meta:image-count="0" meta:object-count="0" meta:page-count="1" meta:paragraph-count="0" meta:word-count="0" meta:character-count="0" meta:non-whitespace-character-count="0"/><meta:generator>LibreOfficeDev/6.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/4dac05d709f960acb27cbbf1425f36cdbf68d04d</meta:generator></office:meta>
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="ViewAreaTop" config:type="long">0</config:config-item>
+ <config:config-item config:name="ViewAreaLeft" config:type="long">0</config:config-item>
+ <config:config-item config:name="ViewAreaWidth" config:type="long">13363</config:config-item>
+ <config:config-item config:name="ViewAreaHeight" config:type="long">12146</config:config-item>
+ <config:config-item config:name="ShowRedlineChanges" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="InBrowseMode" config:type="boolean">false</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">view2</config:config-item>
+ <config:config-item config:name="ViewLeft" config:type="long">6503</config:config-item>
+ <config:config-item config:name="ViewTop" config:type="long">2501</config:config-item>
+ <config:config-item config:name="VisibleLeft" config:type="long">0</config:config-item>
+ <config:config-item config:name="VisibleTop" config:type="long">0</config:config-item>
+ <config:config-item config:name="VisibleRight" config:type="long">13361</config:config-item>
+ <config:config-item config:name="VisibleBottom" config:type="long">12144</config:config-item>
+ <config:config-item config:name="ZoomType" config:type="short">0</config:config-item>
+ <config:config-item config:name="ViewLayoutColumns" config:type="short">1</config:config-item>
+ <config:config-item config:name="ViewLayoutBookMode" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ZoomFactor" config:type="short">100</config:config-item>
+ <config:config-item config:name="IsSelectedFrame" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AnchoredTextOverflowLegacy" 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="PrintPaperFromSetup" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintFaxName" config:type="string"/>
+ <config:config-item config:name="PrintSingleJobs" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintProspectRTL" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintProspect" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintReversed" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintTextPlaceholder" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintTables" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintPageBackground" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintLeftPages" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintAnnotationMode" config:type="short">0</config:config-item>
+ <config:config-item config:name="PrintControls" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintHiddenText" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintDrawings" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IgnoreFirstLineIndentInNumbering" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary"/>
+ <config:config-item config:name="CollapseEmptyCellPara" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseOldPrinterMetrics" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UseOldNumbering" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddExternalLeading" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TreatSingleColumnBreakAsPageBreak" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="IsLabelDocument" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RsidRoot" config:type="int">1767301</config:config-item>
+ <config:config-item config:name="ConsiderTextWrapOnObjPos" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="TableRowKeep" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="TabsRelativeToIndent" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UseFormerTextWrapping" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ChartAutoUpdate" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacingAtStart" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaTableSpacing" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="AddParaSpacingToTableCells" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="UseFormerLineSpacing" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="OutlineLevelYieldsNumbering" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AlignTabStopPosition" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="DoNotJustifyLinesWithManualBreak" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedOnlyUsedFonts" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="LinkUpdateMode" config:type="short">1</config:config-item>
+ <config:config-item config:name="CurrentDatabaseCommandType" config:type="int">0</config:config-item>
+ <config:config-item config:name="CurrentDatabaseCommand" config:type="string"/>
+ <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item>
+ <config:config-item config:name="SmallCapsPercentage66" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="StylesNoDefault" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbeddedDatabaseName" config:type="string"/>
+ <config:config-item config:name="FloattableNomargins" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="BackgroundParaOverDrawings" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string"/>
+ <config:config-item config:name="UseFormerObjectPositioning" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="TabOverMargin" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SaveGlobalDocumentLinks" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="CurrentDatabaseDataSource" config:type="string"/>
+ <config:config-item config:name="IsKernAsianPunctuation" 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="PrinterPaperFromSetup" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrinterIndependentLayout" config:type="string">high-resolution</config:config-item>
+ <config:config-item config:name="TabOverflow" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PrintGraphics" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="PropLineSpacingShrinksFirstLine" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="DoNotResetParaAttrsForNumFont" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="FieldAutoUpdate" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IgnoreTabsAndBlanksForLineCalculation" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="RedlineProtectionKey" config:type="base64Binary"/>
+ <config:config-item config:name="EmbedComplexScriptFonts" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DoNotCaptureDrawObjsOnPage" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ClipAsCharacterAnchoredWriterFlyFrames" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintBlackFonts" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="DisableOffPagePositioning" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SurroundTextWrapSmall" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="UnxForceZeroExtLeading" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmbedAsianScriptFonts" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="TabAtLeftIndentForParagraphsInList" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintRightPages" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="Rsid" config:type="int">1767301</config:config-item>
+ <config:config-item config:name="MathBaselineAlignment" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="MsWordCompTrailingBlanks" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="InvertBorderSpacing" 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="UnbreakableNumberings" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddFrameOffsets" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ClippedPictures" 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="EmbedSystemFonts" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="ApplyParagraphMarkFormatToNumbering" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="SubtractFlysAnchoredAtFlys" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="EmptyDbFieldHidesPara" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ProtectForm" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="AddVerticalFrameOffsets" config:type="boolean">false</config:config-item>
+ <config:config-item config:name="PrintEmptyPages" config:type="boolean">false</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:scripts>
+ <office:script script:language="ooo:Basic">
+ <ooo:libraries xmlns:ooo="http://openoffice.org/2004/office" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ </office:script>
+ </office:scripts>
+ <office:font-face-decls>
+ <style:font-face style:name="Lohit Devanagari1" svg:font-family="'Lohit Devanagari'"/>
+ <style:font-face style:name="Liberation Mono" svg:font-family="'Liberation Mono'" style:font-family-generic="modern" style:font-pitch="fixed"/>
+ <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="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
+ <style:font-face style:name="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Sans CJK SC Regular" svg:font-family="'Noto Sans CJK SC Regular'" style:font-family-generic="system" style:font-pitch="variable"/>
+ <style:font-face style:name="Noto Serif CJK SC" svg:font-family="'Noto Serif CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
+ </office:font-face-decls>
+ <office:styles>
+ <style:default-style style:family="graphic">
+ <style:graphic-properties svg:stroke-color="#3465a4" draw:fill-color="#729fcf" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="false"/>
+ <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:font-independent-line-spacing="false">
+ <style:tab-stops/>
+ </style:paragraph-properties>
+ <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="en" fo:country="IN" style:letter-kerning="true" style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Devanagari" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN"/>
+ </style:default-style>
+ <style:default-style style:family="paragraph">
+ <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
+ <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Serif" fo:font-size="12pt" fo:language="en" fo:country="IN" style:font-name-asian="Noto Serif CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Devanagari" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
+ </style:default-style>
+ <style:default-style style:family="table">
+ <style:table-properties table:border-model="collapsing"/>
+ </style:default-style>
+ <style:default-style style:family="table-row">
+ <style:table-row-properties fo:keep-together="auto"/>
+ </style:default-style>
+ <style:style style:name="Standard" style:family="paragraph" style:class="text"/>
+ <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">
+ <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false" fo:keep-with-next="always"/>
+ <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Noto Sans CJK SC Regular" style:font-family-asian="'Noto Sans CJK SC Regular'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" 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="14pt"/>
+ </style:style>
+ <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
+ <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.247cm" loext:contextual-spacing="false" fo:line-height="115%"/>
+ </style:style>
+ <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list">
+ <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lohit Devanagari1" style:font-family-complex="'Lohit Devanagari'"/>
+ </style:style>
+ <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
+ <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false" text:number-lines="false" text:line-number="0"/>
+ <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-name-complex="Lohit Devanagari1" style:font-family-complex="'Lohit Devanagari'" style:font-size-complex="12pt" style:font-style-complex="italic"/>
+ </style:style>
+ <style:style style:name="Index" style:family="paragraph" style:parent-style-name="Standard" style:class="index">
+ <style:paragraph-properties text:number-lines="false" text:line-number="0"/>
+ <style:text-properties style:font-size-asian="12pt" style:font-name-complex="Lohit Devanagari1" style:font-family-complex="'Lohit Devanagari'"/>
+ </style:style>
+ <style:style style:name="Preformatted_20_Text" style:display-name="Preformatted Text" style:family="paragraph" style:parent-style-name="Standard" style:class="html">
+ <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" loext:contextual-spacing="false"/>
+ <style:text-properties style:font-name="Liberation Mono" fo:font-family="'Liberation Mono'" style:font-family-generic="modern" style:font-pitch="fixed" fo:font-size="10pt" style:font-name-asian="Liberation Mono" style:font-family-asian="'Liberation Mono'" style:font-family-generic-asian="modern" style:font-pitch-asian="fixed" style:font-size-asian="10pt" style:font-name-complex="Liberation Mono" style:font-family-complex="'Liberation Mono'" style:font-family-generic-complex="modern" style:font-pitch-complex="fixed" style:font-size-complex="10pt"/>
+ </style:style>
+ <text:outline-style style:name="Outline">
+ <text:outline-level-style text:level="1" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="2" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="3" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="4" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="5" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="6" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="7" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="8" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="9" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ <text:outline-level-style text:level="10" style:num-format="">
+ <style:list-level-properties text:list-level-position-and-space-mode="label-alignment">
+ <style:list-level-label-alignment text:label-followed-by="listtab"/>
+ </style:list-level-properties>
+ </text:outline-level-style>
+ </text:outline-style>
+ <text:notes-configuration text:note-class="footnote" style:num-format="1" text:start-value="0" text:footnotes-position="page" text:start-numbering-at="document"/>
+ <text:notes-configuration text:note-class="endnote" style:num-format="i" text:start-value="0"/>
+ <text:linenumbering-configuration text:number-lines="false" text:offset="0.499cm" style:num-format="1" text:number-position="left" text:increment="5"/>
+ </office:styles>
+ <office:automatic-styles>
+ <style:style style:name="P1" style:family="paragraph">
+ <loext:graphic-properties draw:fill="none"/>
+ <style:paragraph-properties fo:text-align="center"/>
+ </style:style>
+ <style:style style:name="gr1" style:family="graphic">
+ <style:graphic-properties draw:stroke="none" draw:fill="none" draw:textarea-horizontal-align="center" draw:textarea-vertical-align="middle" draw:color-mode="standard" draw:luminance="0%" draw:contrast="0%" draw:gamma="100%" draw:red="0%" draw:green="0%" draw:blue="0%" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:image-opacity="100%" style:mirror="none" style:run-through="background" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" draw:wrap-influence-on-position="once-concurrent" style:flow-with-text="false"/>
+ </style:style>
+ <style:page-layout style:name="pm1">
+ <style:page-layout-properties fo:page-width="21.001cm" fo:page-height="29.7cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2cm" fo:margin-bottom="2cm" fo:margin-left="2cm" fo:margin-right="2cm" style:writing-mode="lr-tb" style:footnote-max-height="0cm">
+ <style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
+ </style:page-layout-properties>
+ <style:header-style/>
+ <style:footer-style/>
+ </style:page-layout>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page style:name="Standard" style:page-layout-name="pm1"/>
+ </office:master-styles>
+ <office:body>
+ <office:text>
+ <text:sequence-decls>
+ <text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+ <text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+ </text:sequence-decls>
+ <text:p text:style-name="Preformatted_20_Text"><draw:frame text:anchor-type="paragraph" draw:z-index="0" draw:style-name="gr1" draw:text-style-name="P1" svg:width="4.001cm" svg:height="4.001cm" svg:x="0cm" svg:y="0cm">
+ <draw:image loext:mime-type="image/svg+xml">
+ <office:binary-data>PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPCFET0NUWVBFIHN2ZyBQ
+ VUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3Jh
+ cGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53
+ My5vcmcvMjAwMC9zdmciIHZlcnNpb249IjEuMSIgdmlld0JveD0iMCAwIDM1IDM1IiBzdHJv
+ a2U9Im5vbmUiPgoJPHJlY3Qgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0iI0ZG
+ RkZGRiIvPgoJPHBhdGggZD0iTTUsNWgxdjFoLTF6IE02LDVoMXYxaC0xeiBNNyw1aDF2MWgt
+ MXogTTgsNWgxdjFoLTF6IE05LDVoMXYxaC0xeiBNMTAsNWgxdjFoLTF6IE0xMSw1aDF2MWgt
+ MXogTTE1LDVoMXYxaC0xeiBNMTcsNWgxdjFoLTF6IE0xOCw1aDF2MWgtMXogTTIwLDVoMXYx
+ aC0xeiBNMjEsNWgxdjFoLTF6IE0yMyw1aDF2MWgtMXogTTI0LDVoMXYxaC0xeiBNMjUsNWgx
+ djFoLTF6IE0yNiw1aDF2MWgtMXogTTI3LDVoMXYxaC0xeiBNMjgsNWgxdjFoLTF6IE0yOSw1
+ aDF2MWgtMXogTTUsNmgxdjFoLTF6IE0xMSw2aDF2MWgtMXogTTE0LDZoMXYxaC0xeiBNMTUs
+ NmgxdjFoLTF6IE0xNiw2aDF2MWgtMXogTTE5LDZoMXYxaC0xeiBNMjEsNmgxdjFoLTF6IE0y
+ Myw2aDF2MWgtMXogTTI5LDZoMXYxaC0xeiBNNSw3aDF2MWgtMXogTTcsN2gxdjFoLTF6IE04
+ LDdoMXYxaC0xeiBNOSw3aDF2MWgtMXogTTExLDdoMXYxaC0xeiBNMTMsN2gxdjFoLTF6IE0x
+ NSw3aDF2MWgtMXogTTE3LDdoMXYxaC0xeiBNMjMsN2gxdjFoLTF6IE0yNSw3aDF2MWgtMXog
+ TTI2LDdoMXYxaC0xeiBNMjcsN2gxdjFoLTF6IE0yOSw3aDF2MWgtMXogTTUsOGgxdjFoLTF6
+ IE03LDhoMXYxaC0xeiBNOCw4aDF2MWgtMXogTTksOGgxdjFoLTF6IE0xMSw4aDF2MWgtMXog
+ TTE0LDhoMXYxaC0xeiBNMTcsOGgxdjFoLTF6IE0xOCw4aDF2MWgtMXogTTE5LDhoMXYxaC0x
+ eiBNMjEsOGgxdjFoLTF6IE0yMyw4aDF2MWgtMXogTTI1LDhoMXYxaC0xeiBNMjYsOGgxdjFo
+ LTF6IE0yNyw4aDF2MWgtMXogTTI5LDhoMXYxaC0xeiBNNSw5aDF2MWgtMXogTTcsOWgxdjFo
+ LTF6IE04LDloMXYxaC0xeiBNOSw5aDF2MWgtMXogTTExLDloMXYxaC0xeiBNMTMsOWgxdjFo
+ LTF6IE0xOCw5aDF2MWgtMXogTTE5LDloMXYxaC0xeiBNMjAsOWgxdjFoLTF6IE0yMSw5aDF2
+ MWgtMXogTTIzLDloMXYxaC0xeiBNMjUsOWgxdjFoLTF6IE0yNiw5aDF2MWgtMXogTTI3LDlo
+ MXYxaC0xeiBNMjksOWgxdjFoLTF6IE01LDEwaDF2MWgtMXogTTExLDEwaDF2MWgtMXogTTEz
+ LDEwaDF2MWgtMXogTTE3LDEwaDF2MWgtMXogTTIzLDEwaDF2MWgtMXogTTI5LDEwaDF2MWgt
+ MXogTTUsMTFoMXYxaC0xeiBNNiwxMWgxdjFoLTF6IE03LDExaDF2MWgtMXogTTgsMTFoMXYx
+ aC0xeiBNOSwxMWgxdjFoLTF6IE0xMCwxMWgxdjFoLTF6IE0xMSwxMWgxdjFoLTF6IE0xMywx
+ MWgxdjFoLTF6IE0xNSwxMWgxdjFoLTF6IE0xNywxMWgxdjFoLTF6IE0xOSwxMWgxdjFoLTF6
+ IE0yMSwxMWgxdjFoLTF6IE0yMywxMWgxdjFoLTF6IE0yNCwxMWgxdjFoLTF6IE0yNSwxMWgx
+ djFoLTF6IE0yNiwxMWgxdjFoLTF6IE0yNywxMWgxdjFoLTF6IE0yOCwxMWgxdjFoLTF6IE0y
+ OSwxMWgxdjFoLTF6IE0xNCwxMmgxdjFoLTF6IE0xNSwxMmgxdjFoLTF6IE0xNiwxMmgxdjFo
+ LTF6IE0xNywxMmgxdjFoLTF6IE0xOSwxMmgxdjFoLTF6IE02LDEzaDF2MWgtMXogTTksMTNo
+ MXYxaC0xeiBNMTEsMTNoMXYxaC0xeiBNMTMsMTNoMXYxaC0xeiBNMTUsMTNoMXYxaC0xeiBN
+ MTcsMTNoMXYxaC0xeiBNMTgsMTNoMXYxaC0xeiBNMTksMTNoMXYxaC0xeiBNMjAsMTNoMXYx
+ aC0xeiBNMjIsMTNoMXYxaC0xeiBNMjQsMTNoMXYxaC0xeiBNMjUsMTNoMXYxaC0xeiBNMjcs
+ MTNoMXYxaC0xeiBNNywxNGgxdjFoLTF6IE04LDE0aDF2MWgtMXogTTEwLDE0aDF2MWgtMXog
+ TTE0LDE0aDF2MWgtMXogTTE5LDE0aDF2MWgtMXogTTIwLDE0aDF2MWgtMXogTTI1LDE0aDF2
+ MWgtMXogTTI2LDE0aDF2MWgtMXogTTI4LDE0aDF2MWgtMXogTTYsMTVoMXYxaC0xeiBNOSwx
+ NWgxdjFoLTF6IE0xMSwxNWgxdjFoLTF6IE0xMywxNWgxdjFoLTF6IE0xNCwxNWgxdjFoLTF6
+ IE0xNSwxNWgxdjFoLTF6IE0xOCwxNWgxdjFoLTF6IE0xOSwxNWgxdjFoLTF6IE0yMCwxNWgx
+ djFoLTF6IE0yMywxNWgxdjFoLTF6IE0yNCwxNWgxdjFoLTF6IE0xNCwxNmgxdjFoLTF6IE0x
+ NSwxNmgxdjFoLTF6IE0xNiwxNmgxdjFoLTF6IE0xNywxNmgxdjFoLTF6IE0xOCwxNmgxdjFo
+ LTF6IE0yMCwxNmgxdjFoLTF6IE0yMywxNmgxdjFoLTF6IE0yNCwxNmgxdjFoLTF6IE0yNiwx
+ NmgxdjFoLTF6IE0yNywxNmgxdjFoLTF6IE0yOSwxNmgxdjFoLTF6IE02LDE3aDF2MWgtMXog
+ TTksMTdoMXYxaC0xeiBNMTEsMTdoMXYxaC0xeiBNMTIsMTdoMXYxaC0xeiBNMTMsMTdoMXYx
+ aC0xeiBNMTQsMTdoMXYxaC0xeiBNMTgsMTdoMXYxaC0xeiBNMjIsMTdoMXYxaC0xeiBNMjMs
+ MTdoMXYxaC0xeiBNMjQsMTdoMXYxaC0xeiBNMjcsMTdoMXYxaC0xeiBNMjgsMTdoMXYxaC0x
+ eiBNMjksMTdoMXYxaC0xeiBNNSwxOGgxdjFoLTF6IE02LDE4aDF2MWgtMXogTTgsMThoMXYx
+ aC0xeiBNOSwxOGgxdjFoLTF6IE0xNSwxOGgxdjFoLTF6IE0xNywxOGgxdjFoLTF6IE0xOCwx
+ OGgxdjFoLTF6IE0xOSwxOGgxdjFoLTF6IE0yMCwxOGgxdjFoLTF6IE0yMSwxOGgxdjFoLTF6
+ IE0yNSwxOGgxdjFoLTF6IE0yNiwxOGgxdjFoLTF6IE0yNywxOGgxdjFoLTF6IE0yOCwxOGgx
+ djFoLTF6IE05LDE5aDF2MWgtMXogTTEwLDE5aDF2MWgtMXogTTExLDE5aDF2MWgtMXogTTEz
+ LDE5aDF2MWgtMXogTTE0LDE5aDF2MWgtMXogTTE1LDE5aDF2MWgtMXogTTE2LDE5aDF2MWgt
+ MXogTTE4LDE5aDF2MWgtMXogTTIwLDE5aDF2MWgtMXogTTI1LDE5aDF2MWgtMXogTTI2LDE5
+ aDF2MWgtMXogTTcsMjBoMXYxaC0xeiBNOCwyMGgxdjFoLTF6IE05LDIwaDF2MWgtMXogTTIx
+ LDIwaDF2MWgtMXogTTIyLDIwaDF2MWgtMXogTTIzLDIwaDF2MWgtMXogTTI3LDIwaDF2MWgt
+ MXogTTI5LDIwaDF2MWgtMXogTTUsMjFoMXYxaC0xeiBNNiwyMWgxdjFoLTF6IE03LDIxaDF2
+ MWgtMXogTTgsMjFoMXYxaC0xeiBNMTEsMjFoMXYxaC0xeiBNMTIsMjFoMXYxaC0xeiBNMTQs
+ MjFoMXYxaC0xeiBNMTUsMjFoMXYxaC0xeiBNMTcsMjFoMXYxaC0xeiBNMjEsMjFoMXYxaC0x
+ eiBNMjIsMjFoMXYxaC0xeiBNMjMsMjFoMXYxaC0xeiBNMjQsMjFoMXYxaC0xeiBNMjUsMjFo
+ MXYxaC0xeiBNMjcsMjFoMXYxaC0xeiBNMjgsMjFoMXYxaC0xeiBNMjksMjFoMXYxaC0xeiBN
+ MTMsMjJoMXYxaC0xeiBNMTUsMjJoMXYxaC0xeiBNMTYsMjJoMXYxaC0xeiBNMTcsMjJoMXYx
+ aC0xeiBNMTgsMjJoMXYxaC0xeiBNMjEsMjJoMXYxaC0xeiBNMjUsMjJoMXYxaC0xeiBNMjYs
+ MjJoMXYxaC0xeiBNMjcsMjJoMXYxaC0xeiBNMjgsMjJoMXYxaC0xeiBNNSwyM2gxdjFoLTF6
+ IE02LDIzaDF2MWgtMXogTTcsMjNoMXYxaC0xeiBNOCwyM2gxdjFoLTF6IE05LDIzaDF2MWgt
+ MXogTTEwLDIzaDF2MWgtMXogTTExLDIzaDF2MWgtMXogTTE0LDIzaDF2MWgtMXogTTE2LDIz
+ aDF2MWgtMXogTTE3LDIzaDF2MWgtMXogTTE4LDIzaDF2MWgtMXogTTE5LDIzaDF2MWgtMXog
+ TTIxLDIzaDF2MWgtMXogTTIzLDIzaDF2MWgtMXogTTI1LDIzaDF2MWgtMXogTTI2LDIzaDF2
+ MWgtMXogTTI3LDIzaDF2MWgtMXogTTUsMjRoMXYxaC0xeiBNMTEsMjRoMXYxaC0xeiBNMTYs
+ MjRoMXYxaC0xeiBNMjEsMjRoMXYxaC0xeiBNMjUsMjRoMXYxaC0xeiBNMjcsMjRoMXYxaC0x
+ eiBNMjksMjRoMXYxaC0xeiBNNSwyNWgxdjFoLTF6IE03LDI1aDF2MWgtMXogTTgsMjVoMXYx
+ aC0xeiBNOSwyNWgxdjFoLTF6IE0xMSwyNWgxdjFoLTF6IE0xMywyNWgxdjFoLTF6IE0xNywy
+ NWgxdjFoLTF6IE0xOCwyNWgxdjFoLTF6IE0yMSwyNWgxdjFoLTF6IE0yMiwyNWgxdjFoLTF6
+ IE0yMywyNWgxdjFoLTF6IE0yNCwyNWgxdjFoLTF6IE0yNSwyNWgxdjFoLTF6IE0yNywyNWgx
+ djFoLTF6IE0yOSwyNWgxdjFoLTF6IE01LDI2aDF2MWgtMXogTTcsMjZoMXYxaC0xeiBNOCwy
+ NmgxdjFoLTF6IE05LDI2aDF2MWgtMXogTTExLDI2aDF2MWgtMXogTTE0LDI2aDF2MWgtMXog
+ TTE1LDI2aDF2MWgtMXogTTE3LDI2aDF2MWgtMXogTTE4LDI2aDF2MWgtMXogTTIwLDI2aDF2
+ MWgtMXogTTIyLDI2aDF2MWgtMXogTTIzLDI2aDF2MWgtMXogTTI3LDI2aDF2MWgtMXogTTI4
+ LDI2aDF2MWgtMXogTTI5LDI2aDF2MWgtMXogTTUsMjdoMXYxaC0xeiBNNywyN2gxdjFoLTF6
+ IE04LDI3aDF2MWgtMXogTTksMjdoMXYxaC0xeiBNMTEsMjdoMXYxaC0xeiBNMTQsMjdoMXYx
+ aC0xeiBNMTYsMjdoMXYxaC0xeiBNMTgsMjdoMXYxaC0xeiBNMTksMjdoMXYxaC0xeiBNMjAs
+ MjdoMXYxaC0xeiBNMjIsMjdoMXYxaC0xeiBNMjMsMjdoMXYxaC0xeiBNMjQsMjdoMXYxaC0x
+ eiBNMjcsMjdoMXYxaC0xeiBNMjgsMjdoMXYxaC0xeiBNNSwyOGgxdjFoLTF6IE0xMSwyOGgx
+ djFoLTF6IE0xMywyOGgxdjFoLTF6IE0xNCwyOGgxdjFoLTF6IE0xNSwyOGgxdjFoLTF6IE0x
+ OCwyOGgxdjFoLTF6IE0yMCwyOGgxdjFoLTF6IE0yNSwyOGgxdjFoLTF6IE0yNywyOGgxdjFo
+ LTF6IE0yOCwyOGgxdjFoLTF6IE01LDI5aDF2MWgtMXogTTYsMjloMXYxaC0xeiBNNywyOWgx
+ djFoLTF6IE04LDI5aDF2MWgtMXogTTksMjloMXYxaC0xeiBNMTAsMjloMXYxaC0xeiBNMTEs
+ MjloMXYxaC0xeiBNMTUsMjloMXYxaC0xeiBNMTcsMjloMXYxaC0xeiBNMTgsMjloMXYxaC0x
+ eiBNMTksMjloMXYxaC0xeiBNMjAsMjloMXYxaC0xeiBNMjQsMjloMXYxaC0xeiBNMjUsMjlo
+ MXYxaC0xeiBNMjcsMjloMXYxaC0xeiBNMjgsMjloMXYxaC0xeiBNMjksMjloMXYxaC0xeiIg
+ ZmlsbD0iIzAwMDAwMCIvPgo8L3N2Zz4K
+ </office:binary-data>
+ <text:p/>
+ </draw:image>
+ <draw:image loext:mime-type="image/png">
+ <office:binary-data>iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAADbElEQVR4nO2Xu04jQRBFGwnJ
+ EBm+BDJMhIkwEZ+zJrMj4G/IgAg7wmTwJUAERF6f1p5Ra9btnnFiVtqShnm4uurWrUc32/P5
+ vB9CGISfIZPtxZ/e4vq1aSR/ZL69aQR1+Q+oJEsBTSaTcH9/v3RBv98Pg8Gg0vv6+go7OztR
+ n9+WPZfsFAHNZrPw/Pz81wIAbG1txe88j0aj8P39Hc7OzsL+/n5cs+ja8Pr6GvW63W7RTiNA
+ SK/XC0dHR1WERISzj4+PaJBrd3c3GuY6ODgIe3t7ESCOuD89Pa20s0xW1hBM3dzcxGcjRkgF
+ 7zg6PT2NjsfjcTg5OakcksqSndaAcoIznAIGEJ1OJ0yn0+iUO+/Hx8crHa8FiGivr6/jM9TD
+ BELEpAQwAoQt9JVUP2enFSBqBBaUu7u7CITIUx3AvLy8RIA4tus+Pz8b2ykCwjC5rsv5+XmM
+ kJQ8PDxUXWaKcESxXlxcxPUlO40BoUykXLZ4GjkRc9llfEcHYKaSb+/v71WHOZe0mZNsylhM
+ geLIrrKQcZx2mUWNLncuWeI35hLfmFcylgOVBWQnMfB8xpgMPT4+RjZgE0bQoT5SlgF4e3sb
+ gcOm6WbdWgzZ1naVxrjjgKiZPzhGpz59nT/D4TCmDMDpltJqUltD6TPMOHFhKt2PAHh4eBhT
+ Bej6fggIU2cTNAbkPsUiDPmMM1KI0CmAZMtAh+jTFucbOuqROoKAtdzGmgWkMXNO9DpLKcc4
+ d4rVjoMFABCEg5OhyLsD0rprDIgFaVESGSBgB8eA5BnQ6ruhOqNgzJoRiIya+lYpkwFyjkEi
+ xJBO0vnCd2ZOek5CH2G9my4TnSZoXUOyYQ1IMQDr5x6L1FbWSf0gp95aNQS1b29v1bv064hz
+ D2mBJcDZTUSveA6yOy8vL6v1aX01AlQ6MV5dXcV3WKlvB9SY4oQXCO+MhtY1lEaYOzEKwnTB
+ KDpEzvEiHQHu7pyPWO8m3AqQhnInRvcuQACKNLjRApa0spbfrUOBWtTLZK0ToyPBczVMeCrA
+ Kc5gCnZtdZlbq6iV3EnPsUCqPAHADIXOvb6WeqwH1KqodZo76TnJ0RFUClCnMkk6YcqUG1Dj
+ Giqd9LyI0uns1BaMUt+GZC3txiIgHZYk1cnp122V7P4b/9tvUn4koMniGm4YhzL7DX0ADFAY
+ Xmt+AAAAAElFTkSuQmCC
+ </office:binary-data>
+ </draw:image>
+ <loext:qrcode office:string-value="www.libreoffice.org" loext:qrcode-errorcorrection="low" loext:qrcode-border="5"/>
+ </draw:frame></text:p>
+ </office:text>
+ </office:body>
+</office:document>
\ No newline at end of file
diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx
index 5fbe7508cbeb..3d4d0e245451 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -18,6 +18,8 @@
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
#include <com/sun/star/drawing/XGraphicExportFilter.hpp>
+#include <com/sun/star/drawing/QRCode.hpp>
+#include <com/sun/star/drawing/QRCodeErrorCorrection.hpp>
#include <com/sun/star/table/ShadowFormat.hpp>
#include <com/sun/star/table/XCellRange.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
@@ -2111,6 +2113,21 @@ DECLARE_ODFEXPORT_TEST(testSignatureLineProperties, "signatureline-properties.fo
CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xShape, "SignatureLineShowSignDate"));
}
+DECLARE_ODFEXPORT_TEST(testQrCodeGenProperties, "qrcode-properties.odt")
+{
+ uno::Reference<drawing::XShape> xShape = getShape(1);
+ CPPUNIT_ASSERT(xShape.is());
+
+ css::drawing::QRCode aQRCode = getProperty<css::drawing::QRCode>(xShape, "QRCodeProperties");
+
+ CPPUNIT_ASSERT_EQUAL(OUString("www.libreoffice.org"),
+ aQRCode.Payload);
+ CPPUNIT_ASSERT_EQUAL(css::drawing::QRCodeErrorCorrection::LOW,
+ aQRCode.ErrorCorrection);
+ CPPUNIT_ASSERT_EQUAL(sal_Int32(5),
+ aQRCode.Border);
+}
+
DECLARE_ODFEXPORT_TEST(testChapterNumberingNewLine, "chapter-number-new-line.odt")
{
uno::Reference<text::XChapterNumberingSupplier> xNumberingSupplier(mxComponent, uno::UNO_QUERY);
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 031e7da6ab5d..0656f8ee2ab0 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -142,6 +142,7 @@ $(eval $(call gb_Library_add_exception_objects,xo,\
xmloff/source/draw/shapeexport \
xmloff/source/draw/shapeimport \
xmloff/source/draw/SignatureLineContext \
+ xmloff/source/draw/QRCodeContext \
xmloff/source/draw/xexptran \
xmloff/source/draw/ximp3dobject \
xmloff/source/draw/ximp3dscene \
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index a8fea52ebbfc..5ce4b8d8f1a5 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -1503,6 +1503,9 @@ namespace xmloff { namespace token {
TOKEN( "punctuation-wrap", XML_PUNCTUATION_WRAP ),
TOKEN( "purple", XML_PURPLE ),
TOKEN( "pyramid", XML_PYRAMID ),
+ TOKEN( "qrcode", XML_QRCODE ),
+ TOKEN( "qrcode-border", XML_QRCODE_BORDER ),
+ TOKEN( "qrcode-errorcorrection", XML_QRCODE_ERROR_CORRECTION ),
TOKEN( "quarter", XML_QUARTER ),
TOKEN( "query-name", XML_QUERY_NAME ),
TOKEN( "quo-vadis", XML_QUO_VADIS ),
diff --git a/xmloff/source/draw/QRCodeContext.cxx b/xmloff/source/draw/QRCodeContext.cxx
new file mode 100644
index 000000000000..bf0f4c0469d2
--- /dev/null
+++ b/xmloff/source/draw/QRCodeContext.cxx
@@ -0,0 +1,95 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "QRCodeContext.hxx"
+
+#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XStorable.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
+#include <com/sun/star/drawing/QRCode.hpp>
+#include <com/sun/star/drawing/QRCodeErrorCorrection.hpp>
+#include <com/sun/star/xml/sax/XAttributeList.hpp>
+
+#include <sal/log.hxx>
+#include <comphelper/processfactory.hxx>
+#include <comphelper/storagehelper.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmlimp.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmluconv.hxx>
+#include <xmloff/nmspmap.hxx>
+#include <sax/tools/converter.hxx>
+
+#include <rtl/ustrbuf.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
+
+using namespace css;
+using namespace css::xml::sax;
+using namespace css::uno;
+using namespace css::drawing;
+using namespace css::embed;
+using namespace css::frame;
+using namespace css::io;
+using namespace css::graphic;
+using namespace xmloff::token;
+
+QRCodeContext::QRCodeContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ const Reference<XAttributeList>& xAttrList,
+ const Reference<XShape>& rxShape)
+ : SvXMLImportContext(rImport, nPrfx, rLocalName)
+{
+ Reference<beans::XPropertySet> xPropSet(rxShape, UNO_QUERY_THROW);
+
+ css::drawing::QRCode aQRCode;
+ const sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0;
+
+ for (sal_Int16 i = 0; i < nAttrCount; i++)
+ {
+ OUString sAttrName = xAttrList->getNameByIndex(i);
+ OUString aLocalName;
+ sal_uInt16 nPrefix = GetImport().GetNamespaceMap().GetKeyByAttrName(sAttrName, &aLocalName);
+ OUString sValue = xAttrList->getValueByIndex(i);
+
+ switch (nPrefix)
+ {
+ case XML_NAMESPACE_LO_EXT:
+ if (IsXMLToken(aLocalName, XML_QRCODE_ERROR_CORRECTION))
+ {
+ OUString aErrorCorrValue = sValue;
+
+ if (aErrorCorrValue == "low")
+ aQRCode.ErrorCorrection = css::drawing::QRCodeErrorCorrection::LOW;
+ else if (aErrorCorrValue == "medium")
+ aQRCode.ErrorCorrection = css::drawing::QRCodeErrorCorrection::MEDIUM;
+ else if (aErrorCorrValue == "quartile")
+ aQRCode.ErrorCorrection = css::drawing::QRCodeErrorCorrection::QUARTILE;
+ else
+ aQRCode.ErrorCorrection = css::drawing::QRCodeErrorCorrection::HIGH;
+ }
+
+ if (IsXMLToken(aLocalName, XML_QRCODE_BORDER))
+ {
+ sax::Converter::convertNumber(aQRCode.Border, sValue, 0);
+ }
+ break;
+
+ case XML_NAMESPACE_OFFICE:
+ if (IsXMLToken(aLocalName, XML_STRING_VALUE))
+ {
+ aQRCode.Payload = sValue;
+ }
+ }
+ }
+ xPropSet->setPropertyValue("QRCodeProperties", Any(aQRCode));
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/xmloff/source/draw/QRCodeContext.hxx b/xmloff/source/draw/QRCodeContext.hxx
new file mode 100644
index 000000000000..74709bab40f8
--- /dev/null
+++ b/xmloff/source/draw/QRCodeContext.hxx
@@ -0,0 +1,26 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#pragma once
+
+#include <com/sun/star/drawing/XShape.hpp>
+#include <xmloff/xmlictxt.hxx>
+
+// Used to import QR code properties from a QR code in ODF document
+// @see ximpshap
+
+class QRCodeContext : public SvXMLImportContext
+{
+public:
+ QRCodeContext(SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLocalName,
+ const css::uno::Reference<css::xml::sax::XAttributeList>& xAttrList,
+ const css::uno::Reference<css::drawing::XShape>& rxShape);
+};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx
index 4de9defd61be..e6728b798ecc 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -64,6 +64,8 @@
#include <com/sun/star/drawing/XControlShape.hpp>
#include <com/sun/star/drawing/XCustomShapeEngine.hpp>
#include <com/sun/star/drawing/XGluePointsSupplier.hpp>
+#include <com/sun/star/drawing/QRCode.hpp>
+#include <com/sun/star/drawing/QRCodeErrorCorrection.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
@@ -91,6 +93,8 @@
#include <rtl/math.hxx>
#include <rtl/ustrbuf.hxx>
+#include <rtl/strbuf.hxx>
+#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <sax/tools/converter.hxx>
@@ -1285,6 +1289,40 @@ void XMLShapeExport::ImpExportSignatureLine(const uno::Reference<drawing::XShape
true);
}
+void XMLShapeExport::ImpExportQRCode(const uno::Reference<drawing::XShape>& xShape)
+{
+ uno::Reference<beans::XPropertySet> xPropSet(xShape, uno::UNO_QUERY);
+
+ uno::Any aAny = xPropSet->getPropertyValue("QRCodeProperties");
+
+ css::drawing::QRCode aQRCode;
+ if(aAny >>= aQRCode)
+ {
+ mrExport.AddAttribute(XML_NAMESPACE_OFFICE, XML_STRING_VALUE, aQRCode.Payload);
+ /* Export QR Code as per customised schema, @see OpenDocument-schema-v1.3+libreoffice */
+ OUString temp;
+ switch(aQRCode.ErrorCorrection){
+ case css::drawing::QRCodeErrorCorrection::LOW :
+ temp = "low";
+ break;
+ case css::drawing::QRCodeErrorCorrection::MEDIUM:
+ temp = "medium";
+ break;
+ case css::drawing::QRCodeErrorCorrection::QUARTILE:
+ temp = "quartile";
+ break;
+ case css::drawing::QRCodeErrorCorrection::HIGH:
+ temp = "high";
+ break;
+ }
+ mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_QRCODE_ERROR_CORRECTION, temp);
+ mrExport.AddAttribute(XML_NAMESPACE_LO_EXT, XML_QRCODE_BORDER, OUStringBuffer(20).append(aQRCode.Border).makeStringAndClear());
+
+ SvXMLElementExport aQRCodeElement(mrExport, XML_NAMESPACE_LO_EXT, XML_QRCODE, true,
+ true);
+ }
+}
+
void XMLShapeExport::ExportGraphicDefaults()
{
rtl::Reference<XMLStyleExport> aStEx(new XMLStyleExport(mrExport, mrExport.GetAutoStylePool().get()));
@@ -2443,9 +2481,12 @@ void XMLShapeExport::ImpExportGraphicObjectShape(
GetExport().GetImageMapExport().Export( xPropSet );
ImpExportDescription( xShape ); // #i68101#
- // Signature Line - needs to be after the images!
+ // Signature Line, QR Code - needs to be after the images!
if (GetExport().getDefaultVersion() > SvtSaveOptions::ODFVER_012)
+ {
ImpExportSignatureLine(xShape);
+ ImpExportQRCode(xShape);
+ }
}
void XMLShapeExport::ImpExportChartShape(
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index 56efcdb64b2d..ec3c06ad1db2 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -73,6 +73,7 @@
#include "eventimp.hxx"
#include "descriptionimp.hxx"
#include "SignatureLineContext.hxx"
+#include "QRCodeContext.hxx"
#include "ximpcustomshape.hxx"
#include <XMLEmbeddedObjectImportContext.hxx>
#include <xmloff/xmlerror.hxx>
@@ -191,6 +192,10 @@ SvXMLImportContextRef SdXMLShapeContext::CreateChildContext( sal_uInt16 p_nPrefi
{
xContext = new SignatureLineContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape );
}
+ else if( p_nPrefix == XML_NAMESPACE_LO_EXT && IsXMLToken( rLocalName, XML_QRCODE ) )
+ {
+ xContext = new QRCodeContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape );
+ }
else if( p_nPrefix == XML_NAMESPACE_OFFICE && IsXMLToken( rLocalName, XML_EVENT_LISTENERS ) )
{
xContext = new SdXMLEventsContext( GetImport(), p_nPrefix, rLocalName, xAttrList, mxShape );
@@ -3522,6 +3527,19 @@ SvXMLImportContextRef SdXMLFrameShapeContext::CreateChildContext( sal_uInt16 nPr
}
}
}
+ else if ((XML_NAMESPACE_LO_EXT == nPrefix) && IsXMLToken(rLocalName, XML_QRCODE))
+ {
+ SdXMLShapeContext* pSContext = dynamic_cast<SdXMLShapeContext*>(mxImplContext.get());
+ if (pSContext)
+ {
+ uno::Reference<beans::XPropertySet> xPropSet(pSContext->getShape(), uno::UNO_QUERY);
+ if (xPropSet.is())
+ {
+ xContext = new QRCodeContext(GetImport(), nPrefix, rLocalName, xAttrList,
+ pSContext->getShape());
+ }
+ }
+ }
// call parent for content
if (!xContext)
xContext = SvXMLImportContext::CreateChildContext( nPrefix, rLocalName, xAttrList );
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx b/xmloff/source/text/XMLTextFrameContext.cxx
index 64704cd9fbc6..3755b3845c03 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -1670,6 +1670,15 @@ SvXMLImportContextRef XMLTextFrameContext::CreateChildContext(
}
xContext = m_xImplContext->CreateChildContext(p_nPrefix, rLocalName, xAttrList);
}
+ else if (p_nPrefix == XML_NAMESPACE_LO_EXT && (IsXMLToken(rLocalName, XML_QRCODE)))
+ {
+ if (getSupportsMultipleContents())
+ { // tdf#103567 ensure props are set on surviving shape
+ // note: no more draw:image can be added once we get here
+ m_xImplContext = solveMultipleImages();
+ }
+ xContext = m_xImplContext->CreateChildContext(p_nPrefix, rLocalName, xAttrList);
+ }
else
{
// the child is a drawing shape
diff --git a/xmloff/source/token/tokens.txt b/xmloff/source/token/tokens.txt
index 82b64bc85642..dbd6f59945b9 100644
--- a/xmloff/source/token/tokens.txt
+++ b/xmloff/source/token/tokens.txt
@@ -1421,6 +1421,9 @@ publisher
punctuation-wrap
purple
pyramid
+qrcode
+qrcode-border
+qrcode-errorcorrection
quarter
query-name
quo-vadis
More information about the Libreoffice-commits
mailing list