diff options
| author | Bernhard Widl <bernhard.widl@cib.de> | 2017-04-06 18:17:25 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2017-04-10 23:56:50 +0200 |
| commit | 78dfedec7a7ba289691a5d18441796541f3b1812 (patch) | |
| tree | 37e8721d56415fa4abde6db56c0d37bfc39ce53f | |
| parent | 13b70bc6f18f8dd910e373694de5a6a0cd3eb559 (diff) | |
tdf#105044 match empty cells on "<> not-empty" comparisons
this affects any formula using <> over a range of cells
(not only SUMIF and SUMIFS)
Change-Id: I85a3c3762d72de3250def0f037a0afd96c48f35d
Reviewed-on: https://gerrit.libreoffice.org/36224
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | sc/qa/unit/data/functions/mathematical/fods/sumif.fods | 751 | ||||
| -rw-r--r-- | sc/source/core/tool/queryparam.cxx | 11 |
2 files changed, 385 insertions, 377 deletions
diff --git a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods index 4bb3516dfb71..7edd2a4b7b23 100644 --- a/sc/qa/unit/data/functions/mathematical/fods/sumif.fods +++ b/sc/qa/unit/data/functions/mathematical/fods/sumif.fods @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2016-06-25T07:16:38.437590147</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/d2e4753c3f511cfc6b2932ce60d0bc2e09296f9f</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="208" meta:object-count="0"/></office:meta> + <office:meta><meta:creation-date>2016-06-25T07:16:38.437590147</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/709f49bce86d2df4154d8075818f57cacfecb401</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="264" 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> <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item> - <config:config-item config:name="VisibleAreaWidth" config:type="int">58001</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">13638</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">22009</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">4261</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> @@ -31,8 +31,8 @@ <config:config-item config:name="AnchoredTextOverflowLegacy" 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">3</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">30</config:config-item> <config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item> <config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item> @@ -50,7 +50,7 @@ </config:config-item-map-entry> </config:config-item-map-named> <config:config-item config:name="ActiveTable" config:type="string">Sheet2</config:config-item> - <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1241</config:config-item> + <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1048</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">80</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -91,10 +91,12 @@ <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowZeroValues" 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="GridColor" config:type="long">12632256</config:config-item> <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Lexmark-E352dn</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">en</config:config-item> @@ -104,14 +106,12 @@ <config:config-item config:name="EndLine" config:type="string"/> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> - <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item> <config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item> <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> <config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">qQH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAzwAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">lQH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAtgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKRHVwbGV4Ok5vbmUAUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQ8ARHVwbGV4TW9kZTo6T2Zm</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> </config:config-item-set> @@ -452,7 +452,7 @@ <number:text> </number:text> </number:number-style> <number:number-style style:name="N178P2" style:volatile="true"> - <number:text> -</number:text> + <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="0"/> <number:text> </number:text> </number:number-style> @@ -473,7 +473,7 @@ <number:text> € </number:text> </number:number-style> <number:number-style style:name="N182P2" style:volatile="true"> - <number:text> -</number:text> + <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="0"/> <number:text> € </number:text> </number:number-style> @@ -977,7 +977,7 @@ <number:text>)</number:text> </number:number-style> <number:number-style style:name="N264P2" style:volatile="true"> - <number:text> -</number:text> + <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="0"/> <number:text> </number:text> </number:number-style> @@ -1011,63 +1011,56 @@ <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> <style:map style:condition="value()>=0" style:apply-style-name="N269P0"/> </number:currency-style> - <number:date-style style:name="N270"> - <number:day number:style="long"/> - <number:text>.</number:text> - <number:month number:style="long"/> - <number:text>.</number:text> - <number:year number:style="long"/> - </number:date-style> - <number:number-style style:name="N272P0" style:volatile="true"> + <number:number-style style:name="N271P0" style:volatile="true"> <number:text>WAHR</number:text> </number:number-style> - <number:number-style style:name="N272P1" style:volatile="true"> + <number:number-style style:name="N271P1" style:volatile="true"> <number:text>WAHR</number:text> </number:number-style> - <number:number-style style:name="N272"> + <number:number-style style:name="N271"> <number:text>FALSCH</number:text> - <style:map style:condition="value()>0" style:apply-style-name="N272P0"/> - <style:map style:condition="value()<0" style:apply-style-name="N272P1"/> + <style:map style:condition="value()>0" style:apply-style-name="N271P0"/> + <style:map style:condition="value()<0" style:apply-style-name="N271P1"/> </number:number-style> - <number:number-style style:name="N273"> + <number:number-style style:name="N272"> <number:number number:decimal-places="20" loext:min-decimal-places="20" number:min-integer-digits="1"/> </number:number-style> - <number:currency-style style:name="N275P0" style:volatile="true"> + <number:currency-style style:name="N274P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="AU">$</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N275"> + <number:currency-style style:name="N274"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="AU">$</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N275P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N274P0"/> </number:currency-style> - <number:currency-style style:name="N277P0" style:volatile="true"> + <number:currency-style style:name="N276P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="pt" number:country="PT">€</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N277"> + <number:currency-style style:name="N276"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="pt" number:country="PT">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N277P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N276P0"/> </number:currency-style> - <number:currency-style style:name="N279P0" style:volatile="true"> + <number:currency-style style:name="N278P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="es" number:country="ES">€</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N279"> + <number:currency-style style:name="N278"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="es" number:country="ES">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N279P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N278P0"/> </number:currency-style> <number:date-style style:name="N10121" number:language="en" number:country="US"> <number:month/> @@ -1459,15 +1452,62 @@ <style:style style:name="Default" style:family="table-cell"> <style:text-properties style:font-name-asian="Droid Sans Fallback" style:font-family-asian="'Droid Sans Fallback'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="'Droid Sans Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable"/> </style:style> - <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/> - </style:style> - <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/> <style:style style:name="Heading" 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"/> <style:text-properties fo:font-size="16pt" fo:font-style="italic" fo:font-weight="bold"/> </style:style> + <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="table-cell" style:parent-style-name="Heading"> + <style:text-properties fo:color="#000000" fo:font-size="18pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="table-cell" style:parent-style-name="Heading"> + <style:text-properties fo:color="#000000" fo:font-size="12pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Text" style:family="table-cell" style:parent-style-name="Default"/> + <style:style style:name="Note" style:family="table-cell" style:parent-style-name="Text"> + <style:table-cell-properties fo:background-color="#ffffcc" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" fo:border="0.74pt solid #808080"/> + <style:text-properties fo:color="#333333" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Footnote" style:family="table-cell" style:parent-style-name="Text"> + <style:text-properties fo:color="#808080" fo:font-size="10pt" fo:font-style="italic" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Status" style:family="table-cell" style:parent-style-name="Default"/> + <style:style style:name="Good" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#ccffcc"/> + <style:text-properties fo:color="#006600" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Neutral" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#ffffcc"/> + <style:text-properties fo:color="#996600" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Bad" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:background-color="#ff6600"/> + </style:style> + <style:style style:name="Warning" style:family="table-cell" style:parent-style-name="Status"> + <style:text-properties fo:color="#cc0000" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Error" style:family="table-cell" style:parent-style-name="Status"> + <style:table-cell-properties fo:background-color="#cc0000"/> + <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="bold"/> + </style:style> + <style:style style:name="Accent" style:family="table-cell" style:parent-style-name="Default"> + <style:text-properties fo:color="#000000" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="bold"/> + </style:style> + <style:style style:name="Accent_20_1" style:display-name="Accent 1" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#000000"/> + <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Accent_20_2" style:display-name="Accent 2" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#808080"/> + <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/> + </style:style> + <style:style style:name="Accent_20_3" style:display-name="Accent 3" style:family="table-cell" style:parent-style-name="Accent"> + <style:table-cell-properties fo:background-color="#dddddd"/> + </style:style> + <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"> + <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/> + </style:style> + <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/> <style:style style:name="Heading1" style:family="table-cell" style:parent-style-name="Heading"> <style:table-cell-properties style:rotation-angle="90"/> </style:style> @@ -1485,9 +1525,7 @@ <style:style style:name="Ok" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="#33ff99"/> </style:style> - <style:style style:name="Bad" style:family="table-cell" style:parent-style-name="Default"> - <style:table-cell-properties fo:background-color="#ff6600"/> - </style:style> + <draw:marker draw:name="Linienspitzen_20_1" draw:display-name="Linienspitzen 1" svg:viewBox="0 0 20 30" svg:d="M10 0l-10 30h20z"/> </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> @@ -1496,6 +1534,9 @@ <style:style style:name="co2" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="252.51pt"/> </style:style> + <style:style style:name="co3" style:family="table-column"> + <style:table-column-properties fo:break-before="auto" style:column-width="64.01pt"/> + </style:style> <style:style style:name="co4" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="123.99pt"/> </style:style> @@ -1517,9 +1558,6 @@ <style:style style:name="co10" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="110.35pt"/> </style:style> - <style:style style:name="co3" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="64.01pt"/> - </style:style> <style:style style:name="ro1" style:family="table-row"> <style:table-row-properties style:row-height="24.46pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> @@ -1536,10 +1574,10 @@ <style:table-row-properties style:row-height="23.84pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro6" style:family="table-row"> - <style:table-row-properties style:row-height="57.46pt" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="53.4pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro7" style:family="table-row"> - <style:table-row-properties style:row-height="68.66pt" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="63.75pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ta1" style:family="table" style:master-page-name="Default"> <style:table-properties table:display="true" style:writing-mode="lr-tb"/> @@ -1590,169 +1628,7 @@ <number:boolean-style style:name="N10099" number:language="en" number:country="US"> <number:boolean/> </number:boolean-style> - <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="0pt"/> - <style:text-properties style:text-position="" 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="ce3" 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="0pt"/> - <style:text-properties style:text-position="" 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="ce4" 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="0pt"/> - <style:text-properties style:text-position="" 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="ce5" 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="0pt"/> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce6" 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="0pt"/> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet1.B3"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet1.B3"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet1.B3"/> - </style:style> - <style:style style:name="ce7" 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="0pt"/> - <style:text-properties style:text-position=""/> - <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="ce8" 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="0pt"/> - <style:text-properties style:text-position=""/> - <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="ce9" 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" style:text-position="" style:font-name="Liberation Serif" 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="0pt"/> - <style:text-properties style:text-position="" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce12" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name="DejaVu Sans"/> - </style:style> - <style:style style:name="ce13" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name="DejaVu Sans" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="ce14" 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="0pt"/> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce15" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce16" 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="0pt"/> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce17" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name="DejaVu Sans"/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce18" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce19" 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="0pt"/> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce20" 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="0pt"/> - <style:text-properties style:text-position=""/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce21" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/> - </style:style> - <style:style style:name="ce22" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name="Liberation Sans" style:font-name-asian="Droid Sans Fallback" style:font-name-complex="Droid Sans Devanagari"/> - </style:style> - <style:style style:name="ce23" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" style:font-name="Arial" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="6.80000019073486pt" style:language-complex="en" style:country-complex="US"/> - </style:style> - <style:style style:name="ce24" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N10099"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce25" style:family="table-cell" style:parent-style-name="Excel_5f_BuiltIn_5f_Currency"> - <style:table-cell-properties style:glyph-orientation-vertical="0" fo:border-bottom="none" style:cell-protect="protected" style:print-content="true" style:text-align-source="value-type" style:repeat-content="false" fo:background-color="transparent" fo:wrap-option="no-wrap" fo:border-left="0.06pt solid #000000" style:direction="ltr" fo:border-right="0.06pt solid #000000" style:rotation-angle="0" style:rotation-align="none" style:shrink-to-fit="false" fo:border-top="none" style:vertical-align="automatic"/> - <style:paragraph-properties fo:margin-left="0pt" 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:text-position="" style:font-name="Arial1" 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-size-complex="10pt" style:font-style-complex="normal" style:font-weight-complex="normal"/> - </style:style> - <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N11"> - <style:text-properties style:text-position="" fo:font-weight="normal" style:font-weight-asian="normal" style:font-weight-complex="normal"/> - </style:style> - <style:style style:name="ce27" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N82"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce28" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N43"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N42"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce30" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N41"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce31" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N40"> - <style:text-properties style:text-position=""/> - </style:style> - <style:style style:name="ce32" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:text-position="" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> - </style:style> - <style:style style:name="ce33" 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" style:text-position="" style:font-name="Liberation Serif" 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="bold" 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="ce34" style:family="table-cell" style:parent-style-name="Default"> - <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:text-position="" style:font-name="Liberation Serif" 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="ce35" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0"> - <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" style:text-position="" style:font-name="Liberation Serif" 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="ce36" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100"> - <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" style:text-position="" style:font-name="Liberation Serif" 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="ce37" style:family="table-cell" style:parent-style-name="Default"/> + <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"/> <style:style style:name="ce38" 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="0pt"/> @@ -1803,62 +1679,35 @@ <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce47" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0"/> - <style:style style:name="ce48" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:font-name="DejaVu Sans"/> - </style:style> - <style:style style:name="ce49" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:font-name="DejaVu Sans" fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> - </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="0pt"/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce51" 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="0pt"/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> - </style:style> - <style:style style:name="ce52" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> + <style:style style:name="ce13" style:family="table-cell" style:parent-style-name="Default"> + <style:table-cell-properties fo:wrap-option="no-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" style:font-name="Liberation Sans" 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="ce53" style:family="table-cell" style:parent-style-name="Default"> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> + <style:style style:name="ce12" style:family="table-cell" style:parent-style-name="Default"> + <style:text-properties style:font-name="Liberation Sans"/> </style:style> - <style:style style:name="ce54" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce15" 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="0pt"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce55" style:family="table-cell" style:parent-style-name="Default"> - <style:text-properties style:font-name="DejaVu Sans"/> + <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce56" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce17" 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="0pt"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce57" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce19" 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="0pt"/> - <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> <style:style style:name="ce58" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/> @@ -1945,7 +1794,7 @@ <text:p><text:sheet-name>???</text:sheet-name> (<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2016-07-31">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="15:41:00.919722010">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2017-04-10">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="13:39:37.805826734">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -1999,7 +1848,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="ce43" table:formula="of:=AND([Sheet2.C2:.C92])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce43" table:formula="of:=AND([Sheet2.C2:.C91])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -2049,7 +1898,7 @@ <table:table-column table:style-name="co8" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co9" table:number-columns-repeated="3" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co10" table:default-cell-style-name="Default"/> - <table:table-column table:style-name="co3" table:number-columns-repeated="14" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co3" table:number-columns-repeated="17" table:default-cell-style-name="Default"/> <table:table-row table:style-name="ro5"> <table:table-cell table:style-name="ce46" office:value-type="string" calcext:value-type="string"> <text:p>Function</text:p> @@ -2108,6 +1957,7 @@ <table:table-cell table:style-name="ce71" office:value-type="string" calcext:value-type="string"> <text:p>Sales </text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce47" table:formula="of:=SUMIF([.I1:.I5];"unpaid";[.H1:.H5])" office:value-type="float" office:value="6" calcext:value-type="float"> @@ -2116,7 +1966,7 @@ <table:table-cell office:value-type="float" office:value="6" calcext:value-type="float"> <text:p>6</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=ROUND([.A2];12)=ROUND([.B2];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A2]=[.B2]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=SUMIF(I1:I5,"unpaid",H1:H5)" calcext:value-type="string"> @@ -2161,6 +2011,10 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="2300" calcext:value-type="float"> <text:p>2300</text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell office:value-type="float" office:value="1" calcext:value-type="float"> + <text:p>1</text:p> + </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.L1:.L11];10;[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2169,7 +2023,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=ROUND([.A3];12)=ROUND([.B3];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=SUMIF(L1:L11,10,K1:K11)" calcext:value-type="string"> @@ -2209,6 +2063,13 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="5500" calcext:value-type="float"> <text:p>5500</text:p> </table:table-cell> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="10" calcext:value-type="float"> + <text:p>10</text:p> + </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.M1:.M11];"a";[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2217,7 +2078,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A4];12)=ROUND([.B4];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=SUMIF(M1:M11,"a",K1:K11)" calcext:value-type="string"> @@ -2263,6 +2124,13 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="800" calcext:value-type="float"> <text:p>800</text:p> </table:table-cell> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>B</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="100" calcext:value-type="float"> + <text:p>100</text:p> + </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.N1:.N11];"a";[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2271,7 +2139,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A5];12)=ROUND([.B5];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=SUMIF(N1:N11,"a",K1:K11)" calcext:value-type="string"> @@ -2311,6 +2179,13 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="400" calcext:value-type="float"> <text:p>400</text:p> </table:table-cell> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>C</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1000" calcext:value-type="float"> + <text:p>1000</text:p> + </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.O1:.O11];"";[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2319,7 +2194,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A6];12)=ROUND([.B6];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=SUMIF(O1:O11,"",K1:K11)" calcext:value-type="string"> @@ -2360,6 +2235,10 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="4200" calcext:value-type="float"> <text:p>4200</text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="2"/> + <table:table-cell office:value-type="float" office:value="10000" calcext:value-type="float"> + <text:p>10000</text:p> + </table:table-cell> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.P1:.P11];" ";[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2368,7 +2247,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A7];12)=ROUND([.B7];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A7]=[.B7]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=SUMIF(P1:P11," ",K1:K11)" calcext:value-type="string"> @@ -2405,6 +2284,7 @@ <table:table-cell table:style-name="ce73" office:value-type="float" office:value="1200" calcext:value-type="float"> <text:p>1200</text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.O1:.O11];"=";[.K1:.K11])" office:value-type="float" office:value="26" calcext:value-type="float"> @@ -2413,7 +2293,7 @@ <table:table-cell office:value-type="float" office:value="26" calcext:value-type="float"> <text:p>26</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A8];12)=ROUND([.B8];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=SUMIF(O1:O11,"=",K1:K11)" calcext:value-type="string"> @@ -2446,6 +2326,7 @@ <table:table-cell table:style-name="ce71" office:value-type="string" calcext:value-type="string"> <text:p>Result </text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro6"> <table:table-cell table:style-name="ce47" table:formula="of:=SUMIF([.O1:.O11];"<>";[.K1:.K11])" office:value-type="float" office:value="40" calcext:value-type="float"> @@ -2454,7 +2335,7 @@ <table:table-cell office:value-type="float" office:value="40" calcext:value-type="float"> <text:p>40</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A9];12)=ROUND([.B9];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=SUMIF(O1:O11,"<>",K1:K11)" calcext:value-type="string"> @@ -2485,6 +2366,7 @@ <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string"> <text:p>$ 2,000.00 </text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro6"> <table:table-cell table:formula="of:=SUMIF([.R2:.R5];">160000";[.S2:.S5])" office:value-type="float" office:value="63000" calcext:value-type="float"> @@ -2493,7 +2375,7 @@ <table:table-cell office:value-type="float" office:value="63000" calcext:value-type="float"> <text:p>63000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A10]=[.B10]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=SUMIF(R2:R5,">160000",S2:S5)" calcext:value-type="string"> @@ -2524,6 +2406,7 @@ <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string"> <text:p>$ 12,000.00 </text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.R2:.R5];">160000")" office:value-type="float" office:value="900000" calcext:value-type="float"> @@ -2532,7 +2415,7 @@ <table:table-cell office:value-type="float" office:value="900000" calcext:value-type="float"> <text:p>900000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A11];12)=ROUND([.B11];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A11]=[.B11]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=SUMIF(R2:R5,">160000")" calcext:value-type="string"> @@ -2555,6 +2438,7 @@ <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce45"/> <table:table-cell table:style-name="ce74"/> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro7"> <table:table-cell table:formula="of:=SUMIF([.R2:.R5];300000;[.S2:.S5])" office:value-type="float" office:value="21000" calcext:value-type="float"> @@ -2563,7 +2447,7 @@ <table:table-cell office:value-type="float" office:value="21000" calcext:value-type="float"> <text:p>21000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A12];12)=ROUND([.B12];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A12]=[.B12]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=SUMIF(R2:R5,300000,S2:S5)" calcext:value-type="string"> @@ -2576,6 +2460,7 @@ <table:table-cell table:style-name="ce74" office:value-type="string" calcext:value-type="string"> <text:p>$ 400.00 </text:p> </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.R2:.R5];">" & [.T2];[.S2:.S5])" office:value-type="float" office:value="49000" calcext:value-type="float"> @@ -2584,37 +2469,37 @@ <table:table-cell office:value-type="float" office:value="49000" calcext:value-type="float"> <text:p>49000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A13];12)=ROUND([.B13];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A13]=[.B13]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A13])" office:value-type="string" office:string-value="=SUMIF(R2:R5,">" & T2,S2:S5)" calcext:value-type="string"> <text:p>=SUMIF(R2:R5,">" & T2,S2:S5)</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce45" table:formula="of:=SUMIF([.V2:.V7];"Fruits";[.X2:.X7])" office:value-type="float" office:value="2000" calcext:value-type="float"> + <table:table-cell table:style-name="ce13" table:formula="of:=SUMIF([.V2:.V7];"Fruits";[.X2:.X7])" office:value-type="float" office:value="2000" calcext:value-type="float"> <text:p>2000</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="2000" calcext:value-type="float"> <text:p>2000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A14];12)=ROUND([.B14];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A14]=[.B14]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="=SUMIF(V2:V7,"Fruits",X2:X7)" calcext:value-type="string"> <text:p>=SUMIF(V2:V7,"Fruits",X2:X7)</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce45" table:formula="of:=SUMIF([.V2:.V7];"Vegetables";[.X2:.X7])" office:value-type="float" office:value="12000" calcext:value-type="float"> + <table:table-cell table:style-name="ce13" table:formula="of:=SUMIF([.V2:.V7];"Vegetables";[.X2:.X7])" office:value-type="float" office:value="12000" calcext:value-type="float"> <text:p>12000</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="12000" calcext:value-type="float"> <text:p>12000</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A15];12)=ROUND([.B15];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A15]=[.B15]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A15])" office:value-type="string" office:string-value="=SUMIF(V2:V7,"Vegetables",X2:X7)" calcext:value-type="string"> @@ -2622,22 +2507,22 @@ </table:table-cell> <table:table-cell table:number-columns-repeated="10"/> <table:table-cell table:style-name="ce70"/> - <table:table-cell table:number-columns-repeated="9"/> + <table:table-cell table:number-columns-repeated="12"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce45" table:formula="of:=SUMIF([.V2:.V7];"";[.X2:.X7])" office:value-type="float" office:value="400" calcext:value-type="float"> + <table:table-cell table:style-name="ce13" table:formula="of:=SUMIF([.V2:.V7];"";[.X2:.X7])" office:value-type="float" office:value="400" calcext:value-type="float"> <text:p>400</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="400" calcext:value-type="float"> <text:p>400</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A16];12)=ROUND([.B16];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A16]=[.B16]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A16])" office:value-type="string" office:string-value="=SUMIF(V2:V7,"",X2:X7)" calcext:value-type="string"> <text:p>=SUMIF(V2:V7,"",X2:X7)</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.H1:.H7];"<0")" office:value-type="float" office:value="-5" calcext:value-type="float"> @@ -2646,13 +2531,13 @@ <table:table-cell office:value-type="float" office:value="-5" calcext:value-type="float"> <text:p>-5</text:p> </table:table-cell> - <table:table-cell table:style-name="ce51" table:formula="of:=ROUND([.A17];12)=ROUND([.B17];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A17]=[.B17]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A17])" office:value-type="string" office:string-value="=SUMIF(H1:H7,"<0")" calcext:value-type="string"> <text:p>=SUMIF(H1:H7,"<0")</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=SUMIF([.H2:.H8])" office:value-type="string" office:string-value="" calcext:value-type="error"> @@ -2661,256 +2546,376 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Err:511</text:p> </table:table-cell> - <table:table-cell table:style-name="ce52" table:formula="of:=ISERROR([.A18])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A18])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> </table:table-cell> <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A18])" office:value-type="string" office:string-value="=SUMIF(H2:H8)" calcext:value-type="string"> <text:p>=SUMIF(H2:H8)</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="4"> - <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"=B";[.AA2:.AA6])" office:value-type="float" office:value="100" calcext:value-type="float"> + <text:p>100</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="100" calcext:value-type="float"> + <text:p>100</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A19]=[.B19]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A19])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"=B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"=B",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="23"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce54"/> - <table:table-cell table:style-name="ce58"/> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"<>B";[.AA2:.AA6])" office:value-type="float" office:value="11011" calcext:value-type="float"> + <text:p>11011</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="11011" calcext:value-type="float"> + <text:p>11011</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A20]=[.B20]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A20])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<>B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<>B",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="23"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"<B";[.AA2:.AA6])" office:value-type="float" office:value="10" calcext:value-type="float"> + <text:p>10</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="10" calcext:value-type="float"> + <text:p>10</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A21]=[.B21]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A21])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<B",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="23"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];">B";[.AA2:.AA6])" office:value-type="float" office:value="1000" calcext:value-type="float"> + <text:p>1000</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1000" calcext:value-type="float"> + <text:p>1000</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A22]=[.B22]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A22])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,">B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,">B",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="23"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"<=B";[.AA2:.AA6])" office:value-type="float" office:value="110" calcext:value-type="float"> + <text:p>110</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="110" calcext:value-type="float"> + <text:p>110</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A23]=[.B23]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A23])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<=B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<=B",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> <table:table-cell table:style-name="ce64"/> - <table:table-cell table:number-columns-repeated="14"/> + <table:table-cell table:number-columns-repeated="17"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="3"> - <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce50"/> - <table:table-cell table:style-name="ce58"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];">=B";[.AA2:.AA6])" office:value-type="float" office:value="1100" calcext:value-type="float"> + <text:p>1100</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1100" calcext:value-type="float"> + <text:p>1100</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A24]=[.B24]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A24])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,">=B",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,">=B",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> <table:table-cell table:style-name="ce65"/> <table:table-cell/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="3"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce54"/> - <table:table-cell table:style-name="ce58"/> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"=";[.AA2:.AA6])" office:value-type="float" office:value="10001" calcext:value-type="float"> + <text:p>10001</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="10001" calcext:value-type="float"> + <text:p>10001</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A25]=[.B25]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A25])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"=",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"=",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce65"/> + <table:table-cell/> + <table:table-cell table:style-name="ce70" table:number-columns-repeated="3"/> + <table:table-cell table:number-columns-repeated="13"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"<>";[.AA2:.AA6])" office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A26]=[.B26]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A26])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<>",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<>",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> <table:table-cell table:style-name="ce66"/> - <table:table-cell table:number-columns-repeated="14"/> + <table:table-cell table:number-columns-repeated="17"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell/> - <table:table-cell table:style-name="ce48"/> - <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce58"/> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];"<";[.AA2:.AA6])" office:value-type="float" office:value="0" calcext:value-type="float"> + <text:p>0</text:p> + </table:table-cell> + <table:table-cell 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="ce15" table:formula="of:=[.A27]=[.B27]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A27])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:style-name="ce45"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce67"/> <table:table-cell/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="3"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell/> - <table:table-cell table:style-name="ce49"/> - <table:table-cell table:style-name="ce55"/> - <table:table-cell table:number-columns-repeated="6"/> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];">";[.AA2:.AA6])" office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A28]=[.B28]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A28])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,">",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,">",AA2:AA6)</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="5"/> <table:table-cell table:style-name="ce68"/> - <table:table-cell table:number-columns-repeated="14"/> + <table:table-cell table:number-columns-repeated="17"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce48" table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce58"/> + <table:table-cell table:style-name="ce12" table:formula="of:=SUMIF([.Z2:.Z6];"<=";[.AA2:.AA6])" office:value-type="float" office:value="0" calcext:value-type="float"> + <text:p>0</text:p> + </table:table-cell> + <table:table-cell 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="ce15" table:formula="of:=[.A29]=[.B29]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A29])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,"<=",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,"<=",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:style-name="ce45"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce69"/> - <table:table-cell table:number-columns-repeated="14"/> + <table:table-cell table:number-columns-repeated="17"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell/> - <table:table-cell table:style-name="ce49"/> - <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce58"/> + <table:table-cell table:formula="of:=SUMIF([.Z2:.Z6];">=";[.AA2:.AA6])" office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1110" calcext:value-type="float"> + <text:p>1110</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce15" table:formula="of:=[.A30]=[.B30]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce58" table:formula="of:=FORMULA([.A30])" office:value-type="string" office:string-value="=SUMIF(Z2:Z6,">=",AA2:AA6)" calcext:value-type="string"> + <text:p>=SUMIF(Z2:Z6,">=",AA2:AA6)</text:p> + </table:table-cell> <table:table-cell table:style-name="ce45"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce62"/> - <table:table-cell table:number-columns-repeated="14"/> + <table:table-cell table:number-columns-repeated="17"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce16"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> + <table:table-cell table:style-name="ce16"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="5"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce16"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> + <table:table-cell table:style-name="ce16"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="5"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce16"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> + <table:table-cell table:style-name="ce16"/> <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="3"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce53"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce16"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce17"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce17"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="5"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce17"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce17"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="5"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce17"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce17"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce70" table:number-columns-repeated="5"/> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell table:number-columns-repeated="13"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="52"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="53"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce56"/> - <table:table-cell table:number-columns-repeated="21"/> + <table:table-cell table:style-name="ce17"/> + <table:table-cell table:number-columns-repeated="24"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="1000"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="999"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce57"/> - <table:table-cell table:number-columns-repeated="21"/> - </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="1047475"> + <table:table-cell table:style-name="ce19"/> <table:table-cell table:number-columns-repeated="24"/> </table:table-row> + <table:table-row table:style-name="ro2" table:number-rows-repeated="1047476"> + <table:table-cell table:number-columns-repeated="27"/> + </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:number-columns-repeated="24"/> + <table:table-cell table:number-columns-repeated="27"/> </table:table-row> <calcext:conditional-formats> - <calcext:conditional-format calcext:target-range-address="Sheet2.C4:Sheet2.C100 Sheet2.C2:Sheet2.C17"> + <calcext:conditional-format calcext:target-range-address="Sheet2.C2:Sheet2.C100"> <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C2"/> <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C2"/> <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C2"/> </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C4:Sheet2.C1100 Sheet2.C2:Sheet2.C17"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C2"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C2"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C2"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C27:Sheet2.C100 Sheet2.C4:Sheet2.C23"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C4"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C4"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C4"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C27:Sheet2.C100 Sheet2.C4:Sheet2.C23"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C4"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C4"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C4"/> - </calcext:conditional-format> </calcext:conditional-formats> </table:table> <table:table table:name="'file:///tmp/sumif.fods/sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/iserr.fods/isblank.fods/info.fods/formula.fods/formula.fods/current.fods/cell.fods/cell.fods/minute.fods/minute.fods/year.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods'#Sheet2" table:print="false" table:style-name="ta_extref"> - <table:table-source xlink:type="simple" xlink:href="sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/iserr.fods/isblank.fods/info.fods/formula.fods/formula.fods/current.fods/cell.fods/cell.fods/minute.fods/minute.fods/year.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> + <table:table-source xlink:type="simple" xlink:href="/tmp/sumif.fods/sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/iserr.fods/isblank.fods/info.fods/formula.fods/formula.fods/current.fods/cell.fods/cell.fods/minute.fods/minute.fods/year.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> <table:table-column table:number-columns-repeated="8"/> <table:table-row table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="8"/> </table:table-row> <table:table-row> <table:table-cell table:number-columns-repeated="7"/> - <table:table-cell table:style-name="ce37" office:value-type="float" office:value="4"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="4"> <text:p>4</text:p> </table:table-cell> </table:table-row> </table:table> <table:table table:name="'file:///tmp/sumif.fods/sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/sc-unit-test/information-functions.ods'#Information" table:print="false" table:style-name="ta_extref"> - <table:table-source xlink:type="simple" xlink:href="sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/sc-unit-test/information-functions.ods" table:table-name="Information" table:mode="copy-results-only"/> + <table:table-source xlink:type="simple" xlink:href="/tmp/sumif.fods/sum.fods/sum.fods/subtotal.fods/sqrtpi.fods/sqrt.fods/sinh.fods/sin.fods/cos.fods/cos.fods/atan.fods/asinh.fods/asin.fods/acos.fods/abs.fods/abs.fods/xor.fods/xor.fods/not.fods/ifna.fods/ifna.fods/iferror.fods/iferror.fods/if.fods/and.fods/and.fods/and.fods/and.fods/type.fods/isna.fods/isna.fods/islogical.fods/isformula.fods/sc-unit-test/information-functions.ods" table:table-name="Information" table:mode="copy-results-only"/> <table:table-column table:number-columns-repeated="15"/> <table:table-row table:number-rows-repeated="6"> <table:table-cell table:number-columns-repeated="15"/> </table:table-row> <table:table-row> <table:table-cell table:number-columns-repeated="14"/> - <table:table-cell table:style-name="ce37" office:value-type="string"> + <table:table-cell table:style-name="ce1" office:value-type="string"> <text:p>O5</text:p> </table:table-cell> </table:table-row> </table:table> <table:table table:name="'file:///tmp/sumif.fods/sumif.fods/external_refs/sumif_references.fods'#Sheet1" table:print="false" table:style-name="ta_extref"> - <table:table-source xlink:type="simple" xlink:href="sumif.fods/external_refs/sumif_references.fods" table:table-name="Sheet1" table:mode="copy-results-only"/> + <table:table-source xlink:type="simple" xlink:href="/tmp/sumif.fods/sumif.fods/external_refs/sumif_references.fods" table:table-name="Sheet1" table:mode="copy-results-only"/> <table:table-column table:number-columns-repeated="4"/> <table:table-row table:number-rows-repeated="5"> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce37" office:value-type="string"> + <table:table-cell table:style-name="ce1" office:value-type="string"> <text:p>yes</text:p> </table:table-cell> - <table:table-cell table:style-name="ce37" office:value-type="float" office:value="1"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="1"> <text:p>1</text:p> </table:table-cell> </table:table-row> <table:table-row> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce37" office:value-type="string"> + <table:table-cell table:style-name="ce1" office:value-type="string"> <text:p>no</text:p> </table:table-cell> - <table:table-cell table:style-name="ce37" office:value-type="float" office:value="2"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="2"> <text:p>2</text:p> </table:table-cell> </table:table-row> <table:table-row> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce37" office:value-type="string"> + <table:table-cell table:style-name="ce1" office:value-type="string"> <text:p>yes</text:p> </table:table-cell> - <table:table-cell table:style-name="ce37" office:value-type="float" office:value="3"> + <table:table-cell table:style-name="ce1" office:value-type="float" office:value="3"> <text:p>3</text:p> </table:table-cell> </table:table-row> diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 0a5ae116c630..438d5020961f 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -194,12 +194,12 @@ void ScQueryParamBase::FillInExcelSyntax( // Operatoren herausfiltern if (rCellStr[0] == '<') { - if (rCellStr[1] == '>') + if (rCellStr.getLength() > 1 && rCellStr[1] == '>') { rItem.maString = rPool.intern(rCellStr.copy(2)); rEntry.eOp = SC_NOT_EQUAL; } - else if (rCellStr[1] == '=') + else if (rCellStr.getLength() > 1 && rCellStr[1] == '=') { rItem.maString = rPool.intern(rCellStr.copy(2)); rEntry.eOp = SC_LESS_EQUAL; @@ -212,7 +212,7 @@ void ScQueryParamBase::FillInExcelSyntax( } else if (rCellStr[0]== '>') { - if (rCellStr[1] == '=') + if (rCellStr.getLength() > 1 && rCellStr[1] == '=') { rItem.maString = rPool.intern(rCellStr.copy(2)); rEntry.eOp = SC_GREATER_EQUAL; @@ -243,8 +243,11 @@ void ScQueryParamBase::FillInExcelSyntax( * empty cells with an empty string is triggered from the interpreter. * This could be handled independently if all queries should support * it, needs to be evaluated if that actually is desired. */ + + // (empty = empty) is a match, and (empty <> not-empty) also is a match if (rItem.meType == ScQueryEntry::ByString) - rItem.mbMatchEmpty = (rEntry.eOp == SC_EQUAL && rItem.maString.isEmpty()); + rItem.mbMatchEmpty = ((rEntry.eOp == SC_EQUAL && rItem.maString.isEmpty()) + || (rEntry.eOp == SC_NOT_EQUAL && !rItem.maString.isEmpty())); } } |