summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorAndreas Heinisch <andreas.heinisch@yahoo.de>2023-04-03 12:58:27 +0200
committerAndreas Heinisch <andreas.heinisch@yahoo.de>2023-04-03 14:36:15 +0200
commit8fc316fb65e0d4b78ec881aa79f4184602b96f54 (patch)
tree0219db9431c296e99b78b4c2201dcea5289fea16 /sc
parent735437b3b663f43dd7ef6bb2e8c8666673c14c49 (diff)
tdf#89920 - Handle embedded newline in Calc's search cell
Update short-circuited boolean expression so the least expensive subexpressions will be executed first Change-Id: I8c924e00e8de809f3e6df2828f8537185e71c18c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149891 Tested-by: Jenkins Reviewed-by: Andreas Heinisch <andreas.heinisch@yahoo.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/table6.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx
index 1ea4a5ace99d..a6b03f6b3d8d 100644
--- a/sc/source/core/data/table6.cxx
+++ b/sc/source/core/data/table6.cxx
@@ -257,7 +257,7 @@ bool ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, sc::Colum
pFCell->SetMatColsRows( nMatCols, nMatRows );
aCol[nCol].SetFormulaCell(nRow, pFCell);
}
- else if (aString.indexOf('\n') != -1 && eCellType != CELLTYPE_FORMULA)
+ else if (eCellType != CELLTYPE_FORMULA && aString.indexOf('\n') != -1)
{
ScFieldEditEngine& rEngine = rDocument.GetEditEngine();
rEngine.SetTextCurrentDefaults(aString);