sc/qa/unit/data/functions/spreadsheet/fods/match.fods | 280 +++++++++++++++---
sc/source/core/tool/interpr1.cxx | 79 ++---
2 files changed, 279 insertions(+), 80 deletions(-)
New commits:
commit 9e051f75d5ab01d8255734f468e0e63ed6776852
Author: Balazs Varga <balazs.va...@collabora.com>
AuthorDate: Mon Jul 7 16:43:50 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Jul 11 07:23:36 2025 +0200
tdf#167171 - fix MATCH function wrong result with inline arrays
Better to use the original algorithm for searching in inline arrays.
Regression from: f7039822c7ad3987326e1c20ea4a745c158f9682
Change-Id: I4a80b7abda96006c16b3fd316225e8e24ace8c09
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187492
Tested-by: Jenkins
Reviewed-by: Balazs Varga <balazs.va...@collabora.com>
(cherry picked from commit aa4b18b720746038206152689ef31231d474b8a4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187563
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187564
(cherry picked from commit 711ff1b95af0ea2f60f48b3bb4e78b9175d3d732)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187568
Tested-by: Michael Weghorn <m.wegh...@posteo.de>
Reviewed-by: Ilmari Lauhakangas <ilmari.lauhakan...@libreoffice.org>
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/match.fods
b/sc/qa/unit/data/functions/spreadsheet/fods/match.fods
index b84a0eb7a5b0..394a33e64172 100644
--- a/sc/qa/unit/data/functions/spreadsheet/fods/match.fods
+++ b/sc/qa/unit/data/functions/spreadsheet/fods/match.fods
@@ -1,7 +1,7 @@
<?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"
office:version="1.3"
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
-
<office:meta><dc:date>2024-07-09T15:16:27.878000000</dc:date><meta:editing-duration>PT10M48S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOfficeDev/25.2.0.0.alpha0$Windows_X86_64
LibreOffice_project/4b734a0c977871bcc0386e054e5df95eb9477d60</meta:generator><meta:document-statistic
meta:table-count="2" meta:cell-count="731"
meta:object-count="0"/></office:meta>
+<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"
office:version="1.4"
office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
+
<office:meta><dc:date>2025-07-07T15:40:27.305523200</dc:date><meta:editing-duration>PT20M40S</meta:editing-duration><meta:editing-cycles>3</meta:editing-cycles><meta:generator>LibreOfficeDev/26.2.0.0.alpha0$Windows_X86_64
LibreOffice_project/248b8583f859c7af6bfa8247d7ccd2dfb9080927</meta:generator><meta:document-statistic
meta:table-count="2" meta:cell-count="768"
meta:object-count="0"/></office:meta>
<office:settings>
<config:config-item-set config:name="ooo:view-settings">
<config:config-item config:name="VisibleAreaTop"
config:type="int">0</config:config-item>
@@ -30,8 +30,8 @@
<config:config-item config:name="IgnoreBreakAfterMultilineField"
config:type="boolean">false</config:config-item>
</config:config-item-map-entry>
<config:config-item-map-entry config:name="Sheet2">
- <config:config-item config:name="CursorPositionX"
config:type="int">2</config:config-item>
- <config:config-item config:name="CursorPositionY"
config:type="int">139</config:config-item>
+ <config:config-item config:name="CursorPositionX"
config:type="int">4</config:config-item>
+ <config:config-item config:name="CursorPositionY"
config:type="int">151</config:config-item>
<config:config-item config:name="ActiveSplitRange"
config:type="short">2</config:config-item>
<config:config-item config:name="PositionLeft"
config:type="int">0</config:config-item>
<config:config-item config:name="PositionRight"
config:type="int">0</config:config-item>
@@ -48,7 +48,7 @@
</config:config-item-map-entry>
</config:config-item-map-named>
<config:config-item config:name="ActiveTable"
config:type="string">Sheet1</config:config-item>
- <config:config-item config:name="HorizontalScrollbarWidth"
config:type="int">2495</config:config-item>
+ <config:config-item config:name="HorizontalScrollbarWidth"
config:type="int">701</config:config-item>
<config:config-item config:name="ZoomType"
config:type="short">0</config:config-item>
<config:config-item config:name="ZoomValue"
config:type="int">100</config:config-item>
<config:config-item config:name="PageViewZoomValue"
config:type="int">60</config:config-item>
@@ -59,7 +59,7 @@
<config:config-item config:name="ShowFormulasMarks"
config:type="boolean">false</config:config-item>
<config:config-item config:name="ShowGrid"
config:type="boolean">true</config:config-item>
<config:config-item config:name="GridColor"
config:type="int">12632256</config:config-item>
- <config:config-item config:name="FormulaBarHeight"
config:type="short">1</config:config-item>
+ <config:config-item config:name="ShowPageBreaks"
config:type="boolean">true</config:config-item>
<config:config-item config:name="HasColumnRowHeaders"
config:type="boolean">true</config:config-item>
<config:config-item config:name="HasSheetTabs"
config:type="boolean">true</config:config-item>
<config:config-item config:name="IsOutlineSymbolsSet"
config:type="boolean">true</config:config-item>
@@ -71,6 +71,7 @@
<config:config-item config:name="RasterSubdivisionX"
config:type="int">1</config:config-item>
<config:config-item config:name="RasterSubdivisionY"
config:type="int">1</config:config-item>
<config:config-item config:name="IsRasterAxisSynchronized"
config:type="boolean">true</config:config-item>
+ <config:config-item config:name="FormulaBarHeight"
config:type="short">1</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>
@@ -101,7 +102,7 @@
<config:config-item config:name="LoadReadonly"
config:type="boolean">false</config:config-item>
<config:config-item config:name="PrinterName"
config:type="string">Microsoft Print to PDF</config:config-item>
<config:config-item config:name="PrinterPaperFromSetup"
config:type="boolean">false</config:config-item>
- <config:config-item config:name="PrinterSetup"
config:type="base64Binary">ZBb+/01pY3Jvc29mdCBQcmludCB0byBQREYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATWljcm9zb2Z0IFByaW50IFRvIFBERgAAAAAAAAAAAAAWAAEANhUAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAE0AaQBjAHIAbwBzAG8AZgB0ACAAUAByAGkAbgB0ACAAdABvACAAUABEAEYAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAMG3ABQFAMvAQABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////0dJUzQAAAAAAAAAAAAAAABESU5VIgDIACQDLBE/XXt+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAUAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAyAAAAFNNVEoAAAAAEAC4AHsAMAA4ADQARgAwADEARgBBAC0ARQA2ADMANAAtADQARAA3ADcALQA4ADMARQBFAC0AMAA3ADQAOAAxADcAQwAwADMANQA4ADEAfQAAAFJFU0RMTABVbmlyZXNETEwAUGFwZXJTaXplAEE0AE9yaWVudGF0aW9uAFBPUlRSQUlUAFJlc29sdXRpb24AUmVzT3B0aW9uMQBDb2xvck1vZGUAQ29sb3IAAAAAAAAAAAAAAAAAAAAAAAAsEQAAVjRETQEAAAAAAAAAnApwIhwAAADsAAAAAwAAAPoBTwg05ndNg+4HSBfANYHQAAAATAAAAAMAAAAACAAAAAAAAAAAAAADAAAAAAgAACoAAAAACAAAAwAAAEAAAABWAAAAABAAAEQAbwBjAHUAbQBlAG4AdABVAHMAZQByAFAAYQBzAHMAdwBvAHIAZAAAAEQAbwBjAHUAbQBlAG4AdABPAHcAbgBlAHIAUABhAHMAcwB3AG8AcgBkAAAARABvAGMAdQBtAGUAbgB0AEMAcgB5AHAAdABTA
GUAYwB1AHIAaQB0AHkAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgBDT01QQVRfRFVQTEVYX01PREUTAER1cGxleE1vZGU6OlVua25vd24MAFBSSU5URVJfTkFNRRYATWljcm9zb2Z0IFByaW50IHRvIFBERgsARFJJVkVSX05BTUUWAE1pY3Jvc29mdCBQcmludCBUbyBQREY=</config:config-item>
+ <config:config-item config:name="PrinterSetup"
config:type="base64Binary">bBb+/01pY3Jvc29mdCBQcmludCB0byBQREYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATWljcm9zb2Z0IFByaW50IFRvIFBERgAAAAAAAAAAAAAWAAEAPhUAAAAAAAAEAAhSAAAEdAAAM1ROVwAAAAAKAE0AaQBjAHIAbwBzAG8AZgB0ACAAUAByAGkAbgB0ACAAdABvACAAUABEAEYAAAAAAAAAAAAAAAAAAAAAAAAAAAABBAMG3ABYFAMtAQABAAkAmgs0CGQAAQAPAFgCAgABAFgCAwABAEEANAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAQAAAAIAAAABAAAA/////0dJUzQAAAAAAAAAAAAAAABESU5VIgDQACwDLBHiXo1TAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAABkAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0AAAAFNNVEoAAAAAEADAAHsAMAA4ADQARgAwADEARgBBAC0ARQA2ADMANAAtADQARAA3ADcALQA4ADMARQBFAC0AMAA3ADQAOAAxADcAQwAwADMANQA4ADEAfQAAAFJFU0RMTABVbmlyZXNETEwAUGFwZXJTaXplAEE0AE9yaWVudGF0aW9uAFBPUlRSQUlUAFJlc29sdXRpb24AUmVzT3B0aW9uMQBDb2xvck1vZGUAQ29sb3IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACwRAABWNERNAQAAAAAAAACcCnAiHAAAAOwAAAADAAAA+gFPCDTmd02D7gdIF8A1gdAAAABMAAAAAwAAAAAIAAAAAAAAAAAAAAMAAAAACAAAKgAAAAAIAAADAAAAQAAAAFYAAAAAEAAARABvAGMAdQBtAGUAbgB0AFUAcwBlAHIAUABhAHMAcwB3AG8AcgBkAAAARABvAGMAdQBtAGUAbgB0AE8AdwBuAGUAcgBQAGEAcwBzAHcAbwByAGQAAABEAG8AYwB1AG0AZQBuAHQAQwByA
HkAcAB0AFMAZQBjAHUAcgBpAHQAeQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASAENPTVBBVF9EVVBMRVhfTU9ERRMARHVwbGV4TW9kZTo6VW5rbm93bgwAUFJJTlRFUl9OQU1FFgBNaWNyb3NvZnQgUHJpbnQgdG8gUERGCwBEUklWRVJfTkFNRRYATWljcm9zb2Z0IFByaW50IFRvIFBERg==</config:config-item>
<config:config-item config:name="RasterIsVisible"
config:type="boolean">false</config:config-item>
<config:config-item config:name="RasterResolutionX"
config:type="int">1000</config:config-item>
<config:config-item config:name="RasterResolutionY"
config:type="int">1000</config:config-item>
@@ -139,8 +140,8 @@
<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="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="Times New Roman" svg:font-family="'Times
New Roman'" style:font-family-generic="swiss" style:font-pitch="variable"/>
- <style:font-face style:name="Times New Roman1" svg:font-family="'Times
New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Times New Roman" svg:font-family="'Times
New Roman'" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="Times New Roman1" svg:font-family="'Times
New Roman'" style:font-family-generic="swiss" style:font-pitch="variable"/>
</office:font-face-decls>
<office:styles>
<style:default-style style:family="table-cell">
@@ -149,7 +150,7 @@
</style:default-style>
<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" style:writing-mode="page"/>
- <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:punctuation-wrap="simple" style:line-break="strict"
style:writing-mode="page" style:font-independent-line-spacing="false">
+ <style:paragraph-properties style:text-autospace="ideograph-alpha"
style:punctuation-wrap="simple" style:line-break="strict"
loext:tab-stop-distance="0cm" style:writing-mode="page"
style:font-independent-line-spacing="false">
<style:tab-stops/>
</style:paragraph-properties>
<style:text-properties style:use-window-font-color="true"
loext:opacity="0%" fo:font-family="'Liberation Serif'"
style:font-family-generic="roman" style:font-pitch="variable"
fo:font-size="12pt" fo:language="en" fo:country="US"
style:letter-kerning="true" style:font-family-asian="'Segoe UI'"
style:font-family-generic-asian="system" style:font-pitch-asian="variable"
style:font-size-asian="12pt" style:language-asian="zh" style:country-asian="CN"
style:font-family-complex="Tahoma" style:font-family-generic-complex="system"
style:font-pitch-complex="variable" style:font-size-complex="12pt"
style:language-complex="hi" style:country-complex="IN"/>
@@ -2466,12 +2467,12 @@
<style:style style:name="Normal_20_2" style:display-name="Normal 2"
style:family="table-cell" style:parent-style-name="Default"
style:data-style-name="N0">
<style:table-cell-properties style:glyph-orientation-vertical="0"
style:cell-protect="protected" style:print-content="true"
style:diagonal-bl-tr="none" style:diagonal-tl-br="none"
style:text-align-source="value-type" style:repeat-content="false"
fo:background-color="transparent" fo:wrap-option="no-wrap" fo:border="none"
style:direction="ltr" fo:padding="0.071cm" style:rotation-angle="0"
style:rotation-align="none" style:shrink-to-fit="false"
style:vertical-align="automatic" loext:vertical-justify="auto"/>
<style:paragraph-properties css3t:text-justify="auto" fo:margin-left="0cm"
style:writing-mode="page"/>
- <style:text-properties fo:color="#000000" style:text-outline="false"
style:text-line-through-style="none" style:text-line-through-type="none"
style:font-name="Times New Roman" fo:font-family="'Times New Roman'"
style:font-family-generic="swiss" style:font-pitch="variable"
fo:font-size="11pt" fo:font-style="normal" fo:text-shadow="none"
style:text-underline-style="none" fo:font-weight="normal"
style:font-size-asian="11pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Times New Roman"
style:font-family-complex="'Times New Roman'"
style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"
style:font-size-complex="11pt" style:font-style-complex="normal"
style:font-weight-complex="normal"/>
+ <style:text-properties fo:color="#000000" style:text-outline="false"
style:text-line-through-style="none" style:text-line-through-type="none"
style:font-name="Times New Roman1" fo:font-family="'Times New Roman'"
style:font-family-generic="swiss" style:font-pitch="variable"
fo:font-size="11pt" fo:font-style="normal" fo:text-shadow="none"
style:text-underline-style="none" fo:font-weight="normal"
style:font-size-asian="11pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Times New Roman1"
style:font-family-complex="'Times New Roman'"
style:font-family-generic-complex="swiss" style:font-pitch-complex="variable"
style:font-size-complex="11pt" style:font-style-complex="normal"
style:font-weight-complex="normal"/>
</style:style>
<style:style style:name="Normal_5f_Amortization_20_Schedule"
style:display-name="Normal_Amortization Schedule" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N0">
<style:table-cell-properties style:glyph-orientation-vertical="0"
style:cell-protect="protected" style:print-content="true"
style:diagonal-bl-tr="none" style:diagonal-tl-br="none"
style:text-align-source="value-type" style:repeat-content="false"
fo:background-color="transparent" fo:wrap-option="no-wrap" fo:border="none"
style:direction="ltr" fo:padding="0.071cm" style:rotation-angle="0"
style:rotation-align="none" style:shrink-to-fit="false"
style:vertical-align="automatic" loext:vertical-justify="auto"/>
<style:paragraph-properties css3t:text-justify="auto" fo:margin-left="0cm"
style:writing-mode="page"/>
- <style:text-properties style:use-window-font-color="true"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Times New Roman1"
fo:font-family="'Times New Roman'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="10pt" fo:font-style="normal"
fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal"
style:font-size-asian="10pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Times New Roman1"
style:font-family-complex="'Times New Roman'"
style:font-family-generic-complex="roman" style:font-pitch-complex="variable"
style:font-size-complex="10pt" style:font-style-complex="normal"
style:font-weight-complex="normal"/>
+ <style:text-properties style:use-window-font-color="true"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" style:font-name="Times New Roman"
fo:font-family="'Times New Roman'" style:font-family-generic="roman"
style:font-pitch="variable" fo:font-size="10pt" fo:font-style="normal"
fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal"
style:font-size-asian="10pt" style:font-style-asian="normal"
style:font-weight-asian="normal" style:font-name-complex="Times New Roman"
style:font-family-complex="'Times New Roman'"
style:font-family-generic-complex="roman" style:font-pitch-complex="variable"
style:font-size-complex="10pt" style:font-style-complex="normal"
style:font-weight-complex="normal"/>
</style:style>
<style:style style:name="Excel_5f_CondFormat_5f_1_5f_2_5f_1"
style:display-name="Excel_CondFormat_1_2_1" style:family="table-cell"
style:parent-style-name="Default">
<style:text-properties fo:color="#0000ff"/>
@@ -2562,6 +2563,9 @@
<style:style style:name="ta1" style:family="table"
style:master-page-name="Default">
<style:table-properties table:display="true" style:writing-mode="lr-tb"/>
</style:style>
+ <number:number-style style:name="N1">
+ <number:number number:decimal-places="0" number:min-decimal-places="0"
number:min-integer-digits="1"/>
+ </number:number-style>
<number:number-style style:name="N2">
<number:number number:decimal-places="2" number:min-decimal-places="2"
number:min-integer-digits="1"/>
</number:number-style>
@@ -2595,7 +2599,6 @@
<number:boolean-style style:name="N99">
<number:boolean/>
</number:boolean-style>
- <style:style style:name="ce1" style:family="table-cell"
style:parent-style-name="Default"/>
<style:style style:name="ce2" style:family="table-cell"
style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
<style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
@@ -2633,6 +2636,44 @@
<style:table-cell-properties fo:wrap-option="wrap"/>
<style:text-properties style:use-window-font-color="true"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" fo:font-size="10pt" fo:language="en"
fo:country="US" fo:font-style="normal" fo:text-shadow="none"
style:text-underline-style="none" fo:font-weight="normal"
style:text-underline-mode="continuous" style:text-overline-mode="continuous"
style:text-line-through-mode="continuous" style:font-size-asian="10pt"
style:language-asian="zh" style:country-asian="CN"
style:font-style-asian="normal" style:font-weight-asian="normal"
style:font-size-complex="10pt" style:language-complex="hi"
style:country-complex="IN" 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="ce19" style:family="table-cell"
style:parent-style-name="Default"/>
+ <style:style style:name="ce26" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="start" fo:margin-left="0cm"/>
+ <style:text-properties fo:font-size="20pt" fo:font-weight="bold"
style:font-size-asian="20pt" style:font-weight-asian="bold"
style:font-size-complex="20pt" style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="ce45" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
+ <style:text-properties fo:font-size="14pt" fo:font-weight="bold"
style:font-size-asian="14pt" style:font-weight-asian="bold"
style:font-size-complex="14pt" style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="ce46" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
+ <style:text-properties fo:font-size="12pt" fo:font-weight="bold"
style:font-size-asian="12pt" style:font-weight-asian="bold"
style:font-size-complex="12pt" style:font-weight-complex="bold"/>
+ </style:style>
+ <style:style style:name="ce47" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
+ </style:style>
+ <style:style style:name="ce50" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N99">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
+ <style:map style:condition="cell-content()="""
style:apply-style-name="Default" style:base-cell-address="Sheet1.B8"/>
+ <style:map style:condition="cell-content()=0"
style:apply-style-name="Untitled1" style:base-cell-address="Sheet1.B8"/>
+ <style:map style:condition="cell-content()=1"
style:apply-style-name="Untitled2" style:base-cell-address="Sheet1.B8"/>
+ </style:style>
+ <style:style style:name="ce51" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
+ <style:map style:condition="cell-content()="""
style:apply-style-name="Default" style:base-cell-address="Sheet1.B8"/>
+ <style:map style:condition="cell-content()=0"
style:apply-style-name="Untitled1" style:base-cell-address="Sheet1.B8"/>
+ <style:map style:condition="cell-content()=1"
style:apply-style-name="Untitled2" style:base-cell-address="Sheet1.B8"/>
+ </style:style>
+ <style:style style:name="ce52" style:family="table-cell"
style:parent-style-name="Default">
+ <style:table-cell-properties fo:wrap-option="wrap"/>
+ <style:text-properties style:use-window-font-color="true"
style:text-outline="false" style:text-line-through-style="none"
style:text-line-through-type="none" fo:font-size="10pt" fo:language="en"
fo:country="US" fo:font-style="normal" fo:text-shadow="none"
style:text-underline-style="none" fo:font-weight="normal"
style:text-underline-mode="continuous" style:text-overline-mode="continuous"
style:text-line-through-mode="continuous" style:font-size-asian="10pt"
style:language-asian="zh" style:country-asian="CN"
style:font-style-asian="normal" style:font-weight-asian="normal"
style:font-size-complex="10pt" style:language-complex="hi"
style:country-complex="IN" 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="ce10" style:family="table-cell"
style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
<style:paragraph-properties fo:text-align="center" fo:margin-left="0cm"/>
@@ -2642,6 +2683,7 @@
<style:table-cell-properties style:diagonal-bl-tr="none"
style:diagonal-tl-br="none" fo:border="none" fo:padding="0.071cm"
style:rotation-align="none"/>
</style:style>
<style:style style:name="ce13" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N191"/>
+ <style:style style:name="ce56" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N1"/>
<style:style style:name="ce14" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N11"/>
<style:style style:name="ce48" style:family="table-cell"
style:parent-style-name="Default" style:data-style-name="N99">
<style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false"/>
@@ -2675,7 +2717,7 @@
<style:table-cell-properties fo:wrap-option="wrap"/>
<style:text-properties fo:font-weight="bold" style:font-weight-asian="bold"
style:font-weight-complex="bold"/>
</style:style>
- <style:style style:name="ce56" style:family="table-cell"
style:parent-style-name="Default">
+ <style:style style:name="ce66" style:family="table-cell"
style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix"
style:repeat-content="false" style:vertical-align="middle"/>
<style:paragraph-properties fo:text-align="center"/>
</style:style>
@@ -2802,7 +2844,7 @@
<text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p>
</style:region-left>
<style:region-right>
- <text:p><text:date style:data-style-name="N2"
text:date-value="2024-07-09">0000.00.00</text:date>, <text:time
style:data-style-name="N2"
text:time-value="15:05:38.920000000">00:00:00</text:time></text:p>
+ <text:p><text:date style:data-style-name="N2"
text:date-value="2025-07-07">0000.00.00</text:date>, <text:time
style:data-style-name="N2"
text:time-value="15:30:34.682787400">00:00:00</text:time></text:p>
</style:region-right>
</style:header>
<style:header-left style:display="false"/>
@@ -2836,10 +2878,10 @@
<table:table table:name="Sheet1" table:style-name="ta1">
<office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
<table:table-column table:style-name="co1"
table:default-cell-style-name="Default"/>
- <table:table-column table:style-name="co1"
table:default-cell-style-name="ce5"/>
+ <table:table-column table:style-name="co1"
table:default-cell-style-name="ce47"/>
<table:table-column table:style-name="co2"
table:default-cell-style-name="Default"/>
<table:table-row table:style-name="ro1">
- <table:table-cell table:style-name="ce2" office:value-type="string"
calcext:value-type="string">
+ <table:table-cell table:style-name="ce26" office:value-type="string"
calcext:value-type="string">
<text:p>MATCH Function</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
@@ -2848,10 +2890,10 @@
<table:table-cell table:number-columns-repeated="3"/>
</table:table-row>
<table:table-row table:style-name="ro3">
- <table:table-cell table:style-name="ce3" office:value-type="string"
calcext:value-type="string">
+ <table:table-cell table:style-name="ce45" office:value-type="string"
calcext:value-type="string">
<text:p>Result</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce6"
table:formula="of:=AND([.B8:.B95])" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce50"
table:formula="of:=AND([.B8:.B95])" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
<text:p>IGAZ</text:p>
</table:table-cell>
<table:table-cell/>
@@ -2860,13 +2902,13 @@
<table:table-cell table:number-columns-repeated="3"/>
</table:table-row>
<table:table-row table:style-name="ro4">
- <table:table-cell table:style-name="ce4" office:value-type="string"
calcext:value-type="string">
+ <table:table-cell table:style-name="ce46" office:value-type="string"
calcext:value-type="string">
<text:p>Sheet</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce4" office:value-type="string"
calcext:value-type="string">
+ <table:table-cell table:style-name="ce46" office:value-type="string"
calcext:value-type="string">
<text:p>Result</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce4" office:value-type="string"
calcext:value-type="string">
+ <table:table-cell table:style-name="ce46" office:value-type="string"
calcext:value-type="string">
<text:p>Description</text:p>
</table:table-cell>
</table:table-row>
@@ -2874,7 +2916,7 @@
<table:table-cell office:value-type="float" office:value="1"
calcext:value-type="float">
<text:p>1</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce6"
table:formula="of:=AND([Sheet2.C2:.C349])" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce50"
table:formula="of:=AND([Sheet2.C2:.C349])" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
<text:p>IGAZ</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
@@ -2883,17 +2925,17 @@
</table:table-row>
<table:table-row table:style-name="ro2" table:number-rows-repeated="3">
<table:table-cell/>
- <table:table-cell table:style-name="ce8"/>
+ <table:table-cell table:style-name="ce51"/>
<table:table-cell/>
</table:table-row>
<table:table-row table:style-name="ro2">
<table:table-cell/>
- <table:table-cell table:style-name="ce8"/>
- <table:table-cell table:style-name="ce9"/>
+ <table:table-cell table:style-name="ce51"/>
+ <table:table-cell table:style-name="ce52"/>
</table:table-row>
<table:table-row table:style-name="ro2" table:number-rows-repeated="26">
<table:table-cell/>
- <table:table-cell table:style-name="ce8"/>
+ <table:table-cell table:style-name="ce51"/>
<table:table-cell/>
</table:table-row>
<table:table-row table:style-name="ro5"
table:number-rows-repeated="1048537">
@@ -2914,7 +2956,7 @@
<office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
<table:table-column table:style-name="co4"
table:default-cell-style-name="Default"/>
<table:table-column table:style-name="co5"
table:default-cell-style-name="Default"/>
- <table:table-column table:style-name="co6"
table:default-cell-style-name="ce5"/>
+ <table:table-column table:style-name="co6"
table:default-cell-style-name="ce47"/>
<table:table-column table:style-name="co7"
table:default-cell-style-name="Default"/>
<table:table-column table:style-name="co4"
table:default-cell-style-name="Default"/>
<table:table-column table:style-name="co8"
table:default-cell-style-name="Default"/>
@@ -3941,12 +3983,12 @@
<text:p>=MATCH(J29;J29:J37;0)</text:p>
</table:table-cell>
<table:table-cell/>
- <table:table-cell table:style-name="ce56" office:value-type="string"
calcext:value-type="string" table:number-columns-spanned="3"
table:number-rows-spanned="1">
+ <table:table-cell table:style-name="ce66" office:value-type="string"
calcext:value-type="string" table:number-columns-spanned="3"
table:number-rows-spanned="1">
<text:p>With Strings</text:p>
</table:table-cell>
<table:covered-table-cell table:number-columns-repeated="2"/>
<table:table-cell/>
- <table:table-cell table:style-name="ce56" office:value-type="string"
calcext:value-type="string" table:number-columns-spanned="3"
table:number-rows-spanned="1">
+ <table:table-cell table:style-name="ce66" office:value-type="string"
calcext:value-type="string" table:number-columns-spanned="3"
table:number-rows-spanned="1">
<text:p>With numbers</text:p>
</table:table-cell>
<table:covered-table-cell table:number-columns-repeated="2"/>
@@ -3973,9 +4015,9 @@
<text:p>=MATCH(J30;J29:J37;0)</text:p>
</table:table-cell>
<table:table-cell/>
- <table:table-cell table:style-name="ce56"/>
+ <table:table-cell table:style-name="ce66"/>
<table:table-cell table:number-columns-repeated="3"/>
- <table:table-cell table:style-name="ce56"/>
+ <table:table-cell table:style-name="ce66"/>
<table:table-cell table:number-columns-repeated="3"/>
<table:table-cell table:style-name="ce36"
table:number-columns-repeated="5"/>
<table:table-cell table:number-columns-repeated="4"/>
@@ -4002,7 +4044,7 @@
<table:table-cell table:style-name="ce27" office:value-type="string"
calcext:value-type="string" table:number-columns-spanned="2"
table:number-rows-spanned="1">
<text:p>match_type</text:p>
</table:table-cell>
- <table:covered-table-cell table:style-name="ce5"/>
+ <table:covered-table-cell table:style-name="ce47"/>
<table:table-cell table:number-columns-repeated="6"/>
<table:table-cell table:style-name="ce38"
table:number-columns-repeated="4"/>
<table:table-cell table:number-columns-repeated="4"/>
@@ -4029,10 +4071,10 @@
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Other test</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce5" office:value-type="float"
office:value="0" calcext:value-type="float">
+ <table:table-cell table:style-name="ce47" office:value-type="float"
office:value="0" calcext:value-type="float">
<text:p>0</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce5" office:value-type="float"
office:value="1" calcext:value-type="float">
+ <table:table-cell table:style-name="ce47" office:value-type="float"
office:value="1" calcext:value-type="float">
<text:p>1</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="14"/>
@@ -6159,7 +6201,171 @@
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:number-columns-repeated="16"/>
</table:table-row>
- <table:table-row table:style-name="ro2" table:number-rows-repeated="85">
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce13"
table:number-columns-repeated="2"/>
+ <table:table-cell table:style-name="ce48"/>
+ <table:table-cell/>
+ <table:table-cell office:value-type="string" calcext:value-type="string">
+ <text:p>Tdf#167171</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="5"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce13"
table:formula="of:=MATCH(90;{100;110;120};1)" office:value-type="string"
office:string-value="" calcext:value-type="error">
+ <text:p>#N/A</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce13" table:formula="of:#N/A"
office:value-type="string" office:string-value="" calcext:value-type="error">
+ <text:p>#N/A</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=ISERROR([.A152])" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A152])"
office:value-type="string" office:string-value="=MATCH(90;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(90;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56"
table:formula="of:=MATCH(100;{100;110;120};1)" office:value-type="float"
office:value="1" calcext:value-type="float">
+ <text:p>1</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="1" calcext:value-type="float">
+ <text:p>1</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A153]=[.B153]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A153])"
office:value-type="string" office:string-value="=MATCH(100;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(100;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56"
table:formula="of:=MATCH(110;{100;110;120};1)" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A154]=[.B154]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A154])"
office:value-type="string" office:string-value="=MATCH(110;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(110;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56"
table:formula="of:=MATCH(115;{100;110;120};1)" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A155]=[.B155]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A155])"
office:value-type="string" office:string-value="=MATCH(115;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(115;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56"
table:formula="of:=MATCH(120;{100;110;120};1)" office:value-type="float"
office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A156]=[.B156]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A156])"
office:value-type="string" office:string-value="=MATCH(120;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(120;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56"
table:formula="of:=MATCH(130;{100;110;120};1)" office:value-type="float"
office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A157]=[.B157]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A157])"
office:value-type="string" office:string-value="=MATCH(130;{100.110.120};1)"
calcext:value-type="string">
+ <text:p>=MATCH(130;{100.110.120};1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56" table:formula="of:=MATCH(2;
{1.2}; 1)" office:value-type="float" office:value="1"
calcext:value-type="float">
+ <text:p>1</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="1" calcext:value-type="float">
+ <text:p>1</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A158]=[.B158]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A158])"
office:value-type="string" office:string-value="=MATCH(2; {1,2}; 1)"
calcext:value-type="string">
+ <text:p>=MATCH(2; {1,2}; 1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56" table:formula="of:=MATCH(2;
{1;2}; 1)" office:value-type="float" office:value="2"
calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A159]=[.B159]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A159])"
office:value-type="string" office:string-value="=MATCH(2; {1.2}; 1)"
calcext:value-type="string">
+ <text:p>=MATCH(2; {1.2}; 1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce56" table:formula="of:=MATCH(2;
{1|2}; 1)" office:value-type="float" office:value="2"
calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce56" office:value-type="float"
office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce48"
table:formula="of:=[.A160]=[.B160]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>IGAZ</text:p>
+ </table:table-cell>
+ <table:table-cell table:formula="of:=FORMULA([.A160])"
office:value-type="string" office:string-value="=MATCH(2; {1;2}; 1)"
calcext:value-type="string">
+ <text:p>=MATCH(2; {1;2}; 1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:number-columns-repeated="16"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2" table:number-rows-repeated="75">
<table:table-cell table:style-name="ce13"
table:number-columns-repeated="2"/>
<table:table-cell table:style-name="ce48"/>
<table:table-cell table:number-columns-repeated="7"/>
@@ -6212,7 +6418,7 @@
</table:table-row>
<table:table-row>
<table:table-cell table:number-columns-repeated="7"/>
- <table:table-cell table:style-name="ce1" office:value-type="float"
office:value="4">
+ <table:table-cell table:style-name="ce19" office:value-type="float"
office:value="4">
<text:p>4</text:p>
</table:table-cell>
</table:table-row>
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index dcf767a69c5e..3d6e6281316a 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -11784,61 +11784,54 @@ bool ScInterpreter::SearchMatrixForValue(
VectorSearchArguments& vsa, ScQueryPar
case searchbdesc:
{
// binary search for non-equality mode (the source data is
sorted)
- bool bAscOrder = ( vsa.eSearchMode == searchbasc );
- SCSIZE nFirst = 0;
- SCSIZE nLast = nMatCount - 1;
- for ( SCSIZE nLen = nLast - nFirst; nLen > 0; nLen = nLast -
nFirst )
- {
- SCSIZE nMid = nFirst + nLen / 2;
- sal_Int32 nCmp = lcl_CompareMatrix2Query( nMid, aMatAcc,
rParam, rEntry, bMatchWholeCell );
- if ( nCmp == 0 )
+ bool bAscOrder = (rEntry.eOp == SC_LESS_EQUAL);
+ SCSIZE nFirst = 0, nLast = nMatCount-1, nHitIndex = 0;
+ for (SCSIZE nLen = nLast-nFirst; nLen > 0; nLen = nLast-nFirst)
+ {
+ SCSIZE nMid = nFirst + nLen/2;
+ sal_Int32 nCmp = lcl_CompareMatrix2Query( nMid, aMatAcc,
rParam, rEntry, bMatchWholeCell);
+ if (nCmp == 0)
{
// exact match. find the last item with the same
value.
lcl_GetLastMatch( nMid, aMatAcc, nMatCount);
- vsa.nHitIndex = nMid + 1;
- break;
+ vsa.nHitIndex = nMid+1;
+ return true;
}
-
- if ( nLen == 1 ) // first and last items are next to each
other.
+ if (nLen == 1) // first and last items are next to each
other.
{
- if ( bAscOrder && vsa.eMatchMode == exactorS )
- vsa.nHitIndex = ( nCmp > 0 ? nFirst : nLast );
- else if ( !bAscOrder && vsa.eMatchMode == exactorG )
- vsa.nHitIndex = ( nCmp < 0 ? nFirst : nLast );
+ if (nCmp < 0)
+ nHitIndex = bAscOrder ? nLast : nFirst;
+ else
+ nHitIndex = bAscOrder ? nFirst : nLast;
break;
}
+ if (nCmp < 0)
+ {
+ if (bAscOrder)
+ nFirst = nMid;
+ else
+ nLast = nMid;
+ }
else
{
- if ( nCmp < 0 )
- {
- if ( bAscOrder )
- nFirst = nMid;
- else
- nLast = nMid;
- }
+ if (bAscOrder)
+ nLast = nMid;
else
- {
- if ( bAscOrder )
- nLast = nMid;
- else
- nFirst = nMid;
- }
-
- if ( vsa.nHitIndex == nMatCount - 1 ) // last item
- {
- nCmp = lcl_CompareMatrix2Query( vsa.nHitIndex,
aMatAcc, rParam, rEntry, bMatchWholeCell );
- if ( ( vsa.eMatchMode == exactorS && nCmp <= 0 ) ||
- ( vsa.eMatchMode == exactorG && nCmp >= 0 ) )
- {
- // either the last item is an exact match or
the real
- // hit is beyond the last item.
- vsa.nHitIndex++;
- }
- else
- vsa.nHitIndex = 0;
- }
+ nFirst = nMid;
+ }
+ }
+ if (nHitIndex == nMatCount-1) // last item
+ {
+ sal_Int32 nCmp = lcl_CompareMatrix2Query( nHitIndex,
aMatAcc, rParam, rEntry, bMatchWholeCell);
+ if ((bAscOrder && nCmp <= 0) || (!bAscOrder && nCmp >= 0))
+ {
+ // either the last item is an exact match or the real
+ // hit is beyond the last item.
+ vsa.nHitIndex = nHitIndex+1;
+ return true;
}
}
+ vsa.nHitIndex = nHitIndex;
}
break;
