.

ASCOfficePPTFile/PptFormatTest/PptFormatTest.cpp

@@ -60,7 +60,7 @@ int _tmain(int argc, _TCHAR* argv[])
 	
 	pptFile.put_TempDirectory(tempPath);
 
-	HRESULT hRes = pptFile.LoadFromFile(sSrcPpt, dstTempPath, L"password");
+	HRESULT hRes = pptFile.LoadFromFile(sSrcPpt, dstTempPath, L"");
 	
 	if (hRes == S_OK)
 	{

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BkHim.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of BkHim record in BIFF8
 class BkHim: public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(BkHim)
@@ -48,10 +46,9 @@ public:
 
 	BaseObjectPtr clone();
 
-	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeBkHim;
+	static const ElementType type = typeBkHim;
 
 	_UINT16 cf;
 	_UINT32 lcb;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDBB.cpp

@@ -52,8 +52,24 @@ BaseObjectPtr SXDBB::clone()
 
 void SXDBB::readFields(CFRecord& record)
 {
-	int skip = record.getDataSize() - record.getRdPtr();
-	record.skipNunBytes(skip);
+	unsigned int sz = record.getDataSize() - record.getRdPtr();
+
+	//std::list<CFRecordPtr>& recs = continue_records[rt_Continue];
+
+	//while (record.getRdPtr() + lcb > record.getDataSize() && !recs.empty())
+	//{
+	//	record.appendRawData(recs.front());
+	//	recs.pop_front();
+	//}
+
+	if (record.checkFitReadSafe(sz))
+	{
+		blob = boost::shared_array<char>(new char[sz]);
+
+		memcpy(blob.get(), record.getCurData<char>(), sz);
+
+		record.skipNunBytes(sz);
+	}
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDBB.h

@@ -31,12 +31,12 @@
  */
 #pragma once
 
-#include "BiffRecord.h"
+#include "BiffRecordContinued.h"
 
 namespace XLS
 {
 
-class SXDBB: public BiffRecord
+class SXDBB: public BiffRecordContinued
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(SXDBB)
 	BASE_OBJECT_DEFINE_CLASS_NAME(SXDBB)
@@ -50,6 +50,7 @@ public:
 
 	static const ElementType type = typeSXDBB;
 
+	boost::shared_array<char> blob;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDtr.cpp

@@ -51,6 +51,7 @@ BaseObjectPtr SXDtr::clone()
 
 void SXDtr::readFields(CFRecord& record)
 {
+	record >> yr >> mon >> dom >> hr >> min >> sec;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXDtr.h

@@ -51,6 +51,12 @@ public:
 
 	static const ElementType type = typeSXDtr;
 
+	unsigned short	yr;
+	unsigned short	mon;
+	unsigned char	dom;
+	unsigned char	hr;
+	unsigned char	min;
+	unsigned char	sec;
 
 };
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXFDBType.cpp

@@ -51,6 +51,7 @@ BaseObjectPtr SXFDBType::clone()
 
 void SXFDBType::readFields(CFRecord& record)
 {
+	record >> wTypeSql; 
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXFDBType.h

@@ -50,7 +50,7 @@ public:
 
 	static const ElementType type = typeSXFDBType;
 
-
+	short	wTypeSql; //ODBCType enum
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXInt.cpp

@@ -51,6 +51,7 @@ BaseObjectPtr SXInt::clone()
 
 void SXInt::readFields(CFRecord& record)
 {
+	record >> num;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXInt.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "BiffRecord.h"
-//#include "../Biff_structures/CellRangeRef.h"
 
 namespace XLS
 {
@@ -51,7 +50,7 @@ public:
 
 	static const ElementType type = typeSXInt;
 
-
+	short num;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXNum.cpp

@@ -51,6 +51,7 @@ BaseObjectPtr SXNum::clone()
 
 void SXNum::readFields(CFRecord& record)
 {
+	record >> num;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXNum.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "BiffRecord.h"
-//#include "../Biff_structures/CellRangeRef.h"
+#include "../Biff_structures/Xnum.h"
 
 namespace XLS
 {
@@ -51,7 +51,7 @@ public:
 
 	static const ElementType type = typeSXNum;
 
-
+	Xnum num;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXPair.cpp

@@ -51,6 +51,13 @@ BaseObjectPtr SXPair::clone()
 
 void SXPair::readFields(CFRecord& record)
 {
+	unsigned short reserved1, flags;
+
+	record >> isxvd >> iCache >> reserved1 >> flags;
+	
+	fFormula	= GETBIT(flags, 0);
+	fPhysical	= GETBIT(flags, 3);
+	fRelative	= GETBIT(flags, 4);
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXPair.h

@@ -51,7 +51,12 @@ public:
 
 	static const ElementType type = typeSXPair;
 
+	unsigned short	isxvd;
+	short			iCache;
 
+	bool			fFormula;
+	bool			fPhysical;
+	bool			fRelative;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXRng.cpp

@@ -51,6 +51,13 @@ BaseObjectPtr SXRng::clone()
 
 void SXRng::readFields(CFRecord& record)
 {
+	unsigned short flags;
+
+	record >> flags;
+
+	fAutoStart	= GETBIT(flags, 0);
+	fAutoEnd	= GETBIT(flags, 1);
+	iByType		= GETBITS(flags, 2, 4);
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SXRng.h

@@ -51,7 +51,9 @@ public:
 
 	static const ElementType type = typeSXRng;
 
-
+	bool			fAutoStart;
+	bool			fAutoEnd;
+	unsigned char	iByType;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxBool.cpp

@@ -51,6 +51,10 @@ BaseObjectPtr SxBool::clone()
 
 void SxBool::readFields(CFRecord& record)
 {
+	unsigned short flags;
+	record >> flags;
+
+	val = (flags != 0);
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxBool.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "BiffRecord.h"
-//#include "../Biff_structures/CellRangeRef.h"
 
 namespace XLS
 {
@@ -51,7 +50,7 @@ public:
 
 	static const ElementType type = typeSxBool;
 
-
+	bool val;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxErr.cpp

@@ -51,6 +51,7 @@ BaseObjectPtr SxErr::clone()
 
 void SxErr::readFields(CFRecord& record)
 {
+	record >> wbe;
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxErr.h

@@ -51,7 +51,7 @@ public:
 
 	static const ElementType type = typeSxErr;
 
-
+	unsigned short wbe;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxName.cpp

@@ -51,6 +51,10 @@ BaseObjectPtr SxName::clone()
 
 void SxName::readFields(CFRecord& record)
 {
+	unsigned short	flags;
+	record >> flags >> ifdb >> ifn >> csxpair;
+
+	fErrName = GETBIT(flags, 0);
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxName.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "BiffRecord.h"
-//#include "../Biff_structures/CellRangeRef.h"
 
 namespace XLS
 {
@@ -51,7 +50,10 @@ public:
 
 	static const ElementType type = typeSxName;
 
-
+	bool			fErrName;
+	short			ifdb;
+	short			ifn;
+	unsigned short	csxpair;
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/SxNil.h

@@ -32,7 +32,6 @@
 #pragma once
 
 #include "BiffRecord.h"
-//#include "../Biff_structures/CellRangeRef.h"
 
 namespace XLS
 {
@@ -50,8 +49,6 @@ public:
 	void readFields(CFRecord& record);
 
 	static const ElementType type = typeSxNil;
-
-
 };
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ChartParsedFormula.h

@@ -45,8 +45,6 @@ public:
 
 	BiffStructurePtr clone();
 	void load(CFRecord& record);
-	
-
 
 	std::vector<CellRangeRef>	cell_ranges;
 

ASCOfficeXlsFile2/source/win32/XlsFormat.vcproj

@@ -4237,6 +4237,14 @@
 					RelativePath="..\XlsFormat\Logic\Biff_structures\PictFmlaKey.h"
 					>
 				</File>
+				<File
+					RelativePath="..\XlsFormat\Logic\Biff_structures\PivotParsedFormula.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\XlsFormat\Logic\Biff_structures\PivotParsedFormula.h"
+					>
+				</File>
 				<File
 					RelativePath="..\XlsFormat\Logic\Biff_structures\PropertyBag.cpp"
 					>