summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorCzeber László Ádám <czeber.laszloadam@nisz.hu>2023-05-26 10:14:11 +0200
committerAndras Timar <andras.timar@collabora.com>2023-06-04 16:34:09 +0200
commit62426eac75a7f356e31a20204b15a7db9523f423 (patch)
tree80dfe9a51584b343f6f09d118ea329aae611ae70 /sc
parent615922bcce244622dcc129794e090d22298e5c33 (diff)
tdf#152037 XLSX import: fix false alarm data validation error
Fix validation error on valid input by adding missing SimplifyCompiledFormula() to the implementation of setFormula1() and setFormula2() of XSheetCondition UNO API, which used by the XLSX input filter. Change-Id: I8389227eb5a609c29e8d466cf62420bae36f7927 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152295 Tested-by: László Németh <nemeth@numbertext.org> Reviewed-by: László Németh <nemeth@numbertext.org> (cherry picked from commit b14118feb4da3b68caea3e9e60b4eb0f2f83593b) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152328 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/conditio.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 1979d8ab44dd..b70f9579d0e8 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -478,6 +478,7 @@ void ScConditionEntry::SetFormula1( const ScTokenArray& rArray )
if( rArray.GetLen() > 0 )
{
pFormula1.reset( new ScTokenArray( rArray ) );
+ SimplifyCompiledFormula(pFormula1, nVal1, bIsStr1, aStrVal1);
bRelRef1 = lcl_HasRelRef( mpDoc, pFormula1.get() );
}
@@ -490,6 +491,7 @@ void ScConditionEntry::SetFormula2( const ScTokenArray& rArray )
if( rArray.GetLen() > 0 )
{
pFormula2.reset( new ScTokenArray( rArray ) );
+ SimplifyCompiledFormula(pFormula2, nVal2, bIsStr2, aStrVal2);
bRelRef2 = lcl_HasRelRef( mpDoc, pFormula2.get() );
}