Allow non-pooled instance of SvNumberFormatter inside ScCompiler.

Change-Id: I645079254621c2f2684a69116b094e37e46f46f4

sc/inc/compiler.hxx

@@ -312,6 +312,8 @@ private:
     ScDocument* pDoc;
     ScAddress   aPos;
 
+    SvNumberFormatter* mpFormatter;
+
     // For CONV_XL_OOX, may be set via API by MOOXML filter.
     ::com::sun::star::uno::Sequence< const ::com::sun::star::sheet::ExternalLinkInfo > maExternalLinks;
 
@@ -400,6 +402,7 @@ public:
 
     void            SetGrammar( const formula::FormulaGrammar::Grammar eGrammar );
 
+    void SetNumberFormatter( SvNumberFormatter* pFormatter );
     EncodeUrlMode   GetEncodeUrlMode() const;
 private:
     /** Set grammar and reference convention from within SetFormulaLanguage()

sc/source/core/tool/compiler.cxx

@@ -239,6 +239,11 @@ void ScCompiler::SetGrammar( const FormulaGrammar::Grammar eGrammar )
     }
 }
 
+void ScCompiler::SetNumberFormatter( SvNumberFormatter* pFormatter )
+{
+    mpFormatter = pFormatter;
+}
+
 ScCompiler::EncodeUrlMode ScCompiler::GetEncodeUrlMode() const
 {
     return meEncodeUrlMode;
@@ -1640,6 +1645,7 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos,ScTokenArra
         : FormulaCompiler(rArr),
         pDoc( pDocument ),
         aPos( rPos ),
+        mpFormatter(pDoc->GetFormatTable()),
         pCharClass( ScGlobal::pCharClass ),
         mnPredetectedReference(0),
         mnRangeOpPosInSymbol(-1),
@@ -1656,6 +1662,7 @@ ScCompiler::ScCompiler( ScDocument* pDocument, const ScAddress& rPos)
         :
         pDoc( pDocument ),
         aPos( rPos ),
+        mpFormatter(pDoc->GetFormatTable()),
         pCharClass( ScGlobal::pCharClass ),
         mnPredetectedReference(0),
         mnRangeOpPosInSymbol(-1),
@@ -2517,12 +2524,12 @@ bool ScCompiler::IsOpCode2( const OUString& rName )
 bool ScCompiler::IsValue( const OUString& rSym )
 {
     double fVal;
-    sal_uInt32 nIndex = ( mxSymbols->isEnglish() ?
-        pDoc->GetFormatTable()->GetStandardIndex( LANGUAGE_ENGLISH_US ) : 0 );
+    sal_uInt32 nIndex = mxSymbols->isEnglish() ? mpFormatter->GetStandardIndex(LANGUAGE_ENGLISH_US) : 0;
 
-    if (pDoc->GetFormatTable()->IsNumberFormat( rSym, nIndex, fVal ) )
-    {
-        sal_uInt16 nType = pDoc->GetFormatTable()->GetType(nIndex);
+    if (!mpFormatter->IsNumberFormat(rSym, nIndex, fVal))
+        return false;
+
+    sal_uInt16 nType = mpFormatter->GetType(nIndex);
 
     // Don't accept 3:3 as time, it is a reference to entire row 3 instead.
     // Dates should never be entered directly and automatically converted
@@ -2548,9 +2555,6 @@ bool ScCompiler::IsValue( const OUString& rSym )
     aToken.SetDouble( fVal );
     pRawToken = aToken.Clone();
     return true;
-    }
-    else
-        return false;
 }
 
 bool ScCompiler::IsString()