summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2014-07-15 17:12:58 +0200
committerEike Rathke <erack@redhat.com>2014-07-15 17:31:24 +0200
commit6b84beb590417c6e8df024099537ddccb8a984e1 (patch)
treedd9cd1fc3c12518f0d593f593a6a0ce6f0aedbb7
parentb057b1f5697477046d731a234489e1d213efc9e6 (diff)
pDok can't be NULL, remove superfluous check
Change-Id: I639d6e27dd1a44ff878a2e0188fc42e27993b39f
-rw-r--r--sc/source/core/tool/interpr4.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index 55b7ccb31fb2..c6df5fc60b8a 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -3746,8 +3746,7 @@ const ScCalcConfig& ScInterpreter::GetGlobalConfig()
void ScInterpreter::MergeCalcConfig()
{
maCalcConfig = maGlobalConfig;
- if (pDok)
- maCalcConfig.MergeDocumentSpecific( pDok->GetCalcConfig());
+ maCalcConfig.MergeDocumentSpecific( pDok->GetCalcConfig());
}
void ScInterpreter::GlobalExit()