[Libreoffice-commits] core.git: sc/qa sc/source
Winfried Donkers
winfrieddonkers at libreoffice.org
Tue Feb 21 21:52:04 UTC 2017
sc/qa/unit/data/functions/text/fods/search.fods | 354 ++++++++++++++----------
sc/source/core/tool/interpr1.cxx | 11
2 files changed, 221 insertions(+), 144 deletions(-)
New commits:
commit 07157107a3b7fd3d1b55db9ce1aeb9f6d4e204ab
Author: Winfried Donkers <winfrieddonkers at libreoffice.org>
Date: Wed Feb 8 16:48:58 2017 +0100
tdf#105772 apply all ODFF constraints with function SEARCH.
Now the function both complies with ODFF1.2 and behaves the same
as Excel does.
Change-Id: Ic49af48cacedbac54688266a916c5fa6e28bb5c4
Reviewed-on: https://gerrit.libreoffice.org/34037
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Eike Rathke <erack at redhat.com>
diff --git a/sc/qa/unit/data/functions/text/fods/search.fods b/sc/qa/unit/data/functions/text/fods/search.fods
index 4d1b1a0..b4d4ccf 100644
--- a/sc/qa/unit/data/functions/text/fods/search.fods
+++ b/sc/qa/unit/data/functions/text/fods/search.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:scr
ipt="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:form
x="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.spreadsheet">
- <office:meta><meta:creation-date>2017-02-02T18:52:02.797049582</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.3.0.0.alpha1$Linux_X86_64 LibreOffice_project/883024d657fb45c7da459017d2f936aac5644bfb</meta:generator><meta:document-statistic meta:table-count="2" meta:cell-count="80" meta:object-count="0"/></office:meta>
+ <office:meta><meta:creation-date>2017-02-02T18:52:02.797049582</meta:creation-date><meta:editing-duration>P0D</meta:editing-duration><meta:editing-cycles>1</meta:editing-cycles><meta:generator>LibreOfficeDev/5.4.0.0.alpha0$Linux_X86_64 LibreOffice_project/cc33a1ccda26819ed1dff02ec54e7452a598273f</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">33104</config:config-item>
- <config:config-item config:name="VisibleAreaHeight" config:type="int">13409</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">9427</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>
@@ -32,7 +32,7 @@
</config:config-item-map-entry>
<config:config-item-map-entry config:name="Sheet2">
<config:config-item config:name="CursorPositionX" config:type="int">4</config:config-item>
- <config:config-item config:name="CursorPositionY" config:type="int">20</config:config-item>
+ <config:config-item config:name="CursorPositionY" config:type="int">19</config:config-item>
<config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item>
<config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item>
<config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item>
@@ -50,7 +50,7 @@
</config:config-item-map-entry>
</config:config-item-map-named>
<config:config-item config:name="ActiveTable" config:type="string">Sheet2</config:config-item>
- <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1241</config:config-item>
+ <config:config-item config:name="HorizontalScrollbarWidth" config:type="int">1857</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">85</config:config-item>
<config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item>
@@ -91,10 +91,12 @@
<config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item>
<config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item>
<config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item>
+ <config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item>
<config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item>
<config:config-item config:name="GridColor" config:type="long">12632256</config:config-item>
<config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item>
- <config:config-item config:name="PrinterName" config:type="string">Lexmark-E352dn</config:config-item>
+ <config:config-item config:name="PrinterName" config:type="string">Generic Printer</config:config-item>
<config:config-item-map-indexed config:name="ForbiddenCharacters">
<config:config-item-map-entry>
<config:config-item config:name="Language" config:type="string">en</config:config-item>
@@ -111,14 +113,12 @@
<config:config-item config:name="EndLine" config:type="string">([{£¥'"‵〈《「『【〔〖（［｛￡￥〝︵︷︹︻︽︿﹁﹃﹙﹛﹝（｛“‘</config:config-item>
</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">rgH+/0xleG1hcmstRTM1MmRuAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ1VQUzpMZXhtYXJrLUUzNTJkbgAAAAAAAAAAAAAAAAAWAAMAzwAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9TGV4bWFyay1FMzUyZG4Kb3JpZW50YXRpb249UG9ydHJhaXQKY29waWVzPTEKY29sbGF0ZT1mYWxzZQptYXJnaW5kYWp1c3RtZW50PTAsMCwwLDAKY29sb3JkZXB0aD0yNApwc2xldmVsPTAKcGRmZGV2aWNlPTEKY29sb3JkZXZpY2U9MApQUERDb250ZXhEYXRhClBhZ2VTaXplOkE0AElucHV0U2xvdDpUcmF5MQBEdXBsZXg6Tm9uZQAAEgBDT01QQVRfRFVQTEVYX01PREUPAER1cGxleE1vZGU6Ok9mZg==</config:config-item>
+ <config:config-item config:name="PrinterSetup" config:type="base64Binary">hQH+/0dlbmVyaWMgUHJpbnRlcgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU0dFTlBSVAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWAAMApgAAAAAAAAAEAAhSAAAEdAAASm9iRGF0YSAxCnByaW50ZXI9R2VuZXJpYyBQcmludGVyCm9yaWVudGF0aW9uPVBvcnRyYWl0CmNvcGllcz0xCm1hcmdpbmRhanVzdG1lbnQ9MCwwLDAsMApjb2xvcmRlcHRoPTI0CnBzbGV2ZWw9MApwZGZkZXZpY2U9MApjb2xvcmRldmljZT0wClBQRENvbnRleERhdGEKUGFnZVNpemU6QTQAABIAQ09NUEFUX0RVUExFWF9NT0RFDwBEdXBsZXhNb2RlOjpPZmY=</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,7 +146,7 @@
</office:font-face-decls>
<office:styles>
<style:default-style style:family="table-cell">
- <style:paragraph-properties style:tab-stop-distance="36pt"/>
+ <style:paragraph-properties style:tab-stop-distance="12.7mm"/>
<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">
@@ -733,15 +733,63 @@
<style:style style:name="Default" style:family="table-cell">
<style:text-properties style:font-name-asian="Droid Sans Fallback" style:font-family-asian="'Droid Sans Fallback'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-name-complex="Droid Sans Devanagari" style:font-family-complex="'Droid Sans Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable"/>
</style:style>
- <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default">
- <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/>
- </style:style>
- <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/>
<style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
<style:paragraph-properties fo:text-align="center"/>
<style:text-properties fo:font-size="16pt" fo:font-style="italic" fo:font-weight="bold"/>
</style:style>
+ <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="table-cell" style:parent-style-name="Heading">
+ <style:text-properties fo:color="#000000" fo:font-size="18pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Heading_20_2" style:display-name="Heading 2" style:family="table-cell" style:parent-style-name="Heading">
+ <style:text-properties fo:color="#000000" fo:font-size="12pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Text" style:family="table-cell" style:parent-style-name="Default"/>
+ <style:style style:name="Note" style:family="table-cell" style:parent-style-name="Text">
+ <style:table-cell-properties fo:background-color="#ffffcc" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" fo:border="0.74pt solid #808080"/>
+ <style:text-properties fo:color="#333333" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Footnote" style:family="table-cell" style:parent-style-name="Text">
+ <style:text-properties fo:color="#808080" fo:font-size="10pt" fo:font-style="italic" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Status" style:family="table-cell" style:parent-style-name="Default"/>
+ <style:style style:name="Good" style:family="table-cell" style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ccffcc"/>
+ <style:text-properties fo:color="#006600" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Neutral" style:family="table-cell" style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ffffcc"/>
+ <style:text-properties fo:color="#996600" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Bad" style:family="table-cell" style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#ffcccc"/>
+ <style:text-properties fo:color="#cc0000" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Warning" style:family="table-cell" style:parent-style-name="Status">
+ <style:text-properties fo:color="#cc0000" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Error" style:family="table-cell" style:parent-style-name="Status">
+ <style:table-cell-properties fo:background-color="#cc0000"/>
+ <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="Accent" style:family="table-cell" style:parent-style-name="Default">
+ <style:text-properties fo:color="#000000" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="Accent_20_1" style:display-name="Accent 1" style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#000000"/>
+ <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Accent_20_2" style:display-name="Accent 2" style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#808080"/>
+ <style:text-properties fo:color="#ffffff" fo:font-size="10pt" fo:font-style="normal" fo:font-weight="normal"/>
+ </style:style>
+ <style:style style:name="Accent_20_3" style:display-name="Accent 3" style:family="table-cell" style:parent-style-name="Accent">
+ <style:table-cell-properties fo:background-color="#dddddd"/>
+ </style:style>
+ <style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default">
+ <style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/>
+ </style:style>
+ <style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N122"/>
<style:style style:name="Heading1" style:family="table-cell" style:parent-style-name="Heading">
<style:table-cell-properties style:rotation-angle="90"/>
</style:style>
@@ -754,52 +802,49 @@
</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="185.7pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="65.51mm"/>
</style:style>
<style:style style:name="co2" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="252.51pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="89.08mm"/>
</style:style>
<style:style style:name="co3" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="64.01pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="22.58mm"/>
</style:style>
<style:style style:name="co4" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="154.54pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="54.52mm"/>
</style:style>
<style:style style:name="co5" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="160.95pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="56.78mm"/>
</style:style>
<style:style style:name="co6" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="50.94pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="17.97mm"/>
</style:style>
<style:style style:name="co7" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="178.44pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="62.95mm"/>
</style:style>
<style:style style:name="co8" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="114.24pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="40.3mm"/>
</style:style>
<style:style style:name="co9" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="16.44pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="5.8mm"/>
</style:style>
<style:style style:name="co10" style:family="table-column">
- <style:table-column-properties fo:break-before="auto" style:column-width="101.91pt"/>
+ <style:table-column-properties fo:break-before="auto" style:column-width="35.95mm"/>
</style:style>
<style:style style:name="ro1" style:family="table-row">
- <style:table-row-properties style:row-height="24.46pt" fo:break-before="auto" style:use-optimal-row-height="true"/>
+ <style:table-row-properties style:row-height="8.63mm" fo:break-before="auto" style:use-optimal-row-height="true"/>
</style:style>
<style:style style:name="ro2" style:family="table-row">
- <style:table-row-properties style:row-height="12.81pt" fo:break-before="auto" style:use-optimal-row-height="true"/>
+ <style:table-row-properties style:row-height="4.52mm" fo:break-before="auto" style:use-optimal-row-height="true"/>
</style:style>
<style:style style:name="ro3" style:family="table-row">
- <style:table-row-properties style:row-height="17.35pt" fo:break-before="auto" style:use-optimal-row-height="true"/>
+ <style:table-row-properties style:row-height="6.12mm" fo:break-before="auto" style:use-optimal-row-height="true"/>
</style:style>
<style:style style:name="ro4" style:family="table-row">
- <style:table-row-properties style:row-height="15pt" fo:break-before="auto" style:use-optimal-row-height="true"/>
+ <style:table-row-properties style:row-height="5.29mm" 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="14.66pt" 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="114.69pt" fo:break-before="auto" style:use-optimal-row-height="true"/>
+ <style:table-row-properties style:row-height="5.17mm" 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"/>
@@ -812,47 +857,47 @@
</number:text-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="start" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="start" fo:margin-left="0mm"/>
<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="ce12" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
- <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<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="ce15" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
- <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<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="ce16" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
- <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
</style:style>
<style:style style:name="ce19" 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:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<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="ce29" 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:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<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="ce30" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
- <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet1.B8"/>
<style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet1.B8"/>
<style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet1.B8"/>
</style:style>
<style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default">
<style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/>
- <style:paragraph-properties fo:text-align="center" fo:margin-left="0pt"/>
+ <style:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default">
@@ -871,33 +916,50 @@
<style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Sans" fo:font-size="10pt" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-name-asian="Droid Sans Fallback" style:font-size-asian="10pt" style:language-asian="zh" style:country-asian="CN" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-name-complex="Droid Sans Devanagari" style:font-size-complex="10pt" style:language-complex="hi" style:country-complex="IN" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
</style:style>
<style:style style:name="ce14" style:family="table-cell" style:parent-style-name="Default">
- <style:table-cell-properties fo:padding="2.01pt"/>
+ <style:table-cell-properties fo:padding="0.71mm"/>
</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="ce17" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N100">
- <style:table-cell-properties fo:padding="2.01pt"/>
+ <style:table-cell-properties fo:padding="0.71mm"/>
</style:style>
<style:style style:name="ce24" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99">
<style:table-cell-properties fo:wrap-option="wrap"/>
<style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Serif" fo:font-size="10pt" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-size-asian="10pt" style:language-asian="zh" style:country-asian="CN" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="10pt" style:language-complex="hi" style:country-complex="IN" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
</style:style>
- <style:style style:name="ce29" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99">
+ <style:style style:name="ce36" 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:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
<style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C2"/>
<style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C2"/>
<style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C2"/>
</style:style>
- <style:style style:name="ce19" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N99">
+ <style:style style:name="ce38" 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.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:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
+ <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C12"/>
+ <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C12"/>
+ <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C12"/>
</style:style>
- <style:style style:name="ce16" style:family="table-cell" style:parent-style-name="Default">
+ <style:style style:name="ce39" 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:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C13"/>
+ <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C13"/>
+ <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C13"/>
+ </style:style>
+ <style:style style:name="ce40" 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:paragraph-properties fo:text-align="center" fo:margin-left="0mm"/>
+ <style:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C14"/>
+ <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C14"/>
+ <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C14"/>
+ </style:style>
+ <style:style style:name="ce41" 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:map style:condition="cell-content()=""" style:apply-style-name="Default" style:base-cell-address="Sheet2.C21"/>
+ <style:map style:condition="cell-content()=0" style:apply-style-name="Untitled1" style:base-cell-address="Sheet2.C21"/>
+ <style:map style:condition="cell-content()=1" style:apply-style-name="Untitled2" style:base-cell-address="Sheet2.C21"/>
</style:style>
<style:style style:name="ce11" style:family="table-cell" style:parent-style-name="Default">
<style:text-properties style:font-name-asian="Microsoft YaHei" style:font-name-complex="Mangal"/>
@@ -910,37 +972,31 @@
<style:text-properties style:use-window-font-color="true" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Liberation Serif" fo:font-size="10pt" fo:language="en" fo:country="US" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="bold" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-size-asian="10pt" style:language-asian="zh" style:country-asian="CN" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="10pt" style:language-complex="hi" style:country-complex="IN" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
</style:style>
<style:style style:name="ce33" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N0">
- <style:table-cell-properties fo:background-color="#ffffff" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" style:text-align-source="value-type" style:repeat-content="false" fo:wrap-option="no-wrap" fo:border="none" fo:padding-bottom="0.99pt" fo:padding-left="2.41pt" fo:padding-right="2.41pt" fo:padding-top="0.99pt" style:rotation-angle="0" style:rotation-align="none" style:vertical-align="automatic"/>
+ <style:table-cell-properties fo:background-color="#ffffff" style:diagonal-bl-tr="none" style:diagonal-tl-br="none" style:text-align-source="value-type" style:repeat-content="false" fo:wrap-option="no-wrap" fo:border="none" fo:padding-bottom="0.35mm" fo:padding-left="0.85mm" fo:padding-right="0.85mm" fo:padding-top="0.35mm" style:rotation-angle="0" style:rotation-align="none" style:vertical-align="automatic"/>
<style:text-properties fo:color="#000000" style:text-outline="false" style:text-line-through-style="none" style:text-line-through-type="none" style:font-name="Arial" fo:font-size="10pt" fo:language="de" fo:country="CH" fo:font-style="normal" fo:text-shadow="none" style:text-underline-style="none" fo:font-weight="normal" style:text-underline-mode="continuous" style:text-overline-mode="continuous" style:text-line-through-mode="continuous" style:font-size-asian="10pt" style:language-asian="en" style:country-asian="US" style:font-style-asian="normal" style:font-weight-asian="normal" style:font-size-complex="10pt" style:language-complex="en" style:country-complex="US" style:font-style-complex="normal" style:font-weight-complex="normal" style:text-emphasize="none" style:font-relief="none" style:text-overline-style="none" style:text-overline-color="font-color"/>
</style:style>
<style:page-layout style:name="pm1">
<style:page-layout-properties style:writing-mode="lr-tb"/>
<style:header-style>
- <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-bottom="7.09pt"/>
+ <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-bottom="2.5mm"/>
</style:header-style>
<style:footer-style>
- <style:header-footer-properties fo:min-height="21.26pt" fo:margin-left="0pt" fo:margin-right="0pt" fo:margin-top="7.09pt"/>
+ <style:header-footer-properties fo:min-height="7.5mm" fo:margin-left="0mm" fo:margin-right="0mm" fo:margin-top="2.5mm"/>
</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="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: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:background-image/>
</style:header-footer-properties>
</style:header-style>
<style:footer-style>
- <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: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:background-image/>
</style:header-footer-properties>
</style:footer-style>
</style:page-layout>
- <style:style style:name="T1" style:family="text">
- <style:text-properties fo:font-size="10pt" fo:font-weight="bold" fo:language="en" fo:country="US" style:language-asian="ar" style:country-asian="SA" style:font-name-asian="Times New Roman" style:font-size-asian="12pt" style:font-weight-asian="bold" style:font-weight-complex="bold"/>
- </style:style>
- <style:style style:name="T2" style:family="text">
- <style:text-properties fo:font-size="10pt" fo:language="en" fo:country="US" style:language-asian="ar" style:country-asian="SA" style:font-name-asian="Times New Roman" style:font-size-asian="12pt"/>
- </style:style>
</office:automatic-styles>
<office:master-styles>
<style:master-page style:name="Default" style:page-layout-name="pm1">
@@ -959,7 +1015,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="2017-02-02">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="18:51:14.450537214">00:00:00</text:time></text:p>
+ <text:p><text:date style:data-style-name="N2" text:date-value="2017-02-08">00/00/0000</text:date>, <text:time style:data-style-name="N2" text:time-value="16:28:29.735432424">00:00:00</text:time></text:p>
</style:region-right>
</style:header>
<style:header-left style:display="false"/>
@@ -1081,7 +1137,7 @@
<table:table-cell table:style-name="ce17" 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="ce29" table:formula="of:=[.A2]=[.B2]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" table:formula="of:=[.A2]=[.B2]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A2])" office:value-type="string" office:string-value="=SEARCH(54,998877665544)" calcext:value-type="string">
@@ -1097,7 +1153,7 @@
<table:table-cell table:style-name="ce17" office:value-type="float" office:value="6" calcext:value-type="float">
<text:p>6</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=IF(ISERROR(SEARCH("Gewinn|Promotion|Replay",I5)),"",K5)" calcext:value-type="string">
@@ -1113,7 +1169,7 @@
<table:table-cell table:style-name="ce17" 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="ce29" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" 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="ce11" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=IF(ISERROR(SEARCH("Gewinn|Promotion|Replay",I6)),"",K6)" calcext:value-type="string">
@@ -1129,7 +1185,7 @@
<table:table-cell table:style-name="ce17" 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="ce29" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" 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="ce11" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="{=SUM(IF(ISERROR(SEARCH("Mark",I10:I19)),0,1))}" calcext:value-type="string">
@@ -1151,7 +1207,7 @@
<table:table-cell table:style-name="ce17" office:value-type="float" office:value="6" calcext:value-type="float">
<text:p>6</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" 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="ce11" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=SEARCH("off",I1)" calcext:value-type="string">
@@ -1172,7 +1228,7 @@
<table:table-cell table:style-name="ce9" office:value-type="float" office:value="6" calcext:value-type="float">
<text:p>6</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A7]=[.B7]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" table:formula="of:=[.A7]=[.B7]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=SEARCH("OFf",I1)" calcext:value-type="string">
@@ -1188,7 +1244,7 @@
<table:table-cell office:value-type="float" office:value="6" calcext:value-type="float">
<text:p>6</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" 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="ce11" table:formula="of:=FORMULA([.A8])" office:value-type="string" office:string-value="=SEARCH("off",I1,2)" calcext:value-type="string">
@@ -1204,7 +1260,7 @@
<table:table-cell table:style-name="ce17" table:formula="of:=#VALUE!" office:value-type="string" office:string-value="" calcext:value-type="error">
<text:p>#VALUE!</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=ISERROR([.A9])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" table:formula="of:=ISERROR([.A9])" 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="ce11" table:formula="of:=FORMULA([.A9])" office:value-type="string" office:string-value="=SEARCH("off",I1,7)" calcext:value-type="string">
@@ -1219,7 +1275,7 @@
<table:table-cell table:style-name="ce17" office:value-type="float" office:value="5" calcext:value-type="float">
<text:p>5</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A10]=[.B10]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" table:formula="of:=[.A10]=[.B10]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
<text:p>TRUE</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A10])" office:value-type="string" office:string-value="=SEARCH("e",I1)" calcext:value-type="string">
@@ -1238,7 +1294,7 @@
<table:table-cell table:style-name="ce17" office:value-type="float" office:value="11" calcext:value-type="float">
<text:p>11</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce29" table:formula="of:=[.A11]=[.B11]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <table:table-cell table:style-name="ce36" 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="ce11" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=SEARCH("e",I1,6)" calcext:value-type="string">
@@ -1250,28 +1306,67 @@
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</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="5"/>
+ <table:table-row table:style-name="ro5">
+ <table:table-cell table:style-name="ce25" table:formula="of:=SEARCH("e";[.I1];0)" office:value-type="string" office:string-value="" calcext:value-type="error">
+ <text:p>Err:502</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
+ <text:p>error</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce38" table:formula="of:=ISERROR([.A12])" 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="ce11" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=SEARCH("e",I1,0)" calcext:value-type="string">
+ <text:p>=SEARCH("e",I1,0)</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce37" office:value-type="string" calcext:value-type="string">
+ <text:p>Tdf#105772</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="3"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Wookie</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</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="5"/>
+ <table:table-row table:style-name="ro5">
+ <table:table-cell table:style-name="ce9" table:formula="of:=SEARCH("e";"LibreOffice";0)" office:value-type="string" office:string-value="" calcext:value-type="error">
+ <text:p>Err:502</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
+ <text:p>error</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce39" table:formula="of:=ISERROR([.A13])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A13])" office:value-type="string" office:string-value="=SEARCH("e","LibreOffice",0)" calcext:value-type="string">
+ <text:p>=SEARCH("e","LibreOffice",0)</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce37" office:value-type="string" calcext:value-type="string">
+ <text:p>Tdf#105772</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="3"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Mark</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</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="5"/>
+ <table:table-row table:style-name="ro5">
+ <table:table-cell table:style-name="ce9" table:formula="of:=SEARCH("e";"LibreOffice";-1)" office:value-type="string" office:string-value="" calcext:value-type="error">
+ <text:p>Err:502</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
+ <text:p>error</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce40" table:formula="of:=ISERROR([.A14])" 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="ce11" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="=SEARCH("e","LibreOffice",-1)" calcext:value-type="string">
+ <text:p>=SEARCH("e","LibreOffice",-1)</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce37" office:value-type="string" calcext:value-type="string">
+ <text:p>Tdf#105772</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="3"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Mark</text:p>
</table:table-cell>
@@ -1289,7 +1384,7 @@
<table:table-row table:style-name="ro5">
<table:table-cell table:style-name="ce9"/>
<table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="4"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
@@ -1300,7 +1395,7 @@
<table:table-row table:style-name="ro5">
<table:table-cell/>
<table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="4"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
@@ -1308,75 +1403,49 @@
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
- <table:table-row table:style-name="ro5">
- <table:table-cell table:style-name="ce25" table:formula="of:=SEARCH("e";[.I1];0)" office:value-type="float" office:value="5" calcext:value-type="float">
- <text:p>5</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
- <text:p>error</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce19"/>
- <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A18])" office:value-type="string" office:string-value="=SEARCH("e",I1,0)" calcext:value-type="string">
- <text:p>=SEARCH("e",I1,0)</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce37" office:value-type="string" calcext:value-type="string"><text:p><text:span text:style-name="T1">Constraints:</text:span><text:span text:style-name="T2"> Start >= 1</text:span></text:p>
- </table:table-cell>
- <table:table-cell table:number-columns-repeated="3"/>
+ <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="5"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Andromeda</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
- <table:table-row table:style-name="ro5">
- <table:table-cell table:style-name="ce9" table:formula="of:=SEARCH("e";"LibreOffice";0)" office:value-type="float" office:value="5" calcext:value-type="float">
- <text:p>5</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
- <text:p>error</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce19"/>
- <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A19])" office:value-type="string" office:string-value="=SEARCH("e","LibreOffice",0)" calcext:value-type="string">
- <text:p>=SEARCH("e","LibreOffice",0)</text:p>
- </table:table-cell>
- <table:table-cell table:number-columns-repeated="4"/>
+ <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:table-cell table:style-name="ce37"/>
+ <table:table-cell table:number-columns-repeated="3"/>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Mark</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="2"/>
</table:table-row>
- <table:table-row table:style-name="ro6">
- <table:table-cell table:style-name="ce9" table:formula="of:=SEARCH("e";"LibreOffice";-1)" office:value-type="float" office:value="5" calcext:value-type="float">
- <text:p>5</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce17" office:value-type="string" calcext:value-type="string">
- <text:p>error</text:p>
- </table:table-cell>
- <table:table-cell table:style-name="ce19"/>
- <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A20])" office:value-type="string" office:string-value="=SEARCH("e","LibreOffice",-1)" calcext:value-type="string">
- <text:p>=SEARCH("e","LibreOffice",-1)</text:p>
- </table:table-cell>
- <table:table-cell office:value-type="string" calcext:value-type="string"><text:p>It is a non-compliance with a purpose to keep backward compatibility (extract from the source code):</text:p><text:p/><text:p>// This should use GetStringPositionArgument() but old versions up</text:p><text:p>// to LibreOffice 4.2.5 allowed and ignored 0 and negative values.</text:p><text:p>// It is unnecessary to break existing documents that "rely" on</text:p><text:p>// that behavior. Though ODFF constrains Start to be >=1.</text:p><text:p>/* TODO: fix this and possibly break those broken documents? */</text:p><text:p/><text:p>Given that version 4.2.5 dates from June 2014, one could argue that making the code fully ODFF compliant will not really break backward compatibility (version 5.4.0 is scheduled for August 2017).</text:p><text:p>OTOH, it doesn't do real harm, the source code simply replaces the value of argument Start with 1 when the value passed is 0 or negative. </text:p
>
- </table:table-cell>
- <table:table-cell table:number-columns-repeated="6"/>
+ <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="8"/>
</table:table-row>
<table:table-row table:style-name="ro5">
<table:table-cell table:style-name="ce9"/>
<table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce19"/>
+ <table:table-cell table:style-name="ce41"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="7"/>
</table:table-row>
<table:table-row table:style-name="ro5" table:number-rows-repeated="4">
<table:table-cell table:style-name="ce14"/>
<table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="7"/>
</table:table-row>
<table:table-row table:style-name="ro5" table:number-rows-repeated="12">
<table:table-cell table:style-name="ce14"/>
<table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="4"/>
<table:table-cell table:style-name="ce17"/>
@@ -1385,13 +1454,13 @@
<table:table-row table:style-name="ro2" table:number-rows-repeated="39">
<table:table-cell table:style-name="ce23"/>
<table:table-cell table:style-name="ce24"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="7"/>
</table:table-row>
<table:table-row table:style-name="ro2" table:number-rows-repeated="186">
<table:table-cell table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce29"/>
+ <table:table-cell table:style-name="ce36"/>
<table:table-cell table:style-name="ce11"/>
<table:table-cell table:number-columns-repeated="7"/>
</table:table-row>
@@ -1407,10 +1476,25 @@
<calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C2"/>
<calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C2"/>
</calcext:conditional-format>
- <calcext:conditional-format calcext:target-range-address="Sheet2.C18:Sheet2.C21">
- <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C18"/>
- <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C18"/>
- <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C18"/>
+ <calcext:conditional-format calcext:target-range-address="Sheet2.C21:Sheet2.C21">
+ <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C21"/>
+ <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C21"/>
+ <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C21"/>
+ </calcext:conditional-format>
+ <calcext:conditional-format calcext:target-range-address="Sheet2.C12:Sheet2.C12">
+ <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C12"/>
+ <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C12"/>
+ <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C12"/>
+ </calcext:conditional-format>
+ <calcext:conditional-format calcext:target-range-address="Sheet2.C13:Sheet2.C13">
+ <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C13"/>
+ <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C13"/>
+ <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C13"/>
+ </calcext:conditional-format>
+ <calcext:conditional-format calcext:target-range-address="Sheet2.C14:Sheet2.C14">
+ <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C14"/>
+ <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C14"/>
+ <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C14"/>
</calcext:conditional-format>
</calcext:conditional-formats>
</table:table>
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index da43d6e..626c9b3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -8263,15 +8263,8 @@ void ScInterpreter::ScSearch()
double fAnz;
if (nParamCount == 3)
{
- // This should use GetStringPositionArgument() but old versions up
- // to LibreOffice 4.2.5 allowed and ignored 0 and negative values.
- // It is unnecessary to break existing documents that "rely" on
- // that behavior. Though ODFF constrains Start to be >=1.
- /* TODO: fix this and possibly break those broken documents? */
- fAnz = rtl::math::approxFloor( GetDouble());
- if (fAnz < 1.0)
- fAnz = 1.0;
- else if (!CheckStringPositionArgument( fAnz))
+ fAnz = GetStringPositionArgument();
+ if( fAnz < 1 )
{
PushIllegalArgument();
return;
More information about the Libreoffice-commits
mailing list