mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kohei Yoshida
2012-01-10 14:47:35 -05:00
parent d041d14692
commit 8422e18b01
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sc/source/filter/excel/read.cxx
View File

@@ -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;

2
sc/source/filter/excel/xiname.cxx
View File

@@ -240,6 +240,8 @@ void XclImpName::ConvertTokens()
if (pArray)
InsertName(pArray);
mpTokensData.reset();
}
void XclImpName::InsertName(const ScTokenArray* pArray)