[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sc/source

[Kohei Yoshida]

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

New commits:
commit 00c5189e092b74c118e03bdff4578b4de95378ad
Author: Kohei Yoshida <kohei.yoshida at suse.com>
Date:   Tue Jan 10 14:47:35 2012 -0500

    fdo#42624: Do the same for BIFF5 and earlier.

diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index 30acae7..4f0ce42 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 9cdfe77..00f0d42 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)