no base 64 data

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

@@ -125,6 +125,7 @@ const double g_dKoef_mm_to_hps = 2 * g_dKoef_mm_to_pt;
 
 const static wchar_t* g_sFormatSignature = L"DOCY";
 const int g_nFormatVersion = 5;
+const int g_nFormatVersionNoBase64 = 10;
 extern int g_nCurFormatVersion;
 	namespace c_oAscWrapStyle{enum c_oSerFormat
 	{
@@ -715,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);
@@ -7714,9 +7719,9 @@ namespace BinDocxRW
 			m_nLastFilePos = 0;
 			m_nRealTableCount = 0;
 		}
-        static std::wstring WriteFileHeader(long nDataSize)
+        static std::wstring WriteFileHeader(long nDataSize, int version)
 		{
-            std::wstring sHeader = std::wstring(g_sFormatSignature) + L";v" + std::to_wstring(g_nFormatVersion) + L";" + std::to_wstring(nDataSize) + L";";
+            std::wstring sHeader = std::wstring(g_sFormatSignature) + L";v" + std::to_wstring(version) + L";" + std::to_wstring(nDataSize) + L";";
 			return sHeader;
 		}
 		void WriteMainTableStart()

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp

@@ -47,6 +47,7 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
 	m_pCurFileWriter	= NULL;
 
 	m_bIsNoBase64Save	= false;
+	m_bIsNoBase64	= false;
 	m_bSaveChartAsImg	= false;
 }
 BinDocxRW::CDocxSerializer::~CDocxSerializer()
@@ -54,52 +55,6 @@ BinDocxRW::CDocxSerializer::~CDocxSerializer()
 	RELEASEOBJECT(m_pParamsWriter);
 	RELEASEOBJECT(m_pCurFileWriter);
 }
-bool BinDocxRW::CDocxSerializer::ConvertDocxToDoct(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions)
-{
-    std::wstring strDirSrc      = NSSystemPath::Combine(sTmpDir,	L"from");
-    std::wstring strDirDst      = NSSystemPath::Combine(sTmpDir,	L"to");
-    std::wstring strEditorBin   = NSSystemPath::Combine(strDirDst,	L"Editor.bin");
-
-    NSDirectory::CreateDirectory(strDirSrc);
-	NSDirectory::CreateDirectory(strDirDst);
-
-    COfficeUtils oCOfficeUtils(NULL);
-
-    if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
-		if(saveToFile(strEditorBin, strDirSrc, sXMLOptions))
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName))
-				return true;
-	return false;
-}
-bool BinDocxRW::CDocxSerializer::ConvertDoctToDocx(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions)
-{
-	std::wstring strDirSrc		= NSSystemPath::Combine(sTmpDir,	L"from");
-	std::wstring strEditorBin	= NSSystemPath::Combine(strDirSrc,	L"Editor.bin");
-	std::wstring strDirDst		= NSSystemPath::Combine(sTmpDir,	L"to");
-	
-	NSDirectory::CreateDirectory(strDirSrc);
-	NSDirectory::CreateDirectory(strDirDst);
-	
-    std::wstring sEditorBin = strEditorBin;
-
-    COfficeUtils oCOfficeUtils(NULL);
-
-    if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
-    {
-        std::wstring sMediaPath;
-        std::wstring sThemePath;
-        std::wstring sEmbedPath;
-
-        CreateDocxFolders(strDirDst, sThemePath, sMediaPath, sEmbedPath);
-
-        if(loadFromFile(sEditorBin, strDirDst, sXMLOptions, sThemePath, sMediaPath, sEmbedPath))
-        {
-            if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, true))
-				return true;
-        }
-    }
-    return false;
-}
 bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions)
 {
 	OOX::CPath pathMain(sSrcFileName);
@@ -144,13 +99,17 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 
 	BinaryFileWriter oBinaryFileWriter(*m_pParamsWriter);
 	
+	if (m_bIsNoBase64)
+	{
+		oBufferedStream.WriteStringUtf8(oBinaryFileWriter.WriteFileHeader(0, g_nFormatVersionNoBase64));
+	}
 	oBinaryFileWriter.intoBindoc(sDstPath);
 	
 	BYTE* pbBinBuffer = oBufferedStream.GetBuffer();
 	int nBinBufferLen = oBufferedStream.GetPosition();
 
 
-    if (m_bIsNoBase64Save)
+	if (m_bIsNoBase64 || m_bIsNoBase64Save)
 	{
 		NSFile::CFileBinary oFile;
 		oFile.CreateFileW(sSrcFileName);
@@ -166,7 +125,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const std::wstring& sSrcFileName, co
 		{
 			NSFile::CFileBinary oFile;
 			oFile.CreateFileW(sSrcFileName);
-			oFile.WriteStringUTF8(oBinaryFileWriter.WriteFileHeader(nBinBufferLen));
+			oFile.WriteStringUTF8(oBinaryFileWriter.WriteFileHeader(nBinBufferLen, g_nFormatVersion));
 			oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
 			oFile.CloseFile();
 		}
@@ -268,27 +227,42 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				else
                     dst_len += _c;
 			}
-			
-            int nDataSize = atoi(dst_len.c_str());
-			BYTE* pData = new BYTE[nDataSize];
-			
-            if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
+			int nVersion = g_nFormatVersion;
+			if(!version.empty())
 			{
-                NSBinPptxRW::CDrawingConverter oDrawingConverter;
-				
-				NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
-				oBufferedStream.Init(pData, 0, nDataSize);
+				version = version.substr(1);
+				g_nCurFormatVersion = nVersion = std::stoi(version.c_str());
+			}
+			bool bIsNoBase64 = nVersion == g_nFormatVersionNoBase64;
 
-				int nVersion = g_nFormatVersion;
-                if(!version.empty())
+			NSBinPptxRW::CDrawingConverter oDrawingConverter;
+			NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
+			int nDataSize = 0;
+			BYTE* pData = NULL;
+			if (!bIsNoBase64)
+			{
+				nDataSize = atoi(dst_len.c_str());
+				pData = new BYTE[nDataSize];
+				if(Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
 				{
-                    version = version.substr(1);
-                    int nTempVersion = atoi(version.c_str());
-					if(0 != nTempVersion)
-					{
-						g_nCurFormatVersion = nVersion = nTempVersion;
-					}
-				}		
+					oBufferedStream.Init(pData, 0, nDataSize);
+				}
+				else
+				{
+					RELEASEARRAYOBJECTS(pData);
+				}
+			}
+			else
+			{
+				nDataSize = nBase64DataSize;
+				pData = pBase64Data;
+				oBufferedStream.Init(pData, 0, nDataSize);
+				oBufferedStream.Seek(nIndex);
+			}
+
+			
+			if (NULL != pData)
+			{
 				oDrawingConverter.SetMainDocument(this);
 				oDrawingConverter.SetMediaDstPath(sMediaPath);
 				oDrawingConverter.SetEmbedDstPath(sEmbedPath);
@@ -343,6 +317,11 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
 				bResultOk = true;
 
 			}
+			if (!bIsNoBase64)
+			{
+				RELEASEARRAYOBJECTS(pData);
+			}
+
 		}
 		RELEASEARRAYOBJECTS(pBase64Data);
 	}
@@ -472,6 +451,10 @@ void BinDocxRW::CDocxSerializer::setIsNoBase64Save(bool bIsNoBase64Save)
 {
 	m_bIsNoBase64Save = bIsNoBase64Save;
 }
+void BinDocxRW::CDocxSerializer::setIsNoBase64(bool bIsNoBase64)
+{
+	m_bIsNoBase64 = bIsNoBase64;
+}
 void BinDocxRW::CDocxSerializer::setSaveChartAsImg(bool bSaveChartAsImg)
 {
 	m_bSaveChartAsImg = bSaveChartAsImg;

ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h

@@ -54,6 +54,7 @@ namespace BinDocxRW
         std::wstring			m_sFontDir;
         std::wstring			m_sEmbeddedFontsDir;
 		bool					m_bIsNoBase64Save;
+		bool					m_bIsNoBase64;
 		bool					m_bSaveChartAsImg;
 		ParamsWriter*			m_pParamsWriter;
 		Writers::FileWriter*	m_pCurFileWriter;
@@ -61,9 +62,6 @@ namespace BinDocxRW
 		CDocxSerializer();
 		virtual ~CDocxSerializer();
 
-        bool ConvertDocxToDoct(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions);
-        bool ConvertDoctToDocx(const std::wstring& sSrcFileName, const std::wstring& sDstFileName, const std::wstring& sTmpDir, const std::wstring& sXMLOptions);
-		
         bool loadFromFile   (const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions, const std::wstring& sThemePath, const std::wstring& sMediaPath, const std::wstring& sEmbedPath);
         bool saveToFile     (const std::wstring& sSrcFileName, const std::wstring& sDstPath, const std::wstring& sXMLOptions);
 
@@ -78,6 +76,7 @@ namespace BinDocxRW
         void setFontDir         (const std::wstring& sFontDir);
         void setEmbeddedFontsDir(const std::wstring& sEmbeddedFontsDir);
         void setIsNoBase64Save  (bool bIsNoBase64Save);
+        void setIsNoBase64      (bool bIsNoBase64);
         void setSaveChartAsImg  (bool bSaveChartAsImg);
 	};
 }

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.cpp

@@ -49,6 +49,7 @@ namespace BinXlsxRW{
 	CXlsxSerializer::CXlsxSerializer()
 	{
 		m_pExternalDrawingConverter = NULL;
+		m_bIsNoBase64 = false;
 	}
 	CXlsxSerializer::~CXlsxSerializer()
 	{
@@ -134,7 +135,7 @@ namespace BinXlsxRW{
 		oOfficeDrawingConverter.SetFontPicker(pFontPicker);
 
 		BinXlsxRW::BinaryFileWriter oBinaryFileWriter(fp);
-		oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions);
+		oBinaryFileWriter.Open(sSrcPath, sDstFileName, pEmbeddedFontsManager, &oOfficeDrawingConverter, sXMLOptions, m_bIsNoBase64);
 
 		RELEASEOBJECT(pFontPicker);
 		return true;
@@ -226,6 +227,11 @@ namespace BinXlsxRW{
 	{
 		m_pExternalDrawingConverter = pDrawingConverter;
 	}
+	void CXlsxSerializer::setIsNoBase64(bool bIsNoBase64)
+	{
+		m_bIsNoBase64 = bIsNoBase64;
+	}
+
 	void CXlsxSerializer::writeChartXlsx(const std::wstring& sDstFile, const OOX::Spreadsheet::CChartSpace& oChart)
 	{
 	//анализируем chart

ASCOfficeDocxFile2/DocWrapper/XlsxSerializer.h

@@ -55,6 +55,7 @@ namespace BinXlsxRW {
         std::wstring m_sFontDir;
         std::wstring m_sEmbeddedFontsDir;
 		NSBinPptxRW::CDrawingConverter* m_pExternalDrawingConverter;
+		bool m_bIsNoBase64;
 	public:
 		CXlsxSerializer();
 		~CXlsxSerializer();
@@ -69,6 +70,7 @@ namespace BinXlsxRW {
         void setFontDir			(const std::wstring& sFontDir);
         void setEmbeddedFontsDir(const std::wstring& sEmbeddedFontsDir);
 		void setDrawingConverter(NSBinPptxRW::CDrawingConverter* pDrawingConverter);
+		void setIsNoBase64		(bool bIsNoBase64);
 
         void writeChartXlsx     (const std::wstring& sDstFile ,const OOX::Spreadsheet::CChartSpace& oChart);
 	};

ASCOfficeOdfFile/formulasconvert/formulasconvert.h

@@ -51,6 +51,7 @@ public:
     
     // $Лист1.$A$1 -> Лист1!$A$1
 	std::wstring convert_named_ref(std::wstring const & expr, bool withTableName = true, std::wstring separator = L" ");
+	std::wstring get_table_name();
 
 	//a-la convert without check formula
     std::wstring convert_named_expr(std::wstring const & expr, bool withTableName = true);
@@ -90,7 +91,7 @@ public:
     std::wstring convert_named_ref	(std::wstring const & expr);
 	std::wstring convert_named_formula(std::wstring const & expr);
 
-	std::wstring get_base_cell_formula(std::wstring const & expr);
+	std::wstring get_base_cell_formula();
 
 	//Sheet2!C3:C19 -> Sheet2.C3:Sheet2.C19 
     std::wstring convert_chart_distance(std::wstring const & expr);

ASCOfficeOdfFile/formulasconvert/formulasconvert_odf.cpp

@@ -43,7 +43,6 @@ namespace formulasconvert {
 	class odf2oox_converter::Impl
 	{
 	public:
-		static bool convert_with_TableName;
 
 		std::wstring convert(const std::wstring& expr);
 		std::wstring convert_chart_distance(const std::wstring& expr);
@@ -61,8 +60,12 @@ namespace formulasconvert {
 		void replace_named_ref(std::wstring & expr, bool w = true);
 		bool find_first_ref(std::wstring const & expr, std::wstring & table,  std::wstring & ref);
 		bool find_first_last_ref(std::wstring const & expr, std::wstring & table, std::wstring & ref_first,std::wstring & ref_last);
+	
+		static bool			convert_with_TableName;
+		static std::wstring table_name_;
 	};
-	bool odf2oox_converter::Impl::convert_with_TableName = true;
+	bool			odf2oox_converter::Impl::convert_with_TableName = true;
+	std::wstring	odf2oox_converter::Impl::table_name_			= L"";
 
 	bool odf2oox_converter::Impl::find_first_last_ref(std::wstring const & expr, std::wstring & table,std::wstring & ref_first,std::wstring & ref_last)
 	{	
@@ -152,6 +155,8 @@ namespace formulasconvert {
 			std::wstring sheet1 = what[1].str();
 			XmlUtils::replace_all( sheet1, L"$", L"");
 
+			table_name_ = sheet1;
+
 			const std::wstring c1 = what[2].str(); 
 			const std::wstring c2 = what[3].str(); 
 
@@ -180,6 +185,8 @@ namespace formulasconvert {
 			const std::wstring c2 = what[3].str(); //sheet name 2
 			const std::wstring c3 = what[4].str(); 
 
+			table_name_ = sheet1;
+
 			if (convert_with_TableName)
 			{
 				return (sheet1 + L"!") + c1 + (c2.empty() ? L"" : (L":" + c3) );
@@ -189,6 +196,14 @@ namespace formulasconvert {
 				return c1 + (c3.empty() ? L"" : (L":" + c3) );
 			}
 		}
+		else if (sz == 5 && !what[1].matched)
+		{
+			const std::wstring c1 = what[2].str(); 
+			const std::wstring c2 = what[3].str(); //sheet name 2
+			const std::wstring c3 = what[4].str(); 
+
+			return c1 + (c3.empty() ? L"" : (L":" + c3) );
+		}
 		return L"";
 	}
 	std::wstring odf2oox_converter::Impl::replace_named_ref_formater1(boost::wsmatch const & what)
@@ -216,10 +231,10 @@ namespace formulasconvert {
 	void odf2oox_converter::Impl::replace_cells_range(std::wstring& expr, bool withTableName)
 	{
 		convert_with_TableName = withTableName;
-		//boost::wregex simpleRef(L"\\[\\.([a-zA-Z]+\\d+)(?::\\.([a-zA-Z]+\\d+)){0,1}\\]");
-		boost::wregex complexRef(L"\\[(?:\\$)?([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}\\]");
+
+		boost::wregex complexRef(L"\\[(?:\$)?([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::(\\${0,1}[^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}\\]");
 		/*
-									 [     $   Sheet2          . A1                  :  . B5                    ]
+									 [     $   Sheet2          . A1								 : ( $   Sheet2)? . B5                    ]
 		*/
 
 		const std::wstring res = boost::regex_replace(
@@ -235,7 +250,7 @@ namespace formulasconvert {
 		
 		//boost::wregex complexRef(L"\\${0,1}([^\\.]+?){0,1}\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)(?::\\.(\\${0,1}[a-zA-Z]+\\${0,1}\\d+)){0,1}");
 		boost::wregex complexRef(L"\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)(?::\\${0,1}([^\\.\\s]+?){0,1}\\.(\\${0,1}[a-zA-Z]*\\${0,1}\\d*)){0,1}");
-
+	
 		const std::wstring res = boost::regex_replace(
 			expr,
 			complexRef,
@@ -551,6 +566,11 @@ namespace formulasconvert {
 	{
 	}
 
+	std::wstring odf2oox_converter::get_table_name()
+	{
+		return impl_->table_name_;
+	}
+
 	std::wstring odf2oox_converter::convert(const std::wstring& expr)
 	{
 		return impl_->convert(expr);
@@ -590,34 +610,37 @@ namespace formulasconvert {
 
 		bool isFormula = impl_->check_formula(workstr);
 
-		boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
-
-		workstr = boost::regex_replace(
-			workstr,
-			complexRef,
-			&replace_point_space,
-			boost::match_default | boost::format_all);	
-
-		XmlUtils::replace_all( workstr, L"'", L"APOSTROF");
-	   
-		impl_->replace_cells_range(workstr, withTableName);
-		impl_->replace_semicolons(workstr);
-		impl_->replace_vertical(workstr);
-
-		int res_find=0;
-		if ((res_find = workstr.find(L"CONCATINATE")) > 0)
+		if (isFormula)
 		{
-			//могут быть частично заданы диапазоны
-			//todooo
-
+			workstr = impl_->convert(expr);
 		}
- 		XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
-		XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
-		XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
-
-		if (!isFormula)
+		else
 		{
-			workstr = L"\"" + workstr + L"\"";
+
+			boost::wregex complexRef(L"('(?!\\s\\'){0,1}.*?')");// поиск того что в апострофах и замена там
+
+			workstr = boost::regex_replace(
+				workstr,
+				complexRef,
+				&replace_point_space,
+				boost::match_default | boost::format_all);	
+
+			XmlUtils::replace_all( workstr, L"'", L"APOSTROF");
+		   
+			impl_->replace_cells_range(workstr, withTableName);
+			impl_->replace_semicolons(workstr);
+			impl_->replace_vertical(workstr);
+
+			int res_find=0;
+			if ((res_find = workstr.find(L"CONCATINATE")) > 0)
+			{
+				//могут быть частично заданы диапазоны
+				//todooo
+
+			}
+ 			XmlUtils::replace_all( workstr, L"PROBEL"	, L" ");
+			XmlUtils::replace_all( workstr, L"APOSTROF"	, L"'");
+			XmlUtils::replace_all( workstr, L"TOCHKA"	, L".");
 		}
 		return workstr;
 	}

ASCOfficeOdfFile/formulasconvert/formulasconvert_oox.cpp

@@ -614,7 +614,7 @@ std::wstring oox2odf_converter::convert_named_formula(const std::wstring& expr)
     impl_->replace_named_formula(workstr);
     return workstr;
 }
-std::wstring oox2odf_converter::get_base_cell_formula(const std::wstring& expr)
+std::wstring oox2odf_converter::get_base_cell_formula()
 {
     return impl_->base_cell_formula_;
 }

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,254 @@
+/*
+ * (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_;
+
+	struct _desc
+	{
+		void clear()
+		{
+		}
+		std::wstring	name;
+	}current_;
+};
+
+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_->current_.clear();
+	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",				impl_->current_.name); 
+			//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++)
+				{
+					CP_XML_STREAM() << 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::set_view_name(std::wstring name)
+{
+	impl_->current_.name = name;
+}
+
+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,84 @@
+/*
+ * (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 get_view_count();//equal in libre
+	int get_cache_count();
+
+	void set_view_name(std::wstring name);
+
+	void add_cache(std::wstring definitions, std::wstring records);
+
+	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/xlsx_tablecontext.h

@@ -48,7 +48,6 @@ class xlsx_table_context
 public:
     xlsx_table_context(xlsx_conversion_context * Context, xlsx_text_context & textCotnext);
 
-public:
     void start_table(std::wstring tableName, std::wstring tableStyleName, int id);
     void end_table();
 

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

@@ -31,6 +31,7 @@
  */
 
 #include "table_data_pilot_tables.h"
+#include "../formulasconvert/formulasconvert.h"
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
@@ -47,10 +48,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 +72,54 @@ 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-target-range-address", table_show_target_range_address_);
+    CP_APPLY_ATTR(L"table:show-filter-button"		, table_show_filter_button_);
+	CP_APPLY_ATTR(L"table:target-range-address"		, table_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();
+
+	if (table_name_)	Context.get_pivots_context().set_view_name(*table_name_);
+	if (table_target_range_address_)
+	{
+		formulasconvert::odf2oox_converter formulas_converter;
+		
+		std::wstring ref = formulas_converter.convert_named_ref(*table_target_range_address_, false);
+		std::wstring table_name = formulas_converter.get_table_name();
+
+		//Context.get_table_context()
+
+		//Context.get_pivots_context()->set_view_target_range(ref);
+		//Context.get_pivots_context()->set_view_target_table(table_index);
 	}
+
+	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 +127,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 +142,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 +173,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 +187,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 +202,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 +217,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 +237,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_;
@@ -83,16 +88,17 @@ private:
     virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
 
      _CP_OPT(std::wstring)			table_name_;
+	 _CP_OPT(std::wstring)			table_target_range_address_;
      _CP_OPT(std::wstring)			table_application_data_;
      _CP_OPT(std::wstring)			table_buttons_;
 	 _CP_OPT(odf_types::Bool)		table_drill_down_ondouble_click_;
      _CP_OPT(odf_types::grand_total)table_grand_total_;
      _CP_OPT(odf_types::Bool)		table_identify_categories_;
      _CP_OPT(odf_types::Bool)		table_ignore_empty_rows_;
-     _CP_OPT(odf_types::Bool)		table_show_filterbutton_;
-     _CP_OPT(odf_types::Bool)		table_show_target_range_address_;
+     _CP_OPT(odf_types::Bool)		table_show_filter_button_;
 	
-	  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/OdfFormat/abstract_xml.cpp

@@ -32,8 +32,6 @@
 
 #include "abstract_xml.h"
 
-#include <boost/foreach.hpp>
-
 namespace cpdoccore { 
 namespace odf_writer {
 

ASCOfficeOdfFileW/source/OdfFormat/calcext_elements.cpp

@@ -31,8 +31,6 @@
  */
 #include "calcext_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 
 #include <cpdoccore/xml/attributes.h>
@@ -86,9 +84,9 @@ void calcext_conditional_formats::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -115,9 +113,9 @@ void calcext_conditional_format::serialize(std::wostream & _Wostream)
         {   
 			CP_XML_ATTR_OPT(L"calcext:target-range-address",calcext_target_range_address_);
 
-			BOOST_REVERSE_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = content_.size() - 1; i >= 0; i--)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -144,9 +142,9 @@ void calcext_data_bar::serialize(std::wostream & _Wostream)
         {   
 			calcext_data_bar_attr_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -170,9 +168,9 @@ void calcext_color_scale::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {   
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -198,9 +196,9 @@ void calcext_icon_set::serialize(std::wostream & _Wostream)
         {   
 			calcext_icon_set_attr_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/draw_base.cpp

@@ -36,7 +36,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>
@@ -68,11 +67,11 @@ void draw_base::add_child_element( const office_element_ptr & child_element)
 {
 	content_.push_back(child_element);
 }
-void draw_base::serialize(std::wostream & _Wostream)
+void draw_base::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(_Wostream);
+		content_[i]->serialize(strm);
 	}
 }
 void draw_base::serialize_attlist(CP_ATTR_NODE)

ASCOfficeOdfFileW/source/OdfFormat/draw_frame.cpp

@@ -36,7 +36,6 @@
 #include <sstream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 #include <boost/regex.h>
 
@@ -88,9 +87,9 @@ void draw_image::serialize(std::wostream & _Wostream)
 
 			if (office_binary_data_)office_binary_data_->serialize(CP_XML_STREAM());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -136,9 +135,9 @@ void draw_chart::serialize(std::wostream & _Wostream)
 			draw_chart_attlist_.serialize(CP_GET_XML_NODE());
 			common_xlink_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -167,9 +166,9 @@ void draw_g::serialize(std::wostream & _Wostream)
         {
 			common_draw_attlists_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/draw_shapes.cpp

@@ -430,16 +430,15 @@ void draw_enhanced_geometry::serialize(std::wostream & _Wostream)
 			CP_XML_ATTR_OPT(L"svg:viewBox", svg_viewbox_);
 			draw_enhanced_geometry_attlist_.serialize(CP_GET_XML_NODE());
 			
-			BOOST_FOREACH(office_element_ptr & elm, draw_equation_)
+			for (size_t i = 0; i < draw_equation_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				draw_equation_[i]->serialize(CP_XML_STREAM());
 			}		
 			
-			BOOST_FOREACH(office_element_ptr & elm, draw_handle_)
+			for (size_t i = 0; i < draw_handle_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				draw_handle_[i]->serialize(CP_XML_STREAM());
 			}
-
 		}
 	}
 }

ASCOfficeOdfFileW/source/OdfFormat/list.cpp

@@ -32,8 +32,6 @@
 
 #include "list.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 
 #include <cpdoccore/xml/attributes.h>
@@ -80,9 +78,9 @@ void text_list_item::serialize(std::wostream & _Wostream)
         {
 			if (text_number_)text_number_->serialize(CP_XML_STREAM());
 
-			BOOST_FOREACH(const office_element_ptr & parElement, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				parElement->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -129,9 +127,9 @@ void text_list_header::serialize(std::wostream & _Wostream)
         {
 			if (text_number_)text_number_->serialize(CP_XML_STREAM());
 			
-			BOOST_FOREACH(const office_element_ptr & parElement, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				parElement->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/mediaitems.cpp

@@ -34,7 +34,6 @@
 #include "odf_rels.h"
 
 #include <boost/regex.h>
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 
 #include <cpdoccore/xml/utils.h>
@@ -85,11 +84,11 @@ void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wst
 
 	std::wstring output_path ;
 
-    BOOST_FOREACH(item const & elm, items_)
+	for (size_t i = 0; i < items_.size(); i++)
     {
-		if (elm.oox_ref == input_path)
+		if (items_[i].oox_ref == input_path)
 		{
-			output_path  = elm.odf_ref;
+			output_path  = items_[i].odf_ref;
 			break;
 		}
 	}
@@ -110,12 +109,11 @@ void _mediaitems::add_or_find(const std::wstring & oox_ref, Type type,  std::wst
 }
 void _mediaitems::dump_rels(rels & Rels, std::wstring local_path)
 {
-    size_t i = 0;
-    BOOST_FOREACH(item & elm, items_)
+	for (size_t i = 0; i < items_.size(); i++)
     {
-        Rels.add( relationship(
-                utils::media::get_rel_type(elm.type), 
-                local_path + elm.odf_ref)
+		Rels.add( relationship(
+                utils::media::get_rel_type(items_[i].type), 
+                local_path + items_[i].odf_ref)
                 );
 
     }        

ASCOfficeOdfFileW/source/OdfFormat/mediaitems_utils.cpp

@@ -33,7 +33,6 @@
 
 #include "mediaitems_utils.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 namespace cpdoccore { 

ASCOfficeOdfFileW/source/OdfFormat/number_style.cpp

@@ -30,9 +30,6 @@
  *
  */
 
-
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/simple_xml_writer.h>
 
 #include <cpdoccore/xml/xmlchar.h>
@@ -67,13 +64,13 @@ void number_style_base::serialize(std::wostream & strm)
  	if (style_text_properties_) 
 		style_text_properties_->serialize(strm);
  
-	BOOST_FOREACH(office_element_ptr & elm, style_map_)
-	{
-		elm->serialize(strm);
+	for (size_t i = 0; i < style_map_.size(); i++)
+	{		
+		style_map_[i]->serialize(strm);
     }
-	BOOST_FOREACH(office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(strm);
+		content_[i]->serialize(strm);
 	}
 }
 void number_style_base::serialize(CP_ATTR_NODE)
@@ -166,9 +163,9 @@ void number_text::serialize(std::wostream & strm)
     {
 		CP_XML_NODE_SIMPLE()
         {  
-			BOOST_FOREACH(office_element_ptr & elm, text_)
-			{
-				elm->serialize(CP_XML_STREAM());
+			for (size_t i = 0; i < text_.size(); i++)
+			{		
+				text_[i]->serialize(CP_XML_STREAM());
 			}		
 		}
 	}
@@ -194,10 +191,10 @@ void number_embedded_text::serialize(std::wostream & strm)
         {  
 			CP_XML_ATTR_OPT(L"number:position", number_position_);
 			
-			BOOST_FOREACH(office_element_ptr & elm, text_)
-			{
-				elm->serialize(CP_XML_STREAM());
-			}		
+			for (size_t i = 0; i < text_.size(); i++)
+			{		
+				text_[i]->serialize(CP_XML_STREAM());
+			}	
 		}
 	}
 }
@@ -228,10 +225,10 @@ void number_number::serialize(std::wostream & strm)
 
 			CP_XML_ATTR_OPT(L"number:min-integer-digits", number_min_integer_digits_);
 			CP_XML_ATTR_OPT(L"number:grouping", number_grouping_);
-			
-			BOOST_FOREACH(office_element_ptr & elm, number_embedded_text_)
-			{
-				elm->serialize(CP_XML_STREAM());
+
+			for (size_t i = 0; i < number_embedded_text_.size(); i++)
+			{		
+				number_embedded_text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -336,9 +333,9 @@ void number_text_content::serialize(std::wostream & strm)
     {
 		CP_XML_NODE_SIMPLE()
         {  
-			BOOST_FOREACH(office_element_ptr & elm, text_)
-			{
-				elm->serialize(CP_XML_STREAM());
+			for (size_t i = 0; i < text_.size(); i++)
+			{		
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/object_package.cpp

@@ -30,8 +30,6 @@
  *
  */
 
-
-#include <boost/foreach.hpp>
 #include <cpdoccore/utf8cpp/utf8.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 
@@ -92,9 +90,10 @@ namespace odf_writer
 ///////////////
 		void manifect_file::add_rels(rels  & r)
 		{
-			BOOST_FOREACH(relationship & item, r.relationships())
+			std::vector<relationship> & rels = r.relationships();
+			for (size_t i = 0; i < rels.size(); i++)
 			{
-				rels_.add(item);
+				rels_.add(rels[i]);
 			}
 		}
 		manifect_file::manifect_file(std::wstring t)
@@ -188,13 +187,14 @@ namespace odf_writer
 			std::wstring path = RootPath + FILE_SEPARATOR_STR + L"Media";
             NSDirectory::CreateDirectory(path);
 
-			BOOST_FOREACH( _mediaitems::item & item, mediaitems_.items() )
+			std::vector< _mediaitems::item >  & items =  mediaitems_.items();
+			for (size_t i = 0; i < items.size(); i++)
 			{
-				if (item.type == _mediaitems::typeMedia)
+				if (items[i].type == _mediaitems::typeMedia)
 				{
-					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.odf_ref;
+					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].odf_ref;
 
-					NSFile::CFileBinary::Copy(item.oox_ref, file_name_out);
+					NSFile::CFileBinary::Copy(items[i].oox_ref, file_name_out);
 				}
 			}
 
@@ -212,15 +212,16 @@ namespace odf_writer
 			std::wstring path = RootPath + FILE_SEPARATOR_STR + L"Pictures";
             NSDirectory::CreateDirectory(path);
 
-			BOOST_FOREACH( _mediaitems::item & item, mediaitems_.items() )
+			std::vector< _mediaitems::item >  & items =  mediaitems_.items();
+			for (size_t i = 0; i < items.size(); i++)
 			{
-				if (item.type == _mediaitems::typeImage && item.oox_ref.length()>0)
+				if (items[i].type == _mediaitems::typeImage && items[i].oox_ref.length()>0)
 				{
-					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.odf_ref;
+					std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].odf_ref;
 
 					try
 					{
-						NSFile::CFileBinary::Copy(item.oox_ref, file_name_out);
+						NSFile::CFileBinary::Copy(items[i].oox_ref, file_name_out);
 					}catch (...)
 					{
 					}
@@ -289,13 +290,12 @@ namespace odf_writer
 		{
 			if (base_)base_->write(RootPath);
 			
-			long count = 0;
-			BOOST_FOREACH(const element_ptr & item, objects_)
-			{				
-				std::wstring path = RootPath + FILE_SEPARATOR_STR + item->local_path;
+			for (size_t i = 0; i < objects_.size(); i++)
+			{		
+				std::wstring path = RootPath + FILE_SEPARATOR_STR + objects_[i]->local_path;
                 NSDirectory::CreateDirectory(path);
 				
-				item->write(path);
+				objects_[i]->write(path);
 			}
 			if (manifest_)	manifest_->write(RootPath);
 			if (mimetype_)  mimetype_->write(RootPath);

ASCOfficeOdfFileW/source/OdfFormat/odf_chart_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include "../../../ASCOfficeOdfFile/formulasconvert/formulasconvert.h"

ASCOfficeOdfFileW/source/OdfFormat/odf_comment_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <iostream>

ASCOfficeOdfFileW/source/OdfFormat/odf_conversion_context.cpp

@@ -30,8 +30,6 @@
  *
  */
 
-
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
  
 #include "office_spreadsheet.h"
@@ -134,16 +132,15 @@ void odf_conversion_context::end_document()
 			objects_.back().scripts->serialize(content_root_->styles());	
 
 		object.content->serialize(content_root_->content());	
-		BOOST_FOREACH(const office_element_ptr & elm, object.content_styles)
+
+		for (size_t i = 0; i < object.content_styles.size(); i++)
 		{
-			elm->serialize(content_root_->styles());
+			object.content_styles[i]->serialize(content_root_->styles());
 		}
-
 		package::content_simple_ptr content_style_ = package::content_simple::create();
-		BOOST_FOREACH(const office_element_ptr & elm, object.styles)
+		for (size_t i = 0; i < object.styles.size(); i++)
 		{// мастер-пейджы, заданные заливки (градиенты, битмапы), дефолтные стили, колонтитулы, разметки, заметки,...
-
-			elm->serialize(content_style_->content());
+			object.styles[i]->serialize(content_style_->content());
 		}
 		package::content_simple_ptr content_settings_ = package::content_simple::create();
 		object.settings->serialize(content_settings_->content());

ASCOfficeOdfFileW/source/OdfFormat/odf_drawing_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/algorithm/string.hpp>
 

ASCOfficeOdfFileW/source/OdfFormat/odf_notes_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <boost/lexical_cast.hpp>
 
 #include <iostream>

ASCOfficeOdfFileW/source/OdfFormat/odf_page_layout_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "odf_page_layout_context.h" 

ASCOfficeOdfFileW/source/OdfFormat/odf_rels.cpp

@@ -30,9 +30,6 @@
  *
  */
 
-
-#include <boost/foreach.hpp>
-
 #include "odf_rels.h"
 
 #include <cpdoccore/xml/attributes.h>
@@ -54,11 +51,11 @@ void relationship::serialize(std::wostream & _Wostream)
     }
 }
 
-void rels::serialize(std::wostream & _Wostream)
+void rels::serialize(std::wostream & strm)
 {
-    BOOST_FOREACH(relationship & r, relationship_)
+	for (size_t i = 0; i < relationship_.size(); i++)
     {
-        r.serialize(_Wostream);
+        relationship_[i].serialize(strm);
 	}
 }
 

ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp

@@ -40,7 +40,6 @@
 
 #include "style_paragraph_properties.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 namespace cpdoccore {
@@ -56,10 +55,10 @@ void calc_paragraph_properties_content(std::vector<style_paragraph_properties*>
 {
 	if (result == NULL)return;
 
-    BOOST_REVERSE_FOREACH(style_paragraph_properties* v, parProps)
+	for (size_t i = parProps.size() - 1; i >= 0; i--)
     {
-        if (v)
-            result->apply_from(v->content_);
+        if (parProps[i])
+            result->apply_from(parProps[i]->content_);
     }
 }
 
@@ -93,7 +92,7 @@ void odf_style_context::create_style(std::wstring oox_name, style_family::type f
 {
 	std::wstring odf_name = oox_name;
 	
-	if (odf_name.length() <1)odf_name = find_free_name(family);
+	if (odf_name.empty()) odf_name = find_free_name(family);
 
 	office_element_ptr elm;
 	create_element(L"style", L"style", elm, odf_context_);

ASCOfficeOdfFileW/source/OdfFormat/odf_table_context.cpp

@@ -32,8 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
-
 #include <iostream>
 
 #include "odf_conversion_context.h"

ASCOfficeOdfFileW/source/OdfFormat/odf_text_context.cpp

@@ -32,7 +32,6 @@
 
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <boost/regex.hpp>
 
 #include <iostream>

ASCOfficeOdfFileW/source/OdfFormat/ods_table_context.cpp

@@ -37,7 +37,6 @@
 #include "ods_conversion_context.h"
 #include "logging.h"
 
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "../../../ASCOfficeOdfFile/formulasconvert/formulasconvert.h"
@@ -139,7 +138,7 @@ void ods_table_context::add_defined_range(const std::wstring & name, const std::
 	XmlUtils::replace_all( odf_range, L"[", L"");
 	XmlUtils::replace_all( odf_range, L"]", L"");
 	
-	std::wstring odf_base_cell = formulas_converter.get_base_cell_formula(cell_range);
+	std::wstring odf_base_cell = formulas_converter.get_base_cell_formula();
 
 	named_range->table_name_ = name;
 	named_range->table_cell_range_address_ = odf_range;
@@ -183,7 +182,7 @@ void ods_table_context::add_defined_expression(const std::wstring & name, const
 	formulasconvert::oox2odf_converter formulas_converter;
 
 	std::wstring odf_value		= formulas_converter.convert_named_formula(value);
-	std::wstring odf_base_cell	= formulas_converter.get_base_cell_formula(value);
+	std::wstring odf_base_cell	= formulas_converter.get_base_cell_formula();
 
 	named_expression->table_name_		= name;
 	named_expression->table_expression_ = odf_value;

ASCOfficeOdfFileW/source/OdfFormat/office_annotation.cpp

@@ -32,8 +32,6 @@
 
 #include "office_annotation.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 
 #include <cpdoccore/xml/attributes.h>
@@ -159,9 +157,9 @@ void office_annotation::serialize(std::wostream & _Wostream)
 			if (dc_creator_)dc_creator_->serialize(CP_XML_STREAM());
 			if (dc_date_)	dc_date_->serialize(CP_XML_STREAM());
 			
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -210,9 +208,9 @@ void officeooo_annotation::serialize(std::wostream & _Wostream)
 			if (dc_creator_)dc_creator_->serialize(CP_XML_STREAM());
 			if (dc_date_)	dc_date_->serialize(CP_XML_STREAM());
 			
-			BOOST_FOREACH(const office_element_ptr & item, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				item->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/office_body.cpp

@@ -32,8 +32,6 @@
 
 #include "office_body.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 

ASCOfficeOdfFileW/source/OdfFormat/office_chart.cpp

@@ -33,10 +33,7 @@
 
 #include "office_chart.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
-
 #include <cpdoccore/xml/attributes.h>
 
 namespace cpdoccore { 
@@ -61,9 +58,9 @@ void office_chart::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -101,9 +98,9 @@ void chart_chart::serialize(std::wostream & _Wostream)
         {
 			chart_chart_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -271,9 +268,9 @@ void chart_plot_area::serialize(std::wostream & _Wostream)
         {
 			chart_plot_area_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -349,9 +346,9 @@ void chart_axis::serialize(std::wostream & _Wostream)
         {
 			chart_axis_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -427,9 +424,9 @@ void chart_series::serialize(std::wostream & _Wostream)
         {
 			chart_series_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/office_settings.cpp

@@ -32,8 +32,6 @@
 
 #include "office_settings.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 
@@ -56,9 +54,9 @@ void office_settings::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -88,9 +86,9 @@ void settings_config_item_set::serialize(std::wostream & _Wostream)
         {
 			CP_XML_ATTR( L"config:name", config_name_);
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -145,9 +143,9 @@ void settings_config_item_map_indexed::serialize(std::wostream & _Wostream)
         {
 			CP_XML_ATTR_OPT( L"config:name", config_name_);
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -174,9 +172,9 @@ void settings_config_item_map_named::serialize(std::wostream & _Wostream)
         {
 			CP_XML_ATTR_OPT( L"config:name", config_name_);
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -203,9 +201,9 @@ void settings_config_item_map_entry::serialize(std::wostream & _Wostream)
         {
 			CP_XML_ATTR_OPT( L"config:name", config_name_);
 
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/office_spreadsheet.cpp

@@ -32,8 +32,6 @@
 
 #include "office_spreadsheet.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
 
@@ -63,9 +61,9 @@ void office_spreadsheet::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/office_text.cpp

@@ -32,10 +32,7 @@
 
 #include "office_text.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
-
 #include <cpdoccore/xml/attributes.h>
 
 namespace cpdoccore { 

ASCOfficeOdfFileW/source/OdfFormat/paragraph_elements.cpp

@@ -35,7 +35,6 @@
 #include <ostream>
 #include <string>
 
-#include <boost/foreach.hpp>
 #include <boost/algorithm/string.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>
@@ -250,9 +249,9 @@ void text_span::serialize(std::wostream & _Wostream)
         { 	
 			CP_XML_ATTR_OPT(L"text:style-name", text_style_name_);
 			
-			BOOST_FOREACH(const office_element_ptr & parElement, paragraph_content_)
+			for (size_t i = 0; i < paragraph_content_.size(); i++)
 			{
-                if (parElement)  parElement->serialize(CP_XML_STREAM());
+				paragraph_content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -547,9 +546,9 @@ void text_placeholder::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         { 	
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}    
@@ -585,12 +584,12 @@ void text_page_number::serialize(std::wostream & _Wostream)
 			common_num_format_attlist_.serialize(CP_GET_XML_NODE());
 			common_field_fixed_attlist_.serialize(CP_GET_XML_NODE());
 
-			CP_XML_ATTR_OPT(L"text:page-adjust",text_page_adjust_);
-			CP_XML_ATTR_OPT(L"text:select-page",text_select_page_);
+			CP_XML_ATTR_OPT(L"text:page-adjust", text_page_adjust_);
+			CP_XML_ATTR_OPT(L"text:select-page", text_select_page_);
 			
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -625,9 +624,9 @@ void text_page_count::serialize(std::wostream & _Wostream)
         { 	
 			common_field_fixed_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -662,9 +661,9 @@ void text_date::serialize(std::wostream & _Wostream)
         { 	
 			common_field_fixed_attlist_.serialize(CP_GET_XML_NODE());
 
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -701,9 +700,9 @@ void text_time::serialize(std::wostream & _Wostream)
 			CP_XML_ATTR_OPT(L"style:data-style-name", style_data_style_name_);
 			CP_XML_ATTR_OPT(L"text:time-value", text_time_value_);
 			
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -740,9 +739,9 @@ void text_file_name::serialize(std::wostream & _Wostream)
         { 	
 			common_field_fixed_attlist_.serialize(CP_GET_XML_NODE());
 			
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -776,9 +775,9 @@ void text_sequence::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         { 	
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -823,9 +822,9 @@ void text_sheet_name::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         { 	
-			BOOST_FOREACH(const office_element_ptr & elm, text_)
+			for (size_t i = 0; i < text_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				text_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/style_page_layout_properties.cpp

@@ -36,7 +36,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <iostream>
-#include <boost/foreach.hpp>
 
 #include "office_elements_create.h"
 

ASCOfficeOdfFileW/source/OdfFormat/style_paragraph_properties.cpp

@@ -38,9 +38,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/utils.h>
 
-#include <boost/foreach.hpp>
-
-
 #include "borderstyle.h"
 
 namespace cpdoccore { 
@@ -85,9 +82,9 @@ void style_tab_stops::serialize(std::wostream & strm)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(office_element_ptr & elm, style_tab_stops_)
-			{
-				elm->serialize(CP_XML_STREAM());
+			for (size_t i = 0; i < style_tab_stops_.size(); i++)
+			{		
+				style_tab_stops_[i]->serialize(CP_XML_STREAM());
 			}	
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/style_section_properties.cpp

@@ -36,7 +36,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <iostream>
-#include <boost/foreach.hpp>
 
 #include "office_elements_create.h"
 
@@ -91,9 +90,9 @@ void style_columns::serialize(std::wostream & strm)
 
 			if(style_column_sep_) style_column_sep_->serialize(CP_XML_STREAM());
 			
-			BOOST_FOREACH(const office_element_ptr & elm, style_column_)
-			{
-				elm->serialize(CP_XML_STREAM());
+			for (size_t i = 0; i < style_column_.size(); i++)
+			{		
+				style_column_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/styles.cpp

@@ -37,7 +37,6 @@
 #include <cpdoccore/xml/attributes.h>
 #include <cpdoccore/xml/simple_xml_writer.h>
 #include <iostream>
-#include <boost/foreach.hpp>
 
 #include "office_elements_create.h"
 
@@ -543,18 +542,18 @@ void styles::add_child_element( const office_element_ptr & child, odf_conversion
 }
 void styles::serialize(std::wostream & strm)//content from different element
 {
-	BOOST_FOREACH(office_element_ptr & elm, number_styles_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < number_styles_.size(); i++)
+	{		
+		number_styles_[i]->serialize(strm);
 	}
-	BOOST_FOREACH(office_element_ptr & elm, style_style_)
-    {
-		elm->serialize(strm);
-	}	
-	BOOST_FOREACH(office_element_ptr & elm, text_list_style_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < style_style_.size(); i++)
+	{		
+		style_style_[i]->serialize(strm);
 	}	
+	for (size_t i = 0; i < text_list_style_.size(); i++)
+	{		
+		text_list_style_[i]->serialize(strm);
+	}
 }
 void templates::create_child_element( const std::wstring & Ns, const std::wstring & Name, odf_conversion_context * Context)
 {
@@ -576,10 +575,10 @@ void templates::add_child_element( const office_element_ptr & child)
 }
 void templates::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(office_element_ptr & elm, table_templates_)
-	{
-		elm->serialize(strm);
-	}	
+	for (size_t i = 0; i < table_templates_.size(); i++)
+	{		
+		table_templates_[i]->serialize(strm);
+	}
 }
 void draw_styles::create_child_element(const std::wstring & Ns, const std::wstring & Name, odf_conversion_context * Context)
 {
@@ -632,29 +631,29 @@ void draw_styles::add_child_element( const office_element_ptr & child, odf_conve
 
 void draw_styles::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(office_element_ptr & elm, draw_fill_image_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < draw_fill_image_.size(); i++)
+	{		
+		draw_fill_image_[i]->serialize(strm);
 	}
-	BOOST_FOREACH(office_element_ptr & elm, draw_hatch_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < draw_hatch_.size(); i++)
+	{		
+		draw_hatch_[i]->serialize(strm);
 	}	
-	BOOST_FOREACH(office_element_ptr & elm, draw_gradient_)
-    {
-		elm->serialize(strm);
-	}	
-	BOOST_FOREACH(office_element_ptr & elm, draw_opacity_)
-    {
-		elm->serialize(strm);
-	}	
-	BOOST_FOREACH(office_element_ptr & elm, draw_marker_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < draw_gradient_.size(); i++)
+	{		
+		draw_gradient_[i]->serialize(strm);
 	}
-	BOOST_FOREACH(office_element_ptr & elm, draw_stroke_dash_)
-    {
-		elm->serialize(strm);
+	for (size_t i = 0; i < draw_opacity_.size(); i++)
+	{		
+		draw_opacity_[i]->serialize(strm);
+	}
+	for (size_t i = 0; i < draw_marker_.size(); i++)
+	{		
+		draw_marker_[i]->serialize(strm);
+	}
+	for (size_t i = 0; i < draw_stroke_dash_.size(); i++)
+	{		
+		draw_stroke_dash_[i]->serialize(strm);
 	}
 }
 // office:automatic-styles
@@ -696,11 +695,10 @@ void office_automatic_styles::serialize(std::wostream & strm)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(office_element_ptr elm, style_page_layout_)
-			{
-				elm->serialize(CP_XML_STREAM());
-			}
-	
+			for (size_t i = 0; i < style_page_layout_.size(); i++)
+			{		
+				style_page_layout_[i]->serialize(CP_XML_STREAM());
+			}	
 			styles_.serialize(CP_XML_STREAM());
 		}
 	}
@@ -762,11 +760,10 @@ void office_master_styles::serialize(std::wostream & strm)
 			if (draw_layer_set_)
 				draw_layer_set_->serialize(CP_XML_STREAM());
 			
-			BOOST_FOREACH(office_element_ptr elm, style_master_page_)
-			{
-				elm->serialize(CP_XML_STREAM());
-			}
-			
+			for (size_t i = 0; i < style_master_page_.size(); i++)
+			{		
+				style_master_page_[i]->serialize(CP_XML_STREAM());
+			}			
 			if (style_handout_master_)
 				style_handout_master_->serialize(CP_XML_STREAM());
 

ASCOfficeOdfFileW/source/OdfFormat/table.cpp

@@ -33,7 +33,6 @@
 #include "table.h"
 
 #include <boost/make_shared.hpp>
-#include <boost/foreach.hpp>
 
 #include <cpdoccore/xml/xmlchar.h>
 #include <cpdoccore/xml/attributes.h>
@@ -272,7 +271,7 @@ void table_table_columns::create_child_element(const std::wstring & Ns, const st
 {
     if CP_CHECK_NAME(L"table", L"table-column")
     {
-   	    CP_CREATE_ELEMENT(table_table_column_);
+   	    CP_CREATE_ELEMENT(content_);
     }
     else
         CP_NOT_APPLICABLE_ELM();
@@ -284,7 +283,7 @@ void table_table_columns::add_child_element( const office_element_ptr & child_el
 	ElementType type = child_element->get_type();
 
     if (type == typeTableTableColumn) 
-		table_table_column_.push_back(child_element);
+		content_.push_back(child_element);
 }
 void table_table_columns::serialize(std::wostream & _Wostream)
 {
@@ -292,9 +291,9 @@ void table_table_columns::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, table_table_column_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -309,7 +308,7 @@ void table_table_header_columns::create_child_element( const std::wstring & Ns,
 {
     if CP_CHECK_NAME(L"table", L"table-column")
     {
-		 CP_CREATE_ELEMENT(table_table_column_);
+		 CP_CREATE_ELEMENT(content_);
     }
     else
         CP_NOT_APPLICABLE_ELM();
@@ -321,7 +320,7 @@ void table_table_header_columns::add_child_element( const office_element_ptr & c
 	ElementType type = child_element->get_type();
 
     if (type == typeTableTableColumn) 
-		table_table_column_.push_back(child_element);
+		content_.push_back(child_element);
 }
 void table_table_header_columns::serialize(std::wostream & _Wostream)
 {
@@ -329,9 +328,9 @@ void table_table_header_columns::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, table_table_column_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}
@@ -347,7 +346,7 @@ void table_columns::create_child_element( const std::wstring & Ns, const std::ws
     }
     else if CP_CHECK_NAME(L"table", L"table-column")
     {
-        CP_CREATE_ELEMENT_SIMPLE(table_table_column_);                
+        CP_CREATE_ELEMENT_SIMPLE(content_);                
     } 
     else
         not_applicable_element(L"table-columns",  Ns, Name);
@@ -367,15 +366,15 @@ void table_columns::add_child_element( const office_element_ptr & child_element)
 		table_table_columns_ = child_element;
 	}
 	else if (type == typeTableTableColumn) 
-		table_table_column_.push_back(child_element);
+		content_.push_back(child_element);
 }
-void table_columns::serialize(std::wostream & _Wostream)
+void table_columns::serialize(std::wostream & strm)
 {
-	if (table_table_columns_)	table_table_columns_->serialize(_Wostream);
+	if (table_table_columns_)	table_table_columns_->serialize(strm);
 	
-	BOOST_FOREACH(const office_element_ptr & elm, table_table_column_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(_Wostream);
+		content_[i]->serialize(strm);
 	}
 }
 // table-columns-no-group
@@ -521,11 +520,11 @@ void table_columns_and_groups::add_child_element( const office_element_ptr & chi
 		not_applicable_element(L"table-columns-and-groups", L"", L"");
 	}
 }
-void table_columns_and_groups::serialize(std::wostream & _Wostream)
+void table_columns_and_groups::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(_Wostream);
+		content_[i]->serialize(strm);
 	}
 }
 // table-table-cell-content
@@ -539,11 +538,11 @@ void table_table_cell_content::add_child_element( const office_element_ptr & chi
 {
 	text_content_.push_back(child_element);
 }
-void table_table_cell_content::serialize(std::wostream & _Wostream)
+void table_table_cell_content::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(const office_element_ptr & elm, text_content_)
+	for (size_t i = 0; i < text_content_.size(); i++)
 	{
-		if (elm) elm->serialize(_Wostream);
+		text_content_[i]->serialize(strm);
 	}
 }
 // table:table-cell
@@ -635,9 +634,9 @@ void table_table_row::serialize(std::wostream & _Wostream)
         {
 			table_table_row_attlist_.serialize(CP_GET_XML_NODE());
 				
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}	
@@ -650,21 +649,21 @@ const wchar_t * table_table_rows::name = L"table-rows";
 
 void table_table_rows::create_child_element(  const std::wstring & Ns, const std::wstring & Name)
 {
-	CP_CREATE_ELEMENT(table_table_row_);
+	CP_CREATE_ELEMENT(content_);
 }
 void table_table_rows::add_child_element( const office_element_ptr & child_element)
 {
-	table_table_row_.push_back(child_element);    
+	content_.push_back(child_element);    
 }
-void table_table_rows::serialize(std::wostream & _Wostream)
+void table_table_rows::serialize(std::wostream & strm)
 {
-    CP_XML_WRITER(_Wostream)
+    CP_XML_WRITER(strm)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, table_table_row_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(strm);
 			}
 		}
 	}	
@@ -679,7 +678,7 @@ void table_table_header_rows::create_child_element( const std::wstring & Ns, con
 {
     if CP_CHECK_NAME(L"table", L"table-row")
     {
-		CP_CREATE_ELEMENT(table_table_row_);
+		CP_CREATE_ELEMENT(content_);
     }
     else
         CP_NOT_APPLICABLE_ELM();    
@@ -691,7 +690,7 @@ void table_table_header_rows::add_child_element( const office_element_ptr & chil
 	ElementType type = child_element->get_type();
 
     if (type == typeTableTableRow)
-		table_table_row_.push_back(child_element);    
+		content_.push_back(child_element);    
 }
 void table_table_header_rows::serialize(std::wostream & _Wostream)
 {
@@ -699,9 +698,9 @@ void table_table_header_rows::serialize(std::wostream & _Wostream)
     {
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, table_table_row_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}	
@@ -716,7 +715,7 @@ void table_rows::create_child_element(const std::wstring & Ns, const std::wstrin
     } 
     else if CP_CHECK_NAME(L"table", L"table-row")
     {
-		CP_CREATE_ELEMENT_SIMPLE(table_table_row_);
+		CP_CREATE_ELEMENT_SIMPLE(content_);
     }
     else
     {
@@ -733,16 +732,16 @@ void table_rows::add_child_element( const office_element_ptr & child_element)
 		table_table_rows_ = child_element;    
    
 	else if (type == typeTableTableRow)
-		table_table_row_.push_back(child_element);    
+		content_.push_back(child_element);    
 }
-void table_rows::serialize(std::wostream & _Wostream)
+void table_rows::serialize(std::wostream & strm)
 {
 	if (table_table_rows_)
-		table_table_rows_->serialize(_Wostream);
+		table_table_rows_->serialize(strm);
 	
-	BOOST_FOREACH(const office_element_ptr & elm, table_table_row_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(_Wostream);
+		content_[i]->serialize(strm);
 	}
 }
 // table-rows-no-group
@@ -851,11 +850,11 @@ void table_rows_and_groups::add_child_element( const office_element_ptr & child_
         content_.push_back(elm);
 	}
 }
-void table_rows_and_groups::serialize(std::wostream & _Wostream)
+void table_rows_and_groups::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(const office_element_ptr & elm, content_)
+	for (size_t i = 0; i < content_.size(); i++)
 	{
-		elm->serialize(_Wostream);
+		content_[i]->serialize(strm);
 	}
 }
 // table:table-row-group
@@ -911,9 +910,9 @@ void table_shapes::serialize(std::wostream & _Wostream)
 	{
 		CP_XML_NODE_SIMPLE()
         {
-			BOOST_FOREACH(const office_element_ptr & elm, content_)
+			for (size_t i = 0; i < content_.size(); i++)
 			{
-				elm->serialize(CP_XML_STREAM());
+				content_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/OdfFormat/table.h

@@ -186,8 +186,8 @@ public:
     virtual void serialize(std::wostream & _Wostream);
 
 public:
-    office_element_ptr table_table_columns_;
-    office_element_ptr_array table_table_column_;
+    office_element_ptr				table_table_columns_;
+    office_element_ptr_array		content_;
     
 };
 
@@ -296,7 +296,7 @@ public:
 
     virtual void serialize(std::wostream & _Wostream);
 
-	office_element_ptr_array table_table_column_;
+	office_element_ptr_array content_;
 
 };
 
@@ -318,7 +318,7 @@ public:
 
     virtual void serialize(std::wostream & _Wostream);
 
-    office_element_ptr_array table_table_column_;
+    office_element_ptr_array content_;
 
 };
 
@@ -472,7 +472,7 @@ public:
 	{
     }
 
-    office_element_ptr_array table_table_row_;
+    office_element_ptr_array content_;
 
 };
 
@@ -494,7 +494,7 @@ public:
 
     virtual void serialize(std::wostream & _Wostream);
 
-    office_element_ptr_array table_table_row_;
+    office_element_ptr_array content_;
 
 };
 
@@ -509,7 +509,7 @@ public:
     virtual void serialize(std::wostream & _Wostream);
 
     office_element_ptr			table_table_rows_;
-    office_element_ptr_array	table_table_row_;
+    office_element_ptr_array	content_;
 
 };
 

ASCOfficeOdfFileW/source/OdfFormat/text_elements.cpp

@@ -32,10 +32,7 @@
 
 #include "text_elements.h"
 
-#include <boost/foreach.hpp>
-
 #include <cpdoccore/xml/xmlchar.h>
-
 #include <cpdoccore/xml/attributes.h>
 
 #include "paragraph_elements.h"
@@ -76,11 +73,11 @@ void paragraph::add_text(const std::wstring & Text)
     office_element_ptr elm = text_text::create(Text) ;
     paragraph_content_.push_back( elm );
 }
-void paragraph::serialize(std::wostream & _Wostream)
+void paragraph::serialize(std::wostream & strm)
 {
-	BOOST_FOREACH(const office_element_ptr & elm, paragraph_content_)
-	{    
-		elm->serialize(_Wostream);
+	for (size_t i = 0; i < paragraph_content_.size(); i++)
+	{
+		paragraph_content_[i]->serialize(strm);
 	}
 }
 void paragraph::serialize_attr(CP_ATTR_NODE)
@@ -95,11 +92,10 @@ void paragraph_attrs::serialize(CP_ATTR_NODE)
    
 	std::wstring text_class_names_all;
 
-	BOOST_FOREACH(const std::wstring & elm, text_class_names_)
-	{    
-		text_class_names_all = elm + std::wstring(L" ");
-	}
-	
+	for (size_t i = 0; i < text_class_names_.size(); i++)
+	{
+		text_class_names_all = text_class_names_[i] + std::wstring(L" ");
+	}	
 	if (!text_class_names_all.empty())
 		CP_XML_ATTR(L"text:class-names",	text_class_names_all);
 }
@@ -186,9 +182,9 @@ void text_list::serialize(std::wostream & _Wostream)
 			
 			if (text_list_header_) text_list_header_->serialize(CP_XML_STREAM());
    
-			BOOST_FOREACH(const office_element_ptr & listItem, text_list_items_)
+			for (size_t i = 0; i < text_list_items_.size(); i++)
 			{
-				listItem->serialize(CP_XML_STREAM());
+				text_list_items_[i]->serialize(CP_XML_STREAM());
 			}
 		}
 	}

ASCOfficeOdfFileW/source/Oox2OdfConverter/Converter.cpp

@@ -36,8 +36,6 @@
 
 #include "../utils.h"
 
-#include <boost/lexical_cast.hpp>
-
 #include "XlsxConverter.h"
 #include "DocxConverter.h"
 #include "PptxConverter.h"

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.cpp

@@ -39,9 +39,6 @@
 
 #include "VmlShapeTypes2Oox.h"
 
-#include <boost/foreach.hpp>
-#include <boost/lexical_cast.hpp>
-
 #include "../OdfFormat/odt_conversion_context.h"
 
 #include "../OdfFormat/odf_text_context.h"
@@ -187,7 +184,7 @@ void DocxConverter::convert_document()
 	int last_section_start = 0;
 
 	//считаем количесво секций и запоминаем их свойства .. 
-	for (long i = 0; i < document->m_arrItems.size(); i++)
+	for (size_t i = 0; i < document->m_arrItems.size(); i++)
 	{
 		if (document->m_arrItems[i] == NULL) continue;
 
@@ -199,18 +196,18 @@ void DocxConverter::convert_document()
 			{
 				if (para->m_oParagraphProperty->m_oSectPr.IsInit() )
 				{
-					sections.push_back(_section(para->m_oParagraphProperty->m_oSectPr.GetPointer(), last_section_start, i + 1));
-					last_section_start = i + 1;
+					sections.push_back(_section(para->m_oParagraphProperty->m_oSectPr.GetPointer(), last_section_start, (int)i + 1));
+					last_section_start = (int)i + 1;
 				}
 			}
 		}
 	}
-	sections.push_back(_section(document->m_oSectPr.GetPointer(), last_section_start, document->m_arrItems.size(), true));
+	sections.push_back(_section(document->m_oSectPr.GetPointer(), last_section_start, (int)document->m_arrItems.size(), true));
 //----------------------------------------------------------------------------------------------------------
 
 	odt_context->text_context()->clear_params();
 
-	for (int sect = 0; sect < sections.size(); sect++)
+	for (size_t sect = 0; sect < sections.size(); sect++)
 	{
 		current_section_properties = &sections[sect];
 
@@ -522,7 +519,7 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
 	{//rapcomnat12.docx - стр 185
 		bool empty_para = true;
 
-		for (unsigned int nIndex = 0; empty_para && nIndex < oox_paragraph->m_arrItems.size(); nIndex++ )
+		for (size_t nIndex = 0; empty_para && nIndex < oox_paragraph->m_arrItems.size(); nIndex++ )
 		{		
 			switch(oox_paragraph->m_arrItems[nIndex]->getType())
 			{
@@ -546,7 +543,7 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
 	}
 
 //---------------------------------------------------------------------------------------------------------------------
-	for (unsigned int nIndex = 0; nIndex < oox_paragraph->m_arrItems.size(); nIndex++ )
+	for (size_t nIndex = 0; nIndex < oox_paragraph->m_arrItems.size(); nIndex++ )
 	{
 		//те элементы которые тока для Paragraph - здесь - остальные в общей куче		
 		switch(oox_paragraph->m_arrItems[nIndex]->getType())
@@ -573,7 +570,7 @@ void DocxConverter::convert(OOX::Logic::CParagraph *oox_paragraph)
 //---------------------------------------------------------------------------------------------------------------------
 	//std::sort(id_change_properties.begin(), id_change_properties.end());
 
-	for (int i = 0; i < id_change_properties.size(); i++)
+	for (size_t i = 0; i < id_change_properties.size(); i++)
 	{
 		odt_context->end_change(id_change_properties[i].second, id_change_properties[i].first); 
 	}
@@ -584,7 +581,7 @@ void DocxConverter::convert(OOX::Logic::CRun *oox_run)//wordprocessing 22.1.2.87
 	//хм разобраться а нужен ли он ... частенько бывает в неправильном месте!!! - A   GRUBU.docx
 	//https://forums.asp.net/t/1951556.aspx?Facing+problem+finding+out+page+end+in+Ms+Word+Open+XML+SDK+Asp+net+c+We+can+t+get+a+lastRenderedPageBreak
 	////test for break - 2 first element ЭТОТ элемент НУЖНО вытащить отдельно !!!
-	//for(unsigned int i = 0; i < (std::min) ( (size_t)2, oox_run->m_arrItems.size()); ++i)
+	//for(size_t i = 0; i < (std::min) ( (size_t)2, oox_run->m_arrItems.size()); ++i)
 	//{
 	//	if (oox_run->m_arrItems[i]->getType() == OOX::et_w_lastRenderedPageBreak)
 	//	{
@@ -608,7 +605,7 @@ void DocxConverter::convert(OOX::Logic::CRun *oox_run)//wordprocessing 22.1.2.87
 
 	odt_context->start_run(styled);
 	
-	for(unsigned int i = 0; i < oox_run->m_arrItems.size(); ++i)
+	for(size_t i = 0; i < oox_run->m_arrItems.size(); ++i)
 	{
 		//те элементы которые тока для Run - здесь - остальные в общей куче		
 		switch(oox_run->m_arrItems[i]->getType())
@@ -778,7 +775,7 @@ void DocxConverter::convert(OOX::Logic::CFldSimple	*oox_fld)
 		if (oox_fld->m_sInstr.IsInit())	
 			odt_context->set_field_instr(oox_fld->m_sInstr.get2());
 
-		for (unsigned int i=0; i< oox_fld->m_arrItems.size(); i++)
+		for (size_t i=0; i< oox_fld->m_arrItems.size(); i++)
 		{
 			convert(oox_fld->m_arrItems[i]);
 		}
@@ -815,7 +812,7 @@ void DocxConverter::convert(OOX::Logic::CIns *oox_ins)
 			
 	bool start_change = odt_context->start_change(id, 1, author, userId, date);
 
-	for (unsigned int i=0; i< oox_ins->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_ins->m_arrItems.size(); i++)
 	{
 		convert(oox_ins->m_arrItems[i]);
 	}
@@ -1019,7 +1016,7 @@ void DocxConverter::convert(OOX::Logic::CDel *oox_del)
 	std::wstring	date	= oox_del->m_oDate.IsInit()		? oox_del->m_oDate->GetValue()	: L"";
 
 	bool res_change  = odt_context->start_change(id, 2, author, userId, date);
-	for (unsigned int i=0; i< oox_del->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_del->m_arrItems.size(); i++)
 	{
 		convert(oox_del->m_arrItems[i]);
 	}
@@ -1030,7 +1027,7 @@ void DocxConverter::convert(OOX::Logic::CSmartTag *oox_tag)
 {
 	if (oox_tag == NULL) return;
 
-	for (unsigned int i=0; i< oox_tag->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_tag->m_arrItems.size(); i++)
 	{
 		convert(oox_tag->m_arrItems[i]);
 	}
@@ -1250,7 +1247,7 @@ void DocxConverter::convert(OOX::Logic::CParagraphProperty	*oox_paragraph_pr, cp
 	if (oox_paragraph_pr->m_oTabs.IsInit())
 	{
 		paragraph_properties->add_child_element(odf_context()->start_tabs());
-		for (unsigned int i = 0; i < oox_paragraph_pr->m_oTabs->m_arrTabs.size(); i++)
+		for (size_t i = 0; i < oox_paragraph_pr->m_oTabs->m_arrTabs.size(); i++)
 		{
 			if (oox_paragraph_pr->m_oTabs->m_arrTabs[i] == NULL) continue;
 			
@@ -1279,14 +1276,14 @@ void DocxConverter::apply_HF_from(OOX::Logic::CSectionProperty *props, OOX::Logi
 
 	if (other->m_arrFooterReference.size() > 0)
 	{
-		for (unsigned int i =0 ; i < props->m_arrFooterReference.size() ; i++)
+		for (size_t i =0 ; i < props->m_arrFooterReference.size() ; i++)
 		{
 			if (props->m_arrFooterReference[i]) delete props->m_arrFooterReference[i];
 			props->m_arrFooterReference[i] = NULL;
 		}
 		props->m_arrFooterReference.clear();
 
-		for (unsigned int i =0 ; i < other->m_arrFooterReference.size() ; i++)
+		for (size_t i =0 ; i < other->m_arrFooterReference.size() ; i++)
 		{
 			ComplexTypes::Word::CHdrFtrRef* ref = new ComplexTypes::Word::CHdrFtrRef();
 
@@ -1299,14 +1296,14 @@ void DocxConverter::apply_HF_from(OOX::Logic::CSectionProperty *props, OOX::Logi
 	}
 	if (other->m_arrHeaderReference.size() > 0)
 	{
-		for (unsigned int i =0 ; i < props->m_arrHeaderReference.size() ; i++)
+		for (size_t i =0 ; i < props->m_arrHeaderReference.size() ; i++)
 		{
 			if (props->m_arrHeaderReference[i]) delete props->m_arrHeaderReference[i];
 			props->m_arrHeaderReference[i] = NULL;
 		}
 		props->m_arrHeaderReference.clear();
 		
-		for (unsigned int i =0 ; i < other->m_arrHeaderReference.size() ; i++)
+		for (size_t i =0 ; i < other->m_arrHeaderReference.size() ; i++)
 		{
 			ComplexTypes::Word::CHdrFtrRef* ref = new ComplexTypes::Word::CHdrFtrRef();
 			
@@ -1501,7 +1498,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
 
 		std::vector<int> types;
 
-		for (unsigned int i = 0; i < s->m_arrHeaderReference.size(); i++)
+		for (size_t i = 0; i < s->m_arrHeaderReference.size(); i++)
 		{
 			if (s->m_arrHeaderReference[i] == NULL) continue;
 
@@ -1529,7 +1526,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
 		if (!add_odd_even_pages_header	&& present_odd_even_pages)							odt_context->add_empty_header(1);
 		if (!add_default_header			&& (present_odd_even_pages || present_title_page))	odt_context->add_empty_header(0);
 
-		for (unsigned int i=0; i< s->m_arrFooterReference.size(); i++)
+		for (size_t i=0; i< s->m_arrFooterReference.size(); i++)
 		{
 			if (s->m_arrFooterReference[i] == NULL) continue;
 
@@ -1607,7 +1604,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
 
 			std::vector<std::pair<double,double>> width_space;
 			
-			for (unsigned int i =0; i< oox_section_pr->m_oCols->m_arrColumns.size(); i++)
+			for (size_t i =0; i< oox_section_pr->m_oCols->m_arrColumns.size(); i++)
 			{
 				if (oox_section_pr->m_oCols->m_arrColumns[i] == NULL) continue;
 				double space = default_space_pt;
@@ -1620,7 +1617,7 @@ void DocxConverter::convert(OOX::Logic::CSectionProperty *oox_section_pr, bool r
 				
 				width_space.push_back(std::pair<double,double>(w, space));
 			}
-			//for (unsigned int i= oox_section_pr->m_oCols->m_arrColumns.size(); i< num_columns; i ++)
+			//for (size_t i= oox_section_pr->m_oCols->m_arrColumns.size(); i< num_columns; i ++)
 			//{
 			//	width_space.push_back(std::pair<double,double>(-1, default_space_pt));
 			//}
@@ -2262,13 +2259,13 @@ void DocxConverter::convert(OOX::Logic::CAlternateContent *oox_alt_content)
 {
 	if (oox_alt_content == NULL)return;
 
-	for(unsigned int i = 0; i < oox_alt_content->m_arrChoiceItems.size(); ++i) // правильный выбор
+	for(size_t i = 0; i < oox_alt_content->m_arrChoiceItems.size(); ++i) // правильный выбор
 	{
 		convert(oox_alt_content->m_arrChoiceItems[i]);
 	}
 	
 	if (oox_alt_content->m_arrChoiceItems.size() > 0) return;  //чтоб не было дубляжа
-	for(unsigned int i = 0; i < oox_alt_content->m_arrFallbackItems.size(); ++i) // альтернативный 
+	for(size_t i = 0; i < oox_alt_content->m_arrFallbackItems.size(); ++i) // альтернативный 
 	// todooo нужно сверять по инддексно что нормально сконвертилось ... или делать ВСЕ по choice ( это правильнее)
 	{
 		convert(oox_alt_content->m_arrFallbackItems[i]);
@@ -2458,7 +2455,7 @@ void DocxConverter::convert(OOX::Logic::CPicture* oox_pic)
 					}
 					if (!bSet)
 					{
-                        int pos = oox_pic->m_oShape->m_sType->find(_T("#_x0000_t"));
+                        int pos = (int)oox_pic->m_oShape->m_sType->find(_T("#_x0000_t"));
 						if (pos >= 0)
 						{				
                             sptType = (SimpleTypes::Vml::SptType)_wtoi(oox_pic->m_oShape->m_sType->substr(pos + 9, oox_pic->m_oShape->m_sType->length() - pos - 9).c_str());
@@ -2823,13 +2820,13 @@ void DocxConverter::convert_lists_styles()
 
 	oox_current_child_document = dynamic_cast<OOX::IFileContainer*>(lists_styles);
 //базовые
-	for (unsigned int i=0; i < lists_styles->m_arrAbstractNum.size(); i++)
+	for (size_t i=0; i < lists_styles->m_arrAbstractNum.size(); i++)
 	{
 		convert(lists_styles->m_arrAbstractNum[i]);
 	}
 
 //используемые в документе, используют базовые + могут поменяться - Override	
-	for (unsigned int i=0; i < lists_styles->m_arrNum.size(); i++)
+	for (size_t i=0; i < lists_styles->m_arrNum.size(); i++)
 	{
 		if (lists_styles->m_arrNum[i] == NULL) continue;
 
@@ -2864,7 +2861,7 @@ void DocxConverter::convert_styles()
 
 	convert(docx_styles->m_oDocDefaults.GetPointer());
 
-	for (unsigned int i=0; i< docx_styles->m_arrStyle.size(); i++)
+	for (size_t i=0; i< docx_styles->m_arrStyle.size(); i++)
 	{
 		if (docx_styles->m_arrStyle[i] == NULL) continue;
 
@@ -2902,7 +2899,7 @@ void DocxConverter::convert(OOX::Logic::CHyperlink *oox_hyperlink)
 
 		odt_context->start_hyperlink(ref);
 		
-		for (unsigned int i=0; i< oox_hyperlink->m_arrItems.size(); i++)
+		for (size_t i=0; i< oox_hyperlink->m_arrItems.size(); i++)
 		{
 			convert(oox_hyperlink->m_arrItems[i]);
 		}
@@ -2911,7 +2908,7 @@ void DocxConverter::convert(OOX::Logic::CHyperlink *oox_hyperlink)
 	else
 	{//ссылка внутри дока
 		//anchor todooo
-		for (unsigned int i=0; i< oox_hyperlink->m_arrItems.size(); i++)
+		for (size_t i=0; i< oox_hyperlink->m_arrItems.size(); i++)
 		{
 			convert(oox_hyperlink->m_arrItems[i]);
 		}
@@ -3017,7 +3014,7 @@ void DocxConverter::convert(OOX::Numbering::CAbstractNum* oox_num_style)
     //nullable<ComplexTypes::Word::std::wstring_                        > m_oStyleLink;
 	//nullable<ComplexTypes::Word::CLongHexNumber                  > m_oTmpl;
 
-	for (unsigned int i=0; i < oox_num_style->m_arrLvl.size(); i++)
+	for (size_t i=0; i < oox_num_style->m_arrLvl.size(); i++)
 	{
 		convert(oox_num_style->m_arrLvl[i]);
 	}
@@ -3153,7 +3150,7 @@ void DocxConverter::convert(OOX::Numbering::CLvl* oox_num_lvl)
 		int id = oox_num_lvl->m_oLvlPicBulletId->m_oVal->GetValue();
 		OOX::CNumbering * lists_styles = docx_document->GetNumbering();
 
-		for (unsigned int i = 0; (lists_styles) && (i< lists_styles->m_arrNumPicBullet.size()); i++)
+		for (size_t i = 0; (lists_styles) && (i< lists_styles->m_arrNumPicBullet.size()); i++)
 		{
 			if ((lists_styles->m_arrNumPicBullet[i]) && (lists_styles->m_arrNumPicBullet[i]->m_oNumPicBulletId.GetValue() == id))
 			{
@@ -3245,7 +3242,7 @@ void DocxConverter::convert_table_style(OOX::CStyle *oox_style)
 	//	convert(oox_style->m_oTrPr.GetPointer(), table_row_properties);
 	//}
 //отдельные
-	for (unsigned int i = 0 ; i <oox_style->m_arrTblStylePr.size() ; i++)
+	for (size_t i = 0 ; i <oox_style->m_arrTblStylePr.size() ; i++)
 	{
 		if (oox_style->m_arrTblStylePr[i] == NULL) continue;
 
@@ -3437,7 +3434,7 @@ void DocxConverter::convert_comment(int oox_comm_id)
 	OOX::CComments * docx_comments = docx_document->GetComments();
 	if (!docx_comments)return;
 
-	for (unsigned int comm = 0 ; comm < docx_comments->m_arrComments.size(); comm++)
+	for (size_t comm = 0 ; comm < docx_comments->m_arrComments.size(); comm++)
 	{
 		OOX::CComment* oox_comment = docx_comments->m_arrComments[comm];
 		
@@ -3452,7 +3449,7 @@ void DocxConverter::convert_comment(int oox_comm_id)
 				if (oox_comment->m_oDate.IsInit())		odt_context->comment_context()->set_date	(oox_comment->m_oDate->GetValue());
 				if (oox_comment->m_oInitials.IsInit())	{}
 
-				for (unsigned int i = 0; i <oox_comment->m_arrItems.size(); i++)
+				for (size_t i = 0; i <oox_comment->m_arrItems.size(); i++)
 				{
 					convert(oox_comment->m_arrItems[i]);
 				}
@@ -3468,7 +3465,7 @@ void DocxConverter::convert_footnote(int oox_ref_id)
 
 	odt_context->start_note(oox_ref_id, 1);
 
-	for (unsigned int n = 0 ; n < footnotes->m_arrFootnote.size(); n++)
+	for (size_t n = 0 ; n < footnotes->m_arrFootnote.size(); n++)
 	{
 		OOX::CFtnEdn* oox_note = footnotes->m_arrFootnote[n];
 		
@@ -3479,7 +3476,7 @@ void DocxConverter::convert_footnote(int oox_ref_id)
 		{
 			odt_context->start_note_content();
 			{
-				for (unsigned int i = 0; i < oox_note->m_arrItems.size(); i++)
+				for (size_t i = 0; i < oox_note->m_arrItems.size(); i++)
 				{
 					convert(oox_note->m_arrItems[i]);
 				}
@@ -3496,7 +3493,7 @@ void DocxConverter::convert_endnote(int oox_ref_id)
 
 	odt_context->start_note(oox_ref_id, 2);
 
-	for (unsigned int n = 0 ; n < endnotes->m_arrEndnote.size(); n++)
+	for (size_t n = 0 ; n < endnotes->m_arrEndnote.size(); n++)
 	{
 		OOX::CFtnEdn* oox_note = endnotes->m_arrEndnote[n];
 		
@@ -3507,7 +3504,7 @@ void DocxConverter::convert_endnote(int oox_ref_id)
 		{
 			odt_context->start_note_content();
 			{
-				for (unsigned int i = 0; i < oox_note->m_arrItems.size(); i++)
+				for (size_t i = 0; i < oox_note->m_arrItems.size(); i++)
 				{
 					convert(oox_note->m_arrItems[i]);
 				}
@@ -3524,7 +3521,7 @@ void DocxConverter::convert_hdr_ftr	(std::wstring sId)
 
 	oox_current_child_document = dynamic_cast<OOX::IFileContainer*>(oox_hdr_ftr);
 
-	for ( unsigned int nIndex = 0; nIndex < oox_hdr_ftr->m_arrItems.size(); nIndex++ )
+	for ( size_t nIndex = 0; nIndex < oox_hdr_ftr->m_arrItems.size(); nIndex++ )
 	{
 		convert(oox_hdr_ftr->m_arrItems[nIndex]);
 	}
@@ -3695,7 +3692,7 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
 	odt_context->table_context()->set_table_inside_h(border_inside_h);
 
 	int count_rows		= oox_table->m_nCountRow;
-	int count_columns	= oox_table->m_oTblGrid.IsInit() ? oox_table->m_oTblGrid->m_arrGridCol.size() : 0;
+	int count_columns	= oox_table->m_oTblGrid.IsInit() ? (int)oox_table->m_oTblGrid->m_arrGridCol.size() : 0;
 	
 	odt_context->styles_context()->table_styles().set_current_dimension(count_columns, count_rows);
 	odt_context->table_context()->count_rows(count_rows);
@@ -3703,7 +3700,7 @@ void DocxConverter::convert(OOX::Logic::CTbl *oox_table)
 	convert(oox_table->m_oTblGrid.GetPointer());
 
 //------ строки
-	for (unsigned int i =0 ; i < oox_table->m_arrItems.size(); i++)
+	for (size_t i =0 ; i < oox_table->m_arrItems.size(); i++)
 	{
 		switch(oox_table->m_arrItems[i]->getType())
 		{
@@ -3753,7 +3750,7 @@ void DocxConverter::convert(OOX::Logic::CTblGrid	*oox_table_grid)
 
 	odt_context->start_table_columns();
 
-	for (int i =0 ; i < oox_table_grid->m_arrGridCol.size(); i++)
+	for (size_t i =0 ; i < oox_table_grid->m_arrGridCol.size(); i++)
 	{
 		if (oox_table_grid->m_arrGridCol[i] == NULL) continue;
 		double width = -1;
@@ -3819,7 +3816,7 @@ void DocxConverter::convert(OOX::Logic::CTr	*oox_table_row)
 	
 	convert(oox_table_row->m_oTableRowProperties);
 
-	for (unsigned int i =0 ; i < oox_table_row->m_arrItems.size(); i++)
+	for (size_t i =0 ; i < oox_table_row->m_arrItems.size(); i++)
 	{
 		switch(oox_table_row->m_arrItems[i]->getType())
 		{
@@ -3879,7 +3876,7 @@ void DocxConverter::convert(OOX::Logic::CTc	*oox_table_cell)
 			odt_context->table_context()->set_cell_column_span(oox_table_cell->m_oTableCellProperties->m_oGridSpan->m_oVal->GetValue());
 	}
 
-	for (unsigned int i =0 ; i < oox_table_cell->m_arrItems.size(); i++)
+	for (size_t i =0 ; i < oox_table_cell->m_arrItems.size(); i++)
 	{
 		switch(oox_table_cell->m_arrItems[i]->getType())
 		{
@@ -4238,7 +4235,7 @@ bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,
 		//если нет убрать, если да - добавить
 		if (border_inside_h)
 		{
-			int del_border = border_inside_h->find(L"none");
+			int del_border = (int)border_inside_h->find(L"none");
 			if (row != 1)
 			{
 				if (cell_properties->style_table_cell_properties_attlist_.common_border_attlist_.fo_border_top_ && del_border>=0)
@@ -4258,7 +4255,7 @@ bool DocxConverter::convert(OOX::Logic::CTableCellProperties *oox_table_cell_pr,
 		}
 		if (border_inside_v)
 		{
-			int del_border = border_inside_v->find(L"none");
+			int del_border = (int)border_inside_v->find(L"none");
 			if (col != 1)
 			{
 				if (cell_properties->style_table_cell_properties_attlist_.common_border_attlist_.fo_border_left_ && del_border>=0)

ASCOfficeOdfFileW/source/Oox2OdfConverter/DocxConverter.h

@@ -33,7 +33,6 @@
 
 #include "Converter.h"
 
-#include <boost/foreach.hpp>
 #include <cpdoccore/CPSharedPtr.h>
 #include <cpdoccore/CPOptional.h>
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.cpp

@@ -52,8 +52,6 @@
 #include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/SplitTransition.h"
 #include "../../../ASCOfficePPTXFile/PPTXFormat/Logic/Transitions/ZoomTransition.h"
 
-#include <boost/lexical_cast.hpp>
-
 #include "../OdfFormat/odp_conversion_context.h"
 
 #include "../OdfFormat/odf_text_context.h"
@@ -449,25 +447,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);
 	

ASCOfficeOdfFileW/source/Oox2OdfConverter/PptxConverter.h

@@ -33,7 +33,6 @@
 
 #include "Converter.h"
 
-#include <boost/foreach.hpp>
 #include <cpdoccore/CPSharedPtr.h>
 #include <cpdoccore/CPOptional.h>
 

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.cpp

@@ -51,7 +51,7 @@ using namespace cpdoccore;
 
 namespace Oox2Odf
 {
- 
+
 XlsxConverter::XlsxConverter(const std::wstring & path, const ProgressCallback* CallBack) 
 {
     const OOX::CPath oox_path(std::wstring(path.c_str()));
@@ -166,7 +166,7 @@ void XlsxConverter::convert_sheets()
 	
 	if(Workbook->m_oBookViews.IsInit())
 	{	
-		for (unsigned int i = 0; i < Workbook->m_oBookViews->m_arrItems.size(); i++)
+		for (size_t i = 0; i < Workbook->m_oBookViews->m_arrItems.size(); i++)
 		{
 			convert(Workbook->m_oBookViews->m_arrItems[i]);
 		}
@@ -198,7 +198,7 @@ void XlsxConverter::convert_sheets()
 	}
 	if (Workbook->m_oDefinedNames.IsInit())
 	{
-		for (unsigned int i = 0; i < Workbook->m_oDefinedNames->m_arrItems.size(); i++)
+		for (size_t i = 0; i < Workbook->m_oDefinedNames->m_arrItems.size(); i++)
 		{
 			convert(Workbook->m_oDefinedNames->m_arrItems[i]);
 		}
@@ -219,6 +219,8 @@ void XlsxConverter::convert(OOX::Spreadsheet::CDefinedName *oox_defined)
 		bool printable = false;
 		if (name  == L"_xlnm.Print_Area")printable = true;
 
+		//todoooo !!!! сделать анализ на функцию, диапазон, константы .... !!!
+
 		if (false)//если простой - range, составной - выражение
 			ods_context->add_defined_range (name, oox_defined->m_oRef.get2(), sheet_id, printable);
 		else
@@ -243,7 +245,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //Предобработка
 	//гиперлинки 
-	for (unsigned int hyp = 0; oox_sheet->m_oHyperlinks.IsInit() && hyp < oox_sheet->m_oHyperlinks->m_arrItems.size(); hyp++)
+	for (size_t hyp = 0; oox_sheet->m_oHyperlinks.IsInit() && hyp < oox_sheet->m_oHyperlinks->m_arrItems.size(); hyp++)
 	{
 		convert(oox_sheet->m_oHyperlinks->m_arrItems[hyp],oox_sheet);
 	}	
@@ -258,7 +260,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////	
 	//колонки
 	ods_context->start_columns();
-		for (unsigned int col = 0 ; oox_sheet->m_oCols.IsInit() && col < oox_sheet->m_oCols->m_arrItems.size(); col++)
+		for (size_t col = 0 ; oox_sheet->m_oCols.IsInit() && col < oox_sheet->m_oCols->m_arrItems.size(); col++)
 		{
 			convert(oox_sheet->m_oCols->m_arrItems[col]);
 		}
@@ -268,7 +270,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 	if (oox_sheet->m_oSheetData.IsInit() )
 	{
 		ods_context->start_rows();
-			for (unsigned int row = 0 ; row < oox_sheet->m_oSheetData->m_arrItems.size(); row++)
+			for (size_t row = 0 ; row < oox_sheet->m_oSheetData->m_arrItems.size(); row++)
 			{
 				convert(oox_sheet->m_oSheetData->m_arrItems[row]);
 				
@@ -281,7 +283,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 	}
 
 	//мержи
-	for (unsigned int mrg = 0 ; oox_sheet->m_oMergeCells.IsInit() && mrg < oox_sheet->m_oMergeCells->m_arrItems.size(); mrg++)
+	for (size_t mrg = 0 ; oox_sheet->m_oMergeCells.IsInit() && mrg < oox_sheet->m_oMergeCells->m_arrItems.size(); mrg++)
 	{
 		if (oox_sheet->m_oMergeCells->m_arrItems[mrg]->m_oRef.IsInit())
 			ods_context->add_merge_cells(oox_sheet->m_oMergeCells->m_arrItems[mrg]->m_oRef.get());
@@ -306,7 +308,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 	if (oox_sheet->m_arrConditionalFormatting.size() >0)
 	{
 		ods_context->start_conditional_formats();
-		for (unsigned int fmt =0; fmt < oox_sheet->m_arrConditionalFormatting.size(); fmt++)
+		for (size_t fmt =0; fmt < oox_sheet->m_arrConditionalFormatting.size(); fmt++)
 		{
 			convert(oox_sheet->m_arrConditionalFormatting[fmt]);
 		}
@@ -315,7 +317,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CWorksheet *oox_sheet)
 	//выносные части таблицы
 	if (oox_sheet->m_oTableParts.IsInit())
 	{
-		for (unsigned int i=0 ; i < oox_sheet->m_oTableParts->m_arrItems.size(); i++)
+		for (size_t i=0 ; i < oox_sheet->m_oTableParts->m_arrItems.size(); i++)
 		{
 			OOX::Spreadsheet::CTablePart *oox_table_part = oox_sheet->m_oTableParts->m_arrItems[i];
 			if (!oox_table_part)continue;
@@ -421,7 +423,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCommentItem * oox_comment)
 
 	if (oox_comment->m_oText.IsInit())
 	{
-		for(unsigned int i = 0; i < oox_comment->m_oText->m_arrItems.size(); ++i)
+		for(size_t i = 0; i < oox_comment->m_oText->m_arrItems.size(); ++i)
 		{
 			convert(oox_comment->m_oText->m_arrItems[i]);
 		}
@@ -501,7 +503,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRow *oox_row)
 	}else
 		ods_context->current_table().set_row_optimal_height(true);
 
-	for (unsigned int cell = 0 ; cell < oox_row->m_arrItems.size();cell++)
+	for (size_t cell = 0 ; cell < oox_row->m_arrItems.size();cell++)
 	{
 		convert(oox_row->m_arrItems[cell]);
 	}
@@ -626,7 +628,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CRun *oox_text_run)
 	convert(oox_text_run->m_oRPr.GetPointer());
 	ods_context->text_context()->start_span(oox_text_run->m_oRPr.GetPointer() ? true : false);
 	
-	for(unsigned int i = 0; i < oox_text_run->m_arrItems.size(); ++i)
+	for(size_t i = 0; i < oox_text_run->m_arrItems.size(); ++i)
 	{
 		convert(oox_text_run->m_arrItems[i]);
 	}
@@ -965,8 +967,8 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
 
 				if (ActiveCellX >= 0 && ActiveCellY >= 0)
 				{
-					ods_context->settings_context()->add_property(L"CursorPositionX", L"int", boost::lexical_cast<std::wstring>(ActiveCellX));
-					ods_context->settings_context()->add_property(L"CursorPositionY", L"int", boost::lexical_cast<std::wstring>(ActiveCellY));
+					ods_context->settings_context()->add_property(L"CursorPositionX", L"int", std::to_wstring(ActiveCellX));
+					ods_context->settings_context()->add_property(L"CursorPositionY", L"int", std::to_wstring(ActiveCellY));
 				}
 			}
 			if (selection->m_oSqref.IsInit())
@@ -981,7 +983,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
 			
 			if (sheet_view->m_oPane->m_oXSplit.IsInit())
 			{
-				std::wstring sVal = boost::lexical_cast<std::wstring>((int)sheet_view->m_oPane->m_oXSplit->GetValue());
+				std::wstring sVal = std::to_wstring((int)sheet_view->m_oPane->m_oXSplit->GetValue());
 				
 				ods_context->settings_context()->add_property(L"HorizontalSplitMode", L"short", L"2");
 				ods_context->settings_context()->add_property(L"HorizontalSplitPosition", L"int",  sVal);
@@ -991,7 +993,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CSheetViews *oox_sheet_views)
 			}
 			if (sheet_view->m_oPane->m_oYSplit.IsInit())
 			{
-				std::wstring sVal = boost::lexical_cast<std::wstring>((int)sheet_view->m_oPane->m_oYSplit->GetValue());
+				std::wstring sVal = std::to_wstring((int)sheet_view->m_oPane->m_oYSplit->GetValue());
 				ods_context->settings_context()->add_property(L"VerticalSplitMode", L"short", L"2");
 				ods_context->settings_context()->add_property(L"VerticalSplitPosition", L"int", sVal);
 				ods_context->settings_context()->add_property(L"PositionTop", L"int",  L"0");
@@ -1198,31 +1200,31 @@ void XlsxConverter::convert_styles()
 	if (!xlsx_styles)return;
 //todooo ?? стоит ли обращать на параметр Count ??
 ////////////форматы данных
-	for (unsigned int i = 0; xlsx_styles->m_oNumFmts.IsInit() && i < xlsx_styles->m_oNumFmts->m_arrItems.size(); i++)
+	for (size_t i = 0; xlsx_styles->m_oNumFmts.IsInit() && i < xlsx_styles->m_oNumFmts->m_arrItems.size(); i++)
 	{
 		convert(xlsx_styles->m_oNumFmts->m_arrItems[i]);
 	}
 /////////////стили ячеек
-	for (unsigned int i = 0; xlsx_styles->m_oCellStyleXfs.IsInit() && i < xlsx_styles->m_oCellStyleXfs->m_arrItems.size(); i++)
+	for (size_t i = 0; xlsx_styles->m_oCellStyleXfs.IsInit() && i < xlsx_styles->m_oCellStyleXfs->m_arrItems.size(); i++)
 	{
 		//automatical, root - noname - они тока для named
 		convert(xlsx_styles->m_oCellStyleXfs->m_arrItems[i] , i, true, true);
 	}
-	for (unsigned int i = 0; xlsx_styles->m_oCellStyles.IsInit() && i < xlsx_styles->m_oCellStyles->m_arrItems.size(); i++)//styles.xml
+	for (size_t i = 0; xlsx_styles->m_oCellStyles.IsInit() && i < xlsx_styles->m_oCellStyles->m_arrItems.size(); i++)//styles.xml
 	{
 		//non automatical, root - named 
 		convert(xlsx_styles->m_oCellStyles->m_arrItems[i]); 
 	}	
 	
 	//кастомные стили ячеек
-	for (unsigned int i = 0; xlsx_styles->m_oCellXfs.IsInit() && i < xlsx_styles->m_oCellXfs->m_arrItems.size(); i++)
+	for (size_t i = 0; xlsx_styles->m_oCellXfs.IsInit() && i < xlsx_styles->m_oCellXfs->m_arrItems.size(); i++)
 	{
 		//automatical, non root
 		convert(xlsx_styles->m_oCellXfs->m_arrItems[i], i, true, false);
 	}	
 
 ////////////стили условного форматирования 
-	for (unsigned int i=0; xlsx_styles->m_oDxfs.IsInit() && i < xlsx_styles->m_oDxfs->m_arrItems.size(); i++)
+	for (size_t i=0; xlsx_styles->m_oDxfs.IsInit() && i < xlsx_styles->m_oDxfs->m_arrItems.size(); i++)
 	{
 		convert(xlsx_styles->m_oDxfs->m_arrItems[i], i); 
 	}
@@ -1338,10 +1340,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CFill * fill, odf_writer::style_ta
 	{
 	}
 	if (fill->m_oPatternFill.IsInit())
-	{//solid, gradient
-		if (fill->m_oPatternFill->m_oPatternType.IsInit())
-		{}
-		
+	{//solid, gradient, none
 		if (fill->m_oPatternFill->m_oFgColor.IsInit())
 		{
 			convert(fill->m_oPatternFill->m_oFgColor.GetPointer(), 
@@ -1351,7 +1350,37 @@ void XlsxConverter::convert(OOX::Spreadsheet::CFill * fill, odf_writer::style_ta
 		{
 			convert(fill->m_oPatternFill->m_oBgColor.GetPointer(), 
 				cell_properties->style_table_cell_properties_attlist_.common_background_color_attlist_.fo_background_color_);
-		}	
+		}
+		else if (fill->m_oPatternFill->m_oPatternType.IsInit())
+		{
+			switch(fill->m_oPatternFill->m_oPatternType->GetValue())
+			{
+				case SimpleTypes::Spreadsheet::patterntypeNone:
+					cell_properties->style_table_cell_properties_attlist_.common_background_color_attlist_.fo_background_color_ = 
+						odf_types::background_color::Transparent;
+						break;
+
+				case SimpleTypes::Spreadsheet::patterntypeDarkDown:
+				case SimpleTypes::Spreadsheet::patterntypeDarkGray:
+				case SimpleTypes::Spreadsheet::patterntypeDarkGrid:
+				case SimpleTypes::Spreadsheet::patterntypeDarkHorizontal:
+				case SimpleTypes::Spreadsheet::patterntypeDarkTrellis:
+				case SimpleTypes::Spreadsheet::patterntypeDarkUp:
+				case SimpleTypes::Spreadsheet::patterntypeDarkVertical:
+				case SimpleTypes::Spreadsheet::patterntypeGray0625:
+				case SimpleTypes::Spreadsheet::patterntypeGray125:
+				case SimpleTypes::Spreadsheet::patterntypeLightDown:
+				case SimpleTypes::Spreadsheet::patterntypeLightGray:
+				case SimpleTypes::Spreadsheet::patterntypeLightGrid:
+				case SimpleTypes::Spreadsheet::patterntypeLightHorizontal:
+				case SimpleTypes::Spreadsheet::patterntypeLightTrellis:
+				case SimpleTypes::Spreadsheet::patterntypeLightUp:
+				case SimpleTypes::Spreadsheet::patterntypeLightVertical:
+				case SimpleTypes::Spreadsheet::patterntypeMediumGray:
+					// todooo
+					break;
+			}
+		}
 					
 	}
 }
@@ -1541,7 +1570,12 @@ void XlsxConverter::convert(OOX::Spreadsheet::CBorderProp *borderProp, std::wstr
 			break;
 		}
 	}
-	else return;
+	else
+	{
+		border_style = L"none";
+		if (borderProp->m_oColor.IsInit())
+			return;
+	}
 
 	if (borderProp->m_oColor.IsInit())
 	{
@@ -1549,8 +1583,9 @@ void XlsxConverter::convert(OOX::Spreadsheet::CBorderProp *borderProp, std::wstr
 		convert(borderProp->m_oColor.GetPointer(), odf_color);
 		if (odf_color)
 			border_color = L" #" + odf_color->get_hex_value();
+		
+		if (border_color.empty())border_color = L" #000000";
 	}
-	if (border_color.length()<1)border_color = L" #000000";
 	
 	odf_border_prop = border_style + border_color;
 }
@@ -1800,14 +1835,26 @@ void XlsxConverter::convert(OOX::Spreadsheet::CCellAnchor *oox_anchor)
 	}
 		
 //////////////
-	if (oox_anchor->m_oPos.IsInit())
-	{
-	}
-
-	if (oox_anchor->m_oExt.IsInit())
-	{
-	}
 	odf_context()->drawing_context()->start_drawing();
+		if (oox_anchor->m_oPos.IsInit())
+		{
+			_CP_OPT(double) x, y;
+
+			if (oox_anchor->m_oPos->m_oX.IsInit())	x = oox_anchor->m_oPos->m_oX->GetValue();
+			if (oox_anchor->m_oPos->m_oY.IsInit())	y = oox_anchor->m_oPos->m_oY->GetValue();
+	
+			odf_context()->drawing_context()->set_position( x, y);
+		}
+
+		if (oox_anchor->m_oExt.IsInit())
+		{
+			_CP_OPT(double) width, height;
+
+			if (oox_anchor->m_oExt->m_oCx.IsInit())	width	= oox_anchor->m_oExt->m_oCx->GetValue();
+			if (oox_anchor->m_oExt->m_oCy.IsInit())	height	= oox_anchor->m_oExt->m_oCy->GetValue();
+			
+			odf_context()->drawing_context()->set_size(	width, height);					
+		}
 		OoxConverter::convert(oox_anchor->m_oElement.GetPointer());
 	odf_context()->drawing_context()->end_drawing();
 }
@@ -1819,7 +1866,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CDrawing *oox_drawing)
 	OOX::IFileContainer* old_container = xlsx_current_container;
 	xlsx_current_container = dynamic_cast<OOX::IFileContainer*>(oox_drawing);
 
-	for (unsigned int dr = 0 ; dr < oox_drawing->m_arrItems.size(); dr++)
+	for (size_t dr = 0 ; dr < oox_drawing->m_arrItems.size(); dr++)
 	{
 		ods_context->start_drawings();
 			convert(oox_drawing->m_arrItems[dr]);
@@ -1848,7 +1895,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CConditionalFormatting *oox_cond_f
 	{
 		ods_context->current_table().start_conditional_format(oox_cond_fmt->m_oSqRef.get());
 
-		for (unsigned int i=0; i< oox_cond_fmt->m_arrItems.size(); i++)
+		for (size_t i=0; i< oox_cond_fmt->m_arrItems.size(); i++)
 			convert(oox_cond_fmt->m_arrItems[i]);//rule
 		
 		ods_context->current_table().end_conditional_format();
@@ -1871,7 +1918,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CConditionalFormattingRule *oox_co
 			if (oox_cond_rule->m_oOperator.IsInit()) 
 				ods_context->current_table().set_conditional_operator(oox_cond_rule->m_oOperator->GetValue());
 			
-				for (unsigned int i=0; i< oox_cond_rule->m_arrItems.size(); i++)
+				for (size_t i=0; i< oox_cond_rule->m_arrItems.size(); i++)
 					convert(oox_cond_rule->m_arrItems[i]);
 		}	
 		ods_context->current_table().end_conditional_rule();
@@ -1888,14 +1935,14 @@ void XlsxConverter::convert(OOX::Spreadsheet::CDataBar *oox_cond_databar)
 			//nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oMaxLength;
 			//nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oMinLength;
 			//nullable<SimpleTypes::COnOff<>>					m_oShowValue;
-	for (unsigned int i=0; i< oox_cond_databar->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_cond_databar->m_arrItems.size(); i++)
 		convert(oox_cond_databar->m_arrItems[i]);
 }
 void XlsxConverter::convert(OOX::Spreadsheet::CColorScale *oox_cond_colorscale)
 {
 	if (!oox_cond_colorscale)return;
 	
-	for (unsigned int i=0; i< oox_cond_colorscale->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_cond_colorscale->m_arrItems.size(); i++)
 	{
 		if (!oox_cond_colorscale->m_arrItems[i])continue;
 	
@@ -1921,7 +1968,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CIconSet *oox_cond_iconset)
 			//nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oMaxLength;
 			//nullable<SimpleTypes::CUnsignedDecimalNumber<>>	m_oMinLength;
 			//nullable<SimpleTypes::COnOff<>>					m_oShowValue;
-	for (unsigned int i=0; i< oox_cond_iconset->m_arrItems.size(); i++)
+	for (size_t i=0; i< oox_cond_iconset->m_arrItems.size(); i++)
 		convert(oox_cond_iconset->m_arrItems[i]);
 }
 void XlsxConverter::convert(OOX::Spreadsheet::CConditionalFormatValueObject *oox_cond_value)
@@ -1970,7 +2017,7 @@ void XlsxConverter::convert(OOX::Spreadsheet::CAutofilter *oox_filter)
 	}
 	ods_context->add_autofilter(ref);//target
 	
-	//for (unsigned int i=0; i < oox_filter->m_arrItems.size(); i++)//set items todooo
+	//for (size_t i=0; i < oox_filter->m_arrItems.size(); i++)//set items todooo
 	//{
 	//}
 }

ASCOfficeOdfFileW/source/Oox2OdfConverter/XlsxConverter.h

@@ -32,7 +32,7 @@
 #pragma once
 
 #include "Converter.h"
-#include <boost/foreach.hpp>
+
 #include <cpdoccore/CPSharedPtr.h>
 #include <cpdoccore/CPOptional.h>
 

ASCOfficePPTXFile/ASCOfficePPTXFile.h

@@ -61,6 +61,7 @@ private:
 	std::wstring		m_strEmbeddedFontsDirectory;
 
 	std::wstring		m_strFolderThemes;
+	bool				m_bIsNoBase64;
 
     extract_to_directory    m_fCallbackExtract;
 	compress_from_directory m_fCallbackCompress;
@@ -93,6 +94,7 @@ public:
     HRESULT SetFontDir			(std::wstring bsFontDir);
     HRESULT SetThemesDir		(std::wstring bsDir);
     HRESULT SetUseSystemFonts	(bool useSystemFonts);
+    void SetIsNoBase64			(bool bIsNoBase64);
     HRESULT OpenFileToPPTY		(std::wstring bsInput, std::wstring bsOutput);
     HRESULT OpenDirectoryToPPTY	(std::wstring bsInput, std::wstring bsOutput);
     HRESULT ConvertPPTYToPPTX	(std::wstring bsInput, std::wstring bsOutput, std::wstring bsThemesFolder);

ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp

@@ -67,6 +67,7 @@ CPPTXFile::CPPTXFile(extract_to_directory fCallbackExtract, compress_from_direct
 	m_strEmbeddedFontsDirectory = _T("");
 
     m_strFolderThemes = _T("");
+	m_bIsNoBase64 = false;
 
 	//m_fCallbackResource = fCallbackResource;
     m_fCallbackExtract  = fCallbackExtract;
@@ -232,6 +233,10 @@ HRESULT CPPTXFile::SetUseSystemFonts(bool val)
     m_bIsUseSystemFonts = val;
 	return S_OK;
 }
+void CPPTXFile::SetIsNoBase64(bool bIsNoBase64)
+{
+	m_bIsNoBase64 = bIsNoBase64;
+}
 HRESULT CPPTXFile::OpenFileToPPTY(std::wstring bsInput, std::wstring bsOutput)
 {
     if (m_strTempDir.empty())
@@ -325,7 +330,7 @@ HRESULT CPPTXFile::OpenDirectoryToPPTY(std::wstring bsInput, std::wstring bsOutp
 		}
 	}
 
-	PPTX2EditorAdvanced::Convert(oBinaryWriter, *m_pFolder, m_strDirectory, pathDstFileOutput.GetPath());
+	PPTX2EditorAdvanced::Convert(oBinaryWriter, *m_pFolder, m_strDirectory, pathDstFileOutput.GetPath(), m_bIsNoBase64);
 
 	return S_OK;
 }
@@ -360,7 +365,7 @@ HRESULT CPPTXFile::ConvertPPTYToPPTX(std::wstring bsInput, std::wstring bsOutput
 	std::wstring strBsInput = bsInput;
     std::wstring srcFolder = NSDirectory::GetFolderPath(strBsInput);
 
-    oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, bsThemesFolder);
+	oWriter.OpenPPTY(pSrcBuffer, lFileSize, srcFolder, bsThemesFolder);
 	
 	RELEASEARRAYOBJECTS(pSrcBuffer);
 	HRESULT hRes = S_OK;

ASCOfficePPTXFile/Editor/BinReaderWriterDefines.h

@@ -42,6 +42,8 @@ namespace NSBinPptxRW
 	const BYTE g_nodeAttributeStart = 0xFA;
 	const BYTE g_nodeAttributeEnd	= 0xFB;
 
+	const int g_nFormatVersionNoBase64 = 10;
+
 	namespace NSSerFormat
 	{
 		enum SerFormat

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp

@@ -790,6 +790,17 @@ namespace NSBinPptxRW
 	{
         _WriteString(sBuffer.c_str(), (_UINT32)sBuffer.length());
 	}
+	void CBinaryFileWriter::WriteStringUtf8(const std::wstring& sBuffer)
+	{
+		BYTE* pData = NULL;
+		LONG lLen = 0;
+
+		NSFile::CUtf8Converter::GetUtf8StringFromUnicode(sBuffer.c_str(), (LONG)sBuffer.length(), pData, lLen, false);
+
+		WriteBYTEArray(pData, lLen);
+
+		RELEASEARRAYOBJECTS(pData);
+	}
 	CBinaryFileWriter::CBinaryFileWriter()
 	{
 		m_pMainDocument		= NULL;
@@ -844,9 +855,9 @@ namespace NSBinPptxRW
 		m_lPosition += (_UINT32)lCount;
 	}
 
-	void CBinaryFileWriter::WriteMainPart()
+	void CBinaryFileWriter::WriteMainPart(_UINT32 nStartPos)
 	{
-		BYTE* pData = m_pStreamData;
+		BYTE* pData = m_pStreamData + nStartPos;
 		size_t nCount = m_arMainTables.size();
 
 		for (size_t i = 0; i < nCount; i++)

ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h

@@ -292,6 +292,7 @@ namespace NSBinPptxRW
 		void WriteStringW3	(const std::wstring& sBuffer);
 		
 		void WriteStringW4	(const std::wstring& sBuffer);
+		void WriteStringUtf8(const std::wstring& sBuffer);
 		// --------------------------------------------------------
 		void WriteLONG64	(const _INT64& lValue);
 		void WriteDouble64	(const double& dValue);
@@ -306,7 +307,7 @@ namespace NSBinPptxRW
 		void StartMainRecord(_INT32 lType);
 		void WriteReserved(size_t lCount);
 
-		void WriteMainPart();
+		void WriteMainPart(_UINT32 nStartPos);
 		
 		void WriteString1	(int type, const std::wstring& val);
 		void WriteString2	(int type, const NSCommon::nullable_string& val);

ASCOfficePPTXFile/Editor/Converter.h

@@ -38,7 +38,7 @@ namespace PPTX2EditorAdvanced
 {
 	using namespace NSBinPptxRW;
 
-	DWORD Convert(NSBinPptxRW::CBinaryFileWriter& oBinaryWriter, PPTX::Folder& oFolder, const std::wstring& strSourceDirectory, const std::wstring& strDstFile)
+	DWORD Convert(NSBinPptxRW::CBinaryFileWriter& oBinaryWriter, PPTX::Folder& oFolder, const std::wstring& strSourceDirectory, const std::wstring& strDstFile, bool bIsNoBase64)
 	{	
 		// сначала соберем все объекты для конвертации и сформируем main-таблицы
 		NSBinPptxRW::CCommonWriter* pCommon = oBinaryWriter.m_pCommon;
@@ -230,6 +230,12 @@ namespace PPTX2EditorAdvanced
 			oBinaryWriter.m_pCommon->m_oNote_Rels.push_back(nMasterIndex);
 		}
 
+		if (bIsNoBase64)
+		{
+			std::wstring strPrefix = L"PPTY;v"+std::to_wstring(g_nFormatVersionNoBase64)+L";0;";
+			oBinaryWriter.WriteStringUtf8(strPrefix);
+		}
+		_UINT32 nStartPos = oBinaryWriter.GetPosition();
 		// нужно записать все в maintables. А кроме главных таблиц ничего и нету. Все остальное лежит в них
 		// на каждую таблицу - 5 байт (тип и сдвиг)
 		// число таблиц - заранее известно (сделаем 30. если потом не будет хватать - новая версия формата)
@@ -516,29 +522,35 @@ namespace PPTX2EditorAdvanced
 		// ------------------------------------------------
 
 		oBinaryWriter.WriteEmbeddedFonts();
-		oBinaryWriter.WriteMainPart();
+		oBinaryWriter.WriteMainPart(nStartPos);
 
 		// все записалось нормально. осталось скинуть на диск
 		BYTE* pbBinBuffer = oBinaryWriter.GetBuffer();
 		int nBinBufferLen = (int)oBinaryWriter.GetPosition();
-		int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
-        BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen+64];
-//		if (true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
-        if (true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
-        {
-			CFile oFile;
-#if defined(_WIN32) || defined (_WIN64)
-            oFile.CreateFileW(strDstFile);
-#else
-            oFile.CreateFile(strDstFile);
-#endif
-			std::string strPrefix = "PPTY;v1;" + std::to_string(nBinBufferLen) + ";";
-            oFile.WriteFile((void*)strPrefix.c_str(), (DWORD)strPrefix.length());
-			oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
+		if (bIsNoBase64)
+		{
+			NSFile::CFileBinary oFile;
+			oFile.CreateFileW(strDstFile);
+			oFile.WriteFile(pbBinBuffer, nBinBufferLen);
 			oFile.CloseFile();
 		}
+		else
+		{
+			int nBase64BufferLen = Base64::Base64EncodeGetRequiredLength(nBinBufferLen, Base64::B64_BASE64_FLAG_NOCRLF);
+			BYTE* pbBase64Buffer = new BYTE[nBase64BufferLen+64];
+	//		if (true == Base64::Base64Encode(pbBinBuffer, nBinBufferLen, (LPSTR)pbBase64Buffer, &nBase64BufferLen, Base64::B64_BASE64_FLAG_NOCRLF))
+			if (true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
+			{
+				NSFile::CFileBinary oFile;
+				oFile.CreateFileW(strDstFile);
+				std::wstring strPrefix = L"PPTY;v1;" + std::to_wstring(nBinBufferLen) + L";";
+				oFile.WriteStringUTF8(strPrefix);
+				oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
+				oFile.CloseFile();
+			}
 
-		RELEASEARRAYOBJECTS(pbBase64Buffer);
+			RELEASEARRAYOBJECTS(pbBase64Buffer);
+		}
 		return 0;
 	}
 }

ASCOfficePPTXFile/Editor/PPTXWriter.h

@@ -118,7 +118,7 @@ namespace NSBinPptxRW
             m_oReader.m_strFolderThemes = pathTheme.GetPath();
         }
 
-        void OpenPPTY(BYTE* pBuffer, int len, std::wstring srcFolder, std::wstring strThemesFolder)
+		void OpenPPTY(BYTE* pBuffer, int len, std::wstring srcFolder, std::wstring strThemesFolder)
 		{
 			int start_pos = 0;
 
@@ -158,11 +158,30 @@ namespace NSBinPptxRW
 			int dstLenTemp = XmlUtils::GetInteger(__str_decode_len);
 			//int dstLenTemp = Base64DecodeGetRequiredLength(len);
 
-			BYTE* pDstBuffer = new BYTE[dstLenTemp];
-			int dstLen = dstLenTemp;
-            Base64::Base64Decode((const char*)pBuffer, len, pDstBuffer, &dstLen);
+			int nVersion = 1;
+			if(__str_version.length() > 1)
+			{
+				nVersion = std::stoi(__str_version.substr(1).c_str());
+			}
+			bool bIsNoBase64 = nVersion == g_nFormatVersionNoBase64;
+
+			BYTE* pDstBuffer = NULL;
+			int dstLen = 0;
+			if(!bIsNoBase64)
+			{
+				BYTE* pDstBuffer = new BYTE[dstLenTemp];
+				int dstLen = dstLenTemp;
+				Base64::Base64Decode((const char*)pBuffer, len, pDstBuffer, &dstLen);
+				m_oReader.Init(pDstBuffer, 0, dstLen);
+			}
+			else
+			{
+				pDstBuffer = pBuffer - start_pos;
+				dstLen = len + start_pos;
+				m_oReader.Init(pDstBuffer, 0, dstLen);
+				m_oReader.Seek(start_pos);
+			}
 
-			m_oReader.Init(pDstBuffer, 0, dstLen);
 			m_oReader.m_strFolder = srcFolder;
             m_oReader.m_strFolderExternalThemes = strThemesFolder;
 			
@@ -813,8 +832,10 @@ namespace NSBinPptxRW
 					bIsAuthors = true;
 				}
 			}
-
-			RELEASEARRAYOBJECTS(pDstBuffer);
+			if(!bIsNoBase64)
+			{
+				RELEASEARRAYOBJECTS(pDstBuffer);
+			}
 
 	// content types
 			OOX::CContentTypes *pContentTypes = m_oImageManager.m_pContentTypes;