summaryrefslogtreecommitdiff
path: root/sc/source/filter/oox/formulabuffer.cxx
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-07-14 20:40:14 +0200
committerEike Rathke <erack@redhat.com>2018-07-14 21:57:35 +0200
commit095d749fcabdc2601c6dd3c519aa1aba1249a41a (patch)
treeb2e66501d1e5455d1c5a19848107ade07a702e13 /sc/source/filter/oox/formulabuffer.cxx
parent836074f8532fee46b6bf073f7d6beff231448ad6 (diff)
Remove the check for IsRecalcModeMustAfterImport(), tdf#94925 follow-up
It's now superfluous as we set those cells dirty and broadcast in ScDocumentImport::broadcastRecalcAfterImport() Change-Id: Ia9dd4ad16c20b23ee8a1d46b69a4702b1ad4c81f Reviewed-on: https://gerrit.libreoffice.org/57439 Reviewed-by: Eike Rathke <erack@redhat.com> Tested-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source/filter/oox/formulabuffer.cxx')
-rw-r--r--sc/source/filter/oox/formulabuffer.cxx21
1 files changed, 6 insertions, 15 deletions
diff --git a/sc/source/filter/oox/formulabuffer.cxx b/sc/source/filter/oox/formulabuffer.cxx
index 53172729ac85..114a998b8832 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -173,11 +173,8 @@ void applySharedFormulas(
pCell->SetResultToken(new formula::FormulaStringToken(aSS));
// If we don't reset dirty, then e.g. disabling macros makes all cells
// that use macro functions to show #VALUE!
- if (!pCell->GetCode()->IsRecalcModeMustAfterImport())
- {
- pCell->ResetDirty();
- pCell->SetChanged(false);
- }
+ pCell->ResetDirty();
+ pCell->SetChanged(false);
break;
}
SAL_FALLTHROUGH;
@@ -278,11 +275,8 @@ void applyCellFormulaValues(
case XML_n:
{
pCell->SetResultDouble(rValueStr.toDouble());
- if (!pCell->GetCode()->IsRecalcModeMustAfterImport())
- {
- pCell->ResetDirty();
- pCell->SetChanged(false);
- }
+ pCell->ResetDirty();
+ pCell->SetChanged(false);
}
break;
case XML_str:
@@ -300,11 +294,8 @@ void applyCellFormulaValues(
{
svl::SharedString aSS = rStrPool.intern(rValueStr);
pCell->SetResultToken(new formula::FormulaStringToken(aSS));
- if (!pCell->GetCode()->IsRecalcModeMustAfterImport())
- {
- pCell->ResetDirty();
- pCell->SetChanged(false);
- }
+ pCell->ResetDirty();
+ pCell->SetChanged(false);
}
break;
default: