CASCHTMLRenderer3 CloseFile IsNoBase64

ASCOfficeDocxFile2/BinReader/ReaderClasses.h

@@ -1583,6 +1583,7 @@ public:
     std::wstring UserName;
     std::wstring UserId;
     std::wstring Date;
+	std::wstring OOData;
 	bool Solved;
     std::wstring Text;
     std::wstring m_sParaId;
@@ -1706,9 +1707,16 @@ public:
 		{
             std::wstring sDate = XmlUtils::EncodeXmlString(pComment->Date);
             sRes += L" w:date=\"";
-            sRes += sDate;
+			sRes += sDate;
             sRes += L"\"";
 		}
+		if(false == pComment->OOData.empty())
+		{
+			std::wstring sData = XmlUtils::EncodeXmlString(pComment->OOData);
+			sRes += L" oodata=\"";
+			sRes += sData;
+			sRes += L"\"";
+		}
         if(false == sInitials.empty())
 		{
 			sInitials = XmlUtils::EncodeXmlString(sInitials);

ASCOfficeDocxFile2/BinReader/Readers.h

@@ -3039,6 +3039,11 @@ public:
             std::wstring Date(m_oBufferedStream.GetString3(length));
 			pComment->Date = Date;
 		}
+		else if ( c_oSer_CommentsType::OOData == type )
+		{
+			std::wstring Data(m_oBufferedStream.GetString3(length));
+			pComment->OOData = Data;
+		}
 		else if ( c_oSer_CommentsType::Text == type )
 		{
             std::wstring Text(m_oBufferedStream.GetString3(length));

ASCOfficeDocxFile2/BinWriter/BinReaderWriterDefines.h

@@ -716,7 +716,8 @@ extern int g_nCurFormatVersion;
 		Text = 6,
 		QuoteText = 7,
 		Solved = 8,
-		Replies = 9
+		Replies = 9,
+		OOData = 10
 	};}
 	namespace c_oSer_SettingsType{enum c_oSer_SettingsType
 	{

ASCOfficeDocxFile2/BinWriter/BinWriters.h

@@ -7222,6 +7222,11 @@ namespace BinDocxRW
 					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentsType::Date);
 					m_oBcw.m_oStream.WriteStringW(pComment->m_oDate->ToString());
 				}
+				if(pComment->m_oOOData.IsInit())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentsType::OOData);
+					m_oBcw.m_oStream.WriteStringW(pComment->m_oOOData.get2());
+				}
 				if(pComment->m_oId.IsInit())
 				{
 					nCurPos = m_oBcw.WriteItemStart(c_oSer_CommentsType::Id);

ASCOfficeOdfFile/linux/OdfFileReaderLib.pro

@@ -212,6 +212,11 @@ SOURCES += \
     ../src/odf/datatypes/xlink.cpp \
     ../src/odf/datatypes/chartlabelposition.cpp \
     ../src/odf/datatypes/grandtotal.cpp \
+    ../src/odf/datatypes/membertype.cpp \
+    ../src/odf/datatypes/tabletype.cpp \
+    ../src/odf/datatypes/tableorientation.cpp \
+    ../src/odf/datatypes/tablefunction.cpp \
+    ../src/odf/datatypes/tableorder.cpp \
     ../src/docx/xlsx_conditionalFormatting.cpp \
     ../src/docx/xlsx_dxfs.cpp \
     ../src/docx/docx_content_type.cpp \
@@ -281,6 +286,7 @@ SOURCES += \
     ../src/docx/xlsx_table_metrics.cpp \
     ../src/docx/xlsx_table_state.cpp \
     ../src/docx/xlsx_textcontext.cpp \
+    ../src/docx/xlsx_pivots_context.cpp \
     ../src/docx/xlsx_utils.cpp \
     ../src/docx/xlsx_xf.cpp
 }

ASCOfficeOdfFile/linux/odffilereaderlib_odf_datatypes.cpp

@@ -121,3 +121,8 @@
 #include "../src/odf/datatypes/xlink.cpp"
 #include "../src/odf/datatypes/chartlabelposition.cpp"
 #include "../src/odf/datatypes/grandtotal.cpp"
+#include "../src/odf/datatypes/membertype.cpp"
+#include "../src/odf/datatypes/tabletype.cpp"
+#include "../src/odf/datatypes/tableorientation.cpp"
+#include "../src/odf/datatypes/tablefunction.cpp"
+#include "../src/odf/datatypes/tableorder.cpp"

ASCOfficeOdfFile/linux/odffilereaderlib_oox.cpp

@@ -100,3 +100,4 @@
 #include "../src/docx/xlsx_textcontext.cpp"
 #include "../src/docx/xlsx_utils.cpp"
 #include "../src/docx/xlsx_xf.cpp"
+#include "../src/docx/xlsx_pivots_context.cpp"

ASCOfficeOdfFile/src/docx/xlsx_output_xml.cpp

@@ -57,8 +57,7 @@ public:
 	std::wstringstream	ole_objects_;
 	std::wstringstream	page_props_;
 
-	rels hyperlinks_rels_;
-	rels ole_objects_rels_;
+	rels sheet_rels_;
 
     std::wstring drawingName_;
     std::wstring drawingId_;
@@ -141,14 +140,11 @@ std::wostream & xlsx_xml_worksheet::page_properties()
 }
 
 //---------------------------------------------------------------------------------------
-rels & xlsx_xml_worksheet::hyperlinks_rels()
+rels & xlsx_xml_worksheet::sheet_rels()
 {
-    return impl_->hyperlinks_rels_;
-}
-rels & xlsx_xml_worksheet::ole_objects_rels()
-{
-    return impl_->ole_objects_rels_;
+    return impl_->sheet_rels_;
 }
+
 void xlsx_xml_worksheet::write_to(std::wostream & strm)
 {
     CP_XML_WRITER(strm)

ASCOfficeOdfFile/src/docx/xlsx_output_xml.h

@@ -49,8 +49,8 @@ class xlsx_xml_worksheet: noncopyable
 public:
     xlsx_xml_worksheet(std::wstring const & name);
     ~xlsx_xml_worksheet();
-public:
-    std::wstring name() const;
+
+	std::wstring name() const;
    
 	std::wostream & cols();
     std::wostream & sheetFormat();
@@ -65,9 +65,8 @@ public:
 	std::wostream & ole_objects();
 	std::wostream & page_properties();
 	
-	rels & hyperlinks_rels();
-	rels & ole_objects_rels();
-
+	rels & sheet_rels();			//hyperlink, background image, external, media ...
+	
     void write_to(std::wostream & strm);
 
     void set_drawing_link		(std::wstring const & fileName, std::wstring const & id);

ASCOfficeOdfFile/src/docx/xlsx_package.cpp

@@ -32,8 +32,6 @@
 
 #include "xlsx_package.h"
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/ref.hpp>
 
 #include <cpdoccore/utf8cpp/utf8.h>
@@ -82,8 +80,25 @@ void xlsx_document::write(const std::wstring & RootPath)
     content_type_file_.write(RootPath);
 }
 
-////////////////////////////////////////////
+//--------------------------------------------------------------------------------------------
+pivot_cache_content::pivot_cache_content() : definitions_rels_file_(rels_file::create(L""))
+{      
+}
 
+_CP_PTR(pivot_cache_content) pivot_cache_content::create()
+{
+    return boost::make_shared<pivot_cache_content>();
+}
+//--------------------------------------------------------------------------------------------
+pivot_table_content::pivot_table_content() : rels_file_(rels_file::create(L""))
+{      
+}
+
+_CP_PTR(pivot_table_content) pivot_table_content::create()
+{
+    return boost::make_shared<pivot_table_content>();
+}
+//--------------------------------------------------------------------------------------------
 sheet_content::sheet_content() : rels_(rels_file::create(L""))
 {
         
@@ -101,13 +116,13 @@ void sheet_content::add_rel(relationship const & r)
 
 void sheet_content::add_rels(rels & r)
 {
-    BOOST_FOREACH(relationship & item, r.relationships())
+	std::vector<relationship> & items = r.relationships();
+    for (size_t i = 0; i < items.size(); i++)
 	{
-		rels_->get_rels().add(item);
+		rels_->get_rels().add(items[i]);
 	}
 }
-////////////
-
+//--------------------------------------------------------------------------------------------
 sheets_files::sheets_files()
 {}
 
@@ -121,41 +136,36 @@ void sheets_files::write(const std::wstring & RootPath)
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"worksheets";
     NSDirectory::CreateDirectory(path.c_str());
 
-    size_t count = 0;
-
-    BOOST_FOREACH(const sheet_content_ptr & item, sheets_)
+    for (size_t i = 0; i < sheets_.size(); i++)
     {
-        if (item)
+		sheet_content_ptr & item = sheets_[i];
+		if (!item) continue;
+
+        const std::wstring fileName		= std::wstring(L"sheet") + std::to_wstring(i + 1) + L".xml";
+		const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
+        
+		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+        contentTypes->add_override(std::wstring(L"/xl/worksheets/") + fileName, kWSConType);
+
+        if (rels_)
         {
-            count++;
-            const std::wstring fileName		= std::wstring(L"sheet") + std::to_wstring(count) + L".xml";
-			const std::wstring kWSConType	= L"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml";
-            
-			content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
-            contentTypes->add_override(std::wstring(L"/xl/worksheets/") + fileName, kWSConType);
-
-            if (rels_)
-            {
-                const std::wstring id = std::wstring(L"sId") + std::to_wstring(count);
-                static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet";
-                const std::wstring fileRef = std::wstring(L"worksheets/") + fileName;
-                rels_->add(id, kWSRel, fileRef);
-            }
-
-            item->get_rel_file()->set_file_name(fileName + L".rels"); 
-            rels_files relFiles;
-            relFiles.add_rel_file(item->get_rel_file());
-            relFiles.write(path);
-            
-            //item->get_rel_file()->write(path.string<std::wstring>());
-
-            package::simple_element(fileName, item->str()).write(path);
+            const std::wstring id = std::wstring(L"sId") + std::to_wstring(i + 1);
+            static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet";
+            const std::wstring fileRef = std::wstring(L"worksheets/") + fileName;
+            rels_->add(id, kWSRel, fileRef);
         }
+
+        item->get_rel_file()->set_file_name(fileName + L".rels"); 
+        rels_files relFiles;
+        relFiles.add_rel_file(item->get_rel_file());
+        relFiles.write(path);
+        
+        //item->get_rel_file()->write(path.string<std::wstring>());
+
+        package::simple_element(fileName, item->str()).write(path);
     }
 }
-
-////////////////////////////////////////////
-
+//--------------------------------------------------------------------------------------------
 xl_files::xl_files()
 {
     rels_files_.add_rel_file(rels_file::create(L"workbook.xml.rels"));
@@ -166,10 +176,20 @@ void xl_files::write(const std::wstring & RootPath)
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"xl";
     NSDirectory::CreateDirectory(path.c_str());
 
-    sheets_files_.set_rels(&rels_files_);
-    sheets_files_.set_main_document( this->get_main_document() );
-    sheets_files_.write(path);
-
+    {
+		pivot_cache_files_.set_rels(&rels_files_);
+        pivot_cache_files_.set_main_document(get_main_document());
+		pivot_cache_files_.write(path);
+    }
+	{
+		pivot_table_files_.set_main_document(get_main_document());
+		pivot_table_files_.write(path);
+	}
+	{
+		sheets_files_.set_rels(&rels_files_);
+		sheets_files_.set_main_document( this->get_main_document() );
+		sheets_files_.write(path);
+	}
 	int index = 1;
     if (true)
     {
@@ -181,7 +201,16 @@ void xl_files::write(const std::wstring & RootPath)
         sharedStrings_->write(path);
         rels_files_.add( relationship( L"shId1",  L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings", L"sharedStrings.xml" ) );
     }
-    if (styles_)
+	if (connections_)
+	{
+        connections_->write(path);
+        rels_files_.add( relationship( L"cnId1",  L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/connections", L"connections.xml" ) );
+
+		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+		contentTypes->add_override(L"/xl/connections.xml", L"application/vnd.openxmlformats-officedocument.spreadsheetml.connections+xml");
+	}
+
+	if (styles_)
     {
        styles_->write(path);
        rels_files_.add( relationship( L"stId1",  L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles", L"styles.xml" ) );
@@ -235,7 +264,10 @@ void xl_files::set_sharedStrings(element_ptr Element)
 {
     sharedStrings_ = Element;
 }
-
+void xl_files::set_connections(element_ptr Element)
+{
+    connections_ = Element;
+}
 void xl_files::add_sheet(sheet_content_ptr sheet)
 {
     sheets_files_.add_sheet(sheet);
@@ -269,7 +301,102 @@ void xl_files::add_charts(chart_content_ptr chart)
 {
     charts_files_.add_chart(chart);
 }
-////////////////////////////
+void xl_files::add_pivot_cache(pivot_cache_content_ptr pivot_cache)
+{
+    pivot_cache_files_.add_pivot_cache(pivot_cache);
+}
+void xl_files::add_pivot_table(pivot_table_content_ptr pivot_table)
+{
+    pivot_table_files_.add_pivot_table(pivot_table);
+}
+//----------------------------------------------------------------------------------------
+void xl_pivot_cache_files::add_pivot_cache(pivot_cache_content_ptr pivot_cache)
+{
+    pivot_caches_.push_back(pivot_cache);
+}
+void xl_pivot_cache_files::write(const std::wstring & RootPath)
+{
+	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"pivotCache";
+    NSDirectory::CreateDirectory(path.c_str());
+
+	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	
+	static const std::wstring kWSConTypeD = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml";
+	static const std::wstring kWSConTypeR = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml";
+	
+	for (size_t i = 0; i < pivot_caches_.size(); i++)
+    {
+        if (pivot_caches_[i])
+        {
+            const std::wstring fileNameD = std::wstring(L"pivotCacheDefinition") + std::to_wstring(i + 1) + L".xml";
+           
+            contentTypes->add_override(std::wstring(L"/xl/pivotCache/") + fileNameD, kWSConTypeD);
+
+            package::simple_element(fileNameD, pivot_caches_[i]->str_d()).write(path);
+
+            if (pivot_caches_[i]->get_rels().empty() == false)
+			{
+				rels_files relFiles;
+				pivot_caches_[i]->definitions_rels_file_->set_file_name(fileNameD + L".rels");
+				
+				relFiles.add_rel_file(pivot_caches_[i]->definitions_rels_file_);
+				relFiles.write(path);
+			}
+			if (rels_) //for workbook
+			{
+				const std::wstring id = std::wstring(L"pcId") + std::to_wstring(i + 1);
+				static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition";
+				const std::wstring fileRef = std::wstring(L"pivotCache/") + fileNameD;
+				rels_->add(id, kWSRel, fileRef);
+			}
+			std::wstring content_records = pivot_caches_[i]->str_r();
+			if (!content_records.empty())
+			{
+				const std::wstring fileNameR = std::wstring(L"pivotCacheRecords") + std::to_wstring(i + 1) + L".xml";
+	           
+				contentTypes->add_override(std::wstring(L"/xl/pivotCache/") + fileNameR, kWSConTypeR);
+
+				package::simple_element(fileNameR, content_records).write(path);
+			}
+        }
+    }
+}
+//----------------------------------------------------------------------------------------
+void xl_pivot_table_files::add_pivot_table(pivot_table_content_ptr pivot_table)
+{
+    pivot_tables_.push_back(pivot_table);
+}
+void xl_pivot_table_files::write(const std::wstring & RootPath)
+{
+	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"pivotTables";
+    NSDirectory::CreateDirectory(path.c_str());
+
+	content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+	
+	static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml";
+	
+	for (size_t i = 0; i < pivot_tables_.size(); i++)
+    {
+        if (pivot_tables_[i])
+        {
+            const std::wstring fileName = std::wstring(L"pivotTable") + std::to_wstring(i + 1) + L".xml";
+           
+            contentTypes->add_override(std::wstring(L"/xl/pivotTables/") + fileName, kWSConType);
+
+            package::simple_element(fileName, pivot_tables_[i]->str()).write(path);
+
+            if (pivot_tables_[i]->get_rels().empty() == false)
+			{
+				rels_files relFiles;
+				pivot_tables_[i]->rels_file_->set_file_name(fileName + L".rels");
+				
+				relFiles.add_rel_file(pivot_tables_[i]->rels_file_);
+				relFiles.write(path);
+			}
+        }
+    }
+}
+//------------------------------------------------------------------------------------------------------
 void xl_charts_files::add_chart(chart_content_ptr chart)
 {
     charts_.push_back(chart);
@@ -281,29 +408,26 @@ void xl_charts_files::write(const std::wstring & RootPath)
 
     size_t count = 0;
 
-    BOOST_FOREACH(const chart_content_ptr & item, charts_)
+	for (size_t i = 0; i < charts_.size(); i++)
     {
-        if (item)
-        {
-            count++;
-            const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(count) + L".xml";
-            content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
-           
-			static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
-            contentTypes->add_override(std::wstring(L"/xl/charts/") + fileName, kWSConType);
+        count++;
+        const std::wstring fileName = std::wstring(L"chart") + std::to_wstring(i + 1) + L".xml";
+        content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
+       
+		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
+        contentTypes->add_override(std::wstring(L"/xl/charts/") + fileName, kWSConType);
 
-            package::simple_element(fileName, item->str()).write(path);
-			
-			rels_files relFiles;
+        package::simple_element(fileName, charts_[i]->str()).write(path);
+		
+		rels_files relFiles;
 
-			item->get_rel_file()->set_file_name(fileName + L".rels");
-			    
-			relFiles.add_rel_file(item->get_rel_file());
-			relFiles.write(path);
-       }
+		charts_[i]->get_rel_file()->set_file_name(fileName + L".rels");
+		    
+		relFiles.add_rel_file(charts_[i]->get_rel_file());
+		relFiles.write(path);
     }
 }
-//////////////////////////
+//------------------------------------------------------------------------------------------------------
 xl_drawings_ptr xl_drawings::create(const std::vector<drawing_elm> & elms)
 {
     return boost::make_shared<xl_drawings>(boost::ref(elms));
@@ -314,14 +438,14 @@ void xl_drawings::write(const std::wstring & RootPath)
 	std::wstring path = RootPath + FILE_SEPARATOR_STR + L"drawings";
     NSDirectory::CreateDirectory(path.c_str());
 
-    BOOST_FOREACH(drawing_elm const & e, drawings_)
+    for (size_t i = 0; i < drawings_.size(); i++)
     {
-        package::simple_element(e.filename, e.content).write(path);        
+        package::simple_element(drawings_[i].filename, drawings_[i].content).write(path);        
 
         rels_files relFiles;
-        rels_file_ptr r = rels_file::create(e.filename + L".rels");
+        rels_file_ptr r = rels_file::create(drawings_[i].filename + L".rels");
         
-		e.drawings->dump_rels_drawing(r->get_rels());
+		drawings_[i].drawings->dump_rels_drawing(r->get_rels());
                 
         relFiles.add_rel_file(r);
         relFiles.write(path);
@@ -329,7 +453,7 @@ void xl_drawings::write(const std::wstring & RootPath)
         content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
 
         const std::wstring kDrawingCT = L"application/vnd.openxmlformats-officedocument.drawing+xml";
-        contentTypes->add_override(L"/xl/drawings/" + e.filename, kDrawingCT);
+        contentTypes->add_override(L"/xl/drawings/" + drawings_[i].filename, kDrawingCT);
     }
 }
 
@@ -344,15 +468,15 @@ void xl_comments::write(const std::wstring & RootPath)
 	std::wstring vml_path = RootPath + FILE_SEPARATOR_STR + L"drawings";
     NSDirectory::CreateDirectory(vml_path.c_str());
    
-	BOOST_FOREACH(comment_elm const & e, comments_)
+    for (size_t i = 0; i < comments_.size(); i++)
     {
 		content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
 
 		static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml";
-        contentTypes->add_override(std::wstring(L"/xl/") + e.filename, kWSConType);
+        contentTypes->add_override(std::wstring(L"/xl/") + comments_[i].filename, kWSConType);
 			
-		package::simple_element(e.filename, e.content).write(RootPath);        
-		package::simple_element(e.vml_filename, e.vml_content).write(vml_path);        
+		package::simple_element(comments_[i].filename, comments_[i].content).write(RootPath);        
+		package::simple_element(comments_[i].vml_filename, comments_[i].vml_content).write(vml_path);        
 	}
 }
 

ASCOfficeOdfFile/src/docx/xlsx_package.h

@@ -50,9 +50,6 @@ public:
     xlsx_content_types_file();
 };
 
-class sheet_content;
-typedef _CP_PTR(sheet_content) sheet_content_ptr;
-
 class sheet_content : noncopyable
 {
 public:
@@ -68,8 +65,49 @@ private:
     std::wstringstream content_;
     rels_file_ptr rels_;
 };
+typedef _CP_PTR(sheet_content) sheet_content_ptr;
+//------------------------------------------------------------------------
+class pivot_cache_content;
+typedef _CP_PTR(pivot_cache_content) pivot_cache_content_ptr;
+class pivot_cache_content : boost::noncopyable
+{
+public:
+    pivot_cache_content();
+    static _CP_PTR(pivot_cache_content) create();
 
-//  sheets_files
+    std::wostream	& definitions() { return definitions_; }
+	std::wostream	& records()		{ return records_; }
+	rels			& get_rels()	{ return definitions_rels_file_->get_rels(); }
+
+    std::wstring	str_d() { return definitions_.str(); }
+    std::wstring	str_r() { return records_.str(); }
+	
+	friend class	xl_pivot_cache_files;
+private:
+    std::wstringstream	records_;
+    std::wstringstream	definitions_;
+	rels_file_ptr		definitions_rels_file_;
+};
+//------------------------------------------------------------------------
+class pivot_table_content;
+typedef _CP_PTR(pivot_table_content) pivot_table_content_ptr;
+class pivot_table_content : boost::noncopyable
+{
+public:
+    pivot_table_content();
+    static _CP_PTR(pivot_table_content) create();
+
+    std::wostream	& content()		{ return content_; }
+	rels			& get_rels()	{ return rels_file_->get_rels(); }
+
+    std::wstring	str() { return content_.str(); }
+	
+	friend class	xl_pivot_table_files;
+private:
+    std::wstringstream	content_;
+	rels_file_ptr		rels_file_;
+};
+//------------------------------------------------------------------------
 class sheets_files  : public element
 {
 public:
@@ -90,7 +128,7 @@ public:
 
 };
 
-//  xl_charts_files
+
 class xl_charts_files  : public element
 {
 public:
@@ -102,12 +140,37 @@ public:
     std::vector<chart_content_ptr> charts_;
 
 };
-///////////////////////////////////////////////////////////
 
+class xl_pivot_table_files  : public element
+{
+public:
+	xl_pivot_table_files(){}
+	 
+	void			add_pivot_table(pivot_table_content_ptr pivot_table);
+	virtual void	write(const std::wstring & RootPath);
+    
+    std::vector<pivot_table_content_ptr> pivot_tables_;
+};
+class xl_pivot_cache_files  : public element
+{
+public:
+	xl_pivot_cache_files(){}
+
+	void set_rels(rels_files * rels)
+    {
+        rels_ = rels;
+    }
+	 
+	void			add_pivot_cache(pivot_cache_content_ptr pivot_cache);
+	virtual void	write(const std::wstring & RootPath);
+    
+    std::vector<pivot_cache_content_ptr> pivot_caches_;
+
+    rels_files * rels_;
+};
+//-------------------------------------------------------------------------------------------------------------
 class xl_comments;
 typedef _CP_PTR(xl_comments) xl_comments_ptr;
-
-// xl_comments
 class xl_comments: public element
 {
 public:
@@ -121,13 +184,10 @@ public:
 
 private:
     const std::vector<comment_elm> & comments_;
-
 };
-
+//-----------------------------------------------------------------------------------------------------
 class xl_drawings;
 typedef _CP_PTR(xl_drawings) xl_drawings_ptr;
-
-// xl_drawings
 class xl_drawings: public element
 {
 public:
@@ -146,10 +206,9 @@ public:
 private:
     const std::vector<drawing_elm> & drawings_;
     rels_files * rels_;
-
 };
+//----------------------------------------------------------------------------------------------------------
 
-//  xl_files
 class xl_files : public element
 {
 public:
@@ -158,20 +217,25 @@ public:
 public:
     virtual void write(const std::wstring & RootPath);
 
-    void set_workbook(element_ptr Element);
-    void set_styles(element_ptr Element);
-    void set_sharedStrings(element_ptr Element);
-    void add_sheet(sheet_content_ptr sheet);
-    void set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts);    
-    void set_drawings(element_ptr Element);
-	void set_vml_drawings(element_ptr Element);
-	void set_comments(element_ptr Element);
-    void add_charts(chart_content_ptr chart);
+    void set_workbook		(element_ptr Element);
+    void set_styles			(element_ptr Element);
+    void set_sharedStrings	(element_ptr Element);
+	void set_connections	(element_ptr Element);
+    void add_sheet			(sheet_content_ptr sheet);
+    void set_media			(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts);    
+    void set_drawings		(element_ptr Element);
+	void set_vml_drawings	(element_ptr Element);
+	void set_comments		(element_ptr Element);
+    void add_charts			(chart_content_ptr chart);
+    void add_pivot_cache	(pivot_cache_content_ptr cache);
+	void add_pivot_table	(pivot_table_content_ptr table);
 
 private:
-    rels_files		rels_files_;
-    sheets_files	sheets_files_;
-    xl_charts_files charts_files_;
+    rels_files				rels_files_;
+    sheets_files			sheets_files_;
+    xl_charts_files			charts_files_;
+	xl_pivot_cache_files	pivot_cache_files_;
+	xl_pivot_table_files	pivot_table_files_;
     
 	element_ptr		theme_;
     element_ptr		workbook_;
@@ -183,10 +247,9 @@ private:
 	element_ptr		drawings_;
 	element_ptr		vml_drawings_;
 	element_ptr		comments_;
-
+	element_ptr		connections_;
 };
 
-//  xlsx_document
 class xlsx_document : public document
 {
 public:

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.cpp

@@ -0,0 +1,240 @@
+/*
+ * (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 "xlsx_pivots_context.h"
+
+#include <boost/make_shared.hpp>
+#include <cpdoccore/xml/simple_xml_writer.h>
+
+namespace cpdoccore {
+namespace oox {
+
+class xlsx_pivots_context::Impl
+{
+public:
+	struct _pivot_cache
+	{	
+		std::wstring  definitionsData_;
+		std::wstring  recordsData_;
+	};
+	struct _pivot_view
+	{	
+		std::wstring	data_;
+		int				indexCache_;
+	};
+	struct _pivot_field
+	{	
+		std::wstring	view_;
+		std::wstring	cache_;
+	};
+	Impl() {}
+    
+	std::vector<_pivot_cache>	caches_;
+	std::vector<_pivot_view>	views_;
+	std::wstring				connections_;
+
+	std::vector<_pivot_field>	fields_;
+	
+	std::wstringstream			view_;
+	std::wstringstream			cache_;
+};
+
+xlsx_pivots_context::xlsx_pivots_context() : impl_(new xlsx_pivots_context::Impl())
+{
+}
+
+void xlsx_pivots_context::add_cache(std::wstring definitions, std::wstring records)
+{
+	Impl::_pivot_cache c = {definitions, records};
+	impl_->caches_.push_back(c);
+}
+
+int xlsx_pivots_context::get_cache_count()
+{
+	return (int)impl_->caches_.size();
+}
+bool xlsx_pivots_context::is_connections()
+{
+	return !impl_->connections_.empty();
+}
+void xlsx_pivots_context::dump_rels_cache(int index, rels & Rels)
+{
+	if (impl_->caches_[index].recordsData_.empty() == false)
+	{
+		Rels.add(relationship(L"rId1",							
+						L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheRecords",
+						L"pivotCacheRecords" + std::to_wstring(index + 1) + L".xml", L""));
+	}
+}
+void xlsx_pivots_context::dump_rels_view(int index, rels & Rels)
+{
+	if (impl_->views_[index].indexCache_ >= 0)
+	{
+		Rels.add(relationship(L"rId1",							
+						L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition",
+						L"../pivotCache/pivotCacheDefinition" + std::to_wstring(impl_->views_[index].indexCache_ + 1) + L".xml", L""));
+	}
+}
+void xlsx_pivots_context::write_cache_definitions_to(int index, std::wostream & strm)
+{
+	strm << impl_->caches_[index].definitionsData_;
+}
+void xlsx_pivots_context::write_connections_to(std::wostream & strm)
+{
+	CP_XML_WRITER(strm)    
+    {
+		CP_XML_NODE(L"connections")
+		{
+            CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+
+			CP_XML_STREAM() << impl_->connections_;
+		}
+	}
+}
+
+void xlsx_pivots_context::write_cache_records_to(int index, std::wostream & strm)
+{
+	strm << impl_->caches_[index].recordsData_;
+}
+void xlsx_pivots_context::write_table_view_to(int index, std::wostream & strm)
+{
+	strm << impl_->views_[index].data_;
+}
+
+void xlsx_pivots_context::start_table()
+{
+	impl_->fields_.clear();
+}
+
+int xlsx_pivots_context::end_table()
+{
+	std::wstringstream strm;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"pivotTableDefinition")
+		{ 
+			CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
+			
+			//CP_XML_ATTR(L"name",				view->stTable.value()); 
+			//CP_XML_ATTR(L"cacheId",				view->iCache); 
+			//CP_XML_ATTR(L"dataOnRows",			view->sxaxis4Data.bRw); 
+			//CP_XML_ATTR(L"applyNumberFormats",	view->fAtrNum);
+			//CP_XML_ATTR(L"applyBorderFormats",	view->fAtrBdr); 
+			//CP_XML_ATTR(L"applyFontFormats",		view->fAtrFnt);
+			//CP_XML_ATTR(L"applyPatternFormats",	view->fAtrPat);
+			//CP_XML_ATTR(L"applyAlignmentFormats",	view->fAtrAlc);
+			//CP_XML_ATTR(L"applyWidthHeightFormats",	view->fAtrProc);
+			//if (!view->stData.value().empty())
+			//{
+			//	CP_XML_ATTR(L"dataCaption",			view->stData.value()); 
+			//}
+			//CP_XML_ATTR(L"asteriskTotals",			1); 
+			//CP_XML_ATTR(L"showMemberPropertyTips",	0);
+			//CP_XML_ATTR(L"useAutoFormatting",		view->fAutoFormat); 
+			//CP_XML_ATTR(L"autoFormatId",			view->itblAutoFmt);
+			CP_XML_ATTR(L"itemPrintTitles",			1);  
+			CP_XML_ATTR(L"indent",					0); 
+			CP_XML_ATTR(L"compact",					0);  
+			CP_XML_ATTR(L"compactData",				0); 
+			CP_XML_ATTR(L"gridDropZones",			1); 	
+
+			CP_XML_NODE(L"location")
+			{
+				//CP_XML_ATTR(L"ref", view->ref.toString());
+				//CP_XML_ATTR(L"firstHeaderRow", view->rwFirstHead - view->ref.rowFirst );
+				//CP_XML_ATTR(L"firstDataRow", view->rwFirstData - view->ref.rowFirst);
+				//CP_XML_ATTR(L"firstDataCol", view->colFirstData - view->ref.columnFirst); 
+				CP_XML_ATTR(L"rowPageCount", 1); 
+				CP_XML_ATTR(L"colPageCount", 1);
+			}
+			CP_XML_NODE(L"pivotFields")
+			{
+				CP_XML_ATTR(L"count", impl_->fields_.size());
+				for (size_t i = 0; i < impl_->fields_.size(); i++)
+				{
+					impl_->fields_[i].view_;
+				}		
+			}
+		}
+	}
+	Impl::_pivot_view v = {strm.str(), impl_->views_.size() + 1};
+	impl_->views_.push_back(v);
+
+	return impl_->views_.size();
+}
+
+void xlsx_pivots_context::start_field()
+{
+}
+void xlsx_pivots_context::end_field()
+{
+	std::wstringstream strm;
+	CP_XML_WRITER(strm)
+	{
+		CP_XML_NODE(L"pivotField")
+		{ 
+
+		}
+	}	
+	Impl::_pivot_field f = {strm.str(), L""};
+	
+	impl_->fields_.push_back(f);
+}
+
+void xlsx_pivots_context::add_connections(std::wstring connections)
+{
+	if (connections.empty()) return;
+
+	impl_->connections_ = connections;
+}
+
+int xlsx_pivots_context::get_view_count()
+{
+	return (int)impl_->views_.size();
+}
+
+xlsx_pivots_context::~xlsx_pivots_context()
+{
+}
+
+std::wostream & xlsx_pivots_context::stream_view()
+{
+	return impl_->view_;
+}
+
+std::wostream & xlsx_pivots_context::stream_cache()
+{
+	return impl_->cache_;
+}
+
+
+}
+}

ASCOfficeOdfFile/src/docx/xlsx_pivots_context.h

@@ -0,0 +1,83 @@
+/*
+ * (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 "oox_package.h"
+#include <cpdoccore/CPScopedPtr.h>
+#include <cpdoccore/CPOptional.h>
+
+namespace cpdoccore {
+namespace oox {
+
+class xlsx_pivot_cache_context;
+typedef _CP_PTR(xlsx_pivot_cache_context) xlsx_pivot_cache_context_ptr;
+
+class xlsx_pivots_context
+{
+public:
+    xlsx_pivots_context();
+    ~xlsx_pivots_context();
+
+	void start_table();
+	int end_table();
+
+	void start_field();
+	void end_field();
+
+	//int add_view(int indexCache);
+	int get_view_count();
+
+	void add_cache(std::wstring definitions, std::wstring records);
+	int get_cache_count();
+
+	void write_cache_definitions_to	(int index, std::wostream & strm);
+	void write_cache_records_to		(int index, std::wostream & strm);
+	void write_connections_to		(std::wostream & strm);
+
+	void write_table_view_to		(int index, std::wostream & strm);
+
+	void dump_rels_cache(int index, rels & Rels);
+	void dump_rels_view	(int index, rels & Rels);
+
+	void add_connections(std::wstring connections);
+	bool is_connections();
+
+	std::wostream & stream_view();
+	std::wostream & stream_cache();
+
+private:
+    class Impl;
+    _CP_PTR(Impl) impl_;
+              
+};
+
+}
+}

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.cpp

@@ -152,8 +152,7 @@ void xlsx_conversion_context::end_document()
             content->add_rel(relationship(dId, kType, dName));
         }
 //////////////////////////////////////////////////////////////////////////////////////////////////
-        content->add_rels(sheet->hyperlinks_rels());
-        content->add_rels(sheet->ole_objects_rels());
+        content->add_rels(sheet->sheet_rels());
 /////////////////////////////////////////////////////////////////////////////////////////////////
 		const std::pair<std::wstring, std::wstring> p2 = sheet->get_comments_link();        
 		if (!p2.first.empty())
@@ -232,6 +231,54 @@ void xlsx_conversion_context::end_document()
                 }
 
                 get_xlsx_defined_names().xlsx_serialize(CP_XML_STREAM());
+
+				int pivot_cache_count = xlsx_pivots_context_.get_cache_count();
+				if (pivot_cache_count > 0)
+				{
+					CP_XML_NODE(L"pivotCaches")
+					{
+						for (int i = 0; i < pivot_cache_count; i++)
+						{
+							std::wstring				rId		= L"pcId" + std::to_wstring(i+1);
+							static const std::wstring	sType	= L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotCacheDefinition"; 
+							const std::wstring			sName	= std::wstring(L"../pivotCache/pivotCacheDefinition" + std::to_wstring(i + 1) + L".xml");
+							
+							package::pivot_cache_content_ptr content = package::pivot_cache_content::create();
+							
+							CP_XML_NODE(L"pivotCache")
+							{
+								CP_XML_ATTR(L"cacheId", std::to_wstring(i));
+								CP_XML_ATTR(L"r:id", rId);
+							}
+
+							xlsx_pivots_context_.dump_rels_cache(i, content->get_rels());
+							xlsx_pivots_context_.write_cache_definitions_to(i, content->definitions());
+							xlsx_pivots_context_.write_cache_records_to(i, content->records());
+
+							output_document_->get_xl_files().add_pivot_cache(content);	
+						}
+					}
+				}
+				int pivot_view_count = xlsx_pivots_context_.get_view_count();
+				if (pivot_view_count > 0)
+				{
+					for (int i = 0; i < pivot_view_count; i++)
+					{
+						package::pivot_table_content_ptr content = package::pivot_table_content::create();
+
+						xlsx_pivots_context_.dump_rels_view(i, content->get_rels());
+						xlsx_pivots_context_.write_table_view_to(i, content->content());
+
+						output_document_->get_xl_files().add_pivot_table(content);	
+					}
+				}
+				if (xlsx_pivots_context_.is_connections())
+				{
+					std::wstringstream strm;
+					xlsx_pivots_context_.write_connections_to(strm);
+
+					output_document_->get_xl_files().set_connections( package::simple_element::create(L"connections.xml", strm.str()) );
+				}
             }
         }
 
@@ -381,9 +428,8 @@ void xlsx_conversion_context::end_table()
 	get_table_context().serialize_hyperlinks			(current_sheet().hyperlinks());
     get_table_context().serialize_ole_objects			(current_sheet().ole_objects());
 	
-	get_table_context().dump_rels_hyperlinks			(current_sheet().hyperlinks_rels());
-	get_table_context().dump_rels_ole_objects			(current_sheet().ole_objects_rels());
-
+	get_table_context().dump_rels_hyperlinks			(current_sheet().sheet_rels());
+	get_table_context().dump_rels_ole_objects			(current_sheet().sheet_rels());
 
 	if (!get_drawing_context().empty())
     {

ASCOfficeOdfFile/src/docx/xlsxconversioncontext.h

@@ -48,6 +48,7 @@
 #include "xlsx_comments_context.h"
 #include "xlsx_defined_names.h"
 #include "xlsx_table_metrics.h"
+#include "xlsx_pivots_context.h"
 #include "oox_chart_context.h"
 
 #include "mediaitems.h"
@@ -168,6 +169,7 @@ public:
     num_format_context          & get_num_format_context()		 { return num_format_context_; }
     size_t                        get_default_cell_style() const { return default_style_; }
     xlsx_defined_names          & get_xlsx_defined_names()		 { return xlsx_defined_names_; }
+	xlsx_pivots_context			& get_pivots_context()			 { return xlsx_pivots_context_;}
     xlsx_table_metrics          & get_table_metrics();
     xlsx_drawing_context        & get_drawing_context();
     xlsx_drawing_context_handle & get_drawing_context_handle();	
@@ -202,6 +204,7 @@ private:
     xlsx_table_context              xlsx_table_context_;
     xlsx_text_context               xlsx_text_context_;
 	math_context					math_context_;
+	xlsx_pivots_context				xlsx_pivots_context_;
     xlsx_drawing_context_handle     xlsx_drawing_context_handle_;
     xlsx_comments_context_handle    xlsx_comments_context_handle_;
 };

ASCOfficeOdfFile/src/odf/chart_build_oox.cpp

@@ -837,7 +837,7 @@ void process_build_object::visit(table_table_rows& val)
 }
 void process_build_object::visit(const table_table_row & val)
 {       
-    unsigned int repeated = val.table_table_row_attlist_.table_number_rows_repeated_;
+    unsigned int repeated = val.attlist_.table_number_rows_repeated_;
     ACCEPT_ALL_CONTENT_CONST(val.content_);
 	visit_rows(repeated);
 }
@@ -891,13 +891,13 @@ void process_build_object::visit(const table_rows_no_group& val)
 }
 void process_build_object::visit(const table_table_cell& val)
 {
-	const table_table_cell_attlist & attlist = val.table_table_cell_attlist_;
+	const table_table_cell_attlist & attlist = val.attlist_;
 
-    unsigned int repeated = val.table_table_cell_attlist_.table_number_columns_repeated_;
+    unsigned int repeated = val.attlist_.table_number_columns_repeated_;
   
 	std::wstringstream  wstream_temp;	
    
-	val.table_table_cell_content_.text_to_stream(wstream_temp);
+	val.content_.text_to_stream(wstream_temp);
 	std::wstring cell_cash = wstream_temp.str();
 
 	std::wstring cell_val;
@@ -920,7 +920,7 @@ void process_build_object::visit(const table_table_cell& val)
 }
 void process_build_object::visit(const table_covered_table_cell& val)
 {
-    unsigned int repeated = val.table_table_cell_attlist_.table_number_columns_repeated_;
+    unsigned int repeated = val.attlist_.table_number_columns_repeated_;
 
 	if ( repeated <2) 
 		return;

ASCOfficeOdfFile/src/odf/datatypes/membertype.cpp

@@ -0,0 +1,74 @@
+/*
+ * (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 "membertype.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const member_type & _Val)
+{
+    switch(_Val.get_type())
+    {
+    case member_type::named:
+        _Wostream << L"named";
+        break;
+    case member_type::next:
+        _Wostream << L"next";
+        break;
+    case member_type::previous:
+        _Wostream << L"previous";
+        break;
+    }
+    return _Wostream;    
+}
+
+member_type member_type::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"named")
+        return member_type( named );
+    else if (tmp == L"next")
+        return member_type( next );
+    else if (tmp == L"previous")
+        return member_type( previous );
+    else
+    {
+        return member_type( named );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/membertype.h

@@ -0,0 +1,73 @@
+/*
+ * (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 member_type
+{
+public:
+    enum type
+    {
+        named,
+        next,
+        previous
+    };
+    member_type() {}
+
+    member_type(type _Type) : type_(_Type)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+    
+    static member_type parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+
+std::wostream & operator << (std::wostream & _Wostream, const member_type & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::member_type);
+
+}

ASCOfficeOdfFile/src/odf/datatypes/tablealign.cpp

@@ -74,7 +74,6 @@ table_align table_align::parse(const std::wstring & Str)
         return table_align( Margins );
     else
     {
-        BOOST_THROW_EXCEPTION( errors::invalid_attribute() );        
         return table_align( Left );
     }
 }

ASCOfficeOdfFile/src/odf/datatypes/tablealign.h

@@ -29,12 +29,8 @@
  * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
  *
  */
-#ifndef _CPDOCCORE_ODF_TABLEALIGN_H_
-#define _CPDOCCORE_ODF_TABLEALIGN_H_
 
-#ifdef _MSC_VER
 #pragma once
-#endif
 
 #include <iosfwd>
 #include <string>
@@ -78,5 +74,3 @@ std::wostream & operator << (std::wostream & _Wostream, const table_align & _Val
 APPLY_PARSE_XML_ATTRIBUTES(odf_types::table_align);
 
 }
-
-#endif

ASCOfficeOdfFile/src/odf/datatypes/tablefunction.cpp

@@ -0,0 +1,121 @@
+/*
+ * (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 "tablefunction.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const table_function & _Val)
+{
+    switch(_Val.get_type())
+    {
+    case table_function::Auto:
+        _Wostream << L"auto";
+        break;
+    case table_function::average:
+        _Wostream << L"average";
+        break;
+    case table_function::count:
+        _Wostream << L"count";
+        break;
+    case table_function::countnums:
+        _Wostream << L"countnums";
+        break;
+    case table_function::max:
+        _Wostream << L"max";
+        break;
+    case table_function::min:
+        _Wostream << L"min";
+        break;
+    case table_function::product:
+        _Wostream << L"product";
+        break;
+    case table_function::stdev:
+        _Wostream << L"stdev";
+        break;
+    case table_function::stdevp:
+        _Wostream << L"stdevp";
+        break;
+    case table_function::sum:
+        _Wostream << L"sum";
+        break; 
+	case table_function::var:
+        _Wostream << L"var";
+        break;   
+	case table_function::varp:
+        _Wostream << L"varp";
+        break;   
+	default:
+        _Wostream << _Val.get_string();
+        break;
+    }
+    return _Wostream;    
+}
+table_function table_function::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"auto")
+        return table_function( Auto );
+    else if (tmp == L"average")
+        return table_function( average );
+    else if (tmp == L"count")
+        return table_function( count );
+    else if (tmp == L"countnums")
+        return table_function( countnums );
+    else if (tmp == L"max")
+        return table_function( max );
+    else if (tmp == L"min")
+        return table_function( min );
+    else if (tmp == L"product")
+        return table_function( product );
+    else if (tmp == L"stdev")
+        return table_function( stdev );
+    else if (tmp == L"stdevp")
+        return table_function( stdevp );
+    else if (tmp == L"sum")
+        return table_function( sum );
+    else if (tmp == L"var")
+        return table_function( var );
+    else if (tmp == L"varp")
+        return table_function( varp );
+	else
+    {
+        return table_function( String, Str );
+    }
+}
+} 
+}

ASCOfficeOdfFile/src/odf/datatypes/tablefunction.h

@@ -0,0 +1,88 @@
+/*
+ * (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 table_function
+{
+public:
+    enum type
+    {
+        Auto,
+        average,
+        count,
+        countnums,
+		max,
+		min,
+		product,
+		stdev,
+		stdevp,
+		sum,
+		var,
+		varp,
+		String
+
+    };
+    table_function() {}
+
+	table_function(type _Type, std::wstring _string = L"") : type_(_Type), string_(_string)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+	std::wstring get_string() const
+    {
+        return string_;
+    };    
+    static table_function parse(const std::wstring & Str);
+
+private:
+    type			type_;
+	std::wstring	string_;
+
+};
+
+std::wostream & operator << (std::wostream & _Wostream, const table_function & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::table_function);
+
+}

ASCOfficeOdfFile/src/odf/datatypes/tableorder.cpp

@@ -0,0 +1,72 @@
+/*
+ * (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 "tableorder.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const table_order & _Val)
+{
+    switch(_Val.get_type())
+    {
+    case table_order::ascending:
+        _Wostream << L"ascending";
+        break;
+    case table_order::descending:
+        _Wostream << L"descending";
+        break;
+	default:
+        _Wostream << L"ascending";
+        break;
+    }
+    return _Wostream;    
+}
+
+table_order table_order::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"ascending")
+        return table_order( ascending);
+    else if (tmp == L"descending")
+        return table_order( descending );
+    else
+    {
+        return table_order( ascending );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/tableorder.h

@@ -0,0 +1,73 @@
+/*
+ * (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 table_order
+{
+public:
+    enum type
+    {
+        ascending,
+        descending
+    };
+
+    table_order() {}
+
+    table_order(type _Type) : type_(_Type)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+    
+    static table_order parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+
+std::wostream & operator << (std::wostream & _Wostream, const table_order & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::table_order);
+
+}

ASCOfficeOdfFile/src/odf/datatypes/tableorientation.cpp

@@ -0,0 +1,82 @@
+/*
+ * (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 "tableorientation.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const table_orientation & _Val)
+{
+    switch(_Val.get_type())
+    {
+    case table_orientation::column:
+        _Wostream << L"column";
+        break;
+    case table_orientation::data:
+        _Wostream << L"data";
+        break;
+    case table_orientation::hidden:
+        _Wostream << L"hidden";
+        break;
+    case table_orientation::page:
+        _Wostream << L"page";
+        break;
+    default:
+        _Wostream << L"row";
+        break;
+    }
+    return _Wostream;    
+}
+
+table_orientation table_orientation::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"column")
+        return table_orientation( column );
+    else if (tmp == L"data")
+        return table_orientation( data );
+    else if (tmp == L"hidden")
+        return table_orientation( hidden );
+    else if (tmp == L"page")
+        return table_orientation( page );
+    else
+    {
+        return table_orientation( row );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/tableorientation.h

@@ -0,0 +1,76 @@
+/*
+ * (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 table_orientation
+{
+public:
+    enum type
+    {
+        column,
+        data,
+        hidden,
+        page,
+		row
+    };
+
+    table_orientation() {}
+
+    table_orientation(type _Type) : type_(_Type)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+    
+    static table_orientation parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+
+std::wostream & operator << (std::wostream & _Wostream, const table_orientation & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::table_orientation);
+
+}

ASCOfficeOdfFile/src/odf/datatypes/tabletype.cpp

@@ -0,0 +1,102 @@
+/*
+ * (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 "tabletype.h"
+
+#include <boost/algorithm/string.hpp>
+#include <ostream>
+
+namespace cpdoccore { namespace odf_types { 
+
+std::wostream & operator << (std::wostream & _Wostream, const table_type & _Val)
+{
+    switch(_Val.get_type())
+    {
+    case table_type::none:
+        _Wostream << L"none";
+        break;
+    case table_type::member_difference:
+        _Wostream << L"member-difference";
+        break;
+    case table_type::member_percentage:
+        _Wostream << L"member-percentage";
+        break;
+    case table_type::member_percentage_difference:
+        _Wostream << L"member-percentage-difference";
+        break;
+    case table_type::running_total:
+        _Wostream << L"running-total";
+        break;
+    case table_type::row_percentage:
+        _Wostream << L"row-percentage";
+        break;
+    case table_type::column_percentage:
+        _Wostream << L"column-percentage";
+        break;
+    case table_type::total_percentage:
+        _Wostream << L"total-percentage";
+        break;
+    default:
+        _Wostream << L"index";
+        break;
+    }
+    return _Wostream;    
+}
+
+table_type table_type::parse(const std::wstring & Str)
+{
+    std::wstring tmp = Str;
+    boost::algorithm::to_lower(tmp);
+
+    if (tmp == L"none")
+        return table_type( none );
+    else if (tmp == L"member-difference")
+        return table_type( member_difference );
+    else if (tmp == L"member-percentage")
+        return table_type( member_percentage );
+    else if (tmp == L"member-percentage-difference")
+        return table_type( member_percentage_difference );
+    else if (tmp == L"running-total")
+        return table_type( running_total );
+    else if (tmp == L"row-percentage")
+        return table_type( row_percentage );
+    else if (tmp == L"column-percentage")
+        return table_type( column_percentage );
+	else if (tmp == L"total-percentage")
+        return table_type( total_percentage );
+	else
+    {
+        return table_type( index );
+    }
+}
+
+} }

ASCOfficeOdfFile/src/odf/datatypes/tabletype.h

@@ -0,0 +1,80 @@
+/*
+ * (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 table_type
+{
+public:
+    enum type
+    {
+        none,
+        member_difference,
+        member_percentage,
+        member_percentage_difference,
+		running_total,
+		row_percentage,
+		column_percentage,
+		total_percentage,
+		index
+    };
+
+    table_type() {}
+
+    table_type(type _Type) : type_(_Type)
+    {}
+
+    type get_type() const
+    {
+        return type_;
+    };
+    
+    static table_type parse(const std::wstring & Str);
+
+private:
+    type type_;
+
+};
+
+std::wostream & operator << (std::wostream & _Wostream, const table_type & _Val);
+
+} 
+
+APPLY_PARSE_XML_ATTRIBUTES(odf_types::table_type);
+
+}

ASCOfficeOdfFile/src/odf/office_elements_type.h

@@ -206,6 +206,12 @@ enum ElementType
 	typeTableSort,
 	typeTableSortBy,
 
+	typeTableFilter,
+	typeTableFilterAnd,
+	typeTableFilterOr,
+	typeTableFilterCondition,
+	typeTableFilterSetItem,
+
 	typeTableTable,
     typeTableTableColumn,
     typeTableTableColumns,
@@ -223,11 +229,23 @@ enum ElementType
 	typeTableDataPilotTables,
 	typeTableDataPilotTable,
 	typeTableDataPilotField,
+	typeTableDataPilotFieldReference,
 	typeTableDatabaseSourceTable,
 	typeTableDatabaseSourceQuery,
 	typeTableDatabaseSourceSql,
 	typeTableSourceCellRange,
 	typeTableSourceService,
+	typeTableDataPilotSubtotals,
+	typeTableDataPilotSubtotal,
+	typeTableDataPilotGroupMember,
+	typeTableDataPilotMember,
+	typeTableDataPilotMembers,
+	typeTableDataPilotGroup,
+	typeTableDataPilotGroups,
+	typeTableDataPilotLevel,
+	typeTableDataSortInfo,
+	typeTableDataDisplayInfo,
+	typeTableDataLayoutInfo,
         
     typeOfficeBody,
     typeOfficeText,

ASCOfficeOdfFile/src/odf/office_spreadsheet.cpp

@@ -48,26 +48,25 @@ const wchar_t * office_spreadsheet::name = L"spreadsheet";
 void office_spreadsheet::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
 	if CP_CHECK_NAME(L"table", L"database-ranges")
+	{
+		CP_CREATE_ELEMENT(database_ranges_);
+	}
+	else if CP_CHECK_NAME(L"table", L"named-expressions")
     {
-        CP_CREATE_ELEMENT(table_database_ranges_);    
+        CP_CREATE_ELEMENT(named_expressions_);    
     }
 	else if CP_CHECK_NAME(L"table", L"data-pilot-tables")
 	{
-		CP_CREATE_ELEMENT(table_data_pilot_tables_);
+		CP_CREATE_ELEMENT(data_pilot_tables_);
+	}
+	else if CP_CHECK_NAME(L"table", L"tracked-changes")
+	{
+		CP_CREATE_ELEMENT(tracked_changes_);
 	}
 	else
 		CP_CREATE_ELEMENT(content_);
 }
 
-void office_spreadsheet::add_text(const std::wstring & Text)
-{
-    // TODO : error
-}
-
-void office_spreadsheet::add_attributes( const xml::attributes_wc_ptr & Attributes )
-{
-}
-
 void office_spreadsheet::docx_convert(oox::docx_conversion_context & Context)
 {
     Context.start_office_text();
@@ -81,21 +80,23 @@ void office_spreadsheet::docx_convert(oox::docx_conversion_context & Context)
 void office_spreadsheet::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
     Context.start_office_spreadsheet(this);
-    _CP_LOG << L"[info][xlsx] process spreadsheet (" << content_.size() << L" elmements)" << std::endl;
+    _CP_LOG << L"[info][xlsx] process spreadsheet (" << content_.size() << L" tables)" << std::endl;
    
- 	for (size_t i = 0; i < table_database_ranges_.size(); i++)
-	{
-        table_database_ranges_[i]->xlsx_convert(Context);
-    }
+	if (named_expressions_)
+		named_expressions_->xlsx_convert(Context);
+       
+	if (database_ranges_)
+		database_ranges_->xlsx_convert(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();
+        
+	if (data_pilot_tables_)
+		data_pilot_tables_->xlsx_convert(Context);
+
+	Context.end_office_spreadsheet();
 }
 
 }

ASCOfficeOdfFile/src/odf/office_spreadsheet.h

@@ -41,7 +41,6 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-//  office:spreadsheet
 class office_spreadsheet : public office_element_impl<office_spreadsheet>
 {
 public:
@@ -55,27 +54,29 @@ public:
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
 private:
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	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:
-    //  TODO: office-text-content-prelude:
-    //  TODO: office-forms
-    //  TODO: text-decls
-    //  TODO: table-decls
+	office_element_ptr			named_expressions_;
+	office_element_ptr			database_ranges_; 
+	office_element_ptr			data_pilot_tables_;
+	office_element_ptr			tracked_changes_;
 
-	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_;
-    // TODO: text-page-sequence
-    // TODO: office-text-content-epilogue:
-    //  TODO: table-functions
-
+ 	
+	// table:calculation-settings
+	// table:consolidation
+	// table:content-validations
+	// table:dde-links
+	// table:label-ranges
+	
+	// text:alphabetical-index-auto-mark-file
+	// text:ddeconnection-decls
+	// text:sequence-decls
+	// text:user-fielddecls
+	// text:variable-decls
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(office_spreadsheet);
 
 }

ASCOfficeOdfFile/src/odf/search_table_cell.cpp

@@ -201,8 +201,8 @@ public:
 
     virtual void visit(const table_table_row& val)
     {       
-        unsigned int repeated = val.table_table_row_attlist_.table_number_rows_repeated_;
-        std::wstring defaultCellStyle = val.table_table_row_attlist_.table_default_cell_style_name_.get_value_or(L"");
+        unsigned int repeated = val.attlist_.table_number_rows_repeated_;
+        std::wstring defaultCellStyle = val.attlist_.table_default_cell_style_name_.get_value_or(L"");
 
         if (visit_rows(repeated, defaultCellStyle))
         {
@@ -212,7 +212,7 @@ public:
 
     virtual void visit(const table_table_cell& val)
     {
-        unsigned int repeated = val.table_table_cell_attlist_.table_number_columns_repeated_;
+        unsigned int repeated = val.attlist_.table_number_columns_repeated_;
         std::wstring defaultColumnStyle, defaultRowStyle;
         if (visit_cells(repeated, defaultColumnStyle, defaultRowStyle))
         {
@@ -224,7 +224,7 @@ public:
 
     virtual void visit(const table_covered_table_cell& val)
     {
-        unsigned int repeated = val.table_table_cell_attlist_.table_number_columns_repeated_;
+        unsigned int repeated = val.attlist_.table_number_columns_repeated_;
         std::wstring defaultColumnStyle, defaultRowStyle;
     
 		if ( repeated <2) 

ASCOfficeOdfFile/src/odf/table.cpp

@@ -172,7 +172,7 @@ void table_table::add_child_element( xml::sax * Reader, const std::wstring & Ns,
         CP_CREATE_ELEMENT(table_shapes_);    
     }
 	else if (	CP_CHECK_NAME(L"table", L"named-expressions") || 
-				CP_CHECK_NAME(L"table", L"named-range") )
+				CP_CHECK_NAME(L"table", L"named-range") )		//???
 	{
         CP_CREATE_ELEMENT(table_named_);    
 	}
@@ -376,18 +376,18 @@ const wchar_t * table_table_cell::name = L"table-cell";
 
 std::wostream & table_table_cell::text_to_stream(std::wostream & _Wostream) const
 {
-    return table_table_cell_content_.text_to_stream(_Wostream);
+    return content_.text_to_stream(_Wostream);
 }
 
 void table_table_cell::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    table_table_cell_attlist_.add_attributes(Attributes);
-    table_table_cell_attlist_extra_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
+    attlist_extra_.add_attributes(Attributes);
 }
 
 void table_table_cell::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
-    table_table_cell_content_.add_child_element(Reader, Ns, Name, getContext());
+    content_.add_child_element(Reader, Ns, Name, getContext());
 }
 
 void table_table_cell::add_text(const std::wstring & Text)
@@ -402,18 +402,18 @@ const wchar_t * table_covered_table_cell::name = L"covered-table-cell";
 
 std::wostream & table_covered_table_cell::text_to_stream(std::wostream & _Wostream) const
 {
-    return table_table_cell_content_.text_to_stream(_Wostream);
+    return content_.text_to_stream(_Wostream);
 }
 
 void table_covered_table_cell::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    table_table_cell_attlist_.add_attributes(Attributes);
+    attlist_.add_attributes(Attributes);
 }
 
 void table_covered_table_cell::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
 {
 	empty_ = false;
-    table_table_cell_content_.add_child_element(Reader, Ns, Name, getContext());
+    content_.add_child_element(Reader, Ns, Name, getContext());
 }
 
 void table_covered_table_cell::add_text(const std::wstring & Text)
@@ -432,7 +432,7 @@ std::wostream & table_table_row::text_to_stream(std::wostream & _Wostream) const
 
 void table_table_row::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
-    table_table_row_attlist_.add_attributes( Attributes );
+    attlist_.add_attributes( Attributes );
 }
 
 void table_table_row::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -519,6 +519,42 @@ void table_rows::add_child_element( xml::sax * Reader, const std::wstring & Ns,
         not_applicable_element(L"table-rows", Reader, Ns, Name);        
     }
 }
+void table_rows::remove_equals_empty()
+{
+	if (table_table_row_.empty()) return;
+
+	while(true)
+	{
+		size_t i = table_table_row_.size() - 1;
+
+		if (i == 0) break;
+
+		if (table_table_row_[i]->get_type() != typeTableTableRow)
+			break;
+		if (table_table_row_[i-1]->get_type() != typeTableTableRow)
+			break;
+
+		table_table_row *prev = dynamic_cast<table_table_row*>(table_table_row_[i-1].get());
+		table_table_row *next = dynamic_cast<table_table_row*>(table_table_row_[i].get());
+
+		if (prev->content_.size() > 1 || next->content_.size() > 1) break;
+
+		if (prev->attlist_.table_style_name_.get_value_or(L"") != next->attlist_.table_style_name_.get_value_or(L"")) break;
+
+		table_table_cell *prev_cell = dynamic_cast<table_table_cell*>(prev->content_[0].get());
+		table_table_cell *next_cell = dynamic_cast<table_table_cell*>(next->content_[0].get());
+
+		if (!prev_cell || !next_cell) break;
+
+		if (!prev_cell->content_.elements_.empty() || !next_cell->content_.elements_.empty()) break;
+
+		if (prev_cell->attlist_.table_style_name_.get_value_or(L"") != next_cell->attlist_.table_style_name_.get_value_or(L"")) break;
+
+		prev->attlist_.table_number_rows_repeated_ += next->attlist_.table_number_rows_repeated_;
+		table_table_row_.pop_back();
+	}
+}
+
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // table:rows-no-group
@@ -561,7 +597,6 @@ void table_rows_no_group::add_child_element( xml::sax * Reader, const std::wstri
     else
         not_applicable_element(L"table-rows-no-group", Reader, Ns, Name);
 }
-
 // table-rows-and-groups
 //////////////////////////////////////////////////////////////////////////////////////////////////
 

ASCOfficeOdfFile/src/odf/table.h

@@ -51,13 +51,11 @@
 namespace cpdoccore { 
 namespace odf_reader {
 
-// table:table-attlist
 class table_table_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
 	_CP_OPT(bool)			table_is_sub_table_;
     _CP_OPT(std::wstring)	table_name_;
     _CP_OPT(std::wstring)	table_style_name_;
@@ -76,13 +74,11 @@ public:
     friend class table_table;    
 };
 
-// table:table-row-attlist
 class table_table_row_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     unsigned int					table_number_rows_repeated_; // default 1
 	_CP_OPT(std::wstring)			table_style_name_;
     _CP_OPT(std::wstring)			table_default_cell_style_name_;
@@ -90,13 +86,11 @@ public:
 
 };
 
-// table:table-cell-attlist
 class table_table_cell_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     unsigned int				table_number_columns_repeated_; // default 1
     _CP_OPT(std::wstring)		table_style_name_;
     _CP_OPT(std::wstring)		table_content_validation_name_;
@@ -104,18 +98,15 @@ public:
 
     odf_types::common_value_and_type_attlist	common_value_and_type_attlist_;
 
-
     bool table_protect_; // default false
         
 };
 
-// table:table-cell-attlist-extra
 class table_table_cell_attlist_extra
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     unsigned int			table_number_columns_spanned_; // default 1
     unsigned int			table_number_rows_spanned_; // default 1
 
@@ -124,25 +115,21 @@ public:
 
 };
 
-// table-table-source-attlist
 class table_table_source_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     odf_types::table_mode table_mode_; // default CopyAll
     _CP_OPT(std::wstring) table_table_name_;
     
 };
 
-// table:linked-source-attlist
 class table_linked_source_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
     
-public:
     odf_types::common_xlink_attlist common_xlink_attlist_;
 
     _CP_OPT(std::wstring)			table_filter_name_;
@@ -151,7 +138,6 @@ public:
 
 };
 
-//   table:table-source
 class table_table_source : public office_element_impl<table_table_source>
 {
 public:
@@ -172,7 +158,6 @@ private:
 
 CP_REGISTER_OFFICE_ELEMENT2(table_table_source);
 
-// table:columns
 class table_columns
 {
 public:
@@ -182,13 +167,11 @@ public:
     void xlsx_convert(oox::xlsx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context) ;
 
-public:
     office_element_ptr			table_table_columns_;
     office_element_ptr_array	table_table_column_;
     
 };
 
-// table:columns-no-group
 class table_columns_no_group: public office_element
 {
 public:
@@ -204,7 +187,6 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
-public:
     table_columns_no_group();
     void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name, document_context * Context);
 
@@ -214,16 +196,13 @@ public:
 
     static _CP_PTR(table_columns_no_group) create();
     
-public:
     table_columns		table_columns_1_;
     
     bool was_header_;
     office_element_ptr	table_table_header_columns_;
-    table_columns		table_columns_2_;
-    
+    table_columns		table_columns_2_;    
 };
 
-// table:columns-and-groups
 class table_columns_and_groups
 {
 public:
@@ -234,21 +213,18 @@ public:
     void xlsx_convert(oox::xlsx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context);
 
-public:
 
 //    office_element_ptr			table_table_column_group_;
 //    table_columns_no_group		table_columns_no_group_;
-    office_element_ptr_array		content_;
+	office_element_ptr_array		content_;
 
 };
 
-// table:table-column-attlist
 class table_table_column_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-public:
     unsigned int				table_number_columns_repeated_; // default 1
     _CP_OPT(std::wstring)		table_style_name_;
     odf_types::table_visibility	table_visibility_;				// default Visible
@@ -256,7 +232,6 @@ public:
     
 };
 
-// table:table-column
 class table_table_column : public office_element_impl<table_table_column>
 {
 public:
@@ -279,10 +254,8 @@ public:
     table_table_column_attlist	table_table_column_attlist_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_column);
 
-// table:table-columns
 class table_table_columns : public office_element_impl<table_table_columns>
 {
 public:
@@ -304,11 +277,8 @@ public:
     office_element_ptr_array	table_table_column_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_columns);
 
-
-// table:table-header-columns
 class table_table_header_columns : public office_element_impl<table_table_header_columns>
 {
 public:
@@ -331,21 +301,17 @@ public:
     office_element_ptr_array	table_table_column_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_header_columns);
 
-// table:table-column-group-attlist
 class table_table_column_group_attlist
 {
 public:
     void add_attributes( const xml::attributes_wc_ptr & Attributes );
 
-private:
     bool table_display_; // default true
 
 };
 
-// table:table-column-group
 class table_table_column_group : public office_element_impl<table_table_column_group>
 {
 public:
@@ -372,10 +338,8 @@ public:
     table_table_column_group_attlist	table_table_column_group_attlist_;
     table_columns_and_groups			table_columns_and_groups_;
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_column_group);
 
-// table:table-row
 class table_table_row : public office_element_impl<table_table_row>
 {
 public:
@@ -390,7 +354,6 @@ public:
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
     virtual void pptx_convert(oox::pptx_conversion_context & Context) ;
 
-public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
 private:
@@ -398,14 +361,12 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
 public:
-    table_table_row_attlist		table_table_row_attlist_;
+    table_table_row_attlist		attlist_;
     office_element_ptr_array	content_;					// table-table-cell or table-covered-table-cell
     
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_row);
 
-// table:table-cell-content
 class table_table_cell_content
 {
 public:
@@ -417,13 +378,11 @@ public:
     bool	pptx_convert(oox::pptx_conversion_context & Context) ;
 
     office_element_ptr_array	elements_; 
-private:
-    // TODO table-cell-range-source
+
+	// TODO table-cell-range-source
     // TODO table-detective
 };
 
-
-// table:table-cell
 class table_table_cell : public office_element_impl<table_table_cell>
 {
 public:
@@ -440,7 +399,6 @@ public:
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context) ;
     virtual void pptx_convert(oox::pptx_conversion_context & Context) ;
 
-public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
 private:
@@ -451,15 +409,14 @@ private:
 public:
 	bool last_cell_;
 
-    table_table_cell_attlist		table_table_cell_attlist_;
-    table_table_cell_attlist_extra	table_table_cell_attlist_extra_;
-    table_table_cell_content		table_table_cell_content_;
+    table_table_cell_attlist		attlist_;
+    table_table_cell_attlist_extra	attlist_extra_;
+    table_table_cell_content		content_;
 
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_table_cell);
 
-// table:covered-table-cell
 class table_covered_table_cell : public office_element_impl<table_covered_table_cell>
 {
 public:
@@ -476,7 +433,6 @@ public:
     virtual void pptx_convert(oox::pptx_conversion_context & Context) ;
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context) ;
 
-public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
 private:
@@ -489,14 +445,13 @@ public:
 	bool last_cell_;
 	bool empty_;
 
-    table_table_cell_attlist	table_table_cell_attlist_;
-    table_table_cell_content	table_table_cell_content_;
+    table_table_cell_attlist	attlist_;
+    table_table_cell_content	content_;
 
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_covered_table_cell);
 
-// table:table-rows
 class table_table_rows : public office_element_impl<table_table_rows>
 {
 public:
@@ -514,7 +469,6 @@ public:
 	table_table_rows() 
 	{
     }
-public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
 private:
@@ -525,10 +479,8 @@ public:
     office_element_ptr_array	table_table_row_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_rows);
 
-// table:table-header-rows
 class table_table_header_rows : public office_element_impl<table_table_header_rows>
 {
 public:
@@ -543,7 +495,6 @@ public:
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context) ;
     virtual void pptx_convert(oox::pptx_conversion_context & Context) ;
 
-public:
     virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
 
 private:
@@ -555,10 +506,8 @@ public:
     office_element_ptr_array table_table_row_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_header_rows);
 
-// table:rows
 class table_rows
 {
 public:
@@ -569,13 +518,12 @@ public:
     void xlsx_convert(oox::xlsx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context) ;
 
-public:
     office_element_ptr			table_table_rows_;
     office_element_ptr_array	table_table_row_;
 
+	void remove_equals_empty();
 };
 
-// table:rows-no-group
 class table_rows_no_group : public office_element
 {
 public:
@@ -593,8 +541,8 @@ public:
 
     CPDOCCORE_DEFINE_VISITABLE();
 
-public:
     table_rows_no_group();
+
     std::wostream & text_to_stream(std::wostream & _Wostream) const;
     void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name, document_context * Context);
   
@@ -602,7 +550,6 @@ public:
     void xlsx_convert(oox::xlsx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context) ;
    
-public:
     bool was_header_;
 
     table_rows			table_rows_1_;    
@@ -611,21 +558,18 @@ public:
     
 };
 
-// table:rows-and-groups
 class table_rows_and_groups
 {
 public:
     table_rows_and_groups();
     std::wostream & text_to_stream(std::wostream & _Wostream) const;
-    void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name, document_context * Context);
+    
+	void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name, document_context * Context);
   
 	void docx_convert(oox::docx_conversion_context & Context);
     void xlsx_convert(oox::xlsx_conversion_context & Context);
     void pptx_convert(oox::pptx_conversion_context & Context);
 
-	int get_count(){return content_.size();}//временно .. для группировок
-
-public:
     office_element_ptr_array	content_;
     //int type_;
     //office_element_ptr		table_table_row_group_;
@@ -633,7 +577,6 @@ public:
 
 };
 
-// table:table-row-group-attlist
 class table_table_row_group_attlist
 {
 public:
@@ -643,7 +586,6 @@ public:
     
 };
 
-// table:table-row-group
 class table_table_row_group : public office_element_impl<table_table_row_group>
 {
 public:
@@ -669,10 +611,8 @@ public:
     table_rows_and_groups			table_rows_and_groups_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table_row_group);
 
-// table:table
 class table_table : public office_element_impl<table_table>
 {
 public:
@@ -707,10 +647,8 @@ public:
     //table-scenario
     //office-forms
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_table);
 
-// table:shapes
 class table_shapes : public office_element_impl<table_shapes>
 {
 public:
@@ -732,7 +670,6 @@ private:
     office_element_ptr_array content_;
 
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_shapes);
 
 }

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.cpp

@@ -47,10 +47,6 @@ 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_);
@@ -75,21 +71,40 @@ void table_data_pilot_table::add_attributes( const xml::attributes_wc_ptr & Attr
     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-filter-button"		, table_show_filter_button_);
     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_);
+	if (L"table" == Ns && L"data-pilot-field" == Name)
+		CP_CREATE_ELEMENT (fields_);
+	else
+		CP_CREATE_ELEMENT (source_);
+
 }
 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);
-	}
+	if (!source_) return;
+
+	Context.get_pivots_context().start_table();
+
+	source_->xlsx_convert(Context);
+
+	for (size_t i = 0; i < fields_.size(); i++)
+	{
+		fields_[i]->xlsx_convert(Context);
+	}	  
+
+	int index_view = Context.get_pivots_context().end_table();
+	
+	if (index_view > 0)
+	{
+		Context.current_sheet().sheet_rels().add(oox::relationship(L"pvId" + std::to_wstring(index_view),
+			L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/pivotTable",
+			L"../pivotTables/pivotTable" + std::to_wstring(index_view) + L".xml"));
+	} 
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_data_pilot_field::ns		= L"table";
@@ -97,6 +112,13 @@ 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 )
 {
+	CP_APPLY_ATTR(L"table:source-field-name"	, table_source_field_name_);
+	CP_APPLY_ATTR(L"table:orientation"			, table_orientation_);
+	CP_APPLY_ATTR(L"table:used-hierarchy"		, table_used_hierarchy_);
+	CP_APPLY_ATTR(L"table:function"				, table_function_);
+	CP_APPLY_ATTR(L"loext:ignore-selected-page"	, loext_ignore_selected_page_);
+	CP_APPLY_ATTR(L"table:selected-page"		, table_selected_page_);
+	CP_APPLY_ATTR(L"table:is-data-layout-field"	, table_is_data_layout_field_);
 }
 
 void table_data_pilot_field::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -105,10 +127,30 @@ void table_data_pilot_field::add_child_element( xml::sax * Reader, const std::ws
 }
 void table_data_pilot_field::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-    for (size_t i = 0; i < content_.size(); i++)
-    {
+	Context.get_pivots_context().start_field();
+
+	for (size_t i = 0; i < content_.size(); i++)
+	{
 		content_[i]->xlsx_convert(Context);
-	}
+	}			
+
+	Context.get_pivots_context().end_field();
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_field_reference::ns	= L"table";
+const wchar_t * table_data_pilot_field_reference::name	= L"data-pilot-field-reference";
+
+void table_data_pilot_field_reference::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:field-name"		, table_field_name_);
+	CP_APPLY_ATTR(L"table:member-name"		, table_member_name_);
+	CP_APPLY_ATTR(L"table:member-type"		, table_member_type_);
+	CP_APPLY_ATTR(L"table:type"				, table_type_);
+}
+
+void table_data_pilot_field_reference::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 //-------------------------------------------------------------------------------------------------
 const wchar_t * table_database_source_table::ns		= L"table";
@@ -116,18 +158,13 @@ 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 )
 {
+	CP_APPLY_ATTR(L"table:database-name"		, table_database_name_);
+	CP_APPLY_ATTR(L"table:database-table-name"	, table_database_table_name_);
 }
 
-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";
@@ -135,18 +172,14 @@ 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 )
 {
+	CP_APPLY_ATTR(L"table:database-name"	, table_database_name_);
+	CP_APPLY_ATTR(L"table:query-name"		, table_query_name_);	
 }
 
-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";
@@ -154,18 +187,14 @@ 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 )
 {
+	CP_APPLY_ATTR(L"table:database-name"		, table_database_name_);
+	CP_APPLY_ATTR(L"table:parse-sql-statement"	, table_parse_sql_statement_);
+	CP_APPLY_ATTR(L"table:sql-statement"		, table_sql_statement_);
 }
 
-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";
@@ -173,6 +202,7 @@ 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 )
 {
+	CP_APPLY_ATTR(L"table:cellrange-address", table_cellrange_address_);
 }
 
 void table_source_cell_range::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
@@ -192,18 +222,192 @@ const wchar_t * table_source_service::name	= L"source-service";
 
 void table_source_service::add_attributes( const xml::attributes_wc_ptr & Attributes )
 {
+	CP_APPLY_ATTR(L"table:name",		table_name_);
+	CP_APPLY_ATTR(L"table:object-name", table_object_name_);
+	CP_APPLY_ATTR(L"table:password",	table_password_);
+	CP_APPLY_ATTR(L"table:source-name", table_source_name_);
+	CP_APPLY_ATTR(L"table:user-name",	table_user_name_);
 }
 
-void table_source_service::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+void table_source_service::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_level::ns		= L"table";
+const wchar_t * table_data_pilot_level::name	= L"data-pilot-level";
+
+void table_data_pilot_level::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:show-empty-address", table_show_empty_);
+}
+void table_data_pilot_level::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)
+void table_data_pilot_level::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_groups::ns		= L"table";
+const wchar_t * table_data_pilot_groups::name	= L"data-pilot-groups";
+
+void table_data_pilot_groups::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:date-start",			table_date_start_);
+	CP_APPLY_ATTR(L"table:date-end",			table_date_end_);
+	CP_APPLY_ATTR(L"table:start",				table_start);
+	CP_APPLY_ATTR(L"table:end",					table_end_);
+	CP_APPLY_ATTR(L"table:grouped-by",			table_grouped_by_);
+	CP_APPLY_ATTR(L"table:source-field-name",	table_source_field_name_);
+	CP_APPLY_ATTR(L"table:step",				table_step);
+}
+void table_data_pilot_groups::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_groups::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_group::ns		= L"table";
+const wchar_t * table_data_pilot_group::name	= L"data-pilot-group";
+
+void table_data_pilot_group::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:name",	table_name_);
+}
+void table_data_pilot_group::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_group::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_members::ns	= L"table";
+const wchar_t * table_data_pilot_members::name	= L"data-pilot-members";
+
+void table_data_pilot_members::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_members::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_member::ns	= L"table";
+const wchar_t * table_data_pilot_member::name	= L"data-pilot-member";
+
+void table_data_pilot_member::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:display",		table_display_);
+	CP_APPLY_ATTR(L"table:name",		table_name_);
+	CP_APPLY_ATTR(L"table:show-details",table_show_details_);
+}
+
+void table_data_pilot_member::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_group_member::ns	= L"table";
+const wchar_t * table_data_pilot_group_member::name	= L"data-pilot-group-member";
+
+void table_data_pilot_group_member::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:name",	table_name_);
+}
+
+void table_data_pilot_group_member::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_subtotals::ns		= L"table";
+const wchar_t * table_data_pilot_subtotals::name	= L"data-pilot-subtotals";
+
+void table_data_pilot_subtotals::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT (content_);
+}
+void table_data_pilot_subtotals::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_subtotal::ns	= L"table";
+const wchar_t * table_data_pilot_subtotal::name	= L"data-pilot-subtotal";
+
+void table_data_pilot_subtotal::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:function",	table_function_);
+}
+
+void table_data_pilot_subtotal::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_layout_info::ns	= L"table";
+const wchar_t * table_data_pilot_layout_info::name	= L"data-pilot-layout-info";
+
+void table_data_pilot_layout_info::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:add-empty-lines"	, table_add_empty_lines_);
+	CP_APPLY_ATTR(L"table:layout-mode"		, table_layout_mode_);
+}
+void table_data_pilot_layout_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_sort_info::ns		= L"table";
+const wchar_t * table_data_pilot_sort_info::name	= L"data-pilot-sort-info";
+
+void table_data_pilot_sort_info::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:data-field"	, table_data_field_);
+	CP_APPLY_ATTR(L"table:order"		, table_order_);
+	CP_APPLY_ATTR(L"table:sort-mode"	, table_sort_mode_);
+}
+void table_data_pilot_sort_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
+}
+//-------------------------------------------------------------------------------------------------
+const wchar_t * table_data_pilot_display_info::ns	= L"table";
+const wchar_t * table_data_pilot_display_info::name	= L"data-pilot-display-info";
+
+void table_data_pilot_display_info::add_attributes( const xml::attributes_wc_ptr & Attributes )
+{
+	CP_APPLY_ATTR(L"table:data-field"			, table_data_field_);
+	CP_APPLY_ATTR(L"table:display-member-mode"	, table_display_member_mode_);
+	CP_APPLY_ATTR(L"table:enabled"				, table_enabled_);
+	CP_APPLY_ATTR(L"table:member-count"			, table_member_count_);
+}
+void table_data_pilot_display_info::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+
 }
 }
+}

ASCOfficeOdfFile/src/odf/table_data_pilot_tables.h

@@ -41,6 +41,11 @@
 #include "datatypes/common_attlists.h"
 #include "datatypes/bool.h"
 #include "datatypes/grandtotal.h"
+#include "datatypes/membertype.h"
+#include "datatypes/tableorientation.h"
+#include "datatypes/tabletype.h"
+#include "datatypes/tablefunction.h"
+#include "datatypes/tableorder.h"
 
 namespace cpdoccore { 
 namespace odf_reader {
@@ -57,7 +62,7 @@ public:
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
 private:
-    virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
+	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_;
@@ -89,10 +94,11 @@ private:
      _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_filter_button_;
      _CP_OPT(odf_types::Bool)		table_show_target_range_address_;
 	
-	  office_element_ptr_array	content_;
+	office_element_ptr			source_;
+	office_element_ptr_array	fields_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_table);
@@ -113,11 +119,42 @@ 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_OPT(std::wstring)					table_source_field_name_;
+	_CP_OPT(odf_types::table_orientation)	table_orientation_;
+	_CP_OPT(int)							table_used_hierarchy_;
+	_CP_OPT(odf_types::table_function)		table_function_;
+	_CP_OPT(odf_types::Bool)				loext_ignore_selected_page_;
+	_CP_OPT(std::wstring)					table_selected_page_;
+	_CP_OPT(odf_types::Bool)				table_is_data_layout_field_;
+	
+	office_element_ptr_array	content_;  
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_field);
 //-------------------------------------------------------------------------------------
+class table_data_pilot_field_reference : public office_element_impl<table_data_pilot_field_reference>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotFieldReference;
+    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_field_name_;
+	_CP_OPT(std::wstring)			table_member_name_;
+	_CP_OPT(odf_types::member_type)	table_member_type_;	
+	_CP_OPT(odf_types::table_type)	table_type_;		
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_field_reference);
+//-------------------------------------------------------------------------------------
 
 class table_database_source_table : public office_element_impl<table_database_source_table>
 {
@@ -132,9 +169,10 @@ public:
 
 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){}
 
-    office_element_ptr_array content_;  
+	_CP_OPT(std::wstring)	table_database_name_;
+	_CP_OPT(std::wstring)	table_database_table_name_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_source_table);
@@ -153,9 +191,10 @@ public:
 
 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){}
 
-    office_element_ptr_array content_;  
+	_CP_OPT(std::wstring)	table_database_name_;
+	_CP_OPT(std::wstring)	table_query_name_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_source_query);
@@ -174,9 +213,11 @@ public:
 
 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){}
 
-    office_element_ptr_array content_;  
+	_CP_OPT(std::wstring)	table_database_name_;
+	_CP_OPT(odf_types::Bool)table_parse_sql_statement_;
+	_CP_OPT(std::wstring)	table_sql_statement_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_source_sql);
@@ -197,7 +238,8 @@ 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_OPT(std::wstring)		table_cellrange_address_;
+    office_element_ptr_array	content_;  
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_source_cell_range);
@@ -216,12 +258,260 @@ public:
 
 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){}
 
-    office_element_ptr_array content_;  
+	_CP_OPT(std::wstring)		table_name_;
+	_CP_OPT(std::wstring)		table_object_name_;
+	_CP_OPT(std::wstring)		table_password_;
+	_CP_OPT(std::wstring)		table_source_name_;
+	_CP_OPT(std::wstring)		table_user_name_;
+	
 };
-
 CP_REGISTER_OFFICE_ELEMENT2(table_source_service);
 //-------------------------------------------------------------------------------------
+
+class table_data_pilot_level : public office_element_impl<table_data_pilot_level>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotLevel;
+    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(odf_types::Bool)	table_show_empty_;
+    office_element_ptr_array	content_;  
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_level);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_groups : public office_element_impl<table_data_pilot_groups>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotGroups;
+    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_date_end_;
+	_CP_OPT(std::wstring)		table_date_start_;
+	_CP_OPT(std::wstring)		table_start;			//double 18.2 or auto.
+	_CP_OPT(std::wstring)		table_end_;				//double 18.2 or auto.
+	_CP_OPT(std::wstring)		table_grouped_by_;		//seconds, minutes, hours, days, months, quarters or years.
+	_CP_OPT(std::wstring)		table_source_field_name_;
+	_CP_OPT(double)				table_step;
+	
+	office_element_ptr_array	content_;  
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_groups);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_group : public office_element_impl<table_data_pilot_group>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotGroup;
+    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_;
+    office_element_ptr_array	content_;  
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_group);
+
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_members : public office_element_impl<table_data_pilot_members>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotMembers;
+    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_members);
+
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_member : public office_element_impl<table_data_pilot_member>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotMember;
+    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(odf_types::Bool)	table_display_;
+	_CP_OPT(std::wstring)		table_name_;
+	_CP_OPT(odf_types::Bool)	table_show_details_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_member);
+
+//-------------------------------------------------------------------------------------
+class table_data_pilot_group_member : public office_element_impl<table_data_pilot_group_member>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotGroupMember;
+    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_REGISTER_OFFICE_ELEMENT2(table_data_pilot_group_member);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_subtotals : public office_element_impl<table_data_pilot_subtotals>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotSubtotals;
+    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_subtotals);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_subtotal : public office_element_impl<table_data_pilot_subtotal>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataPilotSubtotal;
+    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(odf_types::table_function)	table_function_;
+};
+
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_subtotal);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_layout_info : public office_element_impl<table_data_pilot_layout_info>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataLayoutInfo;
+    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(odf_types::Bool)	table_add_empty_lines_; 
+	_CP_OPT(std::wstring)		table_layout_mode_; //tabular-layout, outlinesubtotals-top or outline-subtotals-bottom.
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_layout_info);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_sort_info : public office_element_impl<table_data_pilot_sort_info>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataSortInfo;
+    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_data_field_;
+	_CP_OPT(odf_types::table_order)	table_order_;
+	_CP_OPT(std::wstring)			table_sort_mode_;			//data, none, manual or name.
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_sort_info);
+//-------------------------------------------------------------------------------------
+
+class table_data_pilot_display_info : public office_element_impl<table_data_pilot_display_info>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type = typeTableDataDisplayInfo;
+    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_data_field_;
+	_CP_OPT(std::wstring)		table_display_member_mode_;	//from-top or from-bottom.
+	_CP_OPT(odf_types::Bool)	table_enabled_;
+	_CP_OPT(unsigned int)		table_member_count_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_data_pilot_display_info);
+//-------------------------------------------------------------------------------------
+
+
 }
 }

ASCOfficeOdfFile/src/odf/table_database_ranges.cpp

@@ -41,11 +41,11 @@
 #include <cpdoccore/odf/odf_document.h>
 
 namespace cpdoccore { 
+
+	using namespace odf_types;
 namespace odf_reader {
 
-
-// table:table-source
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//--------------------------------------------------------------------------------------------------
 const wchar_t * table_database_ranges::ns = L"table";
 const wchar_t * table_database_ranges::name = L"database-ranges";
 
@@ -66,8 +66,7 @@ void table_database_ranges::xlsx_convert(oox::xlsx_conversion_context & Context)
 	}
 
 }
-// table:named-range
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//--------------------------------------------------------------------------------------------------
 const wchar_t * table_database_range::ns = L"table";
 const wchar_t * table_database_range::name = L"database-range";
 
@@ -96,7 +95,7 @@ void table_database_range::xlsx_convert(oox::xlsx_conversion_context & Context)
 		Context.get_table_context().set_database_filter(table_display_filter_buttons_->get());
 
 	if (table_orientation_)
-		Context.get_table_context().set_database_orientation(*table_orientation_ == L"row" ? true : false);
+		Context.get_table_context().set_database_orientation(table_orientation_->get_type() == table_orientation::row ? true : false);
 
 	if (table_contains_header_)
 		Context.get_table_context().set_database_header(table_contains_header_->get());
@@ -109,8 +108,7 @@ void table_database_range::xlsx_convert(oox::xlsx_conversion_context & Context)
 	Context.get_table_context().end_database_range();
 }
 
-// table:sort
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//--------------------------------------------------------------------------------------------------
 const wchar_t * table_sort::ns		= L"table";
 const wchar_t * table_sort::name	= L"sort";
 
@@ -118,25 +116,24 @@ void table_sort::add_child_element( xml::sax * Reader, const std::wstring & Ns,
 {
     if (L"table" == Ns && L"sort-by" == Name)
     {
-        CP_CREATE_ELEMENT(table_sort_by_);
+        CP_CREATE_ELEMENT(content_);
     } 
 }
 
 void table_sort::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	for (size_t i = 0; i < table_sort_by_.size(); i++)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		table_sort_by * sort_by = dynamic_cast<table_sort_by*>(table_sort_by_[i].get());
+		table_sort_by * sort_by = dynamic_cast<table_sort_by*>(content_[i].get());
 
 		int descending = 1;
-		if ((sort_by->table_order_) && (sort_by->table_order_.get() == L"descending"))
+		if ((sort_by->table_order_) && (sort_by->table_order_->get_type() == table_order::descending))
 			descending = 2;
 
 		Context.get_table_context().add_database_sort(sort_by->table_field_number_, descending); 
 	}
 }
-// table:sort-by
-//////////////////////////////////////////////////////////////////////////////////////////////////
+//--------------------------------------------------------------------------------------------------
 const wchar_t * table_sort_by::ns	= L"table";
 const wchar_t * table_sort_by::name	= L"sort-by";
 
@@ -147,6 +144,98 @@ void table_sort_by::add_attributes(xml::attributes_wc_ptr const & Attributes)
 	CP_APPLY_ATTR(L"table:order"		, table_order_);
 
 }
+//--------------------------------------------------------------------------------------------------
+const wchar_t * table_filter::ns	= L"table";
+const wchar_t * table_filter::name	= L"filter";
 
+void table_filter::add_attributes(xml::attributes_wc_ptr const & Attributes)
+{
+	CP_APPLY_ATTR(L"table:condition-source",				table_condition_source_);
+	CP_APPLY_ATTR(L"table:condition-source-range-address",	table_condition_source_range_address_);
+	CP_APPLY_ATTR(L"table:display-duplicates",				table_display_duplicates_);
+	CP_APPLY_ATTR(L"table:target-range-address",			table_target_range_address_);
+}
+
+void table_filter::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT(content_);
+}
+
+void table_filter::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_filter_or::ns		= L"table";
+const wchar_t * table_filter_or::name	= L"filter-or";
+
+void table_filter_or::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT(content_);
+}
+
+void table_filter_or::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_filter_and::ns	= L"table";
+const wchar_t * table_filter_and::name	= L"filter-and";
+
+void table_filter_and::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT(content_);
+}
+
+void table_filter_and::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_filter_condition::ns		= L"table";
+const wchar_t * table_filter_condition::name	= L"filter-condition";
+
+void table_filter_condition::add_attributes(xml::attributes_wc_ptr const & Attributes)
+{
+	CP_APPLY_ATTR(L"table:case-sensitive",	table_case_sensitive_);
+	CP_APPLY_ATTR(L"table:data-type",		table_data_type_);
+	CP_APPLY_ATTR(L"table:field-number",	table_field_number_);
+	CP_APPLY_ATTR(L"table:operator",		table_operator_);
+	CP_APPLY_ATTR(L"table:value",			table_value_);
+}
+
+void table_filter_condition::add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name)
+{
+	CP_CREATE_ELEMENT(content_);
+}
+
+void table_filter_condition::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_filter_set_item::ns	= L"table";
+const wchar_t * table_filter_set_item::name = L"filter-set-item";
+
+void table_filter_set_item::add_attributes(xml::attributes_wc_ptr const & Attributes)
+{
+	CP_APPLY_ATTR(L"table:value",	table_value_);
+}
+
+void table_filter_set_item::xlsx_convert(oox::xlsx_conversion_context & Context)
+{
+}
 }
 }

ASCOfficeOdfFile/src/odf/table_database_ranges.h

@@ -40,14 +40,14 @@
 #include "office_elements_create.h"
 
 #include "datatypes/common_attlists.h"
+#include "datatypes/tableorientation.h"
+#include "datatypes/tableorder.h"
 
 #include "../docx/xlsxconversioncontext.h"
 
 namespace cpdoccore { 
-	using namespace odf_types;
 namespace odf_reader {
 
-//  table:named-expressions
 class table_database_ranges : public office_element_impl<table_database_ranges>
 {
 public:
@@ -68,8 +68,8 @@ public:
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_ranges);
+//-------------------------------------------------------------------------------------------------------------
 
-//  table:named-range
 class table_database_range: public office_element_impl<table_database_range>
 {
 public:
@@ -85,11 +85,11 @@ public:
 
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
-    _CP_OPT(std::wstring)		table_name_;
-    _CP_OPT(std::wstring)		table_target_range_address_;
-	_CP_OPT(Bool)				table_display_filter_buttons_;
-	_CP_OPT(Bool)				table_contains_header_;	
-	_CP_OPT(std::wstring)		table_orientation_;
+    _CP_OPT(std::wstring)					table_name_;
+    _CP_OPT(std::wstring)					table_target_range_address_;
+	_CP_OPT(odf_types::Bool)				table_display_filter_buttons_;
+	_CP_OPT(odf_types::Bool)				table_contains_header_;	
+	_CP_OPT(odf_types::table_orientation)	table_orientation_;
 //table:refresh-delay
 
 	office_element_ptr_array	content_;
@@ -99,8 +99,8 @@ public:
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_database_range);
+//-------------------------------------------------------------------------------------------------------------
 
-//  table:sort
 class table_sort: public office_element_impl<table_sort>
 {
 public:
@@ -116,7 +116,7 @@ public:
 
     virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
 
-	office_element_ptr_array	table_sort_by_;
+	office_element_ptr_array	content_;
 //attr
 	//table:algorithm
 	//table:country
@@ -125,8 +125,8 @@ public:
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_sort);
+//-------------------------------------------------------------------------------------------------------------
 
-//  table:sort-by
 class table_sort_by: public office_element_impl<table_sort_by>
 {
 public:
@@ -140,11 +140,124 @@ public:
 	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){}
 
-	int						table_field_number_;
-	_CP_OPT(std::wstring)	table_data_type_;
-	_CP_OPT(std::wstring)	table_order_;
+	int								table_field_number_;
+	_CP_OPT(std::wstring)			table_data_type_;
+	_CP_OPT(odf_types::table_order)	table_order_;
 };
 
 CP_REGISTER_OFFICE_ELEMENT2(table_sort_by);
+//-------------------------------------------------------------------------------------------------------------
+
+class table_filter: public office_element_impl<table_filter>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTableFilter;
+
+    CPDOCCORE_DEFINE_VISITABLE()
+
+	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 xlsx_convert(oox::xlsx_conversion_context & Context);
+
+	_CP_OPT(std::wstring)		table_condition_source_;	//self or cell-range.
+	_CP_OPT(std::wstring)		table_condition_source_range_address_;	//cellRangeAddress
+	_CP_OPT(odf_types::Bool)	table_display_duplicates_;
+	_CP_OPT(std::wstring)		table_target_range_address_;//cellRangeAddress
+
+	office_element_ptr_array	content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_filter);
+//------------------------------------------------------------------------------
+
+class table_filter_and: public office_element_impl<table_filter_and>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTableFilterAnd;
+
+    CPDOCCORE_DEFINE_VISITABLE()
+
+	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 xlsx_convert(oox::xlsx_conversion_context & Context);
+
+	office_element_ptr_array	content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_filter_and);
+//-------------------------------------------------------------------------------------------------------------
+
+class table_filter_or: public office_element_impl<table_filter_or>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTableFilterOr;
+
+    CPDOCCORE_DEFINE_VISITABLE()
+
+	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 xlsx_convert(oox::xlsx_conversion_context & Context);
+
+	office_element_ptr_array	content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_filter_or);
+//-------------------------------------------------------------------------------------------------------------
+
+class table_filter_condition: public office_element_impl<table_filter_condition>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTableFilterCondition;
+
+    CPDOCCORE_DEFINE_VISITABLE()
+
+	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 xlsx_convert(oox::xlsx_conversion_context & Context);
+
+	_CP_OPT(std::wstring)	table_case_sensitive_;
+	_CP_OPT(std::wstring)	table_data_type_;
+	_CP_OPT(unsigned int)	table_field_number_;
+	_CP_OPT(std::wstring)	table_operator_;
+	_CP_OPT(std::wstring)	table_value_;
+	
+	office_element_ptr_array	content_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_filter_condition);
+//-------------------------------------------------------------------------------------------------------------
+
+class table_filter_set_item: public office_element_impl<table_filter_set_item>
+{
+public:
+    static const wchar_t * ns;
+    static const wchar_t * name;
+    static const xml::NodeType xml_type = xml::typeElement;
+    static const ElementType type		= typeTableFilterSetItem;
+
+    CPDOCCORE_DEFINE_VISITABLE()
+
+	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 xlsx_convert(oox::xlsx_conversion_context & Context);
+
+	_CP_OPT(std::wstring)	table_value_;
+};
+CP_REGISTER_OFFICE_ELEMENT2(table_filter_set_item);
+//-------------------------------------------------------------------------------------------------------------
+
 }
 }

ASCOfficeOdfFile/src/odf/table_docx.cpp

@@ -67,10 +67,10 @@ void table_table_row::docx_convert(oox::docx_conversion_context & Context)
 {
     std::wostream & _Wostream = Context.output_stream();
 
-    const std::wstring styleName = table_table_row_attlist_.table_style_name_.get_value_or(L"");
-    const std::wstring defaultCellStyle = table_table_row_attlist_.table_default_cell_style_name_.get_value_or(L"");
+    const std::wstring styleName = attlist_.table_style_name_.get_value_or(L"");
+    const std::wstring defaultCellStyle = attlist_.table_default_cell_style_name_.get_value_or(L"");
 
-    for (unsigned int i = 0; i < table_table_row_attlist_.table_number_rows_repeated_; ++i)
+    for (unsigned int i = 0; i < attlist_.table_number_rows_repeated_; ++i)
     {
         _Wostream << L"<w:tr>";
         const style_instance * inst = 
@@ -259,7 +259,7 @@ void table_table_cell::docx_convert(oox::docx_conversion_context & Context)
 {
     std::wostream & _Wostream = Context.output_stream();
 
-    for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
+    for (unsigned int r = 0; r < attlist_.table_number_columns_repeated_; ++r)
     {
         int pushTextPropCount = 0;
 
@@ -267,24 +267,24 @@ void table_table_cell::docx_convert(oox::docx_conversion_context & Context)
         _Wostream << L"<w:tc>";
         _Wostream << L"<w:tcPr>";
 
-		const std::wstring styleName = table_table_cell_attlist_.table_style_name_.get_value_or(L""); 
+		const std::wstring styleName = attlist_.table_style_name_.get_value_or(L""); 
 
 		//_Wostream << L"<w:tcW w:w=\"0\" w:type=\"auto\" />";
 		
-        if (table_table_cell_attlist_extra_.table_number_rows_spanned_ > 1)
+        if (attlist_extra_.table_number_rows_spanned_ > 1)
         {
             _Wostream << L"<w:vMerge w:val=\"restart\" />"; 
             Context.get_table_context().set_rows_spanned(Context.get_table_context().current_column(), 
-                table_table_cell_attlist_extra_.table_number_rows_spanned_ - 1,
-                table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1,
+                attlist_extra_.table_number_rows_spanned_ - 1,
+                attlist_extra_.table_number_columns_spanned_ - 1,
                 styleName
                 );
         }        		
 		
-		if (table_table_cell_attlist_extra_.table_number_columns_spanned_ > 1)
+		if (attlist_extra_.table_number_columns_spanned_ > 1)
         {
-            _Wostream << L"<w:gridSpan w:val=\"" << table_table_cell_attlist_extra_.table_number_columns_spanned_ << "\" />";
-            Context.get_table_context().set_columns_spanned(table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1);
+            _Wostream << L"<w:gridSpan w:val=\"" << attlist_extra_.table_number_columns_spanned_ << "\" />";
+            Context.get_table_context().set_columns_spanned(attlist_extra_.table_number_columns_spanned_ - 1);
         }
 
 		const style_instance * inst = 
@@ -344,7 +344,7 @@ void table_table_cell::docx_convert(oox::docx_conversion_context & Context)
         }
 		
         // если одержимое не содержит ниодного параграфа, то добавляем параграф, иначе word считает файл битым
-        if (!table_table_cell_content_.docx_convert(Context))
+        if (!content_.docx_convert(Context))
         {
             _Wostream << emptyPar;
         }
@@ -361,11 +361,11 @@ void table_covered_table_cell::docx_convert(oox::docx_conversion_context & Conte
 {
     std::wostream & _Wostream = Context.output_stream();
 
-    for (unsigned int i = 0; i < table_table_cell_attlist_.table_number_columns_repeated_; ++i)
+    for (unsigned int i = 0; i < attlist_.table_number_columns_repeated_; ++i)
     {
         if (Context.get_table_context().start_covered_cell(Context))
         {
-            if (!table_table_cell_content_.docx_convert(Context))
+            if (!content_.docx_convert(Context))
             {
                 _Wostream << emptyPar;
             }

ASCOfficeOdfFile/src/odf/table_pptx.cpp

@@ -70,10 +70,10 @@ void table_table_row::pptx_convert(oox::pptx_conversion_context & Context)
 {
     std::wostream & _Wostream = Context.get_table_context().tableData();
 
-    const std::wstring styleName = table_table_row_attlist_.table_style_name_.get_value_or(L"");
-    const std::wstring defaultCellStyle = table_table_row_attlist_.table_default_cell_style_name_.get_value_or(L"");
+    const std::wstring styleName = attlist_.table_style_name_.get_value_or(L"");
+    const std::wstring defaultCellStyle = attlist_.table_default_cell_style_name_.get_value_or(L"");
 
-    for (unsigned int i = 0; i < table_table_row_attlist_.table_number_rows_repeated_; ++i)
+    for (unsigned int i = 0; i < attlist_.table_number_rows_repeated_; ++i)
     {
 		int height = 0;
        
@@ -323,7 +323,7 @@ void table_table_cell::pptx_convert(oox::pptx_conversion_context & Context)
 
 	CP_XML_WRITER(_Wostream)
     {
-		for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
+		for (unsigned int r = 0; r < attlist_.table_number_columns_repeated_; ++r)
 		{
 			Context.get_table_context().start_cell();
 			CP_XML_NODE(L"a:tc")
@@ -352,35 +352,35 @@ void table_table_cell::pptx_convert(oox::pptx_conversion_context & Context)
 					style_inst = Context.root()->odf_context().styleContainer().style_by_name(style_name, style_family::TableCell,false);
 					if (style_inst) style_instances.push_back(style_inst);
 				}
-				style_name = table_table_cell_attlist_.table_style_name_.get_value_or(L"");
+				style_name = attlist_.table_style_name_.get_value_or(L"");
 				if (!style_name.empty())
 				{
 					style_inst = Context.root()->odf_context().styleContainer().style_by_name(style_name, style_family::TableCell,false);
 					if (style_inst) style_instances.push_back(style_inst);
 				}
 
-				if (table_table_cell_attlist_extra_.table_number_rows_spanned_ > 1)
+				if (attlist_extra_.table_number_rows_spanned_ > 1)
 				{
-					CP_XML_ATTR(L"rowSpan" , table_table_cell_attlist_extra_.table_number_rows_spanned_);
+					CP_XML_ATTR(L"rowSpan" , attlist_extra_.table_number_rows_spanned_);
 					CP_XML_ATTR(L"vMerge", 1);
 					
 					Context.get_table_context().set_rows_spanned(Context.get_table_context().current_column(), 
-						table_table_cell_attlist_extra_.table_number_rows_spanned_ - 1,
-						table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1,
+						attlist_extra_.table_number_rows_spanned_ - 1,
+						attlist_extra_.table_number_columns_spanned_ - 1,
 						style_name);
 				}        		
 			
-				if (table_table_cell_attlist_extra_.table_number_columns_spanned_ > 1)
+				if (attlist_extra_.table_number_columns_spanned_ > 1)
 				{
 					//CP_XML_ATTR(L"hMerge", true);
-					CP_XML_ATTR(L"gridSpan" , table_table_cell_attlist_extra_.table_number_columns_spanned_);
+					CP_XML_ATTR(L"gridSpan" , attlist_extra_.table_number_columns_spanned_);
 
-					Context.get_table_context().set_columns_spanned(table_table_cell_attlist_extra_.table_number_columns_spanned_ - 1);
+					Context.get_table_context().set_columns_spanned(attlist_extra_.table_number_columns_spanned_ - 1);
 				}		
 
 				Context.get_text_context().start_object();
 
-				bool presentText = table_table_cell_content_.pptx_convert(Context);
+				bool presentText = content_.pptx_convert(Context);
 				
 				std::wstring cellContent = Context.get_text_context().end_object();
 
@@ -408,11 +408,11 @@ void table_covered_table_cell::pptx_convert(oox::pptx_conversion_context & Conte
 {   
 	std::wostream & _Wostream = Context.get_table_context().tableData();
 
-    for (unsigned int i = 0; i < table_table_cell_attlist_.table_number_columns_repeated_; ++i)
+    for (unsigned int i = 0; i < attlist_.table_number_columns_repeated_; ++i)
     {
         if (Context.get_table_context().start_covered_cell(Context))
         {
-            if (!table_table_cell_content_.pptx_convert(Context))
+            if (!content_.pptx_convert(Context))
             {
                 _Wostream << emptyParTable;
             }

ASCOfficeOdfFile/src/odf/table_xlsx.cpp

@@ -82,8 +82,8 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 ///обработка чтилей для роу -
 	size_t Default_Cell_style_in_row_ = 0; 
 
-    const std::wstring rowStyleName			= table_table_row_attlist_.table_style_name_.get_value_or(L"");
-    const std::wstring defaultCellStyleName = table_table_row_attlist_.table_default_cell_style_name_.get_value_or( L"");
+    const std::wstring rowStyleName			= attlist_.table_style_name_.get_value_or(L"");
+    const std::wstring defaultCellStyleName = attlist_.table_default_cell_style_name_.get_value_or( L"");
 
 	style_instance * instStyle_CellDefault = 
 				Context.root()->odf_context().styleContainer().style_by_name(defaultCellStyleName, style_family::TableCell,false/*false*/);
@@ -140,9 +140,9 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 	}
 	int row_current = Context.current_table_row() + 1;
 
-    bool hidden = table_table_row_attlist_.table_visibility_.get_type() == table_visibility::Collapse;
+    bool hidden = attlist_.table_visibility_.get_type() == table_visibility::Collapse;
 
-    for (unsigned int i = 0; i < table_table_row_attlist_.table_number_rows_repeated_; ++i)
+    for (unsigned int i = 0; i < attlist_.table_number_rows_repeated_; ++i)
     {
         Context.start_table_row(rowStyleName, defaultCellStyleName);
         
@@ -214,20 +214,20 @@ void table_table_row::xlsx_convert(oox::xlsx_conversion_context & Context)
 		if (Context.is_empty_row())
 		{
             skip_next_row = true;  
-			if (table_table_row_attlist_.table_number_rows_repeated_ > 0xf000)
+			if (attlist_.table_number_rows_repeated_ > 0xf000)
 				break;//Уведомление_о_вручении.ods (1 лист)
 		}
-		if (content_.size() > 0 && table_table_row_attlist_.table_number_rows_repeated_ > 1000)
+		if (content_.size() > 0 && attlist_.table_number_rows_repeated_ > 1000)
 		{
 			table_table_cell * table_cell = dynamic_cast<table_table_cell *>(content_[0].get());
-			if ((table_cell) && (table_cell->table_table_cell_attlist_.table_number_columns_repeated_ > 1000))
+			if ((table_cell) && (table_cell->attlist_.table_number_columns_repeated_ > 1000))
 			{
 				break;//Уведомление_о_вручении.ods  (2 лист)
 			}
 		}
     }
 
-    Context.get_table_metrics().add_rows(table_table_row_attlist_.table_number_rows_repeated_, !hidden ? row_height : 0.0);
+    Context.get_table_metrics().add_rows(attlist_.table_number_rows_repeated_, !hidden ? row_height : 0.0);
 
 }
 
@@ -259,16 +259,16 @@ void table_rows::xlsx_convert(oox::xlsx_conversion_context & Context)
 			table_table_row* row_last	= dynamic_cast<table_table_row*>(table_table_row_[table_table_row_.size() - 1].get());
 			table_table_row* row_last_1	= dynamic_cast<table_table_row*>(table_table_row_[table_table_row_.size() - 2].get());
 
-			if (row_last->table_table_row_attlist_.table_number_rows_repeated_		> 1000 && 
-				row_last_1->table_table_row_attlist_.table_number_rows_repeated_	> 1000 || 
-				row_last_1->table_table_row_attlist_.table_number_rows_repeated_	> 0xf000)
+			if (row_last->attlist_.table_number_rows_repeated_		> 1000 && 
+				row_last_1->attlist_.table_number_rows_repeated_	> 1000 || 
+				row_last_1->attlist_.table_number_rows_repeated_	> 0xf000)
 			{
-				std::wstring style		= row_last->table_table_row_attlist_.table_style_name_.get_value_or(L"");
-				std::wstring style_1	= row_last->table_table_row_attlist_.table_style_name_.get_value_or(L"");
+				std::wstring style		= row_last->attlist_.table_style_name_.get_value_or(L"");
+				std::wstring style_1	= row_last->attlist_.table_style_name_.get_value_or(L"");
 				
 				if (style == style_1)//check for empty also ????
 				{
-					row_last_1->table_table_row_attlist_.table_number_rows_repeated_ = 1024;
+					row_last_1->attlist_.table_number_rows_repeated_ = 1024;
 					table_table_row_.pop_back();
 				}
 			}
@@ -301,11 +301,11 @@ void table_rows_and_groups::xlsx_convert(oox::xlsx_conversion_context & Context)
 
 void table_table_row_group::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
-	int count = table_rows_and_groups_.get_count();
+	size_t count = table_rows_and_groups_.content_.size();
 
 	int level = 1;
 	
-	Context.set_table_row_group(count,table_table_row_group_attlist_.table_display_,level);
+	Context.set_table_row_group( (int)count, table_table_row_group_attlist_.table_display_, level);
 	table_rows_and_groups_.xlsx_convert(Context);
 }
 
@@ -328,6 +328,27 @@ void table_table::xlsx_convert(oox::xlsx_conversion_context & Context)
     Context.start_table(tableName, tableStyleName);
 
 	table_columns_and_groups_.xlsx_convert(Context);
+
+// check last rows for equal style and empties - collapsed
+
+//<table:table-row table:style-name="ro3" table:number-rows-repeated="65353">
+// <table:table-cell table:style-name="ce14" table:number-columns-repeated="5"/>
+// <table:table-cell table:number-columns-repeated="1019"/>
+//</table:table-row>
+//<table:table-row table:style-name="ro3" table:number-rows-repeated="983017">
+// <table:table-cell table:number-columns-repeated="1024"/>
+//</table:table-row>
+//<table:table-row table:style-name="ro3">
+// <table:table-cell table:number-columns-repeated="1024"/>
+//</table:table-row>
+
+	if (table_rows_and_groups_.content_.empty() == false && table_rows_and_groups_.content_.back()->get_type() == typeTableTableRowNoGroup)
+	{
+		table_rows_no_group * rows = dynamic_cast<table_rows_no_group*>(table_rows_and_groups_.content_.back().get());
+		rows->table_rows_1_.remove_equals_empty();
+		rows->table_rows_2_.remove_equals_empty();
+	}
+
     table_rows_and_groups_.xlsx_convert(Context);
 
     if (table_shapes_)
@@ -607,11 +628,11 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
 {
     std::wostream & strm = Context.current_sheet().sheetData();
     
-	const common_value_and_type_attlist & attr	= table_table_cell_attlist_.common_value_and_type_attlist_;
+	const common_value_and_type_attlist & attr	= attlist_.common_value_and_type_attlist_;
 
  	office_value_type::type	odf_value_type	= office_value_type::Custom;
 	oox::XlsxCellType::type	t_val			= oox::XlsxCellType::s;
-	std::wstring formula					= table_table_cell_attlist_.table_formula_.get_value_or(L"");
+	std::wstring formula					= attlist_.table_formula_.get_value_or(L"");
     
 	std::wstring			number_val;
     _CP_OPT(bool)			bool_val;
@@ -626,11 +647,11 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
 	bool	is_data_visible		= false;
 // вычислить стиль для ячейки
 
-    std::wstring cellStyleName		= table_table_cell_attlist_.table_style_name_.get_value_or(L"");
+    std::wstring cellStyleName		= attlist_.table_style_name_.get_value_or(L"");
 	std::wstring columnStyleName	= Context.get_table_context().default_column_cell_style();
 	std::wstring rowStyleName		= Context.get_table_context().default_row_cell_style();
 
-	if (table_table_cell_attlist_.table_number_columns_repeated_ > 1)
+	if (attlist_.table_number_columns_repeated_ > 1)
 		columnStyleName.clear(); // могут быть разные стили колонок Book 24.ods
 
 	odf_read_context & odfContext = Context.root()->odf_context();   
@@ -760,15 +781,15 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
     
 	is_style_visible = (!cellStyleName.empty() || defaultColumnCellStyle) ? true : false;
 
-	if ( table_table_cell_content_.elements_.size() > 0	|| 
+	if ( content_.elements_.size() > 0	|| 
 		!formula.empty()	||
 		(	t_val == oox::XlsxCellType::n										&& !number_val.empty()) || 
 		(	t_val == oox::XlsxCellType::b										&& bool_val) ||
 		((	t_val == oox::XlsxCellType::str || oox::XlsxCellType::inlineStr)	&& str_val))	is_data_visible = true;
 
-	if (table_table_cell_attlist_.table_number_columns_repeated_ < 199 && last_cell_)	last_cell_ = false;
+	if (attlist_.table_number_columns_repeated_ < 199 && last_cell_)	last_cell_ = false;
 	
-	int cell_repeated_max = Context.current_table_column() + table_table_cell_attlist_.table_number_columns_repeated_ + 1;
+	int cell_repeated_max = Context.current_table_column() + attlist_.table_number_columns_repeated_ + 1;
 
 	if (cell_repeated_max >= 1024 && cellStyleName.empty() && last_cell_ && !is_data_visible)
 	{//Book 24.ods
@@ -780,15 +801,15 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
 		xfId_last_set = Context.get_style_manager().xfId(&textFormatProperties, &parFormatProperties, &cellFormatProperties, &cellFormat, num_format, false, is_style_visible);
 	}
 
-	for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
+	for (unsigned int r = 0; r < attlist_.table_number_columns_repeated_; ++r)
     {
-        Context.start_table_cell (	formula,	table_table_cell_attlist_extra_.table_number_columns_spanned_	- 1 ,
-												table_table_cell_attlist_extra_.table_number_rows_spanned_		- 1	);
+        Context.start_table_cell (	formula,	attlist_extra_.table_number_columns_spanned_	- 1 ,
+												attlist_extra_.table_number_rows_spanned_		- 1	);
 		
 		if (is_style_visible)
 			Context.set_current_cell_style_id(xfId_last_set);
 		
-		const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, &textFormatProperties);
+		const int sharedStringId = content_.xlsx_convert(Context, &textFormatProperties);
 
 		if (t_val == oox::XlsxCellType::str && sharedStringId >=0)
 			t_val = oox::XlsxCellType::s;//в случае текста, если он есть берем кэшированное значение
@@ -813,12 +834,12 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
                         {
                             CP_XML_NODE(L"f")
                             {
-								if (table_table_cell_attlist_extra_.table_number_matrix_columns_spanned_ && table_table_cell_attlist_extra_.table_number_matrix_rows_spanned_)
+								if (attlist_extra_.table_number_matrix_columns_spanned_ && attlist_extra_.table_number_matrix_rows_spanned_)
 								{
 									std::wstring ref = oox::getCellAddress(Context.current_table_column(), Context.current_table_row());
 									ref += L":";
-									ref += oox::getCellAddress(Context.current_table_column() + *table_table_cell_attlist_extra_.table_number_matrix_columns_spanned_ - 1,
-										 Context.current_table_row() + *table_table_cell_attlist_extra_.table_number_matrix_rows_spanned_ - 1);
+									ref += oox::getCellAddress(Context.current_table_column() + *attlist_extra_.table_number_matrix_columns_spanned_ - 1,
+										 Context.current_table_row() + *attlist_extra_.table_number_matrix_rows_spanned_ - 1);
 									CP_XML_ATTR(L"ref", ref);
 									CP_XML_ATTR(L"t", L"array");
 									CP_XML_ATTR(L"aca", false);
@@ -854,7 +875,7 @@ void table_table_cell::xlsx_convert(oox::xlsx_conversion_context & Context)
 				{
 					empty_cell_count++;
 					//Уведомление_о_вручении.ods - 13 повторов пустых с cellStyle=NULL - нужные !!!
-					if (empty_cell_count > 19 && last_cell_&& (table_table_cell_attlist_.table_number_columns_repeated_> 299 || cellStyle == NULL)) 
+					if (empty_cell_count > 19 && last_cell_&& (attlist_.table_number_columns_repeated_> 299 || cellStyle == NULL)) 
 					{//пишем простыню только если задан стиль тока для этих ячеек
 						skip_next_cell = true;
 					}
@@ -875,9 +896,9 @@ void table_covered_table_cell::xlsx_convert(oox::xlsx_conversion_context & Conte
 {
     std::wostream & strm = Context.current_sheet().sheetData();
 
-	const int sharedStringId = table_table_cell_content_.xlsx_convert(Context, NULL);
+	const int sharedStringId = content_.xlsx_convert(Context, NULL);
     
-	for (unsigned int r = 0; r < table_table_cell_attlist_.table_number_columns_repeated_; ++r)
+	for (unsigned int r = 0; r < attlist_.table_number_columns_repeated_; ++r)
     {
         Context.start_table_covered_cell();
         const int xfId = Context.get_current_cell_style_id();

ASCOfficeOdfFile/win32/cpcommon.vcproj

@@ -697,6 +697,14 @@
 				RelativePath="..\src\odf\datatypes\mathvariant.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\membertype.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\membertype.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\datatypes\noteclass.cpp"
 				>
@@ -909,6 +917,14 @@
 				RelativePath="..\src\odf\datatypes\tablecentering.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tablefunction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tablefunction.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\datatypes\tablemode.cpp"
 				>
@@ -917,6 +933,30 @@
 				RelativePath="..\src\odf\datatypes\tablemode.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tableorder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tableorder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tableorientation.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tableorientation.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tabletype.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tabletype.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\datatypes\tablevisibility.cpp"
 				>

ASCOfficeOdfFile/win32/cpodf.vcproj

@@ -718,6 +718,14 @@
 					RelativePath="..\src\docx\xlsx_package.h"
 					>
 				</File>
+				<File
+					RelativePath="..\src\docx\xlsx_pivots_context.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\src\docx\xlsx_pivots_context.h"
+					>
+				</File>
 				<File
 					RelativePath="..\src\docx\xlsx_row_spanned.h"
 					>
@@ -1695,6 +1703,14 @@
 				RelativePath="..\src\odf\table_xlsx.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tablefunction.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\src\odf\datatypes\tablefunction.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\odf\text_content.cpp"
 				>

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -449,25 +449,21 @@ void PptxConverter::convert(PPTX::NotesSlide *oox_notes)
 
 	PPTX::Theme*			old_theme	= current_theme;
 	PPTX::Logic::ClrMap*	old_clrMap	= current_clrMap;
-
-	smart_ptr<PPTX::NotesMaster> notes_master;
-	if (!presentation->notesMasterIdLst.empty())
-	{
-		std::wstring rId = presentation->notesMasterIdLst[0].rid.get();
-		notes_master = ((*presentation)[rId]).smart_dynamic_cast<PPTX::NotesMaster>();
-	}	
+	
 	odp_context->start_note();
 	
-	if (notes_master.IsInit())
+	if (oox_notes->master_.IsInit())
 	{
-		current_theme	= notes_master->theme_.operator->();
-		current_clrMap	= &notes_master->clrMap;
+		current_theme	= oox_notes->master_->theme_.operator->();
+		current_clrMap	= &oox_notes->master_->clrMap;
 	}
 
 	current_slide	= dynamic_cast<OOX::IFileContainer*>(oox_notes);
 
 	if (oox_notes->clrMapOvr.IsInit() && oox_notes->clrMapOvr->overrideClrMapping.IsInit())
+	{
 		current_clrMap	= oox_notes->clrMapOvr->overrideClrMapping.GetPointer();
+	}
 	
 	convert_slide(&oox_notes->cSld, NULL, true, true, Notes);
 	

ASCOfficePPTXFile/PPTXFormat/FileContainer.cpp

@@ -98,7 +98,10 @@ namespace PPTX
 		bool bIsSlide = false;
 		OOX::File* pSrcFile = dynamic_cast<OOX::File*>(this);
 		if (NULL != pSrcFile)
-			bIsSlide = (pSrcFile->type() == OOX::Presentation::FileTypes::Slide) ? true : false;
+		{
+			bIsSlide = (pSrcFile->type() == OOX::Presentation::FileTypes::Slide || 
+						pSrcFile->type() == OOX::Presentation::FileTypes::NotesSlide) ? true : false;
+		}
 
 		size_t nCount = rels.m_arrRelations.size();
 

ASCOfficePPTXFile/PPTXFormat/Folder.cpp

@@ -102,7 +102,6 @@ namespace PPTX
 
         }
 
-
         for (std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.m_map.begin(); pPair != map.m_map.end(); ++pPair)
         {
             const OOX::FileType& curType = pPair->second->type();
@@ -128,7 +127,6 @@ namespace PPTX
             }
         }
 
-
         for (std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.m_map.begin(); pPair != map.m_map.end(); ++pPair)
         {
             const OOX::FileType& curType = pPair->second->type();
@@ -141,6 +139,18 @@ namespace PPTX
             }
         }
 
+        for (std::map<std::wstring, smart_ptr<OOX::File>>::const_iterator pPair = map.m_map.begin(); pPair != map.m_map.end(); ++pPair)
+        {
+            const OOX::FileType& curType = pPair->second->type();
+           
+			if (OOX::Presentation::FileTypes::NotesSlide == curType)
+            {
+                smart_ptr<PPTX::NotesSlide> pointer = pPair->second.smart_dynamic_cast<PPTX::NotesSlide>();
+                if (pointer.is_init())
+                    pointer->ApplyRels();
+            }
+        }
+
 		if (Event)
 			Event->Progress(0, 1000000);
 	}

ASCOfficePPTXFile/PPTXFormat/Logic/Shape.cpp

@@ -469,9 +469,17 @@ namespace PPTX
 				if ((nvSpPr.nvPr.ph->type.IsInit()) || (nvSpPr.nvPr.ph->idx.IsInit()))
 				{
 					if (parentFileIs<Slide>())
+					{
 						parentFileAs<Slide>().Layout->GetLevelUp(this);
+					}
 					else if(parentFileIs<SlideLayout>())
+					{
 						parentFileAs<SlideLayout>().Master->GetLevelUp(this);
+					}
+					else if(parentFileIs<NotesSlide>())
+					{
+						parentFileAs<NotesSlide>().master_->GetLevelUp(this);
+					}
 				}
 			}
 		}

ASCOfficePPTXFile/PPTXFormat/NotesMaster.h

@@ -58,7 +58,6 @@ namespace PPTX
 		{
 		}
 
-	public:
 		virtual void read(const OOX::CPath& filename, FileMap& map)
 		{
 			//FileContainer::read(filename, map);
@@ -85,8 +84,6 @@ namespace PPTX
 			WrapperFile::write(filename, directory, content);
 			FileContainer::write(filename, directory, content);
 		}
-
-	public:
 		virtual const OOX::FileType type() const
 		{
 			return OOX::Presentation::FileTypes::NotesMaster;
@@ -186,10 +183,48 @@ namespace PPTX
 
 			pReader->Seek(end);
 		}
+		virtual void GetLevelUp(Logic::Shape* pShape)
+		{
+			if (!pShape) return;
 
-	public:
-        smart_ptr<Theme>			theme_;
-		smart_ptr<TableStyles>		tableStyles_;
+			if (pShape->nvSpPr.nvPr.ph.is_init())
+			{
+				std::wstring idx = pShape->nvSpPr.nvPr.ph->idx.get_value_or(L"");
+				std::wstring type = pShape->nvSpPr.nvPr.ph->type.get_value_or(L"body");
+				
+				if (type == L"ctrTitle") type = L"title";
+
+				for (size_t i = 0; i < cSld.spTree.SpTreeElems.size(); ++i)
+				{
+					smart_ptr<Logic::Shape> pMasterShape = cSld.spTree.SpTreeElems[i].GetElem().smart_dynamic_cast<Logic::Shape>();
+
+					if (pMasterShape.IsInit())
+					{
+						if (pMasterShape->nvSpPr.nvPr.ph.is_init())
+						{
+							std::wstring lIdx	= pMasterShape->nvSpPr.nvPr.ph->idx.get_value_or(_T(""));
+							std::wstring lType	= pMasterShape->nvSpPr.nvPr.ph->type.get_value_or(_T("body"));
+							
+							if (lType == L"ctrTitle") lType = L"title";
+
+							if ((type == lType) && (idx == lIdx) && !idx.empty())
+							{
+								pShape->SetLevelUpElement(pMasterShape.operator->());
+								return;
+							}
+							else if ((type == lType) && idx.empty() && lIdx.empty())
+							{
+								pShape->SetLevelUpElement(pMasterShape.operator->());
+								return;
+							}
+						}
+					}
+				}
+			}
+		}
+
+        smart_ptr<Theme>				theme_;
+		smart_ptr<TableStyles>			tableStyles_;
 
 		Logic::CSld						cSld;
 		Logic::ClrMap					clrMap;

ASCOfficePPTXFile/PPTXFormat/NotesSlide.h

@@ -37,8 +37,7 @@
 #include "FileContainer.h"
 #include "FileTypes.h"
 
-#include "Logic/ClrMapOvr.h"
-#include "Logic/CSld.h"
+#include "NotesMaster.h"
 
 namespace PPTX
 {
@@ -55,8 +54,6 @@ namespace PPTX
 		virtual ~NotesSlide()
 		{
 		}
-
-	public:
 		virtual void read(const OOX::CPath& filename, FileMap& map)
 		{
 			//FileContainer::read(filename, map);
@@ -79,8 +76,6 @@ namespace PPTX
 			WrapperFile::write(filename, directory, content);
 			FileContainer::write(filename, directory, content);
 		}
-
-	public:
 		virtual const OOX::FileType type() const
 		{
 			return OOX::Presentation::FileTypes::NotesSlide;
@@ -127,7 +122,6 @@ namespace PPTX
 
 			pWriter->EndNode(_T("p:notes"));
 		}
-
 		virtual void fromPPTY(NSBinPptxRW::CBinaryFileReader* pReader)
 		{
 			pReader->Skip(1); // type
@@ -145,7 +139,6 @@ namespace PPTX
 				else if (1 == _at)
 					showMasterSp = pReader->GetBool();
 			}
-
 			while (pReader->GetPos() < end)
 			{
 				BYTE _rec = pReader->GetUChar();
@@ -173,13 +166,25 @@ namespace PPTX
 
 			pReader->Seek(end);
 		}
+		void ApplyRels()
+		{
+			smart_ptr<OOX::File> pFile = FileContainer::Get(OOX::Presentation::FileTypes::NotesMaster);
 
-	public:
+			master_ = pFile.smart_dynamic_cast<PPTX::NotesMaster>();
+
+			if (master_.IsInit())
+			{
+				theme_ = master_->theme_;
+			}
+		}
 		Logic::CSld					cSld;
 		nullable<Logic::ClrMapOvr>	clrMapOvr;
 
 		nullable_bool				showMasterPhAnim;
 		nullable_bool				showMasterSp;
+
+		smart_ptr<NotesMaster>		master_;
+		smart_ptr<Theme>			theme_;
 	};
 } // namespace PPTX
 

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

@@ -77,17 +77,15 @@ const bool SXOPER::loadContent(BinProcessor& proc)
 		SXNum *num = dynamic_cast<SXNum*>(elements_.back().get());
 		if (num)
 		{
-			bInteger = (num->num.data.bytes.Byte1==num->num.data.bytes.Byte2 && 
-						num->num.data.bytes.Byte2==num->num.data.bytes.Byte3 && 
-						num->num.data.bytes.Byte3==num->num.data.bytes.Byte4 && 
-						num->num.data.bytes.Byte4==0);
+			bInteger = !(num->num.data.value - floor(num->num.data.value) > 0);
+
+			bNumber = !bInteger;
+			node	= L"n";
+			if (bInteger)
+				value	= std::to_wstring((int)num->num.data.value);
+			else
+				value	= boost::lexical_cast<std::wstring>(num->num.data.value);
 		}
-		bNumber = !bInteger;
-		node	= L"n";
-		if (bInteger)
-			value	= std::to_wstring((int)num->num.data.value);
-		else
-			value	= boost::lexical_cast<std::wstring>(num->num.data.value);
 	}
 	else if(proc.optional<SxBool>())
 	{

ASCOfficeXlsFile2/source/XlsXlsxConverter/oox_package.h

@@ -80,8 +80,10 @@ class content_types_file : public element
 {
 public:
     content_types_file();
-    virtual void write(const std::wstring & RootPath);
+    
+	virtual void write(const std::wstring & RootPath);
     content_type & get_content_type() { return content_type_; }
+	
 	bool add_or_find_default(const std::wstring & extension);
 	void set_media(external_items & _Mediaitems);
 

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_package.cpp

@@ -184,10 +184,11 @@ void xl_files::write(const std::wstring & RootPath)
 		pivot_table_files_.set_main_document(get_main_document());
 		pivot_table_files_.write(path);
 	}
-    
-	sheets_files_.set_rels(&rels_files_);
-    sheets_files_.set_main_document( this->get_main_document() );
-    sheets_files_.write(path);
+	{
+		sheets_files_.set_rels(&rels_files_);
+		sheets_files_.set_main_document( this->get_main_document() );
+		sheets_files_.write(path);
+	}
 
 	if (sharedStrings_)
     {

ASCOfficeXlsFile2/source/XlsXlsxConverter/xlsx_package.h

@@ -47,9 +47,6 @@ public:
     xlsx_content_types_file();
 };
 //------------------------------------------------------------------------
-class sheet_content;
-typedef _CP_PTR(sheet_content) sheet_content_ptr;
-
 class sheet_content : boost::noncopyable
 {
 public:
@@ -65,10 +62,8 @@ private:
     std::wstringstream content_;
     rels_file_ptr rels_;
 };
+typedef _CP_PTR(sheet_content) sheet_content_ptr;
 //------------------------------------------------------------------------
-class pivot_cache_content;
-typedef _CP_PTR(pivot_cache_content) pivot_cache_content_ptr;
-
 class pivot_cache_content : boost::noncopyable
 {
 public:
@@ -88,10 +83,8 @@ private:
     std::wstringstream	definitions_;
 	rels_file_ptr		definitions_rels_file_;
 };
+typedef _CP_PTR(pivot_cache_content) pivot_cache_content_ptr;
 //------------------------------------------------------------------------
-class pivot_table_content;
-typedef _CP_PTR(pivot_table_content) pivot_table_content_ptr;
-
 class pivot_table_content : boost::noncopyable
 {
 public:
@@ -108,6 +101,7 @@ private:
     std::wstringstream	content_;
 	rels_file_ptr		rels_file_;
 };
+typedef _CP_PTR(pivot_table_content) pivot_table_content_ptr;
 //------------------------------------------------------------------------
 class sheets_files  : public element
 {

Common/DocxFormat/Source/DocxFormat/Comments.h

@@ -275,6 +275,7 @@ namespace OOX
 			WritingElement_ReadAttributes_Start( oReader )
                 WritingElement_ReadAttributes_Read_if     ( oReader, _T("w:author"),        m_oAuthor )
                 WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:date"),          m_oDate )
+				WritingElement_ReadAttributes_Read_else_if( oReader, _T("oodata"),          m_oOOData )
                 WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:id"),            m_oId )
 				WritingElement_ReadAttributes_Read_else_if( oReader, _T("w:initials"),      m_oInitials )
 				WritingElement_ReadAttributes_End( oReader )
@@ -289,6 +290,9 @@ namespace OOX
 		nullable<SimpleTypes::CDecimalNumber<> > m_oId;
 		nullable<std::wstring > m_oInitials;
 
+		//teamlab editor information!!!
+		nullable<std::wstring > m_oOOData;
+
 		// Childs
 	};
 

DesktopEditor/Word_Api/Editor_Api.h

@@ -2377,6 +2377,38 @@ namespace NSEditorApi
                 pEvent->Release();
 		}
 	};
+
+	class CAscCefMenuEvent : public CAscMenuEvent
+	{
+	public:
+		int	m_nSenderId;
+
+	public:
+		CAscCefMenuEvent(int nType = -1) : CAscMenuEvent(nType)
+		{
+			m_nSenderId = -1;
+		}
+		virtual ~CAscCefMenuEvent()
+		{
+		}
+
+		LINK_PROPERTY_INT(SenderId)
+	};
+
+	class CAscCefMenuEventListener
+	{
+	public:
+		// memory release!!!
+		virtual void OnEvent(CAscCefMenuEvent* pEvent)
+		{
+			if (NULL != pEvent)
+				pEvent->Release();
+		}
+		virtual bool IsSupportEvent(int nEventType)
+		{
+			return true;
+		}
+	};
 }
 
 namespace NSEditorApi

DesktopEditor/raster/BgraFrame.cpp

@@ -179,7 +179,7 @@ void CBgraFrame::CxImageToMediaFrame( CxImage& img )
 	int nStride = img.GetEffWidth();
 	BYTE* pBuffer = img.GetBits();
 	RGBQUAD* pPalette = img.GetPalette();
-	bool bIsAlphaPalettePresent = false;//img.GetPaletteAlphaEnabled();
+	bool bIsAlphaPalettePresent = img.AlphaPaletteIsEnabled();
 	bool bIsAlphaApplied = false;
 
 	if( 1 == nBitsPerPixel )
@@ -263,6 +263,10 @@ void CBgraFrame::CxImageToMediaFrame( CxImage& img )
 		BYTE* src = pBuffer;
 		BYTE* dst = pPixels;
 
+		int nTransIndex = img.GetTransIndex();
+		if (bIsAlphaApplied)
+			nTransIndex = -1;
+
 		for( int nRow = 0; nRow < nHeight; ++nRow, src += nStride )
 		{
 			for( int nPos = 0; nPos < nWidth; ++nPos, dst += 4 )
@@ -271,8 +275,21 @@ void CBgraFrame::CxImageToMediaFrame( CxImage& img )
 				dst[0] = pPalette[index].rgbBlue;
 				dst[1] = pPalette[index].rgbGreen;
 				dst[2] = pPalette[index].rgbRed;
+
+				if (bIsAlphaPalettePresent)
+					dst[3] = pPalette[index].rgbReserved;
+				else if (-1 != nTransIndex)
+				{
+					if (index == nTransIndex)
+						dst[3] = pPalette[index].rgbReserved;
+					else
+						dst[3] = 255;
+				}
 			}
 		}
+
+		if (-1 != nTransIndex || bIsAlphaPalettePresent)
+			bIsAlphaApplied = true;
 	}
 	else
 	if( 8 == nBitsPerPixel )
@@ -282,36 +299,35 @@ void CBgraFrame::CxImageToMediaFrame( CxImage& img )
 
 		nStride -= nWidth;
 
+		int nTransIndex = img.GetTransIndex();
+		if (bIsAlphaApplied)
+			nTransIndex = -1;
+
 		if( pPalette )
 		{
-			if (bIsAlphaPalettePresent)
+			for( int nRow = 0; nRow < nHeight; ++nRow, src += nStride )
 			{
-				for( int nRow = 0; nRow < nHeight; ++nRow, src += nStride )
+				for( int nPos = 0; nPos < nWidth; ++nPos, src += 1, dst += 4 )
 				{
-					for( int nPos = 0; nPos < nWidth; ++nPos, src += 1, dst += 4 )
-					{
-						int index = src[0];
-						dst[0] = pPalette[index].rgbBlue;
-						dst[1] = pPalette[index].rgbGreen;
-						dst[2] = pPalette[index].rgbRed;
+					int index = src[0];
+					dst[0] = pPalette[index].rgbBlue;
+					dst[1] = pPalette[index].rgbGreen;
+					dst[2] = pPalette[index].rgbRed;
+
+					if (bIsAlphaPalettePresent)
 						dst[3] = pPalette[index].rgbReserved;
-					}
-				}
-				bIsAlphaApplied = true;
-			}
-			else
-			{
-				for( int nRow = 0; nRow < nHeight; ++nRow, src += nStride )
-				{
-					for( int nPos = 0; nPos < nWidth; ++nPos, src += 1, dst += 4 )
+					else if (-1 != nTransIndex)
 					{
-						int index = src[0];
-						dst[0] = pPalette[index].rgbBlue;
-						dst[1] = pPalette[index].rgbGreen;
-						dst[2] = pPalette[index].rgbRed;								
+						if (index == nTransIndex)
+							dst[3] = pPalette[index].rgbReserved;
+						else
+							dst[3] = 255;
 					}
 				}
 			}
+
+			if (-1 != nTransIndex || bIsAlphaPalettePresent)
+				bIsAlphaApplied = true;
 		}
 		else
 		{

HtmlRenderer/include/HTMLRenderer3.h

@@ -181,7 +181,7 @@ namespace NSHtmlRenderer
         virtual HRESULT put_Mode(LONG lMode);
 
         virtual HRESULT CreateOfficeFile(std::wstring bsFileName, const std::wstring& fontsDir = L"");
-        virtual HRESULT CloseFile();
+        virtual HRESULT CloseFile(bool bIsNoBase64 = false);
 
         virtual HRESULT SetAdditionalParam(std::string sParamName, int nValue);
         virtual HRESULT SetAdditionalParam(std::string sParamName, const std::wstring& sParam);

HtmlRenderer/src/HTMLRenderer3.cpp

@@ -1287,14 +1287,14 @@ namespace NSHtmlRenderer
         m_pInternal->m_oSimpleGraphicsConverter.SetRenderer(this);
         return S_OK;
     }
-    HRESULT CASCHTMLRenderer3::CloseFile()
+    HRESULT CASCHTMLRenderer3::CloseFile(bool bIsNoBase64)
     {
         if (m_pInternal->m_bPageOpened)
         {
             m_pInternal->EndPage();
         }
 
-        m_pInternal->m_oWriter.WriteEndDocument(m_pInternal->m_oDocument);
+        m_pInternal->m_oWriter.WriteEndDocument(m_pInternal->m_oDocument, bIsNoBase64);
         return S_OK;
     }
 

HtmlRenderer/src/Writer.h

@@ -2075,7 +2075,7 @@ namespace NSHtmlRenderer
             m_bIsGids = false;
         }
 
-        void WriteEndDocument(CDocument& oDocument)
+        void WriteEndDocument(CDocument& oDocument, bool bIsNoBase64)
         {
             CMetafile oDocInfo;
             oDocInfo.WriteLONG(m_lPagesCount);
@@ -2114,22 +2114,36 @@ namespace NSHtmlRenderer
 
             NSFile::CFileBinary::Remove(m_strDstDirectoryFiles + L"/document_temp.bin");
 
-            char* pOutput = NULL;
-            int nOutputLen = 0;
-            NSFile::CBase64Converter::Encode(pData, lSizeAll, pOutput, nOutputLen, NSBase64::B64_BASE64_FLAG_NOCRLF);
+            if (bIsNoBase64)
+            {
+                NSFile::CFileBinary oDestinationFile;
+                oDestinationFile.CreateFileW(m_strDstDirectoryFiles + L"/Editor.bin");
+                oDestinationFile.WriteFile(pData, (DWORD)lSizeAll);
+                oDestinationFile.CloseFile();
 
-            RELEASEARRAYOBJECTS(pData);
+                RELEASEARRAYOBJECTS(pData);
+            }
+            else
+            {
+                char* pOutput = NULL;
+                int nOutputLen = 0;
+                NSFile::CBase64Converter::Encode(pData, lSizeAll, pOutput, nOutputLen, NSBase64::B64_BASE64_FLAG_NOCRLF);
 
-            std::string sDstLen = std::to_string(nOutputLen);
-            sDstLen += ";";
+                RELEASEARRAYOBJECTS(pData);
 
-            NSFile::CFileBinary _file;
-            _file.CreateFileW(m_strDstDirectoryFiles + L"/Editor.bin");
+                std::string sDstLen = std::to_string(nOutputLen);
+                sDstLen += ";";
 
-            _file.WriteFile((BYTE*)sDstLen.c_str(), (DWORD)sDstLen.length());
-            _file.WriteFile((BYTE*)pOutput, (DWORD)nOutputLen);
+                NSFile::CFileBinary _file;
+                _file.CreateFileW(m_strDstDirectoryFiles + L"/Editor.bin");
 
-            _file.CloseFile();
+                _file.WriteFile((BYTE*)sDstLen.c_str(), (DWORD)sDstLen.length());
+                _file.WriteFile((BYTE*)pOutput, (DWORD)nOutputLen);
+
+                _file.CloseFile();
+
+                RELEASEARRAYOBJECTS(pOutput);
+            }
 
             ::CFontManager* pFontManager = m_pApplicationFonts->GenerateFontManager();
             m_oDstFontGenerator.WriteFonts(pFontManager, m_strDstDirectoryFiles + L"/fonts", m_bIsGids);

HtmlRenderer/test/main.cpp

@@ -41,15 +41,23 @@
 
 #include "../include/ASCSVGWriter.h"
 #include "../../DesktopEditor/raster/Metafile/MetaFile.h"
+#include "../../DesktopEditor/raster/BgraFrame.h"
 
+#define RASTER_TEST
 //#define METAFILE_TEST
 //#define ONLINE_WORD_TO_PDF
-//#define TO_PDF
-#define TO_HTML_RENDERER
+//#define TO_PDF//#define TO_HTML_RENDERER
 //#define ONLY_TEXT
 
 int main(int argc, char *argv[])
 {
+#ifdef RASTER_TEST
+    CBgraFrame oFrame;
+    oFrame.OpenFile(L"D:\\22.png");
+    oFrame.SaveFile(L"D:\\oleg.png", 4);
+    return 0;
+#endif
+
     CApplicationFonts oFonts;
     oFonts.Initialize();
 

X2tConverter/build/Qt/X2tConverter.pri

@@ -7,7 +7,7 @@
 QT       -= core
 QT       -= gui
 
-VERSION = 2.4.471.0
+VERSION = 2.4.472.0
 DEFINES += INTVER=$$VERSION
 
 TARGET = x2t

X2tConverter/src/ASCConverters.cpp

@@ -2511,7 +2511,7 @@ namespace NExtractTools
            oHtmlRenderer.CreateOfficeFile(sToDir);
            IOfficeDrawingFile* pReader = NULL;
            nRes = PdfDjvuXpsToRenderer(&pReader, &oHtmlRenderer, sFrom, nFormatFrom, sTo, sTemp, params, &oApplicationFonts);
-           oHtmlRenderer.CloseFile();
+           oHtmlRenderer.CloseFile(params.getIsNoBase64());
            RELEASEOBJECT(pReader);
        }
 	   else if(0 != (AVS_OFFICESTUDIO_FILE_IMAGE & nFormatTo))

XlsxSerializerCom/Common/BinReaderWriterDefines.h

@@ -656,7 +656,8 @@ namespace BinXlsxRW
 		Solved = 5,
 		Document = 6,
 		Replies = 7,
-		Reply = 8
+		Reply = 8,
+		OOTime = 9
 	};}
 	namespace c_oSer_ConditionalFormatting{enum c_oSer_ConditionalFormatting
 	{

XlsxSerializerCom/Common/Common.h

@@ -51,6 +51,7 @@ namespace SerializeCommon
 	public :
 		std::wstring sText;
 		std::wstring sTime;
+		std::wstring sOOTime;
 		std::wstring sUserId;
 		std::wstring sUserName;
 		std::wstring sQuoteText;

XlsxSerializerCom/Reader/BinaryWriter.h

@@ -3481,6 +3481,11 @@ namespace BinXlsxRW
 					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentData::Time);
 					m_oBcw.m_oStream.WriteStringW(pCommentData->sTime);
 				}
+				if(!pCommentData->sOOTime.empty())
+				{
+					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentData::OOTime);
+					m_oBcw.m_oStream.WriteStringW(pCommentData->sOOTime);
+				}
 				if (!pCommentData->sUserId.empty())
 				{
 					m_oBcw.m_oStream.WriteBYTE(c_oSer_CommentData::UserId);

XlsxSerializerCom/Writer/BinaryReader.h

@@ -2254,6 +2254,8 @@ namespace BinXlsxRW {
 				pComments->sText = m_oBufferedStream.GetString4(length);
 			else if ( c_oSer_CommentData::Time == type )
 				pComments->sTime = m_oBufferedStream.GetString4(length);
+			else if ( c_oSer_CommentData::OOTime == type )
+				pComments->sOOTime = m_oBufferedStream.GetString4(length);
 			else if ( c_oSer_CommentData::UserId == type )
 				pComments->sUserId = m_oBufferedStream.GetString4(length);
 			else if ( c_oSer_CommentData::UserName == type )