diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-12-21 12:51:36 +0300 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2020-01-03 20:51:28 +0100 |
| commit | 12b4590f3a9ba64bcc27e60185ee7366d9894cc7 (patch) | |
| tree | e9a776f1980a23e2d59d243f22c73a24bd7ea44b /sc | |
| parent | 4fbd76beb57db9a1261efecf5cfac4cae6fe839b (diff) | |
tdf#78840: disable case-insensitive transliteration for regex search
Allow regex engine use its own case-insensitive search instead. We
already set UREGEX_CASE_INSENSITIVE ICU flag when case-insensitive
search is requested in TextSearch::RESrchPrepare. Case-insensitive
transliteration used when preparing the string for passing to regex
engine creates a lowercase string, where case-sensitive search is
impossible, even when regex includes explicit flags for that.
This change allows to honor (?-i)/(?i) flags in the regex if present.
It removes case-sensitive flag from consideration for creation of
transliteration service if regex search is requested.
Change-Id: I0d8960670c1681f7c6bc162a4f858006596c7c36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85650
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/qa/unit/data/functions/statistical/fods/countif.fods | 235 |
1 files changed, 215 insertions, 20 deletions
diff --git a/sc/qa/unit/data/functions/statistical/fods/countif.fods b/sc/qa/unit/data/functions/statistical/fods/countif.fods index f52c622e10e6..f6cf854c707a 100644 --- a/sc/qa/unit/data/functions/statistical/fods/countif.fods +++ b/sc/qa/unit/data/functions/statistical/fods/countif.fods @@ -3105,7 +3105,11 @@ <table:table-cell table:style-name="ce51" office:value-type="float" office:value="1999" calcext:value-type="float"> <text:p>1999</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>abc</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3136,7 +3140,11 @@ <table:table-cell table:style-name="ce51" office:value-type="float" office:value="2000" calcext:value-type="float"> <text:p>2000</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>ABC</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3168,7 +3176,11 @@ <table:table-cell table:style-name="ce51" table:formula="of:=VALUE("0")" office:value-type="float" office:value="0" calcext:value-type="float"> <text:p>0</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Abc</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3200,7 +3212,11 @@ <table:table-cell table:style-name="ce51" table:formula="of:=VALUE("0")" office:value-type="float" office:value="0" calcext:value-type="float"> <text:p>0</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>aBc</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3229,7 +3245,11 @@ <table:table-cell table:style-name="ce51" table:formula="of:=VALUE("0")" office:value-type="float" office:value="0" calcext:value-type="float"> <text:p>0</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>Abc</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3258,7 +3278,11 @@ <table:table-cell table:style-name="ce51" office:value-type="float" office:value="2002" calcext:value-type="float"> <text:p>2002</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>a</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3285,7 +3309,11 @@ <table:table-cell table:style-name="ce51" office:value-type="float" office:value="2001" calcext:value-type="float"> <text:p>2001</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3312,7 +3340,11 @@ <table:table-cell table:style-name="ce52" office:value-type="string" calcext:value-type="string"> <text:p>X</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3334,7 +3366,11 @@ <table:table-cell table:style-name="ce51" office:value-type="float" office:value="2002" calcext:value-type="float"> <text:p>2002</text:p> </table:table-cell> - <table:table-cell table:number-columns-repeated="10"/> + <table:table-cell/> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p>A</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="8"/> <table:table-cell table:style-name="ce56"/> <table:table-cell/> </table:table-row> @@ -3902,9 +3938,22 @@ <table:table-cell table:style-name="ce58"/> </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-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];".*")" office:value-type="float" office:value="9" calcext:value-type="float"> + <text:p>9</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="9" calcext:value-type="float"> + <text:p>9</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A34];12)=ROUND([.B34];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A34])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;".*")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;".*")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-insensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> <text:p>2</text:p> </table:table-cell> @@ -3920,9 +3969,22 @@ <table:table-cell table:style-name="ce58"/> </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-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"abc")" office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A35];12)=ROUND([.B35];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A35])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"abc")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"abc")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-insensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="3"/> <table:table-cell office:value-type="float" office:value="3" calcext:value-type="float"> <text:p>3</text:p> </table:table-cell> @@ -3937,10 +3999,143 @@ <table:table-cell table:style-name="ce56"/> <table:table-cell table:style-name="ce58"/> </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="Default"/> - <table:table-cell table:number-columns-repeated="22"/> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"ABC")" office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="5" calcext:value-type="float"> + <text:p>5</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A36];12)=ROUND([.B36];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A36])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"ABC")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"ABC")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-insensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"a")" office:value-type="float" office:value="4" calcext:value-type="float"> + <text:p>4</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="4" calcext:value-type="float"> + <text:p>4</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A37];12)=ROUND([.B37];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A37])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"a")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"a")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-insensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"A")" office:value-type="float" office:value="4" calcext:value-type="float"> + <text:p>4</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="4" calcext:value-type="float"> + <text:p>4</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A38];12)=ROUND([.B38];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A38])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"A")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"A")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-insensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"(?-i)abc")" office:value-type="float" office:value="1" calcext:value-type="float"> + <text:p>1</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="1" calcext:value-type="float"> + <text:p>1</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A39];12)=ROUND([.B39];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A39])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"(?-i)abc")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"(?-i)abc")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-sensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"(?-i)Abc")" office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A40];12)=ROUND([.B40];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A40])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"(?-i)Abc")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"(?-i)Abc")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-sensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"(?-i)A")" office:value-type="float" office:value="3" calcext:value-type="float"> + <text:p>3</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="3" calcext:value-type="float"> + <text:p>3</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A41];12)=ROUND([.B41];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A41])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"(?-i)A")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"(?-i)A")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-sensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> + <table:table-cell table:style-name="ce56"/> + <table:table-cell table:style-name="ce58"/> + </table:table-row> + <table:table-row table:style-name="ro2"> + <table:table-cell table:formula="of:=COUNTIF([.$Q$3:.$Q$11];"a(?-i)B(?i)c")" office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> + <text:p>2</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce65" table:formula="of:=ROUND([.A42];12)=ROUND([.B42];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> + <text:p>TRUE</text:p> + </table:table-cell> + <table:table-cell table:style-name="ce34" table:formula="of:=FORMULA([.A42])" office:value-type="string" office:string-value="=COUNTIF($Q$3:$Q$11;"a(?-i)B(?i)c")" calcext:value-type="string"> + <text:p>=COUNTIF($Q$3:$Q$11;"a(?-i)B(?i)c")</text:p> + </table:table-cell> + <table:table-cell office:value-type="string" calcext:value-type="string"> + <text:p><text:s/>tdf#78840: case-sensitive</text:p> + </table:table-cell> + <table:table-cell table:number-columns-repeated="20"/> <table:table-cell table:style-name="ce56"/> <table:table-cell table:style-name="ce58"/> </table:table-row> @@ -4349,7 +4544,7 @@ <table:table-cell table:number-columns-repeated="27"/> </table:table-row> <calcext:conditional-formats> - <calcext:conditional-format calcext:target-range-address="Sheet2.C42:Sheet2.C236 Sheet2.C2:Sheet2.C33"> + <calcext:conditional-format calcext:target-range-address="Sheet2.C2:Sheet2.C236"> <calcext:condition calcext:apply-style-name="Default" calcext:value="=""" calcext:base-cell-address="Sheet2.C2"/> <calcext:condition calcext:apply-style-name="Untitled1" calcext:value="=0" calcext:base-cell-address="Sheet2.C2"/> <calcext:condition calcext:apply-style-name="Untitled2" calcext:value="=1" calcext:base-cell-address="Sheet2.C2"/> |