Handle global range names and use CreateString() during xlsx import.

This makes the load speed slightly faster.

Change-Id: I64e4d4b8c42a68577350539f3812cafdc0433f96

1 files changed, 9 insertions, 2 deletions

diff --git a/sc/inc/tokenstringcontext.hxx b/sc/inc/tokenstringcontext.hxx
index e5bb01c3ccc9..5bcc3b3ef735 100644
--- a/sc/inc/tokenstringcontext.hxx
+++ b/sc/inc/tokenstringcontext.hxx
@@ -12,6 +12,10 @@
 
 #include "compiler.hxx"
 
+#include <boost/unordered_map.hpp>
+
+class ScDocument;
+
 namespace sc {
 
 /**
@@ -20,16 +24,19 @@ namespace sc {
  * between multiple CreateString() calls as long as the document content is
  * unmodified.
  */
-struct TokenStringContext
+struct SC_DLLPUBLIC TokenStringContext
 {
+    typedef boost::unordered_map<sal_uInt16, OUString> IndexNameMapType;
+
     formula::FormulaGrammar::Grammar meGram;
     formula::FormulaCompiler::OpCodeMapPtr mxOpCodeMap;
     const ScCompiler::Convention* mpRefConv;
     OUString maErrRef;
 
     std::vector<OUString> maTabNames;
+    IndexNameMapType maGlobalRangeNames;
 
-    TokenStringContext( formula::FormulaGrammar::Grammar eGram );
+    TokenStringContext( const ScDocument* pDoc, formula::FormulaGrammar::Grammar eGram );
 };
 
 }