summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCzeber László Ádám <czeber.laszloadam@nisz.hu>2023-05-26 10:14:11 +0200
committerLászló Németh <nemeth@numbertext.org>2023-05-30 15:37:37 +0200
commit8c1892cd80a5095b38e88d558f653b27d93b074c (patch)
tree25485ee47f63f6abcc7a45efd5db09d9abfe6a63
parentRevert "Use getXWeak in ure" (diff)
downloadcore-8c1892cd80a5095b38e88d558f653b27d93b074c.tar.gz
core-8c1892cd80a5095b38e88d558f653b27d93b074c.zip
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>
-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() );
}