diff options
| author | Eike Rathke <erack@redhat.com> | 2019-05-07 23:17:45 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-05-10 22:27:19 +0200 |
| commit | f01e31762b02b8b896e726238eb2475c0e01ef82 (patch) | |
| tree | b6167edcd0072b9617d3d25e9993209c0779b8fd /sc | |
| parent | 232b467083dd3b55f261bebe084e696bee200ec9 (diff) | |
Resolves: tdf#125099 round duration results in interpreter already
This is a combination of 3 commits.
Resolves: tdf#125099 round duration results in interpreter already
So wall clock time formats less likely display a one-off value,
duration formats are too rarely used if the expected duration is
less than 24 hours.
Reviewed-on: https://gerrit.libreoffice.org/71909
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 85c0521f01f5c726e9f754b3175a550121e566c8)
Test RANK(), not the underlying floating point representation of duration
The RANK() results depended on the floating point representation
of time differences (durations), which for visually equal MM:SS
display values don't have to be equal if similar durations result
from different start and end times. Change that to a well defined
duration in seconds.
b69a6b43f48abd2d4fe605021acfd2800e75b5e1
Reviewed-on: https://gerrit.libreoffice.org/71926
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 8de7949050d63fd9f7ac41e1a2442849580b86fa)
Fix typed flags bitmask, tdf#125099 follow-up
25327cfcafc9e1f2e88b388677853c638dd9b0e6
Reviewed-on: https://gerrit.libreoffice.org/71946
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit d27ad84ec7a0aafb07d6a6152c686f4bc802f661)
Change-Id: I9b0872420699b17e3ed3f20993f8cfe02761f862
Reviewed-on: https://gerrit.libreoffice.org/71935
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/functions/statistical/fods/rank.fods | 739 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 21 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr5.cxx | 9 |
3 files changed, 304 insertions, 465 deletions
diff --git a/sc/qa/unit/data/functions/statistical/fods/rank.fods b/sc/qa/unit/data/functions/statistical/fods/rank.fods index 880f3659032b..d12703d5ee55 100644 --- a/sc/qa/unit/data/functions/statistical/fods/rank.fods +++ b/sc/qa/unit/data/functions/statistical/fods/rank.fods @@ -1,12 +1,12 @@ <?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>2017-01-02T17:08:37.518406343</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/ea860d52ade14b4a16289c81a0f8586799c6617f</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="116" meta:object-count="0"/></office:meta> + <office:meta><meta:creation-date>2017-01-02T17:08:37.518406343</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/6.1.6.3.0$Linux_X86_64 LibreOffice_project/47b704879f52819423702f4efa17cbae8d7b7afa</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="116" 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">58986</config:config-item> + <config:config-item config:name="VisibleAreaWidth" config:type="int">53248</config:config-item> <config:config-item config:name="VisibleAreaHeight" config:type="int">8995</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> @@ -32,7 +32,7 @@ </config:config-item-map-entry> <config:config-item-map-entry config:name="Sheet2"> <config:config-item config:name="CursorPositionX" config:type="int">4</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">10</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">1861</config:config-item> <config:config-item config:name="ZoomType" config:type="short">0</config:config-item> <config:config-item config:name="ZoomValue" config:type="int">100</config:config-item> <config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item> @@ -58,7 +58,7 @@ <config:config-item config:name="ShowZeroValues" 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="ShowGrid" config:type="boolean">true</config:config-item> - <config:config-item config:name="GridColor" config:type="long">12632256</config:config-item> + <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item> <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item> <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> <config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item> @@ -77,24 +77,13 @@ </config:config-item-set> <config:config-item-set config:name="ooo:configuration-settings"> <config:config-item config:name="SyntaxStringRef" config:type="short">7</config:config-item> - <config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item> - <config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item> <config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item> - <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> - <config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> - <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item> - <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item> - <config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item> - <config:config-item config:name="RasterResolutionY" config:type="int">1270</config:config-item> - <config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item> - <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> - <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="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="IsKernAsianPunctuation" config:type="boolean">false</config:config-item> + <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> + <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">lwH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAuAAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCmNvbGxhdGU9ZmFsc2UKbWFyZ2luZGFqdXN0bWVudD0wLDAsMCwwCmNvbG9yZGVwdGg9MjQKcHNsZXZlbD0wCnBkZmRldmljZT0xCmNvbG9yZGV2aWNlPTAKUFBEQ29udGV4RGF0YQpQYWdlU2l6ZTpMZXR0ZXIAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=</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">cs</config:config-item> @@ -125,16 +114,28 @@ <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="AutoCalculate" 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="LoadReadonly" config:type="boolean">false</config:config-item> + <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> + <config:config-item config:name="GridColor" config:type="int">12632256</config:config-item> + <config:config-item config:name="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="PrinterPaperFromSetup" config:type="boolean">false</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item> + <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="EmbedFonts" config:type="boolean">false</config:config-item> + <config:config-item config:name="HasSheetTabs" 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">lgH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAtwAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkxldHRlcgAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==</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 config:name="RasterIsVisible" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item> + <config:config-item config:name="RasterResolutionY" config:type="int">1270</config:config-item> + <config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item> + <config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item> + <config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item> </config:config-item-set> </office:settings> <office:scripts> @@ -159,9 +160,11 @@ <style:font-face style:name="Andale Sans UI" svg:font-family="'Andale Sans UI'" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="Droid Sans Fallback" svg:font-family="'Droid Sans Fallback'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="Lucidasans" svg:font-family="Lucidasans" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="Mangal" svg:font-family="Mangal" style:font-family-generic="system" style:font-pitch="variable"/> <style:font-face style:name="Microsoft YaHei" svg:font-family="'Microsoft YaHei'" style:font-family-generic="system" style:font-pitch="variable"/> + <style:font-face style:name="Source Han Sans CN" svg:font-family="'Source Han Sans CN'" style:font-family-generic="system" style:font-pitch="variable"/> </office:font-face-decls> <office:styles> <style:default-style style:family="table-cell"> @@ -2971,6 +2974,9 @@ <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="Hyperlink" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0"> + <style:text-properties fo:color="#0563c1" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/> + </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"/> @@ -3100,9 +3106,6 @@ <style:style style:name="text_20_en" style:display-name="text en" style:family="table-cell" style:parent-style-name="text"> <style:text-properties fo:language="en" fo:country="US"/> </style:style> - <style:style style:name="Hyperlink" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0"> - <style:text-properties fo:color="#0563c1" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color"/> - </style:style> <style:style style:name="Excel_5f_CondFormat_5f_1_5f_1_5f_1" style:display-name="Excel_CondFormat_1_1_1" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties fo:background-color="#ff9900"/> </style:style> @@ -3163,31 +3166,25 @@ <style:table-column-properties fo:break-before="auto" style:column-width="105.85pt"/> </style:style> <style:style style:name="co13" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="163.64pt"/> + <style:table-column-properties fo:break-before="auto" style:column-width="63.41pt"/> </style:style> <style:style style:name="co14" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="145.64pt"/> + <style:table-column-properties fo:break-before="auto" style:column-width="83.25pt"/> </style:style> <style:style style:name="co15" style:family="table-column"> <style:table-column-properties fo:break-before="auto" style:column-width="177.51pt"/> </style:style> + <style:style style:name="co16" style:family="table-column"> + <style:table-column-properties fo:break-before="auto" style:column-width="145.64pt"/> + </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:table-row-properties style:row-height="26.45pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro2" style:family="table-row"> - <style:table-row-properties style:row-height="12.81pt" fo:break-before="auto" style:use-optimal-row-height="true"/> - </style:style> - <style:style style:name="ro3" style:family="table-row"> - <style:table-row-properties style:row-height="17.35pt" fo:break-before="auto" style:use-optimal-row-height="true"/> - </style:style> - <style:style style:name="ro4" style:family="table-row"> - <style:table-row-properties style:row-height="15pt" fo:break-before="auto" style:use-optimal-row-height="true"/> - </style:style> - <style:style style:name="ro5" style:family="table-row"> <style:table-row-properties style:row-height="17.01pt" 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="15.79pt" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:style style:name="ro3" style:family="table-row"> + <style:table-row-properties style:row-height="19.36pt" 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"/> @@ -3217,13 +3214,6 @@ <style:style style:name="ce13" 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="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="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: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"/> @@ -3253,26 +3243,19 @@ <style:paragraph-properties fo:margin-left="0pt" style:writing-mode="page"/> <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="12pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="12pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="12pt" style:font-style-complex="normal" style:font-weight-complex="normal"/> </style:style> - <style:style style:name="ce25" style:family="table-cell" style:parent-style-name="science"> + <style:style style:name="ce20" style:family="table-cell" style:parent-style-name="science"> <style:table-cell-properties style:glyph-orientation-vertical="0" style:cell-protect="protected" style:print-content="true" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" style:text-align-source="value-type" style:repeat-content="false" fo:wrap-option="no-wrap" fo:border="none" style:direction="ltr" style:rotation-angle="0" style:rotation-align="none" style:shrink-to-fit="false" style:vertical-align="automatic"/> <style:paragraph-properties fo:margin-left="0pt" style:writing-mode="page"/> <style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" fo:font-size="11pt" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:font-size-asian="11pt" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="11pt" style:font-style-complex="normal" style:font-weight-complex="normal"/> </style:style> <style:style style:name="ce24" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N165"/> - <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce25" 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="ce28" 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.C5"/> - <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C5"/> - <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C5"/> - </style:style> <style:style style:name="ce59" 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"/> @@ -3389,15 +3372,15 @@ <style:master-page style:name="Report" style:page-layout-name="pm2"> <style:header> <style:region-left> - <text:p><text:sheet-name>???</text:sheet-name> (<text:title>???</text:title>)</text:p> + <text:p><text:sheet-name>???</text:sheet-name><text:s/>(<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2017-01-02">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="17:08:17.281618646">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2019-05-07">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="20:19:48.908820761">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> <style:footer> - <text:p>Page <text:page-number>1</text:page-number> / <text:page-count>99</text:page-count></text:p> + <text:p>Page <text:page-number>1</text:page-number><text:s/>/ <text:page-count>99</text:page-count></text:p> </style:footer> <style:footer-left style:display="false"/> </style:master-page> @@ -3449,7 +3432,7 @@ <table:table-row table:style-name="ro2" table:number-rows-repeated="3"> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro4"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce11" office:value-type="string" calcext:value-type="string"> <text:p>Sheet</text:p> </table:table-cell> @@ -3460,11 +3443,11 @@ <text:p>Description</text:p> </table:table-cell> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <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="ce14" table:formula="of:=AND([Sheet2.C2:.C841])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce13" table:formula="of:=AND([Sheet2.C2:.C841])" 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"> @@ -3481,27 +3464,7 @@ <table:table-cell table:style-name="ce15"/> <table:table-cell table:style-name="ce16"/> </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="4"> - <table:table-cell/> - <table:table-cell table:style-name="ce15"/> - <table:table-cell/> - </table:table-row> - <table:table-row table:style-name="ro6"> - <table:table-cell/> - <table:table-cell table:style-name="ce15"/> - <table:table-cell/> - </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="4"> - <table:table-cell/> - <table:table-cell table:style-name="ce15"/> - <table:table-cell/> - </table:table-row> - <table:table-row table:style-name="ro6"> - <table:table-cell/> - <table:table-cell table:style-name="ce15"/> - <table:table-cell/> - </table:table-row> - <table:table-row table:style-name="ro2" table:number-rows-repeated="16"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="26"> <table:table-cell/> <table:table-cell table:style-name="ce15"/> <table:table-cell/> @@ -3513,16 +3476,11 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <calcext:conditional-formats> - <calcext:conditional-format calcext:target-range-address="Sheet1.B8:Sheet1.B38"> + <calcext:conditional-format calcext:target-range-address="Sheet1.B8:Sheet1.B38 Sheet1.B3:Sheet1.B3"> <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet1.B8"/> <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet1.B8"/> <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet1.B8"/> </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet1.B3:Sheet1.B3"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet1.B3"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet1.B3"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet1.B3"/> - </calcext:conditional-format> </calcext:conditional-formats> </table:table> <table:table table:name="Sheet2" table:style-name="ta1" table:print="false"> @@ -3538,16 +3496,15 @@ <table:table-column table:style-name="co12" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co13" table:default-cell-style-name="Default"/> - <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co14" table:default-cell-style-name="Default"/> - <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co3" table:number-columns-repeated="4" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co15" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co3" table:number-columns-repeated="3" table:default-cell-style-name="Default"/> - <table:table-column table:style-name="co14" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co16" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="Default"/> - <table:table-column table:style-name="co14" table:default-cell-style-name="Default"/> + <table:table-column table:style-name="co16" table:default-cell-style-name="Default"/> <table:table-column table:style-name="co3" table:number-columns-repeated="2" table:default-cell-style-name="Default"/> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string"> <text:p>Function</text:p> </table:table-cell> @@ -3581,7 +3538,7 @@ <text:p>finish time</text:p> </table:table-cell> <table:table-cell table:style-name="ce50" office:value-type="string" calcext:value-type="string"> - <text:p>time taken</text:p> + <text:p>time taken (s)</text:p> </table:table-cell> <table:table-cell table:style-name="ce12"/> <table:table-cell/> @@ -3592,17 +3549,17 @@ <table:table-cell table:style-name="ce38"/> <table:table-cell table:style-name="ce55"/> <table:table-cell table:style-name="ce56"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19" table:formula="of:=RANK(5; {3|5|2.6|1}; 1)" office:value-type="float" office:value="4" calcext:value-type="float"> <text:p>4</text:p> </table:table-cell> <table:table-cell table:style-name="ce19" office:value-type="float" office:value="4" calcext:value-type="float"> <text:p>4</text:p> </table:table-cell> - <table:table-cell table:style-name="ce26" 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="ce25" table:formula="of:=ROUND([.A2];12)=ROUND([.B2];12)" 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="ce32" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=RANK(5, {3;5;2.6;1}, 1)" calcext:value-type="string"> @@ -3633,18 +3590,18 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell table:style-name="ce60" table:number-columns-spanned="3" table:number-rows-spanned="1"/> - <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce25"/> + <table:covered-table-cell table:number-columns-repeated="2" table:style-name="ce20"/> <table:table-cell table:style-name="ce60" table:number-columns-spanned="3" table:number-rows-spanned="1"/> <table:covered-table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19" table:formula="of:=RANK(5;[.G1:.G4])" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> <table:table-cell table:style-name="ce19" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> - <table:table-cell table:style-name="ce26" 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="ce25" table:formula="of:=ROUND([.A3];12)=ROUND([.B3];12)" 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="ce32" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=RANK(5,G1:G4)" calcext:value-type="string"> @@ -3667,8 +3624,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M45S" calcext:value-type="time"> <text:p>34:45</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L3]-[.K3]" office:value-type="time" office:time-value="PT00H17M34S" calcext:value-type="time"> - <text:p>17:34</text:p> + <table:table-cell table:formula="of:=INT(([.L3]-[.K3])*86400)" office:value-type="float" office:value="1054" calcext:value-type="float"> + <text:p>1054</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell office:value-type="float" office:value="4" calcext:value-type="float"> @@ -3683,17 +3640,17 @@ <table:table-cell/> <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19" table:formula="of:=RANK([.I3];[.I2:.I6];1)" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> - <table:table-cell table:style-name="ce26" 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="ce25" table:formula="of:=ROUND([.A4];12)=ROUND([.B4];12)" 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="ce32" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=RANK(I3,I2:I6,1)" calcext:value-type="string"> @@ -3714,8 +3671,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M47S" calcext:value-type="time"> <text:p>34:47</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L4]-[.K4]" office:value-type="time" office:time-value="PT00H17M35S" calcext:value-type="time"> - <text:p>17:35</text:p> + <table:table-cell table:formula="of:=INT(([.L4]-[.K4])*86400)" office:value-type="float" office:value="1055" calcext:value-type="float"> + <text:p>1055</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell office:value-type="float" office:value="8" calcext:value-type="float"> @@ -3729,17 +3686,17 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19" table:formula="of:=RANK([.I2];[.I2:.I6];1)" office:value-type="float" office:value="5" calcext:value-type="float"> <text:p>5</text:p> </table:table-cell> <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="ce28" 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="ce25" table:formula="of:=ROUND([.A5];12)=ROUND([.B5];12)" 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="ce32" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=RANK(I2,I2:I6,1)" calcext:value-type="string"> @@ -3757,8 +3714,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M45S" calcext:value-type="time"> <text:p>34:45</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L5]-[.K5]" office:value-type="time" office:time-value="PT00H17M32S" calcext:value-type="time"> - <text:p>17:32</text:p> + <table:table-cell table:formula="of:=INT(([.L5]-[.K5])*86400)" office:value-type="float" office:value="1052" calcext:value-type="float"> + <text:p>1052</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell office:value-type="float" office:value="128" calcext:value-type="float"> @@ -3768,17 +3725,17 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:formula="of:=RANK([.M3];[.M$3:.M$9];1)" office:value-type="float" office:value="6" calcext:value-type="float"> - <text:p>6</text:p> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=RANK([.M3];[.M$3:.M$9];1)" office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="6" calcext:value-type="float"> - <text:p>6</text:p> + <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="ce28" 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="ce25" table:formula="of:=ROUND([.A6];12)=ROUND([.B6];12)" 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="ce32" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=RANK(M3,M$3:M$9,1)" calcext:value-type="string"> @@ -3796,8 +3753,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M43S" calcext:value-type="time"> <text:p>34:43</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L6]-[.K6]" office:value-type="time" office:time-value="PT00H17M29S" calcext:value-type="time"> - <text:p>17:29</text:p> + <table:table-cell table:formula="of:=INT(([.L6]-[.K6])*86400)" office:value-type="float" office:value="1049" calcext:value-type="float"> + <text:p>1049</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce52"/> @@ -3805,17 +3762,17 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.M4];[.M$3:.M$9];1)" office:value-type="float" office:value="7" calcext:value-type="float"> <text:p>7</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="7" calcext:value-type="float"> <text:p>7</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A7];12)=ROUND([.B7];12)" 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="ce32" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=RANK(M4,M$3:M$9,1)" calcext:value-type="string"> @@ -3831,24 +3788,24 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M50S" calcext:value-type="time"> <text:p>34:50</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L7]-[.K7]" office:value-type="time" office:time-value="PT00H17M34S" calcext:value-type="time"> - <text:p>17:34</text:p> + <table:table-cell table:formula="of:=INT(([.L7]-[.K7])*86400)" office:value-type="float" office:value="1054" calcext:value-type="float"> + <text:p>1054</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.M5];[.M$3:.M$9];1)" office:value-type="float" office:value="4" calcext:value-type="float"> <text:p>4</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="4" calcext:value-type="float"> <text:p>4</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A8];12)=ROUND([.B8];12)" 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="ce32" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=RANK(M5,M$3:M$9,1)" calcext:value-type="string"> @@ -3865,8 +3822,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M45S" calcext:value-type="time"> <text:p>34:45</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L8]-[.K8]" office:value-type="time" office:time-value="PT00H17M28S" calcext:value-type="time"> - <text:p>17:28</text:p> + <table:table-cell table:formula="of:=INT(([.L8]-[.K8])*86400)" office:value-type="float" office:value="1048" calcext:value-type="float"> + <text:p>1048</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce17" table:number-columns-repeated="4"/> @@ -3874,17 +3831,17 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.M6];[.M$3:.M$9];1)" office:value-type="float" office:value="2" calcext:value-type="float"> <text:p>2</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> <text:p>2</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A9];12)=ROUND([.B9];12)" 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="ce32" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=RANK(M6,M$3:M$9,1)" calcext:value-type="string"> @@ -3900,8 +3857,8 @@ <table:table-cell table:style-name="ce50" office:value-type="time" office:time-value="PT00H34M47S" calcext:value-type="time"> <text:p>34:47</text:p> </table:table-cell> - <table:table-cell table:style-name="ce50" table:formula="of:=[.L9]-[.K9]" office:value-type="time" office:time-value="PT00H17M29S" calcext:value-type="time"> - <text:p>17:29</text:p> + <table:table-cell table:formula="of:=INT(([.L9]-[.K9])*86400)" office:value-type="float" office:value="1049" calcext:value-type="float"> + <text:p>1049</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce53"/> @@ -3909,17 +3866,17 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.M7];[.M$3:.M$9];1)" office:value-type="float" office:value="5" calcext:value-type="float"> <text:p>5</text:p> </table:table-cell> <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="ce28" 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="ce25" table:formula="of:=ROUND([.A10];12)=ROUND([.B10];12)" 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="ce32" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=RANK(M7,M$3:M$9,1)" calcext:value-type="string"> @@ -3934,17 +3891,17 @@ <table:table-cell table:style-name="ce53" table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.M8];[.M$3:.M$9];1)" office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> </table:table-cell> <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="ce28" 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="ce25" table:formula="of:=ROUND([.A11];12)=ROUND([.B11];12)" 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="ce32" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=RANK(M8,M$3:M$9,1)" calcext:value-type="string"> @@ -3956,22 +3913,22 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce38"/> <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:formula="of:=RANK([.M9];[.M$3:.M$9];1)" office:value-type="float" office:value="3" calcext:value-type="float"> - <text:p>3</text:p> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=RANK([.M9];[.M$3:.M$9];1)" office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="3" calcext:value-type="float"> - <text:p>3</text:p> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A12];12)=ROUND([.B12];12)" 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="ce32" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=RANK(M9,M$3:M$9,1)" calcext:value-type="string"> @@ -3985,21 +3942,21 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce38"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK([.H3];[.H1:.H3])" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>#VALUE!</text:p> </table:table-cell> <table:table-cell table:formula="of:=#VALUE!" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>#VALUE!</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=ISERROR([.A13])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <table:table-cell table:style-name="ce25" table:formula="of:=ISERROR([.A13])" 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="ce32" table:formula="of:=FORMULA([.A13])" office:value-type="string" office:string-value="=RANK(H3,H1:H3)" calcext:value-type="string"> @@ -4010,20 +3967,20 @@ <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce38" table:number-columns-repeated="3"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK(32;[.P1:.R5])" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> <table:table-cell table:style-name="ce19" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A14];12)=ROUND([.B14];12)" 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="ce32" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="=RANK(32,P1:R5)" calcext:value-type="string"> @@ -4034,20 +3991,20 @@ <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce19" table:number-columns-repeated="2"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:formula="of:=RANK(32;([.Q1:.Q5]~[.P1:.P5]~[.R1:.R5]))" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> <table:table-cell table:style-name="ce19" office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" 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="ce25" table:formula="of:=ROUND([.A15];12)=ROUND([.B15];12)" 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="ce32" table:formula="of:=FORMULA([.A15])" office:value-type="string" office:string-value="=RANK(32,(Q1:Q5~P1:P5~R1:R5))" calcext:value-type="string"> @@ -4060,16 +4017,16 @@ <table:table-cell/> <table:table-cell table:style-name="ce19" table:number-columns-repeated="2"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce21"/> <table:table-cell table:style-name="ce19"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce57"/> @@ -4078,16 +4035,16 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce57"/> @@ -4097,16 +4054,16 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce58"/> @@ -4116,16 +4073,16 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce19"/> @@ -4134,16 +4091,16 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce19"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce19"/> @@ -4152,32 +4109,32 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:style-name="ce19"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="3"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="3"> <table:table-cell table:style-name="ce21"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce19"/> @@ -4186,16 +4143,16 @@ <table:table-cell table:style-name="ce19"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce21"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell table:style-name="ce19"/> @@ -4204,64 +4161,64 @@ <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce21"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="7"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="7"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="3"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="3"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce36"/> @@ -4270,80 +4227,80 @@ <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="6"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="6"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="3"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="3"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce37"/> @@ -4352,382 +4309,242 @@ <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="4"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="4"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce46" table:number-columns-repeated="2"/> <table:table-cell/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="13"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="13"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="27"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="27"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell/> <table:table-cell table:style-name="genauSF" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="5"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="5"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="47"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="47"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="54"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="54"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="3"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="22"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="22"> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce24"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="94"> - <table:table-cell table:style-name="ce25"/> + <table:table-row table:style-name="ro2" table:number-rows-repeated="94"> + <table:table-cell table:style-name="ce20"/> <table:table-cell/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="4"> + <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="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:style-name="ce44"/> <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2"> + <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="ce28"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="3"> + <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="ce59"/> <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="9"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="220"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="220"> <table:table-cell table:number-columns-repeated="13"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="49"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="49"> <table:table-cell table:number-columns-repeated="13"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="ce55"/> <table:table-cell/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="2"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="2"/> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="2490"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="2490"> <table:table-cell table:number-columns-repeated="13"/> <table:table-cell table:style-name="ce55"/> - <table:table-cell table:style-name="ce25" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce20" table:number-columns-repeated="4"/> <table:table-cell table:number-columns-repeated="9"/> </table:table-row> - <table:table-row table:style-name="ro5" table:number-rows-repeated="1045485"> + <table:table-row table:style-name="ro2" table:number-rows-repeated="1045485"> <table:table-cell table:number-columns-repeated="27"/> </table:table-row> - <table:table-row table:style-name="ro5"> + <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="27"/> </table:table-row> <calcext:conditional-formats> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C2:Sheet2.C328"> - <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.C2:Sheet2.C328"> - <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.C2:Sheet2.C328"> <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.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> - <calcext:conditional-format calcext:target-range-address="Sheet2.C5:Sheet2.C328"> - <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C5"/> - <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C5"/> - </calcext:conditional-format> </calcext:conditional-formats> </table:table> <table:named-expressions> diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index cc3672cbdbeb..57ab5aec29a2 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4433,6 +4433,7 @@ StackVar ScInterpreter::Interpret() case SvNumFormatType::DATE: case SvNumFormatType::TIME: case SvNumFormatType::DATETIME: + case SvNumFormatType::DURATION: nRetIndexExpr = nFuncFmtIndex; break; default: @@ -4547,13 +4548,26 @@ StackVar ScInterpreter::Interpret() // unnecessarily duplicate the information. if (pCur->GetDoubleType() != 0) { - const double fVal = PopDouble(); + double fVal = PopDouble(); if (!bForcedResultType) { if (nCurFmtType != nFuncFmtType) nRetIndexExpr = 0; // carry format index only for matching type nRetTypeExpr = nFuncFmtType = nCurFmtType; } + if (nRetTypeExpr == SvNumFormatType::DURATION) + { + // Round the duration in case a wall clock time + // display format is used instead of a duration + // format. To micro seconds which then catches + // the converted hh:mm:ss.9999997 cases. + if (fVal != 0.0) + { + fVal *= 86400.0; + fVal = rtl::math::round( fVal, 6); + fVal /= 86400.0; + } + } PushTempToken( CreateFormulaDoubleToken( fVal)); } if ( nFuncFmtType == SvNumFormatType::UNDEFINED ) @@ -4663,6 +4677,11 @@ StackVar ScInterpreter::Interpret() else nRetFmtType = SvNumFormatType::NUMBER; + // Currently (2019-05-06) nothing else can cope with a duration format + // type, change to time as it was before. + if (nRetFmtType == SvNumFormatType::DURATION) + nRetFmtType = SvNumFormatType::TIME; + if (nGlobalError != FormulaError::NONE && GetStackType() != svError ) PushError( nGlobalError); diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index b18ddd7fb673..aefb26c920e3 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -1129,15 +1129,16 @@ ScMatrixRef ScInterpreter::MatConcat(const ScMatrixRef& pMat1, const ScMatrixRef return xResMat; } -// for DATE, TIME, DATETIME +// for DATE, TIME, DATETIME, DURATION static void lcl_GetDiffDateTimeFmtType( SvNumFormatType& nFuncFmt, SvNumFormatType nFmt1, SvNumFormatType nFmt2 ) { if ( nFmt1 != SvNumFormatType::UNDEFINED || nFmt2 != SvNumFormatType::UNDEFINED ) { if ( nFmt1 == nFmt2 ) { - if ( nFmt1 == SvNumFormatType::TIME || nFmt1 == SvNumFormatType::DATETIME ) - nFuncFmt = SvNumFormatType::TIME; // times result in time + if ( nFmt1 == SvNumFormatType::TIME || nFmt1 == SvNumFormatType::DATETIME + || nFmt1 == SvNumFormatType::DURATION ) + nFuncFmt = SvNumFormatType::DURATION; // times result in time duration // else: nothing special, number (date - date := days) } else if ( nFmt1 == SvNumFormatType::UNDEFINED ) @@ -1181,6 +1182,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) case SvNumFormatType::DATE : case SvNumFormatType::TIME : case SvNumFormatType::DATETIME : + case SvNumFormatType::DURATION : nFmt2 = nCurFmtType; break; case SvNumFormatType::CURRENCY : @@ -1203,6 +1205,7 @@ void ScInterpreter::CalculateAddSub(bool _bSub) case SvNumFormatType::DATE : case SvNumFormatType::TIME : case SvNumFormatType::DATETIME : + case SvNumFormatType::DURATION : nFmt1 = nCurFmtType; break; case SvNumFormatType::CURRENCY : |