Refactoring zip module

Feature/new embed

.gitignore

@@ -38,3 +38,5 @@ Thumbs.db
 *.db
 
 *.opendb
+
+DesktopEditor/fontengine/js/common/freetype-2.10.4

ASCOfficeOdfFile/src/docx/pptx_text_context.cpp

@@ -172,13 +172,13 @@ void pptx_text_context::Impl::start_paragraph(const std::wstring & styleName)
 {
     if (paragraphs_cout_++ > 0)
     {	
-		//if (in_list_ == false || in_comment == true)
-		//{
-		//// конец предыдущего абзаца и начало следующего
-		////text_ << L"&#10;";
-		//	text_ << L"\n"; 
-		//}
-		//else/* (paragraph_style_name_ != styleName)*/
+		if (in_list_ == false || in_comment == true)
+		{
+		// конец предыдущего абзаца и начало следующего
+		//text_ << L"&#10;";
+			text_ << L"\n"; 
+		}
+		else/* (paragraph_style_name_ != styleName)*/
 		{
 			dump_paragraph();
 		}

ASCOfficeOdfFile/src/odf/math_limit_elements.cpp

@@ -221,9 +221,16 @@ void math_mmultiscripts::oox_convert(oox::math_context & Context)
 {//1* elements
 	std::wostream & strm = Context.output_stream();
 
-	strm << L"<m:sPre>";	
+	strm << L"<m:sPre>";
+		strm << L"<m:sub>";
+		for (size_t i = 0; i < pre_content_.size() / 2; i++)
+		{
+			office_math_element* math_element = dynamic_cast<office_math_element*>(pre_content_[i].get());
+			math_element->oox_convert(Context);
+		}
+		strm << L"</m:sub>";
 		strm << L"<m:sup>";
-			for (size_t i = 0; i < pre_content_.size(); i++)
+			for (size_t i = pre_content_.size() / 2; i < pre_content_.size(); i++)
 			{
 				office_math_element* math_element = dynamic_cast<office_math_element*>(pre_content_[i].get());
 				math_element->oox_convert(Context);

ASCOfficeOdfFile/src/odf/math_token_elements.cpp

@@ -116,6 +116,7 @@ void math_mi::oox_convert(oox::math_context & Context)
 			CP_XML_NODE(L"m:t")
 			{
 				//CP_XML_ATTR(L"xml:space", L"preserve");
+				std::wstring new_text_ = text_.get() + L" ";
 				CP_XML_STREAM() << xml::utils::replace_text_to_xml( *text_ );
 			}
 		}

ASCOfficeOdfFile/src/odf/style_text_properties.cpp

@@ -458,7 +458,7 @@ void text_format_properties_content::drawing_serialize(std::wostream & strm, std
 			
 			if ((fo_letter_spacing_) && (fo_letter_spacing_->get_type() != letter_spacing::Normal))
 			{
-				CP_XML_ATTR(L"spc",(int)(20.0 * fo_letter_spacing_->get_length().get_value_unit(length::pt)));
+				CP_XML_ATTR(L"spc",(int)(100. * fo_letter_spacing_->get_length().get_value_unit(length::pt)));
 			}
 		
 			if (style_text_position_)

ASCOfficeOdfFileW/source/OdfFormat/math_elements.cpp

@@ -135,17 +135,26 @@ void math_annotation::serialize(std::wostream & _Wostream)
 	{
 		CP_XML_NODE_SIMPLE_NONS()
 		{
+			CP_XML_ATTR_OPT(L"encoding", encoding_);
+			if (text_)
+			{
+				CP_XML_CONTENT(text_.get());
+				common_attlist_.serialize(CP_GET_XML_NODE());
+			}
 			for (size_t i = 0; i < content_.size(); i++)
 			{
 				if (!content_[i]) continue;
 				content_[i]->serialize(CP_XML_STREAM());
 			}
-			CP_XML_ATTR_OPT(L"math:text", text_);
-			CP_XML_ATTR_OPT(L"math:encoding", encoding_);
 		}
 	}
 }
 
+void math_annotation::add_text(const std::wstring& Text)
+{
+	text_ = Text;
+}
+
 //----------------------------------------------------------------------------------------------------
 const wchar_t * math_annotation_xml::ns = L"math";
 const wchar_t * math_annotation_xml::name = L"annotation-xml";

ASCOfficeOdfFileW/source/OdfFormat/math_elements.h

@@ -38,8 +38,8 @@
 #include <xml/simple_xml_writer.h>
 
 #include "office_elements_create.h"
-
 #include "mathvariant.h"
+#include "../datatypes/common_attlists.h"
 
 
 namespace cpdoccore { 
@@ -119,6 +119,8 @@ public:
     static const xml::NodeType xml_type = xml::typeElement;
     static const ElementType type = typeMathAnnotation;
 
+	_CP_OPT(std::wstring)		encoding_;
+
     CPDOCCORE_DEFINE_VISITABLE();
     CPDOCCORE_OFFICE_DOCUMENT_IMPL_NAME_FUNCS_
 private:
@@ -127,9 +129,12 @@ private:
 
 	virtual void serialize(std::wostream & _Wostream);
 
+    virtual void add_text(const std::wstring& Text);
+
+    odf_types::common_math_style_attlist	common_attlist_;
+
     office_element_ptr_array	content_;	
 	_CP_OPT(std::wstring)		text_;
-	_CP_OPT(std::wstring)		encoding_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(math_annotation);

ASCOfficeOdfFileW/source/OdfFormat/odf_math_context.cpp

@@ -110,7 +110,7 @@ namespace odf_writer
 	static formulasconvert::oox2odf_converter formulas_converter_math;
 
 	odf_math_context::odf_math_context(odf_conversion_context *odf_context)
-		: impl_(new  odf_math_context::Impl(odf_context)), lvl_of_me(0), counter(0)
+		: impl_(new  odf_math_context::Impl(odf_context)), lvl_of_me(0), counter(0), annotation_flag(true), matrix_row_counter(0)
 	{
 		mo = { L'+', L'-', L'±', L'∓', L'∙', L'×', L'∗', L'÷', L'/', L'≂', L'⊕', L'⊖', L'⊙', L'⊗', L'⊘', L'∘', L'¬', L'∧', L'∨',		// un/bi operators
 				L'=', L'≠', L'<', L'≤', L'>', L'≥', L'≪', L'≫', L'≈', L'~', L'≃', L'≡', L'∝', L'∥', L'⟂', L'|', L'∤', L'→', L'⊷',	// relations
@@ -123,10 +123,27 @@ namespace odf_writer
 				L'˙', L'¨', L'⃛', L'̂', L'̌', L'́'//, L'̆', L'', L'', L'', L'', L'',
 		};
 
-		diakSymbols = { {L"̇", L"˙"}, {L"̈", L"¨"}, {L"⃛", L"⃛"}, {L"̂", L"&#708;"}, {L"̌", L"ˇ"}, {L"́", L"´"}, {L"̀", L"&#715;"}, {L"̆", L"˘"}, {L"̃", L"~"}, {L"̅", L"¯"},
+		diak_symbols = { {L"̇", L"˙"}, {L"̈", L"¨"}, {L"⃛", L"⃛"}, {L"̂", L"&#708;"}, {L"̌", L"ˇ"}, {L"́", L"´"}, {L"̀", L"&#715;"}, {L"̆", L"˘"}, {L"̃", L"~"}, {L"̅", L"¯"},
 						{L"̿", L"═"}, {L"⏞", L"⏞"}, {L"⃖", L"←"}, {L"⃗", L"→"}, {L"⃡", L"↔"}, {L"⃐", L"↼"}, {L"⃑", L"⇀"}, {L"̲", L"&#45;"}
 						//{L'', L''}, { L'', L'' }, { L'', L'' }, { L'', L'' }, { L'', L'' }, { L'', L'' }, { L'', L'' }
 		};
+
+		annotation_diak_symbols = { {L"˙",L"dot"}, {L"¨",L"ddot"}, {L"⃛",L"dddot"}, {L"&#708;", L"hat"}, {L"ˇ",L"check"}, {L"´",L"acute"}, {L"&#715;",L"grave"}, {L"˘",L"breve"},
+			                        {L"~",L"tilde"},{L"¯",L"overline"},{L"→",L"vec"}, {L"⇀",L"harpoon"}, {L"&#45;",L"unnderline"}/*, {L"",L""}, {L"",L""}, {L"",L""}, {L"",L""}, {L"",L""}, {L"",L""},{L"",L""}, 
+			                        {L"",L""}*/
+		};
+
+		annotation_operators = { {L"∫",L"int"}, {L"∬", L"iint "}, {L"∭", L"iiint "}, {L"∮", L"lint "}, {L"∯", L"llint "},
+								 {L"∰", L"lllint "}, {L"∑", L"sum "}, {L"∏", L"prod "}, {L"∐", L"coprod "}
+								
+		};
+
+		annotation_brackets_begin = { {L"(", L"("}, {L"[", L"["}, {L"{", L"lbrace"}, {L"⟨", L"langle"}, {L"〈", L"langle"}, {L"⌊", L"lfloor"}, {L"⌈", L"lceil"}, {L"|", L"lline"}, {L"‖", L"ldline"},
+									  {L"]", L"]"}, {L"⟦", L"ldbracket"}
+		};
+		annotation_brackets_end   = { {L")", L")"}, {L"]", L"]"}, {L"}", L"rbrace"}, {L"⟩", L"rangle"}, {L"〉", L"rangle"},{L"⌋", L"rfloor"}, {L"⌉", L"rceil"}, {L"|", L"rline"}, {L"‖", L"rdline"},
+									  {L"[", L"["}, {L"⟧", L"rdbracket"}
+		};
 		//debug_stream.open(debug_fileName);
 	}
 

ASCOfficeOdfFileW/source/OdfFormat/odf_math_context.h

@@ -87,12 +87,19 @@ namespace cpdoccore {
 			void end_element();
 
 			std::vector<std::vector<std::wstring>> brackets;
+			std::wstring annotation;
 			int lvl_of_me;
+			int matrix_row_counter;
 			std::vector<int> end_counter;
 			int counter; 
 			std::set<wchar_t> mo;
-			std::map<std::wstring, std::wstring> diakSymbols;
-
+			std::map<std::wstring, std::wstring> diak_symbols;
+			bool annotation_flag;
+			std::map<std::wstring, std::wstring> annotation_operators;
+			std::map<std::wstring, std::wstring> annotation_brackets_begin;
+			std::map<std::wstring, std::wstring> annotation_brackets_end;
+			std::map<std::wstring, std::wstring> annotation_diak_symbols;
+			//std::pair<std::set<std::string>, bool> annotation_from_to_operators;
 			void end_math();
 
 			std::wofstream debug_stream;

ASCOfficeOdfFileW/source/Oox2OdfConverter/ConvertDrawing.cpp

@@ -1937,7 +1937,7 @@ void OoxConverter::convert(PPTX::Logic::Paragraph *oox_paragraph, PPTX::Logic::T
 			odf_context()->drawing_context()->set_paragraph_properties(paragraph_properties);
 	}	
 
-	if (oox_paragraph->RunElems.empty() && list_present) list_present = false; // ms не обозначает присутствие списка, libra - показывает значек
+	//if (oox_paragraph->RunElems.empty() && list_present) list_present = false; // ms не обозначает присутствие списка, libra - показывает значек
 	
 	while ((int)odf_context()->text_context()->list_state_.levels.size() > list_level)
 	{

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.h

@@ -660,6 +660,8 @@ public:
 		std::vector<std::vector<std::wstring>>& brackets();
 		int& lvl_of_me();
 		std::vector<int>& end_counter();
+		std::wstring& annotation();
+		bool& annotation_flag();
 		void mrow();
 		void endOfMrow();
 		void resizeBrackets();
@@ -674,7 +676,7 @@ public:
 		void convert(OOX::Logic::CBorderBox				*oox_border_box);
 		void convert(OOX::Logic::CBorderBoxPr			*oox_border_box_pr);
 		void convert(OOX::Logic::CBox					*oox_box);
-		void convert(OOX::Logic::CBoxPr					*oox_box_pr);
+		bool convert(OOX::Logic::CBoxPr					*oox_box_pr);
 		void convert(OOX::Logic::CBrk					*oox_brk);
 		void convert(OOX::Logic::CDelimiter				*oox_del);
 		std::pair<std::wstring, std::wstring> convert(OOX::Logic::CDelimiterPr			*oox_del_pr);
@@ -707,7 +709,7 @@ public:
 		void convert(OOX::Logic::CMRun					*oox_run);
 		void convert(OOX::Logic::CMText					*oox_text);
 		void convert(OOX::Logic::CNary					*oox_nary);
-		std::pair<bool, bool> convert(OOX::Logic::CNaryPr *oox_nary_pr);
+		std::vector<bool> convert(OOX::Logic::CNaryPr *oox_nary_pr);
 		void convert(OOX::Logic::CGrow					*oox_grow);
 		void convert(OOX::Logic::COMathPara				*oox_math_para);
 		void convert(OOX::Logic::COMathParaPr			*oox_math_para_pr);
@@ -735,7 +737,7 @@ public:
 		void convert(OOX::Logic::CSub *oox_sub, OOX::Logic::CElement *oox_elm);
 		void convert(OOX::Logic::CFName					*oox_fname);
 		void convert(OOX::Logic::CLim					*oox_lim);
-		void convert(OOX::Logic::CChr					*oox_chr);
+		bool convert(OOX::Logic::CChr					*oox_chr);
 		void convert(OOX::Logic::CSup					*oox_csup);
 		void convert(OOX::Logic::CSub					*oox_csub);
 		bool convert(OOX::Logic::CSubHide				*oox_subHide);
@@ -743,7 +745,7 @@ public:
 		std::wstring convert(OOX::Logic::CType			*oox_type);
 		void convert(OOX::Logic::CDiff					*oox_diff);
 		void convert(OOX::Logic::CArgSz					*oox_arg_sz);
-		void convert(OOX::Logic::COpEmu					*oox_op_emu);
+		bool convert(OOX::Logic::COpEmu					*oox_op_emu);
 		bool convert(OOX::Logic::CPos					*oox_pos);
 		void convert(OOX::Logic::CVertJc				*oox_vert_jc);
 		void convert(OOX::Logic::CNoBreak				*oox_no_break);

ASCOfficeOdfFileW/source/Oox2OdfConverter/MathConverter.cpp

@@ -29,6 +29,59 @@ namespace Oox2Odf
 		return odf_context()->math_context()->end_counter;
 	}
 
+	std::wstring& OoxConverter::annotation()
+	{
+		return odf_context()->math_context()->annotation;
+	}
+
+	void annotaionReplaceAll(std::wstring& annotation, std::wstring substr1, std::wstring substr2)
+	{
+		size_t pos = annotation.find(substr1);
+		while (pos != std::wstring::npos)
+		{
+			annotation.replace(pos, substr1.size(), substr2);
+			pos = annotation.find(substr1, pos + substr2.size());
+		}
+	}
+
+	void annotationPostProd(std::wstring& annotation)
+	{
+		annotaionReplaceAll(annotation, L"=", L"\"=\"");
+		annotaionReplaceAll(annotation, L"{) }", L")");
+		annotaionReplaceAll(annotation, L"{( }", L"(");
+		annotaionReplaceAll(annotation, L"*", L"\"*\"");
+		annotaionReplaceAll(annotation, L"|", L"\"|\"");
+		// ∥
+		size_t pos = annotation.find(L"∥");
+		std::vector<size_t> positions;
+		//positions.push_back(pos);
+		while (pos != std::wstring::npos)
+		{
+			positions.push_back(pos);
+			pos = annotation.find(L"∥", pos + 1);
+		}
+		std::wstring str1 = L"ldline";
+		std::wstring str2 = L"rdline";
+		for (int i = positions.size() - 1; i >= 0; i--)
+		{			
+			if (i % 2 == 0)
+				annotation.replace(positions[i], 1, str1);
+			else
+				annotation.replace(positions[i], 1, str2);
+		}
+
+		//if (annotation[0] == L'=')
+		//	annotation = L"\"\"" + annotation;
+
+		//if ((annotation[annotation.size() - 1] == L'=') || (annotation[annotation.size() - 1] == L' ') && annotation[annotation.size() - 2] == L'=')
+		//	annotation = annotation + L"\"\"";
+	}
+
+	bool& OoxConverter::annotation_flag()
+	{
+		return odf_context()->math_context()->annotation_flag;
+	}
+
 	void OoxConverter::mrow() // обертка для тега <mrow>
 	{
 		CREATE_MATH_TAG(L"mrow");
@@ -58,7 +111,28 @@ namespace Oox2Odf
 		for (size_t i = 0; i < oox_math->m_arrItems.size(); ++i)
 		{
 			convert(oox_math->m_arrItems[i]);
-		}		
+		}
+		if (annotation_flag())
+		{
+			CREATE_MATH_TAG(L"annotation");
+			typedef odf_writer::math_annotation* T;
+			T tmp = dynamic_cast<T>(elm.get());
+			if (tmp)
+			{
+				tmp->encoding_ = L"StarMath 5.0";
+			}
+			
+			annotationPostProd(annotation());
+
+			elm->add_text(annotation());
+			OPEN_MATH_TAG(elm);
+			CLOSE_MATH_TAG;
+		}
+		else
+			annotation_flag() = true;
+		annotation().clear();
+
+		
 
 		if (bStart) odf_context()->end_math();
 	}
@@ -132,14 +206,22 @@ namespace Oox2Odf
 		
 		OPEN_MATH_TAG(elm);
 		
-		convert(oox_acc->m_oElement.GetPointer());
 		//convert(oox_acc->m_oAccPr.GetPointer());
 		std::wstring diakSymbol = (oox_acc->m_oAccPr->m_oChr.IsInit()) ? oox_acc->m_oAccPr->m_oChr.get().m_val->GetValue() : L"̂";
 		
-		std::map<std::wstring, std::wstring>& map = odf_context()->math_context()->diakSymbols;
+		std::map<std::wstring, std::wstring>& map = odf_context()->math_context()->diak_symbols;
 		std::wstring symbol;		
 		
 		symbol = (map[diakSymbol]);
+		std::map<std::wstring, std::wstring>& annotation_map = odf_context()->math_context()->annotation_diak_symbols;
+		if (annotation_map.find(symbol) != annotation_map.end())
+			annotation() += annotation_map[symbol] + L" ";
+		else
+			annotation_flag() = false;
+
+		annotation() += L"{";
+		convert(oox_acc->m_oElement.GetPointer());
+		annotation() += L"}";
 		{
 			CREATE_MATH_TAG(L"mo");
 			/*typedef odf_writer::math_mo* T;
@@ -154,6 +236,7 @@ namespace Oox2Odf
 
 		}	
 		CLOSE_MATH_TAG;
+		
 	}
 
 	void OoxConverter::convert(OOX::Logic::CAccPr	*oox_acc_pr)
@@ -189,13 +272,18 @@ namespace Oox2Odf
 		CREATE_MATH_TAG(tag.c_str());
 		OPEN_MATH_TAG(elm);
 		{
+			if(flag) annotation() += L"bar {";
+			else	 annotation() += L"underline { ";
+
 			convert(oox_bar->m_oElement.GetPointer());
 			CREATE_MATH_TAG(L"mo");
-			if (flag) elm->add_text(L"¯");
-			else	  elm->add_text(L"&#713;");
+			if (flag)	elm->add_text(L"¯");				
+			else		elm->add_text(L"&#713;");			
 			
 			OPEN_MATH_TAG(elm);
 			CLOSE_MATH_TAG;
+
+			annotation() += L"} ";
 		}
 
 		CLOSE_MATH_TAG;
@@ -240,16 +328,19 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CBox *oox_box)
 	{
 		if (!oox_box) return;
-
-
-		convert(oox_box->m_oBoxPr.GetPointer());
-		convert(oox_box->m_oElement.GetPointer());
-
+		if (convert(oox_box->m_oBoxPr.GetPointer()))
+		{
+			annotation() += L"\"";
+			convert(oox_box->m_oElement.GetPointer());
+			annotation() += L"\"";
+		}
+		else
+			convert(oox_box->m_oElement.GetPointer());
 	}
 
-	void OoxConverter::convert(OOX::Logic::CBoxPr *oox_box_pr)
+	bool OoxConverter::convert(OOX::Logic::CBoxPr *oox_box_pr)
 	{
-		if (!oox_box_pr) return;
+		if (!oox_box_pr) return false;
 
 
 		convert(oox_box_pr->m_oAln.GetPointer());
@@ -257,7 +348,7 @@ namespace Oox2Odf
 		convert(oox_box_pr->m_oCtrlPr.GetPointer());
 		convert(oox_box_pr->m_oDiff.GetPointer());
 		convert(oox_box_pr->m_oNoBreak.GetPointer());
-		convert(oox_box_pr->m_oOpEmu.GetPointer());
+		return convert(oox_box_pr->m_oOpEmu.GetPointer());
 	}
 
 	void OoxConverter::convert(OOX::Logic::CNoBreak *oox_no_break)
@@ -265,9 +356,14 @@ namespace Oox2Odf
 		if (!oox_no_break) return;
 	}
 
-	void OoxConverter::convert(OOX::Logic::COpEmu *oox_op_emu)
+	bool OoxConverter::convert(OOX::Logic::COpEmu *oox_op_emu)
 	{
-		if (!oox_op_emu) return;
+		if (!oox_op_emu) return false;
+
+		if (oox_op_emu->m_val->ToBool())// == L"true") ||(oox_op_emu->m_val == L"1"))
+			return true;
+		else
+			return false;
 	}
 
 	void OoxConverter::convert(OOX::Logic::CDiff *oox_diff)
@@ -283,7 +379,6 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CDelimiter *oox_del)
 	{
 		if (!oox_del) return;
-		
 		std::pair<std::wstring, std::wstring> begEndChrs;
 		for (size_t i = 0; i < oox_del->m_arrItems.size(); ++i)
 		{
@@ -303,9 +398,12 @@ namespace Oox2Odf
 				tmp->form_ = L"prefix";
 				tmp->stretchy_ = true;
 			}
-			OPEN_MATH_TAG(elm);
-			
+			OPEN_MATH_TAG(elm);			
 			CLOSE_MATH_TAG;
+			if (begEndChrs.first == L"")
+				annotation() += L"left none "; //left none
+			else
+				annotation() += L"left " + odf_context()->math_context()->annotation_brackets_begin[begEndChrs.first] + L" ";
 		}
 	
 		for (size_t i = 0; i < oox_del->m_arrItems.size(); ++i)
@@ -326,11 +424,19 @@ namespace Oox2Odf
 				tmp->form_ = L"postfix";
 				tmp->stretchy_ = true;
 			}
-			OPEN_MATH_TAG(elm)
-			
-			CLOSE_MATH_TAG
+			OPEN_MATH_TAG(elm);
+			CLOSE_MATH_TAG;
+			if (begEndChrs.second == L"")
+				annotation() += L"right none "; //right none
+			else
+				annotation() += L"right " + odf_context()->math_context()->annotation_brackets_end[begEndChrs.second] + L" ";
+
 		}	
 		endOfMrow();
+		/*if (begEndChrs.first == begEndChrs.second ||
+			begEndChrs.first == L"]" && begEndChrs.second == L"[" ||
+			begEndChrs.first == L"⟦" && begEndChrs.second == L"⟧")
+			annotation_flag() = false;*/
 	}
 
 	std::pair<std::wstring, std::wstring> OoxConverter::convert(OOX::Logic::CDelimiterPr *oox_del_pr)
@@ -354,6 +460,9 @@ namespace Oox2Odf
 		if (!oox_beg_chr) return L"(";
 
 		std::wstring s_val = oox_beg_chr->m_val->GetValue();
+
+		//brackets()[lvl_of_me()].push_back(s_val);
+
 		return s_val;
 	}
 
@@ -362,6 +471,8 @@ namespace Oox2Odf
 		if (!oox_end_chr) return L")";
 
 		std::wstring s_val = oox_end_chr->m_val->GetValue();
+
+		//brackets()[lvl_of_me()].push_back(s_val);
 		return s_val;
 	}
 
@@ -375,7 +486,8 @@ namespace Oox2Odf
 		CREATE_MATH_TAG(L"mtable");
 		OPEN_MATH_TAG(elm);
 		{
-			
+			for (size_t i = 1; i < oox_eq_arr->m_arrItems.size() - 1; ++i)
+				annotation() += L" binom ";
 			for (size_t i = 1; i < oox_eq_arr->m_arrItems.size(); ++i)
 			{
 				CREATE_MATH_TAG(L"mtr");
@@ -384,12 +496,16 @@ namespace Oox2Odf
 					CREATE_MATH_TAG(L"mtd");
 					OPEN_MATH_TAG(elm);
 					mrow();
+					annotation() += L"{";
 					convert(oox_eq_arr->m_arrItems[i]);
+					annotation() += L"} ";
 					endOfMrow();
 					CLOSE_MATH_TAG;
 				}
 				CLOSE_MATH_TAG;
-			}			
+			}	
+			/*for (size_t i = 1; i < oox_eq_arr->m_arrItems.size() - 1; ++i)
+				annotation() += L"} ";*/
 		}
 		CLOSE_MATH_TAG;
 	}
@@ -441,9 +557,15 @@ namespace Oox2Odf
 
 		if (val == L"lin")
 		{
+
+			annotation() += L"{";
+
 			mrow();
 				convert(oox_fraction->m_oNum.GetPointer());
 			endOfMrow();
+
+			annotation() += L"} / {";
+
 			CREATE_MATH_TAG(L"mo");
 			OPEN_MATH_TAG(elm);
 			elm->add_text(L"/");
@@ -451,6 +573,30 @@ namespace Oox2Odf
 			mrow();
 				convert(oox_fraction->m_oDen.GetPointer());
 			endOfMrow();
+
+			annotation() += L"}";
+		}
+		else if (val == L"skw")
+		{
+			CREATE_MATH_TAG(L"mfrac");
+			typedef odf_writer::math_mfrac* T;
+			T tmp = dynamic_cast<T>(elm.get());
+
+			if (tmp)
+			{				
+				tmp->bevelled = true;				
+			}
+			OPEN_MATH_TAG(elm);
+			annotation() += L"{";
+			mrow();
+				convert(oox_fraction->m_oNum.GetPointer());
+			endOfMrow();
+			annotation() += L"} wideslash {";
+			mrow();
+				convert(oox_fraction->m_oDen.GetPointer());
+			endOfMrow();
+			annotation() += L"}";
+			CLOSE_MATH_TAG;
 		}
 		else if (val == L"noBar")
 		{
@@ -462,10 +608,12 @@ namespace Oox2Odf
 				{
 					CREATE_MATH_TAG(L"mtd");
 					OPEN_MATH_TAG(elm);
+					annotation() += L"binom{";
 					mrow();
 						convert(oox_fraction->m_oNum.GetPointer());
 					endOfMrow();
 					CLOSE_MATH_TAG;
+					annotation() += L"} {";
 				}
 				CLOSE_MATH_TAG;
 			}
@@ -479,6 +627,7 @@ namespace Oox2Odf
 						convert(oox_fraction->m_oDen.GetPointer());
 					endOfMrow();
 					CLOSE_MATH_TAG;
+					annotation() += L"}";
 				}
 				CLOSE_MATH_TAG;
 			}
@@ -486,29 +635,17 @@ namespace Oox2Odf
 		}
 		else
 		{
-			CREATE_MATH_TAG(L"mfrac");
-
-			typedef odf_writer::math_mfrac* T;			
-
-			T tmp = dynamic_cast<T>(elm.get());
-			
-
-			if (tmp)
-			{
-				if (val == L"skw")
-				{
-					
-					tmp->bevelled = true;
-				}
-			}
-
+			CREATE_MATH_TAG(L"mfrac");			
+			annotation() += L"{";
 			OPEN_MATH_TAG(elm);
 			mrow();
 				convert(oox_fraction->m_oNum.GetPointer());
 			endOfMrow();
+			annotation() += L"} over {";
 			mrow();
 				convert(oox_fraction->m_oDen.GetPointer());
 			endOfMrow();
+			annotation() += L"}";
 			CLOSE_MATH_TAG;
 		}	
 	}
@@ -639,20 +776,26 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CLimLow *oox_lim_low)
 	{
 		if (!oox_lim_low) return;
-
+		
 		mrow();
 
 			
 		CREATE_MATH_TAG(L"munder");
 		OPEN_MATH_TAG(elm);
-
+		annotation() += L"oper ";
 		mrow();
 			convert(oox_lim_low->m_oElement.GetPointer());
 		endOfMrow();
-		convert(oox_lim_low->m_oLimLowPr.GetPointer());
-		convert(oox_lim_low->m_oLim.GetPointer());
 
-			CLOSE_MATH_TAG
+		/*if (annotation().find(L"lim") == -1)
+			annotation_flag() = false;*/
+
+		convert(oox_lim_low->m_oLimLowPr.GetPointer());
+		annotation() += L"from {";
+			convert(oox_lim_low->m_oLim.GetPointer());
+		annotation() += L"} ";
+
+		CLOSE_MATH_TAG;
 
 		endOfMrow();
 	}
@@ -660,13 +803,13 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CLim *oox_lim)
 	{
 		if (!oox_lim) return;
-
+		
 		mrow();
 
 		for (size_t i = 0; i < oox_lim->m_arrItems.size(); ++i)
 			convert(oox_lim->m_arrItems[i]);
 
-		endOfMrow();
+		endOfMrow();		
 	}
 
 	void OoxConverter::convert(OOX::Logic::CLimLowPr *oox_lim_low_pr)
@@ -679,16 +822,24 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CLimUpp *oox_lim_upp)
 	{
 		if (!oox_lim_upp) return;
-
+		
 		
 		CREATE_MATH_TAG(L"mover");
 		OPEN_MATH_TAG(elm);
 
+		annotation() += L"oper ";
+
 		mrow();
 			convert(oox_lim_upp->m_oElement.GetPointer());
 		endOfMrow();
+
+		/*if (annotation().find(L"lim") == -1)
+			annotation_flag() = false;*/
+
 		convert(oox_lim_upp->m_oLimUppPr.GetPointer());
-		convert(oox_lim_upp->m_oLim.GetPointer());
+		annotation() += L"to {";
+			convert(oox_lim_upp->m_oLim.GetPointer());
+		annotation() += L"} ";
 
 		CLOSE_MATH_TAG
 	}
@@ -709,16 +860,24 @@ namespace Oox2Odf
 	void OoxConverter::convert(OOX::Logic::CMatrix *oox_matrix)
 	{
 		if (!oox_matrix) return;
+		int& matrix_row_counter = odf_context()->math_context()->matrix_row_counter;
+
+		if (oox_matrix->m_arrItems[0]->getType() == OOX::EElementType::et_m_mPr)
+			matrix_row_counter = oox_matrix->m_arrItems.size() - 1;
+		else
+			matrix_row_counter = oox_matrix->m_arrItems.size();
 
 		CREATE_MATH_TAG(L"mtable");
 		OPEN_MATH_TAG(elm);
-
+		annotation() += L"matrix{";
 		for (size_t i = 0; i < oox_matrix->m_arrItems.size(); ++i)
 		{
 			convert(oox_matrix->m_arrItems[i]);
 		}
 		CLOSE_MATH_TAG;
 
+		odf_context()->math_context()->matrix_row_counter = 0;
+		annotation() += L"} ";
 	}
 
 	void OoxConverter::convert(OOX::Logic::CMc	*oox_mc)
@@ -806,6 +965,8 @@ namespace Oox2Odf
 	{
 		if (!oox_mr) return;
 
+		int& matrix_row_counter = odf_context()->math_context()->matrix_row_counter;
+
 		CREATE_MATH_TAG(L"mtr");
 		OPEN_MATH_TAG(elm);
 
@@ -815,9 +976,14 @@ namespace Oox2Odf
 			OPEN_MATH_TAG(elm);
 			convert(oox_mr->m_arrItems[i]);
 			CLOSE_MATH_TAG;
+			if( i != oox_mr->m_arrItems.size() - 1)
+			annotation() += L"# ";
 		}
-
 		CLOSE_MATH_TAG;
+
+		matrix_row_counter--;
+		if(matrix_row_counter > 0)
+			annotation() += L"## ";
 	}
 
 	void OoxConverter::convert(OOX::Logic::CMRun *oox_mrun)
@@ -914,6 +1080,7 @@ namespace Oox2Odf
 					elm->add_text(sub_s_val);
 					OPEN_MATH_TAG(elm);
 					CLOSE_MATH_TAG;
+					annotation() += sub_s_val;
 					sub_s_val.clear();
 				}
 				CREATE_MATH_TAG(L"mtext");
@@ -922,6 +1089,7 @@ namespace Oox2Odf
 
 				OPEN_MATH_TAG(elm);
 				CLOSE_MATH_TAG;
+				annotation() += std::wstring(1, s_val[i]) + L" ";
 			}
 
 			else if (w_val <= 57 && w_val >= 48)
@@ -932,6 +1100,7 @@ namespace Oox2Odf
 					elm->add_text(sub_s_val);
 					OPEN_MATH_TAG(elm);
 					CLOSE_MATH_TAG;
+					annotation() += sub_s_val + L" ";
 					sub_s_val.clear();
 				}
 				
@@ -941,6 +1110,7 @@ namespace Oox2Odf
 
 				OPEN_MATH_TAG(elm);
 				CLOSE_MATH_TAG;
+				annotation() += std::wstring(1, s_val[i]) + L" ";
 			}
 			else if (mo.find(w_val) != mo.end())
 			{
@@ -950,6 +1120,7 @@ namespace Oox2Odf
 					elm->add_text(sub_s_val);
 					OPEN_MATH_TAG(elm);
 					CLOSE_MATH_TAG;
+					annotation() += sub_s_val + L" ";
 					sub_s_val.clear();
 				}
 				
@@ -959,6 +1130,7 @@ namespace Oox2Odf
 
 				OPEN_MATH_TAG(elm);
 				CLOSE_MATH_TAG;
+				annotation() += std::wstring(1, s_val[i]) + L" ";
 			}
 			else // <mi>
 			{				
@@ -971,6 +1143,7 @@ namespace Oox2Odf
 				elm->add_text(sub_s_val);
 				OPEN_MATH_TAG(elm);
 				CLOSE_MATH_TAG;
+				annotation() += sub_s_val + L" ";
 			}
 		}	
 	}
@@ -1025,21 +1198,38 @@ namespace Oox2Odf
 			flag_nary = true;
 		}		
 		
-		std::pair<bool,bool>	flags;
+		std::vector<bool> flags;
 		flags = convert(oox_nary->m_oNaryPr.GetPointer());
-
-		
-		if (!flags.first)
+		std::wstring str1, str2;
+		if (flags[2])
 		{
+			str1 = L" from {";
+			str2 = L" to {";
+		}
+		else
+		{
+			str1 = L" csub {";
+			str2 = L" csup {";
+		}
+		
+		if (!flags[0])
+		{
+			
+			annotation() += str1;
+			
 			//mrow();
 			convert(oox_nary->m_oSub.GetPointer());
-			//endOfMrow();
+			//endOfMrow();			
+			annotation() += L"}";
+			
 		}
-		if (!flags.second)
-		{
+		if (!flags[1])
+		{			
+			annotation() += str2;			
 			//mrow();
 			convert(oox_nary->m_oSup.GetPointer());
-			//endOfMrow();
+			//endOfMrow();			
+			annotation() += L"} ";			
 		}
 
 
@@ -1052,21 +1242,22 @@ namespace Oox2Odf
 		{
 			CLOSE_MATH_TAG;
 		}
+		annotation() += L" {";
 		convert(oox_nary->m_oElement.GetPointer());
-
+		annotation() += L"} ";
 		endOfMrow();
 	}
 
-	std::pair<bool, bool> OoxConverter::convert(OOX::Logic::CNaryPr *oox_nary_pr)
+	std::vector<bool> OoxConverter::convert(OOX::Logic::CNaryPr *oox_nary_pr)
 	{
-		std::pair<bool, bool> result = { false, false};
+		std::vector<bool> result = { false, false, false};
 		if (!oox_nary_pr) return result;
 
 		convert(oox_nary_pr->m_oCtrlPr.GetPointer());
-		convert(oox_nary_pr->m_oChr.GetPointer());		
+		result[2] = convert(oox_nary_pr->m_oChr.GetPointer());	
 		convert(oox_nary_pr->m_oGrow.GetPointer());		
-		result.first = convert(oox_nary_pr->m_oSubHide.GetPointer());
-		result.second = convert(oox_nary_pr->m_oSupHide.GetPointer());
+		result[0] = convert(oox_nary_pr->m_oSubHide.GetPointer());
+		result[1] = convert(oox_nary_pr->m_oSupHide.GetPointer());
 
 		return result;		
 	}
@@ -1091,8 +1282,9 @@ namespace Oox2Odf
 		return result;
 	}
 
-	void OoxConverter::convert(OOX::Logic::CChr * oox_chr)
-	{		
+	bool OoxConverter::convert(OOX::Logic::CChr * oox_chr)
+	{	
+		bool flag = false;
 		//if (!oox_chr) return;
 		CREATE_MATH_TAG(L"mo");
 		typedef odf_writer::math_mo* T;
@@ -1103,19 +1295,28 @@ namespace Oox2Odf
 			tmp->stretchy_ = false;
 		}
 		
-		if (!oox_chr)		
-			elm->add_text(L"∫");		
+		if (!oox_chr)
+		{
+			annotation() += L"int ";
+			elm->add_text(L"∫");
+		}
 		else
 		{
-			/*std::wstring ws = L"&#";
-			std::wstringstream ss;			
-			ss << (oox_chr->m_val->GetValue()[0] & 0xFFFF);
-			ws += ss.str();
-			elm->add_text(ws);*/			
-			elm->add_text(oox_chr->m_val->GetValue());
+			std::wstring val = oox_chr->m_val->GetValue();
+			std::map<std::wstring, std::wstring>& map = odf_context()->math_context()->annotation_operators;
+			if (map.count(val))
+			{
+				flag = true;
+				annotation() += map[val];
+			}
+			else
+				//annotation_flag() = false;
+				annotation() += (val + L" ");
+			elm->add_text(val);
 		}
 		OPEN_MATH_TAG(elm);
 		CLOSE_MATH_TAG;
+		return flag;
 	}
 
 	void OoxConverter::convert(OOX::Logic::CPhant *oox_phant)
@@ -1176,9 +1377,11 @@ namespace Oox2Odf
 			{
 				CREATE_MATH_TAG(L"msqrt");
 				OPEN_MATH_TAG(elm);
+				annotation() += L"sqrt {";
 				mrow();
 					convert(oox_rad->m_oElement.GetPointer());
 				endOfMrow();
+				annotation() += L"}";
 				CLOSE_MATH_TAG;
 			}
 			else
@@ -1212,20 +1415,28 @@ namespace Oox2Odf
 	{
 		if (!oox_deg) return;
 		if (oox_deg->m_arrItems.size() == 0) return;
-
 		
-		CREATE_MATH_TAG(L"mroot")
-		OPEN_MATH_TAG(elm)		
+		CREATE_MATH_TAG(L"mroot");
+		OPEN_MATH_TAG(elm);
+
+		size_t iterator = annotation().size();
+
 		convert(oox_elm);
 
-		mrow();
+		size_t rootSize = annotation().size() - iterator;
+		std::wstring root(&annotation()[iterator], rootSize);
 
+		mrow();
 			for (size_t i = 0; i < oox_deg->m_arrItems.size(); ++i)
 				convert(oox_deg->m_arrItems[i]);
-
 		endOfMrow();
-
 		
+		size_t degreeSize = annotation().size() - rootSize - iterator;
+		std::wstring degree(&annotation()[iterator + rootSize], degreeSize);
+
+		annotation().erase(iterator);
+		annotation() += L"nroot {" + degree + L"} {" + root + L"}";
+
 		CLOSE_MATH_TAG
 	}
 
@@ -1235,16 +1446,34 @@ namespace Oox2Odf
 
 		convert(oox_s_pre->m_oSPrePr.GetPointer());
 		
-		CREATE_MATH_TAG(L"mmultiscripts")
-		OPEN_MATH_TAG(elm)
+		CREATE_MATH_TAG(L"mmultiscripts");
+		OPEN_MATH_TAG(elm);
+
+		annotation() += L"{";
+		mrow();
+			convert(oox_s_pre->m_oElement.GetPointer());
+		endOfMrow();
+
+		annotation() += L"} lsub {";
 
-		convert(oox_s_pre->m_oElement.GetPointer());
 		{
-			CREATE_MATH_TAG(L"mprescripts")
-			OPEN_MATH_TAG(elm)
-			CLOSE_MATH_TAG
-			convert(oox_s_pre->m_oSub.GetPointer());
-			convert(oox_s_pre->m_oSup.GetPointer());
+			CREATE_MATH_TAG(L"mprescripts");
+			OPEN_MATH_TAG(elm);
+			CLOSE_MATH_TAG;
+
+			
+
+			mrow();
+				convert(oox_s_pre->m_oSub.GetPointer());
+			endOfMrow();
+
+			annotation() += L"} lsup {";
+
+			mrow();
+				convert(oox_s_pre->m_oSup.GetPointer());
+			endOfMrow();
+
+			annotation() += L"}";
 		}
 
 		CLOSE_MATH_TAG
@@ -1265,10 +1494,14 @@ namespace Oox2Odf
 		CREATE_MATH_TAG(L"msup");
 		OPEN_MATH_TAG(elm);		
 		
+		annotation() += L"{";
+
 		mrow();
 		convert(oox_elm);	
 		endOfMrow();
 
+		annotation() += L"}^{";
+
 		mrow();
 		for (size_t i = 0; i < oox_sup->m_arrItems.size(); ++i)
 		{
@@ -1276,6 +1509,7 @@ namespace Oox2Odf
 		}
 		endOfMrow();
 
+		annotation() += L"}";
 		CLOSE_MATH_TAG
 	}
 
@@ -1283,17 +1517,23 @@ namespace Oox2Odf
 	{
 		if (!oox_sub) return;
 		
-		CREATE_MATH_TAG(L"msub")
-		OPEN_MATH_TAG(elm)	
+		CREATE_MATH_TAG(L"msub");
+		OPEN_MATH_TAG(elm);
 
+		annotation() += L"{";
+		
+		mrow();
 		convert(oox_elm);
+		endOfMrow();
+
+		annotation() += L"}_{";
 
 		for (size_t i = 0; i < oox_sub->m_arrItems.size(); ++i)
 		{
 			convert(oox_sub->m_arrItems[i]);
 
 		}
-
+		annotation() += L"}";
 		CLOSE_MATH_TAG
 	}
 
@@ -1339,13 +1579,28 @@ namespace Oox2Odf
 
 		convert(oox_ssub_sup->m_oSSubSupPr.GetPointer());
 		
-		CREATE_MATH_TAG(L"msubsup")
-		OPEN_MATH_TAG(elm)
+		CREATE_MATH_TAG(L"msubsup");
+		OPEN_MATH_TAG(elm);
 
-		convert(oox_ssub_sup->m_oElement.GetPointer());
-		convert(oox_ssub_sup->m_oSub.GetPointer());
-		convert(oox_ssub_sup->m_oSup.GetPointer());
+		annotation() += L"{";
 
+		mrow();
+			convert(oox_ssub_sup->m_oElement.GetPointer());
+		endOfMrow();
+
+		annotation() += L"}_{";
+
+		mrow();
+			convert(oox_ssub_sup->m_oSub.GetPointer());
+		endOfMrow();
+
+		annotation() += L"}^{";
+
+		mrow();
+			convert(oox_ssub_sup->m_oSup.GetPointer());
+		endOfMrow();
+
+		annotation() += L"}";
 		CLOSE_MATH_TAG
 	}
 
@@ -1384,6 +1639,9 @@ namespace Oox2Odf
 	{
 		if (!oox_elm) return;
 
+		if (oox_elm->m_arrItems.empty())
+			annotation() += L"\"\"";
+
 		resizeBrackets();
 
 		if (!brackets()[lvl_of_me()].empty())

ASCOfficePPTFile/PPTFormatLib/PPTXWriter/BulletsConverter.cpp

@@ -17,6 +17,8 @@ void BulletsConverter::FillPPr(PPTX::Logic::TextParagraphPr &oPPr, CParagraph &p
 void BulletsConverter::ConvertPFRun(PPTX::Logic::TextParagraphPr &oPPr, CTextPFRun *pPF)
 {
     const int oneTabSize = 457200;
+
+    const int tabLvl = oPPr.lvl.get_value_or(0);
     int leftMargin = 0;
     if (pPF->leftMargin.is_init())
     {
@@ -25,7 +27,7 @@ void BulletsConverter::ConvertPFRun(PPTX::Logic::TextParagraphPr &oPPr, CTextPFR
     }
     if (pPF->indent.is_init())
     {
-        if (pPF->hasBullet.get_value_or(false) && pPF->indent.get() != -leftMargin)
+        if (pPF->hasBullet.get_value_or(false) && tabLvl == -1)
         {
             oPPr.indent = pPF->indent.get() - leftMargin;
         }
@@ -35,7 +37,6 @@ void BulletsConverter::ConvertPFRun(PPTX::Logic::TextParagraphPr &oPPr, CTextPFR
         }
     } else if (pPF->hasBullet.get_value_or(false))
     {
-        const int tabLvl = oPPr.lvl.get_value_or(0);
         if (tabLvl != -1)
             oPPr.indent = oneTabSize*tabLvl - leftMargin;
         else
@@ -154,82 +155,81 @@ void BulletsConverter::FillBuChar(PPTX::Logic::Bullet &oBullet, WCHAR symbol, CT
 
 void BulletsConverter::ConvertAllBullets(PPTX::Logic::TextParagraphPr &oPPr, CTextPFRun *pPF)
 {
-    if (pPF->hasBullet.is_init())
+    if (pPF->hasBullet.is_init() == false)
+        return;
+
+    if (pPF->hasBullet.get() == false)
     {
-        if (pPF->hasBullet.get())
+        oPPr.buTypeface.m_Typeface.reset(new PPTX::Logic::BuNone);
+        return;
+    }
+    if (pPF->bulletColor.is_init())
+    {
+        FillBuClr(oPPr.buColor, pPF->bulletColor.get());
+    }
+    if (pPF->bulletSize.is_init())
+    {
+        PPTX::WrapperWritingElement* pBuSize(nullptr);
+        if (pPF->bulletSize.get() > 24 && pPF->bulletSize.get() < 401)
         {
-            if (pPF->bulletColor.is_init())
-            {
-                FillBuClr(oPPr.buColor, pPF->bulletColor.get());
-            }
-            if (pPF->bulletSize.is_init())
-            {
-                PPTX::WrapperWritingElement* pBuSize(nullptr);
-                if (pPF->bulletSize.get() > 24 && pPF->bulletSize.get() < 401)
-                {
-                    pBuSize = new PPTX::Logic::BuSzPct;
-                    static_cast<PPTX::Logic::BuSzPct*>(pBuSize)->val = pPF->bulletSize.get() * 1000 ;
-                }
-                if (pPF->bulletSize.get() < 0 && pPF->bulletSize.get() > -4001)
-                {
-                    pBuSize = new PPTX::Logic::BuSzPts;
-                    static_cast<PPTX::Logic::BuSzPts*>(pBuSize)->val = - (pPF->bulletSize.get());
-                }
-                if (pBuSize != nullptr)
-                    oPPr.buSize.m_Size = pBuSize;
-            }
-            if (pPF->bulletFontProperties.is_init())
-            {
-                auto pBuFont = new PPTX::Logic::TextFont;
-                pBuFont->m_name = L"a:buFont";
-                pBuFont->typeface = pPF->bulletFontProperties->Name;
-
-                if ( pPF->bulletFontProperties->PitchFamily > 0)
-                    pBuFont->pitchFamily = std::to_wstring(pPF->bulletFontProperties->PitchFamily);
-                if ( pPF->bulletFontProperties->Charset > 0)
-                    pBuFont->charset = std::to_wstring(pPF->bulletFontProperties->Charset);
-
-                oPPr.buTypeface.m_Typeface.reset(pBuFont);
-            }
-
-            // Bullets (numbering, else picture, else char, else default)
-            if (pPF->bulletBlip.is_init() && pPF->bulletBlip->tmpImagePath.size() && m_pRels != nullptr)
-            {
-                auto strRID = m_pRels->WriteImage(pPF->bulletBlip->tmpImagePath);
-                if (strRID.empty())
-                    FillBuChar(oPPr.ParagraphBullet, L'\x2022');    // error rId
-                else
-                {
-                    auto pBuBlip = new PPTX::Logic::BuBlip;
-                    pBuBlip->blip.embed = new OOX::RId(strRID);
-                    oPPr.ParagraphBullet.m_Bullet.reset(pBuBlip);
-                }
-            }
-            else if (pPF->bulletAutoNum.is_init())
-            {
-                auto pBuAutoNum = new PPTX::Logic::BuAutoNum;
-                oPPr.ParagraphBullet.m_Bullet.reset(pBuAutoNum);
-                if (pPF->bulletAutoNum->startAt.is_init() && pPF->bulletAutoNum->startAt.get() != 1)
-                    pBuAutoNum->startAt = pPF->bulletAutoNum->startAt.get();
-                if (pPF->bulletAutoNum->type.is_init())
-                    pBuAutoNum->type = pPF->bulletAutoNum->type.get();
-            }
-            else if (pPF->bulletChar.is_init())
-            {
-                FillBuChar(oPPr.ParagraphBullet, pPF->bulletChar.get(), pPF);
-            }
-            else
-            {
-                FillBuChar(oPPr.ParagraphBullet, L'\x2022');
-            }
+            pBuSize = new PPTX::Logic::BuSzPct;
+            static_cast<PPTX::Logic::BuSzPct*>(pBuSize)->val = pPF->bulletSize.get() * 1000 ;
         }
+        if (pPF->bulletSize.get() < 0 && pPF->bulletSize.get() > -4001)
+        {
+            pBuSize = new PPTX::Logic::BuSzPts;
+            static_cast<PPTX::Logic::BuSzPts*>(pBuSize)->val = - (pPF->bulletSize.get());
+        }
+        if (pBuSize != nullptr)
+            oPPr.buSize.m_Size = pBuSize;
+    }
+    if (pPF->bulletFontProperties.is_init())
+    {
+        auto pBuFont = new PPTX::Logic::TextFont;
+        pBuFont->m_name = L"a:buFont";
+        pBuFont->typeface = pPF->bulletFontProperties->Name;
+
+        if ( pPF->bulletFontProperties->PitchFamily > 0)
+            pBuFont->pitchFamily = std::to_wstring(pPF->bulletFontProperties->PitchFamily);
+        if ( pPF->bulletFontProperties->Charset > 0)
+            pBuFont->charset = std::to_wstring(pPF->bulletFontProperties->Charset);
+
+        oPPr.buTypeface.m_Typeface.reset(pBuFont);
+    }
+
+    // Bullets (numbering, else picture, else char, else default)
+    if (pPF->bulletBlip.is_init() && pPF->bulletBlip->tmpImagePath.size() && m_pRels != nullptr)
+    {
+        auto strRID = m_pRels->WriteImage(pPF->bulletBlip->tmpImagePath);
+        if (strRID.empty())
+            FillBuChar(oPPr.ParagraphBullet, L'\x2022');    // error rId
         else
         {
-            oPPr.buTypeface.m_Typeface.reset(new PPTX::Logic::BuNone);
+            auto pBuBlip = new PPTX::Logic::BuBlip;
+            pBuBlip->blip.embed = new OOX::RId(strRID);
+            oPPr.ParagraphBullet.m_Bullet.reset(pBuBlip);
         }
     }
+    else if (pPF->bulletAutoNum.is_init())
+    {
+        auto pBuAutoNum = new PPTX::Logic::BuAutoNum;
+        oPPr.ParagraphBullet.m_Bullet.reset(pBuAutoNum);
+        if (pPF->bulletAutoNum->startAt.is_init() && pPF->bulletAutoNum->startAt.get() != 1)
+            pBuAutoNum->startAt = pPF->bulletAutoNum->startAt.get();
+        if (pPF->bulletAutoNum->type.is_init())
+            pBuAutoNum->type = pPF->bulletAutoNum->type.get();
+    }
+    else if (pPF->bulletChar.is_init())
+    {
+        FillBuChar(oPPr.ParagraphBullet, pPF->bulletChar.get(), pPF);
+    }
+    else
+    {
+        FillBuChar(oPPr.ParagraphBullet, L'\x2022');
+    }
 }
 
+
 void BulletsConverter::FillBuClr(PPTX::Logic::BulletColor &oBuClr, CColor &oColor)
 {
     auto pBuClr = new PPTX::Logic::BuClr;

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp

@@ -598,6 +598,8 @@ void CPPTUserInfo::FromDocument()
         pSlide->m_dEndTime			= DurationSlide;
         pSlide->m_dDuration			= DurationSlide;
 
+        pSlide->m_lSlideID          = pPair->first;
+
         LoadSlide ( pPair->first, pSlide);
     }
 
@@ -1094,7 +1096,8 @@ void CPPTUserInfo::LoadGroupShapeContainer(CRecordGroupShapeContainer* pGroupCon
                 CElementPtr pElement = pShapeGroup->GetElement(m_current_level > 1, &m_oExMedia, pTheme, pLayout, pThemeWrapper, pSlideWrapper, pSlide);
 
                 CShapeElement* pShape = dynamic_cast<CShapeElement*>(pElement.get());
-                LoadBulletBlip(pShape);
+//                LoadBulletBlip(pShape);
+                LoadAutoNumBullet(pShape, pSlide ? pSlide->m_lSlideID : -1);
                 if (NULL != pElement)
                 {
                     pElement->m_pParentElements = pParentElements;
@@ -2611,25 +2614,95 @@ void CPPTUserInfo::LoadBulletBlip(CShapeElement *pShape)
         return;
     auto& arrPars = pShape->m_pShape->m_oText.m_arParagraphs;
 
+    // TODO need to find BlipEntity;
+     IRecord* pRecPPT9 = arrDocInfoCont[0]->getDocBinaryTagExtension(___PPT9);
+     auto* pProgBinaryTag = dynamic_cast<CRecordPP9DocBinaryTagExtension*>(pRecPPT9);
+     if (pProgBinaryTag == nullptr || !pProgBinaryTag->m_blipCollectionContainer.is_init())
+         return;
+
+     const auto& arrBlipEntity = pProgBinaryTag->m_blipCollectionContainer.get().m_rgBlipEntityAtom;
+ //    const auto& arrAutoNum      = pProgBinaryTag->m_outlineTextPropsContainer.get()
+     if(arrBlipEntity.empty())
+         return;
+
+     for (auto& par : arrPars)
+     {
+         if (par.m_oPFRun.bulletBlip.IsInit())
+         {
+             auto& buBlip = par.m_oPFRun.bulletBlip.get();
+             if (buBlip.bulletBlipRef >= 0 && (UINT)buBlip.bulletBlipRef < arrBlipEntity.size())
+             {
+                 buBlip.tmpImagePath = arrBlipEntity[buBlip.bulletBlipRef]->getTmpImgPath();
+             }
+         }
+
+     }
+}
+
+void CPPTUserInfo::LoadAutoNumBullet(CShapeElement *pShape, int slideID)
+{
+    if (pShape == nullptr || pShape->m_pShape == nullptr) return;
+    std::vector<CRecordDocInfoListContainer*> arrDocInfoCont;
+    m_oDocument.GetRecordsByType(&arrDocInfoCont, false, true);
+
+    if (arrDocInfoCont.empty())
+        return;
+    auto& arrPars = pShape->m_pShape->m_oText.m_arParagraphs;
+
     // TODO need to find BlipEntity;
     IRecord* pRecPPT9 = arrDocInfoCont[0]->getDocBinaryTagExtension(___PPT9);
     auto* pProgBinaryTag = dynamic_cast<CRecordPP9DocBinaryTagExtension*>(pRecPPT9);
-    if (pProgBinaryTag == nullptr || !pProgBinaryTag->m_blipCollectionContainer.is_init())
+    if (pProgBinaryTag == nullptr)
         return;
 
-    const auto& arrBlipEntity = pProgBinaryTag->m_blipCollectionContainer.get().m_rgBlipEntityAtom;
-    if(arrBlipEntity.empty())
+    const auto& optOutlineCont = pProgBinaryTag->m_outlineTextPropsContainer;
+    if (optOutlineCont.IsInit() == false)
         return;
 
+    const auto& vecOutline9Entry = optOutlineCont->m_rgOutlineTextProps9Entry;
+    std::vector<SStyleTextProp9>* arrStyleTextProp9 = nullptr;
+    for (const auto& entry : vecOutline9Entry)
+        if ((int)entry->m_slideIdRef == slideID)
+        {
+            arrStyleTextProp9 = &(entry->m_styleTextProp9Atom.m_rgStyleTextProp9);
+            break;
+        }
+    if (!arrStyleTextProp9)
+        return;
+
+
+    WORD pp9rt = 0;
     for (auto& par : arrPars)
     {
-        if (par.m_oPFRun.bulletBlip.IsInit())
+        if (par.m_arSpans.empty())
+            continue;
+
+        if (par.m_arSpans[0].m_oRun.pp9rt.is_init())
+            pp9rt = par.m_arSpans[0].m_oRun.pp9rt.get();
+
+        if (pp9rt >= arrStyleTextProp9->size())
+            continue;
+
+        auto& prop9 = (*arrStyleTextProp9)[pp9rt];
+
+        if (prop9.m_pf9.m_optBulletAutoNumberScheme.is_init() &&
+                prop9.m_pf9.m_optfBulletHasAutoNumber.get_value_or(false))
         {
-            auto& buBlip = par.m_oPFRun.bulletBlip.get();
-            if (buBlip.bulletBlipRef >= 0 && (UINT)buBlip.bulletBlipRef < arrBlipEntity.size())
-            {
-                buBlip.tmpImagePath = arrBlipEntity[buBlip.bulletBlipRef]->getTmpImgPath();
-            }
+            auto* pBuAutoNum = new CBulletAutoNum;
+            pBuAutoNum->type = prop9.m_pf9.m_optBulletAutoNumberScheme->SchemeToStr();
+            pBuAutoNum->startAt = prop9.m_pf9.m_optBulletAutoNumberScheme->m_nStartNum;
+
+            par.m_oPFRun.bulletAutoNum.reset(pBuAutoNum);
+        }
+        if (prop9.m_pf9.m_optBulletBlipRef.is_init())
+        {
+            auto* pBuBlip = new CBulletBlip;
+            if (prop9.m_pf9.m_optBulletBlipRef.IsInit())
+                pBuBlip->bulletBlipRef = prop9.m_pf9.m_optBulletBlipRef.get();
+            else
+                pBuBlip->bulletBlipRef = -1;
+
+            par.m_oPFRun.bulletBlip.reset(pBuBlip);
         }
     }
 }

ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.h

@@ -159,6 +159,7 @@ public:
 
     void LoadAutoNumbering(CRecordGroupShapeContainer* pGroupContainer, PPT_FORMAT::CTheme* pTheme);
     void LoadBulletBlip(CShapeElement* pShape);
+    void LoadAutoNumBullet(CShapeElement* pShape, int slideID);
 	void CreateDefaultStyle(PPT_FORMAT::CTextStyles& pStyle, PPT_FORMAT::CTheme* pTheme);
 	void CorrectColorScheme(std::vector<CColor>& oScheme)
 	{

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -2097,9 +2097,9 @@ namespace NSBinPptxRW
 	}
 
 	LONG CBinaryFileReader::GetPos()
-	{
+    {
 		return m_lPos;
-	}
+    }
 
 	LONG CBinaryFileReader::GetSize()
 	{

ASCOfficePPTXFile/PPTXFormat/Logic/Pic.cpp

@@ -226,6 +226,12 @@ namespace PPTX
 
 						unsigned int nXlsbWriterEndPos = oXlsbWriter.GetPositionAbsolute();
 
+						if (office_checker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSB)
+						{
+							dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->PrepareSi();
+							dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->PrepareTableFormula();
+                            dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->ReadSheetData();
+						}
 						xlsxBinaryWriter.WriteMainTableStart(*oDrawingConverter.m_pBinaryWriter);
 						
 						if (nXlsbWriterEndPos  > nXlsbWriterStartPos)

ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp

@@ -472,13 +472,19 @@ namespace PPTX
 						pXlsxEmbedded->Read(oox_unpacked);
 						pXlsxEmbedded->PrepareWorkbook();
 
-						unsigned int nXlsbWriterEndPos = oXlsbWriter.GetPositionAbsolute();
+						unsigned int nXlsbWriterEndPos = oXlsbWriter.GetPositionAbsolute() ;
 
+						if (office_checker.nFileType == AVS_OFFICESTUDIO_FILE_SPREADSHEET_XLSB)
+						{
+							dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->PrepareSi();
+							dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->PrepareTableFormula();
+                            dynamic_cast<OOX::Spreadsheet::CXlsb*>(pXlsxEmbedded)->ReadSheetData();
+						}
 						//startheader for test
 						//oDrawingConverter.m_pBinaryWriter->WriteStringUtf8(xlsxBinaryWriter.WriteFileHeader(0, BinXlsxRW::g_nFormatVersionNoBase64));
 						xlsxBinaryWriter.WriteMainTableStart(*oDrawingConverter.m_pBinaryWriter);
 
-						if (nXlsbWriterEndPos > nXlsbWriterStartPos)
+						if (nXlsbWriterEndPos  > nXlsbWriterStartPos)
 						{
 							xlsxBinaryWriter.WriteBinaryTable(oXlsbWriter.GetBuffer() + nXlsbWriterStartPos, nXlsbWriterEndPos - nXlsbWriterStartPos);
 						}

ASCOfficeXlsFile2/source/VbaFormat/Records.cpp

@@ -0,0 +1,778 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "Records.h"
+#include <boost/make_shared.hpp>
+#include <map>
+#include <locale>
+#include "../../../UnicodeConverter/UnicodeConverter.h"
+
+namespace VBA
+{
+	const std::string int2str(const int val, const int radix)
+	{
+		static char num_buf[10] = {};
+#if defined(_WIN32) || defined(_WIN64)
+		_itoa_s(val, num_buf, 9, radix);
+#else
+		sprintf(num_buf, "%d", val);
+#endif
+		return num_buf;
+	}
+	const std::wstring int2wstr(const int val, const int radix)
+	{
+#if defined(_WIN32) || defined(_WIN64)
+		static wchar_t num_buf[20] = {};
+		_itow_s(val, num_buf, 19, radix);
+		return std::wstring(num_buf);
+#else
+		static char num_buf[20] = {};
+		sprintf(num_buf, "%d", val);
+		std::string a_str(num_buf);
+		return std::wstring(a_str.begin(), a_str.end());
+#endif
+	}
+	const std::wstring int2hex_wstr(const int val, const size_t size_of)
+	{
+		if (size_of > 4) return L"";
+
+#if defined(_WIN32) || defined(_WIN64)
+		static wchar_t num_buf[10] = {};
+		std::wstring wstr = int2wstr(size_of << 1, 10);
+		swprintf_s(num_buf, 9, (L"%0" + wstr + L"X").c_str(), val);
+		return std::wstring(num_buf);
+#else
+		char num_buf[10] = {};
+		std::string str = int2str(size_of << 1, 10);
+		snprintf(num_buf, 9, ("%0" + str + "X").c_str(), val);
+		std::string res(num_buf);
+		return std::wstring(res.begin(), res.end());
+#endif
+	}
+	const std::wstring  guid2bstr(const _GUID_ guid)
+	{
+		std::wstring  guid_ret = L"{";
+
+		guid_ret += int2hex_wstr(guid.Data1, 4) + L"-" +
+			int2hex_wstr(guid.Data2, 2) + L"-" +
+			int2hex_wstr(guid.Data3, 2) + L"-" +
+			int2hex_wstr(guid.Data4[0], 1) + int2hex_wstr(guid.Data4[1], 1) + L"-" +
+			int2hex_wstr(guid.Data4[2], 1) + int2hex_wstr(guid.Data4[3], 1) +
+			int2hex_wstr(guid.Data4[4], 1) + int2hex_wstr(guid.Data4[5], 1) +
+			int2hex_wstr(guid.Data4[6], 1) + int2hex_wstr(guid.Data4[7], 1);
+		return guid_ret + L"}";
+	}
+	const std::wstring convert_string_icu(const char* buffer, const unsigned int& size, _UINT32 nCodePage)
+	{
+		if (!buffer || size < 1) return L"";
+
+		std::string sCodePage;
+		std::map<int, std::string>::const_iterator pFind = NSUnicodeConverter::mapEncodingsICU.find(nCodePage);
+		if (pFind != NSUnicodeConverter::mapEncodingsICU.end())
+		{
+			sCodePage = pFind->second;
+		}
+		if (!sCodePage.empty())
+		{
+			NSUnicodeConverter::CUnicodeConverter oConverter;
+			return oConverter.toUnicode(buffer, size, sCodePage.c_str(), true);
+		}
+		else if (nCodePage != 0)
+		{
+			NSUnicodeConverter::CUnicodeConverter oConverter;
+			return oConverter.toUnicode(buffer, size, nCodePage, true);
+		}
+		else
+		{//текущая локаль
+
+			std::locale loc("");
+			std::ctype<wchar_t> const &facet = std::use_facet<std::ctype<wchar_t> >(loc);
+
+			std::wstring result;
+			result.resize(size);
+
+			facet.widen(buffer, buffer + size, &result[0]);
+			return result;
+		}
+	}
+
+//------------------------------------------------------------------------------------------
+	AnsiString::AnsiString(CVbaFileStreamPtr stream) { load(stream); }
+	BaseRecordPtr AnsiString::clone()
+	{
+		return BaseRecordPtr(new AnsiString(*this));
+	}
+	void AnsiString::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf;
+		
+		if (sizeOf > 0)
+		{
+			char *buf = new char[sizeOf];
+			if (buf)
+			{
+				stream->read(buf, sizeOf);
+				value = convert_string_icu(buf, sizeOf, stream->CodePage);
+			}
+		}
+	}
+//------------------------------------------------------------------------------------------
+	Utf16String::Utf16String(CVbaFileStreamPtr stream) { load(stream); }
+	BaseRecordPtr Utf16String::clone()
+	{
+		return BaseRecordPtr(new Utf16String(*this));
+	}
+	void Utf16String::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf;
+
+		if (sizeOf > 0)
+		{
+			UTF16 *buf = new UTF16[sizeOf / 2];
+			if (buf)
+			{
+				stream->read(buf, sizeOf);
+				if (sizeof(wchar_t) == 2)
+				{
+					value = std::wstring((wchar_t*)buf, sizeOf / 2);
+				}
+				else
+				{
+					value = convertUtf16ToWString(buf, sizeOf / 2);
+				}				
+			}
+		}
+	}
+//------------------------------------------------------------------------------------------
+	BaseRecordPtr MODULENAME::clone()
+	{
+		return BaseRecordPtr(new MODULENAME(*this));
+	}
+	void MODULENAME::load(CVbaFileStreamPtr stream)
+	{
+		ModuleName.load(stream);
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULENAMEUNICODE::clone()
+	{
+		return BaseRecordPtr(new MODULENAMEUNICODE(*this));
+	}
+	void MODULENAMEUNICODE::load(CVbaFileStreamPtr stream)
+	{
+		ModuleNameUnicode.load(stream);
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULESTREAMNAME::clone()
+	{
+		return BaseRecordPtr(new MODULESTREAMNAME(*this));
+	}
+	void MODULESTREAMNAME::load(CVbaFileStreamPtr stream)
+	{
+		_UINT16 Reserved;
+		
+		StreamName.load(stream);
+		*stream >> Reserved;
+		StreamNameUnicode.load(stream);
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULEDOCSTRING::clone()
+	{
+		return BaseRecordPtr(new MODULEDOCSTRING(*this));
+	}
+	void MODULEDOCSTRING::load(CVbaFileStreamPtr stream)
+	{
+		_UINT16 Reserved; 
+
+		DocString.load(stream);			
+		*stream >> Reserved;
+		DocStringUnicode.load(stream);
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULEOFFSET::clone()
+	{
+		return BaseRecordPtr(new MODULEOFFSET(*this));
+	}
+	void MODULEOFFSET::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 SizeOf;
+		*stream >> SizeOf;
+		*stream >> TextOffset;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULEHELPCONTEXT::clone()
+	{
+		return BaseRecordPtr(new MODULEHELPCONTEXT(*this));
+	}
+	void MODULEHELPCONTEXT::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 SizeOf;
+		*stream >> SizeOf;
+		*stream >> HelpContext;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULECOOKIE::clone()
+	{
+		return BaseRecordPtr(new MODULECOOKIE(*this));
+	}
+	void MODULECOOKIE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 SizeOf;
+		_UINT16 Cookie;
+		*stream >> SizeOf >> Cookie;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULETYPE::clone()
+	{
+		return BaseRecordPtr(new MODULETYPE(*this));
+	}
+	void MODULETYPE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 Reserved;
+		*stream >> Reserved;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULEREADONLY::clone()
+	{
+		return BaseRecordPtr(new MODULEREADONLY(*this));
+	}
+	void MODULEREADONLY::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 Reserved;
+		*stream >> Reserved;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULEPRIVATE::clone()
+	{
+		return BaseRecordPtr(new MODULEPRIVATE(*this));
+	}
+	void MODULEPRIVATE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 Reserved;
+		*stream >> Reserved;
+	}
+//--------------------------------------------------------------------------------
+	BaseRecordPtr MODULE::clone()
+	{
+		return BaseRecordPtr(new MODULE(*this));
+	}
+
+	void MODULE::load(CVbaFileStreamPtr stream)
+	{
+		bool bEof = false;
+		while (!bEof && stream->checkFitRead(6))
+		{
+			_UINT16 Id;
+			*stream >> Id;
+
+			switch (Id)
+			{
+			case rt_MODULENAME:			NameRecord = boost::make_shared<MODULENAME>(stream); break;
+			case rt_MODULENAMEUNICODE:	NameUnicodeRecord = boost::make_shared<MODULENAMEUNICODE>(stream); break;
+			case rt_MODULESTREAMNAME:	StreamNameRecord = boost::make_shared<MODULESTREAMNAME>(stream); break;
+			case rt_MODULEDOCSTRING:	DocStringRecord = boost::make_shared<MODULEDOCSTRING>(stream); break;
+			case rt_MODULEOFFSET:		OffsetRecord = boost::make_shared<MODULEOFFSET>(stream); break;
+			case rt_MODULEHELPCONTEXT:	HelpContextRecord = boost::make_shared<MODULEHELPCONTEXT>(stream); break;
+			case rt_MODULECOOKIE: { MODULECOOKIE Cookie(stream); } break;
+			case rt_MODULEREADONLY: { bReadOnly = true;  MODULEREADONLY ReadOnly(stream); } break;
+			case rt_MODULEPRIVATE: { bPrivate = true; MODULEPRIVATE Private(stream); } break;
+			case rt_MODULETYPE_Procedural:
+				bProceduralModule = true;
+			case rt_MODULETYPE_Class: { MODULETYPE type(stream); } break;
+			case rt_Terminator:
+			{
+				bEof = true;
+				_UINT32 Reserved;
+				*stream >> Reserved;
+			}break;
+			default:
+				_UINT32 SizeOf;
+				*stream >> SizeOf;
+				stream->skipBytes(SizeOf);
+				break;
+			}
+		}
+	}
+//-------------------------------------------------------------------------------------------------------
+	PROJECTSYSKIND::PROJECTSYSKIND(CVbaFileStreamPtr stream) { load(stream); }
+	BaseRecordPtr PROJECTSYSKIND::clone()
+	{
+		return BaseRecordPtr(new PROJECTSYSKIND(*this));
+	}
+	void PROJECTSYSKIND::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> SysKind;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTCOMPATVERSION::PROJECTCOMPATVERSION(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTCOMPATVERSION::~PROJECTCOMPATVERSION() {}
+	BaseRecordPtr PROJECTCOMPATVERSION::clone()
+	{
+		return BaseRecordPtr(new PROJECTCOMPATVERSION(*this));
+	}
+	void PROJECTCOMPATVERSION::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> CompatVersion;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTLCID::PROJECTLCID(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTLCID::~PROJECTLCID() {}
+	BaseRecordPtr PROJECTLCID::clone()
+	{
+		return BaseRecordPtr(new PROJECTLCID(*this));
+	}
+	void PROJECTLCID::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> Lcid;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTLCIDINVOKE::PROJECTLCIDINVOKE(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTLCIDINVOKE::~PROJECTLCIDINVOKE() {}
+	BaseRecordPtr PROJECTLCIDINVOKE::clone()
+	{
+		return BaseRecordPtr(new PROJECTLCIDINVOKE(*this));
+	}
+	void PROJECTLCIDINVOKE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> LcidInvoke;
+	}
+//-------------------------------------------------------------------------------	
+	PROJECTCODEPAGE::PROJECTCODEPAGE(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTCODEPAGE::~PROJECTCODEPAGE() {}
+	BaseRecordPtr PROJECTCODEPAGE::clone()
+	{
+		return BaseRecordPtr(new PROJECTCODEPAGE(*this));
+	}
+	void PROJECTCODEPAGE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> CodePage;
+
+		stream->CodePage = CodePage;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTNAME::PROJECTNAME(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTNAME::~PROJECTNAME() {}
+	BaseRecordPtr PROJECTNAME::clone()
+	{
+		return BaseRecordPtr(new PROJECTNAME(*this));
+	}
+	void PROJECTNAME::load(CVbaFileStreamPtr stream)
+	{
+		ProjectName.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	PROJECTDOCSTRING::PROJECTDOCSTRING(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTDOCSTRING::~PROJECTDOCSTRING() {}
+	BaseRecordPtr PROJECTDOCSTRING::clone()
+	{
+		return BaseRecordPtr(new PROJECTDOCSTRING(*this));
+	}
+	void PROJECTDOCSTRING::load(CVbaFileStreamPtr stream)
+	{
+		unsigned short Reserved;
+		aDocString.load(stream);
+		*stream >> Reserved;
+		uDocString.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	PROJECTHELPFILEPATH::PROJECTHELPFILEPATH(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTHELPFILEPATH::~PROJECTHELPFILEPATH() {}
+	BaseRecordPtr PROJECTHELPFILEPATH::clone()
+	{
+		return BaseRecordPtr(new PROJECTHELPFILEPATH(*this));
+	}
+	void PROJECTHELPFILEPATH::load(CVbaFileStreamPtr stream)
+	{
+		unsigned short Reserved;
+		HelpFile1.load(stream);
+		*stream >> Reserved;
+		HelpFile2.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	PROJECTHELPCONTEXT::PROJECTHELPCONTEXT(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTHELPCONTEXT::~PROJECTHELPCONTEXT() {}
+	BaseRecordPtr PROJECTHELPCONTEXT::clone()
+	{
+		return BaseRecordPtr(new PROJECTHELPCONTEXT(*this));
+	}
+	void PROJECTHELPCONTEXT::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> HelpContext;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTLIBFLAGS::PROJECTLIBFLAGS(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTLIBFLAGS::~PROJECTLIBFLAGS() {}
+	BaseRecordPtr PROJECTLIBFLAGS::clone()
+	{
+		return BaseRecordPtr(new PROJECTLIBFLAGS(*this));
+	}
+	void PROJECTLIBFLAGS::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> ProjectLibFlags;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTVERSION::PROJECTVERSION(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTVERSION::~PROJECTVERSION() {}
+	BaseRecordPtr PROJECTVERSION::clone()
+	{
+		return BaseRecordPtr(new PROJECTVERSION(*this));
+	}
+	void PROJECTVERSION::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 sizeOf;
+		*stream >> sizeOf >> VersionMajor >> VersionMinor;
+	}
+//-------------------------------------------------------------------------------
+	//Constants = Constant *(" : " Constant) 
+	//Constant = ConstantName " = " ConstantValue 
+	//ConstantName = VbaIdentifier 
+	//ConstantValue = ["-"] 1 * 5DIGIT
+
+	PROJECTCONSTANTS::PROJECTCONSTANTS(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTCONSTANTS::~PROJECTCONSTANTS() {}
+	BaseRecordPtr PROJECTCONSTANTS::clone()
+	{
+		return BaseRecordPtr(new PROJECTCONSTANTS(*this));
+	}
+	void PROJECTCONSTANTS::load(CVbaFileStreamPtr stream)
+	{
+		unsigned short Reserved;
+		
+		aConstants.load(stream);
+		*stream >> Reserved;
+		uConstants.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	REFERENCENAME::REFERENCENAME(CVbaFileStreamPtr stream) { load(stream); }
+	REFERENCENAME::~REFERENCENAME() {}
+	BaseRecordPtr REFERENCENAME::clone()
+	{
+		return BaseRecordPtr(new REFERENCENAME(*this));
+	}
+	void REFERENCENAME::load(CVbaFileStreamPtr stream)
+	{
+		unsigned short Reserved;
+		aName.load(stream);
+		*stream >> Reserved;
+		uName.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	REFERENCEORIGINAL::REFERENCEORIGINAL(CVbaFileStreamPtr stream) { load(stream); }
+	REFERENCEORIGINAL::~REFERENCEORIGINAL() {}
+	BaseRecordPtr REFERENCEORIGINAL::clone()
+	{
+		return BaseRecordPtr(new REFERENCEORIGINAL(*this));
+	}
+	void REFERENCEORIGINAL::load(CVbaFileStreamPtr stream)
+	{
+		LibidOriginal.load(stream);
+	}
+//-------------------------------------------------------------------------------
+	REFERENCEREGISTERED::REFERENCEREGISTERED(CVbaFileStreamPtr stream) { load(stream); }
+	REFERENCEREGISTERED::~REFERENCEREGISTERED() {}
+	BaseRecordPtr REFERENCEREGISTERED::clone()
+	{
+		return BaseRecordPtr(new REFERENCEREGISTERED(*this));
+	}
+	void REFERENCEREGISTERED::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 Reserved1, Size;
+		_UINT16 Reserved2;
+		*stream >> Size;
+		Libid.load(stream);
+		*stream >> Reserved1 >> Reserved2;
+	}
+//-------------------------------------------------------------------------------
+	REFERENCEPROJECT::REFERENCEPROJECT(CVbaFileStreamPtr stream) { load(stream); }
+	REFERENCEPROJECT::~REFERENCEPROJECT() {}
+	BaseRecordPtr REFERENCEPROJECT::clone()
+	{
+		return BaseRecordPtr(new REFERENCEPROJECT(*this));
+	}
+	void REFERENCEPROJECT::load(CVbaFileStreamPtr stream)
+	{
+		LibidAbsolute.load(stream); 
+		LibidRelative.load(stream);
+
+		*stream >> MajorVersion >> MinorVersion;
+	}
+//-------------------------------------------------------------------------------
+	REFERENCECONTROL::REFERENCECONTROL(CVbaFileStreamPtr stream) { load(stream); }
+	REFERENCECONTROL::~REFERENCECONTROL() {}
+	BaseRecordPtr REFERENCECONTROL::clone()
+	{
+		return BaseRecordPtr(new REFERENCECONTROL(*this));
+	}
+	void REFERENCECONTROL::load(CVbaFileStreamPtr stream)
+	{
+		_UINT32 Reserved1, Reserved4, SizeTwiddled, SizeExtended, Cookie;
+		_UINT16 Reserved2, Reserved3, Reserved5, Id;
+
+		*stream >> SizeTwiddled;
+		LibidTwiddled.load(stream);
+		*stream >> Reserved1 >> Reserved2;
+
+		*stream >> Id;
+		if (Id == 0x0016)
+		{
+			NameRecordExtended = boost::make_shared<REFERENCENAME>(stream);
+			*stream >> Reserved3;
+		}
+		else
+		{
+			Reserved3 = Id; // = 0x0030
+		}
+
+		*stream >> SizeExtended;
+		LibidExtended.load(stream);
+		*stream >> Reserved4 >> Reserved5 >> OriginalTypeLib >> Cookie;
+	}
+//-------------------------------------------------------------------------------
+	PROJECTCOOKIE::PROJECTCOOKIE(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTCOOKIE::~PROJECTCOOKIE() {}
+	BaseRecordPtr PROJECTCOOKIE::clone()
+	{
+		return BaseRecordPtr(new PROJECTCOOKIE(*this));
+	}
+	void PROJECTCOOKIE::load(CVbaFileStreamPtr stream)
+	{
+		_UINT16 Id;
+		_UINT32 sizeOf;
+		*stream >> Id >> sizeOf >> Cookie;
+	}
+//-----------------------------------------------------------------------------------
+	PROJECTMODULES::PROJECTMODULES(CVbaFileStreamPtr stream) { load(stream); }
+	PROJECTMODULES::~PROJECTMODULES() {}
+	BaseRecordPtr PROJECTMODULES::clone()
+	{
+		return BaseRecordPtr(new PROJECTMODULES(*this));
+	}
+	void PROJECTMODULES::load(CVbaFileStreamPtr stream)
+	{
+		_UINT16 Id, nCount;
+		_UINT32 sizeOf;
+		
+		*stream >> Id >> sizeOf >> nCount;
+		
+		ProjectCookieRecord = PROJECTCOOKIEPtr(new PROJECTCOOKIE(stream));
+
+		for (_UINT32 i = 0; i < nCount; i++)
+		{
+			modules.push_back(boost::make_shared<MODULE>(stream));
+		}
+	}
+//----------------------------------------------------------------------------------
+	BaseRecordPtr PROJECTINFORMATION::clone()
+	{
+		return BaseRecordPtr(new PROJECTINFORMATION(*this));
+	}
+
+	void PROJECTINFORMATION::load(CVbaFileStreamPtr stream)
+	{
+		while (stream->checkFitRead(6))
+		{
+			_UINT16 Id;
+			*stream >> Id;
+
+			if (Id == 0x0016)
+			{//next union
+				stream->RollBack(2);
+				break;
+			}
+
+			switch (Id)
+			{
+			case rt_PROJECTSYSKIND:
+			{
+				SysKindRecord = boost::make_shared<PROJECTSYSKIND>(stream);
+
+			}break;
+			case rt_PROJECTCODEPAGE:
+			{
+				CodePageRecord = boost::make_shared<PROJECTCODEPAGE>(stream);
+			}break;
+			case rt_PROJECTCOMPATVERSION:
+			{
+				CompatVersionRecord = boost::make_shared<PROJECTCOMPATVERSION>(stream);
+			}break;
+			case rt_PROJECTLCID:
+			{
+				LcidRecord = boost::make_shared<PROJECTLCID>(stream);
+			}break;
+			case rt_PROJECTLCIDINVOKE:
+			{
+				LcidInvokeRecord = boost::make_shared<PROJECTLCIDINVOKE>(stream);
+			}break;
+			case rt_PROJECTNAME:
+			{
+				NameRecord = boost::make_shared<PROJECTNAME>(stream);
+			}break;
+			case rt_PROJECTDOCSTRING:
+			{
+				DocStringRecord = boost::make_shared<PROJECTDOCSTRING>(stream);
+			}break;
+			case rt_PROJECTHELPFILEPATH:
+			{
+				HelpFilePathRecord = boost::make_shared<PROJECTHELPFILEPATH>(stream);
+			}break;
+			case rt_PROJECTHELPCONTEXT:
+			{
+				HelpContextRecord = boost::make_shared<PROJECTHELPCONTEXT>(stream);
+			}break;
+			case rt_PROJECTLIBFLAGS:
+			{
+				LibFlagsRecord = boost::make_shared<PROJECTLIBFLAGS>(stream);
+			}break;
+			case rt_PROJECTVERSION:
+			{
+				VersionRecord = boost::make_shared<PROJECTVERSION>(stream);
+			}break;
+			case rt_PROJECTCONSTANTS:
+			{
+				ConstantsRecord = boost::make_shared<PROJECTCONSTANTS>(stream);
+			}break;
+			default://unknown .... skip					
+			{
+				_UINT32 SizeOf;
+				*stream >> SizeOf;
+				stream->skipBytes(SizeOf);
+			}break;
+			}
+		}
+
+	}
+//---------------------------------------------------------------------------------------		
+
+	BaseRecordPtr PROJECTREFERENCES::clone()
+	{
+		return BaseRecordPtr(new PROJECTREFERENCES(*this));
+	}
+
+	void PROJECTREFERENCES::load(CVbaFileStreamPtr stream)
+	{
+		while (stream->checkFitRead(6))
+		{
+			_UINT16 Id;
+			*stream >> Id;
+
+			if (Id == rt_REFERENCENAME)
+			{
+				stream->RollBack(2);
+				ReferenceArray.push_back(boost::make_shared<REFERENCE>(stream));
+			}
+			else if (Id == rt_PROJECTMODULES)
+			{//next union
+				stream->RollBack(2);
+				break;
+			}
+			else
+			{
+				_UINT32 SizeOf;
+				*stream >> SizeOf;
+				stream->skipBytes(SizeOf);
+			}
+		}
+	}
+//---------------------------------------------------------------------------------------		
+	BaseRecordPtr REFERENCE::clone()
+	{
+		return BaseRecordPtr(new REFERENCE(*this));
+	}
+
+	void REFERENCE::load(CVbaFileStreamPtr stream)
+	{
+		while (stream->checkFitRead(6))
+		{
+			_UINT16 Id;
+			*stream >> Id;
+
+			if (Id == rt_PROJECTMODULES ||
+				(NameRecord && Id == rt_REFERENCENAME))
+			{//next union
+				stream->RollBack(2);
+				break;
+			}
+
+			switch (Id)
+			{
+			case rt_REFERENCENAME:			NameRecord = boost::make_shared<REFERENCENAME>(stream); break;
+			case rt_REFERENCEORIGINAL:		ReferenceRecord = boost::make_shared<REFERENCEORIGINAL>(stream); break;
+			case rt_REFERENCECONTROL:		ReferenceRecord = boost::make_shared<REFERENCECONTROL>(stream); break;
+			case rt_REFERENCEREGISTERED:	ReferenceRecord = boost::make_shared<REFERENCEREGISTERED>(stream); break;
+			case rt_REFERENCEPROJECT:		ReferenceRecord = boost::make_shared<REFERENCEPROJECT>(stream); break;
+			default://unknown .... skip					
+			{
+				_UINT32 SizeOf;
+				*stream >> SizeOf;
+				stream->skipBytes(SizeOf);
+			}break;
+			}
+		}
+	}
+//---------------------------------------------------------------------------------------		
+
+//-------------------------------------------------------------------------------
+	//PROJECTMODULES::PROJECTMODULES() {}
+	//PROJECTMODULES::~PROJECTMODULES() {}
+	//BaseObjectPtr PROJECTMODULES::clone()
+	//{
+	//	return BaseObjectPtr(new PROJECTMODULES(*this));
+	//}
+	//const bool PROJECTMODULES::loadContent(BinProcessor& proc)
+	//{
+	//	BiffAttributeSimple<unsigned short> nCount;
+
+	//	proc.nCount;
+
+	//	if (proc.optional<PROJECTCOOKIE>())
+	//	{
+	//		ProjectCookieRecord = boost::make_shared<>(stream);
+	//		elements_.pop_back();
+	//	}
+
+	//	for (unsigned short i = 0; i < nCount; i++)
+	//	{
+	//		MODULE *m = new MODULE();
+	//		m->loadContent(proc);
+	//		modules.push_back(BaseObjectPtr(m));
+	//	}
+	//}
+} // namespace VBA
+

ASCOfficeXlsFile2/source/VbaFormat/Records.h

@@ -0,0 +1,611 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "VbaRecordType.h"
+#include "VbaBinary.h"
+
+
+namespace VBA
+{
+	const std::wstring convert_string_icu(const char* buffer, const unsigned int& size, _UINT32 nCodePage);
+	const std::wstring  guid2bstr(const _GUID_ guid);
+
+	class BaseRecord;
+	typedef boost::shared_ptr<BaseRecord> BaseRecordPtr;
+	
+	class BaseRecord
+	{
+	public:
+		virtual BaseRecordPtr clone() = 0;
+		virtual void load(CVbaFileStreamPtr stream) = 0;
+		virtual RecordType get_type() = 0;
+		virtual const std::string & getClassName() const = 0;
+	};
+
+#define BASE_STRUCTURE_DEFINE_CLASS_NAME(class_name)\
+	private: \
+	static const RecordType type = rt_##class_name; \
+	public: \
+        const std::string & getClassName() const { static std::string  str(#class_name); return str;}\
+	virtual RecordType get_type() { return type; }
+
+//--------------------------------------------------------------------------------------------------
+	class AnsiString : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(AnsiString)
+	public:
+		AnsiString() {}
+		AnsiString(CVbaFileStreamPtr stream);
+		~AnsiString() {}
+
+		BaseRecordPtr clone();
+		virtual void load(CVbaFileStreamPtr stream);
+
+		std::wstring value;
+	};
+	typedef boost::shared_ptr<AnsiString> AnsiStringPtr;
+	
+//--------------------------------------------------------------------------------------------------
+	class Utf16String : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(Utf16String)
+	public:
+		Utf16String() {}
+		Utf16String(CVbaFileStreamPtr stream);
+		~Utf16String() {}
+
+		BaseRecordPtr clone();
+		virtual void load(CVbaFileStreamPtr stream);
+
+		std::wstring value;
+	};
+	typedef boost::shared_ptr<Utf16String> Utf16StringPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTSYSKIND : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULESTREAMNAME)
+	public:
+		PROJECTSYSKIND(CVbaFileStreamPtr stream);
+		~PROJECTSYSKIND() {}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 SysKind;
+	};
+	typedef boost::shared_ptr<PROJECTSYSKIND> PROJECTSYSKINDPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTCOMPATVERSION : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTCOMPATVERSION)
+	public:
+		PROJECTCOMPATVERSION(CVbaFileStreamPtr stream);
+		~PROJECTCOMPATVERSION();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 CompatVersion;
+	};
+	typedef boost::shared_ptr<PROJECTCOMPATVERSION> PROJECTCOMPATVERSIONPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTLCID : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTLCID)
+	public:
+		PROJECTLCID(CVbaFileStreamPtr stream);
+		~PROJECTLCID();
+		BaseRecordPtr clone();
+
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 Lcid;
+	};
+	typedef boost::shared_ptr<PROJECTLCID> PROJECTLCIDPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTLCIDINVOKE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTLCIDINVOKE)
+	public:
+		PROJECTLCIDINVOKE(CVbaFileStreamPtr stream);
+		~PROJECTLCIDINVOKE();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 LcidInvoke;
+	};
+	typedef boost::shared_ptr<PROJECTLCIDINVOKE> PROJECTLCIDINVOKEPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTCODEPAGE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTCODEPAGE)
+	public:
+		PROJECTCODEPAGE(CVbaFileStreamPtr stream);
+		~PROJECTCODEPAGE();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		unsigned short CodePage;
+	};
+	typedef boost::shared_ptr<PROJECTCODEPAGE> PROJECTCODEPAGEPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTNAME : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTNAME)
+	public:
+		PROJECTNAME(CVbaFileStreamPtr stream);
+		~PROJECTNAME();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString ProjectName;
+	};
+	typedef boost::shared_ptr<PROJECTNAME> PROJECTNAMEPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTDOCSTRING : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTDOCSTRING)
+	public:
+		PROJECTDOCSTRING(CVbaFileStreamPtr stream);
+		~PROJECTDOCSTRING();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString aDocString;
+		Utf16String uDocString;
+	};
+	typedef boost::shared_ptr<PROJECTDOCSTRING> PROJECTDOCSTRINGPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTHELPFILEPATH : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTHELPFILEPATH)
+	public:
+		PROJECTHELPFILEPATH(CVbaFileStreamPtr stream);
+		~PROJECTHELPFILEPATH();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		Utf16String HelpFile1;
+		Utf16String HelpFile2;
+	};
+	typedef boost::shared_ptr<PROJECTHELPFILEPATH> PROJECTHELPFILEPATHPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTHELPCONTEXT : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTHELPCONTEXT)
+	public:
+		PROJECTHELPCONTEXT(CVbaFileStreamPtr stream);
+		~PROJECTHELPCONTEXT();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 HelpContext;
+	};
+	typedef boost::shared_ptr<PROJECTHELPCONTEXT> PROJECTHELPCONTEXTPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTLIBFLAGS : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTLIBFLAGS)
+	public:
+		PROJECTLIBFLAGS(CVbaFileStreamPtr stream);
+		~PROJECTLIBFLAGS();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 ProjectLibFlags;
+	};
+	typedef boost::shared_ptr<PROJECTLIBFLAGS> PROJECTLIBFLAGSPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTVERSION : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTVERSION)
+	public:
+		PROJECTVERSION(CVbaFileStreamPtr stream);
+		~PROJECTVERSION();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 VersionMajor;
+		_UINT16 VersionMinor;
+	};
+	typedef boost::shared_ptr<PROJECTVERSION> PROJECTVERSIONPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTCONSTANTS : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTCONSTANTS)
+	public:
+		PROJECTCONSTANTS(CVbaFileStreamPtr stream);
+		~PROJECTCONSTANTS();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString aConstants;
+		Utf16String uConstants;
+	};
+	typedef boost::shared_ptr<PROJECTCONSTANTS> PROJECTCONSTANTSPtr;
+//--------------------------------------------------------------------------------------------------
+	class REFERENCENAME : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCENAME)
+	public:
+		REFERENCENAME(CVbaFileStreamPtr stream);
+		~REFERENCENAME();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString aName;
+		Utf16String uName;
+	};
+	typedef boost::shared_ptr<REFERENCENAME> REFERENCENAMEPtr;
+//--------------------------------------------------------------------------------------------------
+	class REFERENCEORIGINAL : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCEORIGINAL)
+	public:
+		REFERENCEORIGINAL(CVbaFileStreamPtr stream);
+		~REFERENCEORIGINAL();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString LibidOriginal;
+	};
+	typedef boost::shared_ptr<REFERENCEORIGINAL> REFERENCEORIGINALPtr;
+//--------------------------------------------------------------------------------------------------
+	class REFERENCEREGISTERED : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCEREGISTERED)
+	public:
+		REFERENCEREGISTERED(CVbaFileStreamPtr stream);
+		~REFERENCEREGISTERED();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString Libid;
+	};
+	typedef boost::shared_ptr<REFERENCEREGISTERED> REFERENCEREGISTEREDPtr;
+//--------------------------------------------------------------------------------------------------
+	class REFERENCEPROJECT : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCEPROJECT)
+	public:
+		REFERENCEPROJECT(CVbaFileStreamPtr stream);
+		~REFERENCEPROJECT();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 MajorVersion;
+		_UINT16 MinorVersion;
+
+		AnsiString LibidAbsolute;
+		AnsiString LibidRelative;
+	};
+	typedef boost::shared_ptr<REFERENCEPROJECT> REFERENCEPROJECTPtr;
+//--------------------------------------------------------------------------------------------------
+	class REFERENCECONTROL : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCECONTROL)
+	public:
+		REFERENCECONTROL(CVbaFileStreamPtr stream);
+		~REFERENCECONTROL();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+		
+		AnsiString LibidTwiddled;
+		AnsiString LibidExtended;
+
+		REFERENCENAMEPtr NameRecordExtended;
+		_GUID_ OriginalTypeLib;
+	};
+	typedef boost::shared_ptr<REFERENCECONTROL> REFERENCECONTROLPtr;
+//--------------------------------------------------------------------------------------------------
+	class PROJECTCOOKIE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTCOOKIE)
+	public:
+		PROJECTCOOKIE(CVbaFileStreamPtr stream);
+		~PROJECTCOOKIE();
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		unsigned short Cookie;
+	};
+	typedef boost::shared_ptr<PROJECTCOOKIE> PROJECTCOOKIEPtr;
+//-------------------------------------------------------------------------------------------------
+	class MODULENAME : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULENAME)
+	public:
+		MODULENAME(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString ModuleName;
+	};
+	typedef boost::shared_ptr<MODULENAME> MODULENAMEPtr;
+//-----------------------------------------------------------------------------
+	class MODULENAMEUNICODE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULENAMEUNICODE)
+	public:
+		MODULENAMEUNICODE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		Utf16String ModuleNameUnicode;
+	};
+	typedef boost::shared_ptr<MODULENAMEUNICODE> MODULENAMEUNICODEPtr;
+//-----------------------------------------------------------------------------
+	class MODULESTREAMNAME : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULESTREAMNAME)
+	public:
+		MODULESTREAMNAME(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString StreamName;
+		Utf16String StreamNameUnicode;
+	};
+	typedef boost::shared_ptr<MODULESTREAMNAME> MODULESTREAMNAMEPtr;
+//-----------------------------------------------------------------------------
+	class MODULEDOCSTRING : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULEDOCSTRING)
+	public:
+		MODULEDOCSTRING(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		AnsiString DocString;
+		Utf16String DocStringUnicode;
+	};
+	typedef boost::shared_ptr<MODULEDOCSTRING> MODULEDOCSTRINGPtr;
+//-----------------------------------------------------------------------------
+	class MODULEOFFSET : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULEOFFSET)
+	public:
+		MODULEOFFSET(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 TextOffset;
+	};
+	typedef boost::shared_ptr<MODULEOFFSET> MODULEOFFSETPtr;
+//-----------------------------------------------------------------------------
+	class MODULEHELPCONTEXT : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULEHELPCONTEXT)
+	public:
+		MODULEHELPCONTEXT(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		_UINT32 HelpContext;
+	};
+	typedef boost::shared_ptr<MODULEHELPCONTEXT> MODULEHELPCONTEXTPtr;
+//-----------------------------------------------------------------------------
+	class MODULECOOKIE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULECOOKIE)
+	public:
+		MODULECOOKIE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+	};
+	typedef boost::shared_ptr<MODULECOOKIE> MODULECOOKIEPtr;
+//-----------------------------------------------------------------------------
+	class MODULETYPE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULETYPE)
+	public:
+		MODULETYPE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+	};
+	typedef boost::shared_ptr<MODULETYPE> MODULETYPEPtr;
+//-----------------------------------------------------------------------------
+	class MODULEREADONLY : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULEREADONLY)
+	public:
+		MODULEREADONLY(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+	};
+	typedef boost::shared_ptr<MODULEREADONLY> MODULEREADONLYPtr;
+//-----------------------------------------------------------------------------
+	class MODULEPRIVATE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULEPRIVATE)
+	public:
+		MODULEPRIVATE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+	};
+	typedef boost::shared_ptr<MODULEPRIVATE> MODULEPRIVATEPtr;
+//------------------------------------------------------------------------------------
+	class MODULE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(MODULE)
+	public:
+		MODULE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+		virtual void load(CVbaFileStreamPtr stream);
+
+		MODULENAMEPtr NameRecord;
+		MODULENAMEUNICODEPtr NameUnicodeRecord;
+		MODULESTREAMNAMEPtr StreamNameRecord;
+		MODULEDOCSTRINGPtr DocStringRecord;
+		MODULEOFFSETPtr OffsetRecord;
+		MODULEHELPCONTEXTPtr HelpContextRecord;
+
+		bool bReadOnly = false;
+		bool bPrivate = false;
+		bool bProceduralModule = false;
+	};
+	typedef boost::shared_ptr<MODULE> MODULEPtr;
+//----------------------------------------------------------------------------------------
+	class PROJECTINFORMATION : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTINFORMATION)
+	public:
+		PROJECTINFORMATION(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		PROJECTSYSKINDPtr		SysKindRecord;
+		PROJECTCOMPATVERSIONPtr	CompatVersionRecord;
+		PROJECTLCIDPtr			LcidRecord;
+		PROJECTLCIDINVOKEPtr	LcidInvokeRecord;
+		PROJECTCODEPAGEPtr		CodePageRecord;
+		PROJECTNAMEPtr			NameRecord;
+		PROJECTDOCSTRINGPtr		DocStringRecord;
+		PROJECTHELPFILEPATHPtr	HelpFilePathRecord;
+		PROJECTHELPCONTEXTPtr	HelpContextRecord;
+		PROJECTLIBFLAGSPtr		LibFlagsRecord;
+		PROJECTVERSIONPtr		VersionRecord;
+		PROJECTCONSTANTSPtr		ConstantsRecord;
+	};
+	typedef boost::shared_ptr<PROJECTINFORMATION> PROJECTINFORMATIONPtr;
+//-----------------------------------------------------------------------------
+	class REFERENCE : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(REFERENCE)
+	public:
+		REFERENCE(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		REFERENCENAMEPtr NameRecord;
+		BaseRecordPtr ReferenceRecord;
+	};
+	typedef boost::shared_ptr<REFERENCE> REFERENCEPtr;
+	class PROJECTREFERENCES : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTINFORMATION)
+	public:
+		PROJECTREFERENCES(CVbaFileStreamPtr stream)
+		{
+			load(stream);
+		}
+		BaseRecordPtr clone();
+
+		virtual void load(CVbaFileStreamPtr stream);
+
+		std::vector<REFERENCEPtr>	ReferenceArray;
+	};
+	typedef boost::shared_ptr<PROJECTREFERENCES> PROJECTREFERENCESPtr;
+//----------------------------------------------------------------------------------------------
+	class PROJECTMODULES : public BaseRecord
+	{
+		BASE_STRUCTURE_DEFINE_CLASS_NAME(PROJECTMODULES)
+	public:
+		PROJECTMODULES(CVbaFileStreamPtr stream);
+		~PROJECTMODULES();
+		BaseRecordPtr clone();
+		virtual void load(CVbaFileStreamPtr stream);
+
+		std::vector<MODULEPtr> modules;
+		PROJECTCOOKIEPtr ProjectCookieRecord;
+	};
+	typedef boost::shared_ptr<PROJECTMODULES> PROJECTMODULESPtr;
+} // namespace VBA
+

ASCOfficeXlsFile2/source/VbaFormat/StreamObjects.cpp

@@ -0,0 +1,56 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "StreamObjects.h"
+#include "VbaRecordType.h"
+
+#include <boost/make_shared.hpp>
+
+namespace VBA
+{;
+
+bool DirStreamObject::loadContent()
+{
+	InformationRecord = boost::make_shared<PROJECTINFORMATION>(reader);
+	ReferencesRecord = boost::make_shared<PROJECTREFERENCES>(reader);
+	ModulesRecord = boost::make_shared<PROJECTMODULES>(reader);
+		
+	return (InformationRecord && ReferencesRecord && ModulesRecord);
+}
+
+bool ModuleStreamObject::loadContent()
+{
+    SourceCode = convert_string_icu((char*)reader->getData(), (unsigned int)reader->getDataSize(), reader->CodePage);
+
+	return true;
+}
+} // namespace VBA

ASCOfficeXlsFile2/source/VbaFormat/StreamObjects.h

@@ -0,0 +1,73 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "Records.h"
+
+class CVbaFileStream;
+typedef boost::shared_ptr<CVbaFileStream> CVbaFileStreamPtr;
+
+namespace VBA
+{
+	class DirStreamObject
+	{
+	public:
+		DirStreamObject(CVbaFileStreamPtr _reader) { reader = _reader; }
+		~DirStreamObject() {}
+
+		bool loadContent();
+
+		PROJECTINFORMATIONPtr InformationRecord;
+		PROJECTREFERENCESPtr ReferencesRecord;
+		PROJECTMODULESPtr ModulesRecord;
+
+	private:
+		CVbaFileStreamPtr reader;
+	};
+	typedef boost::shared_ptr<DirStreamObject> DirStreamObjectPtr;
+
+	class ModuleStreamObject
+	{
+	public:
+		ModuleStreamObject(CVbaFileStreamPtr _reader) { reader = _reader; }
+		~ModuleStreamObject() {}
+
+		bool loadContent();
+
+		std::wstring SourceCode;
+
+	private:
+		CVbaFileStreamPtr reader;
+	};
+	typedef boost::shared_ptr<ModuleStreamObject> ModuleStreamObjectPtr;
+
+} // namespace VBA

ASCOfficeXlsFile2/source/VbaFormat/VbaBinary.cpp

@@ -0,0 +1,237 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "VbaBinary.h"
+
+#include <boost/bind.hpp>
+
+#include <algorithm>
+#include <sstream>
+
+
+
+CVbaFile::~CVbaFile()
+{
+	streams.clear();
+
+	if (storage_)delete storage_;
+	storage_ = NULL;
+}
+
+bool CVbaFile::isError()
+{
+	if (storage_ != NULL) return false;
+	return true;
+}
+
+bool CVbaFile::Open(const std::wstring & file_path)
+{
+	if (storage_) delete storage_;
+	storage_ = NULL;
+
+	storage_ = new POLE::Storage(file_path.c_str());
+	if (storage_ == NULL) return false;
+
+	if (storage_->open(false, false) == false)
+	{
+		delete storage_;
+		storage_ = NULL;
+	}
+
+	if (storage_ == NULL) return false;
+	return true;
+}
+CVbaFile::CVbaFile(const std::wstring & file_path)
+{
+	storage_ = NULL;
+	Open(file_path);
+}
+CVbaFileStreamPtr CVbaFile::getNamedStream(const std::wstring& name, _UINT32 offset)
+{
+	if (!streams[name])
+	{
+		POLE::Stream * pStream = openStream(name.c_str());
+		if (pStream)
+			streams[name].reset(new CVbaFileStream(pStream, offset));
+	}
+	return streams[name];
+}
+
+void CVbaFile::closeNamedStream(const std::wstring& name)
+{
+	streams[name].reset();
+}
+
+POLE::Stream* CVbaFile::openStream(const std::wstring & stream_name)
+{
+	if (storage_ == NULL) return NULL;
+
+	POLE::Stream* pStream = new POLE::Stream(storage_, stream_name);
+	if (pStream == NULL)
+	{
+		return NULL;
+	}
+	if ((pStream) && (pStream->size() > 0))
+		return pStream;
+	else return NULL;
+}
+const unsigned char VBASTREAM_SIGNATURE = 1;
+
+const _UINT16 CHUNK_SIGMASK = 0x7000;
+const _UINT16 CHUNK_SIG = 0x3000;
+const _UINT16 CHUNK_COMPRESSED = 0x8000;
+const _UINT16 CHUNK_LENMASK = 0x0FFF;
+
+inline _UINT16 extract(_UINT16 nBitField, unsigned char nStartBit, unsigned char nBitCount)
+{
+	_UINT64 nMask = 1; nMask <<= nBitCount; --nMask;
+	return static_cast< _UINT16 >(nMask & (nBitField >> nStartBit));
+}
+CVbaFileStream::CVbaFileStream(POLE::Stream* stream, _UINT32 offset)
+{
+	size_t dataSize = stream->size();
+
+	unsigned char sig = 0;
+	stream->read(&sig, 1);
+
+	if (sig != 1)
+	{
+		stream->seek(0);
+		arrChunks.resize(dataSize);
+		stream->read(arrChunks.data(), dataSize);
+
+		return;
+	}
+	dataSize -= 1;
+	
+	stream->seek(stream->tell() + offset);
+	dataSize -= offset;
+//readchunks
+	unsigned char *data = new unsigned char[dataSize];
+	stream->read(data, dataSize);
+
+	unsigned char *dataCur = data;
+	size_t dataPos = 0;	
+
+	while (dataPos + 2 < dataSize)
+	{
+		std::vector<unsigned char> arrChunk;
+		_UINT16 header = *((_UINT32*)dataCur); dataCur += 2;
+
+		bool bCompressed = ((header & CHUNK_COMPRESSED) != 0);
+		_UINT16 chunkSize = (header & CHUNK_LENMASK);
+
+		if ((header & CHUNK_SIGMASK) != CHUNK_SIG)
+		{
+			bCompressed = true;
+			chunkSize = 4094; //по факту
+		}
+		POLE::uint64 target = (dataCur - data) + chunkSize;
+		
+		if (bCompressed)
+		{
+			unsigned char nBitCount = 4;
+			_UINT16 chunkPos = 0;
+
+			bool bEof = stream->eof();
+			while (!bEof && ((dataCur - data) > 0) && (chunkPos < chunkSize))
+			{
+				unsigned char nToken = *dataCur; dataCur++;
+				++chunkPos;
+			
+				for (int bit = 0; !bEof && ((dataCur - data) > 0) && (bit < 8) && (chunkPos < chunkSize); ++bit, nToken >>= 1)
+				{
+					if (nToken & 1)
+					{
+						_UINT16 nCopyToken = *((_UINT32*)dataCur); dataCur += 2;
+						chunkPos += 2;
+
+						while ((static_cast<size_t>(1) << nBitCount) < arrChunk.size())
+							++nBitCount;
+						
+						_UINT16 nLength = extract(nCopyToken, 0, 16 - nBitCount) + 3;					
+						_UINT16 nOffset = extract(nCopyToken, 16 - nBitCount, nBitCount) + 1;
+
+						bEof = (nOffset > arrChunk.size()) || (arrChunk.size() + nLength > 4096);
+					
+						if (!bEof)
+						{
+							arrChunk.resize(arrChunk.size() + nLength);
+							
+							unsigned char* pnTo = &*(arrChunk.end() - nLength);
+							
+							const unsigned char* pnEnd = pnTo + nLength;
+							const unsigned char* pnFrom = pnTo - nOffset;
+
+							size_t nRunLen = (std::min)(nLength, nOffset);
+							while (pnTo < pnEnd)
+							{
+								size_t nStepLen = (std::min)(nRunLen, (size_t)(pnEnd - pnTo));
+								memcpy(pnTo, pnFrom, nStepLen);
+								pnTo += nStepLen;
+							}
+						}
+					}
+					else
+					{
+						arrChunk.emplace_back();
+						arrChunk.back() = *dataCur; dataCur++;
+						++chunkPos;
+					}
+				}
+			}
+		}
+		else
+		{
+			arrChunk.resize(chunkSize);
+			memcpy(arrChunk.data(), dataCur, chunkSize); dataCur += chunkSize;
+		}
+		dataPos = target;
+		arrChunks.insert(arrChunks.end(), arrChunk.begin(), arrChunk.end());
+	}
+}
+CVbaFileStream::~CVbaFileStream()
+{
+	arrChunks.clear();
+}
+void CVbaFileStream::read(void* buf, size_t size)
+{
+	if (NULL == buf || arrChunks.empty())
+	{
+		return;
+	}
+	if (pos + size > arrChunks.size())
+		size = arrChunks.size() - pos;
+	memcpy(buf, arrChunks.data() + pos, size);
+	pos += size;
+
+}

ASCOfficeXlsFile2/source/VbaFormat/VbaBinary.h

@@ -0,0 +1,144 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "../../../Common/3dParty/pole/pole.h"
+#include "../../../Common/DocxFormat/Source/Base/Types_32.h"
+
+#include <map>
+#include <string>
+#include <vector>
+#include <boost/shared_ptr.hpp>
+
+
+typedef struct
+{
+	_UINT32 Data1;
+	_UINT16 Data2;
+	_UINT16 Data3;
+	unsigned char  Data4[8];
+} _GUID_;
+
+class CVbaFileStream
+{
+public:
+	CVbaFileStream(POLE::Stream* stream, _UINT32 offset = 0);
+	~CVbaFileStream();
+
+	template<class Type>
+	CVbaFileStream& operator >> (Type& val)
+	{
+		read(&val, sizeof(Type));
+		return *this;
+	}
+
+	void read(void* buf, size_t size);
+
+//---------------------------------------------------------------------
+    void skipBytes(const size_t n)
+	{
+		pos += n;
+		if (pos > arrChunks.size())
+			pos = arrChunks.size();
+	}
+    void RollBack(const size_t n)
+	{
+		if (pos - n >= 0)
+		{
+			pos -= n;
+		}
+	}
+	unsigned char* getData() { return arrChunks.data(); }
+	size_t getDataSize() { return arrChunks.size(); }
+
+	const bool checkFitReadSafe(const size_t size) const
+	{
+		return (!arrChunks.empty() && (pos + size < arrChunks.size()));
+	}
+	bool checkFitRead(const size_t size) const
+	{
+		if (!checkFitReadSafe(size))
+		{
+			return false;
+		}
+		return true;
+	}
+	template<class T>
+	bool loadAnyData(T& val) //for static size objects
+	{
+		size_t size = sizeof(T);
+		if (checkFitRead(size))
+		{
+			memcpy((unsigned char*)&val, arrChunks.data() + pos, size);
+			pos += size;
+			return true;
+		}
+		return false;
+	}
+
+	CVbaFileStream& operator >> (unsigned char& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (int& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (double& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (short& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (char& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (_GUID_& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (_UINT32& val) { loadAnyData(val);	return *this; }
+	CVbaFileStream& operator >> (_UINT16& val) { loadAnyData(val);	return *this; }
+
+	_UINT32 CodePage = 0;
+private:
+	std::vector<unsigned char> arrChunks;
+    size_t pos = 0;
+};
+typedef boost::shared_ptr<CVbaFileStream> CVbaFileStreamPtr;
+
+class CVbaFile
+{
+public:
+	CVbaFile(const std::wstring & file_path);
+	~CVbaFile();
+
+	bool Open(const std::wstring & file_path);
+
+	bool isError();
+	bool isDirectory(const std::wstring & name) { return (storage_ ? storage_->isDirectory(name) : false); }
+
+	CVbaFileStreamPtr getNamedStream(const std::wstring& name, _UINT32 offset = 0);
+private:
+	POLE::Storage *storage_;
+
+	POLE::Stream* openStream(const std::wstring & stream_name); // Opens a stream in the storage (shall be called not more than once per stream)
+	void closeNamedStream(const std::wstring& name);
+
+	std::map<std::wstring, CVbaFileStreamPtr>	streams;
+};
+typedef boost::shared_ptr<CVbaFile> CVbaFilePtr;

ASCOfficeXlsFile2/source/VbaFormat/VbaReader.cpp

@@ -0,0 +1,165 @@
+#include "VbaReader.h"
+#include "StreamObjects.h"
+#include "../Common/simple_xml_writer.h"
+#include "../../../DesktopEditor/common/File.h"
+#include "../../../Common/DocxFormat/Source/XML/Utils.h"
+
+CVbaReader::CVbaReader(const std::wstring & vbaFileName, const std::wstring & vbaExtractFile)
+{
+	vbaExtractFile_ = vbaExtractFile;
+
+	vbaProject_file_ = boost::shared_ptr<CVbaFile>(new CVbaFile(vbaFileName));
+
+	if (vbaProject_file_->isError()) return;
+}
+const std::wstring CVbaReader::convert()
+{
+	_UINT32 code_page_ = 0;
+
+	CVbaFileStreamPtr strmPROJECT = vbaProject_file_->getNamedStream(L"PROJECT");
+
+	if (false == vbaProject_file_->isDirectory(L"VBA")) return L"";
+
+	CVbaFileStreamPtr strmDir = vbaProject_file_->getNamedStream(L"VBA/dir");
+	VBA::DirStreamObjectPtr DirStreamObject = VBA::DirStreamObjectPtr(new VBA::DirStreamObject(strmDir));
+
+	if (false == DirStreamObject->loadContent()) return L"";
+
+	code_page_ = strmDir->CodePage;
+
+	std::wstringstream strm;
+
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"Information")
+		{
+			if (DirStreamObject->InformationRecord->NameRecord)
+				CP_XML_ATTR(L"Name", DirStreamObject->InformationRecord->NameRecord->ProjectName.value);
+
+			if (DirStreamObject->InformationRecord->LcidRecord)
+				CP_XML_ATTR(L"Lcid", DirStreamObject->InformationRecord->LcidRecord->Lcid);
+
+			if (DirStreamObject->InformationRecord->ConstantsRecord)
+				CP_XML_ATTR(L"Constants", DirStreamObject->InformationRecord->ConstantsRecord->uConstants.value.empty() ?
+					DirStreamObject->InformationRecord->ConstantsRecord->aConstants.value :
+					DirStreamObject->InformationRecord->ConstantsRecord->uConstants.value);
+
+		}
+		CP_XML_NODE(L"References")
+		{
+			for (size_t i = 0; i < DirStreamObject->ReferencesRecord->ReferenceArray.size(); ++i)
+			{
+				CP_XML_NODE(L"Reference")
+				{
+					if (DirStreamObject->ReferencesRecord->ReferenceArray[i]->NameRecord)
+						CP_XML_ATTR(L"Name", DirStreamObject->ReferencesRecord->ReferenceArray[i]->NameRecord->uName.value.empty() ?
+							DirStreamObject->ReferencesRecord->ReferenceArray[i]->NameRecord->aName.value :
+							DirStreamObject->ReferencesRecord->ReferenceArray[i]->NameRecord->uName.value);
+
+					VBA::REFERENCEORIGINAL* original = dynamic_cast<VBA::REFERENCEORIGINAL*>(DirStreamObject->ReferencesRecord->ReferenceArray[i]->ReferenceRecord.get());
+					VBA::REFERENCECONTROL* control = dynamic_cast<VBA::REFERENCECONTROL*>(DirStreamObject->ReferencesRecord->ReferenceArray[i]->ReferenceRecord.get());
+					VBA::REFERENCEREGISTERED* registered = dynamic_cast<VBA::REFERENCEREGISTERED*>(DirStreamObject->ReferencesRecord->ReferenceArray[i]->ReferenceRecord.get());
+					VBA::REFERENCEPROJECT* project = dynamic_cast<VBA::REFERENCEPROJECT*>(DirStreamObject->ReferencesRecord->ReferenceArray[i]->ReferenceRecord.get());
+
+					if (original)
+					{
+						CP_XML_NODE(L"Original")
+						{
+							CP_XML_ATTR(L"val", original->LibidOriginal.value);
+						}
+					}
+					if (project)
+					{
+						CP_XML_NODE(L"Project")
+						{
+							if (!project->LibidAbsolute.value.empty())
+								CP_XML_ATTR(L"LibidAbsolute", project->LibidAbsolute.value);
+							if (!project->LibidRelative.value.empty())
+								CP_XML_ATTR(L"LibidRelative", project->LibidRelative.value);
+						}
+					}
+					if (control)
+					{
+						CP_XML_NODE(L"Control")
+						{
+							CP_XML_ATTR(L"TypeLib", VBA::guid2bstr(control->OriginalTypeLib));
+							if (!control->LibidTwiddled.value.empty())
+								CP_XML_ATTR(L"LibidTwiddled", control->LibidTwiddled.value);
+							if (!control->LibidExtended.value.empty())
+								CP_XML_ATTR(L"LibidExtended", control->LibidExtended.value);
+						}
+					}
+					if (registered)
+					{
+						CP_XML_NODE(L"Registered")
+						{
+							CP_XML_ATTR(L"val", registered->Libid.value);
+						}
+					}
+				}
+			}
+		}
+		CP_XML_NODE(L"Modules")
+		{
+			for (size_t i = 0; i < DirStreamObject->ModulesRecord->modules.size(); ++i)
+			{
+				CP_XML_NODE(L"Module")
+				{
+					if (DirStreamObject->ModulesRecord->modules[i]->StreamNameRecord)
+					{
+						if (DirStreamObject->ModulesRecord->modules[i]->NameUnicodeRecord)
+							CP_XML_ATTR(L"Name", DirStreamObject->ModulesRecord->modules[i]->NameUnicodeRecord->ModuleNameUnicode.value);
+						else if (DirStreamObject->ModulesRecord->modules[i]->NameRecord)
+							CP_XML_ATTR(L"Name", DirStreamObject->ModulesRecord->modules[i]->NameRecord->ModuleName.value);
+
+						CP_XML_ATTR(L"Type", DirStreamObject->ModulesRecord->modules[i]->bProceduralModule ? L"Procedural" : L"Class");
+						CP_XML_ATTR(L"ReadOnly", DirStreamObject->ModulesRecord->modules[i]->bReadOnly);
+						CP_XML_ATTR(L"Private", DirStreamObject->ModulesRecord->modules[i]->bPrivate);
+
+						std::wstring streamName = L"VBA/" + (DirStreamObject->ModulesRecord->modules[i]->StreamNameRecord->StreamNameUnicode.value.empty() ?
+							DirStreamObject->ModulesRecord->modules[i]->StreamNameRecord->StreamName.value :
+							DirStreamObject->ModulesRecord->modules[i]->StreamNameRecord->StreamNameUnicode.value);
+
+						_UINT32 offset = DirStreamObject->ModulesRecord->modules[i]->OffsetRecord ?
+							DirStreamObject->ModulesRecord->modules[i]->OffsetRecord->TextOffset : 0;//skip cache
+
+						CVbaFileStreamPtr strmModule = vbaProject_file_->getNamedStream(streamName, offset);
+						strmModule->CodePage = code_page_;
+
+						VBA::ModuleStreamObjectPtr ModuleStreamObject = VBA::ModuleStreamObjectPtr(new VBA::ModuleStreamObject(strmModule));
+						ModuleStreamObject->loadContent();
+						CP_XML_NODE(L"SourceCode")
+						{
+							CP_XML_STREAM() << XmlUtils::EncodeXmlString(ModuleStreamObject->SourceCode);
+						}
+					}
+				}
+			}
+		}
+	}
+	return strm.str();
+}
+
+bool CVbaReader::write()
+{
+	const std::wstring sXml = convert();
+	
+	NSFile::CFileBinary file;
+	if (file.CreateFileW(vbaExtractFile_))
+	{
+		std::string root = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>";
+        file.WriteFile((BYTE*)root.c_str(), (DWORD)root.length());
+		
+		file.WriteStringUTF8(sXml);
+		file.CloseFile();
+
+        return true;
+    }
+    return false;
+}
+
+CVbaReader::~CVbaReader()
+{
+	//if (vba_context)		delete vba_context;
+	//if (output_document)	delete output_document;
+}

ASCOfficeXlsFile2/source/VbaFormat/VbaReader.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <string>
+#include <boost/shared_ptr.hpp>
+
+class CVbaFile;
+typedef boost::shared_ptr<CVbaFile> CVbaFilePtr;
+
+class CVbaReader
+{
+public:
+	CVbaReader(const std::wstring & vbaFileName, const std::wstring & vbaExtractFile);
+	~CVbaReader();
+
+	const std::wstring convert();
+	bool write();
+private:
+	std::wstring vbaExtractFile_;
+	CVbaFilePtr vbaProject_file_;
+};
+

ASCOfficeXlsFile2/source/VbaFormat/VbaRecordType.h

@@ -0,0 +1,81 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2019
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+namespace VBA
+{
+	typedef enum CF_RECORD_TYPE
+	{
+		rt_PROJECTSYSKIND = 0x0001,
+		rt_PROJECTCOMPATVERSION = 0x004A,
+		rt_PROJECTLCID = 0x0002,
+		rt_PROJECTLCIDINVOKE = 0x0014,
+		rt_PROJECTCODEPAGE = 0x0003,
+		rt_PROJECTNAME = 0x0004,
+		rt_PROJECTDOCSTRING = 0x0005,
+		rt_PROJECTHELPFILEPATH = 0x0006,
+		rt_PROJECTHELPCONTEXT = 0x0007,
+		rt_PROJECTLIBFLAGS = 0x0008,
+		rt_PROJECTVERSION = 0x0009,
+		rt_PROJECTCONSTANTS = 0x000C,
+		rt_REFERENCENAME = 0x0016,
+		rt_REFERENCEORIGINAL = 0x0033,
+		rt_REFERENCEREGISTERED = 0x000D,
+		rt_REFERENCEPROJECT = 0x000E,
+		rt_REFERENCECONTROL = 0x002F,
+		rt_PROJECTMODULES = 0x000F,
+		rt_PROJECTCOOKIE = 0x0013,
+		rt_MODULENAME = 0x0019,
+		rt_MODULENAMEUNICODE = 0x0047,
+		rt_MODULESTREAMNAME = 0x001A,
+		rt_MODULEDOCSTRING = 0x001C,
+		rt_MODULEOFFSET = 0x0031,
+		rt_MODULEHELPCONTEXT = 0x001E,
+		rt_MODULECOOKIE = 0x002C,
+		rt_MODULETYPE_Procedural = 0x0021,
+		rt_MODULETYPE_Class = 0x0022,
+		rt_MODULEREADONLY = 0x0025,
+		rt_MODULEPRIVATE = 0x0028,
+		rt_Terminator = 0x002B,
+		rt_TerminatorStream = 0x0010,
+
+		rt_PROJECTINFORMATION = 0xFF01,
+		rt_REFERENCE,
+		rt_MODULE,
+		rt_MODULETYPE,
+		rt_AnsiString,
+		rt_Utf16String,
+
+		rt_Unknown = 0xffff
+	} RecordType;
+}
+

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp

@@ -54,7 +54,7 @@ CFRecord::CFRecord(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info)
 	unsigned long rec_data_pos = stream->getStreamPointer();
 
 	stream->read(data_, size_);
-	if(global_info->decryptor && 0 != size_)
+	if((global_info) && (global_info->decryptor) && (0 != size_))
 	{
 		size_t block_size = global_info->Version == 0x0500 ? 16 : 1024;
 
@@ -161,6 +161,7 @@ CFRecord::CFRecord(NSBinPptxRW::CBinaryFileReader &reader, GlobalWorkbookInfoPtr
     }
 
     file_ptr += lenght;
+    sizeOfRecordTypeRecordLength = lenght;
        /* auto lambdaDetectBusyByteCount = [] (int val) -> {
             for (int i = 0; i < 4; ++i)
             {
@@ -252,6 +253,10 @@ const size_t CFRecord::getDataSize() const
 	return size_;
 }
 
+const BYTE CFRecord::getSizeOfRecordTypeRecordLength() const
+{
+    return sizeOfRecordTypeRecordLength;
+}
 
 const size_t CFRecord::getMaxRecordSize() const
 {

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.h

@@ -49,7 +49,7 @@ class CFRecord
 public:
 	CFRecord(CFStreamPtr stream, GlobalWorkbookInfoPtr global_info); // Create a record an read its data from the stream
 	CFRecord(NSFile::CFileBinary &file, GlobalWorkbookInfoPtr global_info); // Create a record an read its data from the data stream
-        CFRecord(NSBinPptxRW::CBinaryFileReader &reader, GlobalWorkbookInfoPtr global_info); // Create a record an read its data from the data stream
+    CFRecord(NSBinPptxRW::CBinaryFileReader &reader, GlobalWorkbookInfoPtr global_info); // Create a record an read its data from the data stream
 	CFRecord(CFRecordType::TypeId type_id, GlobalWorkbookInfoPtr global_info); // Create an empty record
 	
 	~CFRecord();
@@ -63,6 +63,7 @@ public:
 	// Pointer to the beginning of the cached data
 	const char* getData() const ;
 	const size_t getDataSize() const;
+    const BYTE getSizeOfRecordTypeRecordLength() const;
 	const size_t getMaxRecordSize() const;
 	void appendRawData(CFRecordPtr where_from);
 	void appendRawData(const char* raw_data, const size_t size);
@@ -129,7 +130,8 @@ private:
 	unsigned int file_ptr;
 	CFRecordType::TypeId type_id_;
 	size_t size_;
-	char* data_;
+    char*  data_;
+    BYTE   sizeOfRecordTypeRecordLength; //размер RecordType и RecordLength
 	size_t rdPtr;
 	static char intData[MAX_RECORD_SIZE];
 

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.cpp

@@ -409,7 +409,7 @@ bool FileStreamCacheReader::isEOF()
 }
 
 //---------------------------------------------------------------------------------------------------------
-BinaryStreamCacheReader::BinaryStreamCacheReader( std::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream, GlobalWorkbookInfoPtr global_info)
+BinaryStreamCacheReader::BinaryStreamCacheReader( boost::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream, GlobalWorkbookInfoPtr global_info)
     :	StreamCacheReader(global_info), binaryStream_(binaryStream)
 {
 
@@ -518,6 +518,17 @@ const size_t BinaryStreamCacheReader::readFromStream(const size_t num_of_records
     return records_cache.size();
 }
 
+//Return current position in stream
+const int BinaryStreamCacheReader::GetRecordPosition()
+{
+    return binaryStream_->GetPos() - records_cache.front()->getDataSize() - records_cache.front()->getSizeOfRecordTypeRecordLength();
+}
+
+void BinaryStreamCacheReader::SetRecordPosition(const int position)
+{
+    binaryStream_->Seek(position);
+}
+
 // Checks whether the next record is Continue and append its data to the real record if so
 void BinaryStreamCacheReader::checkAndAppendContinueData()
 {

ASCOfficeXlsFile2/source/XlsFormat/Binary/CFStreamCacheReader.h

@@ -65,6 +65,9 @@ public:
 	// Skip the specified number of unsigned chars without processing
 	virtual void skipNunBytes(const size_t n) = 0;
 
+	virtual const int GetRecordPosition() { return 0; }
+    virtual void SetRecordPosition(const int) {}
+
 	void SkipRecord();
 	// Seek to the next substream (Read all records till EOF then skip EOF)
 	// Doesn't generate EndOfStreamReached if the stream is the last one
@@ -118,7 +121,7 @@ private:
 class BinaryStreamCacheReader : public StreamCacheReader
 {
 public:
-    BinaryStreamCacheReader(std::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream, const GlobalWorkbookInfoPtr global_info);
+    BinaryStreamCacheReader(boost::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream, const GlobalWorkbookInfoPtr global_info);
     virtual ~BinaryStreamCacheReader();
 
     CFRecordPtr getNextRecord(const CFRecordType::TypeId desirable_type, const bool gen_except = false) override;
@@ -127,6 +130,8 @@ public:
     bool isEOF() override;
 private:
     const size_t readFromStream(const size_t num_of_records_min_necessary) override;
-    std::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream_;
+    const int GetRecordPosition() override;
+    void SetRecordPosition(const int) override;
+    boost::shared_ptr<NSBinPptxRW::CBinaryFileReader> binaryStream_;
 };
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/BaseObject.h

@@ -55,7 +55,7 @@ class BaseObject
 {
 public:
 	BaseObject(){}
-	~BaseObject(){}
+    virtual ~BaseObject(){}
 
 	virtual boost::shared_ptr<BaseObject> clone() = 0;
 

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

@@ -110,8 +110,8 @@ void Row::readFields(CFRecord& record)
     {
         record >> rw >> ixfe_val >> miyRw;
 
-        unsigned short flags;
-        unsigned char  flags2;
+        _UINT16 flags;
+        BYTE  flags2;
 
         record >> flags >> flags2 >> ccolspan;
 

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

@@ -86,15 +86,16 @@ void Window1::readFields(CFRecord& record)
 
     else
     {
-        record >> xWn >> yWn >> dxWn >> dyWn >> wTabRatio >> itabFirst >> itabCur >> flags;
+        BYTE flags1;
+        record >> xWn >> yWn >> dxWn >> dyWn >> wTabRatio >> itabFirst >> itabCur >> flags1;
 
-        fHidden			= GETBIT(flags, 0);
-        fVeryHidden		= GETBIT(flags, 1);
-        fIconic 		= GETBIT(flags, 2);
-        fDspHScroll		= GETBIT(flags, 3);
-        fDspVScroll		= GETBIT(flags, 4);
-        fBotAdornment	= GETBIT(flags, 5);
-        fNoAFDateGroup	= GETBIT(flags, 6);
+        fHidden			= GETBIT(flags1, 0);
+        fVeryHidden		= GETBIT(flags1, 1);
+        fIconic 		= GETBIT(flags1, 2);
+        fDspHScroll		= GETBIT(flags1, 3);
+        fDspVScroll		= GETBIT(flags1, 4);
+        fBotAdornment	= GETBIT(flags1, 5);
+        fNoAFDateGroup	= GETBIT(flags1, 6);
     }
 }
 

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

@@ -69,7 +69,8 @@ void ArrayParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
 
     }
 }

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

@@ -63,7 +63,8 @@ void CFParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), true);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), true);
     }
 }
 

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

@@ -65,7 +65,8 @@ void CFVOParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), true);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), true);
     }
 }
 

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

@@ -75,7 +75,8 @@ void CellParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
     }
 }
 

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

@@ -53,8 +53,17 @@ BiffStructurePtr ExtNameParsedFormula::clone()
 
 void ExtNameParsedFormula::load(CFRecord& record) // Maybe this class shouldn't be a ParsedFormulas's derived?
 {
-	unsigned short cb;
-	record >> cb;
+    _UINT32 cb;
+    if (record.getGlobalWorkbookInfo()->Version < 0x0800)
+    {
+        unsigned short cb_2b;
+        record >> cb_2b;
+        cb = cb_2b;
+    }
+    else
+    {
+        record >> cb;
+    }
 	if(cb && record.getDataSize() > record.getRdPtr())
 	{
 		unsigned char extPtg;

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

@@ -63,7 +63,8 @@ void ListParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), false);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), false);
     }
 }
 //-------------------------------------------------------------------------------

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

@@ -46,11 +46,27 @@ BiffStructurePtr PivotParsedFormula::clone()
 }
 
 void PivotParsedFormula::load(CFRecord& record)
-{
-	unsigned short cce;
+{	
+    if (record.getGlobalWorkbookInfo()->Version < 0x0800)
+    {
+        unsigned short cce;
 
-	record >> cce >> cSxName;	
-	rgce.load(record, cce);
+        record >> cce >> cSxName;
+        rgce.load(record, cce);
+    }
+    else
+    {
+        _UINT32 cce;
+        record >> cce;
+
+        rgce.load(record, cce);
+
+        _UINT32 cb;
+        record >> cb;
+
+        //rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
+
+    }
 }
 
 } // namespace XLS

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

@@ -200,7 +200,7 @@ PtgPtr PtgFactory::createPtg(const unsigned short type, const CellRef& cell_base
 			return PtgPtr(new PtgArray(type)); // *
 
         case 0x1918:
-            return PtgPtr(new PtgList); // *
+            return PtgPtr(new PtgList(type)); // *
 
 		case 0x0021:
 		case 0x0041:
@@ -215,7 +215,7 @@ PtgPtr PtgFactory::createPtg(const unsigned short type, const CellRef& cell_base
 		case 0x0023:
 		case 0x0043:
 		case 0x0063:
-			return PtgPtr(new PtgName(type)); // *
+            return PtgPtr(new PtgName(type)); // *
 
 		case 0x0024:
 		case 0x0044:

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

@@ -36,6 +36,9 @@
 namespace XLS
 {
 
+PtgList::PtgList(const unsigned short full_ptg_id) : OperandPtg(full_ptg_id)
+{
+}
 
 BiffStructurePtr PtgList::clone()
 {

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

@@ -43,6 +43,8 @@ class PtgList: public OperandPtg
     BASE_STRUCTURE_DEFINE_CLASS_NAME(PtgList)
 public:
 
+    PtgList(const unsigned short full_ptg_id);
+
 	BiffStructurePtr clone();
 	
     virtual void loadFields(CFRecord& record);

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

@@ -68,7 +68,8 @@ void SharedParsedFormula::load(CFRecord& record)
         unsigned int cb;
         record >> cb;
 
-        rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
+        if(cb > 0)
+            rgcb.load(record, rgce.getPtgs(), is_part_of_a_revision_);
 
     }
 }

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

@@ -41,8 +41,17 @@ BiffStructurePtr SXAxis::clone()
 }
 void SXAxis::load(CFRecord& record)
 {
-	unsigned short flags;
-	record >> flags;
+    unsigned short flags;
+    if(record.getGlobalWorkbookInfo()->Version < 0x0800)
+    {
+        record >> flags;
+    }
+    else
+    {
+        BYTE   flags_1b;
+        record >> flags_1b;
+        flags = flags_1b;
+    }
 
 	bRw		= GETBIT(flags, 0);
 	bCol	= GETBIT(flags, 1);

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

@@ -45,6 +45,5 @@ void Xnum::load(CFRecord& record)
 	record.loadAnyData(data);
 }
 
-
 } // namespace XLS
 

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

@@ -60,6 +60,7 @@ public:
 		}bytes;
 		double value = 0.;
 	} data;
+
 };
 
 typedef Xnum DateAsNum;

ASCOfficeXlsFile2/source/XlsFormat/Logic/BinProcessor.cpp

@@ -62,19 +62,19 @@ const int BinProcessor::repeated(BaseObject& object, const int fromN, const int
 	bool at_least_one_read = false;
 
 	for(int i = 0; i < fromN; ++i)
-	{
-		mandatory(*object.clone());
+    {
+        mandatory(*object.clone());
 		count++;
-		at_least_one_read = true;
+        at_least_one_read = true;
 	}
 	for(int j = fromN; j < toN || !toN/*infinity*/; ++j)
-	{
-		if(!optional(*object.clone()))
+    {
+        if(!optional(*object.clone()))
 		{
 			break;
 		}
 		count++;
-		at_least_one_read = true;
+        at_least_one_read = true;
 	}
 	return count;
 }
@@ -253,7 +253,16 @@ void BinReaderProcessor::SkipRecord()
 	if (reader_)
 		reader_->SkipRecord();
 }
-
+const int BinReaderProcessor::GetRecordPosition()
+{
+ if (reader_)
+     return reader_->GetRecordPosition();
+}
+void BinReaderProcessor::SetRecordPosition(const int position)
+{
+  if (reader_)
+      reader_->SetRecordPosition(position);
+}
 
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsFormat/Logic/BinProcessor.h

@@ -84,6 +84,8 @@ public:
 	virtual const bool getNextSubstreamType(_UINT16& type) = 0;
 	virtual void SeekToEOF() = 0;
 	virtual void SkipRecord() = 0;
+    virtual const int GetRecordPosition() = 0;
+    virtual void SetRecordPosition(const int position) = 0;
 
 	bool isBOF(CFRecordType::TypeId type);
 
@@ -110,6 +112,8 @@ public:
 	
 	void SeekToEOF();
 	void SkipRecord();
+    const int GetRecordPosition();
+    void SetRecordPosition(const int position);
 
 private:
 	const bool readChild(BaseObject& object, const bool is_mandatory);

ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.cpp

@@ -120,7 +120,9 @@ GlobalWorkbookInfo::GlobalWorkbookInfo(const unsigned short code_page, XlsConver
 	bMacrosExist			= false;
 	bWorkbookProtectExist	= false;
 
-	idPivotCache			= 0;
+	idPivotCache = 0;	
+	currentPivotCacheRecord = 0;
+
 
 	mapDefaultFormatCode.insert(std::make_pair(L"0", 1));
 	mapDefaultFormatCode.insert(std::make_pair(L"0.00", 2));

ASCOfficeXlsFile2/source/XlsFormat/Logic/GlobalWorkbookInfo.h

@@ -38,6 +38,7 @@
 #include <unordered_map>
 
 #include "Biff_structures/BorderFillInfo.h"
+#include "XlsElementsType.h"
 
 #include "../Crypt/Decryptor.h"
 
@@ -150,6 +151,8 @@ public:
 	struct _xti
 	{
 		int							iSup;
+        _INT32                      itabFirst; //firstSheet in biff12
+        _INT32                      itabLast; //lastSheet in biff12
 		std::wstring				link;
 		std::vector<std::wstring>*	pNames = NULL;
 	};
@@ -205,11 +208,14 @@ public:
 	int								connectionId;
 	std::map<std::wstring, int>		connectionNames;
 
-	std::unordered_map<int, std::wstring>		mapTableNames;
-	std::unordered_map<int, std::vector<std::wstring>>	mapTableColumnNames;
-	std::unordered_map<std::wstring, int>		mapTableGuidsIndex;
+    std::unordered_map<int, std::wstring>		mapTableNames;
+    std::unordered_map<int, std::vector<std::wstring>>	mapTableColumnNames;
+    std::unordered_map<std::wstring, int>		mapTableGuidsIndex;
 
-	XlsConverter *xls_converter;
+    std::unordered_map<int, std::vector<XLS::ElementType>>		pivotCacheRecordType;
+    int                     		currentPivotCacheRecord;
+
+	XlsConverter					*xls_converter;
 };
 
 typedef boost::shared_ptr<GlobalWorkbookInfo> GlobalWorkbookInfoPtr;

ASCOfficeXlsFile2/source/XlsFormat/Logic/XlsElementsType.h

@@ -741,97 +741,181 @@ enum ElementType
 	typeOfficeArtClientData,
     typeOfficeArtClientTextbox,
 
-        //xlsb static const XLS::ElementType	type = XLS::typeSLICERCACHEOLAPIMPL;
-        typeCONDITIONALFORMATTING = 4000,
-        typeCONDITIONALFORMATTING14,
-        typeBeginConditionalFormatting,
-        typeBeginConditionalFormatting14,
-        typeCFRULE,
-        typeCFRULE14,
-        typeBeginCFRule,
-        typeBeginCFRule14,
-        typeuCFVO,
-        typeuCFVO14,
-        typeCFVO14,
-        typeCOLORSCALE,
-        typeCOLORSCALE14,
-        typeDATABAR,
-        typeBeginDatabar,
-        typeDATABAR14,
-        typeBeginDatabar14,
-        typeICONSET,
-        typeBeginIconSet,
-        typeICONSET14,
-        typeBeginIconSet14,
-        typeACFMT,
-        typeFmt,
-        typeFRTDXF,
-        typeFRTWORKSHEET,
-        typeFRTSTYLESHEET,
-        typeuDXF,
-        typeDXF14,
-        typeCUSTOMRICHFILTERS,
-        typeRICHFILTERS,
-        typeDynamicRichFilter,
-        typeTop10RichFilter,
-        typeRICHFILTERCONTENT,
-        typeACICONFILTER,
-        typeACFILTERS,
-        typeACCUSTOMFILTER,
-        typeCUSTOMFILTERS,
-        typeFILTERS,
-        typeACFILTERCONTENT,
-        typeDynamicFilter,
-        typeTop10Filter,
-        typeColorFilter,
-        typeIconFilter,
-        typeFRTTABLE,
-        typeSUPSAME,
-        typeSUPADDIN,
-        typeSupBookSrc,
-        typeDVALS,
-        typeDVALS14,
-        typeDVal14,
-        typeBeginDVals,
-        typeBeginDVals14,
-        typeFRTQSI,
-        typeFRTEXTCONNECTIONS,
-        typeEXTCONNECTION,
-        typeEXTCONN14,
-        typeEXTCONN15,
-        typeBeginExtConnection,
-        typeBeginExtConn14,
-        typeBeginExtConn15,
-        typeRangePr15,
-        typeSLICERCACHEOLAPIMPL,
-        typeSLICERCACHENATIVEITEMS,
-        typeFRTSLICERCACHE,
-        typeSLICERSEX,
-        typeTABLESLICERSEX,
-        typeSLICEREX,
-        typeTABLESLICEREX,
-        typeFRTWORKBOOK,
-        typeRWBRK,
-        typeCOLBRK,
-        typeBeginRwBrk,
-        typeBeginColBrk,
-        typeRangeProtection,
-        typeRangeProtectionIso,
-        typeCsProtection,
-        typeCsProtectionIso,
-        typeSheetProtection,
-        typeSheetProtectionIso,
-        typeCSVIEWS,
-        typeCSVIEW,
-        typeBeginCsView,
-        typeWSVIEWS2,
-        typeWSVIEW2,
-        typeBeginWsView,
-        typeCsPageSetup,
-        typePageSetup,
-        typeCsProp,
-        typeWsProp,
-
+    //xlsb static const XLS::ElementType	type = XLS::typeSLICERCACHEOLAPIMPL;
+    typeCONDITIONALFORMATTING = 4000,
+    typeCONDITIONALFORMATTING14,
+    typeBeginConditionalFormatting,
+    typeBeginConditionalFormatting14,
+    typeCFRULE,
+    typeCFRULE14,
+    typeBeginCFRule,
+    typeBeginCFRule14,
+    typeuCFVO,
+    typeuCFVO14,
+    typeCFVO14,
+    typeCOLORSCALE,
+    typeCOLORSCALE14,
+    typeDATABAR,
+    typeBeginDatabar,
+    typeDATABAR14,
+    typeBeginDatabar14,
+    typeICONSET,
+    typeBeginIconSet,
+    typeICONSET14,
+    typeBeginIconSet14,
+    typeACFMT,
+    typeFmt,
+    typeFRTDXF,
+    typeFRTWORKSHEET,
+    typeFRTSTYLESHEET,
+    typeuDXF,
+    typeDXF14,
+    typeCUSTOMRICHFILTERS,
+    typeRICHFILTERS,
+    typeDynamicRichFilter,
+    typeTop10RichFilter,
+    typeRICHFILTERCONTENT,
+    typeACICONFILTER,
+    typeACFILTERS,
+    typeACCUSTOMFILTER,
+    typeCUSTOMFILTERS,
+    typeFILTERS,
+    typeACFILTERCONTENT,
+    typeDynamicFilter,
+    typeTop10Filter,
+    typeColorFilter,
+    typeIconFilter,
+    typeFRTTABLE,
+    typeSUPSAME,
+    typeSUPADDIN,
+    typeSupBookSrc,
+    typeDVALS,
+    typeDVALS14,
+    typeDVal14,
+    typeBeginDVals,
+    typeBeginDVals14,
+    typeFRTQSI,
+    typeFRTEXTCONNECTIONS,
+    typeEXTCONNECTION,
+    typeEXTCONN14,
+    typeEXTCONN15,
+    typeBeginExtConnection,
+    typeBeginExtConn14,
+    typeBeginExtConn15,
+    typeRangePr15,
+    typeSLICERCACHEOLAPIMPL,
+    typeSLICERCACHENATIVEITEMS,
+    typeFRTSLICERCACHE,
+    typeSLICERSEX,
+    typeTABLESLICERSEX,
+    typeSLICEREX,
+    typeTABLESLICEREX,
+    typeFRTWORKBOOK,
+    typeRWBRK,
+    typeCOLBRK,
+    typeBeginRwBrk,
+    typeBeginColBrk,
+    typeRangeProtection,
+    typeRangeProtectionIso,
+    typeCsProtection,
+    typeCsProtectionIso,
+    typeSheetProtection,
+    typeSheetProtectionIso,
+    typeCSVIEWS,
+    typeCSVIEW,
+    typeBeginCsView,
+    typeWSVIEWS2,
+    typeWSVIEW2,
+    typeBeginWsView,
+    typeCsPageSetup,
+    typePageSetup,
+    typeCsProp,
+    typeWsProp,
+    typePCRRecord,
+    typePIVOTCACHERECORDDT,
+    typePCDIMissing,
+    typePCDINumber,
+    typePCDIBoolean,
+    typePCDIError,
+    typePCDIString,
+    typePCDIDatetime,
+    typePCDIIndex,
+    typePCDIAMissing,
+    typePCDIANumber,
+    typePCDIABoolean,
+    typePCDIAError,
+    typePCDIAString,
+    typePCDIADatetime,
+    typePIVOTFILTERS,
+    typeBeginSXView,
+    typeEndSXView,
+    typeBeginSXView14,
+    typeEndSXView14,
+    typeSXCONDFMTS,
+    typeBeginSXCondFmts,
+    typeEndSXCondFmts,
+    typeSXCONDFMTS14,
+    typeBeginSXCondFmts14,
+    typeEndSXCondFmts14,
+    typeSXCONDFMT,
+    typeBeginSXCondFmt,
+    typeEndSXCondFmt,
+    typeSXCONDFMT14,
+    typeBeginSXCondFmt14,
+    typeEndSXCondFmt14,
+    typeBeginSXRules,
+    typeEndSXRules,
+    typeBeginSXRules14,
+    typeEndSXRules14,
+    typeBeginPRule,
+    typeEndPRule,
+    typeBeginPRule14,
+    typeEndPRule14,
+    typeBeginPRFilters,
+    typeEndPRFilters,
+    typeBeginPRFilters14,
+    typeEndPRFilters14,
+    typeBeginPRFilter,
+    typeEndPRFilter,
+    typeBeginPRFilter14,
+    typeEndPRFilter14,
+    typeBeginPRFItem,
+    typeEndPRFItem,
+    typeBeginPRFItem14,
+    typeEndPRFItem14,
+    typeSxvcellNum,
+    typeSxvcellStr,
+    typeSxvcellErr,
+    typeSxvcellBool,
+    typeSxvcellDate,
+    typeSxvcellNil,
+    typeBeginSXView16,
+    typeEndSXView16,
+    typePIVOTRULES,
+    typePIVOTRULES14,
+    typePIVOTRULE14,
+    typePRFILTERS,
+    typePRFILTERS14,
+    typePRFILTER14,
+    typePRFITEM,
+    typePRFITEM14,
+    typeBeginPivotCacheDef,
+    typePCDIRUN,
+    typePCDI,
+    typePCDIA,
+    typeISXVDRWS,
+    typeBeginISXVDRws,
+    typeISXVDCOLS,
+    typeBeginISXVDCols,
+    typeSXLIRWS,
+    typeSXLICOLS,
+    typePCDIDT,
+    typeFRTPIVOTCACHEDEF,
+    typePCD14,
+    typeTABLECELL,
+    typeDATACELL,
+    typeFMLACELL,
+    typeSHRFMLACELL,
 };
 
 

ASCOfficeXlsFile2/source/linux/VbaFormatLib.pro

@@ -0,0 +1,39 @@
+#-------------------------------------------------
+#
+# Project created by QtCreator 2014-12-16T18:28:23
+#
+#-------------------------------------------------
+
+QT       -= core gui
+
+TARGET = VbaFormatLib
+TEMPLATE = lib
+CONFIG += staticlib
+
+CORE_ROOT_DIR = $$PWD/../../..
+PWD_ROOT_DIR = $$PWD
+
+CONFIG += core_x2t
+include(../../../Common/base.pri)
+
+DEFINES += UNICODE \
+           _UNICODE \
+            DONT_WRITE_EMBEDDED_FONTS
+
+#BOOST
+include($$PWD/../../../Common/3dParty/boost/boost.pri)
+
+SOURCES +=  \
+    ../VbaFormat/Records.cpp \
+    ../VbaFormat/StreamObjects.cpp \
+    ../VbaFormat/VbaBinary.cpp \
+    ../VbaFormat/VbaReader.cpp 
+
+
+HEADERS +=  \
+    ../VbaFormat/Records.h \
+    ../VbaFormat/StreamObjects.h \
+    ../VbaFormat/VbaBinary.h \
+    ../VbaFormat/VbaReader.h \
+    ../VbaFormat/VbaRecordType.h
+ 

ASCOfficeXlsFile2/source/win32/VbaFormat.vcxproj

@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\VbaFormat\VbaBinary.cpp" />
+    <ClCompile Include="..\VbaFormat\StreamObjects.cpp" />
+    <ClCompile Include="..\VbaFormat\Records.cpp" />
+    <ClCompile Include="..\VbaFormat\VbaReader.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\VbaFormat\VbaBinary.h" />
+    <ClInclude Include="..\VbaFormat\StreamObjects.h" />
+    <ClInclude Include="..\VbaFormat\Records.h" />
+    <ClInclude Include="..\VbaFormat\VbaReader.h" />
+    <ClInclude Include="..\VbaFormat\VbaRecordType.h" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{041DD428-2D5C-4D97-8AB7-7207F3D5B801}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>VbaFormat</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_32\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_32\lib;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>..\..\..\Common\3dParty\boost\build\win_64\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
+    <LibraryPath>..\..\..\Common\3dParty\boost\build\win_64\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64</LibraryPath>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

ASCOfficeXlsFile2/source/win32/VbaFormat.vcxproj.filters

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\VbaFormat\VbaReader.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\VbaFormat\Records.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\VbaFormat\StreamObjects.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\VbaFormat\VbaBinary.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\VbaFormat\VbaReader.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\VbaFormat\Records.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\VbaFormat\StreamObjects.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\VbaFormat\VbaRecordType.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\VbaFormat\VbaBinary.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>

Common/3dParty/html/css/src/CCompiledStyle.cpp

@@ -23,7 +23,7 @@ namespace NSCSS
         m_arParentsStyles(oStyle.m_arParentsStyles), m_sId(oStyle.m_sId),
         m_nDpi(oStyle.m_nDpi), m_UnitMeasure(oStyle.m_UnitMeasure),
         m_pFont(oStyle.m_pFont), m_pMargin(oStyle.m_pMargin), m_pBackground(oStyle.m_pBackground),
-        m_pText(oStyle.m_pText), m_pBorder(oStyle.m_pBorder){}
+        m_pText(oStyle.m_pText), m_pBorder(oStyle.m_pBorder), m_pDisplay(oStyle.m_pDisplay){}
 
     CCompiledStyle::~CCompiledStyle()
     {
@@ -38,6 +38,7 @@ namespace NSCSS
         m_pFont         += oElement.m_pFont;
         m_pMargin       += oElement.m_pMargin;
         m_pText         += oElement.m_pText;
+        m_pDisplay      += oElement.m_pDisplay;
 
         return *this;
     }
@@ -55,6 +56,7 @@ namespace NSCSS
         m_pFont         = oElement.m_pFont;
         m_pMargin       = oElement.m_pMargin;
         m_pText         = oElement.m_pText;
+        m_pDisplay      = oElement.m_pDisplay;
 
         return *this;
     }
@@ -67,7 +69,8 @@ namespace NSCSS
                m_pBorder         == oStyle.m_pBorder         &&
                m_pFont           == oStyle.m_pFont           &&
                m_pMargin         == oStyle.m_pMargin         &&
-                m_pText           == oStyle.m_pText;
+               m_pText           == oStyle.m_pText           &&
+               m_pDisplay        == oStyle.m_pDisplay;
     }
 
     void CCompiledStyle::StyleEquation(CCompiledStyle &oFirstStyle, CCompiledStyle &oSecondStyle)
@@ -77,6 +80,7 @@ namespace NSCSS
         NSConstValues::NSCssProperties::Background::BackgroundEquation(oFirstStyle.m_pBackground, oSecondStyle.m_pBackground);
         NSConstValues::NSCssProperties::Text::TextEquation(oFirstStyle.m_pText, oSecondStyle.m_pText);
         NSConstValues::NSCssProperties::Border::BorderEquation(oFirstStyle.m_pBorder, oSecondStyle.m_pBorder);
+        NSConstValues::NSCssProperties::Display::DisplayEquation(oFirstStyle.m_pDisplay, oSecondStyle.m_pDisplay);
 
         oFirstStyle.ClearImportants();
         oSecondStyle.ClearImportants();
@@ -92,10 +96,20 @@ namespace NSCSS
         m_UnitMeasure = enUnitMeasure;
     }
 
+    void CCompiledStyle::SetSizeSourceWindow(const CSizeWindow &oSizeWindow)
+    {
+        m_oSourceWindow = oSizeWindow;
+    }
+
+    void CCompiledStyle::SetSizeDeviceWindow(const CSizeWindow &oSizeWindow)
+    {
+            m_oDeviceWindow = oSizeWindow;
+    }
+
     bool CCompiledStyle::Empty() const
     {
         return m_pBackground.Empty() && m_pBorder.Empty() &&
-               m_pFont.Empty() && m_pMargin.Empty() && m_pText.Empty();
+               m_pFont.Empty() && m_pMargin.Empty() && m_pText.Empty() && m_pDisplay.Empty();
     }
 
     void CCompiledStyle::AddPropSel(const std::wstring& sProperty, const std::wstring& sValue, const unsigned int unLevel, const bool& bHardMode)
@@ -245,13 +259,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddMargin(sValue, unLevel, true);
 
@@ -268,13 +282,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddTopMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddTopMargin(sValue, unLevel, true);
 
@@ -291,13 +305,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddRightMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddRightMargin(sValue, unLevel, true);
 
@@ -313,13 +327,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddBottomMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddBottomMargin(sValue, unLevel, true);
 
@@ -336,13 +350,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddLeftMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddLeftMargin(sValue, unLevel, true);
 
@@ -352,6 +366,7 @@ namespace NSCSS
                 }
                 //PADDING
                 CASE(L"padding"):
+                CASE(L"mso-padding-alt"):
                 {
                     if (bIsThereBorder)
                         break;
@@ -359,13 +374,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddMargin(sValue, unLevel, true);
 
@@ -375,6 +390,7 @@ namespace NSCSS
                     break;
                 }
                 CASE(L"padding-top"):
+                CASE(L"mso-padding-top-alt"):
                 {
                     if (bIsThereBorder)
                         break;
@@ -382,13 +398,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddTopMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddTopMargin(sValue, unLevel, true);
 
@@ -398,6 +414,7 @@ namespace NSCSS
                     break;
                 }
                 CASE(L"padding-right"):
+                CASE(L"mso-padding-right-alt"):
                 {
                     if (bIsThereBorder)
                         break;
@@ -406,13 +423,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddRightMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddRightMargin(sValue, unLevel, true);
 
@@ -422,6 +439,7 @@ namespace NSCSS
                     break;
                 }
                 CASE(L"padding-bottom"):
+                CASE(L"mso-padding-bottom-alt"):
                 {
                     if (bIsThereBorder)
                         break;
@@ -429,13 +447,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddBottomMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionY);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddBottomMargin(sValue, unLevel, true);
 
@@ -445,6 +463,7 @@ namespace NSCSS
                     break;
                 }
                 CASE(L"padding-left"):
+                CASE(L"mso-padding-left-alt"):
                 {
                     if (bIsThereBorder)
                         break;
@@ -452,13 +471,13 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddLeftMargin(sValue, unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f);
+                        const std::wstring sValue = ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX);
                         if (sValue.find_first_not_of(L" 0") != std::wstring::npos)
                             m_pMargin.AddLeftMargin(sValue, unLevel, true);
 
@@ -488,11 +507,11 @@ namespace NSCSS
                     const size_t unPositionImp = pPropertie.second.find(L"!i");
                     if (unPositionImp == std::wstring::npos)
                     {
-                        m_pText.SetIndent(ConvertUnitMeasure(pPropertie.second, 540.0f), unLevel, bHardMode);
+                        m_pText.SetIndent(ConvertUnitMeasure(pPropertie.second, 540.0f, ScalingDirectionX), unLevel, bHardMode);
                     }
                     else if (unPositionImp != 0)
                     {
-                        m_pText.SetIndent(ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f), unLevel, true);
+                        m_pText.SetIndent(ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), 540.0f, ScalingDirectionX), unLevel, true);
                         m_pText.SetImportantIndent(true);
                     }
 
@@ -915,6 +934,71 @@ namespace NSCSS
 
                     break;
                 }
+                //DISPLAY
+                CASE(L"display"):
+                {
+                        const size_t unPositionImp = pPropertie.second.find(L"!i");
+                        if (unPositionImp == std::wstring::npos)
+                        {
+                            m_pDisplay.SetDisplay(pPropertie.second, unLevel, bHardMode);
+                        }
+                        else if (unPositionImp != 0)
+                        {
+                            m_pDisplay.SetDisplay(pPropertie.second.substr(0, unPositionImp - 1), unLevel, true);
+                            m_pDisplay.SetImportantDisplay(true);
+                        }
+
+                        break;
+                }
+                //OTHER
+                CASE(L"width"):
+                {
+                        if (bIsThereBorder)
+                            break;
+
+                        const size_t unPositionImp = pPropertie.second.find(L"!i");
+                        if (unPositionImp == std::wstring::npos)
+                        {
+                            m_pDisplay.SetWidth(ConvertUnitMeasure(pPropertie.second, m_oDeviceWindow.m_ushWidth, ScalingDirectionX), unLevel, bHardMode);
+                        }
+                        else if (unPositionImp != 0)
+                        {
+                            m_pDisplay.SetWidth(ConvertUnitMeasure(pPropertie.second.substr(0, unPositionImp - 1), m_oDeviceWindow.m_ushWidth, ScalingDirectionX), unLevel, true);
+                            m_pDisplay.SetImportantWidth(true);
+                        }
+
+//                        std::wstring wsWidth;
+
+
+
+//                        if (unPositionImp == std::wstring::npos)
+//                            wsWidth = pPropertie.second;
+//                        else
+//                            wsWidth = pPropertie.second.substr(0, unPositionImp - 1);
+
+//                        wsWidth = ConvertUnitMeasure(wsWidth, m_oDeviceWindow.m_ushWidth, ScalingDirectionX);
+//                        int nWidth = std::stoi(wsWidth);
+
+//                        if (m_oDeviceWindow.m_ushWidth != nWidth)
+//                                m_pDisplay.SetWidth(m_oDeviceWindow.m_ushWidth - nWidth, unLevel);
+
+                        break;
+                }
+                CASE(L"align"):
+                {
+
+                        const size_t unPositionImp = pPropertie.second.find(L"!i");
+                        if (unPositionImp == std::wstring::npos)
+                        {
+                            m_pDisplay.SetAlign(pPropertie.second, unLevel, bHardMode);
+                        }
+                        else if (unPositionImp != 0)
+                        {
+                            m_pDisplay.SetAlign(pPropertie.second.substr(0, unPositionImp - 1), unLevel, true);
+                            m_pDisplay.SetImportantAlign(true);
+                        }
+                        break;
+                }
             }
         }
     }
@@ -990,7 +1074,7 @@ namespace NSCSS
         m_pText         .ClearImportants();
     }
 
-        std::wstring CCompiledStyle::ConvertUnitMeasure(const std::wstring &sValue, const float& fPreviousValue) const
+        std::wstring CCompiledStyle::ConvertUnitMeasure(const std::wstring &sValue, const float& fPreviousValue, ScalingDirection enScalingDirection) const
         {
             if (sValue.empty())
                 return sValue;
@@ -1031,7 +1115,11 @@ namespace NSCSS
                 }
                 else if (sValueTemp.find(L"px") != std::wstring::npos)
                 {
-                    sValueString += ConvertPx(sValueTemp);
+                    int nValue = ConvertPx(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1040,7 +1128,11 @@ namespace NSCSS
                 }
                 else if (sValueTemp.find(L"cm") != std::wstring::npos)
                 {
-                    sValueString += ConvertCm(sValueTemp);
+                    int nValue = ConvertCm(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1049,7 +1141,11 @@ namespace NSCSS
                 }
                 else if (sValueTemp.find(L"mm") != std::wstring::npos)
                 {
-                    sValueString += ConvertMm(sValueTemp);
+                    int nValue = ConvertMm(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1057,8 +1153,12 @@ namespace NSCSS
                         sValueString += L' ';
                 }
                 else if (sValueTemp.find(L"in") != std::wstring::npos)
-                {
-                    sValueString += ConvertIn(sValueTemp);
+                {       
+                    int nValue = ConvertIn(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1067,7 +1167,11 @@ namespace NSCSS
                 }
                 else if (sValueTemp.find(L"pt") != std::wstring::npos)
                 {
-                    sValueString += ConvertPt(sValueTemp);
+                    int nValue = ConvertPt(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1076,7 +1180,11 @@ namespace NSCSS
                 }
                 else if (sValueTemp.find(L"pc") != std::wstring::npos)
                 {
-                    sValueString += ConvertPc(sValueTemp);
+                    int nValue = ConvertPc(sValueTemp);
+
+                    Scale(nValue, enScalingDirection);
+
+                    sValueString += std::to_wstring(nValue);
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
                         sValueString += L';';
@@ -1086,6 +1194,7 @@ namespace NSCSS
                 else if (sValueTemp.find(L"em") != std::wstring::npos)
                 {
                     const float fValue = wcstof(sValueTemp.c_str(), NULL) * m_pFont.GetSize();
+
                     sValueString += std::to_wstring(static_cast<short int>(fValue + 0.5f));
 
                     if (sValueTemp.find(L';') != std::wstring::npos)
@@ -1095,7 +1204,16 @@ namespace NSCSS
                 }
                 else
                 {
-                    sValueString += sValueTemp;
+                    if (iswdigit(sValueTemp[0]))
+                    {
+                        int nValue = static_cast<int>(wcstof(sValueTemp.c_str(), NULL) + 0.5f);
+
+                        Scale(nValue, enScalingDirection);
+
+                        sValueString += std::to_wstring(nValue);
+                    }
+                    else
+                        sValueString += sValueTemp;
 
                     if (sValueTemp.find(L";") != std::wstring::npos)
                         sValueString += L';';
@@ -1110,10 +1228,26 @@ namespace NSCSS
             return sValueString;
         }
 
-        inline std::wstring CCompiledStyle::ConvertPx(const std::wstring& sValue) const
+        void CCompiledStyle::Scale(int &nValue, ScalingDirection enScalingDirection) const
+        {
+                if (ScalingDirectionNone == enScalingDirection)
+                        return;
+                else if (ScalingDirectionX == enScalingDirection && 0 != m_oSourceWindow.m_ushWidth &&
+                    0 != m_oDeviceWindow.m_ushWidth && m_oSourceWindow.m_ushWidth != m_oDeviceWindow.m_ushWidth)
+                {
+                        nValue = static_cast<int>((double)nValue / m_oSourceWindow.m_ushWidth * m_oDeviceWindow.m_ushWidth + 0.5f);
+                }
+                else if (ScalingDirectionY == enScalingDirection && 0 != m_oSourceWindow.m_ushHeight &&
+                         0 != m_oDeviceWindow.m_ushHeight && m_oSourceWindow.m_ushHeight != m_oDeviceWindow.m_ushHeight)
+                {
+                        nValue = static_cast<int>((double)nValue / m_oSourceWindow.m_ushHeight * m_oDeviceWindow.m_ushHeight + 0.5f);
+                }
+        }
+
+        inline int CCompiledStyle::ConvertPx(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"px") - 1);
             const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
@@ -1121,7 +1255,7 @@ namespace NSCSS
             switch (m_UnitMeasure)
             {
                 case Pixel:
-                    return std::to_wstring(static_cast<short int>(dValue));;
+                    return static_cast<int>(dValue);
                 case Default:
                 case Point:
                     return ConvertPxToPt(dValue);
@@ -1135,53 +1269,39 @@ namespace NSCSS
                     return ConvertPxToPc(dValue);
             }
 
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertPxToCm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPxToCm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / static_cast<float>(m_nDpi) * 2.54f + 0.5f));
+            return static_cast<int>(dValue / m_nDpi * 2.54f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPxToIn(const float& dValue) const
+        inline int CCompiledStyle::ConvertPxToIn(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(1.0f / static_cast<float>(m_nDpi) * dValue + 0.5f));
+            return static_cast<int>(1.0f / static_cast<float>(m_nDpi) * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPxToMm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPxToMm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / static_cast<float>(m_nDpi) * 25.4f + 0.5f));
+            return static_cast<int>(dValue / static_cast<float>(m_nDpi) * 25.4f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPxToPc(const float& dValue) const
+        inline int CCompiledStyle::ConvertPxToPc(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(0.16667f / static_cast<float>(m_nDpi) * dValue + 0.5f));
+            return static_cast<int>(0.16667f / static_cast<float>(m_nDpi) * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPxToPt(const float& dValue) const
+        inline int CCompiledStyle::ConvertPxToPt(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(72.0f /  static_cast<float>(m_nDpi) * dValue + 0.5f));
+            return static_cast<int>(72.0f /  static_cast<float>(m_nDpi) * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertCm(const std::wstring& sValue) const
+        inline int CCompiledStyle::ConvertCm(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"cm") - 1);
             const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
@@ -1194,7 +1314,7 @@ namespace NSCSS
                 case Pixel:
                     return ConvertCmToPx(dValue);
                 case Cantimeter:
-                    return std::to_wstring(static_cast<short int>(dValue));;
+                    return static_cast<int>(dValue);
                 case Millimeter:
                     return ConvertCmToMm(dValue);
                 case Inch:
@@ -1203,53 +1323,38 @@ namespace NSCSS
                     return ConvertCmToPc(dValue);
             }
 
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertCmToIn(const float& dValue) const
+        inline int CCompiledStyle::ConvertCmToIn(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / 2.54f + 0.5f));
+            return static_cast<int>(dValue / 2.54f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertCmToMm(const float& dValue) const
+        inline int CCompiledStyle::ConvertCmToMm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 10.0f + 0.5f));
+            return static_cast<int>(dValue * 10.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertCmToPc(const float& dValue) const
+        inline int CCompiledStyle::ConvertCmToPc(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(2.36f * dValue + 0.5f));
+            return static_cast<int>(2.36f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertCmToPt(const float& dValue) const
+        inline int CCompiledStyle::ConvertCmToPt(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(28.35f * dValue + 0.5f));
+            return static_cast<int>(28.35f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertCmToPx(const float& dValue) const
+        inline int CCompiledStyle::ConvertCmToPx(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(static_cast<float>(m_nDpi) / 2.54f * dValue + 0.5f));
+            return static_cast<int>(static_cast<float>(m_nDpi) / 2.54f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertMm(const std::wstring& sValue) const
+        inline int CCompiledStyle::ConvertMm(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"mm") - 1);
             const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
@@ -1264,59 +1369,47 @@ namespace NSCSS
                 case Cantimeter:
                     return ConvertMmToCm(dValue);
                 case Millimeter:
-                    return std::to_wstring(static_cast<short int>(dValue));;
+                    return static_cast< int>(dValue);
                 case Inch:
                     return ConvertMmToIn(dValue);
                 case Peak:
                     return ConvertMmToPc(dValue);
             }
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertMmToIn(const float& dValue) const
+        inline int CCompiledStyle::ConvertMmToIn(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / 25.4f + 0.5f));
+            return static_cast<int>(dValue / 25.4f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertMmToCm(const float& dValue) const
+        inline int CCompiledStyle::ConvertMmToCm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(dValue / 10.0f + 0.5f));
+            return static_cast<int>(dValue / 10.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertMmToPc(const float& dValue) const
+        inline int CCompiledStyle::ConvertMmToPc(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(2.8346f * dValue + 0.5f));
+            return static_cast<int>(2.8346f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertMmToPt(const float& dValue) const
+        inline int CCompiledStyle::ConvertMmToPt(const float& dValue) const
         {
-            if (dValue == 0)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(0.23262f * dValue + 0.5f));
+            return static_cast<int>(0.23262f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertMmToPx(const float& dValue) const
+        inline int CCompiledStyle::ConvertMmToPx(const float& dValue) const
         {
-            if (dValue == 0)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(static_cast<float>(m_nDpi) / 25.4f * dValue + 0.5f));
+            return static_cast<int>(static_cast<float>(m_nDpi) / 25.4f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertIn(const std::wstring& sValue) const
+        inline int CCompiledStyle::ConvertIn(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"in") - 1);
             const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
@@ -1333,60 +1426,48 @@ namespace NSCSS
                 case Millimeter:
                     return ConvertInToMm(dValue);
                 case Inch:
-                    return std::to_wstring(static_cast<short int>(dValue));;
+                    return static_cast<int>(dValue);
                 case Peak:
                     return ConvertInToPc(dValue);
             }
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertInToMm(const float& dValue) const
+        inline int CCompiledStyle::ConvertInToMm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 25.4f + 0.5f));
+            return static_cast<int>(dValue * 25.4f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertInToCm(const float& dValue) const
+        inline int CCompiledStyle::ConvertInToCm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(dValue * 2.54f + 0.5f));
+            return static_cast<int>(dValue * 2.54f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertInToPc(const float& dValue) const
+        inline int CCompiledStyle::ConvertInToPc(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(dValue / 72.0f + 0.5f));
+            return static_cast<int>(dValue / 72.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertInToPt(const float& dValue) const
+        inline int CCompiledStyle::ConvertInToPt(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
 
-            return std::to_wstring(static_cast<short int>(dValue / 6.0f + 0.5f));
+            return static_cast<int>(dValue / 6.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertInToPx(const float& dValue) const
+        inline int CCompiledStyle::ConvertInToPx(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * static_cast<float>(m_nDpi) + 0.5f));
+            return static_cast<short int>(dValue * static_cast<float>(m_nDpi) + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPt(const std::wstring& sValue) const
+        inline int CCompiledStyle::ConvertPt(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"pt") - 1);
-            const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
+            float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
 
             switch (m_UnitMeasure)
             {
@@ -1394,7 +1475,7 @@ namespace NSCSS
                     return ConvertPtToPx(dValue);
                 case Default:
                 case Point:
-                    return std::to_wstring(static_cast<short int>(dValue));
+                        return static_cast<int>(dValue + 0.5f);
                 case Cantimeter:
                     return ConvertPtToCm(dValue);
                 case Millimeter:
@@ -1405,53 +1486,38 @@ namespace NSCSS
                     return ConvertPtToPc(dValue);
             }
 
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertPtToIn(const float& dValue) const
+        inline int CCompiledStyle::ConvertPtToIn(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring((dValue / 72.0f + 0.5f));
+            return static_cast<int>(dValue / 72.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPtToCm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPtToCm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 0.03528f + 0.5f));
+            return static_cast<int>(dValue * 0.03528f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPtToPc(const float& dValue) const
+        inline int CCompiledStyle::ConvertPtToPc(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / 12.0f + 0.5f));
+            return static_cast<int>(dValue / 12.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPtToMm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPtToMm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring((dValue * 0.3528f + 0.5f));
+            return static_cast<int>(dValue * 0.3528f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPtToPx(const float& dValue) const
+        inline int CCompiledStyle::ConvertPtToPx(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(static_cast<float>(m_nDpi) / 72.0f * dValue + 0.5f));
+            return static_cast<short int>(static_cast<float>(m_nDpi) / 72.0f * dValue + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPc(const std::wstring& sValue) const
+        inline int CCompiledStyle::ConvertPc(const std::wstring& sValue) const
         {
             if (sValue.empty())
-                return std::wstring();
+                return 0;
 
             const std::wstring& sConvertValue = sValue.substr(0, sValue.find_last_of(L"pc") - 1);
             const float dValue = wcstof(sConvertValue.c_str(), NULL) * 2.0f;
@@ -1470,50 +1536,35 @@ namespace NSCSS
                 case Inch:
                     return ConvertPcToIn(dValue);
                 case Peak:
-                    return std::to_wstring(static_cast<short int>(dValue));
+                    return static_cast<int>(dValue);
             }
 
-            return std::wstring();
+            return 0;
         }
 
-        inline std::wstring CCompiledStyle::ConvertPcToIn(const float& dValue) const
+        inline int CCompiledStyle::ConvertPcToIn(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue / 6.0f + 0.5f));
+            return static_cast<int>(dValue / 6.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPcToCm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPcToCm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 0.423f + 0.5f));
+            return static_cast<int>(dValue * 0.423f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPcToPt(const float& dValue) const
+        inline int CCompiledStyle::ConvertPcToPt(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 12.0f + 0.5f));
+            return static_cast<int>(dValue * 12.0f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPcToMm(const float& dValue) const
+        inline int CCompiledStyle::ConvertPcToMm(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(dValue * 4.23f + 0.5f));
+            return static_cast<int>(dValue * 4.23f + 0.5f);
         }
 
-        inline std::wstring CCompiledStyle::ConvertPcToPx(const float& dValue) const
+        inline int CCompiledStyle::ConvertPcToPx(const float& dValue) const
         {
-            if (dValue == 0.0f)
-                return std::wstring(L"0");
-
-            return std::to_wstring(static_cast<short int>(static_cast<float>(m_nDpi) / 6.0f * dValue + 0.5f));
+            return static_cast<int>(static_cast<float>(m_nDpi) / 6.0f * dValue + 0.5f);
         }
     }
 

Common/3dParty/html/css/src/CCompiledStyle.h

@@ -19,49 +19,54 @@ namespace NSCSS
         unsigned short int m_nDpi;
         UnitMeasure m_UnitMeasure;
 
-        std::wstring ConvertUnitMeasure(const std::wstring& sValue, const float& fPreviousValue) const;
+        CSizeWindow m_oSourceWindow;
+        CSizeWindow m_oDeviceWindow;
 
-        std::wstring ConvertPx(const std::wstring& sValue) const;
-        std::wstring ConvertPxToCm(const float& dValue) const;
-        std::wstring ConvertPxToIn(const float& dValue) const;
-        std::wstring ConvertPxToMm(const float& dValue) const;
-        std::wstring ConvertPxToPt(const float& dValue) const;
-        std::wstring ConvertPxToPc(const float& dValue) const;
+        std::wstring ConvertUnitMeasure(const std::wstring& sValue, const float& fPreviousValue, ScalingDirection enScalingDirection = ScalingDirectionNone) const;
 
-        std::wstring ConvertCm(const std::wstring& sValue) const;
-        std::wstring ConvertCmToPx(const float& dValue) const;
-        std::wstring ConvertCmToIn(const float& dValue) const;
-        std::wstring ConvertCmToMm(const float& dValue) const;
-        std::wstring ConvertCmToPt(const float& dValue) const;
-        std::wstring ConvertCmToPc(const float& dValue) const;
+        void Scale(int &nValue, ScalingDirection enScalingDirection) const;
 
-        std::wstring ConvertMm(const std::wstring& sValue) const;
-        std::wstring ConvertMmToPx(const float& dValue) const;
-        std::wstring ConvertMmToIn(const float& dValue) const;
-        std::wstring ConvertMmToCm(const float& dValue) const;
-        std::wstring ConvertMmToPt(const float& dValue) const;
-        std::wstring ConvertMmToPc(const float& dValue) const;
+        int ConvertPx(const std::wstring& sValue) const;
+        int ConvertPxToCm(const float& dValue) const;
+        int ConvertPxToIn(const float& dValue) const;
+        int ConvertPxToMm(const float& dValue) const;
+        int ConvertPxToPt(const float& dValue) const;
+        int ConvertPxToPc(const float& dValue) const;
 
-        std::wstring ConvertIn(const std::wstring& sValue) const;
-        std::wstring ConvertInToPx(const float& dValue) const;
-        std::wstring ConvertInToMm(const float& dValue) const;
-        std::wstring ConvertInToCm(const float& dValue) const;
-        std::wstring ConvertInToPt(const float& dValue) const;
-        std::wstring ConvertInToPc(const float& dValue) const;
+        int ConvertCm(const std::wstring& sValue) const;
+        int ConvertCmToPx(const float& dValue) const;
+        int ConvertCmToIn(const float& dValue) const;
+        int ConvertCmToMm(const float& dValue) const;
+        int ConvertCmToPt(const float& dValue) const;
+        int ConvertCmToPc(const float& dValue) const;
 
-        std::wstring ConvertPt(const std::wstring& sValue) const;
-        std::wstring ConvertPtToPx(const float& dValue) const;
-        std::wstring ConvertPtToMm(const float& dValue) const;
-        std::wstring ConvertPtToCm(const float& dValue) const;
-        std::wstring ConvertPtToIn(const float& dValue) const;
-        std::wstring ConvertPtToPc(const float& dValue) const;
+        int ConvertMm(const std::wstring& sValue) const;
+        int ConvertMmToPx(const float& dValue) const;
+        int ConvertMmToIn(const float& dValue) const;
+        int ConvertMmToCm(const float& dValue) const;
+        int ConvertMmToPt(const float& dValue) const;
+        int ConvertMmToPc(const float& dValue) const;
 
-        std::wstring ConvertPc(const std::wstring& sValue) const;
-        std::wstring ConvertPcToPx(const float& dValue) const;
-        std::wstring ConvertPcToMm(const float& dValue) const;
-        std::wstring ConvertPcToCm(const float& dValue) const;
-        std::wstring ConvertPcToIn(const float& dValue) const;
-        std::wstring ConvertPcToPt(const float& dValue) const;
+        int ConvertIn(const std::wstring& sValue) const;
+        int ConvertInToPx(const float& dValue) const;
+        int ConvertInToMm(const float& dValue) const;
+        int ConvertInToCm(const float& dValue) const;
+        int ConvertInToPt(const float& dValue) const;
+        int ConvertInToPc(const float& dValue) const;
+
+        int ConvertPt(const std::wstring& sValue) const;
+        int ConvertPtToPx(const float& dValue) const;
+        int ConvertPtToMm(const float& dValue) const;
+        int ConvertPtToCm(const float& dValue) const;
+        int ConvertPtToIn(const float& dValue) const;
+        int ConvertPtToPc(const float& dValue) const;
+
+        int ConvertPc(const std::wstring& sValue) const;
+        int ConvertPcToPx(const float& dValue) const;
+        int ConvertPcToMm(const float& dValue) const;
+        int ConvertPcToCm(const float& dValue) const;
+        int ConvertPcToIn(const float& dValue) const;
+        int ConvertPcToPt(const float& dValue) const;
 
     public:
 
@@ -70,6 +75,7 @@ namespace NSCSS
         NSConstValues::NSCssProperties::Background  m_pBackground;
         NSConstValues::NSCssProperties::Text        m_pText;
         NSConstValues::NSCssProperties::Border      m_pBorder;
+        NSConstValues::NSCssProperties::Display     m_pDisplay;
 
         CCompiledStyle();
         explicit CCompiledStyle(const std::map<std::wstring, std::wstring>& mStyle);
@@ -79,6 +85,8 @@ namespace NSCSS
 
         void SetDpi(const unsigned short& uiDpi);
         void SetUnitMeasure(const UnitMeasure& enUnitMeasure);
+        void SetSizeSourceWindow(const CSizeWindow& oSizeWindow);
+        void SetSizeDeviceWindow(const CSizeWindow& oSizeWindow);
 
         bool Empty() const;
 

Common/3dParty/html/css/src/CCssCalculator.cpp

@@ -46,7 +46,27 @@ namespace NSCSS
 
     void CCssCalculator::SetBodyTree(const CTree &oTree)
     {
-        m_pInternal->SetBodyTree(oTree);
+            m_pInternal->SetBodyTree(oTree);
+    }
+
+    void CCssCalculator::SetSizeSourceWindow(const CSizeWindow &oSizeWindow)
+    {
+            m_pInternal->SetSizeSourceWindow(oSizeWindow);
+    }
+
+    void CCssCalculator::SetSizeDeviceWindow(const CSizeWindow &oSizeWindow)
+    {
+            m_pInternal->SetSizeDeviceWindow(oSizeWindow);
+    }
+
+    CSizeWindow CCssCalculator::GetSizeSourceWindow() const
+    {
+            return m_pInternal->GetSizeSourceWindow();
+    }
+
+    CSizeWindow CCssCalculator::GetSizeDeviceWindow() const
+    {
+            return m_pInternal->GetSizeDeviceWindow();
     }
 
     UnitMeasure CCssCalculator::GetUnitMeasure() const

Common/3dParty/html/css/src/CCssCalculator.h

@@ -30,6 +30,11 @@ namespace NSCSS
         void SetDpi(const unsigned short int& nValue);
         void SetBodyTree(const CTree &oTree);
 
+        void SetSizeSourceWindow(const CSizeWindow& oSizeWindow);
+        void SetSizeDeviceWindow(const CSizeWindow& oSizeWindow);
+
+        CSizeWindow GetSizeSourceWindow() const;
+        CSizeWindow GetSizeDeviceWindow() const;
 
         UnitMeasure GetUnitMeasure() const;
         std::wstring GetEncoding()   const;

Common/3dParty/html/css/src/CCssCalculator_Private.cpp

@@ -326,13 +326,19 @@ namespace NSCSS
             oStyle.SetUnitMeasure(m_UnitMeasure);
             oStyle.SetID(arSelectors.back().m_sName + ((!arSelectors.back().m_sClass.empty()) ? L'.' + arSelectors.back().m_sClass : L"") + ((arSelectors.back().m_sId.empty()) ? L"" : L'#' + arSelectors.back().m_sId) + L'-' + std::to_wstring(++m_nCountNodes));
 
+            oStyle.SetSizeDeviceWindow(m_oDeviceWindow);
+            oStyle.SetSizeSourceWindow(m_oSourceWindow);
+
             return oStyle;
         }
 
-        CCompiledStyle *oStyle = new CCompiledStyle();
+        CCompiledStyle *pStyle = new CCompiledStyle();
 
-        oStyle->SetDpi(m_nDpi);
-        oStyle->SetUnitMeasure(m_UnitMeasure);
+        pStyle->SetDpi(m_nDpi);
+        pStyle->SetUnitMeasure(m_UnitMeasure);
+
+        pStyle->SetSizeDeviceWindow(m_oDeviceWindow);
+        pStyle->SetSizeSourceWindow(m_oSourceWindow);
 
         std::vector<std::wstring> arWords;
         arWords.reserve(arSelectors.size() * 2);
@@ -345,10 +351,10 @@ namespace NSCSS
             arWords.push_back(oNode->m_sName);
 
             if (oNode->m_sName == L"td")
-                oStyle->m_pMargin.SetPermission(false);
+                pStyle->m_pMargin.SetPermission(false);
 
             if (oNode->m_sName == L"table")
-                oStyle->m_pBorder.Block();
+                pStyle->m_pBorder.Block();
 
             if (!oNode->m_sClass.empty())
             {
@@ -415,7 +421,7 @@ namespace NSCSS
             sName = arWords.back();
             arWords.pop_back();
             arNextNodes.push_back(sName);
-            oStyle->AddParent(sName);
+            pStyle->AddParent(sName);
 
             const std::map<std::wstring, CElement*>::const_iterator oFindName = m_mData.find(sName);
             std::map<std::wstring, CElement*>::const_iterator oFindId;
@@ -496,25 +502,27 @@ namespace NSCSS
                           });
             }
 
+            pStyle->AddStyle(arSelectors[i].m_mAttrs, i + 1);
+
             for (const CElement* oElement : arFindElements)
-                oStyle->AddStyle(oElement->GetStyle(), i + 1);
+                pStyle->AddStyle(oElement->GetStyle(), i + 1);
 
             std::map<StatistickElement, unsigned int>::const_iterator oFindCountStyle = m_mStatictics->find(StatistickElement{StatistickElement::IsStyle, arSelectors[i].m_sStyle});
 
             if(oFindCountStyle != m_mStatictics->end())
                 if ((bIsSettings && oFindCountStyle->second <  MaxNumberRepetitions) ||
                    (!bIsSettings && oFindCountStyle->second >= MaxNumberRepetitions))
-                    oStyle->AddStyle(arSelectors[i].m_sStyle, i + 1,  true);
+                    pStyle->AddStyle(arSelectors[i].m_sStyle, i + 1,  true);
 
         }
 
         if (!bIsSettings)
         {
-            oStyle->SetID(arSelectors.back().m_sName + ((!arSelectors.back().m_sClass.empty()) ? L'.' + arSelectors.back().m_sClass : L"") + ((arSelectors.back().m_sId.empty()) ? L"" : L'#' + arSelectors.back().m_sId) + L'-' + std::to_wstring(++m_nCountNodes));
-            m_mUsedStyles[arSelectors] = oStyle;
+            pStyle->SetID(arSelectors.back().m_sName + ((!arSelectors.back().m_sClass.empty()) ? L'.' + arSelectors.back().m_sClass : L"") + ((arSelectors.back().m_sId.empty()) ? L"" : L'#' + arSelectors.back().m_sId) + L'-' + std::to_wstring(++m_nCountNodes));
+            m_mUsedStyles[arSelectors] = pStyle;
         }
 
-        return *oStyle;
+        return *pStyle;
     }
 
     void CCssCalculator_Private::AddStyles(const std::string &sStyle)
@@ -558,6 +566,26 @@ namespace NSCSS
         CTree::CountingNumberRepetitions(oTree, *m_mStatictics);
     }
 
+    void CCssCalculator_Private::SetSizeSourceWindow(const CSizeWindow &oSizeWindow)
+    {
+            m_oSourceWindow = oSizeWindow;
+    }
+
+    void CCssCalculator_Private::SetSizeDeviceWindow(const CSizeWindow &oSizeWindow)
+    {
+            m_oDeviceWindow = oSizeWindow;
+    }
+
+    CSizeWindow CCssCalculator_Private::GetSizeSourceWindow() const
+    {
+            return m_oSourceWindow;
+    }
+
+    CSizeWindow CCssCalculator_Private::GetSizeDeviceWindow() const
+    {
+            return m_oDeviceWindow;
+    }
+
     void CCssCalculator_Private::SetUnitMeasure(const UnitMeasure& nType)
     {
         m_UnitMeasure = nType;
@@ -587,6 +615,9 @@ namespace NSCSS
 
         m_mData.clear();
         m_arFiles.clear();
+
+        m_oDeviceWindow.Clear();
+        m_oSourceWindow.Clear();
     }
 }
 inline static std::wstring StringifyValueList(const KatanaArray* oValues)

Common/3dParty/html/css/src/CCssCalculator_Private.h

@@ -27,6 +27,9 @@ namespace NSCSS
 
         std::wstring m_sEncoding;
 
+        CSizeWindow m_oSourceWindow;
+        CSizeWindow m_oDeviceWindow;
+
         void GetStylesheet(const KatanaStylesheet* oStylesheet);
         void GetRule(const KatanaRule* oRule);
 
@@ -56,6 +59,12 @@ namespace NSCSS
         void SetDpi(unsigned short int nValue);
         void SetBodyTree(const CTree &oTree);
 
+        void SetSizeSourceWindow(const CSizeWindow& oSizeWindow);
+        void SetSizeDeviceWindow(const CSizeWindow& oSizeWindow);
+
+        CSizeWindow GetSizeSourceWindow() const;
+        CSizeWindow GetSizeDeviceWindow() const;
+
         UnitMeasure GetUnitMeasure() const;
         std::wstring GetEncoding() const;
         unsigned short int GetDpi() const;

Common/3dParty/html/css/src/CNode.h

@@ -3,6 +3,7 @@
 
 #include <string>
 #include <vector>
+#include <map>
 
 namespace NSCSS
 {
@@ -12,6 +13,7 @@ namespace NSCSS
         std::wstring m_sClass; // Класс тэга
         std::wstring m_sId;    // Id тэга
         std::wstring m_sStyle; // Стиль тэга
+        std::map<std::wstring, std::wstring> m_mAttrs; // Остальные аттрибуты тэга
 
         CNode(){};
         CNode(std::wstring sName, std::wstring sClass, std::wstring sId) : m_sName(sName), m_sClass(sClass), m_sId(sId){};

Common/3dParty/html/css/src/ConstValues.h

@@ -19,6 +19,43 @@ namespace NSCSS
         Peak
     } UnitMeasure;
 
+    typedef enum
+    {
+        ScalingDirectionNone = 0,
+        ScalingDirectionX = 1,
+        ScalingDirectionY = 2
+    } ScalingDirection;
+
+    struct CSizeWindow
+    {
+            unsigned short m_ushWidth;
+            unsigned short m_ushHeight;
+
+            CSizeWindow()
+                    : m_ushWidth(0), m_ushHeight(0) {};
+            CSizeWindow(unsigned short unWidth, unsigned short unHeight)
+                    : m_ushWidth(unWidth), m_ushHeight(unHeight) {};
+
+            bool Empty() const
+            {
+                    return ((0 == m_ushWidth) && (0 == m_ushHeight));
+            }
+
+            void Clear()
+            {
+                    m_ushWidth = m_ushHeight = 0;
+            }
+
+            bool operator==(const CSizeWindow& oSizeWindow) const
+            {
+                    return ((m_ushWidth == oSizeWindow.m_ushWidth) && (m_ushHeight == oSizeWindow.m_ushHeight));
+            }
+            bool operator!=(const CSizeWindow& oSizeWindow) const
+            {
+                    return ((m_ushWidth != oSizeWindow.m_ushWidth) || (m_ushHeight != oSizeWindow.m_ushHeight));
+            }
+    };
+
     struct StatistickElement
     {
         enum TypeElement
@@ -121,6 +158,31 @@ namespace NSCSS
             };
         }
 
+        static const std::vector<std::wstring> arDisplayValues =
+        {
+                /* <display-outside> values */
+                L"block", L"inline", L"run-in",
+                /* <display-inside> values */
+                L"flow", L"flow-root", L"table", L"flex", L"grid", L"ruby",
+                /* <display-outside> plus <display-inside> values */
+                L"block flow", L"inline table", L"flex run-in",
+                /* <display-listitem> values */
+                L"list-item", L"list-item block", L"list-item inline", L"list-item flow",
+                L"list-item flow-root", L"list-item block flow",
+                L"list-item block flow-root", L"flow list-item block",
+                /* <display-internal> values */
+                L"table-row-group", L"table-header-group", L"table-footer-group",
+                L"table-row", L"table-cell", L"table-column-group", L"table-column",
+                L"table-caption", L"ruby-base", L"ruby-text", L"ruby-base-container",
+                L"ruby-text-container",
+                /* <display-box> values */
+                L"contents", L"none",
+                /* <display-legacy> values */
+                L"inline-block", L"inline-table", L"inline-flex", L"inline-grid",
+                /* Global values */
+                L"inherit", L"initial", L"unset"
+        };
+
         namespace NSProperties {
 
             typedef enum
@@ -1301,7 +1363,7 @@ namespace NSCSS
                 normal
             };
 
-            enum class TextAlign
+            enum class Align
             {
                 none = 0,
                 left,
@@ -1313,7 +1375,7 @@ namespace NSCSS
             class Text
             {
                 float fIndent;
-                TextAlign enAlign;
+                Align enAlign;
                 TextDecoration enDecoration;
                 std::wstring sColor; //HEX color
 
@@ -1323,7 +1385,7 @@ namespace NSCSS
             public:
 
                 Text() : fIndent        (fNoneValue),
-                         enAlign        (TextAlign::none),
+                         enAlign        (Align::none),
                          enDecoration   (TextDecoration::none),
                          bImportants    ({false, false, false, false}),
                          arLevels       ({0, 0, 0, 0}){}
@@ -1337,7 +1399,7 @@ namespace NSCSS
                 {
                     if (oText.fIndent != fNoneValue)
                         fIndent = oText.fIndent;
-                    if (oText.enAlign != TextAlign::none)
+                    if (oText.enAlign != Align::none)
                         enAlign = oText.enAlign;
                     if (oText.enDecoration != TextDecoration::none)
                         enDecoration = oText.enDecoration;
@@ -1363,16 +1425,16 @@ namespace NSCSS
                             oSecondText.fIndent = fNoneValue;
                     }
 
-                    if (oFirstText.bImportants[1] && !oSecondText.bImportants[1] && oFirstText.enAlign != TextAlign::none)
-                        oSecondText.enAlign = TextAlign::none;
-                    else if (oSecondText.bImportants[1] && !oFirstText.bImportants[1] && oSecondText.enAlign != TextAlign::none)
-                        oFirstText.enAlign = TextAlign::none;
-                    else if (oFirstText.enAlign != TextAlign::none && oSecondText.enAlign != TextAlign::none)
+                    if (oFirstText.bImportants[1] && !oSecondText.bImportants[1] && oFirstText.enAlign != Align::none)
+                        oSecondText.enAlign = Align::none;
+                    else if (oSecondText.bImportants[1] && !oFirstText.bImportants[1] && oSecondText.enAlign != Align::none)
+                        oFirstText.enAlign = Align::none;
+                    else if (oFirstText.enAlign != Align::none && oSecondText.enAlign != Align::none)
                     {
                         if (oFirstText.arLevels[1] < oSecondText.arLevels[1])
-                            oFirstText.enAlign = TextAlign::none;
+                            oFirstText.enAlign = Align::none;
                         else
-                            oSecondText.enAlign = TextAlign::none;
+                            oSecondText.enAlign = Align::none;
                     }
 
                     if (oFirstText.bImportants[2] && !oSecondText.bImportants[2] && oFirstText.enDecoration != TextDecoration::none)
@@ -1410,7 +1472,7 @@ namespace NSCSS
 
                 bool Empty() const
                 {
-                    return fIndent == fNoneValue && enAlign == TextAlign::none &&
+                    return fIndent == fNoneValue && enAlign == Align::none &&
                            enDecoration == TextDecoration::none && sColor.empty();
                 }
 
@@ -1422,22 +1484,22 @@ namespace NSCSS
                     if (sAlign == L"center")
                     {
                         arLevels[1] = unLevel;
-                        enAlign = NSConstValues::NSCssProperties::TextAlign::center;
+                        enAlign = NSConstValues::NSCssProperties::Align::center;
                     }
                     else if(sAlign == L"justify")
                     {
                         arLevels[1] = unLevel;
-                        enAlign = NSConstValues::NSCssProperties::TextAlign::justify;
+                        enAlign = NSConstValues::NSCssProperties::Align::justify;
                     }
                     else if(sAlign == L"left" || sAlign == L"start")
                     {
                         arLevels[1] = unLevel;
-                        enAlign = NSConstValues::NSCssProperties::TextAlign::left;
+                        enAlign = NSConstValues::NSCssProperties::Align::left;
                     }
                     else if(sAlign == L"right" || sAlign == L"end")
                     {
                         arLevels[1] = unLevel;
-                        enAlign = NSConstValues::NSCssProperties::TextAlign::right;
+                        enAlign = NSConstValues::NSCssProperties::Align::right;
                     }
                 }
 
@@ -1560,13 +1622,13 @@ namespace NSCSS
 
                 std::wstring GetAlign() const
                 {
-                    if (enAlign == TextAlign::left)
+                    if (enAlign == Align::left)
                         return L"left";
-                    if (enAlign == TextAlign::center)
+                    if (enAlign == Align::center)
                         return L"center";
-                    if (enAlign == TextAlign::right)
+                    if (enAlign == Align::right)
                         return L"right";
-                    if (enAlign == TextAlign::justify)
+                    if (enAlign == Align::justify)
                         return L"both";
 
                     return std::wstring();
@@ -1701,7 +1763,7 @@ namespace NSCSS
 
                 bool Empty() const
                 {
-                    return fWidth  <= 0;
+                    return fWidth  < 0;
                 }
 
                 void SetWidthWithoutChecking(const float& fWidth, const unsigned int& unLevel, const bool &bHardMode = false)
@@ -1889,7 +1951,10 @@ namespace NSCSS
 
                 std::wstring GetStyle() const
                 {
-                    return (bBlock) ? L"auto" : sStyle;
+                    if (bBlock) return L"auto";
+                    if (0 == fWidth) return L"none";
+                    else if (L"auto" == sStyle) return L"single";
+                    else return sStyle;
                 }
 
                 std::wstring GetColor() const
@@ -1942,7 +2007,7 @@ namespace NSCSS
                         else if (iswdigit(sValue[0]))
                         {
                             const float fWidth = wcstof(sValue.c_str(), NULL);
-                            if (fWidth > 0.0f)
+                            if (fWidth >= 0.0f)
                                 oBorderSide.fWidth = fWidth;
                         }
                         else if (sValue.substr(0, 3) == L"rgb")
@@ -2444,8 +2509,10 @@ namespace NSCSS
 
                 Background operator+=(const Background& oBackground)
                 {
-                    if (oBackground.sColor.empty())
-                        sColor = oBackground.sColor;
+                    if (oBackground.sColor.empty() || (bImportants[0] && !oBackground.bImportants[0]))
+                        return *this;
+
+                    sColor = oBackground.sColor;
 
                     return *this;
                 }
@@ -2587,6 +2654,165 @@ namespace NSCSS
                     return L"";
                 }
             };
+
+            class Display
+            {
+                std::wstring wsDisplay;
+                int nWidth;
+                std::wstring wsAlign;
+
+                std::vector<bool> bImportants;
+                std::vector<unsigned int> arLevels;
+
+            public:
+                Display() : wsDisplay(L"inline"), nWidth(-1), wsAlign(), bImportants{false, false, false}, arLevels{0, 0, 0} {};
+
+                void ClearImportants()
+                {
+                    bImportants = {false, false, false};
+                }
+
+                Display operator+=(const Display& oDisplay)
+                {
+                    if (oDisplay.Empty())
+                        return *this;
+
+                    wsDisplay   = oDisplay.wsDisplay;
+                    nWidth      = oDisplay.nWidth;
+                    wsAlign     = oDisplay.wsAlign;
+
+                    return *this;
+                }
+
+                static void DisplayEquation(Display &oFirstDisplay, Display &oSecondDisplay)
+                {
+                    if (oFirstDisplay.bImportants[0] && !oSecondDisplay.bImportants[0] && !oFirstDisplay.wsDisplay.empty())
+                        oSecondDisplay.wsDisplay.clear();
+                    else if (oSecondDisplay.bImportants[0] && !oFirstDisplay.bImportants[0] && !oSecondDisplay.wsDisplay.empty())
+                        oFirstDisplay.wsDisplay.clear();
+                    else if (!oSecondDisplay.wsDisplay.empty())
+                    {
+                        if (oFirstDisplay.arLevels[0] < oSecondDisplay.arLevels[0])
+                            oFirstDisplay.wsDisplay.clear();
+                        else
+                            oSecondDisplay.wsDisplay.clear();
+                    }
+
+                    if (oFirstDisplay.bImportants[1] && !oSecondDisplay.bImportants[1] && oFirstDisplay.nWidth > 0)
+                        oSecondDisplay.nWidth = -1;
+                    else if (oSecondDisplay.bImportants[1] && !oFirstDisplay.bImportants[1] && oSecondDisplay.nWidth > 0)
+                        oFirstDisplay.nWidth = -1;
+                    else if (oSecondDisplay.nWidth > 0)
+                    {
+                        if (oFirstDisplay.arLevels[1] < oSecondDisplay.arLevels[1])
+                            oFirstDisplay.nWidth = -1;
+                        else
+                            oSecondDisplay.nWidth = -1;
+                    }
+
+                    if (oFirstDisplay.bImportants[2] && !oSecondDisplay.bImportants[2] && !oFirstDisplay.wsAlign.empty())
+                        oSecondDisplay.wsAlign.clear();
+                    else if (oSecondDisplay.bImportants[2] && !oFirstDisplay.bImportants[2] && !oSecondDisplay.wsAlign.empty())
+                        oFirstDisplay.wsAlign.clear();
+                    else if (!oSecondDisplay.wsAlign.empty())
+                    {
+                        if (oFirstDisplay.arLevels[2] < oSecondDisplay.arLevels[2])
+                            oFirstDisplay.wsAlign.clear();
+                        else
+                            oSecondDisplay.wsAlign.clear();
+                    }
+                }
+
+                bool operator==(const Display& oDisplay) const
+                {
+                    return wsDisplay == oDisplay.wsDisplay && nWidth == oDisplay.nWidth && wsAlign == oDisplay.wsAlign;
+                }
+
+                bool Empty() const
+                {
+                    return (L"inline" == wsDisplay || wsDisplay.empty()) && (nWidth < 0) && (wsAlign.empty());
+                }
+
+                void SetImportantAll(const bool &bImportant)
+                {
+                    bImportants = {bImportant, bImportant, bImportant};
+                }
+
+                void SetImportantDisplay(const bool &bImportant)
+                {
+                    bImportants[0] = bImportant;
+                }
+
+                void SetImportantWidth(const bool &bImportant)
+                {
+                    bImportants[1] = bImportant;
+                }
+
+                void SetImportantAlign(const bool& bImportant)
+                {
+                    bImportants[2] = bImportant;
+                }
+
+                void SetDisplay(const std::wstring& wsNewDisplay, const unsigned int& unLevel, const bool &bHardMode = false)
+                {
+                    if (wsNewDisplay.empty() || (bImportants[0] && !bHardMode))
+                        return;
+
+                    if (arDisplayValues.end() != std::find(arDisplayValues.begin(), arDisplayValues.end(), wsNewDisplay))
+                    {
+                        wsDisplay = wsNewDisplay;
+                        arLevels[0] = unLevel;
+                    }
+                }
+
+                void SetWidth(const std::wstring& wsNewValue, const unsigned int& unLevel, const bool &bHardMode = false)
+                {
+                    if (wsNewValue.empty() || !iswdigit(wsNewValue[0]) || (bImportants[1] && !bHardMode))
+                        return;
+
+                    arLevels[1] = unLevel;
+                    nWidth = std::stoi(wsNewValue);
+                }
+
+                void SetWidth(int nValue, const unsigned int& unLevel, const bool &bHardMode = false)
+                {
+                    if (bImportants[1] && !bHardMode)
+                        return;
+
+                    arLevels[1] = unLevel;
+                    nWidth = nValue;
+                }
+                void SetAlign(const std::wstring& sAlign, const unsigned int& unLevel, const bool& bHardMode = false)
+                {
+                    if (sAlign.empty() || (bImportants[2] && !bHardMode))
+                        return;
+
+                    if (L"center" == sAlign || L"left" == sAlign || L"start" == sAlign ||
+                        L"right" == sAlign || L"end" == sAlign)
+                    {
+                         arLevels[2] = unLevel;
+                         wsAlign = sAlign;
+                    }
+                }
+
+                std::wstring GetDisplay() const
+                {
+                    return wsDisplay;
+                }
+
+                std::wstring GetWidthW() const
+                {
+                    if (nWidth < 0)
+                            return std::wstring();
+
+                    return std::to_wstring(nWidth);
+                }
+
+                std::wstring GetAlign() const
+                {
+                    return wsAlign;
+                }
+            };
         }
 
         const std::vector<std::wstring> arPseudoClasses {

Common/3dParty/html/css/src/xhtml/CDocumentStyle.cpp

@@ -279,6 +279,8 @@ namespace NSCSS
             sSpacingValue += L"w:after=\""  + oStyle.m_pMargin.GetTopSide() + L"\" ";
             sSpacingValue += L"w:before=\"" + oStyle.m_pMargin.GetTopSide() + L"\" ";
         }
+        else if (!oStyle.m_pBorder.Empty())
+                sSpacingValue += L"w:after=\"0\" w:before=\"0\" ";
 
         const std::wstring &sLineHeight = oStyle.m_pFont.GetLineHeight();
         if (!sLineHeight.empty())
@@ -286,6 +288,8 @@ namespace NSCSS
                 sSpacingValue += L"w:line=\"" + sLineHeight + L"\" ";
                 sSpacingValue += L"w:lineRule=\"auto\"";
         }
+        else if (!oStyle.m_pBorder.Empty())
+                sSpacingValue += L"w:line=\"240\" w:lineRule=\"auto\" ";
 
         if (!sSpacingValue.empty())
         {
@@ -308,7 +312,7 @@ namespace NSCSS
                 const std::wstring sBorderStyle = oStyle.m_pBorder.GetStyleBottomSide();
                 const std::wstring sBorderWidth = oStyle.m_pBorder.GetWidthBottomSideW();
 
-                const std::wstring sBorder = L" w:color=\"" + sBorderColor + L"\" w:space=\"4\" w:sz=\"" +
+                const std::wstring sBorder = L" w:color=\"" + sBorderColor + L"\" w:space=\"0\" w:sz=\"" +
                         sBorderWidth + L"\" w:val=\"" + sBorderStyle + L"\"";
 
                 oXmlElement.AddPropertiesInP(NSConstValues::NSProperties::ParagraphProperties::P_TopBorder, sBorder);

Common/3dParty/html/htmltoxhtml.h

@@ -34,30 +34,33 @@ static void replace_all(std::string& s, const std::string& s1, const std::string
     }
 }
 
-static std::wstring htmlToXhtml(std::string& sFileContent)
+static std::wstring htmlToXhtml(std::string& sFileContent, bool bNeedConvert)
 {
     // Распознование кодировки
-    size_t posEncoding = sFileContent.find("charset=");
-    if (posEncoding == std::string::npos)
-        posEncoding = sFileContent.find("encoding=");
-    if (posEncoding != std::string::npos)
+    if (bNeedConvert)
     {
-        posEncoding = sFileContent.find("=", posEncoding) + 1;
-        char quoteSymbol = '\"';
-        if(sFileContent[posEncoding] == '\"' || sFileContent[posEncoding] == '\'')
+        size_t posEncoding = sFileContent.find("charset=");
+        if (posEncoding == std::string::npos)
+            posEncoding = sFileContent.find("encoding=");
+        if (posEncoding != std::string::npos)
         {
-            quoteSymbol = sFileContent[posEncoding];
-            posEncoding += 1;
-        }
-
-        size_t posEnd = sFileContent.find(quoteSymbol, posEncoding);
-        if (std::string::npos != posEnd)
-        {
-            std::string sEncoding = sFileContent.substr(posEncoding, posEnd - posEncoding);
-            if (sEncoding != "utf-8" && sEncoding != "UTF-8")
+            posEncoding = sFileContent.find("=", posEncoding) + 1;
+            char quoteSymbol = '\"';
+            if(sFileContent[posEncoding] == '\"' || sFileContent[posEncoding] == '\'')
             {
-                NSUnicodeConverter::CUnicodeConverter oConverter;
-                sFileContent = U_TO_UTF8(oConverter.toUnicode(sFileContent, sEncoding.c_str()));
+                quoteSymbol = sFileContent[posEncoding];
+                posEncoding += 1;
+            }
+
+            size_t posEnd = sFileContent.find(quoteSymbol, posEncoding);
+            if (std::string::npos != posEnd)
+            {
+                std::string sEncoding = sFileContent.substr(posEncoding, posEnd - posEncoding);
+                if (sEncoding != "utf-8" && sEncoding != "UTF-8")
+                {
+                    NSUnicodeConverter::CUnicodeConverter oConverter;
+                    sFileContent = U_TO_UTF8(oConverter.toUnicode(sFileContent, sEncoding.c_str()));
+                }
             }
         }
     }
@@ -423,11 +426,8 @@ static std::string mhtTohtml(std::string& sFileContent)
     return sFile;
 }
 
-static std::wstring mhtToXhtml(const std::wstring& sFile)
+static std::wstring mhtToXhtml(std::string& sFileContent)
 {
-    std::string sFileContent;
-    if(!NSFile::CFileBinary::ReadAllTextUtf8A(sFile, sFileContent))
-        return L"";
     sFileContent = mhtTohtml(sFileContent);
 
     // Gumbo

Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro

@@ -94,6 +94,8 @@ SOURCES += \
     ../Source/XlsxFormat/Slicer/SlicerCacheExt.cpp \
     ../Source/XlsxFormat/Slicer/Slicer.cpp \
     ../Source/XlsxFormat/NamedSheetViews/NamedSheetViews.cpp \
+    ../Source/XlsxFormat/Pivot/PivotCacheDefinitionExt.cpp \
+    ../Source/XlsxFormat/Workbook/Workbook.cpp
 }
 
 
@@ -270,6 +272,7 @@ HEADERS += docxformatlib.h \
     ../Source/DocxFormat/Diagram/DiagramQuickStyle.h \
     ../Source/XlsxFormat/Pivot/PivotTable.h \
     ../Source/XlsxFormat/Pivot/PivotCacheDefinition.h \
+    ../Source/XlsxFormat/Pivot/PivotCacheDefinitionExt.h \
     ../Source/XlsxFormat/Pivot/PivotCacheRecords.h \
     ../Source/XlsxFormat/Slicer/SlicerCache.h \
     ../Source/XlsxFormat/Slicer/SlicerCacheExt.h \

Common/DocxFormat/DocxFormatLib/XlsbFormatLib.pro

@@ -42,6 +42,10 @@ SOURCES += \
     ../Source/XlsbFormat/SlicersStream.cpp \
     ../Source/XlsbFormat/SlicerCachesStream.cpp \
     ../Source/XlsbFormat/ChartSheetStream.cpp \
+    ../Source/XlsbFormat/ExternalLinkStream.cpp \
+    ../Source/XlsbFormat/PivotCacheRecordsStream.cpp \
+    ../Source/XlsbFormat/PivotTableStream.cpp \
+    ../Source/XlsbFormat/PivotCacheDefStream.cpp \
 ### Biff12_records
     ../Source/XlsbFormat/Biff12_records/BeginBook.cpp \
     ../Source/XlsbFormat/Biff12_records/FRTBegin.cpp \
@@ -276,8 +280,12 @@ SOURCES += \
     ../Source/XlsbFormat/Biff12_records/BeginEcWpTables.cpp \
     ../Source/XlsbFormat/Biff12_records/EndECWPTables.cpp \
     ../Source/XlsbFormat/Biff12_records/PCDIMissing.cpp \
-    ../Source/XlsbFormat/Biff12_records/PCDIIndex.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDINumber.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIBoolean.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIError.cpp \
     ../Source/XlsbFormat/Biff12_records/PCDIString.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIDatetime.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIIndex.cpp \
     ../Source/XlsbFormat/Biff12_records/BeginECTxtWiz.cpp \
     ../Source/XlsbFormat/Biff12_records/EndECTxtWiz.cpp \
     ../Source/XlsbFormat/Biff12_records/BeginECTWFldInfoLst.cpp \
@@ -410,6 +418,269 @@ SOURCES += \
     ../Source/XlsbFormat/Biff12_records/EndWebPubItems.cpp \
     ../Source/XlsbFormat/Biff12_records/BeginWebPubItem.cpp \
     ../Source/XlsbFormat/Biff12_records/EndWebPubItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/ExternValueMeta.cpp \
+    ../Source/XlsbFormat/Biff12_records/ExternRowHdr.cpp \
+    ../Source/XlsbFormat/Biff12_records/ExternTableStart.cpp \
+    ../Source/XlsbFormat/Biff12_records/ExternTableEnd.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameValueStart.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameValueEnd.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameStart.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameFmla.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameBits.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupNameEnd.cpp \
+    ../Source/XlsbFormat/Biff12_records/SupTabs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSupBook.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSupBook.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheRecords.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheRecords.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCRRecord.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCRRecordDt.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXView.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLocation.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXLocation.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVDs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXVDs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVDRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndISXVDRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVD.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXVD.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginAutoSortScope.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndAutoSortScope.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRule.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRule.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilters.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilters.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilter.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilter.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXVIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVI.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXVI.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXVD14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLIRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXLIRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLI.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXLI.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndISXVIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVDCols.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndISXVDCols.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLICols.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXLICols.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXPIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXPIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXPI.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXPI.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXDIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXDIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXDI.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXDI.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXDI14.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXDI15.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFormats.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXFormats.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFormat.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXFormat.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmts.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmts.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmt.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmt.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCrtFormats.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCrtFormats.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCrtFormat.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCrtFormat.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTH.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTH.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXTH14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTDMPs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTDMPs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTDMP.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXTDMPOrder.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXTDMP.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginISXTHRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndISXTHRws.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginISXTHCols.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndISXTHCols.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFilters.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXFilters.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFilter.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXFilter.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXRules.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXRules.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxFilter15.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXView14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXChanges.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXChanges.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXChange.cpp \
+    ../Source/XlsbFormat/Biff12_records/SXTupleItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXChange.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXEdits.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXEdits.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXEdit.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXEdit.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmts14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmts14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmt14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmt14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXRules14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXRules14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRule14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRule14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilters14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilters14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilter14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilter14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFItem14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPRFItem14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSxvcells.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSxvcells.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSxRow.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSxRow.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellNum.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellStr.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellErr.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellBool.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellDate.cpp \
+    ../Source/XlsbFormat/Biff12_records/SxvcellNil.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotTableUISettings.cpp \
+    ../Source/XlsbFormat/Biff12_records/FieldListActiveItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPivotTableUISettings.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView16.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndSXView16.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheDef.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheDef.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSource.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSource.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSRange.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSRange.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSConsol.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSConsol.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPages.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPages.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPage.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPage.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCSets.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCSets.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCSet.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCSet.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFields.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFields.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDField.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDField.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDField14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginItemUniqueNames.cpp \
+    ../Source/XlsbFormat/Biff12_records/ItemUniqueName.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndItemUniqueNames.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPNames.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPNames.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPName.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPName.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPNPairs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPNPairs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPNPair.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPNPair.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFAtbl.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFAtbl.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIAMissing.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIANumber.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIABoolean.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIAError.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIAString.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDIADatetime.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDIRun.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDIRun.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGroup.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGroup.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGRange.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGRange.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGDiscrete.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGDiscrete.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcItems.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcItem.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHierarchies.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHierarchies.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHierarchy.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHierarchy.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHFieldsUsage.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHFieldsUsage.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLevels.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLevels.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLevel.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLevel.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroups.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGroups.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroup.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGroup.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMembers.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGMembers.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMember.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGMember.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDH14.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDKPIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDKPIs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDKPI.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDKPI.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcMems.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcMems.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcMem.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcMem.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTupleCache.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTupleCache.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEntries.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEntries.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembers.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMembers.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMember.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMember.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSets.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCSets.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSet.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCSet.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembersSortBy.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQueries.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCQueries.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQuery.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCQuery.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSFCIEntries.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDSFCIEntry.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSFCIEntries.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginDims.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndDims.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginDim.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndDim.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginMGs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndMGs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginMG.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndMG.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginMGMaps.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndMGMaps.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginMap.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndMap.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPCD14.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPCD14.cpp \
+    ../Source/XlsbFormat/Biff12_records/PivotCacheConnectionName.cpp \
+    ../Source/XlsbFormat/Biff12_records/PivotCacheIdVersion.cpp \
+    ../Source/XlsbFormat/Biff12_records/PCDH15.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheIDs.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheIDs.cpp \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheID.cpp \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheID.cpp \
 ### Biff12_structures
     ../Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp \
     ../Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp \
@@ -464,6 +735,21 @@ SOURCES += \
     ../Source/XlsbFormat/Biff12_structures/SlicerCacheLevelData.cpp \
     ../Source/XlsbFormat/Biff12_structures/RangeProtectionTitleSDRel.cpp \
     ../Source/XlsbFormat/Biff12_structures/Tws.cpp \
+    ../Source/XlsbFormat/Biff12_structures/ExternalNameProperties.cpp \
+    ../Source/XlsbFormat/Biff12_structures/DDEItemProperties.cpp \
+    ../Source/XlsbFormat/Biff12_structures/OLEItemProperties.cpp \
+    ../Source/XlsbFormat/Biff12_structures/ExternalReferenceType.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PCDIDateTime_bs.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PRuleHeaderData.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PRFilter_bs.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PivotItemType.cpp \
+    ../Source/XlsbFormat/Biff12_structures/DataConsolidationFunction.cpp \
+    ../Source/XlsbFormat/Biff12_structures/ShowDataAs.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PivotNumFmt.cpp \
+    ../Source/XlsbFormat/Biff12_structures/SXMA.cpp \
+    ../Source/XlsbFormat/Biff12_structures/SXET.cpp \
+    ../Source/XlsbFormat/Biff12_structures/PCDIAddlInfo.cpp \
+    ../Source/XlsbFormat/Biff12_structures/SdSetSortOrder.cpp \
 ### Biff12_unions
     ../Source/XlsbFormat/Biff12_unions/FRT.cpp \
     ../Source/XlsbFormat/Biff12_unions/ACUID.cpp \
@@ -480,7 +766,7 @@ SOURCES += \
     ../Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp \
     ../Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp \
     ../Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp \
-    ../Source/XlsbFormat/Biff12_unions/CELL_bu.cpp \
+    ../Source/XlsbFormat/Biff12_unions/CELL_12bu.cpp \
     ../Source/XlsbFormat/Biff12_unions/DATACELL.cpp \
     ../Source/XlsbFormat/Biff12_unions/FMLACELL.cpp \
     ../Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp \
@@ -634,6 +920,150 @@ SOURCES += \
     ../Source/XlsbFormat/Biff12_unions/USERCSVIEW.cpp \
     ../Source/XlsbFormat/Biff12_unions/WEBPUBITEMS.cpp \
     ../Source/XlsbFormat/Biff12_unions/WEBPUBITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNVALUEDATA.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNVALUE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNROW.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNTABLE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNNAME.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLELINK.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNALBOOK.cpp \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNALLINK.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDIDT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDDT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORD.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTERS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVD.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVI.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVIS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/AUTOSORTSCOPE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVD.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ISXVDRWS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVDS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXLOCATION.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXLIRWS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXLI_bu.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ISXVIS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ISXVDCOLS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXLICOLS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXPIS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXPI.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXDIS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXDI.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXDI.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXFORMATS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXFORMAT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMTS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCRTFORMATS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCRTFORMAT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTHS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTH.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXTH.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTHITEMS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTHITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTDMPS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXTDMP.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ISXTHRWS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ISXTHCOLS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXFILTERS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXFILTER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/AFILTER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTFILTERCOLUMN.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTFILTERS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXFILTER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVIEW14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCHANGE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCHANGES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXEDIT.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXEDITS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVIEW.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMTS14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMT14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULES14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULE14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTERS14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTER14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PRFITEM14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVIEW15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELLS15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTROWS15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELL15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTTABLEUISETTINGS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/SXVIEW16.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSOURCE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSRANGE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCONSOL.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPAGES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPAGE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCSETS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCSET.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFIELDS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFIELD.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/ITEMUNIQUENAMES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PNAMES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PNAME.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PNPAIRS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PNPAIR.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFATBL.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDIA.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDIRUN.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGROUP.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGRANGE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGDISCRETE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGITEMS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCITEMS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCITEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHIERARCHIES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHIERARCHY.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHFIELDSUSAGE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLEVELS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLEVEL.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGROUPS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGROUP.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBERS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDHIERARCHY.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDKPIS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDKPI.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCMEMS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCMEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDCALCMEM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTUPLECACHE.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRIES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRY.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBER.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCSETS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCSET.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERSSORTBY.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERIES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERY.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSFCIENTRIES.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DIMS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/DIM.cpp \
+    ../Source/XlsbFormat/Biff12_unions/MGS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/MG.cpp \
+    ../Source/XlsbFormat/Biff12_unions/MGMAPS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/MAP.cpp \
+    ../Source/XlsbFormat/Biff12_unions/FRTPIVOTCACHEDEF.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCD14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDSOURCE14.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCD15.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PCDH15_bu.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHEIDS.cpp \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHEID.cpp \
 }
 HEADERS += \
     ../Source/XlsbFormat/Biff12_unions/COMMENTS.h \
@@ -648,6 +1078,10 @@ HEADERS += \
     ../Source/XlsbFormat/SlicersStream.h \
     ../Source/XlsbFormat/SlicerCachesStream.h \
     ../Source/XlsbFormat/ChartSheetStream.h \
+    ../Source/XlsbFormat/ExternalLinkStream.h \
+    ../Source/XlsbFormat/PivotCacheRecordsStream.h \
+    ../Source/XlsbFormat/PivotTableStream.h \
+    ../Source/XlsbFormat/PivotCacheDefStream.h \
     ../Source/XlsbFormat/Xlsb.h \
     ../Source/XlsbFormat/XlsbElementsType.h \
 ### Biff12_records
@@ -888,8 +1322,12 @@ HEADERS += \
     ../Source/XlsbFormat/Biff12_records/BeginEcWpTables.h \
     ../Source/XlsbFormat/Biff12_records/EndECWPTables.h \
     ../Source/XlsbFormat/Biff12_records/PCDIMissing.h \
-    ../Source/XlsbFormat/Biff12_records/PCDIIndex.h \
+    ../Source/XlsbFormat/Biff12_records/PCDINumber.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIBoolean.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIError.h \
     ../Source/XlsbFormat/Biff12_records/PCDIString.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIDatetime.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIIndex.h \
     ../Source/XlsbFormat/Biff12_records/BeginECTxtWiz.h \
     ../Source/XlsbFormat/Biff12_records/EndECTxtWiz.h \
     ../Source/XlsbFormat/Biff12_records/BeginECTWFldInfoLst.h \
@@ -1022,6 +1460,271 @@ HEADERS += \
     ../Source/XlsbFormat/Biff12_records/EndWebPubItems.h \
     ../Source/XlsbFormat/Biff12_records/BeginWebPubItem.h \
     ../Source/XlsbFormat/Biff12_records/EndWebPubItem.h \
+    ../Source/XlsbFormat/Biff12_records/ExternCell.h \
+    ../Source/XlsbFormat/Biff12_records/ExternValueMeta.h \
+    ../Source/XlsbFormat/Biff12_records/ExternRowHdr.h \
+    ../Source/XlsbFormat/Biff12_records/ExternTableStart.h \
+    ../Source/XlsbFormat/Biff12_records/ExternTableEnd.h \
+    ../Source/XlsbFormat/Biff12_records/SupName.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameValueStart.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameValueEnd.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameStart.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameFmla.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameBits.h \
+    ../Source/XlsbFormat/Biff12_records/SupNameEnd.h \
+    ../Source/XlsbFormat/Biff12_records/SupTabs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSupBook.h \
+    ../Source/XlsbFormat/Biff12_records/EndSupBook.h \    
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheRecords.h \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheRecords.h \
+    ../Source/XlsbFormat/Biff12_records/PCRRecord.h \
+    ../Source/XlsbFormat/Biff12_records/PCRRecordDt.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXView.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLocation.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXLocation.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVDs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXVDs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVDRws.h \
+    ../Source/XlsbFormat/Biff12_records/EndISXVDRws.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVD.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXVD.h \
+    ../Source/XlsbFormat/Biff12_records/BeginAutoSortScope.h \
+    ../Source/XlsbFormat/Biff12_records/EndAutoSortScope.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRule.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRule.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilters.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilters.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilter.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilter.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFItem.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFItem.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVIs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXVIs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXVI.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXVI.h \
+    ../Source/XlsbFormat/Biff12_records/SXVD14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLIRws.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXLIRws.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLI.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXLI.h \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVIs.h \
+    ../Source/XlsbFormat/Biff12_records/EndISXVIs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginISXVDCols.h \
+    ../Source/XlsbFormat/Biff12_records/EndISXVDCols.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXLICols.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXLICols.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXPIs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXPIs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXPI.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXPI.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXDIs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXDIs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXDI.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXDI.h \
+    ../Source/XlsbFormat/Biff12_records/SXDI14.h \
+    ../Source/XlsbFormat/Biff12_records/SXDI15.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFormats.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXFormats.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFormat.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXFormat.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmts.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmts.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmt.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmt.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCrtFormats.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCrtFormats.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCrtFormat.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCrtFormat.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTH.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTH.h \
+    ../Source/XlsbFormat/Biff12_records/SXTH14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHItems.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHItems.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTHItem.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTHItem.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTDMPs.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTDMPs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXTDMP.h \
+    ../Source/XlsbFormat/Biff12_records/SXTDMPOrder.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXTDMP.h \
+    ../Source/XlsbFormat/Biff12_records/BeginISXTHRws.h \
+    ../Source/XlsbFormat/Biff12_records/EndISXTHRws.h \
+    ../Source/XlsbFormat/Biff12_records/BeginISXTHCols.h \
+    ../Source/XlsbFormat/Biff12_records/EndISXTHCols.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFilters.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXFilters.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXFilter.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXFilter.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXRules.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXRules.h \
+    ../Source/XlsbFormat/Biff12_records/SxFilter15.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView14.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXView14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXChanges.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXChanges.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXChange.h \
+    ../Source/XlsbFormat/Biff12_records/SXTupleItems.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXChange.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXEdits.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXEdits.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXEdit.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXEdit.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmts14.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmts14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXCondFmt14.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXCondFmt14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXRules14.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXRules14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRule14.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRule14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilters14.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilters14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFilter14.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFilter14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPRFItem14.h \
+    ../Source/XlsbFormat/Biff12_records/EndPRFItem14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSxvcells.h \
+    ../Source/XlsbFormat/Biff12_records/EndSxvcells.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSxRow.h \
+    ../Source/XlsbFormat/Biff12_records/EndSxRow.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellNum.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellStr.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellErr.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellBool.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellDate.h \
+    ../Source/XlsbFormat/Biff12_records/SxvcellNil.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotTableUISettings.h \
+    ../Source/XlsbFormat/Biff12_records/FieldListActiveItem.h \
+    ../Source/XlsbFormat/Biff12_records/EndPivotTableUISettings.h \
+    ../Source/XlsbFormat/Biff12_records/BeginSXView16.h \
+    ../Source/XlsbFormat/Biff12_records/EndSXView16.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheDef.h \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheDef.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSource.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSource.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSRange.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSRange.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSConsol.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSConsol.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPages.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPages.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPage.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPage.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCPItem.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCPItem.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCSets.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCSets.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSCSet.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSCSet.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFields.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFields.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDField.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDField.h \
+    ../Source/XlsbFormat/Biff12_records/PCDField14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginItemUniqueNames.h \
+    ../Source/XlsbFormat/Biff12_records/ItemUniqueName.h \
+    ../Source/XlsbFormat/Biff12_records/EndItemUniqueNames.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPNames.h \
+    ../Source/XlsbFormat/Biff12_records/EndPNames.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPName.h \
+    ../Source/XlsbFormat/Biff12_records/EndPName.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPNPairs.h \
+    ../Source/XlsbFormat/Biff12_records/EndPNPairs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPNPair.h \
+    ../Source/XlsbFormat/Biff12_records/EndPNPair.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFAtbl.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFAtbl.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIAMissing.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIANumber.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIABoolean.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIAError.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIAString.h \
+    ../Source/XlsbFormat/Biff12_records/PCDIADatetime.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDIRun.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDIRun.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGroup.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGroup.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGRange.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGRange.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGDiscrete.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGDiscrete.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDFGItems.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDFGItems.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcItems.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcItems.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcItem.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcItem.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHierarchies.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHierarchies.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHierarchy.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHierarchy.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHFieldsUsage.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHFieldsUsage.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLevels.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLevels.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLevel.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLevel.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroups.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGroups.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroup.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGroup.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMembers.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGMembers.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMember.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDHGLGMember.h \
+    ../Source/XlsbFormat/Biff12_records/PCDH14.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDKPIs.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDKPIs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDKPI.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDKPI.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcMems.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcMems.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDCalcMem.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDCalcMem.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTupleCache.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTupleCache.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEntries.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEntries.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembers.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMembers.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMember.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMember.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSets.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCSets.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSet.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCSet.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembersSortBy.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQueries.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCQueries.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQuery.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSDTCQuery.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCDSFCIEntries.h \
+    ../Source/XlsbFormat/Biff12_records/PCDSFCIEntry.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCDSFCIEntries.h \
+    ../Source/XlsbFormat/Biff12_records/BeginDims.h \
+    ../Source/XlsbFormat/Biff12_records/EndDims.h \
+    ../Source/XlsbFormat/Biff12_records/BeginDim.h \
+    ../Source/XlsbFormat/Biff12_records/EndDim.h \
+    ../Source/XlsbFormat/Biff12_records/BeginMGs.h \
+    ../Source/XlsbFormat/Biff12_records/EndMGs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginMG.h \
+    ../Source/XlsbFormat/Biff12_records/EndMG.h \
+    ../Source/XlsbFormat/Biff12_records/BeginMGMaps.h \
+    ../Source/XlsbFormat/Biff12_records/EndMGMaps.h \
+    ../Source/XlsbFormat/Biff12_records/BeginMap.h \
+    ../Source/XlsbFormat/Biff12_records/EndMap.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPCD14.h \
+    ../Source/XlsbFormat/Biff12_records/EndPCD14.h \
+    ../Source/XlsbFormat/Biff12_records/PivotCacheConnectionName.h \
+    ../Source/XlsbFormat/Biff12_records/PivotCacheIdVersion.h \
+    ../Source/XlsbFormat/Biff12_records/PCDH15.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheIDs.h \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheIDs.h \
+    ../Source/XlsbFormat/Biff12_records/BeginPivotCacheID.h \
+    ../Source/XlsbFormat/Biff12_records/EndPivotCacheID.h \
 ### Biff12_structures
     ../Source/XlsbFormat/Biff12_structures/ACProductVersion.h \
     ../Source/XlsbFormat/Biff12_structures/Blxf.h \
@@ -1079,6 +1782,21 @@ HEADERS += \
     ../Source/XlsbFormat/Biff12_structures/SlicerCacheLevelData.h \
     ../Source/XlsbFormat/Biff12_structures/RangeProtectionTitleSDRel.h \
     ../Source/XlsbFormat/Biff12_structures/Tws.h \
+    ../Source/XlsbFormat/Biff12_structures/ExternalNameProperties.h \
+    ../Source/XlsbFormat/Biff12_structures/DDEItemProperties.h \
+    ../Source/XlsbFormat/Biff12_structures/OLEItemProperties.h \
+    ../Source/XlsbFormat/Biff12_structures/ExternalReferenceType.h \
+    ../Source/XlsbFormat/Biff12_structures/PCDIDateTime.h \
+    ../Source/XlsbFormat/Biff12_structures/PRuleHeaderData.h \
+    ../Source/XlsbFormat/Biff12_structures/PRFilter.h \
+    ../Source/XlsbFormat/Biff12_structures/PivotItemType.h \
+    ../Source/XlsbFormat/Biff12_structures/DataConsolidationFunction.h \
+    ../Source/XlsbFormat/Biff12_structures/ShowDataAs.h \
+    ../Source/XlsbFormat/Biff12_structures/PivotNumFmt.h \
+    ../Source/XlsbFormat/Biff12_structures/SXMA.h \
+    ../Source/XlsbFormat/Biff12_structures/SXET.h \
+    ../Source/XlsbFormat/Biff12_structures/PCDIAddlInfo.h \
+    ../Source/XlsbFormat/Biff12_structures/SdSetSortOrder.h \
 ### Biff12_unions
     ../Source/XlsbFormat/Biff12_unions/ACABSPATH.h \
     ../Source/XlsbFormat/Biff12_unions/ACCELLTABLE.h \
@@ -1249,3 +1967,147 @@ HEADERS += \
     ../Source/XlsbFormat/Biff12_unions/USERCSVIEW.h \
     ../Source/XlsbFormat/Biff12_unions/WEBPUBITEMS.h \
     ../Source/XlsbFormat/Biff12_unions/WEBPUBITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNVALUEDATA.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNVALUE.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNROW.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNTABLE.h \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUE.h \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUES.h \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLEITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNNAME.h \
+    ../Source/XlsbFormat/Biff12_unions/DDEOLELINK.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNALBOOK.h \
+    ../Source/XlsbFormat/Biff12_unions/EXTERNALLINK.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDIDT.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDDT.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORD.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDS.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTER.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTERS.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULE.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVD.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVI.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVIS.h \
+    ../Source/XlsbFormat/Biff12_unions/AUTOSORTSCOPE.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVD.h \
+    ../Source/XlsbFormat/Biff12_unions/ISXVDRWS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVDS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXLOCATION.h \
+    ../Source/XlsbFormat/Biff12_unions/SXLIRWS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXLI.h \
+    ../Source/XlsbFormat/Biff12_unions/ISXVIS.h \
+    ../Source/XlsbFormat/Biff12_unions/ISXVDCOLS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXLICOLS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXPIS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXPI.h \
+    ../Source/XlsbFormat/Biff12_unions/SXDIS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXDI.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXDI.h \
+    ../Source/XlsbFormat/Biff12_unions/SXFORMATS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXFORMAT.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMTS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMT.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCRTFORMATS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCRTFORMAT.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTHS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTH.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXTH.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTHITEMS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTHITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTDMPS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXTDMP.h \
+    ../Source/XlsbFormat/Biff12_unions/ISXTHRWS.h \
+    ../Source/XlsbFormat/Biff12_unions/ISXTHCOLS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXFILTERS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXFILTER.h \
+    ../Source/XlsbFormat/Biff12_unions/AFILTER.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTFILTERCOLUMN.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTFILTERS.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULES.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXFILTER.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVIEW.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVIEW14.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCHANGE.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCHANGES.h \
+    ../Source/XlsbFormat/Biff12_unions/SXEDIT.h \
+    ../Source/XlsbFormat/Biff12_unions/SXEDITS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMTS14.h \
+    ../Source/XlsbFormat/Biff12_unions/SXCONDFMT14.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULES14.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTRULE14.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTERS14.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFILTER14.h \
+    ../Source/XlsbFormat/Biff12_unions/PRFITEM14.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTSXVIEW15.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELLS15.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTROWS15.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELL15.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTTABLEUISETTINGS.h \
+    ../Source/XlsbFormat/Biff12_unions/SXVIEW16.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSOURCE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSRANGE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCONSOL.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPAGES.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPAGE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCPITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCSETS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSCSET.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFIELDS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFIELD.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD14.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD15.h \
+    ../Source/XlsbFormat/Biff12_unions/ITEMUNIQUENAMES.h \
+    ../Source/XlsbFormat/Biff12_unions/PNAMES.h \
+    ../Source/XlsbFormat/Biff12_unions/PNAME.h \
+    ../Source/XlsbFormat/Biff12_unions/PNPAIRS.h \
+    ../Source/XlsbFormat/Biff12_unions/PNPAIR.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFATBL.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDIA.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDIRUN.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGROUP.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGRANGE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGDISCRETE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDFGITEMS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCITEMS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCITEM.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHIERARCHIES.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHIERARCHY.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHFIELDSUSAGE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLEVELS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLEVEL.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGROUPS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGROUP.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBERS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBER.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDHIERARCHY.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDKPIS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDKPI.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCMEMS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDCALCMEM.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPCDCALCMEM.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTUPLECACHE.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRIES.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRY.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBER.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCSETS.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCSET.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERSSORTBY.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERIES.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERY.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSFCIENTRIES.h \
+    ../Source/XlsbFormat/Biff12_unions/DIMS.h \
+    ../Source/XlsbFormat/Biff12_unions/DIM.h \
+    ../Source/XlsbFormat/Biff12_unions/MGS.h \
+    ../Source/XlsbFormat/Biff12_unions/MG.h \
+    ../Source/XlsbFormat/Biff12_unions/MGMAPS.h \
+    ../Source/XlsbFormat/Biff12_unions/MAP.h \
+    ../Source/XlsbFormat/Biff12_unions/FRTPIVOTCACHEDEF.h \
+    ../Source/XlsbFormat/Biff12_unions/PCD14.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDSOURCE14.h \
+    ../Source/XlsbFormat/Biff12_unions/PCD15.h \
+    ../Source/XlsbFormat/Biff12_unions/PCDH15.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHEIDS.h \
+    ../Source/XlsbFormat/Biff12_unions/PIVOTCACHEID.h \

Common/DocxFormat/DocxFormatLib/xlsbformatlib_logic.cpp

@@ -42,6 +42,10 @@
     #include "../Source/XlsbFormat/SlicersStream.cpp"
     #include "../Source/XlsbFormat/SlicerCachesStream.cpp"
     #include "../Source/XlsbFormat/ChartSheetStream.cpp"
+    #include "../Source/XlsbFormat/ExternalLinkStream.cpp"
+    #include "../Source/XlsbFormat/PivotCacheRecordsStream.cpp"
+    #include "../Source/XlsbFormat/PivotTableStream.cpp"
+    #include "../Source/XlsbFormat/PivotCacheDefStream.cpp"
 // Biff12_records
     #include "../Source/XlsbFormat/Biff12_records/BeginBook.cpp"
     #include "../Source/XlsbFormat/Biff12_records/FRTBegin.cpp"
@@ -276,8 +280,12 @@
     #include "../Source/XlsbFormat/Biff12_records/BeginEcWpTables.cpp"
     #include "../Source/XlsbFormat/Biff12_records/EndECWPTables.cpp"
     #include "../Source/XlsbFormat/Biff12_records/PCDIMissing.cpp"
-    #include "../Source/XlsbFormat/Biff12_records/PCDIIndex.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDINumber.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIBoolean.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIError.cpp"
     #include "../Source/XlsbFormat/Biff12_records/PCDIString.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIDatetime.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIIndex.cpp"
     #include "../Source/XlsbFormat/Biff12_records/BeginECTxtWiz.cpp"
     #include "../Source/XlsbFormat/Biff12_records/EndECTxtWiz.cpp"
     #include "../Source/XlsbFormat/Biff12_records/BeginECTWFldInfoLst.cpp"
@@ -408,6 +416,269 @@
     #include "../Source/XlsbFormat/Biff12_records/EndWebPubItems.cpp"
     #include "../Source/XlsbFormat/Biff12_records/BeginWebPubItem.cpp"
     #include "../Source/XlsbFormat/Biff12_records/EndWebPubItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ExternValueMeta.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ExternRowHdr.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ExternTableStart.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ExternTableEnd.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameValueStart.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameValueEnd.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameStart.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameFmla.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameBits.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupNameEnd.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SupTabs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSupBook.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSupBook.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPivotCacheRecords.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPivotCacheRecords.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCRRecord.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCRRecordDt.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXView.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXView.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXLocation.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXLocation.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXVDs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXVDs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginISXVDRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndISXVDRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXVD.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXVD.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginAutoSortScope.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndAutoSortScope.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRule.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRule.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXVIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXVIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXVI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXVI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXVD14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXLIRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXLIRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXLI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXLI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginISXVIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndISXVIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginISXVDCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndISXVDCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXLICols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXLICols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXPIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXPIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXDIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXDIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXDI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXDI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXDI14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXDI15.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXFormats.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXFormats.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXFormat.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXFormat.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCondFmts.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCondFmts.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCondFmt.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCondFmt.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCrtFormats.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCrtFormats.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCrtFormat.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCrtFormat.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTHs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTHs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTH.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTH.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXTH14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTHItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTHItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTHItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTHItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTDMPs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTDMPs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXTDMP.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXTDMPOrder.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXTDMP.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginISXTHRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndISXTHRws.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginISXTHCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndISXTHCols.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXFilters.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXFilter.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXRules.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXRules.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxFilter15.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXView14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXView14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXChanges.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXChanges.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXChange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SXTupleItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXChange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXEdits.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXEdits.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXEdit.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXEdit.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCondFmts14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCondFmts14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXCondFmt14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXCondFmt14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXRules14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXRules14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRule14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRule14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFilters14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFilters14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFilter14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFilter14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPRFItem14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPRFItem14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSxvcells.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSxvcells.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSxRow.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSxRow.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellNum.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellStr.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellErr.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellBool.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellDate.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/SxvcellNil.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPivotTableUISettings.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/FieldListActiveItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPivotTableUISettings.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginSXView16.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndSXView16.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPivotCacheDef.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPivotCacheDef.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSource.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSource.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSRange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSRange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSConsol.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSConsol.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSCPages.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSCPages.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSCPage.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSCPage.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSCPItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSCPItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSCSets.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSCSets.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSCSet.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSCSet.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFields.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFields.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDField.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDField.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDField14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginItemUniqueNames.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/ItemUniqueName.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndItemUniqueNames.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPNames.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPNames.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPName.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPName.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPNPairs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPNPairs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPNPair.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPNPair.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFAtbl.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFAtbl.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIAMissing.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIANumber.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIABoolean.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIAError.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIAString.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDIADatetime.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDIRun.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDIRun.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFGroup.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFGroup.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFGRange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFGRange.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFGDiscrete.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFGDiscrete.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDFGItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDFGItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDCalcItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDCalcItems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDCalcItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDCalcItem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHierarchies.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHierarchies.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHierarchy.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHierarchy.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHFieldsUsage.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHFieldsUsage.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLevels.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLevels.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLevel.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLevel.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroups.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLGroups.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLGroup.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLGroup.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMembers.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLGMembers.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDHGLGMember.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDHGLGMember.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDH14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDKPIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDKPIs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDKPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDKPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDCalcMems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDCalcMems.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDCalcMem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDCalcMem.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTupleCache.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTupleCache.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEntries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCEntries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembers.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMembers.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMember.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCEMember.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSets.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCSets.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCSet.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCSet.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCEMembersSortBy.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQueries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCQueries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSDTCQuery.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSDTCQuery.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCDSFCIEntries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDSFCIEntry.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCDSFCIEntries.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginDims.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndDims.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginDim.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndDim.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginMGs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndMGs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginMG.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndMG.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginMGMaps.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndMGMaps.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginMap.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndMap.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPCD14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPCD14.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PivotCacheConnectionName.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PivotCacheIdVersion.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/PCDH15.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPivotCacheIDs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPivotCacheIDs.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/BeginPivotCacheID.cpp"
+    #include "../Source/XlsbFormat/Biff12_records/EndPivotCacheID.cpp"
 // Biff12_structures
     #include "../Source/XlsbFormat/Biff12_structures/LPByteBuf.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/IsoPasswordData.cpp"
@@ -462,6 +733,21 @@
     #include "../Source/XlsbFormat/Biff12_structures/SlicerCacheLevelData.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/RangeProtectionTitleSDRel.cpp"
     #include "../Source/XlsbFormat/Biff12_structures/Tws.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/ExternalNameProperties.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/DDEItemProperties.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/OLEItemProperties.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/ExternalReferenceType.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PCDIDateTime_bs.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PRuleHeaderData.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PRFilter_bs.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PivotItemType.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/DataConsolidationFunction.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/ShowDataAs.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PivotNumFmt.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/SXMA.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/SXET.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/PCDIAddlInfo.cpp"
+    #include "../Source/XlsbFormat/Biff12_structures/SdSetSortOrder.cpp"
 // Biff12_unions
     #include "../Source/XlsbFormat/Biff12_unions/FRT.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/ACUID.cpp"
@@ -478,7 +764,7 @@
     #include "../Source/XlsbFormat/Biff12_unions/MERGECELLS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/CELLTABLE.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/ACCELLTABLE.cpp"
-    #include "../Source/XlsbFormat/Biff12_unions/CELL_bu.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/CELL_12bu.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/DATACELL.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/FMLACELL.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/SHRFMLACELL.cpp"
@@ -633,3 +919,147 @@
     #include "../Source/XlsbFormat/Biff12_unions/USERCSVIEW.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/WEBPUBITEMS.cpp"
     #include "../Source/XlsbFormat/Biff12_unions/WEBPUBITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNVALUEDATA.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNVALUE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNROW.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNTABLE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DDEOLEITEMVALUES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DDEOLEITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNNAME.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DDEOLELINK.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNALBOOK.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/EXTERNALLINK.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDIDT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDDT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORD.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTCACHERECORDS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTRULE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXVD.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVI.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVIS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/AUTOSORTSCOPE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVD.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ISXVDRWS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVDS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXLOCATION.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXLIRWS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXLI_bu.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ISXVIS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ISXVDCOLS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXLICOLS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXPIS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXDIS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXDI.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXDI.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXFORMATS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXFORMAT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCONDFMTS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCONDFMT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCRTFORMATS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCRTFORMAT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTHS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTH.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXTH.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTHITEMS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTHITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTDMPS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXTDMP.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ISXTHRWS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ISXTHCOLS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/AFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTFILTERCOLUMN.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTFILTERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTRULES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXFILTER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVIEW14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCHANGE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCHANGES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXEDIT.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXEDITS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXVIEW.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCONDFMTS14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXCONDFMT14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTRULES14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTRULE14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFILTERS14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFILTER14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PRFITEM14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTSXVIEW15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELLS15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTROWS15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTVALUECELL15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTTABLEUISETTINGS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/SXVIEW16.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSOURCE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSRANGE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCONSOL.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCPAGES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCPAGE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCPITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCSETS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSCSET.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFIELDS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFIELD.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPCDFIELD15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/ITEMUNIQUENAMES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PNAMES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PNAME.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PNPAIRS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PNPAIR.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFATBL.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDIA.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDIRUN.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFGROUP.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFGRANGE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFGDISCRETE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDFGITEMS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDCALCITEMS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDCALCITEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHIERARCHIES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHIERARCHY.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHFIELDSUSAGE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLEVELS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLEVEL.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLGROUPS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLGROUP.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDHGLGMEMBER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPCDHIERARCHY.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDKPIS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDKPI.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDCALCMEMS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDCALCMEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPCDCALCMEM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTUPLECACHE.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRIES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCENTRY.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBER.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCSETS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCSET.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCEMEMBERSSORTBY.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERIES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSDTCQUERY.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSFCIENTRIES.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DIMS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/DIM.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/MGS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/MG.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/MGMAPS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/MAP.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/FRTPIVOTCACHEDEF.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCD14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDSOURCE14.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCD15.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PCDH15_bu.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTCACHEIDS.cpp"
+    #include "../Source/XlsbFormat/Biff12_unions/PIVOTCACHEID.cpp"

Common/DocxFormat/DocxFormatLib/xlsxformatlib_logic.cpp

@@ -50,4 +50,5 @@
 #include "../Source/XlsxFormat/Slicer/SlicerCacheExt.cpp"
 #include "../Source/XlsxFormat/Slicer/Slicer.cpp"
 #include "../Source/XlsxFormat/NamedSheetViews/NamedSheetViews.cpp"
-
+#include "../Source/XlsxFormat/Pivot/PivotCacheDefinitionExt.cpp"
+#include "../Source/XlsxFormat/Workbook/Workbook.cpp"

Common/DocxFormat/Projects/DocxFormatLib.vcxproj

@@ -357,6 +357,7 @@
     <ClInclude Include="..\Source\XlsxFormat\NamedSheetViews\NamedSheetViews.h" />
     <ClInclude Include="..\Source\XlsxFormat\Ole\OleObjects.h" />
     <ClInclude Include="..\Source\XlsxFormat\Pivot\PivotCacheDefinition.h" />
+    <ClInclude Include="..\Source\XlsxFormat\Pivot\PivotCacheDefinitionExt.h" />
     <ClInclude Include="..\Source\XlsxFormat\Pivot\PivotCacheRecords.h" />
     <ClInclude Include="..\Source\XlsxFormat\Pivot\PivotTable.h" />
     <ClInclude Include="..\Source\XlsxFormat\SharedStrings\PhoneticPr.h" />
@@ -591,6 +592,7 @@
       <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ClCompile Include="..\Source\XlsxFormat\NamedSheetViews\NamedSheetViews.cpp" />
+    <ClCompile Include="..\Source\XlsxFormat\Pivot\PivotCacheDefinitionExt.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Pivot\Pivots.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\SharedStrings\Si.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\SharedStrings\Text.cpp" />
@@ -599,6 +601,7 @@
     <ClCompile Include="..\Source\XlsxFormat\Slicer\SlicerCacheExt.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Styles\rPr.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Table\Tables.cpp" />
+    <ClCompile Include="..\Source\XlsxFormat\Workbook\Workbook.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Worksheets\ConditionalFormatting.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Worksheets\DataValidation.cpp" />
     <ClCompile Include="..\Source\XlsxFormat\Worksheets\SheetData.cpp" />

Common/DocxFormat/Projects/DocxFormatLib.vcxproj.filters

@@ -679,6 +679,9 @@
     <ClInclude Include="..\Source\Common\Unit.h">
       <Filter>Logic\Common</Filter>
     </ClInclude>
+    <ClInclude Include="..\Source\XlsxFormat\Pivot\PivotCacheDefinitionExt.h">
+      <Filter>XlsxFormat\Pivots</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Source\DocxFormat\Logic\Table.cpp">
@@ -871,5 +874,11 @@
     <ClCompile Include="..\Source\DocxFormat\Media\Media.cpp">
       <Filter>Media</Filter>
     </ClCompile>
+    <ClCompile Include="..\Source\XlsxFormat\Pivot\PivotCacheDefinitionExt.cpp">
+      <Filter>XlsxFormat\Pivots</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\XlsxFormat\Workbook\Workbook.cpp">
+      <Filter>XlsxFormat\Workbook</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.cpp

@@ -42,6 +42,7 @@
 #include "../../XlsxFormat/Worksheets/DataValidation.h"
 #include "../../XlsxFormat/Slicer/SlicerCache.h"
 #include "../../XlsxFormat/Slicer/SlicerCacheExt.h"
+#include "../../XlsxFormat/Pivot/PivotCacheDefinitionExt.h"
 #include "../Comments.h"
 
 #include "../../XlsbFormat/Biff12_unions/FRTWORKSHEET.h"
@@ -61,6 +62,7 @@
 #include "../../XlsbFormat/Biff12_unions/SLICERSEX.h"
 #include "../../XlsbFormat/Biff12_unions/TABLESLICERSEX.h"
 #include "../../XlsbFormat/Biff12_unions/FRTWORKBOOK.h"
+#include "../../XlsbFormat/Biff12_unions/FRTPIVOTCACHEDEF.h"
 
 namespace OOX
 {
@@ -728,6 +730,7 @@ namespace OOX
 			m_oSlicerStyles.reset();
 			m_oTableSlicerCache.reset();
 			m_oSlicerCacheHideItemsWithNoData.reset();
+            m_oPivotCacheDefinitionExt.reset();
 
 			for (size_t nIndex = 0; nIndex < m_arrConditionalFormatting.size(); ++nIndex)
 			{
@@ -762,6 +765,7 @@ namespace OOX
 									  *m_sUri == L"{46F421CA-312F-682f-3DD2-61675219B42D}"	||
 									  *m_sUri == L"{DE250136-89BD-433C-8126-D09CA5730AF9}"	||
 									  *m_sUri == L"{19B8F6BF-5375-455C-9EA6-DF929625EA0E}"	||
+                                      *m_sUri == L"{725AE2AE-9491-48be-B2B4-4EB974FC3084}"	||
 									  *m_sUri == L"http://schemas.microsoft.com/office/drawing/2008/diagram"))   
 			{
 				int nCurDepth = oReader.GetDepth();
@@ -860,6 +864,10 @@ namespace OOX
 					{
 						m_oPresenceInfo = oReader;
 					}
+                    else if (sName == L"pivotCacheDefinition")
+                    {
+                        m_oPivotCacheDefinitionExt = oReader;
+                    }
 				}
 			}
 			else
@@ -992,6 +1000,12 @@ namespace OOX
 				m_oSlicerCacheHideItemsWithNoData->toXML(writer, L"x15:slicerCacheHideItemsWithNoData");
 				sResult += writer.GetData().c_str();
 			}
+            if(m_oPivotCacheDefinitionExt.IsInit())
+            {
+                NSStringUtils::CStringBuilder writer;
+                m_oPivotCacheDefinitionExt->toXML(writer, L"x14:pivotCacheDefinition");
+                sResult += writer.GetData().c_str();
+            }
 			if (m_oId.IsInit())
 			{
 				sResult += L"<" + sNamespace + L"id>" + m_oId.get2() + L"</" + sNamespace + L"id>";
@@ -1035,10 +1049,22 @@ namespace OOX
 
                 if(ptr != nullptr)
                 {
+                    if(ptr->m_TABLESLICERCACHEIDS != nullptr)
+                    {
+                        OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{46BE6895-7355-4a93-B00E-2C351335B9C9}"));
+                        oExt->m_oSlicerCachesExt = ptr->m_TABLESLICERCACHEIDS;
+
+                        if (oExt)
+                            m_arrExt.push_back( oExt );
+                    }
+
                     if(ptr->m_SLICERCACHEIDS != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{BBE1A952-AA13-448E-AADC-164F8A28A991}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{BBE1A952-AA13-448e-AADC-164F8A28A991}"));
                         oExt->m_oSlicerCaches = ptr->m_SLICERCACHEIDS;
 
                         if (oExt)
@@ -1047,7 +1073,7 @@ namespace OOX
                 }
             }
 
-            if(obj->get_type() == XLS::typeFRTWORKSHEET)
+            else if(obj->get_type() == XLS::typeFRTWORKSHEET)
             {
                 auto ptr = static_cast<XLSB::FRTWORKSHEET*>(obj.get());
 
@@ -1056,10 +1082,11 @@ namespace OOX
                     if(ptr->m_CONDITIONALFORMATTINGS != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{78C0D931-6437-407d-A8EE-F0AAD7539E65}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{78C0D931-6437-407d-A8EE-F0AAD7539E65}"));
 
-                        auto arCF14 = static_cast<XLSB::CONDITIONALFORMATTINGS*>(ptr->m_CONDITIONALFORMATTINGS.get())->m_arCONDITIONALFORMATTING14;
-                        for(auto &item : arCF14)
+                        auto oCONDITIONALFORMATTINGS = static_cast<XLSB::CONDITIONALFORMATTINGS*>(ptr->m_CONDITIONALFORMATTINGS.get());
+                        for(auto &item : oCONDITIONALFORMATTINGS->m_arCONDITIONALFORMATTING14)
                                 oExt->m_arrConditionalFormatting.push_back(new OOX::Spreadsheet::CConditionalFormatting(item));
 
                         if (oExt)
@@ -1069,7 +1096,8 @@ namespace OOX
                     if(ptr->m_DVALS14 != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{CCE6A557-97BC-4B89-ADB6-D9C93CAAB3DF}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{CCE6A557-97BC-4B89-ADB6-D9C93CAAB3DF}"));
                         oExt->m_oDataValidations = ptr->m_DVALS14;
 
                         if (oExt)
@@ -1079,33 +1107,36 @@ namespace OOX
                     if(ptr->m_SPARKLINEGROUPS != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{05C60535-1F16-4fd2-B633-F4F36F0B64E0}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{05C60535-1F16-4fd2-B633-F4F36F0B64E0}"));
                         oExt->m_oSparklineGroups = ptr->m_SPARKLINEGROUPS;
 
                         if (oExt)
                             m_arrExt.push_back( oExt );
                     }
 
-                    if(ptr->m_SLICERSEX != nullptr)
-                    {
-                        OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{A8765BA9-456A-4dab-B4F3-ACF838C121DE}";
-                        oExt->m_oSlicerList = ptr->m_SLICERSEX;
-
-                        if (oExt)
-                            m_arrExt.push_back( oExt );
-                    }
-
                     if(ptr->m_TABLESLICERSEX != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{A8765BA9-456A-4dab-B4F3-ACF838C121DE}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{A8765BA9-456A-4dab-B4F3-ACF838C121DE}"));
                         oExt->m_oSlicerList = ptr->m_TABLESLICERSEX;
 
                         if (oExt)
                             m_arrExt.push_back( oExt );
                     }
 
+                    if(ptr->m_SLICERSEX != nullptr)
+                    {
+                        OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{A8765BA9-456A-4dab-B4F3-ACF838C121DE}"));
+                        oExt->m_oSlicerList = ptr->m_SLICERSEX;
+
+                        if (oExt)
+                            m_arrExt.push_back( oExt );
+                    }
+
                 }
             }
 
@@ -1118,7 +1149,8 @@ namespace OOX
                     if(ptr->m_STYLESHEET14 != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{EB79DEF2-80B8-43E5-95BD-54CBDDF9020C}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{EB79DEF2-80B8-43E5-95BD-54CBDDF9020C}"));
                         oExt->m_oSlicerStyles = ptr->m_STYLESHEET14;
 
                         if (oExt)
@@ -1128,7 +1160,8 @@ namespace OOX
                     if(ptr->m_DXF14S != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{46F421CA-312F-682F-3DD2-61675219B42D}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{46F421CA-312F-682F-3DD2-61675219B42D}"));
                         oExt->m_oDxfs = static_cast<XLSB::DXF14S*>(ptr->m_DXF14S.get())->m_arDXF14;
 
                         if (oExt)
@@ -1147,7 +1180,8 @@ namespace OOX
                     if(ptr->m_BrtList14 != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{504A1905-F514-4f6f-8877-14C23A59335A}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{504A1905-F514-4f6f-8877-14C23A59335A}"));
                         oExt->m_oAltTextTable = ptr->m_BrtList14;
 
                         if (oExt)
@@ -1185,7 +1219,8 @@ namespace OOX
                     if(ptr->m_EXTCONN15 != nullptr)
                     {
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{DE250136-89BD-433C-8126-D09CA5730AF9}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{DE250136-89BD-433C-8126-D09CA5730AF9}"));
                         oExt->m_oConnection = ptr->m_EXTCONN15;
 
                         if (oExt)
@@ -1207,7 +1242,8 @@ namespace OOX
                         if(ptr1->m_BrtSlicerCacheBookPivotTables != nullptr)
                         {
                             OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                            oExt->m_sUri == L"{03082B11-2C62-411c-B77F-237D8FCFBE4C}";
+                            oExt->m_sUri.Init();
+                            oExt->m_sUri->append(_T("{03082B11-2C62-411c-B77F-237D8FCFBE4C}"));
 
                             auto ptrSCPT = static_cast<XLSB::SlicerCacheBookPivotTables*>(ptr1->m_BrtSlicerCacheBookPivotTables.get());
                             for(auto &item : ptrSCPT->pivotTables)
@@ -1227,7 +1263,8 @@ namespace OOX
                     {
                         auto ptr1 = static_cast<XLSB::TABLESLICERCACHE*>(ptr->m_TABLESLICERCACHE.get());
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{2F2917AC-EB37-4324-AD4E-5DD8C200BD13}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{2F2917AC-EB37-4324-AD4E-5DD8C200BD13}"));
                         oExt->m_oTableSlicerCache = ptr1->m_BrtBeginTableSlicerCache;
 
                         if (oExt)
@@ -1238,7 +1275,8 @@ namespace OOX
                     {
                         auto ptr1 = static_cast<XLSB::SLICERCACHECROSSFILTEREXT*>(ptr->m_SLICERCACHECROSSFILTEREXT.get());
                         OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
-                        oExt->m_sUri == L"{470722E0-AACD-4C17-9CDC-17EF765DBC7E}";
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{470722E0-AACD-4C17-9CDC-17EF765DBC7E}"));
                         oExt->m_oSlicerCacheHideItemsWithNoData = ptr1->m_BrtSlicerCacheHideItemsWithNoData;
 
                         if (oExt)
@@ -1248,6 +1286,24 @@ namespace OOX
                 }
             }
 
+            else if(obj->get_type() == XLS::typeFRTPIVOTCACHEDEF)
+            {
+                auto ptr = static_cast<XLSB::FRTPIVOTCACHEDEF*>(obj.get());
+
+                if(ptr != nullptr)
+                {
+                    if(ptr->m_PCD14 != nullptr)
+                    {
+                        OOX::Drawing::COfficeArtExtension *oExt = new OOX::Drawing::COfficeArtExtension();
+                        oExt->m_sUri.Init();
+                        oExt->m_sUri->append(_T("{725AE2AE-9491-48be-B2B4-4EB974FC3084}"));
+                        oExt->m_oPivotCacheDefinitionExt = ptr->m_PCD14;
+
+                        if (oExt)
+                            m_arrExt.push_back( oExt );
+                    }
+                }
+            }
         }
 	}
 }

Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h

@@ -51,6 +51,7 @@ namespace OOX
 		class CTableSlicerCache;
 		class CSlicerCacheHideNoData;
 		class CConnection;
+        class CPivotCacheDefinitionExt;
 	}
 	namespace Drawing
 	{
@@ -171,28 +172,30 @@ namespace OOX
 
 		public:
 
-                        nullable<std::wstring>  m_sUri;
-                        std::wstring            m_sAdditionalNamespace;
+            nullable<std::wstring>                                  m_sUri;
+            std::wstring                                            m_sAdditionalNamespace;
 
-                        nullable<CCompatExt>					m_oCompatExt;
-                        nullable<OOX::Spreadsheet::CSparklineGroups>            m_oSparklineGroups;
-                        nullable<CDataModelExt>					m_oDataModelExt;
-			nullable<OOX::Spreadsheet::CAltTextTable>		m_oAltTextTable;
-                        nullable<std::wstring>					m_oId;
-                        nullable<OOX::Spreadsheet::CDataValidations>            m_oDataValidations;
+            nullable<CCompatExt>                                    m_oCompatExt;
+            nullable<OOX::Spreadsheet::CSparklineGroups>            m_oSparklineGroups;
+            nullable<CDataModelExt>                                 m_oDataModelExt;
+            nullable<OOX::Spreadsheet::CAltTextTable>               m_oAltTextTable;
+            nullable<std::wstring>                                  m_oId;
+            nullable<OOX::Spreadsheet::CDataValidations>            m_oDataValidations;
 
-			nullable<OOX::Spreadsheet::CConnection>			m_oConnection;
-                        nullable<OOX::Spreadsheet::CDxfs>			m_oDxfs;
+            nullable<OOX::Spreadsheet::CConnection>                 m_oConnection;
+            nullable<OOX::Spreadsheet::CDxfs>                       m_oDxfs;
 
-			nullable<OOX::Spreadsheet::CSlicerRefs>			m_oSlicerList;
-			nullable<OOX::Spreadsheet::CSlicerRefs>			m_oSlicerListExt;
-			nullable<OOX::Spreadsheet::CSlicerCaches>		m_oSlicerCaches;
-			nullable<OOX::Spreadsheet::CSlicerCaches>		m_oSlicerCachesExt;
-			nullable<OOX::Spreadsheet::CSlicerStyles>		m_oSlicerStyles;
+            nullable<OOX::Spreadsheet::CSlicerRefs>                 m_oSlicerList;
+            nullable<OOX::Spreadsheet::CSlicerRefs>                 m_oSlicerListExt;
+            nullable<OOX::Spreadsheet::CSlicerCaches>               m_oSlicerCaches;
+            nullable<OOX::Spreadsheet::CSlicerCaches>               m_oSlicerCachesExt;
+            nullable<OOX::Spreadsheet::CSlicerStyles>               m_oSlicerStyles;
+
+            nullable<OOX::Spreadsheet::CPivotCacheDefinitionExt>    m_oPivotCacheDefinitionExt;
 
 			std::vector<OOX::Spreadsheet::CSlicerCachePivotTable*>	m_oSlicerCachePivotTables;
-                        nullable<OOX::Spreadsheet::CTableSlicerCache>		m_oTableSlicerCache;
-                        nullable<OOX::Spreadsheet::CSlicerCacheHideNoData>	m_oSlicerCacheHideItemsWithNoData;
+            nullable<OOX::Spreadsheet::CTableSlicerCache>           m_oTableSlicerCache;
+            nullable<OOX::Spreadsheet::CSlicerCacheHideNoData>      m_oSlicerCacheHideItemsWithNoData;
 			
 			std::vector<OOX::Spreadsheet::CConditionalFormatting*>	m_arrConditionalFormatting;
 

Common/DocxFormat/Source/XML/Utils.h

@@ -617,7 +617,14 @@ namespace XmlUtils
 			{
 				while ((m_lSizeCur + nSize) > m_lSize)
 				{
-					m_lSize *= 2;
+					if (m_lSize > 10485760/*10 * 1024 * 1024*/)
+					{
+						m_lSize += (std::max)((int)nSize * 10, 1048576/*1024 * 1024*/);
+					}
+					else
+					{
+						m_lSize *= 2;
+					}
 				}
 
 				wchar_t* pRealloc = (wchar_t*)realloc(m_pData, m_lSize * sizeof(wchar_t));

Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACBegin.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(ACBegin)
         public:
             ACBegin();
-            virtual ~ACBegin();
+            ~ACBegin();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/ACEnd.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(ACEnd)
         public:
             ACEnd();
-            virtual ~ACEnd();
+            ~ACEnd();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/AFilterDateGroupItem.h

@@ -44,7 +44,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(AFilterDateGroupItem)
         public:
             AFilterDateGroupItem();
-            virtual ~AFilterDateGroupItem();
+            ~AFilterDateGroupItem();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/AbsPath15.h

@@ -45,7 +45,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(AbsPath15)
         public:
             AbsPath15();
-            virtual ~AbsPath15();
+            ~AbsPath15();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/ActiveX.h

@@ -45,7 +45,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(ActiveX)
         public:
             ActiveX();
-            virtual ~ActiveX();
+            ~ActiveX();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginAFilter.h

@@ -44,7 +44,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginAFilter)
         public:
             BeginAFilter();
-            virtual ~BeginAFilter();
+            ~BeginAFilter();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginActiveXControls.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginActiveXControls)
         public:
             BeginActiveXControls();
-            virtual ~BeginActiveXControls();
+            ~BeginActiveXControls();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginAutoSortScope.cpp

@@ -0,0 +1,58 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2021
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "BeginAutoSortScope.h"
+
+using namespace XLS;
+
+namespace XLSB
+{
+
+    BeginAutoSortScope::BeginAutoSortScope()
+    {
+    }
+
+    BeginAutoSortScope::~BeginAutoSortScope()
+    {
+    }
+
+    BaseObjectPtr BeginAutoSortScope::clone()
+    {
+        return BaseObjectPtr(new BeginAutoSortScope(*this));
+    }
+
+    void BeginAutoSortScope::readFields(XLS::CFRecord& record)
+    {
+    }
+
+} // namespace XLSB
+

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginAutoSortScope.h

@@ -0,0 +1,55 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2021
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
+ * street, Riga, Latvia, EU, LV-1050.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include "../../../../../ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/BiffRecord.h"
+#include "../../XlsxFormat/WritingElement.h"
+#include "../Biff12_structures/CellRangeRef.h"
+
+namespace XLSB
+{
+    // Logical representation of BrtBeginAutoSortScope record in BIFF12
+    class BeginAutoSortScope: public XLS::BiffRecord
+    {
+            BIFF_RECORD_DEFINE_TYPE_INFO(BeginAutoSortScope)
+            BASE_OBJECT_DEFINE_CLASS_NAME(BeginAutoSortScope)
+        public:
+            BeginAutoSortScope();
+            ~BeginAutoSortScope();
+
+            XLS::BaseObjectPtr clone();
+
+            void readFields(XLS::CFRecord& record);
+    };
+
+} // namespace XLSB
+

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBook.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginBook)
         public:
             BeginBook();
-            virtual ~BeginBook();
+            ~BeginBook();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBookViews.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginBookViews)
         public:
             BeginBookViews();
-            virtual ~BeginBookViews();
+            ~BeginBookViews();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBorders.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginBorders)
         public:
             BeginBorders();
-            virtual ~BeginBorders();
+            ~BeginBorders();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginBundleShs.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginBundleShs)
         public:
             BeginBundleShs();
-            virtual ~BeginBundleShs();
+            ~BeginBundleShs();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule.h

@@ -49,7 +49,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginCFRule)
         public:
             BeginCFRule(const XLS::CellRef& cell_base_ref);
-            virtual ~BeginCFRule();
+            ~BeginCFRule();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCFRule14.h

@@ -50,7 +50,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginCFRule14)
         public:
             BeginCFRule14();
-            virtual ~BeginCFRule14();
+            ~BeginCFRule14();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellStyleXFs.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginCellStyleXFs)
         public:
             BeginCellStyleXFs();
-            virtual ~BeginCellStyleXFs();
+            ~BeginCellStyleXFs();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginCellXFs.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginCellXFs)
         public:
             BeginCellXFs();
-            virtual ~BeginCellXFs();
+            ~BeginCellXFs();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColBrk.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginColBrk)
         public:
             BeginColBrk();
-            virtual ~BeginColBrk();
+            ~BeginColBrk();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColInfos.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginColInfos)
         public:
             BeginColInfos();
-            virtual ~BeginColInfos();
+            ~BeginColInfos();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorPalette.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorPalette)
         public:
             BeginColorPalette();
-            virtual ~BeginColorPalette();
+            ~BeginColorPalette();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorScale)
         public:
             BeginColorScale();
-            virtual ~BeginColorScale();
+            ~BeginColorScale();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginColorScale14.h

@@ -43,7 +43,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginColorScale14)
         public:
             BeginColorScale14();
-            virtual ~BeginColorScale14();
+            ~BeginColorScale14();
 
             XLS::BaseObjectPtr clone();
 

Common/DocxFormat/Source/XlsbFormat/Biff12_records/BeginComment.h

@@ -44,7 +44,7 @@ namespace XLSB
             BASE_OBJECT_DEFINE_CLASS_NAME(BeginComment)
         public:
             BeginComment();
-            virtual ~BeginComment();
+            ~BeginComment();
 
             XLS::BaseObjectPtr clone();