Merge remote-tracking branch 'origin/release/v5.3.0' into develop

<x:c r="2:1" instead of "B1"

.gitignore

@@ -63,4 +63,6 @@ X2tConverter/Common/DocxFormat/DocxFormatLib/Makefile
 *.zip
 *.tar.gz
 **/*.build/
-
+*.dat
+*.txt
+*.log

ASCOfficeDocFile/Common/FormatUtils.h

@@ -769,12 +769,20 @@ namespace DocFileFormat
 
 			return bytes;
 		}
-
+#ifndef _WIN32
+		static inline std::wstring IntToWideString(unsigned int value)
+		{
+            return (std::to_wstring(value));
+		}
+#endif
         static inline std::wstring IntToWideString(int value)
 		{
             return (std::to_wstring(value));
 		}
-
+        static inline std::wstring IntToWideString(size_t value)
+		{
+            return (std::to_wstring((unsigned int)value));
+		}
 		static inline std::wstring DoubleToWideString(double value)
 		{
 			std::wstringstream src;			

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.cpp

@@ -87,15 +87,14 @@ namespace DocFileFormat
 		}
 		else
 		{
-			m_nDTTM					= reader->ReadUInt32(); 
+			m_nDTTM					= DateAndTime(reader->ReadUInt32()); 
 			reader->ReadUInt16(); //padding1
 			m_nDepth				= reader->ReadUInt32(); 
 			m_nDiatrdParent			= reader->ReadUInt32(); 
 			unsigned int flag		= reader->ReadUInt32(); 
+			
 			m_fInkAtn = GETBIT(flag, 1);
 		}
-
-
 		return static_cast<ByteStructure*>(newObject);
 	}
 }

ASCOfficeDocFile/DocDocxConverter/AnnotationReferenceDescriptor.h

@@ -32,6 +32,7 @@
 #pragma once
 
 #include "ByteStructure.h"
+#include "DateAndTime.h"
 
 namespace DocFileFormat
 {
@@ -72,7 +73,7 @@ namespace DocFileFormat
 			return (nWordVersion > 0) ? STRUCTURE_SIZE_OLD : STRUCTURE_SIZE;
 		}
 
-        AnnotationReferenceExDescriptor() : m_nDTTM(0), m_nDepth(0), m_nDiatrdParent(0), m_fInkAtn(false)
+        AnnotationReferenceExDescriptor() : m_nDepth(0), m_nDiatrdParent(0), m_fInkAtn(false)
 		{
 		}
 
@@ -82,7 +83,7 @@ namespace DocFileFormat
 
         virtual ByteStructure* ConstructObject( VirtualStreamReader* reader, int length );
 
-		unsigned int	m_nDTTM;
+		DateAndTime		m_nDTTM;
 		unsigned int	m_nDepth;
 		unsigned int	m_nDiatrdParent;
 		bool			m_fInkAtn;

ASCOfficeDocFile/DocDocxConverter/CharacterPropertiesMapping.cpp

@@ -85,9 +85,11 @@ namespace DocFileFormat
 			
 			if (author_str)
 			{
-                XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
+				XMLTools::XMLAttribute author( L"w:author", FormatUtils::XmlEncode(*author_str));
 				rPrChange.AppendAttribute( author );
 			}
+			XMLTools::XMLAttribute date( L"w:date", _revisionData->Dttm.getString());
+			rPrChange.AppendAttribute( date );
 
 			//convert revision stack
 			convertSprms( _revisionData->Changes, &rPrChange );

ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h

@@ -85,10 +85,14 @@ namespace DocFileFormat
 				for (size_t index = 0; index < count; ++index)
 				{   
 					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
-					AnnotationReferenceExDescriptor* atrdPost10 = m_document->AnnotationsReferenceExPlex ? static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]) : NULL;
+					AnnotationReferenceExDescriptor* atrdPost10 = NULL;
+					if ((m_document->AnnotationsReferenceExPlex) && (index < m_document->AnnotationsReferenceExPlex->Elements.size()))
+					{
+						atrdPost10 = static_cast<AnnotationReferenceExDescriptor*>(m_document->AnnotationsReferenceExPlex->Elements[index]);
+					}
 
                     m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
-					if (atrdPre10->m_BookmarkId < 0)
+					if (atrdPre10->m_BookmarkId < 0)//-1 - easy ref (not start/end comment ref)
 					{
 						m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index + 1 + count + 1024 ));
 					}
@@ -98,21 +102,14 @@ namespace DocFileFormat
 					}
 					if (atrdPost10)
 					{
-						//!!!TODO!!!
-						/*//ATRDpost10 is optional and not saved in all files
-						if (doc.AnnotationReferenceExtraTable != null && 
-						doc.AnnotationReferenceExtraTable.Count > index)
-						{
-						AnnotationReferenceDescriptorExtra atrdPost10 = doc.AnnotationReferenceExtraTable[index];
-						atrdPost10.Date.Convert(new DateMapping(_writer));
-						}*/	
+						m_pXmlWriter->WriteAttribute( L"w:date", atrdPost10->m_nDTTM.getString());
 					}
 					if (atrdPre10->m_AuthorIndex < m_document->AnnotationOwners->size())	//conv_253l2H1CehgKwsxCtNk__docx.doc
 					{
 						m_pXmlWriter->WriteAttribute( L"w:author",
 							FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->m_AuthorIndex ) ));
 					}
-                    m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->m_UserInitials);
+                    m_pXmlWriter->WriteAttribute( L"w:initials", FormatUtils::XmlEncode(atrdPre10->m_UserInitials));
 
 
 

ASCOfficeDocFile/DocDocxConverter/DateAndTime.h

@@ -83,6 +83,14 @@ namespace DocFileFormat
 			  //throw new ByteParseException("Cannot parse the struct DTTM, the length of the struct doesn't match");
 			}
 		}
+		std::wstring getString()
+		{
+			return std::to_wstring(yr) + L"-"	+	(mon < 9 ? L"0" : L"" )	+ std::to_wstring(mon)	+ L"-" + 
+													(dom < 9 ? L"0" : L"" )	+ std::to_wstring(dom)	+ L"T" +
+													(hr < 9 ? L"0" : L"" )	+ std::to_wstring(hr)	+ L":" +
+													(mint < 9 ? L"0" : L"" )+ std::to_wstring(mint)	+ L"Z";
+
+		}
 #if defined(_WIN32) || defined(_WIN64)
 	  SYSTEMTIME ToSYSTEMTIME()
       {

ASCOfficeDocFile/DocDocxConverter/DocumentMapping.cpp

@@ -406,8 +406,8 @@ namespace DocFileFormat
 				//if it's a inserted run
                 m_pXmlWriter->WriteNodeBegin(L"w:ins", true);
                 m_pXmlWriter->WriteAttribute(L"w:author", FormatUtils::XmlEncode(*author));
+                m_pXmlWriter->WriteAttribute(L"w:date", FormatUtils::XmlEncode(rev.Dttm.getString()));
                 m_pXmlWriter->WriteNodeEnd(L"", true, false);
-				//rev.Dttm.Convert(new DateMapping(m_pXmlWriter));
 			}
 
 			//start run
@@ -1079,7 +1079,15 @@ namespace DocFileFormat
 				else if ((m_document->AnnotationsReferencePlex) && (_commentNr <= m_document->AnnotationsReferencePlex->Elements.size()))
 				{
 					m_pXmlWriter->WriteNodeBegin( L"w:commentReference", true );
-					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( _commentNr++ ));
+
+					int index = _commentNr++;
+
+					AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index - 1]);
+
+					if (atrdPre10->m_BookmarkId < 0)
+						index += m_document->AnnotationsReferencePlex->Elements.size() + 1024;
+					
+					m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString(index));
 					m_pXmlWriter->WriteNodeEnd( L"", true );
 				}
 			}
@@ -1792,7 +1800,7 @@ namespace DocFileFormat
 			if (m_document->AnnotStartEndCPs[i].second == cp)
 			{
 				result = writeAnnotationEnd(i + 1);  
-				_commentNr = i + 1;
+				//_commentNr = i + 1;
 			}
 		}
 

ASCOfficeDocFile/DocDocxConverter/OfficeArtContent.h

@@ -89,7 +89,7 @@ namespace DocFileFormat
 								GroupContainer* group	=	static_cast<GroupContainer*>(groupChild);
 								if (group)
 								{
-									group->Index =	i;
+									group->Index =	(int)i;
 								}
 							}
 							else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)

ASCOfficeDocFile/DocDocxConverter/VMLShapeMapping.cpp

@@ -1431,8 +1431,7 @@ namespace DocFileFormat
 		{
 			//append size and position ...
 
-			//if (pSpa->fAnchorLock )
-			if (pSpa->bx == TEXT && pSpa->by == TEXT)
+			if (m_isInlineShape)
 			{
 			//	appendStyleProperty( style, L"position", L"static" );
 			}
@@ -1689,21 +1688,17 @@ namespace DocFileFormat
 				m_pSpa->bx = PAGE;
 			}
 			else
-			{
-				nRelH = m_pSpa->bx;
-				appendStyleProperty(oStyle, L"mso-position-horizontal-relative", mapHorizontalPositionRelative(m_pSpa->bx));
+			{//rel column
 			}
 		}
 		if (nRelV < 0 && m_pSpa)
 		{
-			if (m_pSpa->by == TEXT && bZIndex)
+			if (m_pSpa->by == TEXT && bZIndex) 
 			{
 				m_pSpa->by = PAGE;
 			}
 			else
-			{
-				nRelV = m_pSpa->by;
-				appendStyleProperty(oStyle, L"mso-position-vertical-relative", mapVerticalPositionRelative(m_pSpa->by));
+			{//rel paragraph
 			}
 		}
 		if (!m_isInlineShape && !bZIndex)
@@ -1814,7 +1809,7 @@ namespace DocFileFormat
 				//append size and position ...
 				//if (m_pSpa->fAnchorLock)//это возможность смены привязки , а не ее тип
 
-				if (m_pSpa->bx == TEXT && m_pSpa->by == TEXT)
+				if (m_isInlineShape)/*m_pSpa->bx == TEXT && m_pSpa->by == TEXT*/
 				{
 				//	appendStyleProperty( style, L"position", L"static" );
 				}

ASCOfficeDocFile/DocDocxConverter/VMLShapeTypeMapping.cpp

@@ -173,12 +173,16 @@ namespace DocFileFormat
 
 	//Lock ??? 
 			ODRAW::ProtectionBooleanProperties *prot = dynamic_cast<ODRAW::ProtectionBooleanProperties*>(pShape->Lock.get());
-			if ((prot) && (prot->fUsefLockAspectRatio && prot->fLockAspectRatio))
+			if ((prot) && (prot->fUsefLockAspectRatio))
 			{
-                appendValueAttribute( _lock, L"aspectratio", L"t" );
+				appendValueAttribute( _lock, L"aspectratio", prot->fLockAspectRatio ? L"t" : L"f" );
+			}
+			else
+			{
+				appendValueAttribute( _lock, L"aspectratio", L"t");
 			}
 
-			if ( _lock->GetAttributeCount() > 1 )
+			if ( _lock->GetAttributeCount() > 0 )
 			{
 				m_pXmlWriter->WriteString( _lock->GetXMLString() );
 			}

ASCOfficeDocFile/DocDocxConverter/WordDocument.cpp

@@ -84,7 +84,7 @@ namespace DocFileFormat
 		Text(NULL), RevisionAuthorTable(NULL), FontTable(NULL), BookmarkNames(NULL), AutoTextNames(NULL), 
 		IndividualFootnotesPlex(NULL), FootnoteReferenceCharactersPlex(NULL), IndividualEndnotesPlex(NULL),
 		EndnoteReferenceCharactersPlex(NULL), FieldsPlex(NULL), FootnoteDocumentFieldsPlex(NULL),
-		EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL),
+		EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL), AnnotationsFieldsPlex(NULL),
 		AnnotationsReferencePlex(NULL), AnnotationsReferenceExPlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
 		TextboxIndividualPlex(NULL),AssocNames(NULL), BookmarkAnnotNames(NULL), Captions(NULL), AutoCaptions(NULL), ListPlex(NULL),
 		OfficeDrawingPlex(NULL), OfficeDrawingPlexHeader(NULL), SectionPlex(NULL), BookmarkStartPlex(NULL), BookmarkEndPlex(NULL),
@@ -353,7 +353,7 @@ namespace DocFileFormat
 
 		TextboxIndividualPlex				=	new Plex<FTXBXS>			(FTXBXS::STRUCTURE_SIZE,			TableStream, FIB->m_FibWord97.fcPlcftxbxTxt,	FIB->m_FibWord97.lcbPlcftxbxTxt,	nWordVersion);
 
-		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::GetSize(nWordVersion),	TableStream, FIB->m_FibWord97.fcPlcfSed,		FIB->m_FibWord97.lcbPlcfSed,		nWordVersion);
+		SectionPlex							=	new Plex<SectionDescriptor>	(SectionDescriptor::GetSize(nWordVersion),	TableStream, FIB->m_FibWord97.fcPlcfSed,FIB->m_FibWord97.lcbPlcfSed,		nWordVersion);
 		
 		BookmarkStartPlex					=	new Plex<BookmarkFirst>		(BookmarkFirst::STRUCTURE_SIZE,		TableStream, FIB->m_FibWord97.fcPlcfBkf,		FIB->m_FibWord97.lcbPlcfBkf,		nWordVersion);
 		BookmarkEndPlex						=	new Plex<EmptyStructure>	(EmptyStructure::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBkl,		FIB->m_FibWord97.lcbPlcfBkl,		nWordVersion);
@@ -387,10 +387,13 @@ namespace DocFileFormat
 		}
 
 		AutoTextPlex						=	new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy,   FIB->m_FibWord97.lcbPlcfGlsy, nWordVersion);
+		
 		FieldsPlex							=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, nWordVersion);
 		FootnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, nWordVersion);
 		EndnoteDocumentFieldsPlex			=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldEdn, FIB->m_FibWord97.lcbPlcfFldEdn, nWordVersion);
 		HeadersAndFootersDocumentFieldsPlex	=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldHdr, FIB->m_FibWord97.lcbPlcfFldHdr, nWordVersion);
+		AnnotationsFieldsPlex				=	new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldAtn, FIB->m_FibWord97.lcbPlcfFldAtn, nWordVersion);
+		
 		ListPlex							=	new Plex<ListNumCache>	(ListNumCache::STRUCTURE_SIZE,	TableStream, FIB->m_FibWord97.fcPlcfBteLvc, FIB->m_FibWord97.lcbPlcfBteLvc, nWordVersion);
 		
 		if (m_pCallFunc)
@@ -872,6 +875,7 @@ namespace DocFileFormat
 		RELEASEOBJECT(FootnoteDocumentFieldsPlex);
 		RELEASEOBJECT(EndnoteDocumentFieldsPlex);
 		RELEASEOBJECT(HeadersAndFootersDocumentFieldsPlex);
+		RELEASEOBJECT(AnnotationsFieldsPlex);
 		RELEASEOBJECT(HeaderStoriesPlex);
 		RELEASEOBJECT(IndividualCommentsPlex);
 		RELEASEOBJECT(AnnotationsReferencePlex);

ASCOfficeDocFile/DocDocxConverter/WordDocument.h

@@ -224,6 +224,7 @@ namespace DocFileFormat
 		Plex<FieldCharacter>				*FootnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*EndnoteDocumentFieldsPlex;
 		Plex<FieldCharacter>				*HeadersAndFootersDocumentFieldsPlex;
+		Plex<FieldCharacter>				*AnnotationsFieldsPlex;
 		Plex<AnnotationReferenceDescriptor> *AnnotationsReferencePlex;
 		Plex<AnnotationReferenceExDescriptor> *AnnotationsReferenceExPlex;
 		Plex<EmptyStructure>				*AutoTextPlex;		

ASCOfficeDocFile/DocFormatTest/DocFile_VS2005.sln

@@ -2,20 +2,17 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatLib", "..\DocFormatLib\Win32\DocFormatLib.vcproj", "{C5371405-338F-4B70-83BD-2A5CDF64F383}"
-	ProjectSection(ProjectDependencies) = postProject
-		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
-	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\..\ASCOfficeXlsFile2\source\win32\XlsFormat.vcproj", "{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocFormatTest", "DocFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	ProjectSection(ProjectDependencies) = postProject
+		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
+		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
 		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{C5371405-338F-4B70-83BD-2A5CDF64F383} = {C5371405-338F-4B70-83BD-2A5CDF64F383}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -210,25 +210,41 @@ namespace formulasconvert {
 
 	bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
 	{	
+		std::wstring workstr = expr;
+		workstr = boost::regex_replace(
+			workstr,
+			boost::wregex(L"('.*?')|(\".*?\")"),
+			&convert_scobci, boost::match_default | boost::format_all);
+
 		std::vector< std::wstring > splitted;
 	    
-		boost::algorithm::split(splitted, expr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
-	    
+		boost::algorithm::split(splitted, workstr, boost::algorithm::is_any_of(L".:"), boost::algorithm::token_compress_on);
+	  
+		bool res = false;
+		if (splitted.size() == 2)
+		{
+			table		= splitted[0];	
+			ref_first	= splitted[1];
+			ref_last	= splitted[1];
+			res = true;
+		}
 		if (splitted.size() == 3)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
 			ref_last	= splitted[2];
-			return true;
+			res = true;
 		}
 		if (splitted.size() == 4)
 		{
 			table		= splitted[0];	
 			ref_first	= splitted[1];
 			ref_last	= splitted[3];
-			return true;
+			res = true;
 		}
-		return false;
+		replace_tmp_back( table );
+
+		return res;
 	}
 
 	bool odf2oox_converter::Impl::find_first_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref)

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -188,7 +188,7 @@ void oox2odf_converter::Impl::replace_cells_range(std::wstring& expr, bool bSele
 	if ((0 == expr.find(L"KAVYCHKA")) && (expr.length() - 8 == expr.rfind(L"KAVYCHKA") ))
 		return;
 
-	boost::wregex re(L"([:$!])+");
+	boost::wregex re(L"(([:$!])+)|(\\S+\\d+)");
 
 	boost::wsmatch result;
 	bool b = boost::regex_search(expr, result, re);

ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp

@@ -1077,7 +1077,7 @@ void docx_conversion_context::process_styles()
 
                 const std::wstring displayName = StyleDisplayName(arStyles[i]->name(), arStyles[i]->display_name(), arStyles[i]->type());
 
-                _Wostream << L"<w:name w:val=\"" << displayName << L"\"/>";
+				_Wostream << L"<w:name w:val=\"" << XmlUtils::EncodeXmlString(displayName) << L"\"/>";
 
                 if (odf_reader::style_instance * baseOn = arStyles[i]->parent())
                 {

ASCOfficeOdfFile/src/docx/oox_chart_axis.cpp

@@ -150,12 +150,18 @@ void oox_axis_content::oox_serialize_content(std::wostream & _Wostream)
 			odf_reader::GetProperty(content_.properties_,L"maximum", doubleVal);
 			if (doubleVal)
 			{
-				CP_XML_ATTR(L"c:max", *doubleVal);
+				CP_XML_NODE(L"c:max")
+				{
+					CP_XML_ATTR(L"val", *doubleVal);
+				}
 			}
 			odf_reader::GetProperty(content_.properties_,L"minimum", doubleVal);
 			if (doubleVal)
 			{
-				CP_XML_ATTR(L"c:min", *doubleVal);
+				CP_XML_NODE(L"c:min")
+				{
+					CP_XML_ATTR(L"val", *doubleVal);
+				}
 			}
 			odf_reader::GetProperty(content_.properties_,L"logarithmic", boolVal);
 			if ((boolVal == true) && (boolVal.get()==true))

ASCOfficeOdfFile/src/docx/oox_chart_series.cpp

@@ -59,12 +59,19 @@ oox_chart_series::oox_chart_series()
 	bLocalTable_		= false;
 	labelPosEnabled_	= true;
 }
-void oox_chart_series::setName(std::wstring &value)
+void oox_chart_series::setName(const std::wstring &value)
 {
-	name_=value;
+	name_ = value;
 }
+void oox_chart_series::setLabels(const std::wstring &formula, std::vector<std::wstring> & cash)
+{
+	formulasconvert::odf2oox_converter converter;
 
-void oox_chart_series::setFormula(int ind, std::wstring &value, std::wstring & formatCode, bool link_to_source)
+	label_.present	= true;
+	label_.formula = converter.convert_chart_distance(formula);
+	label_.str_cache = cash;
+}
+void oox_chart_series::setFormula(int ind, const std::wstring &value, const std::wstring & formatCode, bool link_to_source)
 {
 	formulasconvert::odf2oox_converter converter;
 
@@ -137,6 +144,7 @@ void oox_chart_series::parse_properties()
 		data_labels_->set_position(*intVal); 
 	}
 }
+
 void oox_chart_series::setValues(int ind, std::vector<std::wstring> & values)
 {
 	values_[ind].present = true;
@@ -215,6 +223,44 @@ void oox_chart_series::oox_serialize_common(std::wostream & _Wostream)
 		shape.set(content_.graphic_properties_, content_.fill_);
 		shape.oox_serialize(_Wostream);
 
+		if (label_.present)
+		{
+			CP_XML_NODE(L"c:tx")
+			{
+				CP_XML_NODE(L"c:strRef")
+				{
+					if (!label_.formula.empty())
+					{
+						CP_XML_NODE(L"c:f")
+						{
+							CP_XML_STREAM() << label_.formula;
+						}
+					}
+					if (false == label_.str_cache.empty())
+					{
+						CP_XML_NODE(L"c:strCache")
+						{
+							CP_XML_NODE(L"c:ptCount")
+							{
+								CP_XML_ATTR(L"val", label_.str_cache.size());
+							}
+							for (size_t i = 0; i < label_.str_cache.size(); i++)
+							{
+								CP_XML_NODE(L"c:pt")
+								{
+									CP_XML_ATTR(L"idx", i);
+									CP_XML_NODE(L"c:v")
+									{
+										CP_XML_STREAM() <<  label_.str_cache[i];
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
 		for (int i = 0; i < 5; i++)
 		{
 			if (values_[i].present)

ASCOfficeOdfFile/src/docx/oox_chart_series.h

@@ -56,17 +56,20 @@ public:
 	virtual void oox_serialize(std::wostream & _Wostream) = 0;
 	
 	bool						labelPosEnabled_;
-	_oox_chart_values			values_[5]; //cat(labels), common, x, y, bubble, 
+	_oox_chart_values			values_[5]; //cat, common, x, y, bubble, 
+
+	_oox_strRef					label_; //tx (Series Text) §21.2.2.215
 	int							id_;
-	std::wstring				name_;	//tx (Series Text) §21.2.2.215
+	std::wstring				name_;	
 	int							iSymbolMarkerType_;
 	bool						bLocalTable_;
 	_CP_OPT(oox_data_labels)	data_labels_;
 	
-	void setName(std::wstring &value);
+	void setName(const std::wstring &value);
 	
-	void setFormula	(int ind, std::wstring & value, std::wstring & formatCode, bool link_to_source);
+	void setFormula	(int ind, const std::wstring & value, const std::wstring & formatCode, bool link_to_source);
 	void setValues	(int ind, std::vector<std::wstring> & values);
+	void setLabels	(const std::wstring &formula, std::vector<std::wstring> & values);
 	void parse_properties();
 	
 	void set_cache_only (bool val);

ASCOfficeOdfFile/src/docx/oox_chart_values.h

@@ -55,21 +55,21 @@ struct _oox_numLit
 
 struct _oox_strRef
 {
-	bool						present;
+	bool						present = false;
 
 	std::wstring				formula;
-	int							str_cache_count;
+	int							str_cache_count = 0;
 	std::vector<std::wstring>	str_cache;
 
 };
 struct _oox_numRef
 {
-	bool						present;
+	bool						present = false;
 
 	std::wstring				formula;
 	std::wstring				formatCode;
-	bool						link_to_source;
-	int							num_cache_count;
+	bool						link_to_source = false;
+	int							num_cache_count = 0;
 	std::vector<std::wstring>	num_cache;
 
 };

ASCOfficeOdfFile/src/docx/oox_types_chart.cpp

@@ -46,13 +46,13 @@ void oox_chart::set_cache_only (bool val)
 
 }
 
-void oox_chart::set_formula_series(int ind, std::wstring val, std::wstring formatCode, bool link_to_source)
+void oox_chart::set_formula_series(int ind, const std::wstring& val, const std::wstring& formatCode, bool link_to_source)
 {
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setFormula(ind, val, formatCode, link_to_source);
 
 }
-void oox_chart::set_name(std::wstring val)
+void oox_chart::set_name(const std::wstring& val)
 {
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setName(val);
@@ -68,6 +68,13 @@ void oox_chart::set_values_series(int ind, std::vector<std::wstring> & val)
 	oox_series_ptr & current_ptr = series_.back();
 	current_ptr->setValues (ind, val);
 }
+void oox_chart::set_label_series(const std::wstring& formula, std::vector<std::wstring> & cash)
+{
+	if (formula.empty() && cash.empty()) return;
+
+	oox_series_ptr & current_ptr = series_.back();
+	current_ptr->setLabels (formula, cash);
+}
 void oox_chart::set_properties(std::vector<odf_reader::_property> g)
 {
 	_CP_OPT(int) iVal;

ASCOfficeOdfFile/src/docx/oox_types_chart.h

@@ -78,9 +78,10 @@ public:
 	virtual void add_series(int id){}
 	
 	void set_cache_only		(bool val);
-	void set_formula_series	(int ind, std::wstring val, std::wstring formatCode, bool link_to_source);
+	void set_formula_series	(int ind, const std::wstring& val, const std::wstring& formatCode, bool link_to_source);
 	void set_values_series	(int ind, std::vector<std::wstring> & val);
-	void set_name			(std::wstring val);
+	void set_label_series	(const std::wstring& formula, std::vector<std::wstring> & val);
+	void set_name			(const std::wstring& val);
 	void set_content_series	(odf_reader::chart::series & content);
 	
 	//void set_showBubbleSize(bool Val){data_labels_.set_showBubbleSize(Val);}

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -421,11 +421,13 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		std::vector<std::wstring>		domain_cash;
 		std::vector<std::wstring>		cell_cash;
 		std::vector<std::wstring>		cat_cash;
+		std::vector<std::wstring>		label_cash;
 
 		calc_cache_series (domain_cell_range_adress_,			domain_cash);
 		calc_cache_series (series_[i].cell_range_address_,		cell_cash);
+		calc_cache_series (series_[i].label_cell_address_,		label_cash);
 		
-		if (categories_.size() >0)
+		if (false == categories_.empty())
 			calc_cache_series (categories_[0],	cat_cash);
 
 		std::wstring			formatCode	= L"General";
@@ -439,6 +441,11 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 		{
 			formatCode = *strVal;
 		}
+
+		if (false == series_[i].label_cell_address_.empty())
+		{
+			current->set_label_series(series_[i].label_cell_address_, label_cash);//_oox_strRef  
+		}
 		
 		if (domain_cell_range_adress_.empty() == false || 
 			last_set_type == chart_scatter) 
@@ -455,14 +462,14 @@ void object_odf_context::oox_convert(oox::oox_chart_context & chart_context)
 			}
 			else
 			{	//x
-				if (false == domain_cash.empty() || cash_values.empty())
+				if (false == domain_cash.empty() || false == cash_values.empty())
 				{
 					if (!bPivotChart_)
 						current->set_formula_series(2, domain_cell_range_adress_, formatCode, boolVal.get_value_or(true));	
 					current->set_values_series (2, domain_cash);		
 				}
 				//y
-				if (false == cell_cash.empty() || cash_values.empty())
+				if (false == cell_cash.empty() || false == cash_values.empty())
 				{
 					if (!bPivotChart_)
 						current->set_formula_series(3, series_[i].cell_range_address_, formatCode, boolVal.get_value_or(true));				

ASCOfficeOdfFile/src/odf/datatypes/common_attlists.cpp

@@ -265,7 +265,13 @@ void common_break_attlist::serialize(CP_ATTR_NODE)
 
 void common_page_number_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    CP_APPLY_ATTR(L"style:page-number", style_page_number_);
+	_CP_OPT(std::wstring) str;
+    CP_APPLY_ATTR(L"style:page-number", str);
+
+	if ((str) && (*str != L"auto"))
+	{
+		style_page_number_ = XmlUtils::GetInteger(*str);
+	}
 }
 void common_page_number_attlist::apply_from(const common_page_number_attlist & Other)
 {

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -462,7 +462,9 @@ void odf_drawing_context::end_group()
 	
 	impl_->current_group_ = impl_->group_list_.back()->prev_group;
 	impl_->group_list_.pop_back();
-	impl_->current_level_.pop_back();
+
+	if (!impl_->current_level_.empty())
+		impl_->current_level_.pop_back();
 }
 
 
@@ -2052,8 +2054,8 @@ void odf_drawing_context::set_position(_CP_OPT(double) & x_pt, _CP_OPT(double) &
 	double x = x_pt ? *x_pt : 0;
 	double y = y_pt ? *y_pt : 0;
 
-	double cx = *impl_->current_drawing_state_.cx_;
-	double cy = *impl_->current_drawing_state_.cy_;
+	//double cx = *impl_->current_drawing_state_.cx_;
+	//double cy = *impl_->current_drawing_state_.cy_;
 	
 	if (impl_->current_drawing_state_.in_group_)
 	{
@@ -2067,8 +2069,8 @@ void odf_drawing_context::set_position(_CP_OPT(double) & x_pt, _CP_OPT(double) &
 			x = (x + impl_->group_list_[i]->shift_x) * impl_->group_list_[i]->scale_cx ;	
 			y = (y + impl_->group_list_[i]->shift_y) * impl_->group_list_[i]->scale_cy;
 
-			cx *= impl_->group_list_[i]->scale_cx;
-			cy *= impl_->group_list_[i]->scale_cy;
+			//cx *= impl_->group_list_[i]->scale_cx;
+			//cy *= impl_->group_list_[i]->scale_cy;
 		}
 	}
 
@@ -2373,6 +2375,7 @@ void odf_drawing_context::set_textarea_font(std::wstring & latin, std::wstring &
 }
 void odf_drawing_context::set_textarea_fontcolor(std::wstring hexColor)
 {
+	if (hexColor.empty()) return;
 	if (impl_->current_drawing_state_.elements_.empty())return;
 
 	odf_style_state_ptr style_state = impl_->styles_context_->last_state(style_family::Paragraph);

ASCOfficeOdfFileW/source/OdfFormat/odf_number_styles_context.cpp

@@ -240,14 +240,14 @@ void odf_number_styles_context::set_odf_context(odf_conversion_context * Context
 }
 void odf_number_styles_context::create(int oox_num_fmt, std::wstring formatCode)
 {
-	if (oox_num_fmt <164)return create_default(oox_num_fmt,formatCode);
+	if (oox_num_fmt < 164) return create_default(oox_num_fmt, formatCode);
 
 	number_format_state state;
 
 	state.oox_num_fmt = oox_num_fmt;
 	state.style_name = std::wstring(L"NF1000") + boost::lexical_cast<std::wstring>( number_format_array_.size()+1);
 	state.ods_type = office_value_type::Custom;
-	state.language_code=0;
+	state.language_code = 0;
 
 //////////////////////////////
 
@@ -259,7 +259,7 @@ void odf_number_styles_context::create(int oox_num_fmt, std::wstring formatCode)
 	}
 
 	number_format_array_.push_back(state);
-	named_link_map_[oox_num_fmt] = number_format_array_.size() - 1;
+	named_link_map_[oox_num_fmt] = (int)number_format_array_.size() - 1;
 
 	detect_format(number_format_array_.back());
 }
@@ -271,8 +271,14 @@ void odf_number_styles_context::create_default(int oox_num_fmt, std::wstring for
 	
 	state.oox_num_fmt = oox_num_fmt;
 	state.ods_type = office_value_type::Custom;
-	state.style_name = std::wstring(L"NF1000") + boost::lexical_cast<std::wstring>( number_format_array_.size()+1);
-	state.language_code=0;
+	state.language_code = 0;
+
+	if (oox_num_fmt == 0 && formatCode.empty()) 
+	{
+		//general
+	}
+	else
+		state.style_name = std::wstring(L"NF1000") + boost::lexical_cast<std::wstring>( number_format_array_.size()+1);
 
 	switch (oox_num_fmt)
 	{
@@ -342,7 +348,7 @@ void odf_number_styles_context::create_default(int oox_num_fmt, std::wstring for
 ////////////////////////////////////////////
 
 	number_format_array_.push_back(state);
-	named_link_map_[oox_num_fmt] = number_format_array_.size() - 1;
+	named_link_map_[oox_num_fmt] = (int)number_format_array_.size() - 1;
 
 	detect_format(number_format_array_.back());
 
@@ -355,7 +361,7 @@ number_format_state & odf_number_styles_context::add_or_find(int oox_num_fmt, st
 	}
 	else
 	{
-		create(oox_num_fmt,formatCode);
+		create(oox_num_fmt, formatCode);
 		return number_format_array_.back();
 	}
 }
@@ -434,7 +440,7 @@ void odf_number_styles_context::create_numbers(number_format_state & state, offi
 			if (std::wstring::npos != splits[i].find(L"\""))
 			{
 				bText = true;
-				indText = i;
+				indText = (int)i;
 				break;
 			}
 		}
@@ -442,7 +448,7 @@ void odf_number_styles_context::create_numbers(number_format_state & state, offi
 		{
 			if (i != indText)
 			{
-				indNumber = i;
+				indNumber = (int)i;
 				break;
 			}
 		}
@@ -533,12 +539,13 @@ void odf_number_styles_context::create_percentage_style(number_format_state & st
     create_numbers(state, elm, empty);
 	root_elm->add_child_element(elm); 
 
-	create_element(L"number", L"text", elm, odf_context_);
-	number_text* number_text_ = dynamic_cast<number_text*>(elm.get());
+	office_element_ptr elm_text;
+	create_element(L"number", L"text", elm_text, odf_context_);
+	number_text* number_text_ = dynamic_cast<number_text*>(elm_text.get());
 	if (number_text_)number_text_->add_text(L"%"); 	
 
-	root_elm->add_child_element(elm);
-	styles_elments.push_back(elm);
+	root_elm->add_child_element(elm_text);
+	styles_elments.push_back(elm_text);
 }
 
 void odf_number_styles_context::create_currency_style(number_format_state & state, office_element_ptr & root_elm)
@@ -568,7 +575,7 @@ void odf_number_styles_context::create_currency_style(number_format_state & stat
 				}
 			}
 
-			if (number_country.length()>0)
+			if (false == number_country.empty())
 			{
 				number_currency_symbol_->number_country_ = number_country;
 			}			

ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp

@@ -92,22 +92,27 @@ void odf_page_layout_context::create_layer_sets()
 	create_element(L"draw", L"layer", elm, odf_context_); 		sets_elm->add_child_element(elm);
 	layer = dynamic_cast<draw_layer*>(elm.get());
 	if (layer) layer->draw_name_ = L"layout";
+	elm = office_element_ptr();
 
 	create_element(L"draw", L"layer", elm, odf_context_);		sets_elm->add_child_element(elm);
 	layer = dynamic_cast<draw_layer*>(elm.get());
 	if (layer) layer->draw_name_ = L"background";
+	elm = office_element_ptr();
 	
 	create_element(L"draw", L"layer", elm, odf_context_);		sets_elm->add_child_element(elm);
 	layer = dynamic_cast<draw_layer*>(elm.get());
 	if (layer) layer->draw_name_ = L"backgroundobjects";
+	elm = office_element_ptr();
 	
 	create_element(L"draw", L"layer", elm, odf_context_);		sets_elm->add_child_element(elm);
 	layer = dynamic_cast<draw_layer*>(elm.get());
 	if (layer) layer->draw_name_ = L"controls";
+	elm = office_element_ptr();
 
 	create_element(L"draw", L"layer", elm, odf_context_);		sets_elm->add_child_element(elm);
 	layer = dynamic_cast<draw_layer*>(elm.get());
 	if (layer) layer->draw_name_ = L"measurelines";
+	elm = office_element_ptr();
 
 	master_state_list_.push_back( odf_master_state(sets_elm) ); 
 }

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.cpp

@@ -601,15 +601,23 @@ void odf_table_context::set_cell_row_span(int spanned)
 	else
 	{
 		int col = impl_->current_table().current_column - 1;
-		odf_column_state & state = impl_->current_table().columns[col];
+		
+		if (col < (int)impl_->current_table().columns.size())
+		{
+			odf_column_state & state = impl_->current_table().columns[col];
 
-		state.spanned_row_cell.push_back(impl_->current_table().cells.back().elm);
+			state.spanned_row_cell.push_back(impl_->current_table().cells.back().elm);
+		}
 	}
 }
 
 void odf_table_context::set_cell_row_span_restart()
 {
 	int col = impl_->current_table().current_column - 1;
+
+	if (col >= (int)impl_->current_table().columns.size())
+		return;
+
 	odf_column_state & state = impl_->current_table().columns[col];
 
 	unsigned int sz = (unsigned int)state.spanned_row_cell.size();

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.cpp

@@ -77,7 +77,7 @@ std::wstring convert_date(const std::wstring & oox_date)
 	{
 		return oox_date;
 	}
-	boost::gregorian::date date_ = boost::gregorian::date(1900, 1, 1) + boost::gregorian::date_duration(iDate-2);
+	boost::gregorian::date date_ = boost::gregorian::date(1900, 1, 1) + boost::gregorian::date_duration(iDate - 2);
 
 	////to for example, "1899-12-31T05:37:46.66569
 	std::wstring date_str;
@@ -110,19 +110,18 @@ std::wstring convert_time(const std::wstring & oox_time)
 	}
 
 	//PT12H15M42S
-	int hours=0, minutes=0;
-	double sec=0;
+	int hours = 0, minutes = 0;
+	double sec = 0;
 	
-	//todooo ПЕРЕПИСАТЬ !!!
-	//boost::posix_time::time_duration day(24, 0, 0);
-	//
-	//double millisec = day.total_milliseconds() * dTime;
+	boost::posix_time::time_duration day(24, 0, 0);
+	
+	double millisec = day.total_milliseconds() * dTime;
 
 
-	//sec		= millisec /1000.;
-	//hours	= sec/60./60.;
-	//minutes = (sec - (hours * 60 * 60))/60.;
-	//sec		= sec - (hours *60 + minutes) * 60.;
+	sec		= millisec /1000.;
+	hours	= sec/60./60.;
+	minutes = (sec - (hours * 60 * 60))/60.;
+	sec		= sec - (hours *60 + minutes) * 60.;
 
 	int sec1 = sec;
 

ASCOfficeOdfFileW/source/OdfFormat/ods_table_state.h

@@ -102,7 +102,7 @@ namespace utils
 				f = false;
 			else
 				v += 1;
-			res += v * mul;
+			res += (int)(v * mul);
 			mul *= r;
 		}
 		return res;

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -437,17 +437,19 @@ void OoxConverter::convert(PPTX::Logic::ChartRec *oox_chart)
 	if (oFile.IsInit())
 	{
 		OOX::Spreadsheet::CChartSpace* pChart = dynamic_cast<OOX::Spreadsheet::CChartSpace*>(oFile.operator->());
+		OOX::Spreadsheet::CChartSpaceEx* pChartEx = dynamic_cast<OOX::Spreadsheet::CChartSpaceEx*>(oFile.operator->());
 		
-		if (pChart)
+		if (pChart || pChartEx)
 		{
-			oox_current_child_document = dynamic_cast<OOX::IFileContainer*>(pChart);	
+			oox_current_child_document = pChart ? dynamic_cast<OOX::IFileContainer*>(pChart) : dynamic_cast<OOX::IFileContainer*>(pChartEx);	
 			
 			OOX::CChartDrawing* pChartDrawing = NULL;
-			if ((pChart->m_oChartSpace.m_userShapes) && (pChart->m_oChartSpace.m_userShapes->m_id))
+			if ( (pChart) && ((pChart->m_oChartSpace.m_userShapes) && (pChart->m_oChartSpace.m_userShapes->m_id)) )
 			{
 				oFile = find_file_by_id (*pChart->m_oChartSpace.m_userShapes->m_id);
 				pChartDrawing = dynamic_cast<OOX::CChartDrawing*>(oFile.operator->());
 			}
+			
 			if ((pChartDrawing) && (false == pChartDrawing->m_arrItems.empty()))
 			{
 				odf_context()->drawing_context()->start_group();
@@ -465,9 +467,16 @@ void OoxConverter::convert(PPTX::Logic::ChartRec *oox_chart)
 				odf_context()->start_chart();
 					odf_context()->chart_context()->set_chart_size(width, height);		
 		
-					OoxConverter::convert(pChart->m_oChartSpace.m_oSpPr.GetPointer());			
-			
-					OoxConverter::convert(&pChart->m_oChartSpace);
+					if (pChart)
+					{
+						OoxConverter::convert(pChart->m_oChartSpace.m_oSpPr.GetPointer());					
+						OoxConverter::convert(&pChart->m_oChartSpace);
+					}
+					else if (pChartEx)
+					{
+						OoxConverter::convert(pChartEx->m_oChartSpace.m_oSpPr.GetPointer());					
+						OoxConverter::convert(&pChartEx->m_oChartSpace);
+					}
 				odf_context()->end_chart();
 			}
 			odf_context()->drawing_context()->end_object();	
@@ -748,7 +757,7 @@ void OoxConverter::convert(PPTX::Logic::Shape *oox_shape)
 				odf_context()->drawing_context()->set_no_fill();
 			odf_context()->drawing_context()->end_line_properties();
 		
-		odf_context()->drawing_context()->end_text_box();	
+		odf_context()->drawing_context()->end_shape();	
 		odf_context()->drawing_context()->end_drawing();
 		
 		odf_context()->drawing_context()->end_group();	
@@ -1689,7 +1698,9 @@ void OoxConverter::convert_list_level(PPTX::Logic::TextParagraphPr	*oox_para_pro
 		
 		if (size_pt < 0.001 && odf_list_type == 1000)
 		{
-			odf_writer::style_text_properties * text_props = odf_context()->styles_context()->last_state(odf_types::style_family::Paragraph)->get_text_properties();
+			odf_writer::odf_style_state_ptr state = odf_context()->styles_context()->last_state(odf_types::style_family::Paragraph);
+			odf_writer::style_text_properties *text_props = state ? state->get_text_properties() : NULL;
+
 			if (text_props && text_props->content_.fo_font_size_)
 			{
 				size_pt = text_props->content_.fo_font_size_->get_length().get_value_unit(odf_types::length::pt);
@@ -1977,11 +1988,11 @@ void OoxConverter::convert(PPTX::Logic::RunProperties *oox_run_pr, odf_writer::s
 	odf_writer::odf_drawing_context *drawing = odf_context()->drawing_context(); 
 	if (drawing)	//from styles drawing impossible(  ... todoooo ??? 
 	{	
-		if ((oox_run_pr->Fill.is<PPTX::Logic::GradFill>()) ||
-			(oox_run_pr->ln.IsInit() /*&& (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() != OOX::et_a_noFill)*/))
-		{
-			drawing->change_text_box_2_wordart();
-		}
+		//if ((oox_run_pr->Fill.is<PPTX::Logic::GradFill>()) ||
+		//	(oox_run_pr->ln.IsInit() /*&& (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() != OOX::et_a_noFill)*/))
+		//{
+		//	drawing->change_text_box_2_wordart();
+		//}
 
 		if (drawing->is_wordart())
 		{
@@ -2014,7 +2025,8 @@ void OoxConverter::convert(PPTX::Logic::RunProperties *oox_run_pr, odf_writer::s
 
 	if (oox_run_pr->ln.is_init())
 	{
-		drawing->start_line_properties(true);
+		if (drawing)
+			drawing->start_line_properties(true);
 		if (oox_run_pr->ln->Fill.is_init() && oox_run_pr->ln->Fill.getType() == OOX::et_a_solidFill )
 		{	
 			solidFill = &oox_run_pr->ln->Fill.as<PPTX::Logic::SolidFill>();

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h

@@ -230,6 +230,26 @@ namespace OOX
 		class CT_Style;
 		class CT_TextLanguageID;
 		class CTextProperties;
+
+		namespace ChartEx
+		{
+			class CChartSpace;
+			class CChart;
+			class CChartData;
+			class CData;
+			class CDimension;
+			class CPlotArea;
+			class CLegend;
+			class CAxis;
+			class CTickMarks;
+			class CGridlines;
+			class CValScaling;
+			class CCatScaling;
+			class CSeries;
+			class CDataLabels;
+			class CTitle;
+
+		}
 	}
 	class CSizeAnchor;
 	namespace Vml
@@ -522,7 +542,12 @@ public:
 		void convert(OOX::Spreadsheet::CT_StrData				*str_data, bool categories, bool label);
 		
 		void convert(OOX::CSizeAnchor *sz_anchor, double x0, double y0, double width, double height);
-
+//.chart.ex...........................................................................................................................
+		void convert(OOX::Spreadsheet::ChartEx::CChartSpace		*oox_chart);
+		void convert(OOX::Spreadsheet::ChartEx::CTitle			*ct_title);
+		void convert(OOX::Spreadsheet::ChartEx::CChart			*oox_chart);
+		void convert(OOX::Spreadsheet::ChartEx::CChartData		*oox_chart_data);
+		void convert(OOX::Spreadsheet::ChartEx::CPlotArea		*oox_plot_area);
 //.vml............................................................................................................................
 		void convert(OOX::Vml::CShapeType				*vml_shape_type);
 		void convert(OOX::Vml::CShape					*vml_shape);

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConverterChart.cpp

@@ -282,7 +282,6 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_PlotArea* ct_plotArea)
 		odf_context()->chart_context()->end_element();
 	}
 }
-//////////////////////////////////////////////////////////////////////////////////////////////
 void OoxConverter::convert(OOX::Spreadsheet::CT_CatAx* axis)
 {
 	if (axis == NULL)return;
@@ -448,7 +447,6 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_ValAx* axis)
 		convert(axis->m_minorGridlines, 2);
 	odf_context()->chart_context()->end_element();
 }
-////////////////////////////////////////////////////////////////////////////////////////////
 void OoxConverter::convert(OOX::Spreadsheet::CT_ChartLines *line, int type)
 {
 	if (line == NULL)return;
@@ -1212,7 +1210,6 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_NumDataSource* val)
 	}
 	
 }
-///////////////////////////////////////////////////////////////////////////////////////////////
 void OoxConverter::convert(OOX::Spreadsheet::CT_Surface* ct_surface, int type, bool chart3D)
 {
 	if (ct_surface == NULL && chart3D == false)return;
@@ -1293,4 +1290,59 @@ void OoxConverter::convert(OOX::Spreadsheet::CT_StrData *str_data, bool categori
 
 	odf_context()->chart_context()->set_cash(format, data, categories, label);
 }
+
+//---------------------------------------------------------------------------------------------------------------
+////chart ex ///////////////////////////////////////////////////////////////////////////////////////////
+//---------------------------------------------------------------------------------------------------------------
+void OoxConverter::convert(OOX::Spreadsheet::ChartEx::CPlotArea* oox_plotArea)
+{
+	if (oox_plotArea == NULL)return;
+
+	//convert(oox_plotArea->m_layout);
+///////////////////////
+
+	for (size_t i = 0; i < oox_plotArea->m_plotAreaRegion.m_arSeries.size(); i++)
+	{
+		convert(oox_plotArea->m_plotAreaRegion.m_arSeries[i]);
+	}
+	for (size_t i = 0; i < oox_plotArea->m_arAxis.size(); i++)
+	{
+		convert(oox_plotArea->m_arAxis[i]);
+	}
+
+	odf_context()->chart_context()->start_wall();
+	{
+		convert(oox_plotArea->m_oSpPr.GetPointer());
+	}	
+	odf_context()->chart_context()->end_element();
+}
+void OoxConverter::convert(OOX::Spreadsheet::ChartEx::CChartData *oox_chart_data)
+{
+	if (!oox_chart_data) return;
+
+	for (size_t i = 0; i < oox_chart_data->m_arData.size(); i++)
+	{
+	}
+
+}
+void OoxConverter::convert(OOX::Spreadsheet::ChartEx::CChartSpace *oox_chart)
+{
+	if (!oox_chart)return;
+
+	convert(oox_chart->m_oSpPr.GetPointer());	
+	convert_chart_text(oox_chart->m_oTxPr.GetPointer());
+
+	//convert(oox_chart->m_chart.m_title);
+	//convert(oox_chart->m_chart.m_legend);
+
+	convert(&oox_chart->m_chartData);
+
+	odf_context()->chart_context()->start_plot_area();
+	{
+		convert(&oox_chart->m_chart.m_plotArea); 
+	}
+	odf_context()->chart_context()->end_plot_area();
+}
+
+
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -310,8 +310,8 @@ void PptxConverter::convert_slides()
 				bool bShowLayoutMasterAnim	= slide->Layout->showMasterPhAnim.get_value_or(true);
 				bool bShowLayoutMasterSp	= slide->Layout->showMasterSp.get_value_or(true);
 				
-				if (slide->Master->cSld.attrName.IsInit())	master_style_name = slide->Master->cSld.attrName.get();
-				else if (current_theme->name.IsInit())		master_style_name = current_theme->name.get();
+				if (slide->Master->cSld.attrName.IsInit())					master_style_name = slide->Master->cSld.attrName.get();
+				else if ((current_theme) && (current_theme->name.IsInit()))	master_style_name = current_theme->name.get();
 
 				master_style_name += L"_" ;
 				

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.cpp

@@ -59,7 +59,17 @@ _UINT32 COfficePPTFile::OpenFile(const std::wstring & sFileName, const std::wstr
     POLE::Storage *pStgFrom = new POLE::Storage(sFileName.c_str());
 	if (pStgFrom == NULL) return AVS_ERROR_FILEFORMAT;
 	
-	pStgFrom->open(false, false);
+	try
+	{
+		if (false == pStgFrom->open(false, false))
+		{
+			return AVS_ERROR_FILEACCESS; //file access error or not compound file
+		}
+	}
+	catch(...)
+	{
+		return AVS_ERROR_FILEACCESS; 
+	}
 
 	m_pReader = new CPPTFileReader(pStgFrom, m_strTempDirectory);
 	CPPTFileReader* pptReader = (CPPTFileReader*)m_pReader;	

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfo.h

@@ -121,8 +121,15 @@ public:
 	{
 		if (m_arUsers.empty()) return false;
 		
-		m_arUsers[0]->ReadExtenalObjects(strFolderMem);
-		m_arUsers[0]->FromDocument();
+		try
+		{
+			m_arUsers[0]->ReadExtenalObjects(strFolderMem);
+			m_arUsers[0]->FromDocument();
+		}
+		catch(int) //error code
+		{
+			return false;
+		}
 
 		return true;
 	}

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp

@@ -860,7 +860,12 @@ void CPPTUserInfo::LoadSlide(_UINT32 dwSlideID, CSlide* pSlide)
 	if (pPairTheme == m_mapMasterToTheme.end())
 	{
 		//????? слайду не присвоена тема !!!
-		pPairTheme = m_mapMasterToTheme.begin();
+		if (false == m_mapMasterToTheme.empty())
+			pPairTheme = m_mapMasterToTheme.begin();
+		else
+		{			
+			throw 1;	// file format error
+		}
 	}
 //-----------------	
 	pSlide->m_lThemeID			= pPairTheme->second;
@@ -1766,8 +1771,10 @@ void CPPTUserInfo::LoadMaster(_typeMaster type, CRecordSlide* pMaster, CSlideInf
 
 	//настройки текстовых стилей -----------------------------------------------
 	
-	for (size_t i = 0; i < 9; ++i)
+	for (size_t i = 0; i < 9 && false == m_arMasterWrapper.empty(); ++i)
+	{
 		pMasterWrapper->m_pStyles[i] = m_arMasterWrapper[0].m_pStyles[i]; //main master
+	}
 	
 	CLayout* pLayout = NULL; // ну нету тут разметок ...!!
 	

ASCOfficePPTFile/PptFormatTest/PptFormatTest.vcproj

@@ -349,6 +349,14 @@
 				RelativePath="..\..\ASCOfficePPTXFile\Editor\BinaryFileReaderWriter.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\BinaryReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\BinaryWriter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
 				>

ASCOfficePPTXFile/PPTXFormat/FileFactory.cpp

@@ -119,6 +119,12 @@ namespace PPTX
 
 		else if (relation.Type() == OOX::FileTypes::Chart)
 			return smart_ptr<OOX::File>(new OOX::Spreadsheet::CChartSpace(pMain, filename, filename));
+		else if (relation.Type() == OOX::FileTypes::ChartEx)
+			return smart_ptr<OOX::File>(new OOX::Spreadsheet::CChartSpaceEx(pMain, filename, filename));
+		else if (relation.Type() == OOX::FileTypes::ChartStyle)
+			return smart_ptr<OOX::File>(new OOX::Spreadsheet::CChartStyle(pMain, filename, filename));
+		else if (relation.Type() == OOX::FileTypes::ChartColorStyle)
+			return smart_ptr<OOX::File>(new OOX::Spreadsheet::CChartColorStyle(pMain, filename, filename));
 		else if (relation.Type() == OOX::FileTypes::HyperLink)
 			return smart_ptr<OOX::File>(new OOX::HyperLink(pMain, relation.Target()));
 		else if (relation.Type() == OOX::FileTypes::Image)

ASCOfficePPTXFile/PPTXFormat/Logic/GraphicFrame.cpp

@@ -508,7 +508,14 @@ namespace PPTX
 			}
 			else if (chartRec.is_init())
 			{
-				pWriter->WriteRecord2(3, chartRec);
+				if (chartRec->m_bChartEx)
+				{
+					pWriter->WriteRecord2(4, chartRec);
+				}
+				else
+				{
+					pWriter->WriteRecord2(3, chartRec);
+				}
 			}
 			else if (element.is_init())
 			{
@@ -575,6 +582,12 @@ namespace PPTX
 						chartRec = new Logic::ChartRec();
 						chartRec->fromPPTY(pReader);
 					}					
+					case 4:
+					{
+						chartRec = new Logic::ChartRec();
+						chartRec->m_bChartEx = true;
+						chartRec->fromPPTY(pReader);
+					}		
 					default:
 						break;
 				}

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -502,15 +502,18 @@ namespace PPTX
 				{
 					if (parentFileIs<Slide>())
 					{
-						parentFileAs<Slide>().Layout->GetLevelUp(this);
+						if (parentFileAs<Slide>().Layout.IsInit())
+							parentFileAs<Slide>().Layout->GetLevelUp(this);
 					}
 					else if(parentFileIs<SlideLayout>())
 					{
-						parentFileAs<SlideLayout>().Master->GetLevelUp(this);
+						if (parentFileAs<SlideLayout>().Master.IsInit())
+							parentFileAs<SlideLayout>().Master->GetLevelUp(this);
 					}
 					else if(parentFileIs<NotesSlide>())
 					{
-						parentFileAs<NotesSlide>().master_->GetLevelUp(this);
+						if (parentFileAs<NotesSlide>().master_.IsInit())
+							parentFileAs<NotesSlide>().master_->GetLevelUp(this);
 					}
 				}
 			}

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp

@@ -175,9 +175,9 @@ namespace PPTX
 				else if (pRels != NULL)					file = pRels->Find(*id_data);
 			}
 			smart_ptr<OOX::Spreadsheet::CChartSpace> pChart = file.smart_dynamic_cast<OOX::Spreadsheet::CChartSpace>();
+			smart_ptr<OOX::Spreadsheet::CChartSpaceEx> pChartEx = file.smart_dynamic_cast<OOX::Spreadsheet::CChartSpaceEx>();
 
-            if (pChart.IsInit() == false)
-				return;
+			if (false == pChart.IsInit() && false == pChartEx.IsInit()) return;
 
 			NSBinPptxRW::CDrawingConverter oDrawingConverter;
 			
@@ -190,7 +190,14 @@ namespace PPTX
 			oDrawingConverter.SetRels(pChart.smart_dynamic_cast<OOX::IFileContainer>());
 		
 			BinXlsxRW::BinaryChartWriter oBinaryChartWriter(*pWriter, &oDrawingConverter);	
-			oBinaryChartWriter.WriteCT_ChartSpace(*pChart);
+			if (pChart.IsInit())
+			{
+				oBinaryChartWriter.WriteCT_ChartSpace(*pChart);
+			}
+			else if (pChartEx.IsInit())
+			{
+				//oBinaryChartWriter.WriteCT_ChartSpace(*pChartEx);
+			}
 
 			oDrawingConverter.SetRels(oldRels);
 			

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.h

@@ -123,10 +123,8 @@ namespace PPTX
 		public:
 			WritingElement_AdditionConstructors(ChartRec)
 			
-			ChartRec()	
+			ChartRec() : m_bChartEx(false), m_bData(false), m_lChartNumber(0)
 			{
-				m_bData = false;
-				m_lChartNumber = 0;
 			}
 
 			ChartRec(const ChartRec& oSrc) 
@@ -148,7 +146,11 @@ namespace PPTX
 			}
 			virtual void fromXML(XmlUtils::CXmlLiteReader& oReader)
 			{
+				std::wstring ns = XmlUtils::GetNamespace(oReader.GetName());
+
 				m_bData = false;
+				m_bChartEx = false;
+				
 				ReadAttributes( oReader );
 				FillParentPointersForChilds();
 				
@@ -156,10 +158,18 @@ namespace PPTX
 				{
 					m_bData = true;
 				}
+
+				if (ns == L"cx")
+				{
+					m_bChartEx = true;
+				}
 			}
 			virtual void fromXML(XmlUtils::CXmlNode& node)
 			{
 				m_bData = false;
+				m_bChartEx = false;
+
+				std::wstring ns = XmlUtils::GetNamespace(node.GetName());
 
 				XmlMacroReadAttributeBase(node, L"r:id", id_data);
 				FillParentPointersForChilds();
@@ -168,6 +178,10 @@ namespace PPTX
 				{
 					m_bData = true;
 				}
+				if (ns == L"cx")
+				{
+					m_bChartEx = true;
+				}
 			}
 			virtual std::wstring toXML() const;
 			virtual void toXmlWriter(NSBinPptxRW::CXmlWriter* pWriter) const;
@@ -179,6 +193,7 @@ namespace PPTX
 
 			LONG				m_lChartNumber;
 			bool				m_bData;
+			bool				m_bChartEx;
 		protected:
 			virtual void FillParentPointersForChilds()
 			{				

ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.cpp

@@ -149,7 +149,7 @@ namespace PPTX
 		std::wstring SpPr::toXML() const
 		{
 			XmlUtils::CAttribute oAttr;
-			oAttr.WriteLimitNullable(_T("bwMode"), bwMode);
+			oAttr.WriteLimitNullable(L"bwMode", bwMode);
 
 			XmlUtils::CNodeValue oValue;
 			oValue.WriteNullable(xfrm);
@@ -160,7 +160,7 @@ namespace PPTX
 			oValue.WriteNullable(scene3d);
 			oValue.WriteNullable(sp3d);
 
-			return XmlUtils::CreateNode(m_namespace + _T(":spPr"), oAttr, oValue);
+			return XmlUtils::CreateNode(m_namespace + L":spPr", oAttr, oValue);
 		}
 
 		void SpPr::Merge(SpPr& spPr)const

ASCOfficePPTXFile/PPTXFormat/Logic/SpPr.h

@@ -137,7 +137,6 @@ namespace PPTX
 			virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader);
 			void Merge(SpPr& spPr)const;
 
-		public:
 			nullable<Xfrm>				xfrm;
 			Logic::Geometry				Geometry;
 			UniFill						Fill;
@@ -147,9 +146,8 @@ namespace PPTX
 			nullable<Sp3d>				sp3d;
 
 			nullable_limit<Limit::BWMode> bwMode;
-		//private:
-		public:
-			std::wstring m_namespace;
+
+			std::wstring				m_namespace;
 		protected:
 			virtual void FillParentPointersForChilds();
 		};

ASCOfficeRtfFile/RtfFormatLib/source/RtfShape.cpp

@@ -279,7 +279,7 @@ std::wstring RtfShape::RenderToRtf(RenderParameter oRenderParameter)
 	}
 	else if (( st_inline == m_eAnchorTypeShape || st_none == m_eAnchorTypeShape) && !m_bIsOle)
 	{
-		if( NULL != m_oPicture && m_nShapeType == ODRAW::sptPictureFrame)
+		if( NULL != m_oPicture && m_nShapeType == ODRAW::sptPictureFrame && !m_bInGroup)
 		{
 			if (m_oPicture->m_nWidth == PROP_DEF)
 			{
@@ -361,7 +361,13 @@ std::wstring RtfShape::RenderToRtf(RenderParameter oRenderParameter)
 			//sResult += L"{\\sp{\\sn fLockRotation}{\\sv 1}}";		
 		
 			//picture
-			if( 0 != m_oPicture && m_nFillType == 1 || m_nFillType == 2 || m_nFillType == 3 || m_nFillType == 9)
+			if( NULL != m_oPicture && m_nShapeType == ODRAW::sptPictureFrame && m_bInGroup)
+			{
+				sResult += L"{\\sp{\\sn pib}{\\sv ";
+				sResult +=  m_oPicture->RenderToRtf( oRenderParameter );
+				sResult += L"}}";
+			}
+			else if( NULL != m_oPicture && m_nFillType == 1 || m_nFillType == 2 || m_nFillType == 3 || m_nFillType == 9)
 			{
 				sResult += L"{\\sp{\\sn fillBlip}{\\sv ";
 				sResult +=  m_oPicture->RenderToRtf( oRenderParameter );

ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj

@@ -343,6 +343,14 @@
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\BinaryReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\BinaryWriter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
 				>

ASCOfficeXlsFile2/XlsFormatTest/XlsFormatTest.vcproj

@@ -359,6 +359,14 @@
 		<Filter
 			Name="Common"
 			>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Writer\BinaryReader.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\XlsxSerializerCom\Reader\BinaryWriter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\BinWriter\BinWriters.cpp"
 				>

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

@@ -35,16 +35,14 @@
 namespace XLS
 {
 
-ContinueFrt::ContinueFrt()
+ContinueFrt::ContinueFrt() : nData(0)
 {
 }
 
-
 ContinueFrt::~ContinueFrt()
 {
 }
 
-
 BaseObjectPtr ContinueFrt::clone()
 {
 	return BaseObjectPtr(new ContinueFrt(*this));
@@ -52,10 +50,15 @@ BaseObjectPtr ContinueFrt::clone()
 
 void ContinueFrt::readFields(CFRecord& record)
 {
-#pragma message("####################### ContinueFrt record is not implemented")
-	Log::error("ContinueFrt record is not implemented.");
-	
-	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+	record >> frtHeaderOld;
+
+	nData = record.getDataSize() - 4;
+
+	pData = boost::shared_array<char>(new char[nData]);
+
+	memcpy(pData.get(), record.getCurData<char>(), nData);
+
+	record.skipNunBytes(nData);
 }
 
 } // namespace XLS

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

@@ -31,13 +31,12 @@
  */
 #pragma once
 
+#include "../Biff_structures/FrtHeaderOld.h"
 #include "BiffRecord.h"
 
 namespace XLS
 {
 
-
-// Logical representation of ContinueFrt record in BIFF8
 class ContinueFrt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ContinueFrt)
@@ -47,11 +46,14 @@ public:
 	~ContinueFrt();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeContinueFrt;
+	static const ElementType type = typeContinueFrt;
+
+	FrtHeaderOld				frtHeaderOld;
+	boost::shared_array<char>	pData;
+	size_t						nData;
 
 };
 

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

@@ -35,16 +35,14 @@
 namespace XLS
 {
 
-ContinueFrt11::ContinueFrt11()
+ContinueFrt11::ContinueFrt11(): nData(0)
 {
 }
 
-
 ContinueFrt11::~ContinueFrt11()
 {
 }
 
-
 BaseObjectPtr ContinueFrt11::clone()
 {
 	return BaseObjectPtr(new ContinueFrt11(*this));
@@ -53,6 +51,15 @@ BaseObjectPtr ContinueFrt11::clone()
 
 void ContinueFrt11::readFields(CFRecord& record)
 {
+	record >> frtHeaderOld;
+
+	nData = record.getDataSize() - 4;
+
+	pData = boost::shared_array<char>(new char[nData]);
+
+	memcpy(pData.get(), record.getCurData<char>(), nData);
+
+	record.skipNunBytes(nData);
 }
 
 } // namespace XLS

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

@@ -31,13 +31,12 @@
  */
 #pragma once
 
+#include "../Biff_structures/FrtHeaderOld.h"
 #include "BiffRecord.h"
 
 namespace XLS
 {
 
-
-// Logical representation of ContinueFrt11 record in BIFF8
 class ContinueFrt11: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(ContinueFrt11)
@@ -47,12 +46,14 @@ public:
 	~ContinueFrt11();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeContinueFrt11;
 
+	FrtHeaderOld				frtHeaderOld;
+	boost::shared_array<char>	pData;
+	size_t						nData;
 };
 
 } // namespace XLS

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

@@ -52,10 +52,13 @@ BaseObjectPtr CrtMlFrt::clone()
 
 void CrtMlFrt::readFields(CFRecord& record)
 {
-#pragma message("####################### CrtMlFrt record is not implemented")
-	Log::error("CrtMlFrt record is not implemented.");
-	
-	record.skipNunBytes(record.getDataSize() - record.getRdPtr());
+	record >> frtHeader >> cbXmltkChain;
+
+	//xmltkChain.cb = cbXmltkChain;
+	//record >> xmltkChain;
+	record.skipNunBytes(cbXmltkChain);
+
+	record.skipNunBytes(4);
 }
 
 } // namespace XLS

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

@@ -31,13 +31,12 @@
  */
 #pragma once
 
+#include "../Biff_structures/FrtHeader.h"
 #include "BiffRecord.h"
 
 namespace XLS
 {
 
-
-// Logical representation of CrtMlFrt record in BIFF8
 class CrtMlFrt: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(CrtMlFrt)
@@ -47,12 +46,16 @@ public:
 	~CrtMlFrt();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	static const ElementType	type = typeCrtMlFrt;
 
+	FrtHeader	frtHeader;
+	_UINT32		cbXmltkChain;
+
+	//XmlTkChain	xmltkChain;
+
 //-----------------------------
 
 	_UINT32	cb;

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of Dimensions record in BIFF8
 class Dimensions: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Dimensions)
@@ -47,11 +45,10 @@ public:
 	~Dimensions();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
-	static const ElementType	type = typeDimensions;
+	static const ElementType type = typeDimensions;
 
 	int serialize(std::wostream & stream);
 	

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

@@ -40,18 +40,15 @@ DropDownObjIds::DropDownObjIds()
 {
 }
 
-
 DropDownObjIds::~DropDownObjIds()
 {
 }
 
-
 BaseObjectPtr DropDownObjIds::clone()
 {
 	return BaseObjectPtr(new DropDownObjIds(*this));
 }
 
-
 void DropDownObjIds::readFields(CFRecord& record)
 {
 	FrtHeader frtHeader(rt_DropDownObjIds);

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

@@ -32,13 +32,10 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/DropDownObjId.h>
+#include "../Biff_structures/DropDownObjId.h"
 
 namespace XLS
 {
-
-
-// Logical representation of DropDownObjIds record in BIFF8
 class DropDownObjIds: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(DropDownObjIds)
@@ -48,7 +45,6 @@ public:
 	~DropDownObjIds();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 

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

@@ -58,12 +58,15 @@ void ExternSheet::readFields(CFRecord& record)
 	if (record.getGlobalWorkbookInfo()->Version < 0x0600)
 	{
 		unsigned char type;
+		unsigned char size;
 
-		ShortXLAnsiString stName;
-		record >> type >> stName;
+		record >> size >> type;
+
+		LPAnsiStringNoCch stName(size);
+		record >> stName;
 
 		name = stName.value();
-		//int type	= stName.value().substr(0, 1).c_str()[0];
+
 		//if (!name.empty())
 		//	record.getGlobalWorkbookInfo()->arExternalNames.push_back(name);
 

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

@@ -31,11 +31,12 @@
  */
 
 #include "Feature11.h"
+#include "ContinueFrt11.h"
 
 namespace XLS
 {
 
-Feature11::Feature11()
+Feature11::Feature11(bool bFeat12) : bFeature12(bFeat12)
 {
 }
 
@@ -50,6 +51,18 @@ BaseObjectPtr Feature11::clone()
 
 void Feature11::readFields(CFRecord& record)
 {
+	size_t sz = continue_records.size();
+	std::list<CFRecordPtr>& recs = continue_records[rt_ContinueFrt11];
+
+	while (!recs.empty())
+	{
+		ContinueFrt11 continueFrt;
+		continueFrt.readFields(*recs.front());
+
+		record.appendRawData(continueFrt.pData.get(), continueFrt.nData);
+		recs.pop_front();
+	}	
+
 	record >> frtRefHeaderU;
 	record >> isf;
 	
@@ -67,7 +80,13 @@ void Feature11::readFields(CFRecord& record)
 		refs2.push_back(BiffStructurePtr(new Ref8U(reff)));
 		sqref += reff.toString() + ((i == cref2 - 1) ? L"" : L" ");
 	}
+	if (cbFeatData == 0)
+	{
+		cbFeatData = record.getDataSize() - (cref2 * 8) - 27;
+	}
 
+	rgbFeat.bFeature12 = bFeature12;
+	rgbFeat.cbFeatData = cbFeatData;
 	record >> rgbFeat;	
 }
 

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

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include "BiffRecord.h"
+#include "BiffRecordContinued.h"
 
 #include "../Biff_structures/FrtRefHeaderU.h"
 #include "../Biff_structures/CellRangeRef.h"
@@ -40,12 +40,12 @@
 namespace XLS
 {
 
-class Feature11: public BiffRecord
+class Feature11 : public BiffRecordContinued //: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Feature11)
 	BASE_OBJECT_DEFINE_CLASS_NAME(Feature11)
 public:
-	Feature11();
+	Feature11(bool bFeat12 = false);
 	~Feature11();
 
 	BaseObjectPtr clone();
@@ -62,6 +62,8 @@ public:
 	std::wstring			sqref;
 
 	TableFeatureType		rgbFeat;
+
+	bool bFeature12;
 };
 
 } // namespace XLS

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

@@ -31,11 +31,12 @@
  */
 
 #include "Feature12.h"
+#include "ContinueFrt.h"
 
 namespace XLS
 {
 
-Feature12::Feature12()
+Feature12::Feature12() : feature11(true)
 {
 }
 
@@ -51,6 +52,17 @@ BaseObjectPtr Feature12::clone()
 
 void Feature12::readFields(CFRecord& record)
 {
+	size_t sz = continue_records.size();
+	std::list<CFRecordPtr>& recs = continue_records[rt_ContinueFrt];
+
+	while (!recs.empty())
+	{
+		ContinueFrt continueFrt;
+		continueFrt.readFields(*recs.front());
+
+		record.appendRawData(continueFrt.pData.get(), continueFrt.nData);
+		recs.pop_front();
+	}	
 	feature11.readFields(record);
 
 }

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

@@ -32,13 +32,11 @@
 #pragma once
 
 #include "BiffRecord.h"
-#include <Logic/Biff_structures/LongRGB.h>
+#include "../Biff_structures/LongRGB.h"
 
 namespace XLS
 {
 
-
-// Logical representation of LineFormat record in BIFF8
 class LineFormat: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(LineFormat)
@@ -48,7 +46,6 @@ public:
 	~LineFormat();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 

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

@@ -36,7 +36,6 @@
 namespace XLS
 {
 
-
 class IXFCellMulBlankSpecial : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(IXFCellMulBlankSpecial)
@@ -53,9 +52,6 @@ public:
 	std::vector<unsigned short> rgixfe;
 };
 
-
-
-// Logical representation of MulBlank record in BIFF8
 class MulBlank: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(MulBlank)

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

@@ -179,10 +179,7 @@ void Obj::readFields(CFRecord& record)
 		old_version.anchor->loadFields(record);
 		
 		record >> nMacrosSize;
-		record.skipNunBytes(2);
-		record >> nNameLen;
-		record.skipNunBytes(2);
-
+		record.skipNunBytes(6);
 
 		if(OBJ_Line == cmo.ot)
 		{
@@ -190,6 +187,26 @@ void Obj::readFields(CFRecord& record)
 			record >> old_version.flag;
 			record >> old_version.flag2;
 		}	
+		else if(OBJ_DropdownList == cmo.ot)
+		{
+			old_version.bFill = true;
+			record >> old_version.fill;
+			record >> old_version.line;		
+			record.skipNunBytes(6);
+
+			short iVal, iMin, iMax, dInc, dPage, fHoriz, dxScroll, grbit, ifnt;
+
+			record >> iVal >> iMin >> iMax >> dInc >> dPage >> fHoriz >> dxScroll >> grbit;
+			record.skipNunBytes(18);
+
+			record >> ifnt;
+			record.skipNunBytes(14);
+
+			short xLeft, yTop, xRight, yBot;
+			record >> xLeft >> yTop >> xRight >> yBot;
+			
+			record.skipNunBytes(4);
+		}
 		else
 		{
 			old_version.bFill = true;
@@ -261,9 +278,38 @@ void Obj::readFields(CFRecord& record)
 
 			old_version.name = txO->name;
 		}
+		else if(OBJ_DropdownList == cmo.ot)
+		{
+			record >> old_version.name;
+			
+			short cbFmla1, cbFmla2, cbFmla3;
+			ObjectParsedFormula fmla1, fmla2, fmla3;
+
+			record >> cbFmla1;
+			if (cbFmla1 > 0)
+			{
+				fmla1.load(record);
+			}
+			record >> cbFmla2;
+			if (cbFmla2 > 0)
+			{
+				fmla2.load(record);
+			}
+			record >> cbFmla3;
+			if (cbFmla3 > 0)
+			{
+				fmla3.load(record);
+			}
+			short cLines, iSel, flag1, flag2, cLine, dxMin;
+			record >> cLines >> iSel >> flag1;
+			
+			record.skipNunBytes(2);
+			record >> flag2 >> cLine >> dxMin;
+			//record.skipNunBytes(2);
+		}
 		else
 		{
-			if (nNameLen > 0)
+			//if (nNameLen > 0)
 			{
 				record >> old_version.name;
 			}

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

@@ -95,8 +95,8 @@ public:
 		bool						bFill = false;
 		ShortXLAnsiString			name;
 
-		_UINT32						fill = 0;
-		_UINT32						line = 0;
+		_UINT32						fill = 0;//(icvBack, icvFore, fls, fAuto)
+		_UINT32						line = 0;//(icv, lns, lnw, fAuto)
 		_UINT16						flag = 0;
 		_UINT16						flag2 = 0;
 	}old_version;

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

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of Row record in BIFF8
 class Row: public BiffRecord
 {
 	BIFF_RECORD_DEFINE_TYPE_INFO(Row)
@@ -47,13 +45,12 @@ public:
 	~Row();
 
 	BaseObjectPtr clone();
-
 	
 	void readFields(CFRecord& record);
 
 	int serialize(std::wostream & stream);
 
-	static const ElementType	type = typeRow;
+	static const ElementType type = typeRow;
 
 	GlobalWorkbookInfoPtr global_info_;
 

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

@@ -50,7 +50,6 @@ BaseObjectPtr Sort::clone()
 	return BaseObjectPtr(new Sort(*this));
 }
 
-
 void Sort::readFields(CFRecord& record)
 {
 	unsigned short flags;
@@ -68,20 +67,52 @@ void Sort::readFields(CFRecord& record)
 	unsigned char cchKey2;
 	unsigned char cchKey3;
 	record >> cchKey1 >> cchKey2 >> cchKey3;
-	if(cchKey1)
+
+	if (record.getGlobalWorkbookInfo()->Version >= 0x0600)
 	{
-		stKey1.setSize(cchKey1);
-		record >> stKey1;
+		XLUnicodeStringNoCch stKey1_, stKey2_, stKey3_;
+
+		if(cchKey1)
+		{
+			stKey1_.setSize(cchKey1);
+			record >> stKey1_;
+			stKey1 = stKey1_.value();
+		}
+		if(cchKey2)
+		{
+			stKey2_.setSize(cchKey2);
+			record >> stKey2_;
+			stKey2 = stKey2_.value();
+		}
+		if(cchKey3)
+		{
+			stKey3_.setSize(cchKey3);
+			record >> stKey3_;
+			stKey3 = stKey3_.value();
+		}
 	}
-	if(cchKey2)
+	else
 	{
-		stKey2.setSize(cchKey2);
-		record >> stKey2;
-	}
-	if(cchKey3)
-	{
-		stKey3.setSize(cchKey3);
-		record >> stKey3;
+		LPAnsiStringNoCch stKey1_, stKey2_, stKey3_;
+
+		if(cchKey1)
+		{
+			stKey1_.setSize(cchKey1);
+			record >> stKey1_;
+			stKey1 = stKey1_.value();
+		}
+		if(cchKey2)
+		{
+			stKey2_.setSize(cchKey2);
+			record >> stKey2_;
+			stKey2 = stKey2_.value();
+		}
+		if(cchKey3)
+		{
+			stKey3_.setSize(cchKey3);
+			record >> stKey3_;
+			stKey3 = stKey3_.value();
+		}
 	}
 	record.skipNunBytes(1); // reserved
 }

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

@@ -63,9 +63,9 @@ public:
 	_INT16 iOrder;
 	bool fAltMethod;
 
-	XLUnicodeStringNoCch stKey1;
-	XLUnicodeStringNoCch stKey2;
-	XLUnicodeStringNoCch stKey3;
+	std::wstring stKey1;
+	std::wstring stKey2;
+	std::wstring stKey3;
 };
 
 } // namespace XLS

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

@@ -50,7 +50,10 @@ void CachedDiskHeader::load(CFRecord& record)
 		rgHdrDisk.size = cbdxfHdrDisk;
 		rgHdrDisk.load(record);
 	}
-	record >> strStyleName;	
+	if (fSaveStyleName)
+	{
+		record >> strStyleName;	
+	}
 }
 
 } // namespace XLS

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

@@ -52,6 +52,9 @@ public:
 	_UINT32			cbdxfHdrDisk;
 	DXFN12List		rgHdrDisk;
 	XLUnicodeString	strStyleName;
+
+	bool	fSaveStyleName;
+
 };
 
 typedef boost::shared_ptr<CachedDiskHeader> CachedDiskHeaderPtr;

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

@@ -64,6 +64,7 @@ void DXFN12List::load(CFRecord& record)
 		bExist = true;
 		record >> dxfn;
 		size -= (record.getRdPtr() - pos_record);
+		pos_record = record.getRdPtr();
 	}
 	if (size > 0)
 	{

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

@@ -57,7 +57,7 @@ public:
 	XFExtNoFRT	xfext;
 //-----------------------------------------------------------------
 	bool		bExist;
-	_UINT32		size;
+	_INT32		size;
 };
 
 typedef boost::shared_ptr<DXFN12List> DXFN12ListPtr;

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

@@ -36,13 +36,11 @@
 namespace XLS
 {
 
-
 BiffStructurePtr DropDownObjId::clone()
 {
 	return BiffStructurePtr(new DropDownObjId(*this));
 }
 
-
 void DropDownObjId::load(CFRecord& record)
 {
 	record >> id;

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

@@ -49,7 +49,6 @@ public:
 
 	virtual void load(CFRecord& record);
 
-
 	ObjId id;
 };
 

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

@@ -49,6 +49,7 @@ void Feat11FdaAutoFilter::load(CFRecord& record)
 	if (cbAutoFilter >= 0xffff0000)
 	{
 		//LCA BI - Financial Report Usage2010.xls 
+		record.RollRdPtrBack(4);
 		return;
 	}
 	record.skipNunBytes(2);	

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

@@ -36,7 +36,7 @@
 
 namespace XLS
 {
-Feat11FieldDataItem::Feat11FieldDataItem(_UINT32 _lt, bool bDskHeaderCache) : lt(_lt), bDiskHdrCache(bDskHeaderCache)
+Feat11FieldDataItem::Feat11FieldDataItem(_UINT32 _lt, bool bDskHeaderCache, bool bFeat12) : lt(_lt), bDiskHdrCache(bDskHeaderCache), bFeature12(bFeat12)
 {
 }
 BiffStructurePtr Feat11FieldDataItem::clone()
@@ -96,7 +96,7 @@ void Feat11FieldDataItem::load(CFRecord& record)
 	{
 		fmla.load(record);
 	}
-	if (fLoadTotalFmla)
+	if (fLoadTotalFmla && bFeature12)
 	{
 		if (fLoadTotalArray)
 		{
@@ -107,7 +107,7 @@ void Feat11FieldDataItem::load(CFRecord& record)
 			totalFmla.load(record);
 		}	
 	}
-	if (fLoadTotalStr)
+	if (fLoadTotalStr && bFeature12)
 	{
 		record >> strTotal;
 	}
@@ -122,6 +122,7 @@ void Feat11FieldDataItem::load(CFRecord& record)
 	}
 	if (bDiskHdrCache)
 	{
+		dskHdrCache.fSaveStyleName = fSaveStyleName;
 		record >> dskHdrCache;
 	}
 }

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

@@ -50,7 +50,7 @@ class Feat11FieldDataItem : public BiffStructure
 {
 	BASE_STRUCTURE_DEFINE_CLASS_NAME(Feat11FieldDataItem)
 public:
-	Feat11FieldDataItem(_UINT32 lt, bool bDskHeaderCache);
+	Feat11FieldDataItem(_UINT32 lt, bool bDskHeaderCache, bool bFeat12);
 	BiffStructurePtr clone();
 
 	static const ElementType type = typeFeat11FieldDataItem;
@@ -97,6 +97,7 @@ public:
 //------------------------------------------------
 	_UINT32					lt;
 	bool					bDiskHdrCache;
+	bool					bFeature12;
 };
 
 typedef boost::shared_ptr<Feat11FieldDataItem> Feat11FieldDataItemPtr;

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

@@ -50,8 +50,6 @@ public:
 	BiffStructurePtr clone();
 
 	virtual void load(CFRecord& record);
-
-
 	
 	static const ElementType	type = typeFrtHeader;
 	

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/IMsoArray.h

@@ -74,7 +74,7 @@ public:
 		unsigned short nElems, nElemsAlloc;
 		unsigned short cbElem;
 		
-		int pos1 = record.getRdPtr();
+		size_t pos1 = record.getRdPtr();
 		
 		record >> nElems >> nElemsAlloc >> cbElem;
 		

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtBlip.h

@@ -59,7 +59,7 @@ public:
 	
 	XLS::BiffStructurePtr clone()
 	{
-		return XLS::BiffStructurePtr(new OfficeArtBlip(recType));
+		return XLS::BiffStructurePtr(new OfficeArtBlip((unsigned short)recType));
 	}
 
 	static const XLS::ElementType	type = XLS::typeOfficeArtBlip;

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

@@ -131,7 +131,7 @@ void PtgArea3d::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, bool f
 			ptg_stack.push(strRange + range_ref);		
 		}
 	}
-	if (ixti != 0xffff)
+	if (ixti < global_info->arXti_External.size())
 	{
 		std::wstring link = global_info->arXti_External[ixti].link;
 		if (!link.empty() && !range_ref.empty()) 

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

@@ -80,13 +80,13 @@ void PtgFuncVar::assemble(AssemblerStack& ptg_stack, PtgQueue& extra_data, bool
 	{
 		arguments += ptg_stack.top();
 		ptg_stack.pop();
-		for(unsigned char i = 0; i < nparams - 1 ; ++i)
+		for(unsigned char i = 0; i < nparams - 1 && !ptg_stack.empty(); ++i)
 		{
 			arguments = ptg_stack.top() + L',' + arguments;
 			ptg_stack.pop();
 		}
 	}
-	if(0xFF == tab.getIndex() && ptg_stack.size() > 0) // user-defined function
+	if(0xFF == tab.getIndex()&& !ptg_stack.empty()) // user-defined function
 	{
 		func_name = ptg_stack.top();
 

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

@@ -87,6 +87,25 @@ void TableFeatureType::load(CFRecord& record)
 	fLoadCSPName		= GETBIT(flags, 14);
 	fLoadPldwIdChanged	= GETBIT(flags, 15);
 
+	if (bFeature12)
+	{
+		//crwHeader = 0;
+		//lt = 0x00000003;
+		//fSingleCell = false;
+	}
+	else
+	{
+		//lt != 0x00000003;
+		//crwHeader == 0 && fSingleCell == false -> lt = 0
+	}
+
+	if (fAutoFilter) crwHeader = 1;
+	if (fSingleCell)
+	{
+		crwHeader = 0;
+		crwTotals = 0;
+	}
+
 	record >> flags;
 	verXL				= GETBITS(flags, 0, 4);
 	fLoadEntryId		= GETBIT(flags, 4);
@@ -105,7 +124,7 @@ void TableFeatureType::load(CFRecord& record)
 		record.skipNunBytes(16);		// rgbHashParam
 
 	record >> rgbName;
-	record >> cFieldData; //from 1 to 100
+	record >> cFieldData; //from 1 to 0x100
 
 	if (fLoadCSPName)
 		record >> cSPName;
@@ -118,7 +137,7 @@ void TableFeatureType::load(CFRecord& record)
 		if (record.getRdPtr() >= record.getDataSize())
 			return;
 
-		arFieldData.push_back(BiffStructurePtr(new Feat11FieldDataItem(lt, (crwHeader == 0x0000 && fSingleCell))));
+		arFieldData.push_back(BiffStructurePtr(new Feat11FieldDataItem(lt, (crwHeader == 0x0000 && fSingleCell == 0x0000), bFeature12)));
 		arFieldData.back()->load(record);
 	}
 	if (fLoadPldwIdDeleted)

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

@@ -93,6 +93,10 @@ public:
 	BiffStructurePtr		idDeleted;
 	BiffStructurePtr		idChanged;
 	BiffStructurePtr		cellInvalid;
+//-------
+	_UINT32					cbFeatData;
+	bool					bFeature12;
+
 };
 
 typedef boost::shared_ptr<TableFeatureType> TableFeatureTypePtr;

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AUTOFILTER.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of AUTOFILTER union of records 
 class AUTOFILTER: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(AUTOFILTER)
@@ -57,7 +55,7 @@ public:
 
 	std::vector<BaseObjectPtr>					m_arSORTDATA12;
 
-	GlobalWorkbookInfoPtr		pGlobalWorkbookInfoPtr;
+	GlobalWorkbookInfoPtr						global_info_;
 
 };
 

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

@@ -42,7 +42,6 @@
 namespace XLS
 {
 
-
 AUTOFILTER::AUTOFILTER()
 {
 }
@@ -87,11 +86,11 @@ const bool AUTOFILTER::loadContent(BinProcessor& proc)
 		return false;
 	}
 	
-	pGlobalWorkbookInfoPtr = proc.getGlobalWorkbookInfo();
+	global_info_ = proc.getGlobalWorkbookInfo();
 
 	m_AutoFilterInfo = elements_.back();
 	elements_.pop_back();
-	
+
 	int count = proc.repeated<Parenthesis_AUTOFILTER_1>(0, 0);
 	while(count > 0)
 	{
@@ -139,13 +138,13 @@ int AUTOFILTER::serialize(std::wostream & stream)
 
 	AutoFilterInfo *info = dynamic_cast<AutoFilterInfo*>(m_AutoFilterInfo.get());
 	
-	std::map<std::wstring, std::vector<std::wstring>>::iterator it = pGlobalWorkbookInfoPtr->mapDefineNames.find(L"_xlnm._FilterDatabase");
+	std::map<std::wstring, std::vector<std::wstring>>::iterator it = global_info_->mapDefineNames.find(L"_xlnm._FilterDatabase");
 	
-	if (it == pGlobalWorkbookInfoPtr->mapDefineNames.end()) return 0;
+	if (it == global_info_->mapDefineNames.end()) return 0;
 
 	int count_columns = info->cEntries;
 	
-	size_t ind = pGlobalWorkbookInfoPtr->current_sheet;
+	size_t ind = global_info_->current_sheet;
 	std::wstring ref;
 	
 	if (ind < it->second.size() && ind >= 0)
@@ -159,7 +158,7 @@ int AUTOFILTER::serialize(std::wostream & stream)
 	}
 	if (ref.empty()) return 0;
 
-	std::wstring sheet_name = ind <= pGlobalWorkbookInfoPtr->sheets_info.size() ? pGlobalWorkbookInfoPtr->sheets_info[ind-1].name : L"";
+	std::wstring sheet_name = ind <= global_info_->sheets_info.size() ? global_info_->sheets_info[ind-1].name : L"";
 	if (!sheet_name.empty())
 	{
 		int pos = ref.find(sheet_name);

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/AXISPARENT.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of AXISPARENT union of records 
 class AXISPARENT: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(AXISPARENT)

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CELL.h

@@ -38,7 +38,6 @@ namespace XLS
 
 class CellRef;
 
-// Logical representation of CELL union of records 
 class CELL: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(CELL)
@@ -52,7 +51,7 @@ public:
 
 	int serialize(std::wostream & stream);
 
-	static const ElementType	type = typeCELL;
+	static const ElementType type = typeCELL;
 
     int RowNumber;
     int ColumnNumber;

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

@@ -31,18 +31,19 @@
  */
 
 #include "CELLTABLE.h"
-#include <Logic/Biff_records/EntExU2.h>
-#include <Logic/Biff_records/Row.h>
-#include <Logic/Biff_unions/CELL.h>
-#include <Logic/Biff_records/DBCell.h>
+#include "CELL.h"
+
+#include "../Biff_records/EntExU2.h"
+#include "../Biff_records/Row.h"
+#include "../Biff_records/DBCell.h"
+#include "../Biff_records/MulBlank.h"
+#include "../Biff_records/MulRk.h"
 
 #include <simple_xml_writer.h>
 
 namespace XLS
 {
 
-// This class is made a deriver of CompositeObject intentionally.
-// This is an optimization step - to form a CELLTABLE that is divided into smaller groups
 class CELL_GROUP : public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(CELL_GROUP)
@@ -59,11 +60,10 @@ public:
 
 	const bool loadContent(BinProcessor& proc)
 	{
-		global_info_ = proc.getGlobalWorkbookInfo();
+		global_info_			= proc.getGlobalWorkbookInfo();
+		int index_sheet_info_	= global_info_->current_sheet - 1;
 
-		XLS::GlobalWorkbookInfo::_sheet_info zero;
-		XLS::GlobalWorkbookInfo::_sheet_info & sheet_info = global_info_->current_sheet >=0 ? 
-											global_info_->sheets_info[global_info_->current_sheet - 1] : zero;
+		GlobalWorkbookInfo::_sheet_info & sheet_info = global_info_->sheets_info[index_sheet_info_];
 		
 		int count, count_row = 0;
 		
@@ -81,7 +81,22 @@ public:
 						sheet_info.customRowsHeight.insert(std::make_pair(row->rw, row->miyRw / 20.));
 					}
 				}
-				m_rows.push_back(elements_.front());
+				std::map<int, GlobalWorkbookInfo::_row_info>::iterator pFindRow = sheet_info.mapRows.find(row->rw);
+				if (pFindRow == sheet_info.mapRows.end())
+				{
+					GlobalWorkbookInfo::_row_info row_info;
+
+					row_info.row_info = elements_.front();
+					sheet_info.mapRows.insert(std::make_pair(row->rw, row_info));
+				}
+				else
+				{
+					if (!pFindRow->second.row_info)
+					{
+						pFindRow->second.row_info = elements_.front();
+					}
+				}
+
 				elements_.pop_front();
 				count--;				
 			}
@@ -97,16 +112,25 @@ public:
 			CELL * cell = dynamic_cast<CELL *>(elements_.front().get());
 			if (cell)
 			{
-				std::map<int, std::list<BaseObjectPtr>>::iterator it = m_cells.find(cell->RowNumber);
-				if (it == m_cells.end())
+				std::map<int, GlobalWorkbookInfo::_row_info>::iterator pFindRow = sheet_info.mapRows.find(cell->RowNumber);
+				if (pFindRow == sheet_info.mapRows.end())
 				{
-					std::list<BaseObjectPtr> c;
-					c.push_back(elements_.front());
-					m_cells.insert(std::make_pair(cell->RowNumber, c));
+					GlobalWorkbookInfo::_row_info row_info;
+					sheet_info.mapRows.insert(std::make_pair(cell->RowNumber, row_info));
+
+					pFindRow = sheet_info.mapRows.find(cell->RowNumber);
+				}
+				std::map<int, BaseObjectPtr>::iterator pFindCell = pFindRow->second.mapCells.find(cell->ColumnNumber);
+
+				if (pFindCell != pFindRow->second.mapCells.end())
+				{
+					CELL* cell_prev = dynamic_cast<CELL *>(pFindCell->second.get());
+
+					pFindCell->second = elements_.front();
 				}
 				else
 				{
-					it->second.push_back(elements_.front());
+					pFindRow->second.mapCells.insert(std::make_pair(cell->ColumnNumber, elements_.front()));
 				}
 			}
 			elements_.pop_front();
@@ -124,158 +148,19 @@ public:
 		else									return false;
 	}
 	
-	int serialize(std::wostream & stream);
-	static const ElementType	type = typeCELL_GROUP;
+	static const ElementType type = typeCELL_GROUP;
 
 //---------------------------------------------------------------------------
-	std::map<int, std::list<BaseObjectPtr>> m_cells;
-	std::list<BaseObjectPtr>				m_rows;
-	std::list<BaseObjectPtr>				m_DBCells;
+	std::list<BaseObjectPtr> m_DBCells;
 
 private:
 	std::vector<CellRangeRef>& shared_formulas_locations_ref_;
 
 	GlobalWorkbookInfoPtr global_info_;
 };
-
-
-struct _CompareRowCell
-{
-    bool operator()(XLS::BaseObjectPtr & first, XLS::BaseObjectPtr & second)
-	{
-		CELL * cell_1 = dynamic_cast<CELL *>(first.get());
-		CELL * cell_2 = dynamic_cast<CELL *>(second.get());
-
-		if (!cell_1 || !cell_2) 
-			return true;
-
-		if (cell_1->RowNumber < cell_2->RowNumber) 
-			return true;
-		else
-			return false;
-	}
-}CompareRowCell;
-
-struct _CompareColumnCell
-{
-    bool operator()(XLS::BaseObjectPtr & first, XLS::BaseObjectPtr & second)
-	{
-		CELL * cell_1 = dynamic_cast<CELL *>(first.get());
-		CELL * cell_2 = dynamic_cast<CELL *>(second.get());
-
-		if (!cell_1 || !cell_2) 
-			return true;
-
-		if (cell_1->ColumnNumber < cell_2->ColumnNumber) 
-			return true;
-		else
-			return false;
-	}
-}CompareColumnCell;
-
-int CELL_GROUP::serialize(std::wostream & stream)
-{
-	XLS::GlobalWorkbookInfo::_sheet_info zero;
-	XLS::GlobalWorkbookInfo::_sheet_info & sheet_info = global_info_->current_sheet >=0 ? 
-										global_info_->sheets_info[global_info_->current_sheet - 1] : zero;
-	
-	CP_XML_WRITER(stream)    
-    {	
-		std::list<XLS::BaseObjectPtr>::iterator current_row = m_rows.begin();
-		
-		for (std::map<int, std::list<BaseObjectPtr>>::iterator it_row = m_cells.begin(); it_row != m_cells.end(); it_row++)
-		{
-			it_row->second.sort(CompareColumnCell);
-			
-			Row * row = NULL;
-
-			if (current_row != m_rows.end())
-			{
-				row = dynamic_cast<Row *>(current_row->get());
-
-				while ((row) && (row->rw < it_row->first))
-				{//skip cells
-					row->serialize(stream);
-					current_row++;
-
-					if (current_row == m_rows.end())
-						break;
-					row = dynamic_cast<Row *>(current_row->get());
-				}
-			}
-			CP_XML_NODE(L"row")
-			{	
-				CP_XML_ATTR(L"r", it_row->first + 1);
-				if ((row) && (row->rw  == it_row->first))
-				{
-					bool xf_set = true;
-					if (row->fGhostDirty == false) xf_set = false;
-					
-					if (xf_set)
-					{
-						int xf = row->ixfe_val >= global_info_->cellStyleXfs_count ? row->ixfe_val - global_info_->cellStyleXfs_count : -1/*row->ixfe_val*/;
-						
-						if (xf < global_info_->cellXfs_count && xf >= 0)
-						{
-							CP_XML_ATTR(L"s", xf);
-							CP_XML_ATTR(L"customFormat", true);
-						}
-					}
-					if (row->miyRw > 0 && row->miyRw < 0x8000) //v8_14A_1b13.xls
-					{
-						CP_XML_ATTR(L"ht", row->miyRw / 20.);
-						CP_XML_ATTR(L"customHeight", true);
-					}
-					if (row->iOutLevel > 0)
-					{
-						CP_XML_ATTR(L"outlineLevel", row->iOutLevel);
-					}
-					if (row->fCollapsed)
-					{
-						CP_XML_ATTR(L"collapsed", row->fCollapsed);
-					}
-					if (row->fExAsc)
-					{
-						CP_XML_ATTR(L"thickTop", true);
-					}
-					if (row->fExDes)
-					{
-						CP_XML_ATTR(L"thickBot", true);
-					}
-					if (row->fDyZero)
-					{
-						CP_XML_ATTR(L"hidden", true);
-					}
-					
-					row = NULL;
-					current_row++;
-					if (current_row != m_rows.end())
-						row = dynamic_cast<Row *>(current_row->get());
-
-				}
-				for ( std::list<BaseObjectPtr>::iterator it_cell = it_row->second.begin(); it_cell != it_row->second.end(); it_cell++)
-				{
-					(*it_cell)->serialize(CP_XML_STREAM());
-				}
-			}
-
-		}
-		while (current_row != m_rows.end())
-		{//skip cells ... last rows
-			(*current_row)->serialize(stream);
-			current_row++;
-		}	
-	}
-
-	return 0;
-}
-
 //-----------------------------------------------------------------------------------------------------------------
-
-
 CELLTABLE::CELLTABLE(std::vector<CellRangeRef>& shared_formulas_locations_ref) : 
-												 m_count_CELL_GROUP(0)
-												,shared_formulas_locations_ref_(shared_formulas_locations_ref)
+											isConcatinate_(false), shared_formulas_locations_ref_(shared_formulas_locations_ref)
 {
 }
 
@@ -293,16 +178,31 @@ BaseObjectPtr CELLTABLE::clone()
 // CELLTABLE = 1*(1*Row *CELL 1*DBCell) *EntExU2
 const bool CELLTABLE::loadContent(BinProcessor& proc)
 {
-    CELL_GROUP cell_group1(shared_formulas_locations_ref_);
-	if(!proc.mandatory(cell_group1))
+	global_info_		 = proc.getGlobalWorkbookInfo();
+	index_sheet_info_	= global_info_->current_sheet - 1;
+
+	GlobalWorkbookInfo::_sheet_info zero;
+	while (index_sheet_info_ >= global_info_->sheets_info.size())
+	{
+		global_info_->sheets_info.push_back(zero);
+	}
+
+	CELL_GROUP cell_group(shared_formulas_locations_ref_);
+	if(!proc.mandatory(cell_group))
 	{
 		return false;
 	}
+		
+	int count = 1 + proc.repeated(cell_group, 0, 0);
 	
-	CELL_GROUP cell_group2(shared_formulas_locations_ref_);
-	m_count_CELL_GROUP = proc.repeated(cell_group2, 0, 0);
-
-	int count = proc.repeated<EntExU2>(0, 0);
+	while(!elements_.empty())
+	{
+		//m_arCELLGROUP.insert(m_arCELLGROUP.begin(), elements_.back());
+		elements_.pop_back();
+		count--;
+	}
+	
+	count = proc.repeated<EntExU2>(0, 0);
 	while(count > 0)
 	{
 		m_arEntExU2.insert(m_arEntExU2.begin(), elements_.back());
@@ -311,12 +211,95 @@ const bool CELLTABLE::loadContent(BinProcessor& proc)
 	}	
 	return true;
 }
-
 int CELLTABLE::serialize(std::wostream & stream)
 {
-	for (std::list<XLS::BaseObjectPtr>::iterator it = elements_.begin(); it != elements_.end(); ++it)
-	{
-		it->get()->serialize(stream);
+	GlobalWorkbookInfo::_sheet_info & sheet_info = global_info_->sheets_info[index_sheet_info_];
+
+	CP_XML_WRITER(stream)    
+    {	
+	
+		for (std::map<int, GlobalWorkbookInfo::_row_info>::iterator it_row = sheet_info.mapRows.begin(); it_row != sheet_info.mapRows.end(); it_row++)
+		{
+			Row* row = dynamic_cast<Row*>(it_row->second.row_info.get());
+			
+			if (row && it_row->second.mapCells.empty())
+			{
+				it_row->second.row_info->serialize(stream);
+			}
+			else
+			{
+				CP_XML_NODE(L"row")
+				{	
+					CP_XML_ATTR(L"r", it_row->first + 1);
+					
+					if (row)
+					{
+						bool xf_set = true;
+						if (row->fGhostDirty == false) xf_set = false;
+						
+						if (xf_set)
+						{
+							int xf = row->ixfe_val >= global_info_->cellStyleXfs_count ? row->ixfe_val - global_info_->cellStyleXfs_count : -1/*row->ixfe_val*/;
+							
+							if (xf < global_info_->cellXfs_count && xf >= 0)
+							{
+								CP_XML_ATTR(L"s", xf);
+								CP_XML_ATTR(L"customFormat", true);
+							}
+						}
+						if (row->miyRw > 0 && row->miyRw < 0x8000) //v8_14A_1b13.xls
+						{
+							CP_XML_ATTR(L"ht", row->miyRw / 20.);
+							CP_XML_ATTR(L"customHeight", true);
+						}
+						if (row->iOutLevel > 0)
+						{
+							CP_XML_ATTR(L"outlineLevel", row->iOutLevel);
+						}
+						if (row->fCollapsed)
+						{
+							CP_XML_ATTR(L"collapsed", row->fCollapsed);
+						}
+						if (row->fExAsc)
+						{
+							CP_XML_ATTR(L"thickTop", true);
+						}
+						if (row->fExDes)
+						{
+							CP_XML_ATTR(L"thickBot", true);
+						}
+						if (row->fDyZero)
+						{
+							CP_XML_ATTR(L"hidden", true);
+						}						
+					}
+					for ( std::map<int, BaseObjectPtr>::iterator it_cell = it_row->second.mapCells.begin(); it_cell != it_row->second.mapCells.end(); it_cell++)
+					{
+						if (isConcatinate_)
+						{
+							CELL* cell = dynamic_cast<CELL*>((it_cell->second).get());
+
+							MulBlank	*mulblank	= dynamic_cast<MulBlank*>(cell->elements_.begin()->get());
+							MulRk		*mulrk		= dynamic_cast<MulRk*>(cell->elements_.begin()->get());
+
+							if (mulblank || mulrk)
+							{
+								std::map<int, BaseObjectPtr>::iterator it_next_cell =  it_cell; it_next_cell++;
+								if (it_next_cell != it_row->second.mapCells.end())
+								{
+									CELL* cell_next = dynamic_cast<CELL*>((it_next_cell->second).get());
+
+									if (mulblank)	mulblank->colLast = (std::min)((int)mulblank->colLast, cell_next->ColumnNumber - 1);
+									if (mulrk)		mulrk->colLast = (std::min)((int)mulrk->colLast, cell_next->ColumnNumber - 1);
+								}
+							}
+						}
+						(it_cell->second)->serialize(CP_XML_STREAM());
+					}
+				}
+			}
+		}
+
 	}
 	return 0;
 }

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

@@ -54,8 +54,12 @@ public:
 	int serialize(std::wostream & stream);
 
 	std::vector<CellRangeRef>& shared_formulas_locations_ref_;
-    int							m_count_CELL_GROUP;
+   
 	std::vector<BaseObjectPtr>	m_arEntExU2;
+
+	GlobalWorkbookInfoPtr		global_info_;
+	int							index_sheet_info_;
+	bool						isConcatinate_;
 };
 
 } // namespace XLS

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

@@ -35,8 +35,8 @@
 
 #include "../Biff_records/Blank.h"
 #include "../Biff_records/MulBlank.h"
-#include "../Biff_records/RK.h"
 #include "../Biff_records/MulRk.h"
+#include "../Biff_records/RK.h"
 #include "../Biff_records/BoolErr.h"
 #include "../Biff_records/Number.h"
 #include "../Biff_records/LabelSst.h"

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

@@ -31,9 +31,12 @@
  */
 
 #include "CHART.h"
-#include <Logic/Biff_records/BOF.h>
-#include <Logic/ChartSheetSubstream.h>
-#include <Logic/Biff_records/Continue.h>
+#include "../ChartSheetSubstream.h"
+#include "../Biff_records/BOF.h"
+#include "../Biff_records/Continue.h"
+#include "../Biff_unions/CELLTABLE.h"
+#include "../Biff_structures/CellRangeRef.h"
+#include "../Biff_records/EOF.h"
 
 namespace XLS
 {
@@ -51,12 +54,17 @@ BaseObjectPtr CHART::clone()
 
 const bool CHART::loadContent(BinProcessor& proc)
 {
+	GlobalWorkbookInfoPtr global_info = proc.getGlobalWorkbookInfo();
+
 	unsigned short ss_type;
 	if(!proc.getNextSubstreamType(ss_type) || BOF::st_Chart != ss_type)
 	{
 		return false;
 	}
-	ChartSheetSubstream chart_sheet(-1);
+
+	size_t tmp_index_table = global_info->sheets_info.size(); //if present table
+
+	ChartSheetSubstream chart_sheet(tmp_index_table); 
 	if(!proc.mandatory(chart_sheet))
 	{
 		return false;
@@ -82,6 +90,20 @@ const bool CHART::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 		count--;
 	}
+//chart_sourcedata_missing_import_biff5.xls
+	if (proc.getGlobalWorkbookInfo()->Version < 0x0600)	
+	{
+		std::vector<CellRangeRef> shared_formulas_locations;
+		CELLTABLE cell_table_temlate(shared_formulas_locations);
+		
+		if (proc.optional(cell_table_temlate))
+		{
+			//cash table
+		}
+		if (proc.optional<EOF_T>())
+		{//???
+		}
+	}
 	return true;
 }
 

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_unions/CRT.h

@@ -36,8 +36,6 @@
 namespace XLS
 {
 
-
-// Logical representation of CRT union of records 
 class CRT: public CompositeObject
 {
 	BASE_OBJECT_DEFINE_CLASS_NAME(CRT)

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

@@ -31,24 +31,24 @@
  */
 
 #include "CUSTOMVIEW.h"
-#include <Logic/Biff_records/UserSViewBegin.h>
-#include <Logic/Biff_records/Selection.h>
-#include <Logic/Biff_records/HorizontalPageBreaks.h>
-#include <Logic/Biff_records/VerticalPageBreaks.h>
-#include <Logic/Biff_records/Header.h>
-#include <Logic/Biff_records/Footer.h>
-#include <Logic/Biff_records/HCenter.h>
-#include <Logic/Biff_records/VCenter.h>
-#include <Logic/Biff_records/LeftMargin.h>
-#include <Logic/Biff_records/RightMargin.h>
-#include <Logic/Biff_records/TopMargin.h>
-#include <Logic/Biff_records/BottomMargin.h>
-#include <Logic/Biff_records/Pls.h>
-#include <Logic/Biff_records/Setup.h>
-#include <Logic/Biff_records/PrintSize.h>
-#include <Logic/Biff_records/HeaderFooter.h>
-#include <Logic/Biff_records/UserSViewEnd.h>
-#include <Logic/Biff_unions/AUTOFILTER.h>
+#include "AUTOFILTER.h"
+#include "../Biff_records/UserSViewBegin.h"
+#include "../Biff_records/Selection.h"
+#include "../Biff_records/HorizontalPageBreaks.h"
+#include "../Biff_records/VerticalPageBreaks.h"
+#include "../Biff_records/Header.h"
+#include "../Biff_records/Footer.h"
+#include "../Biff_records/HCenter.h"
+#include "../Biff_records/VCenter.h"
+#include "../Biff_records/LeftMargin.h"
+#include "../Biff_records/RightMargin.h"
+#include "../Biff_records/TopMargin.h"
+#include "../Biff_records/BottomMargin.h"
+#include "../Biff_records/Pls.h"
+#include "../Biff_records/Setup.h"
+#include "../Biff_records/PrintSize.h"
+#include "../Biff_records/HeaderFooter.h"
+#include "../Biff_records/UserSViewEnd.h"
 
 namespace XLS
 {
@@ -105,7 +105,7 @@ const bool CUSTOMVIEW::loadContent(BinProcessor& proc)
 	proc.optional<TopMargin>();
 	proc.optional<BottomMargin>();
 
-    if (proc.optional<Pls>())
+	if (proc.optional<Pls>())
 	{
 		m_pls = elements_.back();
 		elements_.pop_back();

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

@@ -80,9 +80,7 @@ public:
 				return false;
 			}
 		}
-		int count = 0;
-		count = proc.repeated<ContinueFrt11>(0, 0);
-		count = proc.repeated<List12>(0, 0);
+		int count = proc.repeated<List12>(0, 0);
 		
 		while (proc.optional<AutoFilter12>())
 		{
@@ -199,10 +197,14 @@ int FEAT11::serialize(std::wostream & strm, size_t index)
 			{
 				if (display.empty()) display = feature11->rgbFeat.rgbName.value();
 
-				CP_XML_ATTR(L"id",		feature11->rgbFeat.idList);
-				CP_XML_ATTR(L"name",	feature11->rgbFeat.rgbName.value());
-				CP_XML_ATTR(L"displayName", display);
-				CP_XML_ATTR(L"ref",		feature11->sqref);
+				CP_XML_ATTR(L"id",				feature11->rgbFeat.idList);
+				CP_XML_ATTR(L"name",			feature11->rgbFeat.rgbName.value());
+				CP_XML_ATTR(L"displayName",		display);
+				CP_XML_ATTR(L"ref",				feature11->sqref);
+
+				CP_XML_ATTR(L"headerRowCount",	feature11->rgbFeat.crwHeader);
+				CP_XML_ATTR(L"totalsRowCount",	feature11->rgbFeat.crwTotals);
+				//CP_XML_ATTR(L"totalsRowShown",	feature11->rgbFeat.fShownTotalRow);
 				
 				if (!comment.empty()) 
 					CP_XML_ATTR(L"comment", comment);
@@ -289,7 +291,23 @@ int FEAT11::serialize(std::wostream & strm, size_t index)
 							//if (!field->stData.value().empty())
 							//	CP_XML_ATTR(L"dataDxfId", field->stData.value());	
 							}
-							//totalsRowFunction
+							if (field->fmla.bFmlaExist)
+							{
+								CP_XML_NODE(L"calculatedColumnFormula")
+								{
+									CP_XML_STREAM() << field->fmla.fmla.getAssembledFormula();
+								}
+							}
+							if (field->fLoadTotalFmla)
+							{
+								CP_XML_NODE(L"totalsRowFormula")
+								{
+									if (field->fLoadTotalArray)
+										CP_XML_STREAM() << field->totalArrayFmla.getAssembledFormula();
+									else 
+										CP_XML_STREAM() << field->totalFmla.getAssembledFormula();
+								}
+							}
 						}
 					}
 				}

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

@@ -31,9 +31,9 @@
  */
 
 #include "INTERFACE.h"
-#include <Logic/Biff_records/InterfaceHdr.h>
-#include <Logic/Biff_records/Mms.h>
-#include <Logic/Biff_records/InterfaceEnd.h>
+#include "../Biff_records/InterfaceHdr.h"
+#include "../Biff_records/Mms.h"
+#include "../Biff_records/InterfaceEnd.h"
 
 namespace XLS
 {

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

@@ -95,7 +95,7 @@ const bool IVAXIS::loadContent(BinProcessor& proc)
 		elements_.pop_back();
 	}
 
-	if (proc.mandatory<AxcExt>()) // 4-th place
+	if (proc.optional<AxcExt>()) // 4-th place
 	{
 		m_AxcExt = elements_.back();
 		elements_.pop_back();
@@ -109,7 +109,7 @@ const bool IVAXIS::loadContent(BinProcessor& proc)
 		m_CatLab = elements_.back();
 		elements_.pop_back();
 	}
-	if (proc.mandatory<AXS>())
+	if (proc.optional<AXS>())
 	{
 		m_AXS = elements_.back();
 		elements_.pop_back();

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

@@ -32,18 +32,20 @@
 
 #include "PAGESETUP.h"
 
-#include <Logic/Biff_records/Header.h>
-#include <Logic/Biff_records/Footer.h>
-#include <Logic/Biff_records/HCenter.h>
-#include <Logic/Biff_records/VCenter.h>
-#include <Logic/Biff_records/LeftMargin.h>
-#include <Logic/Biff_records/RightMargin.h>
-#include <Logic/Biff_records/TopMargin.h>
-#include <Logic/Biff_records/BottomMargin.h>
-#include <Logic/Biff_records/Pls.h>
-#include <Logic/Biff_records/Continue.h>
-#include <Logic/Biff_records/Setup.h>
-#include <Logic/Biff_records/HeaderFooter.h> 
+#include "../Biff_records/Header.h"
+#include "../Biff_records/Footer.h"
+#include "../Biff_records/HCenter.h"
+#include "../Biff_records/VCenter.h"
+#include "../Biff_records/LeftMargin.h"
+#include "../Biff_records/RightMargin.h"
+#include "../Biff_records/TopMargin.h"
+#include "../Biff_records/BottomMargin.h"
+#include "../Biff_records/Pls.h"
+#include "../Biff_records/Continue.h"
+#include "../Biff_records/Setup.h"
+#include "../Biff_records/HeaderFooter.h" 
+#include "../Biff_records/HorizontalPageBreaks.h"
+#include "../Biff_records/VerticalPageBreaks.h"
 
 namespace XLS
 {
@@ -135,10 +137,13 @@ const bool PAGESETUP::loadContent(BinProcessor& proc)
 						elements_.pop_back();
 					}
 				}break;			
-			case rt_BottomMargin:	proc.optional<BottomMargin>();			break;
+			case rt_BottomMargin:	proc.optional<BottomMargin>();		break;
 			case rt_TopMargin:		proc.optional<TopMargin>();			break;
 			case rt_LeftMargin:		proc.optional<LeftMargin>();		break;
 			case rt_RightMargin:	proc.optional<RightMargin>();		break;
+			
+			case rt_HorizontalPageBreaks: proc.optional<HorizontalPageBreaks>();	break;
+			case rt_VerticalPageBreaks: proc.optional<VerticalPageBreaks>();	break;
 			case rt_Pls:
 				{
 					if (proc.optional<Pls>())
@@ -238,32 +243,35 @@ int PAGESETUP::serialize(std::wostream & stream)
 			if (!r)			CP_XML_ATTR(L"right"	, 0.75);
 		}
 
-		if (setup->iFitHeight > 0 && setup->iFitWidth == 1 && setup->iScale == 100)
+		if (setup)
 		{
-			setup->iScale = 90;
-		}
-
-		if (false == setup->fNoPls)
-		{	
-			CP_XML_NODE(L"pageSetup")// - для chartsheet аккуратнее
+			if (setup->iFitHeight > 0 && setup->iFitWidth == 1 && setup->iScale == 100)
 			{
-				CP_XML_ATTR(L"paperSize", setup->iPaperSize);
-				CP_XML_ATTR(L"firstPageNumber", setup->iPageStart);
-				
-				CP_XML_ATTR(L"scale", setup->iScale);
+				setup->iScale = 90;
+			}
 
-				CP_XML_ATTR(L"orientation", setup->fPortrait ? L"portrait" : L"landscape");
-				CP_XML_ATTR(L"horizontalDpi", setup->iRes);
-				CP_XML_ATTR(L"verticalDpi", setup->iVRes);
+			if (false == setup->fNoPls)
+			{	
+				CP_XML_NODE(L"pageSetup")// - для chartsheet аккуратнее
+				{
+					CP_XML_ATTR(L"paperSize", setup->iPaperSize);
+					CP_XML_ATTR(L"firstPageNumber", setup->iPageStart);
+					
+					CP_XML_ATTR(L"scale", setup->iScale);
 
-				if (setup->fUsePage)
-					CP_XML_ATTR(L"useFirstPageNumber", true);
-				
-				if (setup->iFitWidth > 0 && setup->iFitWidth < 32767)
-					CP_XML_ATTR(L"fitToWidth", setup->iFitWidth);
+					CP_XML_ATTR(L"orientation", setup->fPortrait ? L"portrait" : L"landscape");
+					CP_XML_ATTR(L"horizontalDpi", setup->iRes);
+					CP_XML_ATTR(L"verticalDpi", setup->iVRes);
 
-				if (setup->iFitHeight > 0 && setup->iFitHeight < 32767)
-					CP_XML_ATTR(L"fitToHeight", setup->iFitHeight);
+					if (setup->fUsePage)
+						CP_XML_ATTR(L"useFirstPageNumber", true);
+					
+					if (setup->iFitWidth > 0 && setup->iFitWidth < 32767)
+						CP_XML_ATTR(L"fitToWidth", setup->iFitWidth);
+
+					if (setup->iFitHeight > 0 && setup->iFitHeight < 32767)
+						CP_XML_ATTR(L"fitToHeight", setup->iFitHeight);
+				}
 			}
 		}
 

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

@@ -134,7 +134,14 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 	m_Series = elements_.back();
 	elements_.pop_back();
 	
-	proc.mandatory<Begin>();								elements_.pop_back(); //skip
+	if (proc.getGlobalWorkbookInfo()->Version < 0x0600)	
+	{
+		if (proc.optional<Begin>()) elements_.pop_back(); //skip
+	}
+	else
+	{
+		if (proc.mandatory<Begin>()) elements_.pop_back(); //skip
+	}
 	
 	count = proc.repeated<AI>(4, 4);
 	while(count > 0 && elements_.size() > 0)
@@ -174,7 +181,7 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 		count = elements_.size();
 		while(count > 0)
 		{
-			if		("SerParent"	== elements_.front()->getClassName())
+			if ("SerParent"	== elements_.front()->getClassName())
 				m_SerParent = elements_.front();
 			else if ("SerToCrt"		== elements_.front()->getClassName())
 				m_SerToCrt = elements_.front();
@@ -224,7 +231,14 @@ const bool SERIESFORMAT::loadContent(BinProcessor& proc)
 		m_SeriesEx.push_back(ex);
 	}
 
-	if (proc.mandatory<End>())							elements_.pop_back(); //skip
+	if (proc.getGlobalWorkbookInfo()->Version < 0x0600)	
+	{
+		if (proc.optional<End>()) elements_.pop_back(); //skip
+	}
+	else
+	{
+		if (proc.mandatory<End>()) elements_.pop_back(); //skip
+	}
 
 	return true;
 }