XlsFormat - vps

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

@@ -37,21 +37,8 @@
 
 namespace XLS
 {
-//static inline std::wstring &ltrim(std::wstring &s) 
-//{
-//	s.erase(s.begin(), std::find_if(s.begin(), s.end(), std::not1(std::ptr_fun<int, int>(isspace))));
-//	return s;
-//}
-//
-//// trim from end
-//static inline std::wstring &rtrim(std::wstring &s) 
-//{
-//	s.erase(std::find_if(s.rbegin(), s.rend(), std::not1(std::ptr_fun<int, int>(isspace))).base(), s.end());
-//	return s;
-//}
-
 // trim from both ends
-static inline void/*std::wstring &*/trim(std::wstring &s) 
+static inline void trim(std::wstring &s) 
 {
 	int new_size = s.length();
 	for (int i = new_size - 1; i >=0; i--)
@@ -61,7 +48,6 @@ static inline void/*std::wstring &*/trim(std::wstring &s)
 	}
 	if (new_size < s.length())
 		s.erase(new_size);
-	//return ltrim(rtrim(s));
 }
 
 AutoFilter::AutoFilter()
@@ -102,11 +88,12 @@ void AutoFilter::readFields(CFRecord& record)
 	unsigned short	_wTopN		= wTopN;			
 	
 	if (fTopN != 1)
+	{
 		record >> doper1;			
-	if (fTopN != 1)
 		record >> doper2;
+	}
 
-	if ((doper1.vt == BIFF_BYTE(0)) && (doper1.vt == BIFF_BYTE(0)))
+	if ((doper1.vt == BIFF_BYTE(0)) && (doper2.vt == BIFF_BYTE(0)))
 	{
 		m_bAutoFilter12 = true;	
 		return;

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

@@ -53,7 +53,7 @@ public:
 	virtual const CFRecordType::TypeId getTypeId() const = 0;  // made virtual to let derived assign their own names (for example, EOF_T)
 
 	static const ElementType	type = typeBiffRecord;
-	virtual ElementType			get_type() const { return type; }
+	virtual ElementType			get_type() { return type; }
 //-----------------------------
 	virtual void readFollowingContinue(CFStreamCacheReader& reader);
 	virtual const bool storeRecordAndDecideProceeding(CFRecordPtr record); // This function is overridden in BiffRecordSplit

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

@@ -59,7 +59,7 @@ public:
 	bool			fWrap;
 	unsigned char	alcV;
 	bool			fJustLast;
-	unsigned char	trot;
+	unsigned short	trot;
 	unsigned char	cIndent;
 	bool			fShrinkToFit;
 	unsigned char	iReadOrder;

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

@@ -95,7 +95,6 @@ void PtgFuncVar::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, bool
 				func_name == L"DAYSINMONTH"	||
 				func_name == L"ISLEAPYEAR"	||
 				func_name == L"MONTHS"		||
-				func_name == L"WEEKS"		||
 				func_name == L"WEEKSINYEAR"	||
 				func_name == L"YEARS")
 		{

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

@@ -95,7 +95,7 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		if (pDataRead)
 		{
 			crypt_data_aes.saltValue = std::string((char*)pDataRead, crypt_data_aes.saltSize);	
-			delete pDataRead;
+			delete []pDataRead;
 		}
 		
 		pDataRead = new unsigned char[0x10];
@@ -119,7 +119,7 @@ void RC4EncryptionHeader::load(XLS::CFRecord& record)
 		if (pDataRead)
 		{
 			crypt_data_aes.encryptedVerifierValue = std::string((char*)pDataRead, szEncryptedVerifierHash);
-			delete pDataRead;
+			delete []pDataRead;
 		}
 
 		pos = record.getRdPtr();

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

@@ -67,7 +67,7 @@ public:
 	bool			fWrap;
 	unsigned char	alcV;
 	bool			fJustLast;
-	unsigned char	trot;
+	unsigned short	trot;
 	unsigned char	cIndent;
 	bool			fShrinkToFit;
 	unsigned char	iReadOrder;

ASCOfficeXlsFile2/source/XlsXlsxConverter/XlsConverter.cpp

@@ -1663,7 +1663,7 @@ void XlsConverter::convert_geometry_text(std::vector<ODRAW::OfficeArtFOPTEPtr> &
 					if (bools->fUsegFItalic			&& bools->fItalic)		xlsx_context->get_drawing_context().set_wordart_italic	(true); 
 					if (bools->fUsegFVertical		&& bools->fVertical)	xlsx_context->get_drawing_context().set_wordart_vertical(true); 
 					if (bools->fUsegFUnderline		&& bools->fUnderline)	xlsx_context->get_drawing_context().set_wordart_underline(true); 
-					if (bools->fStrikethrough	&& bools->fStrikethrough)xlsx_context->get_drawing_context().set_wordart_strike(true);
+					if (bools->fUsegStrikethrough	&& bools->fStrikethrough)xlsx_context->get_drawing_context().set_wordart_strike(true);
 
 					//if (bools->fUsegFShrinkFit && bools->fShrinkFit)
 				}