OdfFormatReader - fix after testing

PptFormatReader - fix bug#37445
x2t - 2.4.541 fix after testing
2026-04-07 13:55:33 +08:00 · 2018-08-01 20:12:59 +03:00 · 2018-08-01 20:11:05 +03:00 · 2018-08-01 12:51:13 +03:00 · 2018-07-30 18:28:40 +03:00
49 changed files with 696 additions and 899 deletions
--- a/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp
@ -51,6 +51,7 @@ namespace formulasconvert {
 		void replace_cells_range(std::wstring& expr, bool withTableName);
 		bool check_formula(std::wstring& expr);
 		void replace_semicolons(std::wstring& expr);
+		void replace_tilda(std::wstring& expr);
 		void replace_vertical(std::wstring& expr);
 		void replace_space(std::wstring& expr);

@ -291,7 +292,17 @@ namespace formulasconvert {
 		else
 			return L"";
 	}
-
+	std::wstring replace_tilda_formater(boost::wsmatch const & what)
+	{
+		if (what[1].matched)
+			return L";";
+		else if (what[2].matched)
+			return what[2].str();    
+		else if (what[3].matched)
+			return what[3].str();
+		else
+			return L"";
+	}
 	// TODO
 	// заменить точки с запятой во всех вхождениях кроме находящихся в кавычках --*и в фигурных скобках*--
 	void odf2oox_converter::Impl::replace_semicolons(std::wstring& expr)
@ -302,9 +313,20 @@ namespace formulasconvert {
 			boost::wregex(L"(;)|(\".*?\")|('.*?')"),
 			&replace_semicolons_formater,
 			boost::match_default | boost::format_all);
+
 		 expr = res;
 	}
+	void odf2oox_converter::Impl::replace_tilda(std::wstring& expr)
+	{
+		 const std::wstring res = boost::regex_replace(
+			expr,
+			//boost::wregex(L"(;)|(?:\".*?\")|(?:'.*?')"),
+			boost::wregex(L"(~)|(\".*?\")|('.*?')"),
+			&replace_semicolons_formater,
+			boost::match_default | boost::format_all);

+		 expr = res;
+	}
 	std::wstring replace_vertical_formater(boost::wsmatch const & what)
 	{
 		if (what[1].matched)
@ -462,6 +484,7 @@ namespace formulasconvert {

 		replace_cells_range	(workstr, true);
 		replace_semicolons	(workstr);
+		replace_tilda		(workstr);
 		replace_vertical	(workstr);
 		
 		if (isFormula)
--- a/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp
+++ b/ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp
@ -32,7 +32,6 @@
 #include "formulasconvert.h"

 #include <boost/regex.hpp>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>

 #include"../../Common/DocxFormat/Source/XML/Utils.h"
@ -221,6 +220,20 @@ void oox2odf_converter::Impl::replace_named_ref(std::wstring & expr)

 namespace 
 {
+std::wstring replace_tilda_formater(boost::wsmatch const & what)
+{
+    if (what[1].matched)
+        return L";";
+    else if (what[2].matched)
+        return what[2].str();    
+    else if (what[3].matched)
+        return what[3].str();
+    //else if (what[4].matched)
+    //    return what[4].str();
+	else
+		return L"";
+}
+

 std::wstring replace_semicolons_formater(boost::wsmatch const & what)
 {
@ -251,7 +264,6 @@ void oox2odf_converter::Impl::replace_semicolons(std::wstring& expr)
        boost::match_default | boost::format_all);
     expr = res;
 }
-
 namespace 
 {

@ -306,9 +318,9 @@ std::wstring forbidden_formulas1[] =

 bool is_forbidden1(const std::wstring & formula)
 {
-    BOOST_FOREACH(const std::wstring & s, forbidden_formulas1)
-    {
-        if (boost::algorithm::contains(formula, s))
+	for (size_t i = 0; i < 1; i++)
+     {
+        if (boost::algorithm::contains(formula, forbidden_formulas1[i]))
            return true;
    }
    return false;
@ -669,9 +681,10 @@ size_t getColAddressInv(const std::wstring & a_)
    size_t mul = 1;
    bool f = true;
    size_t res = 0;
-    BOOST_REVERSE_FOREACH(const wchar_t c, a)
+
+	for (int i = a.length() - 1; i >= 0; i--)
    {
-        size_t v = c - L'A';
+        size_t v = a[i] - L'A';
        if (f)
            f = false;
        else
@ -700,14 +713,13 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
    ::XmlUtils::replace_all( a, L"$", L"");
    //::XmlUtils::replace_all( a, L"'", L"");
 	::boost::algorithm::to_upper(a);
-	

-	BOOST_FOREACH(wchar_t c, a)
+	for (size_t i = 0; i < a.length(); i++)
    {
-		if (c >= L'0' && c <= L'9')
-			row +=c;
+		if (a[i] >= L'0' && a[i] <= L'9')
+			row += a[i];
 		else
-			col += c;
+			col += a[i];
    }
 	std::reverse(col.begin(), col.end());
 	std::reverse(row.begin(), row.end());
--- a/ASCOfficeOdfFile/include/odf/odf_elements_type.h
+++ b/ASCOfficeOdfFile/include/odf/odf_elements_type.h
@ -55,6 +55,7 @@ enum ElementType
 	typeFieldFieldmarkStart,
 	typeFieldFieldmarkEnd,
 	typeFieldFieldmark,
+	typeFieldParam,

    typeTextSpan,
    typeTextA,
@ -502,6 +503,7 @@ enum ElementType
 	typeFormTextarea,
 	typeFormTime,
 	typeFormValueRange,
+	typeFormItem,

 	typeDrawPage,    
 	typePresentationFooterDecl,
--- a/ASCOfficeOdfFile/include/xml/utils.h
+++ b/ASCOfficeOdfFile/include/xml/utils.h
@ -45,7 +45,7 @@ namespace utils {
 		std::wstring replace_xml_to_text_ImplRegEx(const std::wstring & Text);
 		std::string replace_xml_to_text_ImplRegEx(const std::string & Text);

-		std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text);
+		std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text, bool dDeleteUnicode = false);
 		std::string replace_text_to_xml_ImplReplace(const std::string & Text);

 		std::wstring replace_amp_text_to_xml_ImplReplace(const std::wstring & Text);
@ -55,7 +55,7 @@ namespace utils {
 		std::string replace_xml_to_text_ImplReplace(const std::string & Text);
 	}

-	std::wstring replace_text_to_xml(const std::wstring & Text);
+	std::wstring replace_text_to_xml(const std::wstring & Text, bool dDeleteUnicode = false);
 	std::string replace_text_to_xml(const std::string & Text);

 	std::wstring replace_amp_text_to_xml(const std::wstring & Text);
--- a/ASCOfficeOdfFile/src/common/CPColorUtils.cpp
+++ b/ASCOfficeOdfFile/src/common/CPColorUtils.cpp
@ -31,7 +31,6 @@
 */

 #include <string>
-#include <boost/foreach.hpp>
 #include <cmath>

 #include <boost/optional/optional_io.hpp>
@ -78,14 +77,13 @@ std::wstring RGBToString(int r, int g, int b)
    color v(r, g, b);
    double minDist = (std::numeric_limits<double>::max)();
    
-    
-    BOOST_FOREACH(color const & c, colors)
+    for (size_t i = 0; i < 6; i++)
    {
-        double dist = color_dist(v, c);
+        double dist = color_dist(v, colors[i]);
        if (dist < minDist)
        {
            minDist = dist;
-            result = c.name_;
+            result = colors[i].name_;
        }
    }

--- a/ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp
+++ b/ASCOfficeOdfFile/src/docx/docx_conversion_context.cpp
@ -30,9 +30,6 @@
 *
 */

-
-#include <boost/foreach.hpp>
-
 #include <iostream>

 #include <xml/utils.h>
@ -443,21 +440,7 @@ void docx_conversion_context::start_index_content()
 			 sInstrText += L" \\c \"" + table_content_context_.caption_sequence_name + L"\""; 
 		}
 	}
-	output_stream() << L"<w:r>";
-	output_stream() << L"<w:fldChar w:fldCharType=\"begin\"/>";
-	output_stream() << L"</w:r>";
-	output_stream() << L"<w:r>";
-	output_stream() << L"<w:instrText xml:space=\"preserve\">" << sInstrText << L" </w:instrText>";
-	output_stream() << L"</w:r>";
-	output_stream() << L"<w:r>";
-	//output_stream() << L"<w:rPr>
-	//output_stream() << L"<w:rFonts w:ascii="Minion Pro" w:eastAsia="DejaVuSans" w:hAnsi="Minion Pro"/>
-	//output_stream() << L"<w:bCs w:val="0"/>
-	//output_stream() << L"<w:sz w:val="21"/>
-	//output_stream() << L"<w:szCs w:val="24"/>
-	//output_stream() << L"</w:rPr>
-	output_stream() << L"<w:fldChar w:fldCharType=\"separate\"/>";
-	output_stream() << L"</w:r>";
+	start_field(sInstrText, L"");
 	
 	finish_paragraph();
 }
@ -466,15 +449,38 @@ void docx_conversion_context::end_index_content()
 	if (!in_table_content_) return;

 	start_paragraph(false);
+	end_field();
+	
+	finish_paragraph();
+}
+void docx_conversion_context::start_field(const std::wstring & sInstrText, const std::wstring & sName)
+{
+	output_stream() << L"<w:r>";
+	output_stream() << L"<w:fldChar w:fldCharType=\"begin\">";
+
+	if (!sName.empty())
+	{
+		output_stream() << L"<w:ffData><w:name w:val=\"" << sName << L"\"/><w:enabled/><w:calcOnExit w:val=\"0\"/></w:ffData>";
+	}
+	output_stream() << L"</w:fldChar>";
+	output_stream() << L"</w:r>";
+	output_stream() << L"<w:r>";
+	output_stream() << L"<w:instrText xml:space=\"preserve\">" << sInstrText << L" </w:instrText>";
+	output_stream() << L"</w:r>";
+	output_stream() << L"<w:r>";
+
+	output_stream() << L"<w:fldChar w:fldCharType=\"separate\"/>";
+	output_stream() << L"</w:r>";
+}
+void docx_conversion_context::end_field()
+{
 	output_stream() << L"<w:r>";
 	//output_stream() << L"<w:rPr>";
 	//output_stream() << L"<w:rFonts w:ascii="Minion Pro" w:hAnsi="Minion Pro"/>";
 	//output_stream() << L"<w:sz w:val="20"/>
 	//output_stream() << L"</w:rPr>";
 	output_stream() << L"<w:fldChar w:fldCharType=\"end\"/>";
-	output_stream() << L"</w:r>";
-	
-	finish_paragraph();
+	output_stream() << L"</w:r>";	
 }
 void docx_conversion_context::end_sdt()
 {
@ -917,21 +923,23 @@ xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\"
 mc:Ignorable=\"w14 wp14\">";

    std::vector<int> numIds;
-	BOOST_FOREACH(odf_reader::list_style_instance_ptr & inst, list_styles.instances())
-    {
-        odf_reader::office_element_ptr_array & content = inst->get_text_list_style()->get_content();
+
+	odf_reader::list_style_container::instances_array & arListStyles = list_styles.instances();
+	for (size_t i = 0; i < arListStyles.size(); i++)
+   {
+        odf_reader::office_element_ptr_array & content = arListStyles[i]->get_text_list_style()->get_content();

 		if (content.size() < 1) 
 			continue;
       
-		const int abstractNumId = list_styles.id_by_name(inst->get_style_name());
+		const int abstractNumId = list_styles.id_by_name(arListStyles[i]->get_style_name());
        
        strm << L"<w:abstractNum w:abstractNumId=\"" << abstractNumId << "\">";
        numIds.push_back(abstractNumId);		
       
 		for (size_t i = 0; i < (std::min)( content.size(), (size_t)9); i++)
        {
-            start_text_list_style(inst->get_text_list_style()->get_style_name());
+            start_text_list_style(arListStyles[i]->get_text_list_style()->get_style_name());
            content[i]->docx_convert(*this);
            // TODO
            end_text_list_style();        
@ -963,21 +971,25 @@ void docx_conversion_context::process_fonts()
        odf_reader::odf_read_context & context =  doc->odf_context();
        odf_reader::fonts_container & fonts = context.fontContainer();

-        BOOST_FOREACH(odf_reader::font_instance_ptr & inst, fonts.instances())
+		odf_reader::fonts_container::instances_array &arFonts = fonts.instances();
+		for (size_t i = 0; i < arFonts.size(); i++)
        {
-            strm << L"<w:font w:name=\"" << inst->name() << L"\" >";
+			if (!arFonts[i]) continue;
+			if (arFonts[i]->name().empty()) continue;

-            if (!inst->charset().empty())
-                strm << L"<w:charset w:val=\"" << inst->charset() <<"\" />";
+            strm << L"<w:font w:name=\"" << arFonts[i]->name() << L"\" >";

-            if (!inst->family().empty())
-                strm << L"<w:family w:val=\"" << inst->family() << "\" />";
+            if (!arFonts[i]->charset().empty())
+                strm << L"<w:charset w:val=\"" << arFonts[i]->charset() <<"\" />";

-            if (!inst->pitch().empty())
-                strm << L"<w:pitch w:val=\"" << inst->pitch() << "\" />";
+            if (!arFonts[i]->family().empty())
+                strm << L"<w:family w:val=\"" << arFonts[i]->family() << "\" />";

-            if (!inst->alt_name().empty())
-                strm << L"<w:altName w:val=\"" << inst->alt_name() << "\" />";
+            if (!arFonts[i]->pitch().empty())
+                strm << L"<w:pitch w:val=\"" << arFonts[i]->pitch() << "\" />";
+
+            if (!arFonts[i]->alt_name().empty())
+                strm << L"<w:altName w:val=\"" << arFonts[i]->alt_name() << "\" />";

            strm << L"</w:font>";
        }
@ -1008,9 +1020,11 @@ void docx_conversion_context::process_styles()
        odf_reader::styles_container & styles = context.styleContainer();

        // add all styles to the map
-        BOOST_FOREACH(odf_reader::style_instance_ptr & inst, styles.instances())
+		odf_reader::styles_container::instances_array &arStyles = styles.instances();
+		for (size_t i = 0; i < arStyles.size(); i++)
        {
-            styles_map_.get(inst->name(), inst->type());
+			if (!arStyles[i]) continue;
+            styles_map_.get(arStyles[i]->name(), arStyles[i]->type());
        }

        _Wostream << L"<w:docDefaults>";
@ -1029,51 +1043,51 @@ void docx_conversion_context::process_styles()

        _Wostream << L"</w:docDefaults>";

-        BOOST_FOREACH(odf_reader::style_instance_ptr & inst, styles.instances())
-        {
-            if (!inst->is_automatic() && 
+		for (size_t i = 0; i < arStyles.size(); i++)
+		{
+            if (!arStyles[i]->is_automatic() && 
 					(
-					inst->type() == odf_types::style_family::Paragraph ||
-					inst->type() == odf_types::style_family::Text
+					arStyles[i]->type() == odf_types::style_family::Paragraph ||
+					arStyles[i]->type() == odf_types::style_family::Text
 					))
            {
-                const std::wstring id = styles_map_.get(inst->name(), inst->type());
-                _Wostream << L"<w:style w:styleId=\"" << id << L"\" w:type=\"" << StyleTypeOdf2Docx(inst->type()) << L"\""; 
-				if (!inst->is_default())
+                const std::wstring id = styles_map_.get(arStyles[i]->name(), arStyles[i]->type());
+                _Wostream << L"<w:style w:styleId=\"" << id << L"\" w:type=\"" << StyleTypeOdf2Docx(arStyles[i]->type()) << L"\""; 
+				if (!arStyles[i]->is_default())
 				{
 					_Wostream << L" w:customStyle=\"1\"";
 				}
 				_Wostream << L">";

-                const std::wstring displayName = StyleDisplayName(inst->name(), inst->type());
+                const std::wstring displayName = StyleDisplayName(arStyles[i]->name(), arStyles[i]->type());

                _Wostream << L"<w:name w:val=\"" << displayName << L"\" />";

-                if (odf_reader::style_instance * baseOn = inst->parent())
+                if (odf_reader::style_instance * baseOn = arStyles[i]->parent())
                {
                    const std::wstring basedOnId = styles_map_.get(baseOn->name(), baseOn->type());
                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
                }
-                else if (!inst->is_default() && styles_map_.check(L"", inst->type()))
+                else if (!arStyles[i]->is_default() && styles_map_.check(L"", arStyles[i]->type()))
                {
-                    const std::wstring basedOnId = styles_map_.get(L"", inst->type());
+                    const std::wstring basedOnId = styles_map_.get(L"", arStyles[i]->type());
                    _Wostream << L"<w:basedOn w:val=\"" << basedOnId << "\" />";
                }

-                if (odf_reader::style_instance * next = inst->next())
+                if (odf_reader::style_instance * next = arStyles[i]->next())
                {
                    const std::wstring nextId = styles_map_.get(next->name(), next->type());
                    _Wostream << L"<w:next w:val=\"" << nextId << "\" />";
                }
-                else if (inst->is_default())
+                else if (arStyles[i]->is_default())
                {
                    // self
                    _Wostream << L"<w:next w:val=\"" << id << "\" />";
                }

-                if (odf_reader::style_content * content = inst->content())
+                if (odf_reader::style_content * content = arStyles[i]->content())
                {
-                    get_styles_context().start_process_style(inst.get());
+                    get_styles_context().start_process_style(arStyles[i].get());
                    content->docx_convert(*this, true);
                    get_styles_context().end_process_style();
                }
@ -1334,10 +1348,11 @@ void docx_conversion_context::pop_text_properties()
 odf_reader::style_text_properties_ptr docx_conversion_context::current_text_properties()
 {
    odf_reader::style_text_properties_ptr cur = boost::make_shared<odf_reader::style_text_properties>();
-    BOOST_FOREACH(const odf_reader::style_text_properties * prop, text_properties_stack_)
+
+	for (size_t i = 0; i < text_properties_stack_.size(); i++)
    {
-        if (prop)
-            cur->content().apply_from( prop->content() );
+        if (text_properties_stack_[i])
+            cur->content().apply_from( text_properties_stack_[i]->content() );
    }
    return cur;
 }
--- a/ASCOfficeOdfFile/src/docx/docx_conversion_context.h
+++ b/ASCOfficeOdfFile/src/docx/docx_conversion_context.h
@ -842,8 +842,8 @@ public:
    void start_body		();
    void end_body		();
    
-	void start_office_text		();
-    void end_office_text		();
+	void start_office_text	();
+    void end_office_text	();

 	void start_sdt	(int type);
 	void end_sdt	();
@ -854,6 +854,9 @@ public:
 	void start_index_element();
 	void end_index_element();

+	void start_field(const std::wstring & sInstrText, const std::wstring & sName);
+	void end_field();
+
 	void process_styles			();
    void process_fonts			();
    
--- a/ASCOfficeOdfFile/src/docx/headers_footers.cpp
+++ b/ASCOfficeOdfFile/src/docx/headers_footers.cpp
@ -31,7 +31,6 @@
 */

 #include "headers_footers.h"
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>

 namespace cpdoccore { 
@ -88,12 +87,12 @@ std::wstring get_rel_type(headers_footers::Type _Type)

 void headers_footers::dump_rels(rels & Rels) const//внешние релсы
 {
-    BOOST_FOREACH(const instances_map::value_type & instAr, instances_)
+	for (boost::unordered_map<std::wstring, instances_array>::const_iterator it = instances_.begin(); it != instances_.end(); ++it)
    {
-        BOOST_FOREACH(const instance_ptr & inst, instAr.second)
+		for (size_t i = 0; i < it->second.size(); i++)
        {
-			if (inst->type_ == none) continue;
-            Rels.add( relationship( inst->id_,  get_rel_type(inst->type_),  inst->name_, L"" ) );
+			if (it->second[i]->type_ == none) continue;
+            Rels.add( relationship( it->second[i]->id_,  get_rel_type(it->second[i]->type_),  it->second[i]->name_, L"" ) );
        }
    }        
 }
@ -107,9 +106,13 @@ bool headers_footers::write_sectPr(const std::wstring & StyleName, bool next_pag

 	bool first	=	false, left	=	false;
 	bool res	=	false;
+
+	instances_array & pFind = instances_.at(StyleName);
   
-	BOOST_FOREACH(const instance_ptr & inst, instances_.at(StyleName))
+	for (size_t i = 0; i < pFind.size(); i++)
    {
+		instance_ptr & inst = pFind[i];
+
        std::wstring type = L"default";
 		
 		if ( inst->type_ == headerFirst || inst->type_ == footerFirst )
--- a/ASCOfficeOdfFile/src/docx/oox_drawing.cpp
+++ b/ASCOfficeOdfFile/src/docx/oox_drawing.cpp
@ -317,8 +317,8 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 				if ((iWrap) && (*iWrap == 0)) CP_XML_ATTR(L"wrap", L"none");
 			}

-			_CP_OPT(int) iAlign;
-			odf_reader::GetProperty(prop,L"textarea-vertical_align",iAlign);
+			_CP_OPT(int) iAlign, iVert;
+			odf_reader::GetProperty(prop, L"textarea-vertical_align", iAlign);
 			if (iAlign)
 			{
 				switch (iAlign.get())
@ -336,6 +336,16 @@ void _oox_drawing::serialize_bodyPr(std::wostream & strm, const std::wstring & n
 					CP_XML_ATTR(L"anchor", L"just");break;
 				}
 			}
+			odf_reader::GetProperty(prop, L"text_vert", iVert);
+			if (iVert)
+			{
+				switch (iVert.get())
+				{
+				case 1:	CP_XML_ATTR(L"vert", L"vert");		break;
+				case 2:	CP_XML_ATTR(L"vert", L"vert270");	break;
+
+				}
+			}			
 			_CP_OPT(bool) bAutoGrowHeight;
 			_CP_OPT(bool) bFitToSize;
 			odf_reader::GetProperty(prop,L"fit-to-size", bFitToSize);
--- a/ASCOfficeOdfFile/src/docx/xlsx_borders.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_borders.cpp
@ -32,7 +32,6 @@

 #include "xlsx_borders.h"

-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>
 #include <xml/simple_xml_writer.h>
@ -203,9 +202,9 @@ public:
    {
        std::vector<xlsx_border> inst_array;

-        BOOST_FOREACH(const xlsx_border & inst, borders_)
+		for (boost::unordered_set<xlsx_border, boost::hash<xlsx_border>>::iterator it = borders_.begin(); it != borders_.end(); ++it)
        {
-            inst_array.push_back(inst);
+            inst_array.push_back(*it);
        }

        std::sort(inst_array.begin(), inst_array.end(), compare_());
@ -215,9 +214,10 @@ public:
            CP_XML_NODE(L"borders")
            {
                CP_XML_ATTR(L"count", inst_array.size());
-                BOOST_FOREACH( xlsx_border & border, inst_array)
+				
+				for (size_t i = 0; i < inst_array.size(); i++)
                {
-                    cpdoccore::oox::xlsx_serialize(CP_XML_STREAM(), border);
+                    cpdoccore::oox::xlsx_serialize(CP_XML_STREAM(), inst_array[i]);
                }
            }
        }
--- a/ASCOfficeOdfFile/src/docx/xlsx_fills.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_fills.cpp
@ -34,7 +34,6 @@

 #include <xml/simple_xml_writer.h>

-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>

@ -155,10 +154,10 @@ struct compare_xlsx_fills
 void xlsx_fills::serialize(std::wostream & _Wostream) const
 {
    std::vector<xlsx_fill> inst_array;
-            
-    BOOST_FOREACH(const xlsx_fill & inst, impl_->fills_)
-    {
-        inst_array.push_back(inst);
+            	
+	for (boost::unordered_set<xlsx_fill, boost::hash<xlsx_fill>>::iterator it = impl_->fills_.begin(); it != impl_->fills_.end(); ++it)
+	{
+        inst_array.push_back(*it);
    }

    std::sort(inst_array.begin(), inst_array.end(), compare_xlsx_fills());
@ -169,7 +168,7 @@ void xlsx_fills::serialize(std::wostream & _Wostream) const
        {
            CP_XML_ATTR(L"count", inst_array.size());
 			
-			for (int i = 0; i < inst_array.size(); i++)
+			for (size_t i = 0; i < inst_array.size(); i++)
            {
                xlsx_serialize(CP_XML_STREAM(), inst_array[i]);
            }
--- a/ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_fonts.cpp
@ -35,7 +35,6 @@

 #include <xml/simple_xml_writer.h>

-#include <boost/foreach.hpp>
 #include <boost/functional.hpp>
 #include <boost/unordered_set.hpp>

@ -79,9 +78,9 @@ void xlsx_fonts::Impl::serialize(std::wostream & _Wostream) const
 {
    std::vector<xlsx_font> fonts;
            
-    BOOST_FOREACH(const xlsx_font & fnt, fonts_)
+	for (boost::unordered_set<xlsx_font, boost::hash<xlsx_font>>::iterator it = fonts_.begin(); it != fonts_.end(); ++it)
    {
-        fonts.push_back(fnt);
+        fonts.push_back(*it);
    }

    std::sort(fonts.begin(), fonts.end(), compare_xlsx_fonts());
@ -91,6 +90,7 @@ void xlsx_fonts::Impl::serialize(std::wostream & _Wostream) const
        CP_XML_NODE(L"fonts")
        {
            CP_XML_ATTR(L"count", fonts.size());
+			
 			for (size_t i = 0; i < fonts.size(); ++i)
 			{
 				xlsx_serialize(CP_XML_STREAM(), fonts[i]);
--- a/ASCOfficeOdfFile/src/docx/xlsx_styles.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_styles.cpp
@ -30,7 +30,6 @@
 *
 */

-#include <boost/foreach.hpp>
 #include "../odf/style_text_properties.h"
 #include "../odf/style_paragraph_properties.h"

@ -223,11 +222,11 @@ namespace
 void xlsx_style_manager::Impl::serialize_xf(std::wostream & _Wostream, const xlsx_xf_array & xfArray, const std::wstring & nodeName)
 {
    std::vector<xlsx_xf> xfs_;
-            
-    BOOST_FOREACH(const xlsx_xf & xfRecord, xfArray)
-    {
-        xfs_.push_back(xfRecord);
-    }
+   
+	for (boost::unordered_set<xlsx_xf, boost::hash<xlsx_xf>>::iterator it = xfArray.begin(); it != xfArray.end(); ++it)
+	{
+        xfs_.push_back(*it);
+	}

    std::sort(xfs_.begin(), xfs_.end(), compare_xlsx_xf());

--- a/ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_table_state.cpp
@ -220,7 +220,9 @@ void xlsx_table_state::start_cell(size_t columnsSpanned, size_t rowsSpanned)

    // в случае если объединение имеет место добавляем запись о нем
    if (columnsSpanned != 0 || rowsSpanned != 0)
-        xlsx_merge_cells_.add_merge(current_table_column_, current_table_row_, columnsSpanned, rowsSpanned);
+	{
+		xlsx_merge_cells_.add_merge(current_table_column_, current_table_row_, columnsSpanned, rowsSpanned);
+	}

    if ( current_columns_spaned() > 0 )
    {
--- a/ASCOfficeOdfFile/src/docx/xlsx_utils.cpp
+++ b/ASCOfficeOdfFile/src/docx/xlsx_utils.cpp
@ -33,7 +33,6 @@
 #include "xlsx_utils.h"

 #include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
 #include <boost/regex.hpp>

 #include <boost/date_time/gregorian/gregorian.hpp>
@ -90,14 +89,15 @@ std::wstring getCellAddress(size_t col, size_t row)
 size_t getColAddressInv(const std::wstring & a_)
 {
    std::wstring a = a_;
-    ::boost::algorithm::to_upper(a);
+    boost::algorithm::to_upper(a);
    static const size_t r = (L'Z' - L'A' + 1);
    size_t mul = 1;
    bool f = true;
    size_t res = 0;
-    BOOST_REVERSE_FOREACH(const wchar_t c, a)
-    {
-        size_t v = c - L'A';
+
+	for (int i = a.length() - 1; i >= 0; i--)
+	{
+		size_t v = a[i] - L'A';
        if (f)
            f = false;
        else
@ -129,13 +129,12 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
 	
 	boost::algorithm::to_upper(a);
 	
-
-	BOOST_FOREACH(wchar_t c, a)
-    {
-		if (c >= L'0' && c <= L'9')
-			row +=c;
+	for (size_t i = 0; i < a.length(); i++)
+	{
+		if (a[i] >= L'0' && a[i] <= L'9')
+			row += a[i];
 		else
-			col += c;
+			col += a[i];
    }
 	std::reverse(col.begin(), col.end());
 	std::reverse(row.begin(), row.end());
--- a/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp
+++ b/ASCOfficeOdfFile/src/odf/chart_build_oox.cpp
@ -29,8 +29,6 @@
 * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 *
 */
-#include <boost/foreach.hpp>
-
 #include "../docx/xlsx_textcontext.h"
 #include "../docx/xlsx_num_format_context.h"

@ -61,17 +59,17 @@ class office_element;
 typedef shared_ptr<const office_element>::Type office_element_ptr_const;

 #define ACCEPT_ALL_CONTENT(VAL) \
-        BOOST_FOREACH(office_element_ptr & elm, (VAL)) \
+	for (size_t ii = 0; ii < VAL.size(); ++ii) \
        { \
-            if (elm) \
-                elm->accept(*this); \
+            if (VAL[ii]) \
+                VAL[ii]->accept(*this); \
        }
        
 #define ACCEPT_ALL_CONTENT_CONST(VAL) \
-        BOOST_FOREACH(const office_element_ptr_const & elm, (VAL)) \
+	for (size_t ii = 0; ii < VAL.size(); ++ii) \
        { \
-            if (elm) \
-                elm->accept(*this); \
+            if (VAL[ii]) \
+                VAL[ii]->accept(*this); \
        }


--- a/ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
+++ b/ASCOfficeOdfFile/src/odf/draw_frame_docx.cpp
@ -774,6 +774,20 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
 			style_instance * defaultStyle = Context.root()->odf_context().styleContainer().style_default_by_type(odf_types::style_family::Graphic);
 			if (defaultStyle)instances.push_back(defaultStyle);
 		}
+		else if (styleInst->content())
+		{
+			style_paragraph_properties *para_props = styleInst->content()->get_style_paragraph_properties();
+			if ((para_props) && (para_props->content_.style_writing_mode_))
+			{
+				switch(para_props->content_.style_writing_mode_->get_type())
+				{
+					case writing_mode::TbLr:
+						drawing->additional.push_back(odf_reader::_property(L"text_vert", 2)); break;
+					case writing_mode::TbRl:
+						drawing->additional.push_back(odf_reader::_property(L"text_vert", 1)); break;
+				}
+			}
+		}
 		
 		instances.push_back(styleInst);
 	}
@ -870,7 +884,7 @@ void common_draw_docx_convert(oox::docx_conversion_context & Context, union_comm
 		}

    }
-	drawing->number_wrapped_paragraphs=graphicProperties.style_number_wrapped_paragraphs_.
+	drawing->number_wrapped_paragraphs = graphicProperties.style_number_wrapped_paragraphs_.
 									get_value_or( integer_or_nolimit( integer_or_nolimit::NoLimit) ).get_value();
 	if (anchor && anchor->get_type() == anchor_type::AsChar && drawing->posOffsetV< 0)
 	{
@ -1232,7 +1246,7 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)

 	const std::wstring & content = Context.get_drawing_context().get_text_stream_frame();
 	
-	drawing->additional.push_back(_property(L"text-content",content));
+	drawing->additional.push_back(_property(L"text-content", content));
 	Context.get_drawing_context().clear_stream_frame();

 /////////
@ -1302,6 +1316,12 @@ void draw_text_box::docx_convert(oox::docx_conversion_context & Context)
 	}
 	else if (auto_fit_text)
 		drawing->additional.push_back(_property(L"fit-to-size",	auto_fit_text));
+
+	if (drawing->cx < 1 && drawing->cy < 1)
+	{
+		drawing->cx = 10;
+		drawing->cy = 10;
+	}
 }
 void draw_g::docx_convert(oox::docx_conversion_context & Context)
 {
@ -1425,8 +1445,7 @@ void draw_frame::docx_convert(oox::docx_conversion_context & Context)
    Context.get_drawing_context().start_frame(this);
    
    const _CP_OPT(std::wstring) name = 
-        common_draw_attlists_.shape_with_text_and_styles_.
-        common_shape_draw_attlist_.draw_name_;
+        common_draw_attlists_.shape_with_text_and_styles_.common_shape_draw_attlist_.draw_name_;
 	
 	Context.get_drawing_context().add_name_object(name.get_value_or(L"Object"));
 	
@ -1654,7 +1673,7 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)
 	oox::text_forms_context::_state & state = Context.get_forms_context().get_state_element(*control_id_);
 	if (state.id.empty()) return;

-	if (state.type == 6 && state.element)
+	if ((state.type == 6 || state.type == 4) && state.element)
 	{
 		return state.element->docx_convert_sdt(Context, this);
 	}
@ -1711,7 +1730,7 @@ void draw_control::docx_convert(oox::docx_conversion_context & Context)

 			Context.add_new_run(L"");
 				Context.output_stream() << L"<w:t xml:space=\"preserve\">";
-				Context.output_stream() << xml::utils::replace_text_to_xml( text );
+				Context.output_stream() << xml::utils::replace_text_to_xml( text, true );
 				Context.output_stream() << L"</w:t>";
 			Context.finish_run();
 		}
--- a/ASCOfficeOdfFile/src/odf/draw_shapes.cpp
+++ b/ASCOfficeOdfFile/src/odf/draw_shapes.cpp
@ -37,7 +37,6 @@
 #include <sstream>
 #include <string>

-#include <boost/foreach.hpp>
 #include <boost/regex.h>

 #include <xml/xmlchar.h>
@ -438,9 +437,9 @@ int draw_enhanced_geometry::parsing(_CP_OPT(std::wstring) val)
 	int pos = 0, res = -1;
 	if (!val) return res;

-	BOOST_FOREACH(wchar_t c, val.get())
+	for (size_t i = 0; i < val->length(); i++)
    {
-		if (c < L'0' && c > L'9')
+		if (val->at(i) < L'0' && val->at(i) > L'9')
 			return res;
 	}

--- a/ASCOfficeOdfFile/src/odf/number_style.cpp
+++ b/ASCOfficeOdfFile/src/odf/number_style.cpp
@ -32,7 +32,6 @@

 #include "number_style.h"

-#include <boost/foreach.hpp>
 #include <odf/odf_document.h>

 #include <xml/xmlchar.h>
@ -78,10 +77,10 @@ void number_style_base::oox_convert_impl(oox::num_format_context & Context)
        }
    }

-    BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
    {
-		number_style_base	*number_style_		= dynamic_cast<number_style_base *>	(elm.get());
-  		number_element		*number_element_	= dynamic_cast<number_element *>	(elm.get());
+		number_style_base	*number_style_		= dynamic_cast<number_style_base *>	(content_[i].get());
+  		number_element		*number_element_	= dynamic_cast<number_element *>	(content_[i].get());
 		
 		if (number_style_)		number_style_->oox_convert(Context);
 		if (number_element_)	number_element_->oox_convert(Context);
@ -93,9 +92,9 @@ void number_style_base::oox_convert(oox::num_format_context & Context)
 {
    if (!style_map_.empty())
    {
-        BOOST_FOREACH(const office_element_ptr & elm, style_map_)
-        {
-            if (const style_map * styleMap = dynamic_cast<const style_map *>(elm.get()))
+		for (size_t i = 0; i < style_map_.size(); i++)
+		{
+            if (const style_map * styleMap = dynamic_cast<const style_map *>(style_map_[i].get()))
            {
                const std::wstring applyStyleName	= styleMap->style_apply_style_name_;
                const std::wstring condition		= styleMap->style_condition_;
@ -309,12 +308,13 @@ void number_currency_symbol::add_text(const std::wstring & Text)
 void number_currency_symbol::oox_convert(oox::num_format_context & Context)
 {
    std::wostream & strm = Context.output();
-    strm << L"[$";//xml::utils::replace_text_to_xml(L"\"");
-    BOOST_FOREACH(const std::wstring & t, text_)
+    strm << L"[$";
+
+	for (size_t i = 0; i < text_.size(); i++)
    {
-        strm << xml::utils::replace_text_to_xml(t);
+        strm << xml::utils::replace_text_to_xml(text_[i]);
    }
-    strm << L"]";;//xml::utils::replace_text_to_xml(L"\"");
+    strm << L"]";
 }


--- a/ASCOfficeOdfFile/src/odf/odf_document_impl.cpp
+++ b/ASCOfficeOdfFile/src/odf/odf_document_impl.cpp
@ -296,9 +296,20 @@ bool odf_document::Impl::decrypt_folder (const std::wstring &password, const std
 			if (false == result)
 				break;
 		}
-		else
+		else 
 		{
-			NSFile::CFileBinary::Copy(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName);
+			pFind = map_encryptions_extra_.find(arFiles[i]);
+			if ( pFind != map_encryptions_.end() )
+			{
+				result = decrypt_file(password, arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName, pFind->second.first, pFind->second.second);
+				
+				if (false == result)
+					break;
+			}
+			else 
+			{
+				NSFile::CFileBinary::Copy(arFiles[i], dstPath + FILE_SEPARATOR_STR + sFileName);
+			}
 		}
 	}
 	for (size_t i = 0; result && i < arDirectories.size(); ++i)
@ -573,7 +584,14 @@ void odf_document::Impl::parse_manifests(office_element *element)
 			XmlUtils::replace_all( file_path, L"/", FILE_SEPARATOR_STR);
 			file_path = base_folder_ + FILE_SEPARATOR_STR + file_path;

-			map_encryptions_.insert(std::make_pair(file_path, std::make_pair(entry->encryption_data_, entry->size)));
+			if (0 == entry->full_path_.find(L"Basic/")) //Cuaderno de notas 1.2.ods
+			{
+				map_encryptions_extra_.insert(std::make_pair(file_path, std::make_pair(entry->encryption_data_, entry->size)));
+			}
+			else
+			{
+				map_encryptions_.insert(std::make_pair(file_path, std::make_pair(entry->encryption_data_, entry->size)));
+			}
 		}

 		if (entry->full_path_ == L"/")
--- a/ASCOfficeOdfFile/src/odf/odf_document_impl.h
+++ b/ASCOfficeOdfFile/src/odf/odf_document_impl.h
@ -80,7 +80,9 @@ public:

 	int get_office_mime_type() {return office_mime_type_;}

-	bool get_encrypted() {return (false == map_encryptions_.empty());}
+	bool get_encrypted()		{return (false == map_encryptions_.empty());}
+	bool get_encrypted_extra()	{return (false == map_encryptions_extra_.empty());}
+	
 	bool get_error() {return bError;}

 	bool UpdateProgress(long Complete);
@ -122,7 +124,8 @@ private:
 	int GetMimetype(std::wstring value);

 	std::map<std::wstring, std::pair<office_element_ptr, int>> map_encryptions_;
-            
+ 	std::map<std::wstring, std::pair<office_element_ptr, int>> map_encryptions_extra_;
+           
 };

 }
--- a/ASCOfficeOdfFile/src/odf/odfcontext.cpp
+++ b/ASCOfficeOdfFile/src/odf/odfcontext.cpp
@ -71,7 +71,7 @@ style_instance::style_instance(
   
 style_instance * styles_container::hyperlink_style()
 {
-    if (hyperlink_style_pos_ > 0)
+    if (hyperlink_style_pos_ > 0 && hyperlink_style_pos_ < instances_.size())
        return instances_[hyperlink_style_pos_].get();
    else
        return NULL;
--- a/ASCOfficeOdfFile/src/odf/office_forms.cpp
+++ b/ASCOfficeOdfFile/src/odf/office_forms.cpp
@ -406,12 +406,76 @@ void form_combobox::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
 	form_element::add_attributes(Attributes);
 }
+void form_combobox::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+    if CP_CHECK_NAME(L"form", L"item")
+    {
+        CP_CREATE_ELEMENT(items_);                    
+    }
+	else
+	{
+		form_element::add_child_element(Reader, Ns, Name);
+	}
+}
 void form_combobox::docx_convert(oox::docx_conversion_context & Context)
 {
 	Context.get_forms_context().start_element(4);
+	Context.get_forms_context().set_element(dynamic_cast<form_element*>(this));

 	form_element::docx_convert(Context);
 }
+void form_combobox::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
+{
+	Context.finish_run();
+	Context.output_stream() << L"<w:sdt>";
+		Context.output_stream() << L"<w:sdtPr>";
+		{
+			if (name_)
+			{
+				Context.output_stream() << L"<w:alias w:val=\"" + xml::utils::replace_text_to_xml(*name_) + L"\"/>";
+			}
+			Context.output_stream() << L"<w:id w:val=\"" + std::to_wstring(Context.get_drawing_context().get_current_shape_id()) + L"\"/>";
+			
+			Context.output_stream() << L"<w:dropDownList>";
+
+			for (size_t i = 0; i < items_.size(); i++)
+			{
+				form_item* item = dynamic_cast<form_item*>(items_[i].get());
+				if (!item) continue;
+
+				Context.output_stream() << L"<w:listItem w:displayText=\"" << (item->text_.empty() ? item->label_ : item->text_);
+				Context.output_stream() << L"\" w:value=\"" << item->label_ << L"\"/>";
+			}
+			
+			Context.output_stream() << L"</w:dropDownList>";
+		}
+		Context.output_stream() << L"</w:sdtPr>";
+		Context.output_stream() << L"<w:sdtContent>";
+		{
+			Context.add_new_run(L"");
+				Context.output_stream() << L"<w:t xml:space=\"preserve\">";
+				if (current_value_)
+				{
+					Context.output_stream() << xml::utils::replace_text_to_xml(*current_value_ );
+				}
+				Context.output_stream() << L"</w:t>";
+			Context.finish_run();
+		}
+		Context.output_stream() << L"</w:sdtContent>";
+	Context.output_stream() << L"</w:sdt>";
+	
+	if (label_)
+	{
+		Context.add_new_run(L"");
+			Context.output_stream() << L"<w:t xml:space=\"preserve\">";
+			Context.output_stream() << xml::utils::replace_text_to_xml(*label_ );
+			Context.output_stream() << L"</w:t>";
+		Context.finish_run();
+	}
+}
+
+
+
 // form:listbox
 //----------------------------------------------------------------------------------
 const wchar_t * form_listbox::ns = L"form";
@ -445,6 +509,8 @@ void form_date::docx_convert(oox::docx_conversion_context & Context)
 }
 void form_date::docx_convert_sdt(oox::docx_conversion_context & Context, draw_control *draw)
 {
+	Context.finish_run();
+
 	Context.output_stream() << L"<w:sdt>";
 		Context.output_stream() << L"<w:sdtPr>";
 		{
@ -489,7 +555,19 @@ void form_date::docx_convert_sdt(oox::docx_conversion_context & Context, draw_co
 		Context.finish_run();
 	}
 }
+// form:item
+//----------------------------------------------------------------------------------
+const wchar_t * form_item::ns = L"form";
+const wchar_t * form_item::name = L"item";

+void form_item::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"form:label", label_, std::wstring(L""));
+}
+void form_item::add_text(const std::wstring & Text)
+{
+	text_ = Text;
+}

 }
 }
--- a/ASCOfficeOdfFile/src/odf/office_forms.h
+++ b/ASCOfficeOdfFile/src/odf/office_forms.h
@ -337,10 +337,16 @@ public:
    CPDOCCORE_DEFINE_VISITABLE();

 	virtual void docx_convert		(oox::docx_conversion_context & Context) ;
+	virtual void docx_convert_sdt	(oox::docx_conversion_context & Context, draw_control* draw);
 private:
    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);

 public:
+	_CP_OPT(odf_types::Bool)	dropdown_;
+	office_element_ptr_array	items_;
+	_CP_OPT(int	)				size_;
+	
 	//form:list-source-type
 	//form:size
 	//form:auto-complete
@ -367,10 +373,9 @@ private:

 public:
 	//form:list-source-type
-	//form:size
 	//form:list-source
 	//form:source-cell-range
-	//form:dropdown
+	
 	//form:bound-column
 	//form:xforms-list-source
 	//form:multiple
@ -400,6 +405,27 @@ public:

 };
 CP_REGISTER_OFFICE_ELEMENT2(form_date);
+
+//  form:item
+class form_item : public office_element_impl<form_item>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeFormItem;
+    CPDOCCORE_DEFINE_VISITABLE();
+
+private:
+    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+    virtual void add_text(const std::wstring & Text);
+
+public:
+	std::wstring label_;
+	std::wstring text_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(form_item);
 }
 }
 //<form:connection-resource>7.6.2,  
--- a/ASCOfficeOdfFile/src/odf/paragraph_elements.cpp
+++ b/ASCOfficeOdfFile/src/odf/paragraph_elements.cpp
@ -122,7 +122,7 @@ const wchar_t * text::name = L"";

 std::wostream & text::text_to_stream(std::wostream & _Wostream) const
 {
-    _Wostream << xml::utils::replace_text_to_xml( text_ );
+    _Wostream << xml::utils::replace_text_to_xml( text_, true );
    return _Wostream;
 }

@ -174,7 +174,7 @@ void text::docx_convert(oox::docx_conversion_context & Context)
 		Context.output_stream() << L" xml:space=\"preserve\"";
 	Context.output_stream() << L">";

-	Context.output_stream() << xml::utils::replace_text_to_xml( text_ );
+	Context.output_stream() << xml::utils::replace_text_to_xml( text_, true );
    Context.output_stream() << L"</" << textNode << L">";

 	if (add_del_run)
@ -2050,9 +2050,25 @@ void field_fieldmark_start::add_attributes( const xml::attributes_wc_ptr & Attri
    CP_APPLY_ATTR(L"text:name", text_name_);
    CP_APPLY_ATTR(L"field:type", field_type_);
 }
+void field_fieldmark_start::docx_convert(oox::docx_conversion_context & Context)
+{
+	if (!field_type_) return;
+	if (!text_name_) return;
+
+	if (std::wstring::npos != field_type_->find(L"vnd.oasis.opendocument.field."))
+	{
+		Context.start_field(field_type_->substr(29), *text_name_);
+	}
+
+}
 //------------------------------------------------------------------------------------------------------------
 const wchar_t * field_fieldmark_end::ns = L"field";
 const wchar_t * field_fieldmark_end::name = L"fieldmark-end";
+
+void field_fieldmark_end::docx_convert(oox::docx_conversion_context & Context)
+{
+	Context.end_field();
+}
 //------------------------------------------------------------------------------------------------------------
 const wchar_t * field_fieldmark::ns = L"field";
 const wchar_t * field_fieldmark::name = L"fieldmark";
@ -2062,13 +2078,75 @@ void field_fieldmark::add_attributes( const xml::attributes_wc_ptr & Attributes
    CP_APPLY_ATTR(L"text:name", text_name_);
    CP_APPLY_ATTR(L"field:type", field_type_);
 }
+void field_fieldmark::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT(field_params_);
+}
 void field_fieldmark::docx_convert(oox::docx_conversion_context & Context)
 {
 	if (!field_type_) return;
+	if (!text_name_) return;

-	//if (std::wstring::npos = field_type_->find(L"FORMCHECKBOX"))
-	//{
-	//}
+	if (std::wstring::npos != field_type_->find(L"FORMCHECKBOX"))
+	{
+		XmlUtils::replace_all( *text_name_, L" ", L"_");
+
+		Context.output_stream() << L"<w:r><w:fldChar w:fldCharType=\"begin\"><w:ffData><w:name w:val=\"" << *text_name_ << L"\"/><w:enabled/>";
+		Context.output_stream() << L"<w:checkBox>";
+		//Context.output_stream() << L"<w:default w:val=\"" << std::to_wstring(current_state_) << L"\"/>
+		Context.output_stream() << L"<w:sizeAuto/>";
+		for (size_t i = 0; i < field_params_.size(); i++)
+		{
+			field_param *param = dynamic_cast<field_param*>(field_params_[i].get());
+			if ((param) && (param->field_name_) && (std::wstring::npos != param->field_name_->find(L"Checkbox_Checked")))
+			{
+				odf_types::Bool value = Bool::parse(*param->field_value_);
+				if (value.get())
+ 					Context.output_stream() << L"<w:checked/>";
+				break;
+			}
+		}
+		Context.output_stream() << L"</w:checkBox></w:ffData>";
+		Context.output_stream() << L"</w:fldChar></w:r>";
+		Context.output_stream() << L"<w:r><w:instrText>FORMCHECKBOX</w:instrText></w:r>";
+		Context.output_stream() << L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
+		Context.output_stream() << L"<w:r><w:t>" << L"" << L"</w:t></w:r>";
+		Context.output_stream() << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
+	}
+	else if (std::wstring::npos != field_type_->find(L"FORMDROPDOWN"))
+	{
+		std::wostream & strm = Context.output_stream();
+		Context.finish_run();
+		
+		strm << L"<w:r><w:fldChar w:fldCharType=\"begin\"><w:ffData><w:name w:val=\"" << text_name_.get_value_or(L"") << L"\"/><w:enabled/>";
+
+		strm << L"<w:ddList><w:result w:val=\"0\"/>";
+		for (size_t i = 0; i < field_params_.size(); i++)
+		{
+			field_params_[i]->docx_convert(Context);
+		}
+		strm << L"</w:ddList></w:ffData>";
+
+		strm << L"</w:fldChar></w:r>";
+		strm << L"<w:r><w:instrText>FORMDROPDOWN</w:instrText></w:r>";
+		strm << L"<w:r><w:fldChar w:fldCharType=\"separate\"/></w:r>";
+		strm << L"<w:r><w:fldChar w:fldCharType=\"end\"/></w:r>";
+	}
+	else if (std::wstring::npos != field_type_->find(L"FORMTEXT"))
+	{
+	}
+}
+//------------------------------------------------------------------------------------------------------------
+const wchar_t * field_param::ns = L"field";
+const wchar_t * field_param::name = L"param";
+
+void field_param::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+    CP_APPLY_ATTR(L"field:name", field_name_);
+    CP_APPLY_ATTR(L"field:value", field_value_);
+}
+void field_param::docx_convert(oox::docx_conversion_context & Context)
+{
 }
 }
 }
--- a/ASCOfficeOdfFile/src/odf/paragraph_elements.h
+++ b/ASCOfficeOdfFile/src/odf/paragraph_elements.h
@ -1590,6 +1590,8 @@ public:

    _CP_OPT(std::wstring)	text_name_;
 	_CP_OPT(std::wstring)	field_type_;
+	
+	void docx_convert(oox::docx_conversion_context & Context);
 private:
    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name) {}
@ -1608,6 +1610,7 @@ public:
    static const ElementType type = typeFieldFieldmarkStart;
    CPDOCCORE_DEFINE_VISITABLE();

+	void docx_convert(oox::docx_conversion_context & Context);
 private:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes ){}
    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name) {}
@ -1629,11 +1632,35 @@ public:
    _CP_OPT(std::wstring)	text_name_;
 	_CP_OPT(std::wstring)	field_type_;

+	office_element_ptr_array	field_params_;
+
 	void docx_convert(oox::docx_conversion_context & Context);
 private:
 	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
-    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name) {}
+    virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 };
 CP_REGISTER_OFFICE_ELEMENT2(field_fieldmark);
+
+//-------------------------------------------------------------------------------------------------------------------
+// field:param
+//-------------------------------------------------------------------------------------------------------------------
+class field_param : public text::paragraph_content_element<field_param>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeFieldParam;
+    CPDOCCORE_DEFINE_VISITABLE();
+
+    _CP_OPT(std::wstring)	field_name_;
+	_CP_OPT(std::wstring)	field_value_;
+
+	void docx_convert(oox::docx_conversion_context & Context);
+private:
+	virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name){}
+};
+CP_REGISTER_OFFICE_ELEMENT2(field_param);
 } // namespace odf_reader
 } // namespace cpdoccore
--- a/ASCOfficeOdfFile/src/odf/style_table_properties.cpp
+++ b/ASCOfficeOdfFile/src/odf/style_table_properties.cpp
@ -207,29 +207,45 @@ void style_table_column_properties::docx_convert(oox::docx_conversion_context &
 {
    std::wostream & strm = Context.output_stream();

+	double page_width = 0;
+	
+	const page_layout_instance * pp = Context.root()->odf_context().pageLayoutContainer().page_layout_first();
+	if ((pp) && (pp->properties()))
+	{
+		style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
+		if (attr_page.fo_page_width_)
+		{
+			page_width = attr_page.fo_page_width_->get_value_unit(odf_types::length::pt);
+		}
+		if (attr_page.common_horizontal_margin_attlist_.fo_margin_left_)
+		{
+			page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_left_->get_length().get_value_unit(odf_types::length::pt);
+		}
+		if (attr_page.common_horizontal_margin_attlist_.fo_margin_right_)
+		{
+			page_width -= attr_page.common_horizontal_margin_attlist_.fo_margin_right_->get_length().get_value_unit(odf_types::length::pt);
+		}
+	}	
    if (attlist_.style_column_width_)
    {
 		double kf_max_width_ms = 1.;

-		const page_layout_instance * pp = Context.root()->odf_context().pageLayoutContainer().page_layout_first();//
-		if ((pp) && (pp->properties()))
-		{
-			style_page_layout_properties_attlist & attr_page = pp->properties()->attlist_;
-			if (attr_page.fo_page_width_)
-			{
-				int val =  0.5 + 20.0 * attr_page.fo_page_width_->get_value_unit(length::pt);
-				if (val > 31680.)
-					kf_max_width_ms = 31680./val;
-			}
-		}
+		int val =  0.5 + 20.0 * page_width;
+		if (val > 31680.)
+			kf_max_width_ms = 31680./val;

-		int val = attlist_.style_column_width_->get_value_unit(length::pt);
-
-		double width = 0.5 + 20.0 * val * kf_max_width_ms;
+		double width = 0.5 + 20.0 * attlist_.style_column_width_->get_value_unit(length::pt) * kf_max_width_ms;

 		Context.get_table_context().add_column_width(width);
        strm << L"<w:gridCol w:w=\"" << (int)(width) << "\"/>";
    }
+	else if ((attlist_.style_rel_column_width_) && (attlist_.style_rel_column_width_->get_unit() == length::rel))
+	{
+		double width = 0.5 + 20.0 * page_width * attlist_.style_rel_column_width_->get_value() / 65534.;
+		
+		Context.get_table_context().add_column_width(width);
+        strm << L"<w:gridCol w:w=\"" << (int)(width) << "\"/>";
+	}
 	else
 	{
 		Context.get_table_context().add_column_width(0);
--- a/ASCOfficeOdfFile/src/odf/table.cpp
+++ b/ASCOfficeOdfFile/src/odf/table.cpp
@ -381,6 +381,9 @@ bool table_table_cell::empty()
 {
 	if (!content_.elements_.empty()) return false;
 	if (attlist_.table_formula_) return false;
+	
+	if (attlist_extra_.table_number_columns_spanned_ > 1) return false;
+	if (attlist_extra_.table_number_rows_spanned_ > 1) return false;

 	return true;
 }
--- a/ASCOfficeOdfFile/src/xml/attributes.cpp
+++ b/ASCOfficeOdfFile/src/xml/attributes.cpp
@ -34,8 +34,6 @@
 #include <string>
 #include <iostream>

-#include <boost/foreach.hpp>
-
 #include "../../include/xml/attributes.h"
 #include "../../include/xml/sax.h"

--- a/ASCOfficeOdfFile/src/xml/utils.cpp
+++ b/ASCOfficeOdfFile/src/xml/utils.cpp
@ -96,9 +96,9 @@ std::string replace_xml_to_text_ImplRegEx(const std::string & Text)
    return boost::regex_replace(Text, replace_xml_to_text_expr, replace_xml_to_text_fmt, boost::match_default | boost::format_all);
 }

-std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text)
+std::wstring replace_text_to_xml_ImplReplace(const std::wstring & Text, bool dDeleteUnicode)
 {
-    return XmlUtils::EncodeXmlString(Text);
+    return XmlUtils::EncodeXmlString(Text, dDeleteUnicode);
 }

 std::string replace_text_to_xml_ImplReplace(const std::string & Text)
@ -164,9 +164,9 @@ std::wstring replace_amp_text_to_xml(const std::wstring & Text)
 {
    return details::replace_amp_text_to_xml_ImplReplace(Text);                
 }
-std::wstring replace_text_to_xml(const std::wstring & Text)
+std::wstring replace_text_to_xml(const std::wstring & Text, bool dDeleteUnicode)
 {
-    return details::replace_text_to_xml_ImplReplace(Text);                
+    return details::replace_text_to_xml_ImplReplace(Text, dDeleteUnicode);                
 }

 std::string replace_text_to_xml(const std::string & Text)
--- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp
+++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/Converter.cpp
@ -523,7 +523,8 @@ void NSPresentationEditor::CPPTXWriter::WritePresInfo()
   
 	if (false == m_pDocument->m_arThemes.empty())
 	{
-		strDefaultTextStyle += CStylesWriter::ConvertStyles(m_pDocument->m_arThemes[0]->m_pStyles[0], 9);
+		CStylesWriter styleWriter(m_pDocument->m_arThemes[0].get());
+		strDefaultTextStyle += styleWriter.ConvertStyles(m_pDocument->m_arThemes[0]->m_pStyles[0], 9);
 	}
 	strDefaultTextStyle += _T("</p:defaultTextStyle>");

@ -587,7 +588,9 @@ void NSPresentationEditor::CPPTXWriter::WriteThemes()

 	for (size_t i = 0; i < m_pDocument->m_arThemes.size(); i++)
 	{
-		WriteTheme(m_pDocument->m_arThemes[i], nIndexTheme, nStartLayout);
+		m_pShapeWriter->m_pTheme = m_pDocument->m_arThemes[i].get();
+			WriteTheme(m_pDocument->m_arThemes[i], nIndexTheme, nStartLayout);
+		m_pShapeWriter->m_pTheme = NULL;
 	}

 	WriteTheme(m_pDocument->m_pNotesMaster, nIndexTheme, nStartLayout);
@ -776,20 +779,23 @@ void NSPresentationEditor::CPPTXWriter::WriteTheme(CThemePtr pTheme, int & nInde
 		if (!pTheme->m_bHasFooter)		oWriter.WriteString(std::wstring(L" ftr=\"0\""));
 		oWriter.WriteString(std::wstring(L"/>"));
 	}
+	CStylesWriter styleWriter;
+	styleWriter.m_pTheme = pTheme.get();
+
 	if (pTheme->m_eType == typeMaster)
 	{	
 		oWriter.WriteString(std::wstring(L"<p:txStyles>"));

 		oWriter.WriteString(std::wstring(L"<p:titleStyle>"));
-		CStylesWriter::ConvertStyles(pTheme->m_pStyles[1], oWriter, 9);
+		styleWriter.ConvertStyles(pTheme->m_pStyles[1], oWriter, 9);
 		oWriter.WriteString(std::wstring(L"</p:titleStyle>"));

 		oWriter.WriteString(std::wstring(L"<p:bodyStyle>"));
-		CStylesWriter::ConvertStyles(pTheme->m_pStyles[2], oWriter, 9);
+		styleWriter.ConvertStyles(pTheme->m_pStyles[2], oWriter, 9);
 		oWriter.WriteString(std::wstring(L"</p:bodyStyle>"));

 		oWriter.WriteString(std::wstring(L"<p:otherStyle>"));
-		CStylesWriter::ConvertStyles(pTheme->m_pStyles[3], oWriter, 9);
+		styleWriter.ConvertStyles(pTheme->m_pStyles[3], oWriter, 9);
 		oWriter.WriteString(std::wstring(L"</p:otherStyle>"));
 		
 		oWriter.WriteString(std::wstring(L"</p:txStyles>"));
@ -797,7 +803,7 @@ void NSPresentationEditor::CPPTXWriter::WriteTheme(CThemePtr pTheme, int & nInde
 	else if (pTheme->m_eType == typeNotesMaster)
 	{	
 		oWriter.WriteString(std::wstring(L"<p:notesStyle>"));
-		CStylesWriter::ConvertStyles(pTheme->m_pStyles[1], oWriter, 9);
+		styleWriter.ConvertStyles(pTheme->m_pStyles[1], oWriter, 9);
 		oWriter.WriteString(std::wstring(L"</p:notesStyle>"));
 	}

--- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
+++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
@ -31,6 +31,7 @@
 */
 #include "ShapeWriter.h"
 #include "StylesWriter.h"
+#include "../../../ASCOfficePPTXFile/Editor/Drawing/Theme.h"

 #include "../../../ASCOfficeXlsFile2/source/XlsXlsxConverter/ShapeType.h"
 #include "../../../Common/MS-LCID.h"
@ -39,6 +40,9 @@
 #include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h"
 #include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/SpTree.h"

+CStylesWriter::CStylesWriter() : m_pTheme(NULL) {}
+CStylesWriter::CStylesWriter(NSPresentationEditor::CTheme* pTheme) : m_pTheme(pTheme) {}
+
 void CStylesWriter::ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLevel, NSPresentationEditor::CStringWriter& oWriter, const int& nLevel)
 {//дублирование CTextPFRun и  CTextCFRun с ShapeWriter - todooo  - вынести отдельно
    std::wstring str1;
@ -243,24 +247,31 @@ void CStylesWriter::ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLe
 			oWriter.WriteString(L"<a:solidFill><a:srgbClr val=\"" + strColor + L"\"/></a:solidFill>");
 		}
 	}
-	if (pCF->Typeface.is_init())
+	if ((pCF->FontProperties.is_init()) && (!pCF->FontProperties->strFontName.empty()))
 	{
-		if (0 == pCF->Typeface.get())
+		oWriter.WriteString(L"<a:latin typeface=\"" + pCF->FontProperties->strFontName + L"\"/>");
+	}
+	else if (pCF->fontRef.is_init())
+	{
+		if ((m_pTheme) && (pCF->fontRef.get() < m_pTheme->m_arFonts.size()))
 		{
-			oWriter.WriteString(L"<a:latin typeface=\"+mj-lt\"/>");
+			oWriter.WriteString(L"<a:latin typeface=\"" + m_pTheme->m_arFonts[pCF->fontRef.get()].Name + L"\"/>");
 		}
 		else
 		{
-			oWriter.WriteString(L"<a:latin typeface=\"+mn-lt\"/>");
+			if (0 == pCF->fontRef.get())
+			{
+				oWriter.WriteString(L"<a:latin typeface=\"+mj-lt\"/>");
+			}
+			else
+			{
+				oWriter.WriteString(L"<a:latin typeface=\"+mn-lt\"/>");
+			}
 		}
 	}
-	else if ((pCF->FontProperties.is_init()) && (!pCF->FontProperties->strFontName.empty()))
-	{
-		oWriter.WriteString(L"<a:latin typeface=\"" + pCF->FontProperties->strFontName + L"\"/>");
-	}	
 	if (pCF->FontPropertiesEA.is_init())
 	{
-		oWriter.WriteString(L"<a:ea typeface=\"" + pCF->FontPropertiesEA->strFontName + L"\"/>");
+		oWriter.WriteString(L"<a:cs typeface=\"" + pCF->FontPropertiesEA->strFontName + L"\"/>");
 	}
 	if (pCF->FontPropertiesSym.is_init())
 	{
@ -278,6 +289,7 @@ void CStylesWriter::ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLe
 }
 NSPresentationEditor::CShapeWriter::CShapeWriter()
 {
+	m_pTheme		= NULL;
 	m_pRels			= NULL;
 	m_lNextShapeID	= 1000;

@ -979,7 +991,8 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()

 	if (!m_bWordArt)
 	{
-		CStylesWriter::ConvertStyles(pShapeElement->m_pShape->m_oText.m_oStyles, m_oWriter);
+		CStylesWriter styleWriter(m_pTheme);
+		styleWriter.ConvertStyles(pShapeElement->m_pShape->m_oText.m_oStyles, m_oWriter);
 	}

 	m_oWriter.WriteString(std::wstring(L"</a:lstStyle>"));
@ -1267,24 +1280,32 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
 				}
 			}

-			if (pCF->Typeface.is_init())
-			{
-				if (0 == pCF->Typeface.get())
-				{
-					m_oWriter.WriteString(L"<a:latin typeface=\"+mj-lt\"/>");
-				}
-				else
-				{
-					m_oWriter.WriteString(L"<a:latin typeface=\"+mn-lt\"/>");
-				}
-			}
-			else if (pCF->FontProperties.is_init())
+			if (pCF->FontProperties.is_init())
 			{
 				m_oWriter.WriteString(std::wstring(L"<a:latin typeface=\"") + pCF->FontProperties->strFontName + _T("\"/>"));
 			}
+			else if (pCF->fontRef.is_init())
+			{
+				if ((m_pTheme) && (pCF->fontRef.get() < m_pTheme->m_arFonts.size()))
+				{
+					m_oWriter.WriteString(L"<a:latin typeface=\"" + m_pTheme->m_arFonts[pCF->fontRef.get()].Name + L"\"/>");
+				}
+				else
+				{
+					if (0 == pCF->fontRef.get())
+					{
+						m_oWriter.WriteString(L"<a:latin typeface=\"+mj-lt\"/>");
+					}
+					else
+					{
+						m_oWriter.WriteString(L"<a:latin typeface=\"+mn-lt\"/>");
+					}
+				}
+			}
+
 			if (pCF->FontPropertiesEA.is_init())
 			{
-				m_oWriter.WriteString(std::wstring(L"<a:ea typeface=\"") + pCF->FontPropertiesEA->strFontName + _T("\"/>"));
+				m_oWriter.WriteString(std::wstring(L"<a:cs typeface=\"") + pCF->FontPropertiesEA->strFontName + L"\"/>");
 			}
 			if (pCF->FontPropertiesSym.is_init())
 			{
--- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.h
+++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.h
@ -146,6 +146,8 @@ namespace NSPresentationEditor
 		
 		NSPresentationEditor::CRelsGenerator*	m_pRels;

+		NSPresentationEditor::CTheme*			m_pTheme;
+
        LONG									m_lNextShapeID;

 		bool									m_bWordArt;
--- a/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/StylesWriter.h
+++ b/ASCOfficePPTFile/PPTFormatLib/PPTXWriter/StylesWriter.h
@ -31,9 +31,42 @@
 */
 #pragma once

+namespace NSPresentationEditor
+{
+	class CTheme;
+}
 class CStylesWriter
 {
 public:
+	CStylesWriter(NSPresentationEditor::CTheme* m_pTheme);
+	CStylesWriter();
+
+	NSPresentationEditor::CTheme* m_pTheme;
+	
+	void ConvertStyles(NSPresentationEditor::CTextStyles& oStyles, NSPresentationEditor::CStringWriter& oWriter, int nCount = 10)
+	{
+		for (int i = 0; i < nCount; ++i)
+		{
+			if (oStyles.m_pLevels[i].is_init())
+				ConvertStyleLevel(oStyles.m_pLevels[i].get(), oWriter, i);
+		}
+	}
+	std::wstring ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLevel, const int& nLevel)
+	{
+		NSPresentationEditor::CStringWriter oWriter;
+		ConvertStyleLevel(oLevel, oWriter, nLevel);
+		return oWriter.GetData();
+	}
+
+	void ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLevel,
+		NSPresentationEditor::CStringWriter& oWriter, const int& nLevel);
+
+    std::wstring ConvertStyles(NSPresentationEditor::CTextStyles& oStyles, int nCount = 10)
+	{
+		NSPresentationEditor::CStringWriter oWriter;
+		ConvertStyles(oStyles, oWriter, nCount);
+		return oWriter.GetData();
+	}
 	AVSINLINE static std::wstring GetTextAnchor(const WORD& value)
 	{
 		if (0 == value)			return L"t";
@ -88,27 +121,5 @@ public:
 		return L"auto";
 	}

-    static std::wstring ConvertStyles(NSPresentationEditor::CTextStyles& oStyles, int nCount = 10)
-	{
-		NSPresentationEditor::CStringWriter oWriter;
-		ConvertStyles(oStyles, oWriter, nCount);
-		return oWriter.GetData();
-	}
-	static void ConvertStyles(NSPresentationEditor::CTextStyles& oStyles, NSPresentationEditor::CStringWriter& oWriter, int nCount = 10)
-	{
-		for (int i = 0; i < nCount; ++i)
-		{
-			if (oStyles.m_pLevels[i].is_init())
-				ConvertStyleLevel(oStyles.m_pLevels[i].get(), oWriter, i);
-		}
-	}
-    static std::wstring ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLevel, const int& nLevel)
-	{
-		NSPresentationEditor::CStringWriter oWriter;
-		ConvertStyleLevel(oLevel, oWriter, nLevel);
-		return oWriter.GetData();
-	}

-	static void ConvertStyleLevel(NSPresentationEditor::CTextStyleLevel& oLevel,
-		NSPresentationEditor::CStringWriter& oWriter, const int& nLevel);
 };
--- a/ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.cpp
+++ b/ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.cpp
@ -471,7 +471,7 @@ void CTextCFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation)
 	}

 	if (typeface_)
-		m_oRun.Typeface = StreamUtils::ReadWORD(pStream);
+		m_oRun.fontRef = StreamUtils::ReadWORD(pStream);

 	if (EAFontRef_)
 		m_oRun.EAFontRef = StreamUtils::ReadWORD(pStream);
--- a/ASCOfficePPTFile/PptFormatTest/PptFormatTest.cpp
+++ b/ASCOfficePPTFile/PptFormatTest/PptFormatTest.cpp
@ -43,6 +43,16 @@
 #if defined(_WIN64)
 	#pragma comment(lib, "../../build/bin/icu/win_64/icuuc.lib")
 #elif defined (_WIN32)
+
+	#if defined(_DEBUG)
+		#pragma comment(lib, "../../build/lib/win_32/DEBUG/graphics.lib")
+		#pragma comment(lib, "../../build/lib/win_32/DEBUG/kernel.lib")
+		#pragma comment(lib, "../../build/lib/win_32/DEBUG/UnicodeConverter.lib")
+	#else
+		#pragma comment(lib, "../../build/lib/win_32/graphics.lib")
+		#pragma comment(lib, "../../build/lib/win_32/kernel.lib")
+		#pragma comment(lib, "../../build/lib/win_32/UnicodeConverter.lib")
+	#endif
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif

--- a/ASCOfficePPTFile/PptFormatTest/PptFormatTest.sln
+++ b/ASCOfficePPTFile/PptFormatTest/PptFormatTest.sln
@ -2,102 +2,26 @@ Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "..\..\ASCOfficePPTXFile\PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
 	ProjectSection(ProjectDependencies) = postProject
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "graphics", "..\..\DesktopEditor\graphics\graphics_vs2005.vcproj", "{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}"
-	ProjectSection(ProjectDependencies) = postProject
-		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}
-		{BC52A07C-A797-423D-8C4F-8678805BBB36} = {BC52A07C-A797-423D-8C4F-8678805BBB36}
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD} = {617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "agg2d", "..\..\DesktopEditor\agg-2.4\agg_vs2005.vcproj", "{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cximage", "..\..\DesktopEditor\cximage\CxImage\cximage_vs2005.vcproj", "{BC52A07C-A797-423D-8C4F-8678805BBB36}"
-	ProjectSection(ProjectDependencies) = postProject
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7} = {43A0E60E-5C4A-4C09-A29B-7683F503BBD7}
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239} = {764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}
-		{DF861D33-9BC1-418C-82B1-581F590FE169} = {DF861D33-9BC1-418C-82B1-581F590FE169}
-		{0588563C-F05C-428C-B21A-DD74756628B3} = {0588563C-F05C-428C-B21A-DD74756628B3}
-		{40A69F40-063E-43FD-8543-455495D8733E} = {40A69F40-063E-43FD-8543-455495D8733E}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E} = {9A037A69-D1DF-4505-AB2A-6CB3641C476E}
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D} = {FFDA5DA1-BB65-4695-B678-BE59B4A1355D}
-		{818753F2-DBB9-4D3B-898A-A604309BE470} = {818753F2-DBB9-4D3B-898A-A604309BE470}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "..\..\DesktopEditor\cximage\jpeg\Jpeg_vs2005.vcproj", "{818753F2-DBB9-4D3B-898A-A604309BE470}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DocxFormat", "..\..\Common\DocxFormat\Projects\DocxFormat2005.vcproj", "{A100103A-353E-45E8-A9B8-90B87CC5C0B0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "font_engine", "..\..\DesktopEditor\fontengine\font_engine_vs2005.vcproj", "{C739151F-5384-41DF-A1A6-F089E2C1AD56}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "..\..\DesktopEditor\freetype-2.5.2\builds\windows\vc2005\freetype.vcproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "raster", "..\..\DesktopEditor\raster\raster_vs2005.vcproj", "{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1} = {EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jasper", "..\..\DesktopEditor\cximage\jasper\jasper_vs2005.vcproj", "{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdcr", "..\..\DesktopEditor\cximage\raw\libdcr_vs2005.vcproj", "{DF861D33-9BC1-418C-82B1-581F590FE169}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "png", "..\..\DesktopEditor\cximage\png\png_vs2005.vcproj", "{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mng", "..\..\DesktopEditor\cximage\mng\mng_vs2005.vcproj", "{40A69F40-063E-43FD-8543-455495D8733E}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tiff", "..\..\DesktopEditor\cximage\tiff\Tiff_vs2005.vcproj", "{0588563C-F05C-428C-B21A-DD74756628B3}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpsd", "..\..\DesktopEditor\cximage\libpsd\libpsd_vs2005.vcproj", "{9A037A69-D1DF-4505-AB2A-6CB3641C476E}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTFormatLib", "..\PPTFormatLib\Win32\PPTFormatLib.vcproj", "{7B27E40E-F70A-4A74-A77C-0944D7931D15}"
 	ProjectSection(ProjectDependencies) = postProject
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56} = {C739151F-5384-41DF-A1A6-F089E2C1AD56}
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0} = {A100103A-353E-45E8-A9B8-90B87CC5C0B0}
 		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig", "..\..\DesktopEditor\cximage\jbig\jbig_vs2005.vcproj", "{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jbig2", "..\..\DesktopEditor\raster\JBig2\win32\jbig2.vcproj", "{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeUtilsLib", "..\..\OfficeUtils\win32\OfficeUtilsLib.vcproj", "{F8274B05-168E-4D6E-B843-AA7510725363}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PptFormatTest", "PptFormatTest.vcproj", "{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}"
 	ProjectSection(ProjectDependencies) = postProject
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15} = {7B27E40E-F70A-4A74-A77C-0944D7931D15}
 		{3423EC9A-52E4-4A4D-9753-EDEBC38785EF} = {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C} = {C27E9A9F-3A17-4482-9C5F-BF15C01E747C}
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2} = {37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540} = {9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}
 		{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
-		{F8274B05-168E-4D6E-B843-AA7510725363} = {F8274B05-168E-4D6E-B843-AA7510725363}
-		{21663823-DE45-479B-91D0-B4FEF4916EF0} = {21663823-DE45-479B-91D0-B4FEF4916EF0}
 		{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D} = {77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "..\..\DesktopEditor\xml\build\vs2005\libxml2.vcproj", "{21663823-DE45-479B-91D0-B4FEF4916EF0}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OfficeFileCrypt", "..\..\OfficeCryptReader\win32\ECMACryptReader.vcproj", "{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XlsFormat", "..\..\ASCOfficeXlsFile2\source\win32\XlsFormat.vcproj", "{77DDC8D7-5B12-4FF2-9629-26AEBCA8436D}"
@ -154,126 +78,6 @@ Global
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Unicode Release|Win32.Build.0 = Release|Win32
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Unicode Release|x64.ActiveCfg = Release|x64
 		{36636678-AE25-4BE6-9A34-2561D1BCF302}.Unicode Release|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|Win32.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.ActiveCfg = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Debug|x64.Build.0 = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.DLL-Import Release|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Release|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseASC|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Debug|x64.Build.0 = Debug|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Release|Win32.Build.0 = Release|Win32
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Release|x64.ActiveCfg = Release|x64
-		{37CA072A-5BDE-498B-B3A7-5E404F5F9BF2}.Unicode Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|Win32.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.ActiveCfg = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Debug|x64.Build.0 = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.DLL-Import Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Release|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseASC|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Debug|x64.Build.0 = Debug|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Release|Win32.Build.0 = Release|Win32
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Release|x64.ActiveCfg = Release|x64
-		{617F9069-5E37-4B80-9A3A-E77AFC4CC7AD}.Unicode Release|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|Win32.Build.0 = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.ActiveCfg = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Debug|x64.Build.0 = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.DLL-Import Release|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.ActiveCfg = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|Win32.Build.0 = Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Release|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseASC|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{BC52A07C-A797-423D-8C4F-8678805BBB36}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.ActiveCfg = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|Win32.Build.0 = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.ActiveCfg = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Debug|x64.Build.0 = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.DLL-Import Release|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.ActiveCfg = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|Win32.Build.0 = Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Release|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseASC|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{818753F2-DBB9-4D3B-898A-A604309BE470}.Unicode Release|x64.Build.0 = Unicode Release|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.ActiveCfg = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|Win32.Build.0 = Debug|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Debug|x64.ActiveCfg = Debug|x64
@ -305,276 +109,6 @@ Global
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|Win32.Build.0 = Release|Win32
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|x64.ActiveCfg = Release|x64
 		{A100103A-353E-45E8-A9B8-90B87CC5C0B0}.Unicode Release|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.ActiveCfg = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|Win32.Build.0 = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.ActiveCfg = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Debug|x64.Build.0 = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.DLL-Import Release|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Release|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseASC|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Debug|x64.Build.0 = Debug|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Release|Win32.Build.0 = Release|Win32
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Release|x64.ActiveCfg = Release|x64
-		{C739151F-5384-41DF-A1A6-F089E2C1AD56}.Unicode Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.ActiveCfg = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|Win32.Build.0 = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.DLL-Import Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.ActiveCfg = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|Win32.Build.0 = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.ActiveCfg = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Release|x64.Build.0 = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|Win32.ActiveCfg = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|x64.ActiveCfg = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseASC|x64.Build.0 = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|Win32.ActiveCfg = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.ActiveCfg = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.ReleaseOpenSource|x64.Build.0 = Release Singlethreaded|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Debug|x64.Build.0 = Debug|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Release|Win32.Build.0 = Release|Win32
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Release|x64.ActiveCfg = Release|x64
-		{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.Unicode Release|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|Win32.Build.0 = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.ActiveCfg = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Debug|x64.Build.0 = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.DLL-Import Release|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.ActiveCfg = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|Win32.Build.0 = Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Release|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseASC|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{9CAA294E-58C3-4CEB-ABA0-CB9786CA5540}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|Win32.Build.0 = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.ActiveCfg = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Debug|x64.Build.0 = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.DLL-Import Release|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.ActiveCfg = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|Win32.Build.0 = Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Release|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseASC|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{FFDA5DA1-BB65-4695-B678-BE59B4A1355D}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.ActiveCfg = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|Win32.Build.0 = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.ActiveCfg = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Debug|x64.Build.0 = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.DLL-Import Release|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.ActiveCfg = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|Win32.Build.0 = Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Release|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseASC|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{DF861D33-9BC1-418C-82B1-581F590FE169}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|Win32.Build.0 = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.ActiveCfg = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Debug|x64.Build.0 = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.DLL-Import Release|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.ActiveCfg = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|Win32.Build.0 = Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Release|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseASC|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{43A0E60E-5C4A-4C09-A29B-7683F503BBD7}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|Win32.Build.0 = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.ActiveCfg = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Debug|x64.Build.0 = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.DLL-Import Release|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.ActiveCfg = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|Win32.Build.0 = Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Release|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseASC|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{40A69F40-063E-43FD-8543-455495D8733E}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.ActiveCfg = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|Win32.Build.0 = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.ActiveCfg = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Debug|x64.Build.0 = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.DLL-Import Release|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.ActiveCfg = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|Win32.Build.0 = Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Release|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseASC|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{0588563C-F05C-428C-B21A-DD74756628B3}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.ActiveCfg = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|Win32.Build.0 = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.ActiveCfg = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Debug|x64.Build.0 = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.DLL-Import Release|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.ActiveCfg = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|Win32.Build.0 = Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Release|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseASC|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{9A037A69-D1DF-4505-AB2A-6CB3641C476E}.Unicode Release|x64.Build.0 = Unicode Release|x64
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|Win32.ActiveCfg = Debug|Win32
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|Win32.Build.0 = Debug|Win32
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Debug|x64.ActiveCfg = Debug|x64
@ -605,96 +139,6 @@ Global
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Unicode Release|Win32.Build.0 = Release|Win32
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Unicode Release|x64.ActiveCfg = Release|x64
 		{7B27E40E-F70A-4A74-A77C-0944D7931D15}.Unicode Release|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.ActiveCfg = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|Win32.Build.0 = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.ActiveCfg = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Debug|x64.Build.0 = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.DLL-Import Release|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.ActiveCfg = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|Win32.Build.0 = Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Release|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseASC|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|Win32.ActiveCfg = Unicode Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|Win32.Build.0 = Unicode Debug|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|x64.ActiveCfg = Unicode Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Debug|x64.Build.0 = Unicode Debug|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|Win32.ActiveCfg = Unicode Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|Win32.Build.0 = Unicode Release|Win32
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|x64.ActiveCfg = Unicode Release|x64
-		{764C3A2D-FB0F-428E-B1C7-62D1DD2CE239}.Unicode Release|x64.Build.0 = Unicode Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.ActiveCfg = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|Win32.Build.0 = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.ActiveCfg = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Debug|x64.Build.0 = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.DLL-Import Release|x64.Build.0 = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.ActiveCfg = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|Win32.Build.0 = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Release|x64.Build.0 = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseASC|x64.Build.0 = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Debug|x64.Build.0 = Debug|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Release|Win32.Build.0 = Release|Win32
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Release|x64.ActiveCfg = Release|x64
-		{EE1B576A-07C5-4ACC-920F-81C41DD0C8C1}.Unicode Release|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|Win32.Build.0 = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.ActiveCfg = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Debug|x64.Build.0 = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.DLL-Import Release|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.ActiveCfg = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|Win32.Build.0 = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Release|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseASC|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Debug|x64.Build.0 = Debug|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Release|Win32.Build.0 = Release|Win32
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Release|x64.ActiveCfg = Release|x64
-		{F8274B05-168E-4D6E-B843-AA7510725363}.Unicode Release|x64.Build.0 = Release|x64
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.ActiveCfg = Debug|Win32
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|Win32.Build.0 = Debug|Win32
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Debug|x64.ActiveCfg = Debug|x64
@ -725,36 +169,6 @@ Global
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|Win32.Build.0 = Release|Win32
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|x64.ActiveCfg = Release|x64
 		{0F49D5D1-A8D3-4F97-8BC1-E2F65BB00C10}.Unicode Release|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|Win32.Build.0 = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.ActiveCfg = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Debug|x64.Build.0 = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|Win32.Build.0 = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Debug|x64.Build.0 = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|x64.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.DLL-Import Release|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Release|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|Win32.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseASC|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|Win32.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.ReleaseOpenSource|x64.Build.0 = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|Win32.ActiveCfg = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|Win32.Build.0 = Debug|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|x64.ActiveCfg = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Debug|x64.Build.0 = Debug|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|Win32.ActiveCfg = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|Win32.Build.0 = Release|Win32
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|x64.ActiveCfg = Release|x64
-		{21663823-DE45-479B-91D0-B4FEF4916EF0}.Unicode Release|x64.Build.0 = Release|x64
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|Win32.Build.0 = Debug|Win32
 		{C27E9A9F-3A17-4482-9C5F-BF15C01E747C}.Debug|x64.ActiveCfg = Debug|x64
--- a/ASCOfficePPTFile/PptFormatTest/PptFormatTest.vcproj
+++ b/ASCOfficePPTFile/PptFormatTest/PptFormatTest.vcproj
@ -48,7 +48,7 @@
 				PreprocessorDefinitions="_DEBUG;_CONSOLE;_USE_MATH_DEFINES;_USE_LIBXML2_READER_;LIBXML_READER_ENABLED;USE_LITE_READER;_USE_XMLLITE_READER_;_PRESENTATION_WRITER_;_SVG_CONVERT_TO_IMAGE_;DONT_WRITE_EMBEDDED_FONTS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
+				RuntimeLibrary="3"
 				EnableEnhancedInstructionSet="0"
 				UsePrecompiledHeader="0"
 				ProgramDataBaseFileName="$(IntDir)\PptFileFormatTest.pdb"
@ -357,6 +357,10 @@
 				RelativePath="..\..\XlsxSerializerCom\Reader\ChartFromToBinary.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\ChartWriter.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\XlsxSerializerCom\Common\Common.cpp"
 				>
@ -374,7 +378,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
 				>
 			</File>
 			<File
@ -390,38 +398,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\DesktopEditor\xml\src\xmldom.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\DesktopEditor\xml\src\xmllight.cpp"
+				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
 			</File>
 		</Filter>
-		<File
-			RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\ChartWriter.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\DocxSerializer.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
-			>
-		</File>
 		<File
 			RelativePath="PptFormatTest.cpp"
 			>
 		</File>
-		<File
-			RelativePath="..\..\build\lib\win_32\DEBUG\UnicodeConverter.lib"
-			>
-		</File>
-		<File
-			RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
-			>
-		</File>
 	</Files>
 	<Globals>
 	</Globals>
--- a/ASCOfficePPTXFile/Editor/Drawing/Elements.cpp
+++ b/ASCOfficePPTXFile/Editor/Drawing/Elements.cpp
@ -97,13 +97,13 @@ void NSPresentationEditor::CShapeElement::SetupTextProperties(CSlide* pSlide, CT
 			}
 			if (NULL != pTheme)
 			{
-				if ((pRun->Typeface.is_init()) && (pRun->Typeface.get() < pTheme->m_arFonts.size()))
+				if ((pRun->fontRef.is_init()) && (pRun->fontRef.get() < pTheme->m_arFonts.size()))
 				{
 					pRun->FontProperties = new CFontProperties();
-					pRun->FontProperties->SetFont(pTheme->m_arFonts[pRun->Typeface.get()]);
+					pRun->FontProperties->SetFont(pTheme->m_arFonts[pRun->fontRef.get()]);

-					if (1 < pRun->Typeface.get())
-						pRun->Typeface.reset();
+					if (1 < pRun->fontRef.get())
+						pRun->fontRef.reset();
 				}
 				if ((pRun->EAFontRef.is_init()) && (pRun->EAFontRef.get() < pTheme->m_arFonts.size()))
 				{
--- a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h
+++ b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h
@ -130,7 +130,7 @@ namespace NSPresentationEditor
        NSCommon::nullable_base<bool>			FontStrikeout;
        NSCommon::nullable_base<bool>			FontShadow;
 		
-		NSCommon::nullable_base<WORD>			Typeface;			// fontRef
+		NSCommon::nullable_base<WORD>			fontRef;			// fontRef
 		NSCommon::nullable_base<WORD>			EAFontRef;			// eaFontRef
 		NSCommon::nullable_base<WORD>			AnsiFontRef;		// ansiFontRef
 		NSCommon::nullable_base<WORD>			SymbolFontRef;		// SymbolFontRef
@ -162,7 +162,7 @@ namespace NSPresentationEditor
 			FontStrikeout	= oSrc.FontStrikeout;
 			FontShadow		= oSrc.FontShadow;
 			
-			Typeface		= oSrc.Typeface;
+			fontRef		= oSrc.fontRef;
 			EAFontRef		= oSrc.EAFontRef;
 			AnsiFontRef		= oSrc.AnsiFontRef;
 			SymbolFontRef	= oSrc.SymbolFontRef;
@ -192,7 +192,7 @@ namespace NSPresentationEditor
 			if (!FontStrikeout.is_init())			FontStrikeout = oSrc.FontStrikeout;
 			if (!FontShadow.is_init())				FontShadow = oSrc.FontShadow;
 			
-			if (!Typeface.is_init())				Typeface = oSrc.Typeface;
+			if (!fontRef.is_init())					fontRef = oSrc.fontRef;
 			if (!EAFontRef.is_init())				EAFontRef = oSrc.EAFontRef;
 			if (!AnsiFontRef.is_init())				AnsiFontRef = oSrc.AnsiFontRef;
 			if (!SymbolFontRef.is_init())			SymbolFontRef = oSrc.SymbolFontRef;
@ -217,11 +217,11 @@ namespace NSPresentationEditor
 			if (oSrc.FontStrikeout.is_init())		FontStrikeout = oSrc.FontStrikeout;
 			if (oSrc.FontShadow.is_init())			FontShadow = oSrc.FontShadow;
 			
-			bool bTypefaceSetUp = false;
-			if (oSrc.Typeface.is_init())
+			bool bFontRefSetUp = false;
+			if (oSrc.fontRef.is_init())
 			{
-				Typeface = oSrc.Typeface;
-				bTypefaceSetUp = true;
+				fontRef = oSrc.fontRef;
+				bFontRefSetUp = true;
 			}
 			if (oSrc.EAFontRef.is_init())			EAFontRef = oSrc.EAFontRef;
 			if (oSrc.AnsiFontRef.is_init())			AnsiFontRef = oSrc.AnsiFontRef;
@ -238,8 +238,8 @@ namespace NSPresentationEditor
 			if (oSrc.FontProperties.is_init())
 			{
 				FontProperties = oSrc.FontProperties;
-				if (!bTypefaceSetUp)
-					Typeface.reset();
+				if (!bFontRefSetUp)
+					fontRef.reset();
 			}
 			if (oSrc.Language.is_init())
 				Language = oSrc.Language;
--- a/ASCOfficePPTXFile/Editor/Drawing/Theme.h
+++ b/ASCOfficePPTXFile/Editor/Drawing/Theme.h
@ -147,9 +147,9 @@ namespace NSPresentationEditor
 							oColor.A	= m_arColorScheme[oColor.m_lSchemeIndex].A;
 						}
 					}
-					if (pLevel->m_oCFRun.Typeface.IsInit())
+					if (pLevel->m_oCFRun.fontRef.IsInit())
 					{
-						WORD lFontIndex = pLevel->m_oCFRun.Typeface.get();
+						WORD lFontIndex = pLevel->m_oCFRun.fontRef.get();
 						if (lFontIndex < (WORD)m_arFonts.size())
 						{
 							if (!pLevel->m_oCFRun.FontProperties.is_init())
@ -208,9 +208,9 @@ namespace NSPresentationEditor
 						oColor.A	= pTheme->m_arColorScheme[oColor.m_lSchemeIndex].A;
 					}
 				}
-				if (pLevel->m_oCFRun.Typeface.IsInit())
+				if (pLevel->m_oCFRun.fontRef.IsInit())
 				{
-					WORD lFontIndex = pLevel->m_oCFRun.Typeface.get();
+					WORD lFontIndex = pLevel->m_oCFRun.fontRef.get();
 					if (lFontIndex < (WORD)pTheme->m_arFonts.size())
 					{
 						if (!pLevel->m_oCFRun.FontProperties.is_init())
--- a/ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.cpp
+++ b/ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.cpp
@ -47,12 +47,15 @@
 	#if defined(_DEBUG)
 		#pragma comment(lib, "../../build/lib/win_32/DEBUG/graphics.lib")
 		#pragma comment(lib, "../../build/lib/win_32/DEBUG/kernel.lib")
+		#pragma comment(lib, "../../build/lib/win_32/DEBUG/UnicodeConverter.lib")
 	#else
 		#pragma comment(lib, "../../build/lib/win_32/graphics.lib")
 		#pragma comment(lib, "../../build/lib/win_32/kernel.lib")
+		#pragma comment(lib, "../../build/lib/win_32/UnicodeConverter.lib")
 	#endif
 	#pragma comment(lib, "../../build/bin/icu/win_32/icuuc.lib")
 #endif
+
 HRESULT convert_single(std::wstring srcFileName)
 {
 	int n1 = srcFileName.rfind(_T('.'));
--- a/ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj
+++ b/ASCOfficeRtfFile/RtfFormatTest/RtfFormatTest.vcproj
@ -383,10 +383,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File
-				RelativePath="..\..\Common\FileDownloader\FileDownloader_win.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\FontProcessor.cpp"
 				>
@ -411,10 +407,6 @@
 				RelativePath="..\..\Common\DocxFormat\Source\Base\unicode_util.cpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\UnicodeConverter\UnicodeConverter.cpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\ASCOfficeDocxFile2\DocWrapper\XlsxSerializer.cpp"
 				>
--- a/Common/version.txt
+++ b/Common/version.txt
@ -1 +1 @@
-2.4.540.0
+2.4.541.0
--- a/DesktopEditor/Word_Api/Editor_Api.h
+++ b/DesktopEditor/Word_Api/Editor_Api.h
@ -991,10 +991,10 @@ namespace NSEditorApi
        js_wrapper<int> m_nTransitionType;
        js_wrapper<int> m_nTransitionOption;
        js_wrapper<int> m_nTransitionDuration;
-        js_wrapper<int> m_nSlideAdvanceDuration;
        
        js_wrapper<bool> m_bSlideAdvanceOnMouseClick;
        js_wrapper<bool> m_bSlideAdvanceAfter;
+        js_wrapper<bool> m_bSlideAdvanceDuration;
        js_wrapper<bool> m_bShowLoop;
        
    public:
@ -1007,10 +1007,10 @@ namespace NSEditorApi
        LINK_PROPERTY_INT_JS(TransitionType)
        LINK_PROPERTY_INT_JS(TransitionOption)
        LINK_PROPERTY_INT_JS(TransitionDuration)
-        LINK_PROPERTY_INT_JS(SlideAdvanceDuration)
        
        LINK_PROPERTY_BOOL_JS(SlideAdvanceOnMouseClick)
        LINK_PROPERTY_BOOL_JS(SlideAdvanceAfter)
+        LINK_PROPERTY_BOOL_JS(SlideAdvanceDuration)
        LINK_PROPERTY_BOOL_JS(ShowLoop)
    };
    
--- a/DesktopEditor/Word_Api/Editor_Defines.h
+++ b/DesktopEditor/Word_Api/Editor_Defines.h
@ -690,9 +690,6 @@
 #define ASC_MENU_EVENT_TYPE_SECTION					17
 #define ASC_MENU_EVENT_TYPE_SHAPE                   18
 #define ASC_MENU_EVENT_TYPE_SLIDE                   20
-#define ASC_MENU_EVENT_TYPE_THEME_THUMBNAILS        21
-#define ASC_MENU_EVENT_TYPE_LAYOUT_THUMBNAILS       22
-#define ASC_MENU_EVENT_TYPE_SLIDETIMINGALL          23

 // insert commands
 #define ASC_MENU_EVENT_TYPE_INSERT_IMAGE			50
--- a/DesktopEditor/fontengine/ApplicationFonts.cpp
+++ b/DesktopEditor/fontengine/ApplicationFonts.cpp
@ -41,6 +41,32 @@

 namespace NSFonts
 {
+    void makeLower(std::wstring& name)
+    {
+        int nLen = (int)name.length();
+        wchar_t* pStr = (wchar_t*)name.c_str();
+
+        for (int i = 0; i < nLen; ++i)
+        {
+            if (pStr[i] >= 'A' && pStr[i] <= 'Z')
+                pStr[i] = pStr[i] + 'a' - 'A';
+        }
+    }
+    std::wstring prepareFont3000(std::wstring& name)
+    {
+        std::wstring sRet;
+        int nLen = (int)name.length();
+        wchar_t* pStr = (wchar_t*)name.c_str();
+
+        for (int i = 0; i < nLen; ++i)
+        {
+            if (pStr[i] == ' ' || pStr[i] == '-')
+                continue;
+            sRet.append(pStr + i, 1);
+        }
+        return sRet;
+    }
+
    CFontInfo* FromBuffer(BYTE*& pBuffer, std::wstring strDir)
    {
        // name
@ -729,7 +755,7 @@ int CFontList::GetFaceNamePenalty(std::wstring sCandName, std::wstring sReqName,
 	else if ( std::wstring::npos != sReqName.find( sCandName ) || std::wstring::npos != sCandName.find( sReqName ) )
 		return 1000;

-	if (NULL != pArrayLikes)
+    if (NULL != pArrayLikes)
 	{
 		for (std::vector<std::wstring>::iterator iter = pArrayLikes->begin(); iter != pArrayLikes->end(); iter++)
 		{
@ -738,6 +764,19 @@ int CFontList::GetFaceNamePenalty(std::wstring sCandName, std::wstring sReqName,
 		}
 	}

+    /*
+    NSFonts::makeLower(sCandName);
+    NSFonts::makeLower(sReqName);
+    if ( sReqName == sCandName )
+        return 1500;
+
+    sCandName = NSFonts::prepareFont3000(sCandName);
+    sReqName = NSFonts::prepareFont3000(sReqName);
+
+    if ( sReqName == sCandName )
+        return 3000;
+    */
+
 	return 10000;
 }

--- a/DesktopEditor/xml/mac/libxml2.xcodeproj/project.pbxproj
+++ b/DesktopEditor/xml/mac/libxml2.xcodeproj/project.pbxproj
@ -584,20 +584,15 @@
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
+					_UNICODE,
 					USE_LITE_READER,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
 					LINUX,
 					MAC,
+					_IOS,
 					LIBXML_READER_ENABLED,
-					LIBXML_PUSH_ENABLED,
-					LIBXML_HTML_ENABLED,
-					LIBXML_XPATH_ENABLED,
-					LIBXML_OUTPUT_ENABLED,
-					LIBXML_C14N_ENABLED,
-					LIBXML_SAX1_ENABLED,
-					LIBXML_TREE_ENABLED,
-					LIBXML_XPTR_ENABLED,
-					IN_LIBXML,
-					LIBXML_STATIC,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@ -617,20 +612,15 @@
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					UNICODE,
+					_UNICODE,
 					USE_LITE_READER,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
 					LINUX,
 					MAC,
+					_IOS,
 					LIBXML_READER_ENABLED,
-					LIBXML_PUSH_ENABLED,
-					LIBXML_HTML_ENABLED,
-					LIBXML_XPATH_ENABLED,
-					LIBXML_OUTPUT_ENABLED,
-					LIBXML_C14N_ENABLED,
-					LIBXML_SAX1_ENABLED,
-					LIBXML_TREE_ENABLED,
-					LIBXML_XPTR_ENABLED,
-					IN_LIBXML,
-					LIBXML_STATIC,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
--- a/DesktopEditor/xml/src/xmldom.cpp
+++ b/DesktopEditor/xml/src/xmldom.cpp
@ -1,4 +1,4 @@
-/*
+/*
 * (c) Copyright Ascensio System SIA 2010-2018
 *
 * This program is a free software product. You can redistribute it and/or
Author	SHA1	Message	Date
ElenaSubbotina	8513ec5ae7	OdfFormatReader - fix after testing	2018-08-01 20:12:59 +03:00
ElenaSubbotina	35b43e0683	PptFormatReader - fix bug#37445	2018-08-01 20:11:05 +03:00
ElenaSubbotina	421e58fe34	x2t - 2.4.541 fix after testing	2018-08-01 12:51:13 +03:00
Oleg Korshul	048cac74b6	.	2018-07-30 18:28:40 +03:00