Skip to content

C
core
Kaydet (Commit) 8422e18b authored tarafından Kohei Yoshida's avatar Kohei Yoshida
Dosyalara gözat
Seçenekler

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

üst d041d146
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 0 deletions
sc/source/filter/excel/read.cxx
Dosyayı görüntüle @ 8422e18b
...@@ -238,6 +238,7 @@ FltError ImportExcel::Read( void ) ...@@ -238,6 +238,7 @@ FltError ImportExcel::Read( void )
case 0x08: Row25(); break; // ROW [ 2 5] case 0x08: Row25(); break; // ROW [ 2 5]
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats(); rNumFmtBfr.CreateScFormats();
rNameMgr.ConvertAllTokens();
Eof(); Eof();
eAkt = Z_Ende; eAkt = Z_Ende;
break; break;
...@@ -300,6 +301,7 @@ FltError ImportExcel::Read( void ) ...@@ -300,6 +301,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats(); rNumFmtBfr.CreateScFormats();
rNameMgr.ConvertAllTokens();
Eof(); Eof();
eAkt = Z_Ende; eAkt = Z_Ende;
break; break;
...@@ -370,6 +372,7 @@ FltError ImportExcel::Read( void ) ...@@ -370,6 +372,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats(); rNumFmtBfr.CreateScFormats();
rNameMgr.ConvertAllTokens();
Eof(); Eof();
eAkt = Z_Ende; eAkt = Z_Ende;
break; break;
...@@ -424,6 +427,7 @@ FltError ImportExcel::Read( void ) ...@@ -424,6 +427,7 @@ FltError ImportExcel::Read( void )
switch( nOpcode ) switch( nOpcode )
{ {
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNameMgr.ConvertAllTokens();
eAkt = Z_Ende; eAkt = Z_Ende;
break; break;
case 0x12: DocProtect(); break; // PROTECT [ 5] case 0x12: DocProtect(); break; // PROTECT [ 5]
...@@ -487,6 +491,7 @@ FltError ImportExcel::Read( void ) ...@@ -487,6 +491,7 @@ FltError ImportExcel::Read( void )
case EXC_ID_RK: ReadRk(); break; case EXC_ID_RK: ReadRk(); break;
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNameMgr.ConvertAllTokens();
Eof(); Eof();
eAkt = Z_Biff4E; eAkt = Z_Biff4E;
break; break;
...@@ -584,6 +589,7 @@ FltError ImportExcel::Read( void ) ...@@ -584,6 +589,7 @@ FltError ImportExcel::Read( void )
case 0x0A: // EOF [ 2345] case 0x0A: // EOF [ 2345]
rNumFmtBfr.CreateScFormats(); rNumFmtBfr.CreateScFormats();
rXFBfr.CreateUserStyles(); rXFBfr.CreateUserStyles();
rNameMgr.ConvertAllTokens();
eAkt = Z_Biff5E; eAkt = Z_Biff5E;
break; break;
case 0x18: rNameMgr.ReadName( maStrm ); break; case 0x18: rNameMgr.ReadName( maStrm ); break;
......
sc/source/filter/excel/xiname.cxx
Dosyayı görüntüle @ 8422e18b
...@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens() ...@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens()
if (pArray) if (pArray)
InsertName(pArray); InsertName(pArray);
mpTokensData.reset();
} }
void XclImpName::InsertName(const ScTokenArray* pArray) void XclImpName::InsertName(const ScTokenArray* pArray)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment