From 8422e18b01843bac061c20a8aa47d1c43994a2d2 Mon Sep 17 00:00:00 2001
From: Kohei Yoshida <kohei.yoshida@suse.com>
Date: Tue, 10 Jan 2012 14:47:35 -0500
Subject: [PATCH] fdo#42624: Do the same for BIFF5 and earlier.

---
 sc/source/filter/excel/read.cxx   | 6 ++++++
 sc/source/filter/excel/xiname.cxx | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 30acae7d36e1..4f0ce42eb23d 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -238,6 +238,7 @@ FltError ImportExcel::Read( void )
                     case 0x08:  Row25(); break;         // ROW          [ 2  5]
                     case 0x0A:                          // EOF          [ 2345]
                         rNumFmtBfr.CreateScFormats();
+                        rNameMgr.ConvertAllTokens();
                         Eof();
                         eAkt = Z_Ende;
                         break;
@@ -300,6 +301,7 @@ FltError ImportExcel::Read( void )
 
                     case 0x0A:                          // EOF          [ 2345]
                         rNumFmtBfr.CreateScFormats();
+                        rNameMgr.ConvertAllTokens();
                         Eof();
                         eAkt = Z_Ende;
                         break;
@@ -370,6 +372,7 @@ FltError ImportExcel::Read( void )
 
                     case 0x0A:                          // EOF          [ 2345]
                         rNumFmtBfr.CreateScFormats();
+                        rNameMgr.ConvertAllTokens();
                         Eof();
                         eAkt = Z_Ende;
                         break;
@@ -424,6 +427,7 @@ FltError ImportExcel::Read( void )
                 switch( nOpcode )
                 {
                     case 0x0A:                          // EOF          [ 2345]
+                        rNameMgr.ConvertAllTokens();
                         eAkt = Z_Ende;
                         break;
                     case 0x12:  DocProtect(); break;    // PROTECT      [    5]
@@ -487,6 +491,7 @@ FltError ImportExcel::Read( void )
                     case EXC_ID_RK:             ReadRk();               break;
 
                     case 0x0A:                          // EOF          [ 2345]
+                        rNameMgr.ConvertAllTokens();
                         Eof();
                         eAkt = Z_Biff4E;
                     break;
@@ -584,6 +589,7 @@ FltError ImportExcel::Read( void )
                     case 0x0A:                          // EOF          [ 2345]
                         rNumFmtBfr.CreateScFormats();
                         rXFBfr.CreateUserStyles();
+                        rNameMgr.ConvertAllTokens();
                         eAkt = Z_Biff5E;
                         break;
                     case 0x18:  rNameMgr.ReadName( maStrm );            break;
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index 9cdfe775f94e..00f0d4299305 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens()
 
     if (pArray)
         InsertName(pArray);
+
+    mpTokensData.reset();
 }
 
 void XclImpName::InsertName(const ScTokenArray* pArray)