project for mac debug

* 'develop' of https://github.com/ONLYOFFICE/core:
  .
  fix unsize shape text rect
  XlsFormat - pivot charts
  fix bug #35396. version up.
  .
  OdfFormatWriter - data label position XlsFormatReader - fix pivots

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -105,6 +105,7 @@ SOURCES += \
     ../src/odf/table_calculation_settings.cpp \
     ../src/odf/table_docx.cpp \
     ../src/odf/table_named_expressions.cpp \
+    ../src/odf/table_data_pilot_tables.cpp \
     ../src/odf/table_pptx.cpp \
     ../src/odf/table_xlsx.cpp \
     ../src/odf/templates.cpp \
@@ -210,6 +211,7 @@ SOURCES += \
     ../src/odf/datatypes/writingmode.cpp \
     ../src/odf/datatypes/xlink.cpp \
     ../src/odf/datatypes/chartlabelposition.cpp \
+    ../src/odf/datatypes/grandtotal.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -463,6 +465,8 @@ HEADERS += \
     ../src/odf/datatypes/wrapoption.h \
     ../src/odf/datatypes/writingmode.h \
     ../src/odf/datatypes/xlink.h \
+    ../src/odf/datatypes/chartlabelposition.h \
+    ../src/odf/datatypes/grandtotal.h \
     ../src/docx/docx_content_type.h \
     ../src/docx/docx_conversion_context.h \
     ../src/docx/docx_conversion_state.h \

ASCOfficeOdfFile/linux/odffilereaderlib_odf.cpp

@@ -88,6 +88,7 @@
 #include "../src/odf/table_calculation_settings.cpp"
 #include "../src/odf/table_docx.cpp"
 #include "../src/odf/table_named_expressions.cpp"
+#include "../src/odf/table_data_pilot_tables.cpp"
 #include "../src/odf/table_pptx.cpp"
 #include "../src/odf/table_xlsx.cpp"
 #include "../src/odf/templates.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -120,3 +120,4 @@
 #include "../src/odf/datatypes/writingmode.cpp"
 #include "../src/odf/datatypes/xlink.cpp"
 #include "../src/odf/datatypes/chartlabelposition.cpp"
+#include "../src/odf/datatypes/grandtotal.cpp"

ASCOfficeOdfFile/src/odf/datatypes/grandtotal.cpp

@@ -0,0 +1,66 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "grandtotal.h"
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const grand_total & _Val)
+{
+	switch(_Val.get_type())
+	{
+	case   grand_total::none:	_Wostream <<  L"none";	break;
+	case   grand_total::both:	_Wostream <<  L"both";	break;
+	case   grand_total::column: _Wostream <<  L"column"; break;
+	case   grand_total::row:	_Wostream <<  L"row";	break;
+	}
+    return _Wostream;    
+}
+
+grand_total grand_total::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"none")			return grand_total( none );
+    else if (tmp == L"both")	return grand_total( both );
+    else if (tmp == L"column")	return grand_total( column );
+    else if (tmp == L"row")		return grand_total( row );
+    else
+    {
+        return grand_total( none );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/grandtotal.h

@@ -0,0 +1,67 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <iosfwd>
+#include <string>
+#include "odfattributes.h"
+
+
+namespace cpdoccore { namespace odf_types { 
+
+class grand_total
+{
+public:
+    enum type
+    {
+		none,
+        both,
+        column,
+        row
+    };
+
+    grand_total() {}
+    grand_total(type _Type) : type_(_Type)   {}
+    type get_type() const   {  return type_; };
+    static grand_total parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+	std::wostream & operator << (std::wostream & _Wostream, const grand_total & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::grand_total);
+
+}

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -219,6 +219,15 @@ enum ElementType
     typeTableTableRowGroup,
 	typeTableTableRowNoGroup,
     typeTableTableSource,
+
+	typeTableDataPilotTables,
+	typeTableDataPilotTable,
+	typeTableDataPilotField,
+	typeTableDatabaseSourceTable,
+	typeTableDatabaseSourceQuery,
+	typeTableDatabaseSourceSql,
+	typeTableSourceCellRange,
+	typeTableSourceService,
         
     typeOfficeBody,
     typeOfficeText,

ASCOfficeOdfFile/src/odf/office_spreadsheet.cpp

@@ -34,7 +34,6 @@
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
-#include <cpdoccore/xml/attributes.h>
 
 #include "serialize_elements.h"
 
@@ -52,6 +51,10 @@ void office_spreadsheet::add_child_element( xml::sax * Reader, const std::wstrin
     {
         CP_CREATE_ELEMENT(table_database_ranges_);    
     }
+	else if CP_CHECK_NAME(L"table", L"data-pilot-tables")
+	{
+		CP_CREATE_ELEMENT(table_data_pilot_tables_);
+	}
 	else
 		CP_CREATE_ELEMENT(content_);
 }
@@ -87,6 +90,10 @@ void office_spreadsheet::xlsx_convert(oox::xlsx_conversion_context & Context)
 	for (size_t i = 0; i < content_.size(); i++)
     {
         content_[i]->xlsx_convert(Context);
+    }
+ 	for (size_t i = 0; i < table_data_pilot_tables_.size(); i++)
+	{
+        table_data_pilot_tables_[i]->xlsx_convert(Context);
     }
     Context.end_office_spreadsheet();
 }

ASCOfficeOdfFile/src/odf/office_spreadsheet.h

@@ -66,6 +66,7 @@ public:
     //  TODO: table-decls
 
 	office_element_ptr_array	table_database_ranges_;
+	office_element_ptr_array	table_data_pilot_tables_;
 
 	office_element_ptr			tracked_changes_;//??
 	office_element_ptr_array	content_;

ASCOfficeOdfFile/src/odf/table.h

@@ -35,11 +35,13 @@
 #include <cpdoccore/CPOptional.h>
 #include <cpdoccore/xml/xmlelement.h>
 #include <cpdoccore/xml/nodetype.h>
+
 #include "office_elements.h"
 #include "office_elements_create.h"
 
 #include "table_named_expressions.h"
 #include "table_database_ranges.h"
+#include "table_data_pilot_tables.h"
 #include "calcext_elements.h"
 
 #include "datatypes/tablemode.h"

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.cpp

@@ -0,0 +1,209 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "table_data_pilot_tables.h"
+
+#include <cpdoccore/xml/xmlchar.h>
+#include <cpdoccore/xml/attributes.h>
+
+#include "serialize_elements.h"
+
+namespace cpdoccore { 
+
+	using namespace odf_types;
+
+namespace odf_reader {
+
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_tables::ns		= L"table";
+const wchar_t * table_data_pilot_tables::name	= L"data-pilot-tables";
+
+void table_data_pilot_tables::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_data_pilot_tables::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_tables::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_table::ns		= L"table";
+const wchar_t * table_data_pilot_table::name	= L"data-pilot-table";
+
+void table_data_pilot_table::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:name"						, table_name_);
+	CP_APPLY_ATTR(L"table:application-data"			, table_application_data_);
+    CP_APPLY_ATTR(L"table:buttons"					, table_buttons_);
+    CP_APPLY_ATTR(L"table:drill-down-ondouble-click", table_drill_down_ondouble_click_);
+    CP_APPLY_ATTR(L"table:grand-total"				, table_grand_total_);
+    CP_APPLY_ATTR(L"table:identify-categories"		, table_identify_categories_);
+    CP_APPLY_ATTR(L"table:ignore-empty-rows"		, table_ignore_empty_rows_);
+    CP_APPLY_ATTR(L"table:show-filterbutton"		, table_show_filterbutton_);
+    CP_APPLY_ATTR(L"table:show-target-range-address", table_show_target_range_address_);
+
+}
+
+void table_data_pilot_table::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_table::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_field::ns		= L"table";
+const wchar_t * table_data_pilot_field::name	= L"data-pilot-field";
+
+void table_data_pilot_field::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_data_pilot_field::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_field::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_database_source_table::ns		= L"table";
+const wchar_t * table_database_source_table::name	= L"database-source-table";
+
+void table_database_source_table::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_database_source_table::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_database_source_table::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_database_source_query::ns		= L"table";
+const wchar_t * table_database_source_query::name	= L"database-source-query";
+
+void table_database_source_query::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_database_source_query::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_database_source_query::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_database_source_sql::ns	= L"table";
+const wchar_t * table_database_source_sql::name	= L"database-source-sql";
+
+void table_database_source_sql::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_database_source_sql::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_database_source_sql::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_source_cell_range::ns		= L"table";
+const wchar_t * table_source_cell_range::name	= L"source-cell-range";
+
+void table_source_cell_range::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_source_cell_range::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_source_cell_range::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_source_service::ns	= L"table";
+const wchar_t * table_source_service::name	= L"source-service";
+
+void table_source_service::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+}
+
+void table_source_service::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_source_service::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+    for (size_t i = 0; i < content_.size(); i++)
+    {
+		content_[i]->xlsx_convert(Context);
+	}
+}
+}
+}

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.h

@@ -0,0 +1,227 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+#pragma once
+
+#include <iosfwd>
+#include <cpdoccore/CPOptional.h>
+#include <cpdoccore/xml/xmlelement.h>
+#include <cpdoccore/xml/nodetype.h>
+#include "office_elements.h"
+#include "office_elements_create.h"
+
+#include "datatypes/common_attlists.h"
+#include "datatypes/bool.h"
+#include "datatypes/grandtotal.h"
+
+namespace cpdoccore { 
+namespace odf_reader {
+
+class table_data_pilot_tables : public office_element_impl<table_data_pilot_tables>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotTables;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;
+  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_tables);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_table : public office_element_impl<table_data_pilot_table>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotTable;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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_OPT(std::wstring)			table_name_;
+     _CP_OPT(std::wstring)			table_application_data_;
+     _CP_OPT(std::wstring)			table_buttons_;
+	 _CP_OPT(odf_types::Bool)		table_drill_down_ondouble_click_;
+     _CP_OPT(odf_types::grand_total)table_grand_total_;
+     _CP_OPT(odf_types::Bool)		table_identify_categories_;
+     _CP_OPT(odf_types::Bool)		table_ignore_empty_rows_;
+     _CP_OPT(odf_types::Bool)		table_show_filterbutton_;
+     _CP_OPT(odf_types::Bool)		table_show_target_range_address_;
+	
+	  office_element_ptr_array	content_;
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_table);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_field : public office_element_impl<table_data_pilot_field>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotField;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_field);
+//-------------------------------------------------------------------------------------
+
+class table_database_source_table : public office_element_impl<table_database_source_table>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDatabaseSourceTable;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_database_source_table);
+//-------------------------------------------------------------------------------------
+
+class table_database_source_query : public office_element_impl<table_database_source_query>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDatabaseSourceQuery;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_database_source_query);
+//-------------------------------------------------------------------------------------
+
+class table_database_source_sql : public office_element_impl<table_database_source_sql>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDatabaseSourceSql;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_database_source_sql);
+//-------------------------------------------------------------------------------------
+
+class table_source_cell_range : public office_element_impl<table_source_cell_range>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableSourceCellRange;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_source_cell_range);
+//-------------------------------------------------------------------------------------
+
+class table_source_service : public office_element_impl<table_source_service>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableSourceService;
+    CPDOCCORE_DEFINE_VISITABLE();
+   
+    virtual void xlsx_convert(oox::xlsx_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);
+
+    office_element_ptr_array content_;  
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_source_service);
+//-------------------------------------------------------------------------------------
+}
+}

ASCOfficeOdfFile/win32/cpcommon.vcproj

@@ -565,6 +565,14 @@
 				RelativePath="..\src\odf\datatypes\gradientstyle.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\grandtotal.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\grandtotal.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\datatypes\hatchstyle.cpp"
 				>

ASCOfficeOdfFile/win32/cpodf.vcproj

@@ -1659,6 +1659,14 @@
 				RelativePath="..\src\odf\table_calculation_settings.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\table_data_pilot_tables.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\table_data_pilot_tables.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\table_database_ranges.cpp"
 				>

ASCOfficePPTFile/PPTFormatLib/PPTFormatLib.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include "../../../DesktopEditor/common/ASCVariant.h"
+#include "../../DesktopEditor/common/ASCVariant.h"
 
 #include <vector>
 

ASCOfficeRtfFile/RtfFormatLib/Mac/RtfFormatLib.xcodeproj/project.pbxproj

@@ -562,6 +562,7 @@
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
 					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -595,6 +596,7 @@
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
 					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

Common/DocxFormat/Mac/DocxFormatLib.xcodeproj/project.pbxproj

@@ -213,6 +213,7 @@
 		690FE07F1E9BBA15004B26D0 /* DrawingExt.h in Headers */ = {isa = PBXBuildFile; fileRef = 690FE07B1E9BBA15004B26D0 /* DrawingExt.h */; };
 		690FE0821E9BBA23004B26D0 /* DiagramData.h in Headers */ = {isa = PBXBuildFile; fileRef = 690FE0801E9BBA23004B26D0 /* DiagramData.h */; };
 		690FE0831E9BBA23004B26D0 /* DiagramDrawing.h in Headers */ = {isa = PBXBuildFile; fileRef = 690FE0811E9BBA23004B26D0 /* DiagramDrawing.h */; };
+		691C3E131F20C3D500F1775E /* File.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 691C3E121F20C3D500F1775E /* File.cpp */; };
 		69F181EC1C7734A700B2952B /* strings_hack_printf.h in Headers */ = {isa = PBXBuildFile; fileRef = 69F181EA1C7734A700B2952B /* strings_hack_printf.h */; };
 /* End PBXBuildFile section */
 
@@ -431,6 +432,7 @@
 		690FE07B1E9BBA15004B26D0 /* DrawingExt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DrawingExt.h; sourceTree = "<group>"; };
 		690FE0801E9BBA23004B26D0 /* DiagramData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagramData.h; sourceTree = "<group>"; };
 		690FE0811E9BBA23004B26D0 /* DiagramDrawing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagramDrawing.h; sourceTree = "<group>"; };
+		691C3E121F20C3D500F1775E /* File.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; path = File.cpp; sourceTree = "<group>"; };
 		69F181EA1C7734A700B2952B /* strings_hack_printf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = strings_hack_printf.h; path = ../../Common/DocxFormat/Source/Base/strings_hack_printf.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -901,6 +903,7 @@
 				17E6B3BD1AC4298500F28F8B /* Base64.h */,
 				17E6B3BE1AC4298500F28F8B /* Directory.h */,
 				17E6B3BF1AC4298500F28F8B /* File.h */,
+				691C3E121F20C3D500F1775E /* File.cpp */,
 				17E6B3C01AC4298500F28F8B /* Path.h */,
 				17E6B3C11AC4298500F28F8B /* Types.h */,
 				69F181EA1C7734A700B2952B /* strings_hack_printf.h */,
@@ -1163,6 +1166,7 @@
 				17C1FBAE1ACC4250006B99B3 /* oMath.cpp in Sources */,
 				17C1FBAF1ACC4250006B99B3 /* ChartSerialize.cpp in Sources */,
 				17C1FBB11ACC4250006B99B3 /* Position.cpp in Sources */,
+				691C3E131F20C3D500F1775E /* File.cpp in Sources */,
 				17C1FBB21ACC4250006B99B3 /* Vml.cpp in Sources */,
 				17C1FBB31ACC4250006B99B3 /* unicode_util.cpp in Sources */,
 				17C1FBB41ACC4250006B99B3 /* FldSimple.cpp in Sources */,
@@ -1202,6 +1206,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1242,6 +1247,7 @@
 					unix,
 					_IOS,
 					DONT_WRITE_EMBEDDED_FONTS,
+					_XCODE,
 				);
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
 				HEADER_SEARCH_PATHS = (

Common/DocxFormat/Source/Base/Base.h

@@ -37,7 +37,7 @@
 
 #include "unicode_util.h"
 
-#include "../../../DesktopEditor/common/File.h"
+#include "../../../../DesktopEditor/common/File.h"
 
 #define _T(x)       __T(x)
 #define __T(x)      L##x

Common/DocxFormat/Source/DocxFormat/WritingElement.h

@@ -31,7 +31,7 @@
  */
 #pragma once
 
-#include "../../../DesktopEditor/xml/include/xmlutils.h"
+#include "../../../../DesktopEditor/xml/include/xmlutils.h"
 
 
 namespace OOX

DesktopEditor/common/File.cpp

@@ -0,0 +1,92 @@
+/*
+ * (c) Copyright Ascensio System SIA 2010-2017
+ *
+ * This program is a free software product. You can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License (AGPL)
+ * version 3 as published by the Free Software Foundation. In accordance with
+ * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
+ * that Ascensio System SIA expressly excludes the warranty of non-infringement
+ * of any third-party rights.
+ *
+ * This program is distributed WITHOUT ANY WARRANTY; without even the implied
+ * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR  PURPOSE. For
+ * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
+ *
+ * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
+ * EU, LV-1021.
+ *
+ * The  interactive user interfaces in modified source and object code versions
+ * of the Program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU AGPL version 3.
+ *
+ * Pursuant to Section 7(b) of the License you must retain the original Product
+ * logo when distributing the program. Pursuant to Section 7(e) we decline to
+ * grant you any rights under trademark law for use of our trademarks.
+ *
+ * All the Product's GUI elements, including illustrations and icon sets, as
+ * well as technical writing content are licensed under the terms of the
+ * Creative Commons Attribution-ShareAlike 4.0 International. See the License
+ * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
+ *
+ */
+
+#include "File.h"
+
+#ifdef _IOS
+
+#import <Foundation/Foundation.h>
+
+static const char* fileSystemRepresentation(const std::wstring& sFileName)
+{
+    NSString *path = [[NSString alloc] initWithBytes:(char*)sFileName.data()
+                                              length:sFileName.size()* sizeof(wchar_t)
+                                            encoding:CFStringConvertEncodingToNSStringEncoding(kCFStringEncodingUTF32LE)];
+    
+    return (const char*)[path fileSystemRepresentation];
+}
+
+namespace NSFile
+{
+    bool CFileBinary::OpenFile(const std::wstring& sFileName, bool bRewrite)
+    {
+        m_pFile = fopen(fileSystemRepresentation(sFileName), bRewrite ? "rb+" : "rb");
+        
+        if (NULL == m_pFile)
+            return false;
+        
+        fseek(m_pFile, 0, SEEK_END);
+        m_lFileSize = ftell(m_pFile);
+        fseek(m_pFile, 0, SEEK_SET);
+        
+        m_lFilePosition = 0;
+        
+        if (0 < sFileName.length())
+        {
+            if (((wchar_t)'/') == sFileName.c_str()[sFileName.length() - 1])
+                m_lFileSize = 0x7FFFFFFF;
+        }
+        
+        unsigned int err = 0x7FFFFFFF;
+        unsigned int cur = (unsigned int)m_lFileSize;
+        if (err == cur)
+        {
+            CloseFile();
+            return false;
+        }
+        
+        return true;
+    }
+    
+    bool CFileBinary::CreateFileW(const std::wstring& sFileName)
+    {
+        m_pFile = fopen(fileSystemRepresentation(sFileName), "wb");
+        
+        if (NULL == m_pFile)
+            return false;
+        
+        m_lFilePosition = 0;
+        return true;
+    }
+}
+
+#endif

DesktopEditor/common/File.h

@@ -618,6 +618,14 @@ namespace NSFile
 		{
 			return m_lFilePosition;
 		}
+        
+        #ifdef _IOS
+        
+        bool OpenFile(const std::wstring& sFileName, bool bRewrite = false);
+        bool CreateFileW(const std::wstring& sFileName);
+       
+        #else
+        
 		bool OpenFile(const std::wstring& sFileName, bool bRewrite = false)
 		{
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)
@@ -675,6 +683,9 @@ namespace NSFile
 			m_lFilePosition = 0;
 			return true;
 		}
+        
+        #endif
+        
 		bool CreateTempFile()
 		{
 #if defined(_WIN32) || defined(_WIN32_WCE) || defined(_WIN64)

DesktopEditor/ios_projects/PdfWriter/PdfWriter.xcodeproj/project.pbxproj

@@ -437,6 +437,7 @@
 					_IOS,
 					FILTER_FLATE_DECODE_ENABLED,
 					_ARM_ALIGN_,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -476,6 +477,7 @@
 					_IOS,
 					FILTER_FLATE_DECODE_ENABLED,
 					_ARM_ALIGN_,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

DesktopEditor/xml/mac/libxml2.xcodeproj/project.pbxproj

@@ -566,6 +566,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					USE_LITE_READER,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					LINUX,
+					MAC,
+					_IOS,
+					LIBXML_READER_ENABLED,
+					_XCODE,
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -582,6 +594,18 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				DEVELOPMENT_TEAM = 2WH24U26GJ;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					UNICODE,
+					_UNICODE,
+					USE_LITE_READER,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					LINUX,
+					MAC,
+					_IOS,
+					LIBXML_READER_ENABLED,
+					_XCODE,
+				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

HtmlFile/Mac/HtmlFile/HtmlFile.xcodeproj/project.pbxproj

@@ -241,6 +241,7 @@
 					_IOS,
 					NOMINMAX,
 					LINUX,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -271,6 +272,7 @@
 					_IOS,
 					NOMINMAX,
 					LINUX,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

OfficeUtils/OfficeUtils.xcodeproj/project.pbxproj

@@ -36,7 +36,7 @@
 		69676CB81CA58BBD00D7A1D1 /* OfficeUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OfficeUtils.cpp; sourceTree = "<group>"; };
 		69676CB91CA58BBD00D7A1D1 /* OfficeUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeUtils.h; sourceTree = "<group>"; };
 		69676CBA1CA58BBD00D7A1D1 /* OfficeUtilsCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfficeUtilsCommon.h; sourceTree = "<group>"; };
-		69676CBB1CA58BBD00D7A1D1 /* ZipUtilsCP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipUtilsCP.cpp; sourceTree = "<group>"; };
+		69676CBB1CA58BBD00D7A1D1 /* ZipUtilsCP.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; path = ZipUtilsCP.cpp; sourceTree = "<group>"; };
 		69676CBC1CA58BBD00D7A1D1 /* ZipUtilsCP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipUtilsCP.h; sourceTree = "<group>"; };
 		69676D291CA58BBD00D7A1D1 /* crypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypt.h; sourceTree = "<group>"; };
 		69676D2A1CA58BBD00D7A1D1 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ioapi.c; sourceTree = "<group>"; };
@@ -292,6 +292,7 @@
 					MAC,
 					unix,
 					_IOS,
+					_XCODE,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				OTHER_LDFLAGS = "-ObjC";
@@ -309,6 +310,7 @@
 					MAC,
 					unix,
 					_IOS,
+					_XCODE,
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 8.2;
 				OTHER_LDFLAGS = "-ObjC";

OfficeUtils/src/ZipUtilsCP.cpp

@@ -36,6 +36,10 @@
 #include "../../DesktopEditor/common/Directory.h"
 #include "../../DesktopEditor/common/Path.h"
 
+#if _IOS
+    #import <Foundation/Foundation.h>
+#endif
+
 #define WRITEBUFFERSIZE 8192
 #define READBUFFERSIZE 8192
 
@@ -43,6 +47,13 @@ namespace ZLibZipUtils
 {
   static zipFile zipOpenHelp(const wchar_t* filename)
   {
+#ifdef _IOS
+      NSString *path =[[NSString alloc] initWithBytes:filename
+                                               length:wcslen(filename)*sizeof(*filename)
+                                             encoding:NSUTF32LittleEndianStringEncoding];
+      return zipOpen( (const char*)[path fileSystemRepresentation], APPEND_STATUS_CREATE );
+#endif
+      
 #if defined(_WIN32) || defined (_WIN64)
 	  zipFile zf = zipOpen( filename, APPEND_STATUS_CREATE );
 #else
@@ -56,6 +67,13 @@ namespace ZLibZipUtils
   }
   static unzFile unzOpenHelp(const wchar_t* filename)
   {
+#ifdef _IOS
+      NSString *path =[[NSString alloc] initWithBytes:filename
+                                               length:wcslen(filename)*sizeof(*filename)
+                                             encoding:NSUTF32LittleEndianStringEncoding];
+      return unzOpen ((const char*)[path fileSystemRepresentation]);
+#endif
+      
 #if defined(_WIN32) || defined (_WIN64)
 	  unzFile uf = unzOpen (filename);
 #else

UnicodeConverter/build/UnicodeConverter/UnicodeConverter.xcodeproj/project.pbxproj

@@ -232,6 +232,7 @@
 					MAC,
 					unix,
 					_IOS,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -260,6 +261,7 @@
 					MAC,
 					unix,
 					_IOS,
+					_XCODE,
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",

X2tConverter/build/Mac/x2t_mac_debug/x2t_macos/x2t_macos.xcodeproj/project.pbxproj

@@ -0,0 +1,459 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		7CC743FF1F20E97F006A9889 /* ASCConverters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC743F91F20E97F006A9889 /* ASCConverters.cpp */; };
+		7CC744001F20E97F006A9889 /* cextracttools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC743FB1F20E97F006A9889 /* cextracttools.cpp */; };
+		7CC744011F20E97F006A9889 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC743FD1F20E97F006A9889 /* main.cpp */; };
+		7CC744191F20E9BF006A9889 /* libASCOfficeDocxFile2Lib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744031F20E9BF006A9889 /* libASCOfficeDocxFile2Lib.a */; };
+		7CC7441A1F20E9BF006A9889 /* libCryptoPPLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744041F20E9BF006A9889 /* libCryptoPPLib.a */; };
+		7CC7441B1F20E9BF006A9889 /* libDjVuFile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744051F20E9BF006A9889 /* libDjVuFile.dylib */; };
+		7CC7441C1F20E9BF006A9889 /* libDocFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744061F20E9BF006A9889 /* libDocFormatLib.a */; };
+		7CC7441D1F20E9BF006A9889 /* libdoctrenderer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744071F20E9BF006A9889 /* libdoctrenderer.dylib */; };
+		7CC7441E1F20E9BF006A9889 /* libDocxFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744081F20E9BF006A9889 /* libDocxFormatLib.a */; };
+		7CC7441F1F20E9BF006A9889 /* libgraphics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744091F20E9BF006A9889 /* libgraphics.a */; };
+		7CC744201F20E9BF006A9889 /* libHtmlFile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440A1F20E9BF006A9889 /* libHtmlFile.dylib */; };
+		7CC744211F20E9BF006A9889 /* libHtmlRenderer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440B1F20E9BF006A9889 /* libHtmlRenderer.dylib */; };
+		7CC744221F20E9BF006A9889 /* liblibxml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440C1F20E9BF006A9889 /* liblibxml.a */; };
+		7CC744231F20E9BF006A9889 /* libOdfFileReaderLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440D1F20E9BF006A9889 /* libOdfFileReaderLib.a */; };
+		7CC744241F20E9BF006A9889 /* libOdfFileWriterLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440E1F20E9BF006A9889 /* libOdfFileWriterLib.a */; };
+		7CC744251F20E9BF006A9889 /* libOfficeUtils.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7440F1F20E9BF006A9889 /* libOfficeUtils.a */; };
+		7CC744261F20E9BF006A9889 /* libPdfReader.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744101F20E9BF006A9889 /* libPdfReader.dylib */; };
+		7CC744271F20E9BF006A9889 /* libPdfWriter.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744111F20E9BF006A9889 /* libPdfWriter.dylib */; };
+		7CC744281F20E9BF006A9889 /* libPptFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744121F20E9BF006A9889 /* libPptFormatLib.a */; };
+		7CC744291F20E9BF006A9889 /* libPPTXFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744131F20E9BF006A9889 /* libPPTXFormatLib.a */; };
+		7CC7442A1F20E9BF006A9889 /* libRtfFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744141F20E9BF006A9889 /* libRtfFormatLib.a */; };
+		7CC7442B1F20E9BF006A9889 /* libTxtXmlFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744151F20E9BF006A9889 /* libTxtXmlFormatLib.a */; };
+		7CC7442C1F20E9BF006A9889 /* libUnicodeConverter.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744161F20E9BF006A9889 /* libUnicodeConverter.dylib */; };
+		7CC7442D1F20E9BF006A9889 /* libXlsFormatLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744171F20E9BF006A9889 /* libXlsFormatLib.a */; };
+		7CC7442E1F20E9BF006A9889 /* libXpsFile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744181F20E9BF006A9889 /* libXpsFile.dylib */; };
+		7CC744311F20E9D5006A9889 /* libicudata.55.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7442F1F20E9D5006A9889 /* libicudata.55.1.dylib */; };
+		7CC744321F20E9D5006A9889 /* libicuuc.55.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744301F20E9D5006A9889 /* libicuuc.55.1.dylib */; };
+		7CC744371F20EAE6006A9889 /* libboost_date_time.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744331F20EAE6006A9889 /* libboost_date_time.a */; };
+		7CC744381F20EAE6006A9889 /* libboost_filesystem.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744341F20EAE6006A9889 /* libboost_filesystem.a */; };
+		7CC744391F20EAE6006A9889 /* libboost_regex.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744351F20EAE6006A9889 /* libboost_regex.a */; };
+		7CC7443A1F20EAE6006A9889 /* libboost_system.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC744361F20EAE6006A9889 /* libboost_system.a */; };
+		7CC7443C1F20F0A9006A9889 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7CC7443B1F20F0A9006A9889 /* AppKit.framework */; };
+		7CC7443F1F20F114006A9889 /* xmldom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC7443D1F20F114006A9889 /* xmldom.cpp */; };
+		7CC744401F20F114006A9889 /* xmllight.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC7443E1F20F114006A9889 /* xmllight.cpp */; };
+		7CC744421F20F128006A9889 /* OfficeFileFormatChecker2.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CC744411F20F128006A9889 /* OfficeFileFormatChecker2.cpp */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXCopyFilesBuildPhase section */
+		7CC743EC1F20E952006A9889 /* CopyFiles */ = {
+			isa = PBXCopyFilesBuildPhase;
+			buildActionMask = 2147483647;
+			dstPath = /usr/share/man/man1/;
+			dstSubfolderSpec = 0;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 1;
+		};
+/* End PBXCopyFilesBuildPhase section */
+
+/* Begin PBXFileReference section */
+		7CC743EE1F20E952006A9889 /* x2t_macos */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = x2t_macos; sourceTree = BUILT_PRODUCTS_DIR; };
+		7CC743F91F20E97F006A9889 /* ASCConverters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ASCConverters.cpp; path = ../../../../src/ASCConverters.cpp; sourceTree = "<group>"; };
+		7CC743FA1F20E97F006A9889 /* ASCConverters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASCConverters.h; path = ../../../../src/ASCConverters.h; sourceTree = "<group>"; };
+		7CC743FB1F20E97F006A9889 /* cextracttools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cextracttools.cpp; path = ../../../../src/cextracttools.cpp; sourceTree = "<group>"; };
+		7CC743FC1F20E97F006A9889 /* cextracttools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cextracttools.h; path = ../../../../src/cextracttools.h; sourceTree = "<group>"; };
+		7CC743FD1F20E97F006A9889 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = ../../../../src/main.cpp; sourceTree = "<group>"; };
+		7CC744031F20E9BF006A9889 /* libASCOfficeDocxFile2Lib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libASCOfficeDocxFile2Lib.a; path = ../../../../../build/lib/mac_64/libASCOfficeDocxFile2Lib.a; sourceTree = "<group>"; };
+		7CC744041F20E9BF006A9889 /* libCryptoPPLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libCryptoPPLib.a; path = ../../../../../build/lib/mac_64/libCryptoPPLib.a; sourceTree = "<group>"; };
+		7CC744051F20E9BF006A9889 /* libDjVuFile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libDjVuFile.dylib; path = ../../../../../build/lib/mac_64/libDjVuFile.dylib; sourceTree = "<group>"; };
+		7CC744061F20E9BF006A9889 /* libDocFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDocFormatLib.a; path = ../../../../../build/lib/mac_64/libDocFormatLib.a; sourceTree = "<group>"; };
+		7CC744071F20E9BF006A9889 /* libdoctrenderer.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libdoctrenderer.dylib; path = ../../../../../build/lib/mac_64/libdoctrenderer.dylib; sourceTree = "<group>"; };
+		7CC744081F20E9BF006A9889 /* libDocxFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libDocxFormatLib.a; path = ../../../../../build/lib/mac_64/libDocxFormatLib.a; sourceTree = "<group>"; };
+		7CC744091F20E9BF006A9889 /* libgraphics.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgraphics.a; path = ../../../../../build/lib/mac_64/libgraphics.a; sourceTree = "<group>"; };
+		7CC7440A1F20E9BF006A9889 /* libHtmlFile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHtmlFile.dylib; path = ../../../../../build/lib/mac_64/libHtmlFile.dylib; sourceTree = "<group>"; };
+		7CC7440B1F20E9BF006A9889 /* libHtmlRenderer.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libHtmlRenderer.dylib; path = ../../../../../build/lib/mac_64/libHtmlRenderer.dylib; sourceTree = "<group>"; };
+		7CC7440C1F20E9BF006A9889 /* liblibxml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblibxml.a; path = ../../../../../build/lib/mac_64/liblibxml.a; sourceTree = "<group>"; };
+		7CC7440D1F20E9BF006A9889 /* libOdfFileReaderLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOdfFileReaderLib.a; path = ../../../../../build/lib/mac_64/libOdfFileReaderLib.a; sourceTree = "<group>"; };
+		7CC7440E1F20E9BF006A9889 /* libOdfFileWriterLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOdfFileWriterLib.a; path = ../../../../../build/lib/mac_64/libOdfFileWriterLib.a; sourceTree = "<group>"; };
+		7CC7440F1F20E9BF006A9889 /* libOfficeUtils.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libOfficeUtils.a; path = ../../../../../build/lib/mac_64/libOfficeUtils.a; sourceTree = "<group>"; };
+		7CC744101F20E9BF006A9889 /* libPdfReader.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPdfReader.dylib; path = ../../../../../build/lib/mac_64/libPdfReader.dylib; sourceTree = "<group>"; };
+		7CC744111F20E9BF006A9889 /* libPdfWriter.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libPdfWriter.dylib; path = ../../../../../build/lib/mac_64/libPdfWriter.dylib; sourceTree = "<group>"; };
+		7CC744121F20E9BF006A9889 /* libPptFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPptFormatLib.a; path = ../../../../../build/lib/mac_64/libPptFormatLib.a; sourceTree = "<group>"; };
+		7CC744131F20E9BF006A9889 /* libPPTXFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libPPTXFormatLib.a; path = ../../../../../build/lib/mac_64/libPPTXFormatLib.a; sourceTree = "<group>"; };
+		7CC744141F20E9BF006A9889 /* libRtfFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libRtfFormatLib.a; path = ../../../../../build/lib/mac_64/libRtfFormatLib.a; sourceTree = "<group>"; };
+		7CC744151F20E9BF006A9889 /* libTxtXmlFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTxtXmlFormatLib.a; path = ../../../../../build/lib/mac_64/libTxtXmlFormatLib.a; sourceTree = "<group>"; };
+		7CC744161F20E9BF006A9889 /* libUnicodeConverter.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libUnicodeConverter.dylib; path = ../../../../../build/lib/mac_64/libUnicodeConverter.dylib; sourceTree = "<group>"; };
+		7CC744171F20E9BF006A9889 /* libXlsFormatLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libXlsFormatLib.a; path = ../../../../../build/lib/mac_64/libXlsFormatLib.a; sourceTree = "<group>"; };
+		7CC744181F20E9BF006A9889 /* libXpsFile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libXpsFile.dylib; path = ../../../../../build/lib/mac_64/libXpsFile.dylib; sourceTree = "<group>"; };
+		7CC7442F1F20E9D5006A9889 /* libicudata.55.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicudata.55.1.dylib; path = ../../../../../build/bin/icu/mac_64/libicudata.55.1.dylib; sourceTree = "<group>"; };
+		7CC744301F20E9D5006A9889 /* libicuuc.55.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicuuc.55.1.dylib; path = ../../../../../build/bin/icu/mac_64/libicuuc.55.1.dylib; sourceTree = "<group>"; };
+		7CC744331F20EAE6006A9889 /* libboost_date_time.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_date_time.a; path = ../../../../../Common/3dParty/boost/boost_1_58_0/build/mac_64/static/libboost_date_time.a; sourceTree = "<group>"; };
+		7CC744341F20EAE6006A9889 /* libboost_filesystem.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_filesystem.a; path = ../../../../../Common/3dParty/boost/boost_1_58_0/build/mac_64/static/libboost_filesystem.a; sourceTree = "<group>"; };
+		7CC744351F20EAE6006A9889 /* libboost_regex.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_regex.a; path = ../../../../../Common/3dParty/boost/boost_1_58_0/build/mac_64/static/libboost_regex.a; sourceTree = "<group>"; };
+		7CC744361F20EAE6006A9889 /* libboost_system.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libboost_system.a; path = ../../../../../Common/3dParty/boost/boost_1_58_0/build/mac_64/static/libboost_system.a; sourceTree = "<group>"; };
+		7CC7443B1F20F0A9006A9889 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
+		7CC7443D1F20F114006A9889 /* xmldom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmldom.cpp; path = ../../../../../DesktopEditor/xml/src/xmldom.cpp; sourceTree = "<group>"; };
+		7CC7443E1F20F114006A9889 /* xmllight.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = xmllight.cpp; path = ../../../../../DesktopEditor/xml/src/xmllight.cpp; sourceTree = "<group>"; };
+		7CC744411F20F128006A9889 /* OfficeFileFormatChecker2.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = OfficeFileFormatChecker2.cpp; path = ../../../../../Common/OfficeFileFormatChecker2.cpp; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		7CC743EB1F20E952006A9889 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7CC7443C1F20F0A9006A9889 /* AppKit.framework in Frameworks */,
+				7CC744371F20EAE6006A9889 /* libboost_date_time.a in Frameworks */,
+				7CC744381F20EAE6006A9889 /* libboost_filesystem.a in Frameworks */,
+				7CC744391F20EAE6006A9889 /* libboost_regex.a in Frameworks */,
+				7CC7443A1F20EAE6006A9889 /* libboost_system.a in Frameworks */,
+				7CC744311F20E9D5006A9889 /* libicudata.55.1.dylib in Frameworks */,
+				7CC744321F20E9D5006A9889 /* libicuuc.55.1.dylib in Frameworks */,
+				7CC744191F20E9BF006A9889 /* libASCOfficeDocxFile2Lib.a in Frameworks */,
+				7CC7441A1F20E9BF006A9889 /* libCryptoPPLib.a in Frameworks */,
+				7CC7441B1F20E9BF006A9889 /* libDjVuFile.dylib in Frameworks */,
+				7CC7441C1F20E9BF006A9889 /* libDocFormatLib.a in Frameworks */,
+				7CC7441D1F20E9BF006A9889 /* libdoctrenderer.dylib in Frameworks */,
+				7CC7441E1F20E9BF006A9889 /* libDocxFormatLib.a in Frameworks */,
+				7CC7441F1F20E9BF006A9889 /* libgraphics.a in Frameworks */,
+				7CC744201F20E9BF006A9889 /* libHtmlFile.dylib in Frameworks */,
+				7CC744211F20E9BF006A9889 /* libHtmlRenderer.dylib in Frameworks */,
+				7CC744221F20E9BF006A9889 /* liblibxml.a in Frameworks */,
+				7CC744231F20E9BF006A9889 /* libOdfFileReaderLib.a in Frameworks */,
+				7CC744241F20E9BF006A9889 /* libOdfFileWriterLib.a in Frameworks */,
+				7CC744251F20E9BF006A9889 /* libOfficeUtils.a in Frameworks */,
+				7CC744261F20E9BF006A9889 /* libPdfReader.dylib in Frameworks */,
+				7CC744271F20E9BF006A9889 /* libPdfWriter.dylib in Frameworks */,
+				7CC744281F20E9BF006A9889 /* libPptFormatLib.a in Frameworks */,
+				7CC744291F20E9BF006A9889 /* libPPTXFormatLib.a in Frameworks */,
+				7CC7442A1F20E9BF006A9889 /* libRtfFormatLib.a in Frameworks */,
+				7CC7442B1F20E9BF006A9889 /* libTxtXmlFormatLib.a in Frameworks */,
+				7CC7442C1F20E9BF006A9889 /* libUnicodeConverter.dylib in Frameworks */,
+				7CC7442D1F20E9BF006A9889 /* libXlsFormatLib.a in Frameworks */,
+				7CC7442E1F20E9BF006A9889 /* libXpsFile.dylib in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		7CC743E51F20E952006A9889 = {
+			isa = PBXGroup;
+			children = (
+				7CC744411F20F128006A9889 /* OfficeFileFormatChecker2.cpp */,
+				7CC7443D1F20F114006A9889 /* xmldom.cpp */,
+				7CC7443E1F20F114006A9889 /* xmllight.cpp */,
+				7CC743F91F20E97F006A9889 /* ASCConverters.cpp */,
+				7CC743FA1F20E97F006A9889 /* ASCConverters.h */,
+				7CC743FB1F20E97F006A9889 /* cextracttools.cpp */,
+				7CC743FC1F20E97F006A9889 /* cextracttools.h */,
+				7CC743FD1F20E97F006A9889 /* main.cpp */,
+				7CC743F01F20E952006A9889 /* x2t_macos */,
+				7CC743EF1F20E952006A9889 /* Products */,
+				7CC744021F20E9BF006A9889 /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		7CC743EF1F20E952006A9889 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7CC743EE1F20E952006A9889 /* x2t_macos */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		7CC743F01F20E952006A9889 /* x2t_macos */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = x2t_macos;
+			sourceTree = "<group>";
+		};
+		7CC744021F20E9BF006A9889 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7CC7443B1F20F0A9006A9889 /* AppKit.framework */,
+				7CC744331F20EAE6006A9889 /* libboost_date_time.a */,
+				7CC744341F20EAE6006A9889 /* libboost_filesystem.a */,
+				7CC744351F20EAE6006A9889 /* libboost_regex.a */,
+				7CC744361F20EAE6006A9889 /* libboost_system.a */,
+				7CC7442F1F20E9D5006A9889 /* libicudata.55.1.dylib */,
+				7CC744301F20E9D5006A9889 /* libicuuc.55.1.dylib */,
+				7CC744031F20E9BF006A9889 /* libASCOfficeDocxFile2Lib.a */,
+				7CC744041F20E9BF006A9889 /* libCryptoPPLib.a */,
+				7CC744051F20E9BF006A9889 /* libDjVuFile.dylib */,
+				7CC744061F20E9BF006A9889 /* libDocFormatLib.a */,
+				7CC744071F20E9BF006A9889 /* libdoctrenderer.dylib */,
+				7CC744081F20E9BF006A9889 /* libDocxFormatLib.a */,
+				7CC744091F20E9BF006A9889 /* libgraphics.a */,
+				7CC7440A1F20E9BF006A9889 /* libHtmlFile.dylib */,
+				7CC7440B1F20E9BF006A9889 /* libHtmlRenderer.dylib */,
+				7CC7440C1F20E9BF006A9889 /* liblibxml.a */,
+				7CC7440D1F20E9BF006A9889 /* libOdfFileReaderLib.a */,
+				7CC7440E1F20E9BF006A9889 /* libOdfFileWriterLib.a */,
+				7CC7440F1F20E9BF006A9889 /* libOfficeUtils.a */,
+				7CC744101F20E9BF006A9889 /* libPdfReader.dylib */,
+				7CC744111F20E9BF006A9889 /* libPdfWriter.dylib */,
+				7CC744121F20E9BF006A9889 /* libPptFormatLib.a */,
+				7CC744131F20E9BF006A9889 /* libPPTXFormatLib.a */,
+				7CC744141F20E9BF006A9889 /* libRtfFormatLib.a */,
+				7CC744151F20E9BF006A9889 /* libTxtXmlFormatLib.a */,
+				7CC744161F20E9BF006A9889 /* libUnicodeConverter.dylib */,
+				7CC744171F20E9BF006A9889 /* libXlsFormatLib.a */,
+				7CC744181F20E9BF006A9889 /* libXpsFile.dylib */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7CC743ED1F20E952006A9889 /* x2t_macos */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7CC743F51F20E952006A9889 /* Build configuration list for PBXNativeTarget "x2t_macos" */;
+			buildPhases = (
+				7CC743EA1F20E952006A9889 /* Sources */,
+				7CC743EB1F20E952006A9889 /* Frameworks */,
+				7CC743EC1F20E952006A9889 /* CopyFiles */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = x2t_macos;
+			productName = x2t_macos;
+			productReference = 7CC743EE1F20E952006A9889 /* x2t_macos */;
+			productType = "com.apple.product-type.tool";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7CC743E61F20E952006A9889 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0800;
+				ORGANIZATIONNAME = "Oleg Korshul";
+				TargetAttributes = {
+					7CC743ED1F20E952006A9889 = {
+						CreatedOnToolsVersion = 8.0;
+						ProvisioningStyle = Automatic;
+					};
+				};
+			};
+			buildConfigurationList = 7CC743E91F20E952006A9889 /* Build configuration list for PBXProject "x2t_macos" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 7CC743E51F20E952006A9889;
+			productRefGroup = 7CC743EF1F20E952006A9889 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7CC743ED1F20E952006A9889 /* x2t_macos */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		7CC743EA1F20E952006A9889 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7CC744001F20E97F006A9889 /* cextracttools.cpp in Sources */,
+				7CC743FF1F20E97F006A9889 /* ASCConverters.cpp in Sources */,
+				7CC7443F1F20F114006A9889 /* xmldom.cpp in Sources */,
+				7CC744011F20E97F006A9889 /* main.cpp in Sources */,
+				7CC744401F20F114006A9889 /* xmllight.cpp in Sources */,
+				7CC744421F20F128006A9889 /* OfficeFileFormatChecker2.cpp in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		7CC743F31F20E952006A9889 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				FRAMEWORK_SEARCH_PATHS = "@executable_path";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					_MAC,
+					MAC,
+					_LINUX,
+					LINUX,
+					UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					PPTX_DEF,
+					PPT_DEF,
+					ENABLE_PPT_TO_PPTX_CONVERT,
+					FILTER_FLATE_DECODE_ENABLED,
+					CXIMAGE_DONT_DECLARE_TCHAR,
+					DONT_WRITE_EMBEDDED_FONTS,
+					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					LIBXML_READER_ENABLED,
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					/Users/Oleg/Desktop/GIT/core/build/lib/mac_64,
+					/Users/Oleg/Desktop/GIT/core/Common/boost_1_58_0/stage/lib,
+					/Users/Oleg/Desktop/GIT/core/build/bin/icu/mac_64,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				OTHER_CFLAGS = (
+					"-I./../../../../../Common/boost_1_58_0",
+					"-I./../../../../../DesktopEditor/xml/libxml2/include",
+					"-I./../../../../../DesktopEditor/freetype-2.5.2/include",
+					"-I./../../../../../DesktopEditor/agg-2.4/include",
+					"-I./../../../../../DesktopEditor/xml/build/qt",
+				);
+				SDKROOT = macosx;
+			};
+			name = Debug;
+		};
+		7CC743F41F20E952006A9889 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVES = YES;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				CODE_SIGN_IDENTITY = "-";
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				FRAMEWORK_SEARCH_PATHS = "@executable_path";
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					_MAC,
+					MAC,
+					_LINUX,
+					LINUX,
+					UNICODE,
+					_USE_LIBXML2_READER_,
+					_USE_XMLLITE_READER_,
+					USE_LITE_READER,
+					PPTX_DEF,
+					PPT_DEF,
+					ENABLE_PPT_TO_PPTX_CONVERT,
+					FILTER_FLATE_DECODE_ENABLED,
+					CXIMAGE_DONT_DECLARE_TCHAR,
+					DONT_WRITE_EMBEDDED_FONTS,
+					AVS_USE_CONVERT_PPTX_TOCUSTOM_VML,
+					LIBXML_READER_ENABLED,
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				LIBRARY_SEARCH_PATHS = (
+					/Users/Oleg/Desktop/GIT/core/build/lib/mac_64,
+					/Users/Oleg/Desktop/GIT/core/Common/boost_1_58_0/stage/lib,
+					/Users/Oleg/Desktop/GIT/core/build/bin/icu/mac_64,
+				);
+				MACOSX_DEPLOYMENT_TARGET = 10.12;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				OTHER_CFLAGS = (
+					"-I./../../../../../Common/boost_1_58_0",
+					"-I./../../../../../DesktopEditor/xml/libxml2/include",
+					"-I./../../../../../DesktopEditor/freetype-2.5.2/include",
+					"-I./../../../../../DesktopEditor/agg-2.4/include",
+					"-I./../../../../../DesktopEditor/xml/build/qt",
+				);
+				SDKROOT = macosx;
+			};
+			name = Release;
+		};
+		7CC743F61F20E952006A9889 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Debug;
+		};
+		7CC743F71F20E952006A9889 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				PRODUCT_NAME = "$(TARGET_NAME)";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7CC743E91F20E952006A9889 /* Build configuration list for PBXProject "x2t_macos" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7CC743F31F20E952006A9889 /* Debug */,
+				7CC743F41F20E952006A9889 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7CC743F51F20E952006A9889 /* Build configuration list for PBXNativeTarget "x2t_macos" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7CC743F61F20E952006A9889 /* Debug */,
+				7CC743F71F20E952006A9889 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7CC743E61F20E952006A9889 /* Project object */;
+}

X2tConverter/build/Mac/x2t_mac_debug/x2t_macos/x2t_macos.xcodeproj/xcuserdata/Oleg.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>x2t_macos.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>7CC743ED1F20E952006A9889</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>