diff options
| author | Eike Rathke <erack@redhat.com> | 2016-06-30 18:49:36 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-06-30 18:53:50 +0200 |
| commit | 14e31d6cf4c4ba8a28b932c77994bc905686dba5 (patch) | |
| tree | 4c1ca786a1f9e108457c51d10eb3f4d88638af6f | |
| parent | ad59dcf7dad19540403f5812677901e6fad30257 (diff) | |
Resolves: tdf#100440 check mode to be 0 or 1 for MONTHS(), YEARS() and WEEKS()
Needed to adapt the WEEKS and YEARS test documents to cope with the
change.
Change-Id: Ia52505418f4fed684bd04290c608e2a65eee2fbc
| -rw-r--r-- | sc/qa/unit/data/functions/fods/weeks.fods | 485 | ||||
| -rw-r--r-- | sc/qa/unit/data/functions/fods/years.fods | 539 | ||||
| -rw-r--r-- | scaddins/source/datefunc/datefunc.cxx | 9 |
3 files changed, 518 insertions, 515 deletions
diff --git a/sc/qa/unit/data/functions/fods/weeks.fods b/sc/qa/unit/data/functions/fods/weeks.fods index 3c7b728e90cc..0002995ff9da 100644 --- a/sc/qa/unit/data/functions/fods/weeks.fods +++ b/sc/qa/unit/data/functions/fods/weeks.fods @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2016-06-16T20:38:26.745575429</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/131e604073f89e6c1dd54be88b94b7befd881f2e</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="76" meta:object-count="0"/></office:meta> + <office:meta><meta:creation-date>2016-06-16T20:38:26.745575429</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/6402c19c9b4d51dd7feaa3129b6f15b20704d356</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="76" 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">35796</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">12440</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">12426</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> @@ -30,8 +30,8 @@ <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> </config:config-item-map-entry> <config:config-item-map-entry config:name="Sheet2"> - <config:config-item config:name="CursorPositionX" config:type="int">2</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">15</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">2</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> @@ -48,7 +48,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">1540</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> @@ -88,10 +88,12 @@ <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> <config:config-item config:name="GridColor" config:type="long">12632256</config:config-item> <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Lexmark-E352dn</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">cs</config:config-item> @@ -115,14 +117,12 @@ <config:config-item config:name="EndLine" config:type="string"/> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> - <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item> <config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item> <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> <config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">qQH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAzwAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">hAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAqgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> </config:config-item-set> @@ -146,259 +146,248 @@ </office:font-face-decls> <office:styles> <style:default-style style:family="table-cell"> - <style:paragraph-properties style:tab-stop-distance="12.7mm"/> + <style:paragraph-properties style:tab-stop-distance="36pt"/> <style:text-properties style:font-name="Liberation Sans" fo:language="en" fo:country="US" style:font-name-asian="DejaVu Sans" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans" style:language-complex="hi" style:country-complex="IN"/> </style:default-style> <number:number-style style:name="N0"> <number:number number:min-integer-digits="1"/> </number:number-style> - <number:currency-style style:name="N108P0" style:volatile="true"> + <number:currency-style style:name="N122P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N108"> + <number:currency-style style:name="N122"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N108P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N122P0"/> </number:currency-style> - <number:currency-style style:name="N110P0" style:volatile="true"> + <number:currency-style style:name="N124P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N110"> + <number:currency-style style:name="N124"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N110P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N124P0"/> </number:currency-style> - <number:currency-style style:name="N112P0" style:volatile="true"> + <number:currency-style style:name="N126P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N112"> + <number:currency-style style:name="N126"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N112P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N126P0"/> </number:currency-style> - <number:currency-style style:name="N113P0" style:volatile="true"> + <number:currency-style style:name="N127P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N113"> + <number:currency-style style:name="N127"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N113P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N127P0"/> </number:currency-style> - <number:currency-style style:name="N114P0" style:volatile="true"> + <number:currency-style style:name="N128P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N114"> + <number:currency-style style:name="N128"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N114P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N128P0"/> </number:currency-style> - <number:currency-style style:name="N116P0" style:volatile="true"> + <number:currency-style style:name="N130P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N116"> + <number:currency-style style:name="N130"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N116P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N130P0"/> </number:currency-style> - <number:number-style style:name="N118P0" style:volatile="true"> + <number:number-style style:name="N132P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> </number:number-style> - <number:number-style style:name="N118"> + <number:number-style style:name="N132"> <number:text>(</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text>)</number:text> - <style:map style:condition="value()>=0" style:apply-style-name="N118P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N132P0"/> </number:number-style> - <number:number-style style:name="N120P0" style:volatile="true"> + <number:number-style style:name="N134P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> </number:number-style> - <number:number-style style:name="N120"> + <number:number-style style:name="N134"> <number:text>(</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text>)</number:text> - <style:map style:condition="value()>=0" style:apply-style-name="N120P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N134P0"/> </number:number-style> - <number:currency-style style:name="N122P0" style:volatile="true"> + <number:currency-style style:name="N136P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N122"> + <number:currency-style style:name="N136"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N122P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N136P0"/> </number:currency-style> - <number:currency-style style:name="N124P0" style:volatile="true"> + <number:currency-style style:name="N138P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N124"> + <number:currency-style style:name="N138"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N124P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N138P0"/> </number:currency-style> - <number:currency-style style:name="N126P0" style:volatile="true"> + <number:currency-style style:name="N140P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N126"> + <number:currency-style style:name="N140"> <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N126P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N140P0"/> </number:currency-style> - <number:currency-style style:name="N127P0" style:volatile="true"> + <number:currency-style style:name="N141P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N127"> + <number:currency-style style:name="N141"> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N127P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N141P0"/> </number:currency-style> - <number:currency-style style:name="N128P0" style:volatile="true"> + <number:currency-style style:name="N142P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N128"> + <number:currency-style style:name="N142"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N128P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N142P0"/> </number:currency-style> - <number:currency-style style:name="N130P0" style:volatile="true"> + <number:currency-style style:name="N144P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N130"> + <number:currency-style style:name="N144"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N130P0"/> - </number:currency-style> - <number:currency-style style:name="N132P0" style:volatile="true"> - <number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol> - <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - </number:currency-style> - <number:currency-style style:name="N132"> - <style:text-properties fo:color="#ff0000"/> - <number:text>-</number:text> - <number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol> - <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N132P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N144P0"/> </number:currency-style> - <number:number-style style:name="N133"> + <number:number-style style:name="N146"> <number:number number:decimal-places="9" loext:min-decimal-places="9" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N134"> + <number:number-style style:name="N147"> <number:number number:decimal-places="8" loext:min-decimal-places="8" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N135"> + <number:number-style style:name="N148"> <number:number number:decimal-places="10" loext:min-decimal-places="10" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N136"> + <number:number-style style:name="N149"> <number:number number:decimal-places="11" loext:min-decimal-places="11" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N137"> + <number:number-style style:name="N150"> <number:number number:decimal-places="12" loext:min-decimal-places="12" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N138"> + <number:number-style style:name="N151"> <number:number number:decimal-places="13" loext:min-decimal-places="13" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N139"> + <number:number-style style:name="N152"> <number:number number:decimal-places="14" loext:min-decimal-places="14" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N140"> + <number:number-style style:name="N153"> <number:number number:decimal-places="15" loext:min-decimal-places="15" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N141"> + <number:number-style style:name="N154"> <number:number number:decimal-places="16" loext:min-decimal-places="16" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N142"> + <number:number-style style:name="N155"> <number:number number:decimal-places="17" loext:min-decimal-places="17" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N143"> + <number:number-style style:name="N156"> <number:number number:decimal-places="18" loext:min-decimal-places="18" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N144"> + <number:number-style style:name="N157"> <number:number number:decimal-places="1" loext:min-decimal-places="1" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N145"> + <number:number-style style:name="N158"> <number:number number:decimal-places="3" loext:min-decimal-places="3" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N146"> + <number:number-style style:name="N159"> <number:number number:decimal-places="4" loext:min-decimal-places="4" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N147"> + <number:number-style style:name="N160"> <number:number number:decimal-places="5" loext:min-decimal-places="5" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N148"> + <number:number-style style:name="N161"> <number:number number:decimal-places="6" loext:min-decimal-places="6" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N149"> + <number:number-style style:name="N162"> <number:number number:decimal-places="7" loext:min-decimal-places="7" number:min-integer-digits="1"/> </number:number-style> - <number:currency-style style:name="N151P0" style:volatile="true"> + <number:currency-style style:name="N164P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N151"> + <number:currency-style style:name="N164"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N151P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N164P0"/> </number:currency-style> - <number:number-style style:name="N153P0" style:volatile="true"> + <number:number-style style:name="N166P0" style:volatile="true"> <number:text/> </number:number-style> - <number:currency-style style:name="N153"> + <number:currency-style style:name="N166"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N153P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N166P0"/> </number:currency-style> - <number:date-style style:name="N154"> + <number:date-style style:name="N167"> <number:day-of-week/> <number:text> </number:text> <number:day number:style="long"/> @@ -407,7 +396,7 @@ <number:text>/</number:text> <number:year/> </number:date-style> - <number:date-style style:name="N155"> + <number:date-style style:name="N168"> <number:day-of-week number:style="long"/> <number:text> </number:text> <number:day number:style="long"/> @@ -422,7 +411,7 @@ <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/> </style:style> - <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N108"/> + <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/> <style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> <style:paragraph-properties fo:text-align="center"/> @@ -440,64 +429,64 @@ </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="65.51mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="185.7pt"/> </style:style> <style:style style:name="co2" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="89.08mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="252.51pt"/> </style:style> <style:style style:name="co3" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="22.58mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="64.01pt"/> </style:style> <style:style style:name="co4" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="43.9mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="124.44pt"/> </style:style> <style:style style:name="co5" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="25.65mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="72.71pt"/> </style:style> <style:style style:name="co6" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="26.18mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="74.21pt"/> </style:style> <style:style style:name="co7" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="105.39mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="298.74pt"/> </style:style> <style:style style:name="co8" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="49.72mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="140.94pt"/> </style:style> <style:style style:name="co9" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="5.8mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="16.44pt"/> </style:style> <style:style style:name="co10" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="25.12mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="71.21pt"/> </style:style> <style:style style:name="co11" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="10.04mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="28.46pt"/> </style:style> <style:style style:name="ro1" style:family="table-row"> - <style:table-row-properties style:row-height="8.63mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="24.46pt" 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="4.52mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="6.12mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="5.29mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="4.66mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="13.21pt" 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="37.48mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="106.24pt" 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"/> </style:style> <number:date-style style:name="N36" number:automatic-order="true"> - <number:day number:style="long"/> - <number:text>.</number:text> <number:month number:style="long"/> - <number:text>.</number:text> + <number:text>/</number:text> + <number:day number:style="long"/> + <number:text>/</number:text> <number:year number:style="long"/> </number:date-style> <number:boolean-style style:name="N99"> @@ -506,40 +495,40 @@ <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"/> <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="start" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="start" fo:margin-left="0pt"/> <style:text-properties fo:font-size="20pt" fo:font-weight="bold" style:font-size-asian="20pt" style:font-weight-asian="bold" style:font-size-complex="20pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce4" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-size="12pt" fo:font-weight="bold" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-size-complex="12pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> </style:style> <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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="ce7" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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"/> </style:style> <style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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"/> @@ -550,7 +539,7 @@ </style:style> <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default"> @@ -564,116 +553,124 @@ </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="0mm"/> + <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="ce15" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> + <style:text-properties style:font-name="Liberation Sans" style:font-name-asian="Droid Sans Fallback" style:font-name-complex="Droid Sans Devanagari"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> </style:style> <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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.C3"/> + <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> + <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> + </style:style> + <style:style style:name="ce17" 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.C7"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C7"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C7"/> </style:style> - <style:style style:name="ce17" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce18" 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="0mm"/> + <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.C7"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C7"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C7"/> </style:style> - <style:style style:name="ce18" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce19" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C10"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C10"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C10"/> </style:style> - <style:style style:name="ce19" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce20" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> </style:style> - <style:style style:name="ce20" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce21" 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="0mm"/> + <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="ce21" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce22" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C16"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C16"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C16"/> </style:style> - <style:style style:name="ce22" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce23" 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="start" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="start" fo:margin-left="0pt"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C17"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C17"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C17"/> </style:style> - <style:style style:name="ce23" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce24" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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="ce24" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce25" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce25" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce27" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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="ce27" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce28" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Liberation Serif" style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/> </style:style> - <style:style style:name="ce28" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"> + <style:style style:name="ce30" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="ce30" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"/> + <style:style style:name="ce31" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"/> <style:style style:name="ta_extref" style:family="table"> <style:table-properties table:display="false"/> </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties style:writing-mode="lr-tb"/> <style:header-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm"/> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-bottom="7.09pt"/> </style:header-style> <style:footer-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm"/> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-top="7.09pt"/> </style:footer-style> </style:page-layout> <style:page-layout style:name="pm2"> <style:page-layout-properties style:writing-mode="lr-tb"/> <style:header-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm" fo:border="2.49pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-bottom="7.09pt" fo:border="2.49pt solid #000000" fo:padding="0.51pt" fo:background-color="#c0c0c0"> <style:background-image/> </style:header-footer-properties> </style:header-style> <style:footer-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm" fo:border="2.49pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-top="7.09pt" fo:border="2.49pt solid #000000" fo:padding="0.51pt" fo:background-color="#c0c0c0"> <style:background-image/> </style:header-footer-properties> </style:footer-style> @@ -711,7 +708,7 @@ <text:p><text:sheet-name>???</text:sheet-name> (<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2016-06-18">00.00.0000</text:date>, <text:time style:data-style-name="N2" text:time-value="19:07:01.341169821">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2016-06-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="18:30:02.161604013">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -743,7 +740,7 @@ <text:p>Result</text:p> </table:table-cell> <table:table-cell table:style-name="ce6" table:formula="of:=AND([.B8:.B95])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> <table:table-cell/> </table:table-row> @@ -766,7 +763,7 @@ <text:p>1</text:p> </table:table-cell> <table:table-cell table:style-name="ce7" table:formula="of:=AND([Sheet2.C2:.C49])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Simple WEEKS formulas with local references and values</text:p> @@ -835,15 +832,15 @@ <text:p>Comment</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>DATA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:style-name="ce5" table:number-matrix-columns-spanned="1" table:number-matrix-rows-spanned="7" table:formula="of:={1|0|0|0|0|0|1}" office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:formula="of:=ORG.OPENOFFICE.WEEKS([.K2];[.K3];[.K4:.K6])" office:value-type="string" office:string-value="" calcext:value-type="error"> @@ -853,14 +850,14 @@ <text:p>err</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=ISERROR([.A2])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=WEEKS(K2;K3;K4:K6)" calcext:value-type="string"> - <text:p>=WEEKS(K2;K3;K4:K6)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=WEEKS(K2,K3,K4:K6)" calcext:value-type="string"> + <text:p>=WEEKS(K2,K3,K4:K6)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2014-11-01" calcext:value-type="date"> - <text:p>01.11.2014</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-01" calcext:value-type="date"> + <text:p>11/01/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -868,22 +865,22 @@ </table:table-cell> <table:table-cell/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.WEEKS([.K2];[.K2];[.K2])" office:value-type="float" office:value="0" calcext:value-type="float"> - <text:p>0</text:p> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.WEEKS([.K2];[.K2];[.K2])" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>Err:502</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="0" calcext:value-type="float"> - <text:p>0</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce15" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A2])" 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="ce27" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=WEEKS(K2;K2;K2)" calcext:value-type="string"> - <text:p>=WEEKS(K2;K2;K2)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=WEEKS(K2,K2,K2)" calcext:value-type="string"> + <text:p>=WEEKS(K2,K2,K2)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2014-11-30" calcext:value-type="date"> - <text:p>30.11.2014</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-30" calcext:value-type="date"> + <text:p>11/30/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -898,22 +895,22 @@ <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="ce15" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=WEEKS(K2;K3;L2)" calcext:value-type="string"> - <text:p>=WEEKS(K2;K3;L2)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=WEEKS(K2,K3,L2)" calcext:value-type="string"> + <text:p>=WEEKS(K2,K3,L2)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> - <table:table-cell table:style-name="ce28"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2014-11-11" calcext:value-type="date"> - <text:p>11.11.2014</text:p> + <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-11" calcext:value-type="date"> + <text:p>11/11/2014</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> <text:p>0</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.WEEKS([.K2];[.K3];)" office:value-type="float" office:value="4" calcext:value-type="float"> @@ -922,15 +919,15 @@ <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="ce15" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=WEEKS(K2;K3;)" calcext:value-type="string"> - <text:p>=WEEKS(K2;K3;)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=WEEKS(K2,K3,)" calcext:value-type="string"> + <text:p>=WEEKS(K2,K3,)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2014-11-27" calcext:value-type="date"> - <text:p>27.11.2014</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-27" calcext:value-type="date"> + <text:p>11/27/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -945,15 +942,15 @@ <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="ce15" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=WEEKS(K3;K2;)" calcext:value-type="string"> - <text:p>=WEEKS(K3;K2;)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=WEEKS(K3,K2,)" calcext:value-type="string"> + <text:p>=WEEKS(K3,K2,)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2014-11-28" calcext:value-type="date"> - <text:p>28.11.2014</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-28" calcext:value-type="date"> + <text:p>11/28/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -968,22 +965,22 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ISERROR([.A7])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce17" table:formula="of:=ISERROR([.A7])" 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="ce27" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=WEEKS(K2;K2+6;;{1;0;1;0;1;0;1})" calcext:value-type="string"> - <text:p>=WEEKS(K2;K2+6;;{1;0;1;0;1;0;1})</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=WEEKS(K2,K2+6,,{1;0;1;0;1;0;1})" calcext:value-type="string"> + <text:p>=WEEKS(K2,K2+6,,{1;0;1;0;1;0;1})</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> - <table:table-cell table:style-name="ce28"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2001-12-24" calcext:value-type="date"> - <text:p>24.12.2001</text:p> + <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-24" calcext:value-type="date"> + <text:p>12/24/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:style-name="ce5" 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:table-cell table:style-name="ce29"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:formula="of:=ORG.OPENOFFICE.WEEKS(day1;day2;one)" office:value-type="float" office:value="4" calcext:value-type="float"> @@ -992,15 +989,15 @@ <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="ce17" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce18" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=WEEKS(day1;day2;one)" calcext:value-type="string"> - <text:p>=WEEKS(day1;day2;one)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=WEEKS(day1,day2,one)" calcext:value-type="string"> + <text:p>=WEEKS(day1,day2,one)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2001-12-25" calcext:value-type="date"> - <text:p>25.12.2001</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-25" calcext:value-type="date"> + <text:p>12/25/2001</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> @@ -1011,15 +1008,15 @@ <table:table-cell office:value-type="float" office:value="10" calcext:value-type="float"> <text:p>10</text:p> </table:table-cell> - <table:table-cell table:style-name="ce15" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=WEEKS(DATE(2014;1;15);DATE(2014;4;1);0)" calcext:value-type="string"> - <text:p>=WEEKS(DATE(2014;1;15);DATE(2014;4;1);0)</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=WEEKS(DATE(2014,1,15),DATE(2014,4,1),0)" calcext:value-type="string"> + <text:p>=WEEKS(DATE(2014,1,15),DATE(2014,4,1),0)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2001-12-26" calcext:value-type="date"> - <text:p>26.12.2001</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-26" calcext:value-type="date"> + <text:p>12/26/2001</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> @@ -1030,34 +1027,34 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce18" table:formula="of:=ISERROR([.A10])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce19" table:formula="of:=ISERROR([.A10])" 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="ce27" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=WEEKS(DATE(2014;11;1);DATE(2014;11;30);{"Hello";"Eike";"!"})" calcext:value-type="string"> - <text:p>=WEEKS(DATE(2014;11;1);DATE(2014;11;30);{"Hello";"Eike";"!"})</text:p> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=WEEKS(DATE(2014,11,1),DATE(2014,11,30),{"Hello";"Eike";"!"})" calcext:value-type="string"> + <text:p>=WEEKS(DATE(2014,11,1),DATE(2014,11,30),{"Hello";"Eike";"!"})</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>TDF#100409</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> - <table:table-cell table:style-name="ce28"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2001-12-31" calcext:value-type="date"> - <text:p>31.12.2001</text:p> + <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-31" calcext:value-type="date"> + <text:p>12/31/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce29" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> <table:table-cell table:style-name="Default"/> <table:table-cell table:number-columns-repeated="7"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2002-01-01" calcext:value-type="date"> - <text:p>01.01.2002</text:p> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2002-01-01" calcext:value-type="date"> + <text:p>01/01/2002</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce19"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:number-columns-repeated="7"/> <table:table-cell office:value-type="float" office:value="17" calcext:value-type="float"> <text:p>17</text:p> @@ -1066,47 +1063,47 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce19"/> - <table:table-cell table:style-name="ce27"/> - <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce28"/> - <table:table-cell table:style-name="ce30" office:value-type="date" office:date-value="2001-12-01" calcext:value-type="date"> - <text:p>01.12.2001</text:p> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-01" calcext:value-type="date"> + <text:p>12/01/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce29" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce20"/> - <table:table-cell table:style-name="ce27"/> + <table:table-cell table:style-name="ce21"/> + <table:table-cell table:style-name="ce28"/> <table:table-cell table:number-columns-repeated="10"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce12" table:formula="of:=ORG.OPENOFFICE.WEEKS(DATE(2014;1;15);DATE(2014;4;1);2)" office:value-type="float" office:value="10" calcext:value-type="float"> - <text:p>10</text:p> + <table:table-cell table:style-name="ce12" table:formula="of:=ORG.OPENOFFICE.WEEKS(DATE(2014;1;15);DATE(2014;4;1);2)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce21"/> - <table:table-cell table:style-name="ce27" table:formula="of:=FORMULA([.A16])" office:value-type="string" office:string-value="=WEEKS(DATE(2014;1;15);DATE(2014;4;1);2)" calcext:value-type="string"> - <text:p>=WEEKS(DATE(2014;1;15);DATE(2014;4;1);2)</text:p> + <table:table-cell table:style-name="ce22"/> + <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A16])" office:value-type="string" office:string-value="=WEEKS(DATE(2014,1,15),DATE(2014,4,1),2)" calcext:value-type="string"> + <text:p>=WEEKS(DATE(2014,1,15),DATE(2014,4,1),2)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Tdf#100440</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> - <table:table-cell table:style-name="ce29"/> - <table:table-cell table:style-name="ce28" table:number-columns-repeated="4"/> + <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce29" table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce22"/> + <table:table-cell table:style-name="ce23"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce23"/> + <table:table-cell table:style-name="ce24"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2"> @@ -1116,7 +1113,7 @@ </table:table-row> <table:table-row table:style-name="ro6"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce23"/> + <table:table-cell table:style-name="ce24"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell office:value-type="string" calcext:value-type="string"><text:p><text:span text:style-name="T1">WEEKS</text:span></text:p><text:p><text:span text:style-name="T2">Calculates the difference in weeks between two dates.</text:span></text:p><text:p><text:span text:style-name="T3">Syntax</text:span></text:p><text:p><text:span text:style-name="T4">WEEKS(StartDate; EndDate; Type)</text:span></text:p><text:p><text:span text:style-name="T5">StartDate</text:span><text:span text:style-name="T2"> is the first date</text:span></text:p><text:p><text:span text:style-name="T5">EndDate</text:span><text:span text:style-name="T2"> is the second date</text:span></text:p><text:p><text:span text:style-name="T5">Type</text:span><text:span text:style-name="T2"> calculates the type of difference. The possible values are 0 (interval) and 1 (in numbers of weeks).</text:span></text:p> </table:table-cell> @@ -1124,34 +1121,34 @@ </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="6"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce23"/> + <table:table-cell table:style-name="ce24"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce23"/> + <table:table-cell table:style-name="ce24"/> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce31"/> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce19"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce25"/> + <table:table-cell table:style-name="ce26"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="69"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce26"/> + <table:table-cell table:style-name="ce27"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="1048475"> @@ -1199,7 +1196,7 @@ </calcext:conditional-formats> </table:table> <table:table table:name="'file:///home/zdenek/Dokumenty/LO/sc-unit-test/Project%20Calc%20functions%20tests/fods/weeks.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods'#Sheet2" table:print="false" table:style-name="ta_extref"> - <table:table-source xlink:type="simple" xlink:href="weeks.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> + <table:table-source xlink:type="simple" xlink:href="/home/zdenek/Dokumenty/LO/sc-unit-test/Project%20Calc%20functions%20tests/fods/weeks.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> <table:table-column table:number-columns-repeated="8"/> <table:table-row table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="8"/> diff --git a/sc/qa/unit/data/functions/fods/years.fods b/sc/qa/unit/data/functions/fods/years.fods index 71ad7796a772..cd3ac27e652f 100644 --- a/sc/qa/unit/data/functions/fods/years.fods +++ b/sc/qa/unit/data/functions/fods/years.fods @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:drawooo="http://openoffice.org/2010/draw" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet"> - <office:meta><meta:creation-date>2016-06-16T21:00:15.480415068</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/131e604073f89e6c1dd54be88b94b7befd881f2e</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="84" meta:object-count="0"/></office:meta> + <office:meta><meta:creation-date>2016-06-16T21:00:15.480415068</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha0$Linux_X86_64 LibreOffice_project/6402c19c9b4d51dd7feaa3129b6f15b20704d356</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="84" 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">33007</config:config-item> - <config:config-item config:name="VisibleAreaHeight" config:type="int">15349</config:config-item> + <config:config-item config:name="VisibleAreaHeight" config:type="int">15335</config:config-item> <config:config-item-map-indexed config:name="Views"> <config:config-item-map-entry> <config:config-item config:name="ViewId" config:type="string">view1</config:config-item> @@ -30,8 +30,8 @@ <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> </config:config-item-map-entry> <config:config-item-map-entry config:name="Sheet2"> - <config:config-item config:name="CursorPositionX" config:type="int">4</config:config-item> - <config:config-item config:name="CursorPositionY" config:type="int">18</config:config-item> + <config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item> + <config:config-item config:name="CursorPositionY" config:type="int">2</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> @@ -48,7 +48,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">1540</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> @@ -88,10 +88,12 @@ <config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item> <config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item> + <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> + <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> <config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item> <config:config-item config:name="GridColor" config:type="long">12632256</config:config-item> <config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item> - <config:config-item config:name="PrinterName" config:type="string">Lexmark-E352dn</config:config-item> + <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item> <config:config-item-map-indexed config:name="ForbiddenCharacters"> <config:config-item-map-entry> <config:config-item config:name="Language" config:type="string">cs</config:config-item> @@ -115,14 +117,12 @@ <config:config-item config:name="EndLine" config:type="string"/> </config:config-item-map-entry> </config:config-item-map-indexed> - <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item> - <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item> <config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item> <config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item> <config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item> <config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item> <config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item> - <config:config-item config:name="PrinterSetup" config:type="base64Binary">qQH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAzwAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhCkR1cGxleDpOb25lAElucHV0U2xvdDpUcmF5MQBQYWdlU2l6ZTpBNAAAEgBDT01QQVRfRFVQTEVYX01PREUKAERVUExFWF9PRkY=</config:config-item> + <config:config-item config:name="PrinterSetup" config:type="base64Binary">hAH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMAqgAAAAAAAAAIAFZUAAAkbQAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6TGV0dGVyAAASAENPTVBBVF9EVVBMRVhfTU9ERQoARFVQTEVYX09GRg==</config:config-item> <config:config-item config:name="ApplyUserData" config:type="boolean">false</config:config-item> <config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item> </config:config-item-set> @@ -145,259 +145,248 @@ </office:font-face-decls> <office:styles> <style:default-style style:family="table-cell"> - <style:paragraph-properties style:tab-stop-distance="12.7mm"/> + <style:paragraph-properties style:tab-stop-distance="36pt"/> <style:text-properties style:font-name="Liberation Sans" fo:language="en" fo:country="US" style:font-name-asian="DejaVu Sans" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans" style:language-complex="hi" style:country-complex="IN"/> </style:default-style> <number:number-style style:name="N0"> <number:number number:min-integer-digits="1"/> </number:number-style> - <number:currency-style style:name="N108P0" style:volatile="true"> + <number:currency-style style:name="N122P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N108"> + <number:currency-style style:name="N122"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N108P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N122P0"/> </number:currency-style> - <number:currency-style style:name="N110P0" style:volatile="true"> + <number:currency-style style:name="N124P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N110"> + <number:currency-style style:name="N124"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N110P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N124P0"/> </number:currency-style> - <number:currency-style style:name="N112P0" style:volatile="true"> + <number:currency-style style:name="N126P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N112"> + <number:currency-style style:name="N126"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N112P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N126P0"/> </number:currency-style> - <number:currency-style style:name="N113P0" style:volatile="true"> + <number:currency-style style:name="N127P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N113"> + <number:currency-style style:name="N127"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N113P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N127P0"/> </number:currency-style> - <number:currency-style style:name="N114P0" style:volatile="true"> + <number:currency-style style:name="N128P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N114"> + <number:currency-style style:name="N128"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N114P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N128P0"/> </number:currency-style> - <number:currency-style style:name="N116P0" style:volatile="true"> + <number:currency-style style:name="N130P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N116"> + <number:currency-style style:name="N130"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N116P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N130P0"/> </number:currency-style> - <number:number-style style:name="N118P0" style:volatile="true"> + <number:number-style style:name="N132P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> </number:number-style> - <number:number-style style:name="N118"> + <number:number-style style:name="N132"> <number:text>(</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text>)</number:text> - <style:map style:condition="value()>=0" style:apply-style-name="N118P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N132P0"/> </number:number-style> - <number:number-style style:name="N120P0" style:volatile="true"> + <number:number-style style:name="N134P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> </number:number-style> - <number:number-style style:name="N120"> + <number:number-style style:name="N134"> <number:text>(</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text>)</number:text> - <style:map style:condition="value()>=0" style:apply-style-name="N120P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N134P0"/> </number:number-style> - <number:currency-style style:name="N122P0" style:volatile="true"> + <number:currency-style style:name="N136P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N122"> + <number:currency-style style:name="N136"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N122P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N136P0"/> </number:currency-style> - <number:currency-style style:name="N124P0" style:volatile="true"> + <number:currency-style style:name="N138P0" style:volatile="true"> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N124"> + <number:currency-style style:name="N138"> <number:text>-</number:text> <number:currency-symbol number:language="en" number:country="GB">£</number:currency-symbol> <loext:fill-character> </loext:fill-character> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N124P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N138P0"/> </number:currency-style> - <number:currency-style style:name="N126P0" style:volatile="true"> + <number:currency-style style:name="N140P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N126"> + <number:currency-style style:name="N140"> <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N126P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N140P0"/> </number:currency-style> - <number:currency-style style:name="N127P0" style:volatile="true"> + <number:currency-style style:name="N141P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N127"> + <number:currency-style style:name="N141"> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N127P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N141P0"/> </number:currency-style> - <number:currency-style style:name="N128P0" style:volatile="true"> + <number:currency-style style:name="N142P0" style:volatile="true"> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N128"> + <number:currency-style style:name="N142"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="0" loext:min-decimal-places="0" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N128P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N142P0"/> </number:currency-style> - <number:currency-style style:name="N130P0" style:volatile="true"> + <number:currency-style style:name="N144P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N130"> + <number:currency-style style:name="N144"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="0" number:min-integer-digits="1" number:decimal-replacement="--" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="cs" number:country="CZ">Kč</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N130P0"/> - </number:currency-style> - <number:currency-style style:name="N132P0" style:volatile="true"> - <number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol> - <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - </number:currency-style> - <number:currency-style style:name="N132"> - <style:text-properties fo:color="#ff0000"/> - <number:text>-</number:text> - <number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol> - <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N132P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N144P0"/> </number:currency-style> - <number:number-style style:name="N133"> + <number:number-style style:name="N146"> <number:number number:decimal-places="9" loext:min-decimal-places="9" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N134"> + <number:number-style style:name="N147"> <number:number number:decimal-places="8" loext:min-decimal-places="8" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N135"> + <number:number-style style:name="N148"> <number:number number:decimal-places="10" loext:min-decimal-places="10" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N136"> + <number:number-style style:name="N149"> <number:number number:decimal-places="11" loext:min-decimal-places="11" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N137"> + <number:number-style style:name="N150"> <number:number number:decimal-places="12" loext:min-decimal-places="12" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N138"> + <number:number-style style:name="N151"> <number:number number:decimal-places="13" loext:min-decimal-places="13" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N139"> + <number:number-style style:name="N152"> <number:number number:decimal-places="14" loext:min-decimal-places="14" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N140"> + <number:number-style style:name="N153"> <number:number number:decimal-places="15" loext:min-decimal-places="15" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N141"> + <number:number-style style:name="N154"> <number:number number:decimal-places="16" loext:min-decimal-places="16" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N142"> + <number:number-style style:name="N155"> <number:number number:decimal-places="17" loext:min-decimal-places="17" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N143"> + <number:number-style style:name="N156"> <number:number number:decimal-places="18" loext:min-decimal-places="18" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N144"> + <number:number-style style:name="N157"> <number:number number:decimal-places="1" loext:min-decimal-places="1" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N145"> + <number:number-style style:name="N158"> <number:number number:decimal-places="3" loext:min-decimal-places="3" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N146"> + <number:number-style style:name="N159"> <number:number number:decimal-places="4" loext:min-decimal-places="4" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N147"> + <number:number-style style:name="N160"> <number:number number:decimal-places="5" loext:min-decimal-places="5" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N148"> + <number:number-style style:name="N161"> <number:number number:decimal-places="6" loext:min-decimal-places="6" number:min-integer-digits="1"/> </number:number-style> - <number:number-style style:name="N149"> + <number:number-style style:name="N162"> <number:number number:decimal-places="7" loext:min-decimal-places="7" number:min-integer-digits="1"/> </number:number-style> - <number:currency-style style:name="N151P0" style:volatile="true"> + <number:currency-style style:name="N164P0" style:volatile="true"> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> </number:currency-style> - <number:currency-style style:name="N151"> + <number:currency-style style:name="N164"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N151P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N164P0"/> </number:currency-style> - <number:number-style style:name="N153P0" style:volatile="true"> + <number:number-style style:name="N166P0" style:volatile="true"> <number:text/> </number:number-style> - <number:currency-style style:name="N153"> + <number:currency-style style:name="N166"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> <number:text> </number:text> <number:currency-symbol number:language="fr" number:country="FR">€</number:currency-symbol> - <style:map style:condition="value()>=0" style:apply-style-name="N153P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N166P0"/> </number:currency-style> - <number:date-style style:name="N154"> + <number:date-style style:name="N167"> <number:day-of-week/> <number:text> </number:text> <number:day number:style="long"/> @@ -406,7 +395,7 @@ <number:text>/</number:text> <number:year/> </number:date-style> - <number:date-style style:name="N155"> + <number:date-style style:name="N168"> <number:day-of-week number:style="long"/> <number:text> </number:text> <number:day number:style="long"/> @@ -415,18 +404,18 @@ <number:text>/</number:text> <number:year/> </number:date-style> - <number:currency-style style:name="N157P0" style:volatile="true"> + <number:currency-style style:name="N170P0" style:volatile="true"> <number:currency-symbol number:language="de" number:country="AT">€</number:currency-symbol> <number:text> </number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> </number:currency-style> - <number:currency-style style:name="N157"> + <number:currency-style style:name="N170"> <style:text-properties fo:color="#ff0000"/> <number:text>-</number:text> <number:currency-symbol number:language="de" number:country="AT">€</number:currency-symbol> <number:text> </number:text> <number:number number:decimal-places="2" loext:min-decimal-places="2" number:min-integer-digits="1" number:grouping="true"/> - <style:map style:condition="value()>=0" style:apply-style-name="N157P0"/> + <style:map style:condition="value()>=0" style:apply-style-name="N170P0"/> </number:currency-style> <style:style style:name="Default" style:family="table-cell"> <style:text-properties style:font-name-asian="Droid Sans Fallback" style:font-family-asian="'Droid Sans Fallback'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="'Droid Sans Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable"/> @@ -434,7 +423,7 @@ <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/> </style:style> - <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N108"/> + <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/> <style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> <style:paragraph-properties fo:text-align="center"/> @@ -452,79 +441,79 @@ </office:styles> <office:automatic-styles> <style:style style:name="co1" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="65.51mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="185.7pt"/> </style:style> <style:style style:name="co2" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="89.08mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="252.51pt"/> </style:style> <style:style style:name="co3" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="22.58mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="64.01pt"/> </style:style> <style:style style:name="co4" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="43.9mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="124.44pt"/> </style:style> <style:style style:name="co5" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="25.65mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="72.71pt"/> </style:style> <style:style style:name="co6" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="26.18mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="74.21pt"/> </style:style> <style:style style:name="co7" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="77.51mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="219.71pt"/> </style:style> <style:style style:name="co8" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="49.72mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="140.94pt"/> </style:style> <style:style style:name="co9" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="5.8mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="16.44pt"/> </style:style> <style:style style:name="co10" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="25.12mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="71.21pt"/> </style:style> <style:style style:name="co11" style:family="table-column"> - <style:table-column-properties fo:break-before="auto" style:column-width="10.04mm"/> + <style:table-column-properties fo:break-before="auto" style:column-width="28.46pt"/> </style:style> <style:style style:name="ro1" style:family="table-row"> - <style:table-row-properties style:row-height="8.63mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="24.46pt" 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="4.52mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="6.12mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="5.29mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <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="4.66mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="13.21pt" 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="48.51mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="137.51pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro7" style:family="table-row"> - <style:table-row-properties style:row-height="16.28mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="46.15pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro8" style:family="table-row"> - <style:table-row-properties style:row-height="5.42mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="15.36pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro9" style:family="table-row"> - <style:table-row-properties style:row-height="12.36mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="35.04pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro10" style:family="table-row"> - <style:table-row-properties style:row-height="8.47mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="24.01pt" fo:break-before="auto" style:use-optimal-row-height="true"/> </style:style> <style:style style:name="ro11" style:family="table-row"> - <style:table-row-properties style:row-height="27.98mm" fo:break-before="auto" style:use-optimal-row-height="true"/> + <style:table-row-properties style:row-height="79.31pt" 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"/> </style:style> <number:date-style style:name="N36" number:automatic-order="true"> - <number:day number:style="long"/> - <number:text>.</number:text> <number:month number:style="long"/> - <number:text>.</number:text> + <number:text>/</number:text> + <number:day number:style="long"/> + <number:text>/</number:text> <number:year number:style="long"/> </number:date-style> <number:boolean-style style:name="N99"> @@ -533,40 +522,40 @@ <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default"/> <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="start" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="start" fo:margin-left="0pt"/> <style:text-properties fo:font-size="20pt" fo:font-weight="bold" style:font-size-asian="20pt" style:font-weight-asian="bold" style:font-size-complex="20pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-size="14pt" fo:font-weight="bold" style:font-size-asian="14pt" style:font-weight-asian="bold" style:font-size-complex="14pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce4" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-size="12pt" fo:font-weight="bold" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-size-complex="12pt" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> </style:style> <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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="ce7" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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"/> </style:style> <style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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"/> @@ -577,7 +566,7 @@ </style:style> <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> <style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default"> @@ -591,123 +580,131 @@ </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="0mm"/> + <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="ce15" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/> + <style:text-properties style:font-name="Liberation Sans" style:font-name-asian="Droid Sans Fallback" style:font-name-complex="Droid Sans Devanagari"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> </style:style> <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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.C3"/> + <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> + <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> + </style:style> + <style:style style:name="ce17" 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.C7"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C7"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C7"/> </style:style> - <style:style style:name="ce17" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce18" 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="0mm"/> + <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.C7"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C7"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C7"/> </style:style> - <style:style style:name="ce18" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce19" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C10"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C10"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C10"/> </style:style> - <style:style style:name="ce19" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce20" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C3"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C3"/> </style:style> - <style:style style:name="ce20" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce21" 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="0mm"/> + <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="ce21" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce22" 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="start" fo:margin-left="0mm"/> + <style:paragraph-properties fo:text-align="start" fo:margin-left="0pt"/> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C16"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C16"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C16"/> </style:style> - <style:style style:name="ce22" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce23" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C18"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C18"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C18"/> </style:style> - <style:style style:name="ce23" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99"> + <style:style style:name="ce24" 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="0mm"/> + <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.C19"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C19"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C19"/> </style:style> - <style:style style:name="ce24" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce25" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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="ce25" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce26" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce27" style:family="table-cell" style:parent-style-name="Default"> <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/> <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/> </style:style> - <style:style style:name="ce27" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce28" style:family="table-cell" style:parent-style-name="Default"> <style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/> - <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/> + <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:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties style:font-name="Liberation Serif" style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/> </style:style> - <style:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default"> + <style:style style:name="ce30" style:family="table-cell" style:parent-style-name="Default"> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="ce30" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"> + <style:style style:name="ce31" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"> <style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/> </style:style> - <style:style style:name="ce31" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"/> + <style:style style:name="ce32" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N36"/> <style:style style:name="ta_extref" style:family="table"> <style:table-properties table:display="false"/> </style:style> <style:page-layout style:name="pm1"> <style:page-layout-properties style:writing-mode="lr-tb"/> <style:header-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm"/> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-bottom="7.09pt"/> </style:header-style> <style:footer-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm"/> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-top="7.09pt"/> </style:footer-style> </style:page-layout> <style:page-layout style:name="pm2"> <style:page-layout-properties style:writing-mode="lr-tb"/> <style:header-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm" fo:border="2.49pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-bottom="7.09pt" fo:border="2.49pt solid #000000" fo:padding="0.51pt" fo:background-color="#c0c0c0"> <style:background-image/> </style:header-footer-properties> </style:header-style> <style:footer-style> - <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm" fo:border="2.49pt solid #000000" fo:padding="0.18mm" fo:background-color="#c0c0c0"> + <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-top="7.09pt" fo:border="2.49pt solid #000000" fo:padding="0.51pt" fo:background-color="#c0c0c0"> <style:background-image/> </style:header-footer-properties> </style:footer-style> @@ -730,7 +727,7 @@ <text:p><text:sheet-name>???</text:sheet-name> (<text:title>???</text:title>)</text:p> </style:region-left> <style:region-right> - <text:p><text:date style:data-style-name="N2" text:date-value="2016-06-18">00.00.0000</text:date>, <text:time style:data-style-name="N2" text:time-value="22:30:59.552401263">00:00:00</text:time></text:p> + <text:p><text:date style:data-style-name="N2" text:date-value="2016-06-30">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="18:45:16.504004319">00:00:00</text:time></text:p> </style:region-right> </style:header> <style:header-left style:display="false"/> @@ -762,7 +759,7 @@ <text:p>Result</text:p> </table:table-cell> <table:table-cell table:style-name="ce6" table:formula="of:=AND([.B8:.B95])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> <table:table-cell/> </table:table-row> @@ -785,7 +782,7 @@ <text:p>1</text:p> </table:table-cell> <table:table-cell table:style-name="ce7" table:formula="of:=AND([Sheet2.C2:.C49])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>SimpleYEARS formulas with local references and values</text:p> @@ -854,15 +851,15 @@ <text:p>Comment</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>DATA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> <table:table-cell table:style-name="ce5" table:number-matrix-columns-spanned="1" table:number-matrix-rows-spanned="7" table:formula="of:={1|0|0|0|0|0|1}" office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:formula="of:=ORG.OPENOFFICE.YEARS([.K2];[.K3];[.K4:.K6])" office:value-type="string" office:string-value="" calcext:value-type="error"> @@ -872,14 +869,14 @@ <text:p>err</text:p> </table:table-cell> <table:table-cell table:style-name="ce14" table:formula="of:=ISERROR([.A2])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=YEARS(K2;K3;K4:K6)" calcext:value-type="string"> - <text:p>=YEARS(K2;K3;K4:K6)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=YEARS(K2,K3,K4:K6)" calcext:value-type="string"> + <text:p>=YEARS(K2,K3,K4:K6)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-01" calcext:value-type="date"> - <text:p>01.11.2014</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2014-11-01" calcext:value-type="date"> + <text:p>11/01/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -887,22 +884,22 @@ </table:table-cell> <table:table-cell/> </table:table-row> - <table:table-row table:style-name="ro5"> - <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.YEARS([.K2];[.K2];[.K2])" office:value-type="float" office:value="0" calcext:value-type="float"> - <text:p>0</text:p> + <table:table-row table:style-name="ro2"> + <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.YEARS([.K2];[.K2];[.K2])" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>Err:502</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="0" calcext:value-type="float"> - <text:p>0</text:p> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce15" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A2])" 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="ce28" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=YEARS(K2;K2;K2)" calcext:value-type="string"> - <text:p>=YEARS(K2;K2;K2)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=YEARS(K2,K2,K2)" calcext:value-type="string"> + <text:p>=YEARS(K2,K2,K2)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2017-11-30" calcext:value-type="date"> - <text:p>30.11.2017</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2017-11-30" calcext:value-type="date"> + <text:p>11/30/2017</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -917,22 +914,22 @@ <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="ce15" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=YEARS(K2;K3;L2)" calcext:value-type="string"> - <text:p>=YEARS(K2;K3;L2)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=YEARS(K2,K3,L2)" calcext:value-type="string"> + <text:p>=YEARS(K2,K3,L2)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> - <table:table-cell table:style-name="ce29"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-11" calcext:value-type="date"> - <text:p>11.11.2014</text:p> + <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2014-11-11" calcext:value-type="date"> + <text:p>11/11/2014</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> <text:p>0</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:style-name="ce11" table:formula="of:=ORG.OPENOFFICE.YEARS([.K2];[.K3];)" office:value-type="float" office:value="3" calcext:value-type="float"> @@ -941,15 +938,15 @@ <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="ce15" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=YEARS(K2;K3;)" calcext:value-type="string"> - <text:p>=YEARS(K2;K3;)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=YEARS(K2,K3,)" calcext:value-type="string"> + <text:p>=YEARS(K2,K3,)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-27" calcext:value-type="date"> - <text:p>27.11.2014</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2014-11-27" calcext:value-type="date"> + <text:p>11/27/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -964,15 +961,15 @@ <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="ce15" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=YEARS(K3;K2;)" calcext:value-type="string"> - <text:p>=YEARS(K3;K2;)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=YEARS(K3,K2,)" calcext:value-type="string"> + <text:p>=YEARS(K3,K2,)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2014-11-28" calcext:value-type="date"> - <text:p>28.11.2014</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2014-11-28" calcext:value-type="date"> + <text:p>11/28/2014</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce5" office:value-type="float" office:value="0" calcext:value-type="float"> @@ -987,22 +984,22 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce16" table:formula="of:=ISERROR([.A7])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce17" table:formula="of:=ISERROR([.A7])" 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="ce28" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=YEARS(K2;K2+6;;{1;0;1;0;1;0;1})" calcext:value-type="string"> - <text:p>=YEARS(K2;K2+6;;{1;0;1;0;1;0;1})</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=YEARS(K2,K2+6,,{1;0;1;0;1;0;1})" calcext:value-type="string"> + <text:p>=YEARS(K2,K2+6,,{1;0;1;0;1;0;1})</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> - <table:table-cell table:style-name="ce29"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-24" calcext:value-type="date"> - <text:p>24.12.2001</text:p> + <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2001-12-24" calcext:value-type="date"> + <text:p>12/24/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29"/> + <table:table-cell table:style-name="ce30"/> <table:table-cell table:style-name="ce5" 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="ce29"/> + <table:table-cell table:style-name="ce30"/> </table:table-row> <table:table-row table:style-name="ro5"> <table:table-cell table:formula="of:=ORG.OPENOFFICE.YEARS(day1;day2;one)" office:value-type="float" office:value="3" calcext:value-type="float"> @@ -1011,15 +1008,15 @@ <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="ce17" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce18" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=YEARS(day1;day2;one)" calcext:value-type="string"> - <text:p>=YEARS(day1;day2;one)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=YEARS(day1,day2,one)" calcext:value-type="string"> + <text:p>=YEARS(day1,day2,one)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-25" calcext:value-type="date"> - <text:p>25.12.2001</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2001-12-25" calcext:value-type="date"> + <text:p>12/25/2001</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> @@ -1030,15 +1027,15 @@ <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="ce15" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce16" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=YEARS(DATE(2014;1;15);DATE(2016;4;1);0)" calcext:value-type="string"> - <text:p>=YEARS(DATE(2014;1;15);DATE(2016;4;1);0)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=YEARS(DATE(2014,1,15),DATE(2016,4,1),0)" calcext:value-type="string"> + <text:p>=YEARS(DATE(2014,1,15),DATE(2016,4,1),0)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-26" calcext:value-type="date"> - <text:p>26.12.2001</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2001-12-26" calcext:value-type="date"> + <text:p>12/26/2001</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> @@ -1049,21 +1046,21 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce18" table:formula="of:=ISERROR([.A10])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce19" table:formula="of:=ISERROR([.A10])" 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="ce28" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=WEEKS(DATE(2014;11;1);DATE(2014;11;30);{"Hello";"Eike";"!"})" calcext:value-type="string"> - <text:p>=WEEKS(DATE(2014;11;1);DATE(2014;11;30);{"Hello";"Eike";"!"})</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=WEEKS(DATE(2014,11,1),DATE(2014,11,30),{"Hello";"Eike";"!"})" calcext:value-type="string"> + <text:p>=WEEKS(DATE(2014,11,1),DATE(2014,11,30),{"Hello";"Eike";"!"})</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>TDF#100409</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> - <table:table-cell table:style-name="ce29"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-31" calcext:value-type="date"> - <text:p>31.12.2001</text:p> + <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2001-12-31" calcext:value-type="date"> + <text:p>12/31/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce30" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:style-name="ce13" table:formula="of:=ORG.OPENOFFICE.YEARS([.K16];[.K17];0)" office:value-type="float" office:value="115" calcext:value-type="float"> @@ -1072,21 +1069,21 @@ <table:table-cell office:value-type="float" office:value="115" calcext:value-type="float"> <text:p>115</text:p> </table:table-cell> - <table:table-cell table:style-name="ce18" table:formula="of:=[.A11]=[.B11]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> - <text:p>PRAVDA</text:p> + <table:table-cell table:style-name="ce19" table:formula="of:=[.A11]=[.B11]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> </table:table-cell> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=YEARS(K16;K17;0)" calcext:value-type="string"> - <text:p>=YEARS(K16;K17;0)</text:p> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=YEARS(K16,K17,0)" calcext:value-type="string"> + <text:p>=YEARS(K16,K17,0)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2002-01-01" calcext:value-type="date"> - <text:p>01.01.2002</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2002-01-01" calcext:value-type="date"> + <text:p>01/01/2002</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="Default"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:number-columns-repeated="7"/> <table:table-cell office:value-type="float" office:value="17" calcext:value-type="float"> <text:p>17</text:p> @@ -1095,64 +1092,64 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce19"/> - <table:table-cell table:style-name="ce28"/> - <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:style-name="ce29"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2001-12-01" calcext:value-type="date"> - <text:p>01.12.2001</text:p> + <table:table-cell table:number-columns-repeated="5"/> + <table:table-cell table:style-name="ce30"/> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2001-12-01" calcext:value-type="date"> + <text:p>12/01/2001</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce30" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce20"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce21"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:number-columns-repeated="10"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce20"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce21"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="1899-12-30" calcext:value-type="date"> - <text:p>30.12.1899</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="1899-12-30" calcext:value-type="date"> + <text:p>12/30/1899</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce21"/> + <table:table-cell table:style-name="ce22"/> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce30"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="1899-12-30" calcext:value-type="date"> - <text:p>30.12.1899</text:p> + <table:table-cell table:style-name="ce31"/> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="1899-12-30" calcext:value-type="date"> + <text:p>12/30/1899</text:p> </table:table-cell> - <table:table-cell table:style-name="ce29" table:number-columns-repeated="3"/> + <table:table-cell table:style-name="ce30" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce21"/> + <table:table-cell table:style-name="ce22"/> <table:table-cell/> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Tdf#96756 bug</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> - <table:table-cell table:style-name="ce31" office:value-type="date" office:date-value="2015-01-02" calcext:value-type="date"> - <text:p>02.01.2015</text:p> + <table:table-cell table:style-name="ce32" office:value-type="date" office:date-value="2015-01-02" calcext:value-type="date"> + <text:p>01/02/2015</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:style-name="ce12" table:formula="of:=ORG.OPENOFFICE.YEARS(DATE(2014;1;15);DATE(2016;4;1);2)" office:value-type="float" office:value="2" calcext:value-type="float"> - <text:p>2</text:p> + <table:table-cell table:style-name="ce12" table:formula="of:=ORG.OPENOFFICE.YEARS(DATE(2014;1;15);DATE(2016;4;1);2)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>err</text:p> </table:table-cell> - <table:table-cell table:style-name="ce22"/> - <table:table-cell table:style-name="ce28" table:formula="of:=FORMULA([.A18])" office:value-type="string" office:string-value="=YEARS(DATE(2014;1;15);DATE(2016;4;1);2)" calcext:value-type="string"> - <text:p>=YEARS(DATE(2014;1;15);DATE(2016;4;1);2)</text:p> + <table:table-cell table:style-name="ce23"/> + <table:table-cell table:style-name="ce29" table:formula="of:=FORMULA([.A18])" office:value-type="string" office:string-value="=YEARS(DATE(2014,1,15),DATE(2016,4,1),2)" calcext:value-type="string"> + <text:p>=YEARS(DATE(2014,1,15),DATE(2016,4,1),2)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Tdf#100440</text:p> @@ -1161,18 +1158,18 @@ </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce23"/> - <table:table-cell table:style-name="ce28"/> + <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce29"/> <table:table-cell table:number-columns-repeated="10"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="4"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro6"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="6"/> <table:table-cell office:value-type="string" calcext:value-type="string"><text:p>YEARS</text:p><text:p/><text:p>Calculates the difference in years between two dates.</text:p><text:p>Syntax</text:p><text:p/><text:p>YEARS(StartDate; EndDate; Type)</text:p><text:p/><text:p>StartDate is the first date</text:p><text:p/><text:p>EndDate is the second date</text:p><text:p/><text:p>Type calculates the type of difference. Possible values are 0 (interval) and 1 (in calendar years).</text:p> </table:table-cell> @@ -1180,44 +1177,44 @@ </table:table-row> <table:table-row table:style-name="ro7"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro8"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro9"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce24"/> + <table:table-cell table:style-name="ce25"/> <table:table-cell table:number-columns-repeated="6"/> - <table:table-cell table:style-name="ce31"/> + <table:table-cell table:style-name="ce32"/> <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro10"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce19"/> + <table:table-cell table:style-name="ce20"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro10"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce25"/> + <table:table-cell table:style-name="ce26"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro11"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce26"/> + <table:table-cell table:style-name="ce27"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce26"/> + <table:table-cell table:style-name="ce27"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="69"> <table:table-cell table:number-columns-repeated="2"/> - <table:table-cell table:style-name="ce27"/> + <table:table-cell table:style-name="ce28"/> <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro2" table:number-rows-repeated="1048475"> @@ -1270,7 +1267,7 @@ </calcext:conditional-formats> </table:table> <table:table table:name="'file:///home/zdenek/Dokumenty/LO/sc-unit-test/Project%20Calc%20functions%20tests/fods/years.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods'#Sheet2" table:print="false" table:style-name="ta_extref"> - <table:table-source xlink:type="simple" xlink:href="function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> + <table:table-source xlink:type="simple" xlink:href="/home/zdenek/Dokumenty/LO/sc-unit-test/Project%20Calc%20functions%20tests/fods/years.fods/function_based_test_Example.fods/function_based_test_Example_reference.fods" table:table-name="Sheet2" table:mode="copy-results-only"/> <table:table-column table:number-columns-repeated="8"/> <table:table-row table:number-rows-repeated="2"> <table:table-cell table:number-columns-repeated="8"/> diff --git a/scaddins/source/datefunc/datefunc.cxx b/scaddins/source/datefunc/datefunc.cxx index cd9b3b005718..ca4003cd37e7 100644 --- a/scaddins/source/datefunc/datefunc.cxx +++ b/scaddins/source/datefunc/datefunc.cxx @@ -591,6 +591,9 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffWeeks( sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { + if (nMode != 0 && nMode != 1) + throw lang::IllegalArgumentException(); + sal_Int32 nNullDate = GetNullDate( xOptions ); sal_Int32 nDays1 = nStartDate + nNullDate; @@ -628,6 +631,9 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffMonths( sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { + if (nMode != 0 && nMode != 1) + throw lang::IllegalArgumentException(); + sal_Int32 nNullDate = GetNullDate( xOptions ); sal_Int32 nDays1 = nStartDate + nNullDate; @@ -673,6 +679,9 @@ sal_Int32 SAL_CALL ScaDateAddIn::getDiffYears( sal_Int32 nStartDate, sal_Int32 nEndDate, sal_Int32 nMode ) throw( uno::RuntimeException, lang::IllegalArgumentException, std::exception ) { + if (nMode != 0 && nMode != 1) + throw lang::IllegalArgumentException(); + if ( nMode != 1 ) return getDiffMonths( xOptions, nStartDate, nEndDate, nMode ) / 12; |