summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMike Kaganski <mike.kaganski@collabora.com>2024-08-12 15:58:24 +0500
committerAndras Timar <andras.timar@collabora.com>2024-08-23 11:17:13 +0200
commit64e35d7e92d67391a7e537dae2a6d4e600d36c71 (patch)
tree125ee9e999129b8a7f30d2b2c0ee24921bb968d1 /sc
parent996218bce9e6075f1e5725d7aa00dc55c36d1edc (diff)
tdf#162439: compare strings, not pointers
Change-Id: Id107eaee553531f49da4ad06c681a34cdc08e4da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171756 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Jenkins (cherry picked from commit 26931fa1ce1c22f0c54ab2916e9924b1c78f8efe) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171999 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/data/functions/text/fods/exact.fods40
-rw-r--r--sc/source/core/tool/interpr1.cxx2
2 files changed, 29 insertions, 13 deletions
diff --git a/sc/qa/unit/data/functions/text/fods/exact.fods b/sc/qa/unit/data/functions/text/fods/exact.fods
index 5a97d27654ec..db69bed3dba5 100644
--- a/sc/qa/unit/data/functions/text/fods/exact.fods
+++ b/sc/qa/unit/data/functions/text/fods/exact.fods
@@ -2799,25 +2799,41 @@
<table:table-cell table:style-name="ce9"/>
<table:table-cell table:number-columns-repeated="8"/>
</table:table-row>
- <table:table-row table:style-name="ro2" table:number-rows-repeated="182">
- <table:table-cell table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce6"/>
- <table:table-cell table:style-name="ce11"/>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce23" table:formula="of:=EXACT(1;[.L2])" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce24" table:formula="of:=TRUE()" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce6" table:formula="of:=[.A77]=[.B77]" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A77])" office:value-type="string" calcext:value-type="string"/>
<table:table-cell table:number-columns-repeated="6"/>
<table:table-cell table:style-name="ce9"/>
<table:table-cell table:number-columns-repeated="8"/>
</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="ce6"/>
- <table:table-cell table:style-name="ce11"/>
- <table:table-cell table:number-columns-repeated="15"/>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce23" table:number-matrix-columns-spanned="1" table:number-matrix-rows-spanned="2" table:formula="of:=EXACT(1;[.L2:.L3])" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce24" table:formula="of:=TRUE()" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce6" table:formula="of:=[.A78]=[.B78]" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A78])" office:value-type="string" calcext:value-type="string"/>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce9"/>
+ <table:table-cell table:number-columns-repeated="8"/>
</table:table-row>
- <table:table-row table:style-name="ro2" table:number-rows-repeated="1048313">
- <table:table-cell table:number-columns-repeated="19"/>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell table:style-name="ce23" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce24" table:formula="of:=FALSE()" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce6" table:formula="of:=[.A79]=[.B79]" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A79])" office:value-type="string" calcext:value-type="string"/>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce9"/>
+ <table:table-cell table:number-columns-repeated="8"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell table:number-columns-repeated="19"/>
+ <table:table-cell table:style-name="ce23" table:number-matrix-columns-spanned="1" table:number-matrix-rows-spanned="1" table:formula="of:=EXACT(1;{1})" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce24" table:formula="of:=TRUE()" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce6" table:formula="of:=[.A80]=[.B80]" office:value-type="boolean" calcext:value-type="boolean"/>
+ <table:table-cell table:style-name="ce11" table:formula="of:=FORMULA([.A80])" office:value-type="string" calcext:value-type="string"/>
+ <table:table-cell table:number-columns-repeated="6"/>
+ <table:table-cell table:style-name="ce9"/>
+ <table:table-cell table:number-columns-repeated="8"/>
</table:table-row>
<calcext:conditional-formats>
<calcext:conditional-format calcext:target-range-address="Sheet2.C2:Sheet2.C262">
diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index 9e0f09912647..c6eabab262ea 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -10441,7 +10441,7 @@ void ScInterpreter::ScExact()
{
svl::SharedString s1 = GetString();
svl::SharedString s2 = GetString();
- PushInt( int(s1.getData() == s2.getData()) );
+ PushInt(int(s1 == s2));
}
}