XlsFormatReader - fix ukr 1c

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp

@@ -47,7 +47,7 @@ CFRecord::CFRecord(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info)
 :	rdPtr(0), // seek to the start
 	global_info_(global_info)
 {
-	file_ptr = static_cast<unsigned int>(stream->getStreamPointer()); // Assume that files have size < 4Gb
+	file_ptr = static_cast<unsigned int>(stream->getStreamPointer());
 	*stream >> type_id_;
 	unsigned short size_short;
 	*stream >> size_short;

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.cpp

@@ -69,6 +69,7 @@ void CFStream::read(void* buf, const size_t size)
 
 	if(num_read < size)
 	{
+		stream_->seek(stream_->size()); // 5217417.xls
 		return;// EndOfStreamReached
 	}
 }

ASCOfficeXlsFile2/source/XlsFormat/Binary/CompoundFile.cpp

@@ -90,6 +90,8 @@ CFStreamPtr CompoundFile::getWorkbookStream()
 {
 	CFStreamPtr stream = getNamedStream("Workbook");
 
+	if (stream == NULL) 
+		stream = getNamedStream("WORKBOOK"); //6447323.xls
 	if (stream == NULL) 
 		stream = getNamedStream("Book");
 	if (stream == NULL) 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/DXFN12.cpp

@@ -91,7 +91,9 @@ void DXFN12::load(CFRecord& record)
 
 int DXFN12::serialize(std::wostream & stream)
 {
-	if (dxfn && !xfext)
+	if (!dxfn) return 0;
+
+	if (!xfext)
 	{
 		dxfn->serialize(stream);
 	}

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELLTABLE.cpp

@@ -197,6 +197,9 @@ int CELL_GROUP::serialize(std::wostream & stream)
 				{//skip cells
 					row->serialize(stream);
 					current_row++;
+
+					if (current_row == m_rows.end())
+						break;
 					row = dynamic_cast<Row *>(current_row->get());
 				}
 			}