if the formatter was to change, then the cache should be dropped

Change-Id: I98edea680f5300c4375168391627ac654ea3779c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164228
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

1 files changed, 7 insertions, 1 deletions

diff --git a/sc/source/core/tool/interpretercontext.cxx b/sc/source/core/tool/interpretercontext.cxx
index 03d5036b6e63..ef9e1f3947bf 100644
--- a/sc/source/core/tool/interpretercontext.cxx
+++ b/sc/source/core/tool/interpretercontext.cxx
@@ -58,11 +58,17 @@ void ScInterpreterContext::SetDocAndFormatter(const ScDocument& rDoc, SvNumberFo
         mxScLookupCache.reset();
         mpDoc = &rDoc;
     }
-    mpFormatter = pFormatter;
+    if (mpFormatter != pFormatter)
+    {
+        maNFBuiltInCache.clear();
+        maNFTypeCache.clear();
+        mpFormatter = pFormatter;
+    }
 }
 
 void ScInterpreterContext::initFormatTable()
 {
+    assert(!mpFormatter && maNFBuiltInCache.empty() && maNFTypeCache.empty());
     mpFormatter = mpDoc->GetFormatTable(); // will assert if not main thread
 }