XlsFormat ....

ASCOfficeOdfFile/src/odf/draw_frame_xlsx.cpp

@@ -37,14 +37,9 @@ namespace odf_reader {
 
 void draw_g::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	int i=0;
-	int size = content_.size();
-	while(true)
+	for (int i = 0 ; i < content_.size(); i++)
     {
-		if (i>=size)break;
-		office_element_ptr const & elm = content_[i];
-        elm->xlsx_convert(Context);
-		i++;
+        content_[i]->xlsx_convert(Context);
     }
 }
 void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStream.cpp

@@ -16,7 +16,7 @@ CFStream::CFStream(POLE::Stream* stream)
 {
 	if(NULL == stream)
 	{
-		throw;// EXCEPT::RT::CompoundFileFormatError("Wrong IStream pointer (NULL)");
+		return; // throw;EXCEPT::RT::CompoundFileFormatError("Wrong IStream pointer (NULL)");
 	}
 	stream_ = stream;
 }

ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/Structures/PropertySet.h

 #pragma once
 
 #include "Property.h"
-#include <Binary/BinSmartPointers.h>
+#include "../../../Binary/BinSmartPointers.h"
 
 #include <vector>
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/Structures/PropertySetStream.cpp

@@ -23,10 +23,15 @@ PropertySetStream::PropertySetStream(XLS::CFStreamPtr stream)
 	if (Version != 0x01 && Version != 0x00) 
 		return;
 
-	*stream >> SystemIdentifier >> Clsid >> NumPropertySets;
+	*stream >> SystemIdentifier >> Clsid;
+	
+	*stream >> NumPropertySets;
 
 	if (NumPropertySets != 0x01 && NumPropertySets != 0x02) 
-		return;
+	{
+		NumPropertySets = 0x01;
+		stream->seekFromBegin(28);
+	}
 
 	std::vector<unsigned int> property_sets_offsets;
 	for(unsigned int i = 0; i < NumPropertySets; ++i)
@@ -35,7 +40,7 @@ PropertySetStream::PropertySetStream(XLS::CFStreamPtr stream)
 		unsigned int Offset;
 		*stream >> FMTID >> Offset;
 		
-		if (Offset > 0)
+		if (Offset < stream->getStreamSize())
 			property_sets_offsets.push_back(Offset);
 	}
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/Structures/PropertySetStream.h

 #pragma once
 
-#include <Binary/BinSmartPointers.h>
+#include "../../../Binary/BinSmartPointers.h"
 #include "PropertySet.h"
 
 namespace OLEPS

ASCOfficeXlsFile2/source/XlsFormat/Logic/SummaryInformationStream/SummaryInformation.h

 #pragma once
 
-#include <Binary/BinSmartPointers.h>
+#include "../../Binary/BinSmartPointers.h"
 #include "Structures/PropertySetStream.h"
 
 namespace OLEPS